From patchwork Fri Apr 25 11:55:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell King X-Patchwork-Id: 29067 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qg0-f69.google.com (mail-qg0-f69.google.com [209.85.192.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5ADB5202E6 for ; Fri, 25 Apr 2014 12:43:22 +0000 (UTC) Received: by mail-qg0-f69.google.com with SMTP id a108sf8700634qge.0 for ; Fri, 25 Apr 2014 05:43:22 -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:in-reply-to:references:from:to :subject:message-id:date:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=w9QCJteDEw5bB8sMCdwqM5xRrTNMBY+EWhIQUUNNtXE=; b=fORpgMJdOTJ0q85ivG5h/Ue+OvXqishppb2NlbqcWRAoS0F49wZyxodxEoDEbkXz4J WV6lQckyiirG0wHQj/DIUg5WF/yUt9dRqqvVH7QyUO/qIYLMLXezlX0SBgsSveZgfiBK +jHbfrIvIUw5rZzNKFXrmgefHLJl8xDdg/8HL0SoPjxkmopr5VMos2j5SQdnTHCbD+tR Pd8R/X0dpNCzmXGlgSWKuYlbCBDIG+jfT3HRPSitsADPfoln8iILIldoHgfM8DdT83+Q ercIvcdibHE4oACxyIA1etgk9jc0UM7YizJteIVaAinJwcl+vwUO+lWwKA2Tcfhv4spj X0XQ== X-Gm-Message-State: ALoCoQkkR0XSE7n7Z/STGX0xt/2DG5L/3WHlzNvT2ezgX17R8nGwI9xO6M3UBC88RRnf3tsmcJ9R X-Received: by 10.236.35.33 with SMTP id t21mr3905296yha.11.1398429802007; Fri, 25 Apr 2014 05:43:22 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.28.137 with SMTP id 9ls1543450qgz.14.gmail; Fri, 25 Apr 2014 05:43:21 -0700 (PDT) X-Received: by 10.58.230.103 with SMTP id sx7mr1415986vec.28.1398429801886; Fri, 25 Apr 2014 05:43:21 -0700 (PDT) Received: from mail-ve0-x230.google.com (mail-ve0-x230.google.com [2607:f8b0:400c:c01::230]) by mx.google.com with ESMTPS id xx5si1673626vcb.72.2014.04.25.05.43.21 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 25 Apr 2014 05:43:21 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=2607:f8b0:400c:c01::230; Received: by mail-ve0-f176.google.com with SMTP id db11so4519849veb.21 for ; Fri, 25 Apr 2014 05:43:21 -0700 (PDT) X-Received: by 10.58.23.6 with SMTP id i6mr6663802vef.12.1398429801807; Fri, 25 Apr 2014 05:43:21 -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.220.221.72 with SMTP id ib8csp94868vcb; Fri, 25 Apr 2014 05:43:21 -0700 (PDT) X-Received: by 10.140.98.233 with SMTP id o96mr10528985qge.86.1398429801482; Fri, 25 Apr 2014 05:43:21 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id p8si3736735qag.214.2014.04.25.05.43.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Apr 2014 05:43:21 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) 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 1WdfRY-0000zj-Gs; Fri, 25 Apr 2014 12:41:28 +0000 Received: from pandora.arm.linux.org.uk ([2001:4d48:ad52:3201:214:fdff:fe10:1be6]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wdej6-0005sD-EL for linux-arm-kernel@lists.infradead.org; Fri, 25 Apr 2014 11:55:33 +0000 Received: from e0022681537dd.dyn.arm.linux.org.uk ([2001:4d48:ad52:3201:222:68ff:fe15:37dd]:37612 helo=rmk-PC.arm.linux.org.uk) by pandora.arm.linux.org.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1Wdeil-00023G-8W for linux-arm-kernel@lists.infradead.org; Fri, 25 Apr 2014 12:55:11 +0100 Received: from rmk by rmk-PC.arm.linux.org.uk with local (Exim 4.76) (envelope-from ) id 1Wdeik-0007Pm-HL for linux-arm-kernel@lists.infradead.org; Fri, 25 Apr 2014 12:55:10 +0100 In-Reply-To: <20140425112951.GK26756@n2100.arm.linux.org.uk> References: <20140425112951.GK26756@n2100.arm.linux.org.uk> From: Russell King To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 181/222] ARM: l2c: omap2+: get rid of redundant cache replacement policy setting Message-Id: Date: Fri, 25 Apr 2014 12:55:10 +0100 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140425_045532_904811_05C413AA X-CRM114-Status: GOOD ( 12.36 ) X-Spam-Score: -0.8 (/) X-Spam-Report: SpamAssassin version 3.3.2 on bombadil.infradead.org summary: Content analysis details: (-0.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Original-Sender: rmk@arm.linux.org.uk X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=neutral (body hash did not verify) header.i=@arm.linux.org.uk Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Sekhar Nori To: linux-arm-kernel@lists.infradead.org L2 cache initialization for OMAP4 redundantly sets the cache policy to Round-Robin. This is not needed since thats the PL310 default anyway. Removing this reduces the number of platform specific aux control settings. Signed-off-by: Sekhar Nori Acked-by: Santosh Shilimkar Signed-off-by: Russell King --- arch/arm/mach-omap2/omap4-common.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c index df3f53195c57..6927d5b120fe 100644 --- a/arch/arm/mach-omap2/omap4-common.c +++ b/arch/arm/mach-omap2/omap4-common.c @@ -213,16 +213,15 @@ static int __init omap_l2_cache_init(void) return -ENOMEM; /* 16-way associativity, parity disabled, way size - 64KB (es2.0 +) */ - aux_ctrl = L310_AUX_CTRL_CACHE_REPLACE_RR | - L2C_AUX_CTRL_SHARED_OVERRIDE | + aux_ctrl = L2C_AUX_CTRL_SHARED_OVERRIDE | L310_AUX_CTRL_DATA_PREFETCH | L310_AUX_CTRL_INSTR_PREFETCH; outer_cache.write_sec = omap4_l2c310_write_sec; if (of_have_populated_dt()) - l2x0_of_init(aux_ctrl, 0xcd9fffff); + l2x0_of_init(aux_ctrl, 0xcf9fffff); else - l2x0_init(l2cache_base, aux_ctrl, 0xcd9fffff); + l2x0_init(l2cache_base, aux_ctrl, 0xcf9fffff); return 0; }