From patchwork Mon Aug 3 07:26:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 51844 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by patches.linaro.org (Postfix) with ESMTPS id 2E2E8229FD for ; Mon, 3 Aug 2015 07:28:47 +0000 (UTC) Received: by wixh2 with SMTP id h2sf26374263wix.0 for ; Mon, 03 Aug 2015 00:28:46 -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 :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=4EXFcDj3MeOvsTXukPmQYh6X/yX8sSU8/WLsNL2HqWo=; b=TU9zF0Uyk+CIG2BJ6z+pXIOb0duVw29gQJBJzO6os1yzZEOK4Ki1aA7aYwKAA7xPst oPedUFfR3/vp64gT06u2Qt/HMbcPHJm+B3zBo8PuMowtuwcNuLzWJEIfpQBs5ljhtU9R 5K5qMmD0qj2nxLT1XMvS2ovAOalb/kgjTzdCdSszqTK2B+fsn0VWYXTp7o4P8V1VnnXV QZXvZKQVJC6ODjZo4fxl+eZyq8V1UfUjbwn0sDqXMOL1PojhHtguFXcv/EHdOmvGzxIA czfdnnyN8JE+/ACt6SIZioX+1opc65CMCnhkqmwMDU/DlXAWBHMcohXmDNp4ydS2XUQ6 xQwA== X-Gm-Message-State: ALoCoQmHa2L+ka75/bAkInoLK5Uf7Bz/5FUSi12U+p1aZ8ZaomC0j4+nkn8uOpsVYJk1lM5SCURe X-Received: by 10.152.87.46 with SMTP id u14mr5140767laz.5.1438586926398; Mon, 03 Aug 2015 00:28:46 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.178.197 with SMTP id da5ls95919lac.61.gmail; Mon, 03 Aug 2015 00:28:46 -0700 (PDT) X-Received: by 10.112.63.137 with SMTP id g9mr15320754lbs.121.1438586926244; Mon, 03 Aug 2015 00:28:46 -0700 (PDT) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com. [209.85.217.181]) by mx.google.com with ESMTPS id lt3si11215275lac.124.2015.08.03.00.28.46 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Aug 2015 00:28:46 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) client-ip=209.85.217.181; Received: by lbqc9 with SMTP id c9so47656869lbq.1 for ; Mon, 03 Aug 2015 00:28:46 -0700 (PDT) X-Received: by 10.152.26.163 with SMTP id m3mr15456935lag.86.1438586926140; Mon, 03 Aug 2015 00:28:46 -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.7.198 with SMTP id l6csp1709936lba; Mon, 3 Aug 2015 00:28:44 -0700 (PDT) X-Received: by 10.66.132.16 with SMTP id oq16mr33292173pab.13.1438586924089; Mon, 03 Aug 2015 00:28:44 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id sk5si25023991pac.9.2015.08.03.00.28.43 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Aug 2015 00:28:44 -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 1ZMA9S-0005VD-EM; Mon, 03 Aug 2015 07:27:14 +0000 Received: from mail-lb0-f180.google.com ([209.85.217.180]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZMA9P-0005Tb-3M for linux-arm-kernel@lists.infradead.org; Mon, 03 Aug 2015 07:27:11 +0000 Received: by lbbud7 with SMTP id ud7so69063365lbb.3 for ; Mon, 03 Aug 2015 00:26:48 -0700 (PDT) X-Received: by 10.112.163.226 with SMTP id yl2mr15609007lbb.100.1438586807940; Mon, 03 Aug 2015 00:26:47 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by smtp.gmail.com with ESMTPSA id xf5sm2782636lbb.38.2015.08.03.00.26.45 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Aug 2015 00:26:46 -0700 (PDT) From: Linus Walleij To: arm@kernel.org Subject: [PATCH 1/2] ARM: ux500: add an SMP enablement type and move cpu nodes Date: Mon, 3 Aug 2015 09:26:41 +0200 Message-Id: <1438586801-30115-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150803_002711_391795_42FCF014 X-CRM114-Status: GOOD ( 15.26 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.217.180 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.217.180 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 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: Linus Walleij , linux-arm-kernel@lists.infradead.org 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: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) smtp.mail=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 "cpus" node cannot be inside the "soc" node, while this works for the CoreSight blocks, the early boot code will look for "cpus" directly under the root node, so this is a hard convention. So move the CPU nodes. Augment the "reg" property to match what is actually in the hardware: 0x300 and 0x301 respectively. Then add an SMP enablement type to be used by the SMP init code, "ste,dbx500-smp". Signed-off-by: Linus Walleij --- Hi ARM SoC people: please apply this as a fix for v4.2 as it is prerequisite for 2/2 which is a more proper fix for the secondary CPU boot regression addressed by the fixed remappings patch. --- Documentation/devicetree/bindings/arm/cpus.txt | 1 + arch/arm/boot/dts/ste-dbx5x0.dtsi | 53 +++++++++++++------------- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/cpus.txt b/Documentation/devicetree/bindings/arm/cpus.txt index d6b794cef0b8..91e6e5c478d0 100644 --- a/Documentation/devicetree/bindings/arm/cpus.txt +++ b/Documentation/devicetree/bindings/arm/cpus.txt @@ -199,6 +199,7 @@ nodes to be present and contain the properties described below. "qcom,kpss-acc-v1" "qcom,kpss-acc-v2" "rockchip,rk3066-smp" + "ste,dbx500-smp" - cpu-release-addr Usage: required for systems that have an "enable-method" diff --git a/arch/arm/boot/dts/ste-dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi index a75f3289e653..b8f81fb418ce 100644 --- a/arch/arm/boot/dts/ste-dbx5x0.dtsi +++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi @@ -15,6 +15,33 @@ #include "skeleton.dtsi" / { + cpus { + #address-cells = <1>; + #size-cells = <0>; + enable-method = "ste,dbx500-smp"; + + cpu-map { + cluster0 { + core0 { + cpu = <&CPU0>; + }; + core1 { + cpu = <&CPU1>; + }; + }; + }; + CPU0: cpu@300 { + device_type = "cpu"; + compatible = "arm,cortex-a9"; + reg = <0x300>; + }; + CPU1: cpu@301 { + device_type = "cpu"; + compatible = "arm,cortex-a9"; + reg = <0x301>; + }; + }; + soc { #address-cells = <1>; #size-cells = <1>; @@ -22,32 +49,6 @@ interrupt-parent = <&intc>; ranges; - cpus { - #address-cells = <1>; - #size-cells = <0>; - - cpu-map { - cluster0 { - core0 { - cpu = <&CPU0>; - }; - core1 { - cpu = <&CPU1>; - }; - }; - }; - CPU0: cpu@0 { - device_type = "cpu"; - compatible = "arm,cortex-a9"; - reg = <0>; - }; - CPU1: cpu@1 { - device_type = "cpu"; - compatible = "arm,cortex-a9"; - reg = <1>; - }; - }; - ptm@801ae000 { compatible = "arm,coresight-etm3x", "arm,primecell"; reg = <0x801ae000 0x1000>;