From patchwork Wed Dec 14 11:39:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Martin X-Patchwork-Id: 5686 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 5112A23E18 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 48115A18062 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.204.156.208 with SMTP id y16mr523048bkw.72.1323862802098; Wed, 14 Dec 2011 03:40:02 -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 hg2cs5892bkc; Wed, 14 Dec 2011 03:40:01 -0800 (PST) Received: by 10.213.27.81 with SMTP id h17mr558438ebc.99.1323862801654; Wed, 14 Dec 2011 03:40:01 -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 i50si1569624eei.128.2011.12.14.03.40.00 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 14 Dec 2011 03:40:01 -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 q24so1235119faa.37 for ; Wed, 14 Dec 2011 03:40:00 -0800 (PST) Received: by 10.180.4.42 with SMTP id h10mr3857211wih.22.1323862800855; Wed, 14 Dec 2011 03:40:00 -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.58 (version=SSLv3 cipher=OTHER); Wed, 14 Dec 2011 03:40:00 -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 4/5] highbank: Unconditionally require l2x0 L2 cache controller support Date: Wed, 14 Dec 2011 11:39:40 +0000 Message-Id: <1323862781-3465-5-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 Highbank SoC. 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: Rob Herring --- arch/arm/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index d33eb39..744296d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -340,12 +340,12 @@ config ARCH_HIGHBANK select ARM_AMBA select ARM_GIC select ARM_TIMER_SP804 + select CACHE_L2X0 select CLKDEV_LOOKUP select CPU_V7 select GENERIC_CLOCKEVENTS select HAVE_ARM_SCU select HAVE_SMP - select MIGHT_HAVE_CACHE_L2X0 select USE_OF help Support for the Calxeda Highbank SoC based boards.