From patchwork Fri Dec 16 16:35:30 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Martin X-Patchwork-Id: 5826 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 601D323E18 for ; Fri, 16 Dec 2011 16:35:51 +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 55190A18507 for ; Fri, 16 Dec 2011 16:35:51 +0000 (UTC) Received: by mail-ey0-f180.google.com with SMTP id k10so3835963eaa.11 for ; Fri, 16 Dec 2011 08:35:51 -0800 (PST) Received: by 10.205.120.135 with SMTP id fy7mr3228991bkc.54.1324053349761; Fri, 16 Dec 2011 08:35:49 -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.204.41.207 with SMTP id p15cs10387bke; Fri, 16 Dec 2011 08:35:49 -0800 (PST) Received: by 10.14.189.8 with SMTP id b8mr3315610een.130.1324053346238; Fri, 16 Dec 2011 08:35:46 -0800 (PST) Received: from mail-fx0-f50.google.com (mail-fx0-f50.google.com [209.85.161.50]) by mx.google.com with ESMTPS id w45si7940455eef.126.2011.12.16.08.35.45 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 16 Dec 2011 08:35:46 -0800 (PST) Received-SPF: neutral (google.com: 209.85.161.50 is neither permitted nor denied by best guess record for domain of dave.martin@linaro.org) client-ip=209.85.161.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.161.50 is neither permitted nor denied by best guess record for domain of dave.martin@linaro.org) smtp.mail=dave.martin@linaro.org Received: by mail-fx0-f50.google.com with SMTP id q24so3644944faa.37 for ; Fri, 16 Dec 2011 08:35:45 -0800 (PST) Received: by 10.180.102.4 with SMTP id fk4mr13687416wib.15.1324053345516; Fri, 16 Dec 2011 08:35:45 -0800 (PST) Received: from e103592.peterhouse.linaro.org (fw-lnat.cambridge.arm.com. [217.140.96.63]) by mx.google.com with ESMTPS id p2sm15137647wbh.22.2011.12.16.08.35.44 (version=SSLv3 cipher=OTHER); Fri, 16 Dec 2011 08:35:44 -0800 (PST) From: Dave Martin To: linux-arm-kernel@lists.infradead.org Cc: patches@linaro.org, Tony Lindgren , linux-omap@vger.kernel.org Subject: [PATCH v5 REPOST 3/5] omap4: Unconditionally require l2x0 L2 cache controller support Date: Fri, 16 Dec 2011 16:35:30 +0000 Message-Id: <1324053332-6431-4-git-send-email-dave.martin@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1324053332-6431-1-git-send-email-dave.martin@linaro.org> References: <1324053332-6431-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] [1] http://lists.infradead.org/pipermail/linux-arm-kernel/2011-November/074495.html Signed-off-by: Dave Martin 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