From patchwork Mon Apr 28 19:33:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell King X-Patchwork-Id: 29273 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f70.google.com (mail-qa0-f70.google.com [209.85.216.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A378920B8D for ; Mon, 28 Apr 2014 19:33:46 +0000 (UTC) Received: by mail-qa0-f70.google.com with SMTP id dc16sf9671104qab.5 for ; Mon, 28 Apr 2014 12:33: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:mime-version:delivered-to:in-reply-to:references :from:to:cc:subject:message-id:date:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=mUhGoS8y0qUBjzVCERKa0xtJlYMivf5nbZmyvHy2QRw=; b=mjccNutf8yjLwz0+z/VVRl/TAy+4XaYYqGDjemvMlX7/xVf4q224ajubdqW2HH8gJF 1kObCUeRffTnXscJsd6gXG6S9sDMH1Ie5o4coPxTqyXeZtSuqyMV2Nt/TbZ2NOP72J6r NpT1oW0iItNy5AkARPufRNkEJiYMyBTEhHVvFvG+aQ8KsdNUjPKHNDmmO5Cu/H8+gZQ0 qZotKxq4KACS/+NbrHWbCZm4GcfHaslNp65zwcAx4Nqo54fnZfunT9om/TemN3AeJEuY xE0v0tPeUQ6EjdlX4ja21Iybca56zG0IZim77/Cch5d7d1ZBNDO3NDY1zDNjOnPFO8Ep JQSw== X-Gm-Message-State: ALoCoQl7jS8wNE5yRBm0VlIBFSTLpDBcqofFxMqZroeHBh1Whw5TaUA2kdpVBq6Hl01r6DdLwamd X-Received: by 10.58.46.240 with SMTP id y16mr13593575vem.2.1398713626210; Mon, 28 Apr 2014 12:33:46 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.85.229 with SMTP id n92ls1279079qgd.9.gmail; Mon, 28 Apr 2014 12:33:45 -0700 (PDT) X-Received: by 10.221.19.196 with SMTP id ql4mr23339vcb.64.1398713625883; Mon, 28 Apr 2014 12:33:45 -0700 (PDT) Received: from mail-vc0-x230.google.com (mail-vc0-x230.google.com [2607:f8b0:400c:c03::230]) by mx.google.com with ESMTPS id b7si3894975vev.94.2014.04.28.12.33.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 28 Apr 2014 12:33:45 -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:c03::230; Received: by mail-vc0-f176.google.com with SMTP id lc6so8753988vcb.35 for ; Mon, 28 Apr 2014 12:33:45 -0700 (PDT) X-Received: by 10.52.175.166 with SMTP id cb6mr21234500vdc.1.1398713625788; Mon, 28 Apr 2014 12:33:45 -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 ib8csp141619vcb; Mon, 28 Apr 2014 12:33:45 -0700 (PDT) X-Received: by 10.68.166.36 with SMTP id zd4mr31260233pbb.54.1398713623944; Mon, 28 Apr 2014 12:33:43 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bn5si11084470pbb.409.2014.04.28.12.33.43; Mon, 28 Apr 2014 12:33:43 -0700 (PDT) Received-SPF: none (google.com: linux-omap-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932931AbaD1Tdk (ORCPT + 6 others); Mon, 28 Apr 2014 15:33:40 -0400 Received: from gw-1.arm.linux.org.uk ([78.32.30.217]:55848 "EHLO pandora.arm.linux.org.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932433AbaD1Tdi (ORCPT ); Mon, 28 Apr 2014 15:33:38 -0400 Received: from e0022681537dd.dyn.arm.linux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:35662 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 1WerJ2-0008HA-Ug; Mon, 28 Apr 2014 20:33:37 +0100 Received: from rmk by rmk-PC.arm.linux.org.uk with local (Exim 4.76) (envelope-from ) id 1WerJ2-0001Zc-HI; Mon, 28 Apr 2014 20:33:36 +0100 In-Reply-To: <20140428192419.GV26756@n2100.arm.linux.org.uk> References: <20140428192419.GV26756@n2100.arm.linux.org.uk> From: Russell King To: linux-arm-kernel@lists.ifradead.org Cc: Tony Lindgren , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 87/97] ARM: l2c: omap2+: get rid of redundant cache replacement policy setting Message-Id: Date: Mon, 28 Apr 2014 20:33:36 +0100 Sender: linux-omap-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-omap@vger.kernel.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 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Sekhar Nori To: linux-arm-kernel@lists.ifradead.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; }