From patchwork Thu Dec 8 12:37:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Martin X-Patchwork-Id: 5538 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 AE59023E04 for ; Thu, 8 Dec 2011 12:38:05 +0000 (UTC) Received: from mail-bw0-f52.google.com (mail-bw0-f52.google.com [209.85.214.52]) by fiordland.canonical.com (Postfix) with ESMTP id 9425DA181B2 for ; Thu, 8 Dec 2011 12:38:05 +0000 (UTC) Received: by bke17 with SMTP id 17so2158180bke.11 for ; Thu, 08 Dec 2011 04:38:05 -0800 (PST) Received: by 10.204.152.87 with SMTP id f23mr1345774bkw.18.1323347885215; Thu, 08 Dec 2011 04:38:05 -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 hg2cs92546bkc; Thu, 8 Dec 2011 04:38:04 -0800 (PST) Received: by 10.180.105.232 with SMTP id gp8mr4947477wib.65.1323347883395; Thu, 08 Dec 2011 04:38:03 -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 l9si3859636wiy.82.2011.12.08.04.38.02 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 08 Dec 2011 04:38:03 -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 faaq24 with SMTP id q24so413727faa.37 for ; Thu, 08 Dec 2011 04:38:02 -0800 (PST) Received: by 10.180.92.169 with SMTP id cn9mr4896888wib.62.1323347882529; Thu, 08 Dec 2011 04:38:02 -0800 (PST) Received: from e103592.peterhouse.linaro.org (fw-lnat.cambridge.arm.com. [217.140.96.63]) by mx.google.com with ESMTPS id gd6sm8486330wbb.1.2011.12.08.04.38.01 (version=SSLv3 cipher=OTHER); Thu, 08 Dec 2011 04:38:01 -0800 (PST) From: Dave Martin To: patches@arm.linux.org.uk Cc: patches@linaro.org, Dave Martin Subject: [PATCH] ARM: errata: Remove SMP dependency for erratum 720789 Date: Thu, 8 Dec 2011 12:37:46 +0000 Message-Id: <1323347866-29493-1-git-send-email-dave.martin@linaro.org> X-Mailer: git-send-email 1.7.4.1 Activation conditions for a workaround should not be encoded in the workaround's direct dependencies if this makes otherwise reasonable configuration choices impossible. The workaround for erratum 720789 only affects a code path which is not active in UP kernels; hence it should be safe to turn on in UP kernels, without penalty. This patch simply removes the extra dependency on SMP from Kconfig. This means that configs for buggy silicon can simply select ARM_ERRATA_720789, without preventing a UP kernel from being built or duplicatiing knowledge about when to activate the workaround. Signed-off-by: Dave Martin Acked-by: Will Deacon --- KernelVersion: v3.2-rc3 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 44789ef..31bbad3 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1245,7 +1245,7 @@ config PL310_ERRATA_588369 config ARM_ERRATA_720789 bool "ARM errata: TLBIASIDIS and TLBIMVAIS operations can broadcast a faulty ASID" - depends on CPU_V7 && SMP + depends on CPU_V7 help This option enables the workaround for the 720789 Cortex-A9 (prior to r2p0) erratum. A faulty ASID can be sent to the other CPUs for the