From patchwork Tue Nov 22 02:45:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mans Rullgard X-Patchwork-Id: 5257 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 69DE023E14 for ; Tue, 22 Nov 2011 02:47:48 +0000 (UTC) Received: from mail-lpp01m010-f52.google.com (mail-lpp01m010-f52.google.com [209.85.215.52]) by fiordland.canonical.com (Postfix) with ESMTP id 4F731A18500 for ; Tue, 22 Nov 2011 02:47:48 +0000 (UTC) Received: by laah2 with SMTP id h2so186678laa.11 for ; Mon, 21 Nov 2011 18:47:48 -0800 (PST) Received: by 10.152.104.1 with SMTP id ga1mr10453402lab.40.1321930067987; Mon, 21 Nov 2011 18:47:47 -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 h6cs157252lal; Mon, 21 Nov 2011 18:47:47 -0800 (PST) Received: by 10.216.135.91 with SMTP id t69mr2689023wei.63.1321930064575; 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 n40si5751199weq.2.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 15B17149B1; 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 1/5] OMAP4: apply L2 cache lockdown workaround only on 4460 ES1.0 Date: Tue, 22 Nov 2011 02:45:49 +0000 Message-Id: <1321929953-5956-2-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> The issue addressed by this workaround is fixed in ES1.1. Signed-off-by: Mans Rullgard --- arch/arm/mach-omap2/omap4-common.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c index 5df70fb..e0120d5 100644 --- a/arch/arm/mach-omap2/omap4-common.c +++ b/arch/arm/mach-omap2/omap4-common.c @@ -190,25 +190,17 @@ static int __init omap_l2_cache_init(void) omap_smc1(0x113, por_ctrl); } - if (cpu_is_omap446x()) { - writel_relaxed(0xa5a5, l2cache_base + 0x900); - writel_relaxed(0xa5a5, l2cache_base + 0x908); - writel_relaxed(0xa5a5, l2cache_base + 0x904); - writel_relaxed(0xa5a5, l2cache_base + 0x90C); - } - /* - * FIXME: Temporary WA for OMAP4460 stability issue. + * Workaround for OMAP4460 ES1.0 stability issue. * Lock-down specific L2 cache ways which makes effective * L2 size as 512 KB instead of 1 MB */ - if (cpu_is_omap446x()) { + if (omap_rev() == OMAP4460_REV_ES1_0) { lockdown = 0xa5a5; writel_relaxed(lockdown, l2cache_base + L2X0_LOCKDOWN_WAY_D0); writel_relaxed(lockdown, l2cache_base + L2X0_LOCKDOWN_WAY_D1); writel_relaxed(lockdown, l2cache_base + L2X0_LOCKDOWN_WAY_I0); writel_relaxed(lockdown, l2cache_base + L2X0_LOCKDOWN_WAY_I1); - goto skip_aux_por_api; } skip_aux_por_api: