From patchwork Thu Aug 6 14:42:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 52006 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 6496F20539 for ; Thu, 6 Aug 2015 14:44:27 +0000 (UTC) Received: by lbbyj8 with SMTP id yj8sf24436403lbb.3 for ; Thu, 06 Aug 2015 07:44:26 -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=H0pUH/8j2IpZ0fVp2KgzMRYf3zaarEzT0C608vPliPA=; b=YHaxzRA+2Eb9W2fQa0Of99CcjuofcxmLd+/okzixnrcmSX4ze5jnzFuKQc015uDq4p VPSQyKa0OF2y8ifX3OaeptkhUNAoeFB+dxgG6qnRH1QZsnlliFS3NLtZjqQRkEUu34GD FFSNSUmdDiX09pRNtpcoNDEHxIDnGXdVnEY+k0pTW2cp/B0S3L1RHJ7pYKYoyC0/juAn 0iMY6iGLdn6Kb7ArqIqNe+C12fmzPesQAlYxOkkBdCw/5+cQXccrhBBiGXVETB7+SvAu s+mo5nfBbvAM+Gmlb2m+xvMJ7addbAZcjA/B5kNg5lYrb4IgcfTauNqZg15RvlCg6YJ7 Yfwg== X-Gm-Message-State: ALoCoQnvefF+N6PXrtQL8HIjq/IpfifWZInFQ2cC67NfvdFsv0RsymPP8eq7FgUAeK9dGntSrJtC X-Received: by 10.112.99.37 with SMTP id en5mr617043lbb.7.1438872266364; Thu, 06 Aug 2015 07:44:26 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.44.228 with SMTP id h4ls345142lam.23.gmail; Thu, 06 Aug 2015 07:44:26 -0700 (PDT) X-Received: by 10.112.180.201 with SMTP id dq9mr2308530lbc.78.1438872266223; Thu, 06 Aug 2015 07:44:26 -0700 (PDT) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id ds10si4969870lbc.133.2015.08.06.07.44.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Aug 2015 07:44:26 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by lagz9 with SMTP id z9so4733359lag.3 for ; Thu, 06 Aug 2015 07:44:26 -0700 (PDT) X-Received: by 10.152.9.66 with SMTP id x2mr2060930laa.76.1438872266097; Thu, 06 Aug 2015 07:44:26 -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 l6csp992899lba; Thu, 6 Aug 2015 07:44:24 -0700 (PDT) X-Received: by 10.70.16.67 with SMTP id e3mr4073686pdd.98.1438872264060; Thu, 06 Aug 2015 07:44:24 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id xv3si11863092pab.185.2015.08.06.07.44.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Aug 2015 07:44:24 -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 1ZNMO5-00084R-Du; Thu, 06 Aug 2015 14:43:17 +0000 Received: from mail-la0-f42.google.com ([209.85.215.42]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZNMO2-0007xi-SK for linux-arm-kernel@lists.infradead.org; Thu, 06 Aug 2015 14:43:15 +0000 Received: by lagz9 with SMTP id z9so4701142lag.3 for ; Thu, 06 Aug 2015 07:42:52 -0700 (PDT) X-Received: by 10.153.7.166 with SMTP id dd6mr2252044lad.42.1438872172794; Thu, 06 Aug 2015 07:42:52 -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 l5sm1430853lal.29.2015.08.06.07.42.51 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Aug 2015 07:42:51 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/4 v2] ARM: nomadik: move l2x0 setup to device tree Date: Thu, 6 Aug 2015 16:42:42 +0200 Message-Id: <1438872162-13565-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-20150806_074315_104504_551A2920 X-CRM114-Status: GOOD ( 14.39 ) 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.215.42 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.215.42 listed in wl.mailspike.net] -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.54 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 --- This v2 version fixes the syntactic minimalism issue with just 0/~0 for the AUX val/mask pointed out by Russell. --- 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 f68988ac800c..ce8936bebe5e 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..0c612d95bd5c 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 = 0, + .l2c_aux_mask = ~0, .map_io = cpu8815_map_io, .restart = cpu8815_restart, .dt_compat = cpu8815_board_compat,