From patchwork Sun Aug 2 21:56:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 51805 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by patches.linaro.org (Postfix) with ESMTPS id F0521229FD for ; Sun, 2 Aug 2015 21:58:18 +0000 (UTC) Received: by lbbyj8 with SMTP id yj8sf18945500lbb.3 for ; Sun, 02 Aug 2015 14:58:17 -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=4q0HpWJJEJ8vlM17jlleIu8gpfcJuuj0YQ97Us9symw=; b=Ch1nk6ycmlg2f3W5a1heIJT/E9DrXotOJx3c5Tk4VWTGXl//DQyxZzPiiSQWLQBBZY uDKvFxLCy56ypINCeHeSSPEYV40iU/r8AYDL2xsaYgknbOAGRHcICgNgDa0Y4nCdY6Fg m2hQ9U5zLMyw1OWwwpR0k6aWbNeKfs4lIHMk4MEdNYj/fJ3T7I0wq4cmjtLOvqSLTTDK n+m9TpnNOG8TadlcHxanCbRTe9YB/ThvFR6KQyX97ggo3HbYpzuffrNoEX1cu8c7edtj 5dJ3tVBltfvqKAE1UZ+0vxOBRpkqE6X/ZR9BGQwx/1HThW/rktAWc67/CBvfl+xJcSj4 QusQ== X-Gm-Message-State: ALoCoQkedoVrscLRj8QfHm5LyT/xvK9WRVgVZbgRh/Y6/YTCcra1/hstk7i/cOGFoGIO7ExZ62D8 X-Received: by 10.112.26.5 with SMTP id h5mr4586866lbg.4.1438552697611; Sun, 02 Aug 2015 14:58:17 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.42.165 with SMTP id p5ls417689lal.68.gmail; Sun, 02 Aug 2015 14:58:17 -0700 (PDT) X-Received: by 10.152.9.66 with SMTP id x2mr12550921laa.76.1438552697470; Sun, 02 Aug 2015 14:58:17 -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 qg4si10319687lbb.25.2015.08.02.14.58.17 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 02 Aug 2015 14:58:17 -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 labgo9 with SMTP id go9so16032380lab.3 for ; Sun, 02 Aug 2015 14:58:17 -0700 (PDT) X-Received: by 10.152.120.135 with SMTP id lc7mr13539682lab.41.1438552697332; Sun, 02 Aug 2015 14:58:17 -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 l6csp1548149lba; Sun, 2 Aug 2015 14:58:16 -0700 (PDT) X-Received: by 10.68.252.225 with SMTP id zv1mr17227924pbc.45.1438552695496; Sun, 02 Aug 2015 14:58:15 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id ks7si23047993pab.99.2015.08.02.14.58.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 02 Aug 2015 14:58:15 -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 1ZM1Fi-0001b8-HP; Sun, 02 Aug 2015 21:57:06 +0000 Received: from mail-lb0-f178.google.com ([209.85.217.178]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZM1Fe-0001W8-OY for linux-arm-kernel@lists.infradead.org; Sun, 02 Aug 2015 21:57:03 +0000 Received: by lblf12 with SMTP id f12so69160796lbl.2 for ; Sun, 02 Aug 2015 14:56:40 -0700 (PDT) X-Received: by 10.112.223.12 with SMTP id qq12mr7716945lbc.7.1438552600371; Sun, 02 Aug 2015 14:56:40 -0700 (PDT) Received: from localhost.localdomain.localdomain (c-297471d5.01-192-6c756e10.cust.bredbandsbolaget.se. [213.113.116.41]) by smtp.gmail.com with ESMTPSA id lu1sm2553742lac.37.2015.08.02.14.56.37 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 02 Aug 2015 14:56:38 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/4] ARM: nomadik: move l2x0 setup to device tree Date: Sun, 2 Aug 2015 23:56:33 +0200 Message-Id: <1438552593-4578-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-20150802_145703_079747_E51F9EFA X-CRM114-Status: GOOD ( 13.13 ) 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.178 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.217.178 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 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.215.48 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 cache setup magic value in the Nomadik machine is plain wrong, the correct settings can be done using device tree in accordance with the settings from ST's own port. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 7 +++++++ arch/arm/mach-nomadik/cpu-8815.c | 5 ++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi index 0edab6d23211..defabe053114 100644 --- a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi +++ b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi @@ -21,6 +21,13 @@ interrupts = <30>; cache-unified; cache-level = <2>; + cache-size = <131072>; + cache-sets = <512>; + cache-line-size = <32>; + /* At full speed latency must be >=2 */ + arm,tag-latency = <2>; + arm,data-latency = <2 2>; + arm,dirty-latency = <2>; }; mtu0: mtu@101e2000 { diff --git a/arch/arm/mach-nomadik/cpu-8815.c b/arch/arm/mach-nomadik/cpu-8815.c index 82831dc6122f..009754055f09 100644 --- a/arch/arm/mach-nomadik/cpu-8815.c +++ b/arch/arm/mach-nomadik/cpu-8815.c @@ -114,9 +114,8 @@ static const char * cpu8815_board_compat[] = { }; DT_MACHINE_START(NOMADIK_DT, "Nomadik STn8815") - /* At full speed latency must be >=2, so 0x249 in low bits */ - .l2c_aux_val = 0x00700249, - .l2c_aux_mask = 0xfe0fefff, + .l2c_aux_val = 0x0, + .l2c_aux_mask = ~0x0UL, .map_io = cpu8815_map_io, .restart = cpu8815_restart, .dt_compat = cpu8815_board_compat,