From patchwork Wed Aug 10 12:02:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 9272963 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DF830600CB for ; Wed, 10 Aug 2016 12:04:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D0A5828338 for ; Wed, 10 Aug 2016 12:04:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C52652838E; Wed, 10 Aug 2016 12:04:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 661FA28338 for ; Wed, 10 Aug 2016 12:04:18 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bXSDk-0003oB-Ho; Wed, 10 Aug 2016 12:02:52 +0000 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bXSDd-0003aH-2n for linux-arm-kernel@lists.infradead.org; Wed, 10 Aug 2016 12:02:49 +0000 Received: by mail-wm0-x231.google.com with SMTP id d196so12997879wmd.0 for ; Wed, 10 Aug 2016 05:02:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=Utk9XatP9wIvJDvBExf38VpSawMQxy3cr/vdWNJuB1Q=; b=M+sqTBogBSpCQeF5gbY35ZN9u5af6kHzzjaTnXOGhMUuXesg+8gMGGOLtHyHulcb1m 25coWNe267R98tgupBfVC4pfELCL189VVyoJAoTP2VMpB1mLsW9dsc6MiU5x3iJrq0Ec CL88XCsOhgDiTfuKvrbJb+wDtIC2df/YPaac0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Utk9XatP9wIvJDvBExf38VpSawMQxy3cr/vdWNJuB1Q=; b=ZIl9t47L/qgJwiFeYMRxnzyQrmmeO1vDQ63LI/XybBPK2BF2Jo+7y8+pFbAnZSQND3 Oa2GGBvlu9tUFVHsep5+iTU7M+UJTY9BpKJYjfNQvhaup7LOlCSQDh0daO1N7ZFzSsHf BwvPjrMH5amnP+SGK0Yt3PzX2C38OuuJLekdEnu0dWWhHr7nuLN3O8sejG7Mx+RWAQK4 ZU/NKH5BO1ro2H1iNAbz8MRy4US1aiN7AU5zvxIUheWIvcsq8Jeeyaayt7CX5crUonrW xqWQ4yIqMRyhtOipyG9tkX4g7OBSC10jG8QiiuvYFyiR3ZBWmCK0wqiLx4IaOYNDmF2p b3Qw== X-Gm-Message-State: AEkooutVNzlvtpeAUqt8qnlPZOkNyDTt3ChDh5hopHjjgaXTj76ZvCdq4VwYf3Ld0jRNhDwd X-Received: by 10.25.154.19 with SMTP id c19mr570799lfe.188.1470830542910; Wed, 10 Aug 2016 05:02:22 -0700 (PDT) Received: from linuslaptop.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id 62sm7580175ljj.3.2016.08.10.05.02.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Aug 2016 05:02:22 -0700 (PDT) From: Linus Walleij To: arm@kernel.org Subject: [PATCH] ARM: dts: realview: Fix PBX-A9 cache description Date: Wed, 10 Aug 2016 14:02:17 +0200 Message-Id: <1470830537-12307-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160810_050245_600969_F3A150DB X-CRM114-Status: GOOD ( 14.63 ) 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 , Robin Murphy , stable@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Robin Murphy Clearly QEMU is very permissive in how its PL310 model may be set up, but the real hardware turns out to be far more particular about things actually being correct. Fix up the DT description so that the real thing actually boots: - The arm,data-latency and arm,tag-latency properties need 3 cells to be valid, otherwise we end up retaining the default 8-cycle latencies which leads pretty quickly to lockup. - The arm,dirty-latency property is only relevant to L210/L220, so get rid of it. - The cache geometry override also leads to lockup and/or general misbehaviour. Irritatingly, the manual doesn't state the actual PL310 configuration, but based on the boardfile code and poking registers from the Boot Monitor, it would seem to be 8 sets of 16KB ways. With that, we can successfully boot to enjoy the fun of mismatched FPUs... Cc: stable@vger.kernel.org Signed-off-by: Robin Murphy Tested-by: Mark Rutland Signed-off-by: Linus Walleij --- ARM SoC folks: please apply this directly for fixes. I had queued it for worries of clashing with other updates, but I think it will be fine, and it needs to go in for v4.8. --- arch/arm/boot/dts/arm-realview-pbx-a9.dts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/arm-realview-pbx-a9.dts b/arch/arm/boot/dts/arm-realview-pbx-a9.dts index db808f92dd79..90d00b407f85 100644 --- a/arch/arm/boot/dts/arm-realview-pbx-a9.dts +++ b/arch/arm/boot/dts/arm-realview-pbx-a9.dts @@ -70,13 +70,12 @@ * associativity as these may be erroneously set * up by boot loader(s). */ - cache-size = <1048576>; // 1MB - cache-sets = <4096>; + cache-size = <131072>; // 128KB + cache-sets = <512>; cache-line-size = <32>; arm,parity-disable; - arm,tag-latency = <1>; - arm,data-latency = <1 1>; - arm,dirty-latency = <1>; + arm,tag-latency = <1 1 1>; + arm,data-latency = <1 1 1>; }; scu: scu@1f000000 {