From patchwork Wed Dec 14 11:39:39 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Martin X-Patchwork-Id: 5687 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 7649123E33 for ; Wed, 14 Dec 2011 11:40:02 +0000 (UTC) Received: from mail-ey0-f180.google.com (mail-ey0-f180.google.com [209.85.215.180]) by fiordland.canonical.com (Postfix) with ESMTP id 6D7E9A18056 for ; Wed, 14 Dec 2011 11:40:02 +0000 (UTC) Received: by mail-ey0-f180.google.com with SMTP id k10so399892eaa.11 for ; Wed, 14 Dec 2011 03:40:02 -0800 (PST) Received: by 10.205.129.137 with SMTP id hi9mr526373bkc.90.1323862801051; Wed, 14 Dec 2011 03:40:01 -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.205.129.2 with SMTP id hg2cs5890bkc; Wed, 14 Dec 2011 03:40:00 -0800 (PST) Received: by 10.180.109.106 with SMTP id hr10mr3725931wib.62.1323862799543; Wed, 14 Dec 2011 03:39:59 -0800 (PST) Received: from mail-ww0-f42.google.com (mail-ww0-f42.google.com [74.125.82.42]) by mx.google.com with ESMTPS id c4si1187493wed.114.2011.12.14.03.39.58 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 14 Dec 2011 03:39:59 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.42 is neither permitted nor denied by best guess record for domain of dave.martin@linaro.org) client-ip=74.125.82.42; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.42 is neither permitted nor denied by best guess record for domain of dave.martin@linaro.org) smtp.mail=dave.martin@linaro.org Received: by wgbds13 with SMTP id ds13so1257309wgb.1 for ; Wed, 14 Dec 2011 03:39:58 -0800 (PST) Received: by 10.180.103.170 with SMTP id fx10mr3762722wib.56.1323862798728; Wed, 14 Dec 2011 03:39:58 -0800 (PST) Received: from e103592.peterhouse.linaro.org (fw-lnat.cambridge.arm.com. [217.140.96.63]) by mx.google.com with ESMTPS id k5sm3012382wiz.9.2011.12.14.03.39.56 (version=SSLv3 cipher=OTHER); Wed, 14 Dec 2011 03:39:58 -0800 (PST) From: Dave Martin To: linux-arm-kernel@lists.infradead.org Cc: patches@linaro.org, Anton Vorontsov , Barry Song , Catalin Marinas , Colin Cross , Haojian Zhuang , John Linn , Kukjin Kim , Linus Walleij , linux-omap@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-sh@vger.kernel.org, linux-tegra@vger.kernel.org, Magnus Damm , Paul Mundt , Pawel Moll , Rob Herring , Sascha Hauer , Shawn Guo , Tony Lindgren , Will Deacon Subject: [PATCH v4 REPOST 3/5] omap4: Unconditionally require l2x0 L2 cache controller support Date: Wed, 14 Dec 2011 11:39:39 +0000 Message-Id: <1323862781-3465-4-git-send-email-dave.martin@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1323862781-3465-1-git-send-email-dave.martin@linaro.org> References: <1323862781-3465-1-git-send-email-dave.martin@linaro.org> If running in the Normal World on a TrustZone-enabled SoC, Linux does not have complete control over the L2 cache controller configuration. The kernel cannot work reliably on such platforms without the l2x0 cache support code built in. This patch unconditionally enables l2x0 support for the OMAP4 SoCs. Thanks to Rob Herring for this suggestion. [1] Signed-off-by: Dave Martin [1] http://lists.infradead.org/pipermail/linux-arm-kernel/2011-November/074495.html Acked-by: Tony Lindgren --- arch/arm/mach-omap2/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index bb1b670..94e568a 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -41,11 +41,11 @@ config ARCH_OMAP4 bool "TI OMAP4" default y depends on ARCH_OMAP2PLUS + select CACHE_L2X0 select CPU_V7 select ARM_GIC select HAVE_SMP select LOCAL_TIMERS if SMP - select MIGHT_HAVE_CACHE_L2X0 select PL310_ERRATA_588369 select PL310_ERRATA_727915 select ARM_ERRATA_720789