From patchwork Fri Oct 2 09:55:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 54414 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by patches.linaro.org (Postfix) with ESMTPS id 4522423009 for ; Fri, 2 Oct 2015 09:58:02 +0000 (UTC) Received: by lbwr8 with SMTP id r8sf14799196lbw.0 for ; Fri, 02 Oct 2015 02:58:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:cc:mime-version :content-type:content-transfer-encoding:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list; bh=/UAvX1QXYPqBbYLZ//2p057LV0Ot4TADdzbTCKAmObw=; b=C8A+1BF/qQxFJ6+Vq5bZSLgDtcB6ErU/Enq3b53LxVL8SbDFfRjmrzMYpicbhbmTqx HSFEqStcszcD4GN+cAakMNRDgdHz/Uff1MlJ6WbkKy9V+MTZFf+K79gSHrfD527YeHTZ Mf2pmy5o8GQ9XsL8biJJX7B9dhPqCQjtL8bczePYl+l+5dTgUXflFjLt6VcYq0AFtDwQ ybTT9jQpP3eFT1DdFdfY2D1fCXdAOTL0wMXXS5CxA5pwPfkC0qFbP22alyEa5+e1jirZ W2+tTaDqORigxP5rApUPGqOW3jRS529XnqdJ9ajfHtMTGcE3TwksCNsyt2ZeMuJcpx0y zikg== X-Gm-Message-State: ALoCoQlTuc6NYomz4/dafFwwrEXjGHOjoexknSc07HlLZXeM9aK66BT1XbBdTEU7q3wwZYg9m0z1 X-Received: by 10.112.130.41 with SMTP id ob9mr2368918lbb.17.1443779881188; Fri, 02 Oct 2015 02:58:01 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.32.207 with SMTP id g198ls173995lfg.18.gmail; Fri, 02 Oct 2015 02:58:01 -0700 (PDT) X-Received: by 10.112.144.101 with SMTP id sl5mr5148791lbb.115.1443779881052; Fri, 02 Oct 2015 02:58:01 -0700 (PDT) Received: from mail-la0-f48.google.com (mail-la0-f48.google.com. [209.85.215.48]) by mx.google.com with ESMTPS id kf2si5681278lbc.174.2015.10.02.02.58.01 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Oct 2015 02:58:01 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) client-ip=209.85.215.48; Received: by lafb9 with SMTP id b9so1477137laf.0 for ; Fri, 02 Oct 2015 02:58:01 -0700 (PDT) X-Received: by 10.112.135.9 with SMTP id po9mr5228852lbb.56.1443779880941; Fri, 02 Oct 2015 02:58:00 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp1120012lbq; Fri, 2 Oct 2015 02:57:59 -0700 (PDT) X-Received: by 10.194.22.165 with SMTP id e5mr14567652wjf.50.1443779879487; Fri, 02 Oct 2015 02:57:59 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id wc10si8805716wic.102.2015.10.02.02.57.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Oct 2015 02:57:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Zhx4r-0003TR-57; Fri, 02 Oct 2015 09:56:33 +0000 Received: from foss.arm.com ([217.140.101.70]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Zhx4I-0002vv-IP for linux-arm-kernel@lists.infradead.org; Fri, 02 Oct 2015 09:56:00 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C91F75E2; Fri, 2 Oct 2015 02:55:40 -0700 (PDT) Received: from leverpostej.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 6C14C3F50D; Fri, 2 Oct 2015 02:55:38 -0700 (PDT) From: Mark Rutland To: linux-arm-kernel@lists.infradead.org Subject: [PATCHv4 4/6] arm64: dts: juno: describe PMUs separately Date: Fri, 2 Oct 2015 10:55:06 +0100 Message-Id: <1443779708-26789-5-git-send-email-mark.rutland@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1443779708-26789-1-git-send-email-mark.rutland@arm.com> References: <1443779708-26789-1-git-send-email-mark.rutland@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151002_025559_067226_AFF39D10 X-CRM114-Status: UNSURE ( 8.32 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -6.9 (------) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-6.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [217.140.101.70 listed in list.dnswl.org] -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Cc: Mark Rutland , Liviu Dudau , will.deacon@arm.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: mark.rutland@arm.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 The A57 and A53 PMUs in Juno support different events, so describe them separately in both the Juno and Juno R1 DTs. Signed-off-by: Mark Rutland Cc: Liviu Dudau Cc: Will Deacon Acked-by: Liviu Dudau --- arch/arm64/boot/dts/arm/juno-r1.dts | 18 +++++++++++------- arch/arm64/boot/dts/arm/juno.dts | 18 +++++++++++------- 2 files changed, 22 insertions(+), 14 deletions(-) Note: as older kernels don't handle multiple PMUs being listed in the DT, this should be applied after the core changes. diff --git a/arch/arm64/boot/dts/arm/juno-r1.dts b/arch/arm64/boot/dts/arm/juno-r1.dts index c627511..734e127 100644 --- a/arch/arm64/boot/dts/arm/juno-r1.dts +++ b/arch/arm64/boot/dts/arm/juno-r1.dts @@ -91,17 +91,21 @@ }; }; - pmu { - compatible = "arm,armv8-pmuv3"; + pmu_a57 { + compatible = "arm,cortex-a57-pmu"; interrupts = , - , - , + ; + interrupt-affinity = <&A57_0>, + <&A57_1>; + }; + + pmu_a53 { + compatible = "arm,cortex-a53-pmu"; + interrupts = , , , ; - interrupt-affinity = <&A57_0>, - <&A57_1>, - <&A53_0>, + interrupt-affinity = <&A53_0>, <&A53_1>, <&A53_2>, <&A53_3>; diff --git a/arch/arm64/boot/dts/arm/juno.dts b/arch/arm64/boot/dts/arm/juno.dts index d7cbdd4..ffa05ae 100644 --- a/arch/arm64/boot/dts/arm/juno.dts +++ b/arch/arm64/boot/dts/arm/juno.dts @@ -91,17 +91,21 @@ }; }; - pmu { - compatible = "arm,armv8-pmuv3"; + pmu_a57 { + compatible = "arm,cortex-a57-pmu"; interrupts = , - , - , + ; + interrupt-affinity = <&A57_0>, + <&A57_1>; + }; + + pmu_a53 { + compatible = "arm,cortex-a53-pmu"; + interrupts = , , , ; - interrupt-affinity = <&A57_0>, - <&A57_1>, - <&A53_0>, + interrupt-affinity = <&A53_0>, <&A53_1>, <&A53_2>, <&A53_3>;