From patchwork Tue Nov 22 02:45:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mans Rullgard X-Patchwork-Id: 5258 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 7FBC123FFD for ; Tue, 22 Nov 2011 02:47:48 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 7679AA1850A for ; Tue, 22 Nov 2011 02:47:48 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id a26so11780478faa.11 for ; Mon, 21 Nov 2011 18:47:48 -0800 (PST) Received: by 10.152.111.170 with SMTP id ij10mr7412025lab.5.1321930068323; Mon, 21 Nov 2011 18:47:48 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.41.198 with SMTP id h6cs157253lal; Mon, 21 Nov 2011 18:47:48 -0800 (PST) Received: by 10.216.177.67 with SMTP id c45mr820167wem.0.1321930064721; Mon, 21 Nov 2011 18:47:44 -0800 (PST) Received: from unicorn.mansr.com (unicorn.mansr.com. [78.86.181.103]) by mx.google.com with ESMTP id er14si5729612wbb.83.2011.11.21.18.47.43; Mon, 21 Nov 2011 18:47:44 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of mru@mansr.com designates 78.86.181.103 as permitted sender) client-ip=78.86.181.103; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of mru@mansr.com designates 78.86.181.103 as permitted sender) smtp.mail=mru@mansr.com Received: by unicorn.mansr.com (Postfix, from userid 51770) id 1748E4B82; Tue, 22 Nov 2011 02:47:43 +0000 (GMT) From: Mans Rullgard To: andy.green@linaro.org Cc: linaro-dev@lists.linaro.org, patches@linaro.org Subject: [PATCH 2/5] OMAP4: enable double linefill on 4460 Date: Tue, 22 Nov 2011 02:45:50 +0000 Message-Id: <1321929953-5956-3-git-send-email-mans.rullgard@linaro.org> X-Mailer: git-send-email 1.7.7.4 In-Reply-To: <1321929953-5956-1-git-send-email-mans.rullgard@linaro.org> References: <1321929953-5956-1-git-send-email-mans.rullgard@linaro.org> Re-enable the PL310 double linefill feature on 4460, disabled in 285d2c4, without setting the "reserved" bit 25 of the prefetch control register. Benchmarking shows no measurable difference with and without this bit set. Signed-off-by: Mans Rullgard --- arch/arm/mach-omap2/omap4-common.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c index e0120d5..03b13e3 100644 --- a/arch/arm/mach-omap2/omap4-common.c +++ b/arch/arm/mach-omap2/omap4-common.c @@ -175,16 +175,14 @@ static int __init omap_l2_cache_init(void) /* Setup POR Control register */ por_ctrl = readl_relaxed(l2cache_base + L2X0_PREFETCH_CTRL); -#if 0 + /* * Double linefill is available only on OMAP4460 L2X0. - * Undocumented bit 25 is set for better performance. */ if (cpu_is_omap446x()) - por_ctrl |= ((1 << L2X0_PREFETCH_DATA_PREFETCH_SHIFT) | - (1 << L2X0_PREFETCH_DOUBLE_LINEFILL_SHIFT) | - (1 << 25)); -#endif + por_ctrl |= (1 << L2X0_PREFETCH_DATA_PREFETCH_SHIFT) | + (1 << L2X0_PREFETCH_DOUBLE_LINEFILL_SHIFT); + if (cpu_is_omap446x() || (omap_rev() >= OMAP4430_REV_ES2_2)) { por_ctrl |= L2X0_POR_OFFSET_VALUE; omap_smc1(0x113, por_ctrl);