From patchwork Mon May 26 09:01:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Bolle X-Patchwork-Id: 4240641 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 54E89BF90B for ; Mon, 26 May 2014 09:04:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 76BC0201D3 for ; Mon, 26 May 2014 09:03:59 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 99F1A2018B for ; Mon, 26 May 2014 09:03:58 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Woqmp-0005xs-8T; Mon, 26 May 2014 09:01:39 +0000 Received: from cpsmtpb-ews06.kpnxchange.com ([213.75.39.9]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Woqmm-0005xB-29 for linux-arm-kernel@lists.infradead.org; Mon, 26 May 2014 09:01:38 +0000 Received: from cpsps-ews03.kpnxchange.com ([10.94.84.170]) by cpsmtpb-ews06.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Mon, 26 May 2014 11:01:12 +0200 Received: from CPSMTPM-TLF102.kpnxchange.com ([195.121.3.5]) by cpsps-ews03.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Mon, 26 May 2014 11:01:12 +0200 Received: from [192.168.10.106] ([195.240.213.44]) by CPSMTPM-TLF102.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Mon, 26 May 2014 11:01:11 +0200 Message-ID: <1401094871.25902.20.camel@x220> Subject: [PATCH] ARM: mvebu: rename ARM_ERRATA_753970 From: Paul Bolle To: Jason Cooper , Andrew Lunn , Gregory CLEMENT , Sebastian Hesselbarth , Russell King Date: Mon, 26 May 2014 11:01:11 +0200 In-Reply-To: <1396805315.7723.8.camel@x220> References: <201404052101.19381.arnd@arndb.de> <201404052104.11363.arnd@arndb.de> <1396777049.30640.9.camel@x220> <53418889.2050002@free-electrons.com> <1396805315.7723.8.camel@x220> X-Mailer: Evolution 3.10.4 (3.10.4-2.fc20) Mime-Version: 1.0 X-OriginalArrivalTime: 26 May 2014 09:01:11.0986 (UTC) FILETIME=[0AA85920:01CF78C1] X-RcptDomain: lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140526_020136_436981_D679F495 X-CRM114-Status: GOOD ( 11.98 ) X-Spam-Score: 0.0 (/) Cc: Thomas Petazzoni , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP ARM_ERRATA_753970 was renamed to PL310_ERRATA_753970 in v3.2, through commit fa0ce4035d48 ("ARM: 7162/1: errata: tidy up Kconfig options for PL310 errata workarounds"). Two selects were added in v3.15-rc1 that still use the previous name. Rename these. Make these statements depend on CACHE_PL310, like all other selects of PL310_ERRATA_753970. That way it will only be selected if its dependency is met. Signed-off-by: Paul Bolle --- I reported this before v3.15-rc1. I don't know whether any fixes are pending. None are in linux-next. And ignoring an errata were one apparently could be needed sounds, well, scary. Perhaps it is not. Anyhow, to make sure this gets fixed, hopefully before v3.15, I'm submitting this (untested!) patch. A related observation. There are three PL310 errata options: one depends on CACHE_PL310, three depend on CACHE_L2X0. The one depending on CACHE_PL310 is selected only if CACHE_PL310 is set. But the three depending on CACHE_L2X0 are selected a few times if CACHE_L2X0 is set, in other cases if CACHE_PL310 is set, and in some cases always. There may be good reasons for this, but it looks odd. I know nothing about the PL310 cache and its erratas, so I haven't looked into this any further. arch/arm/mach-mvebu/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 3f73eecbcfb0..501d0f42e7b2 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -35,7 +35,7 @@ config MACH_ARMADA_370 config MACH_ARMADA_375 bool "Marvell Armada 375 boards" if ARCH_MULTI_V7 select ARM_ERRATA_720789 - select ARM_ERRATA_753970 + select PL310_ERRATA_753970 if CACHE_PL310 select ARM_GIC select ARMADA_375_CLK select CPU_V7 @@ -48,7 +48,7 @@ config MACH_ARMADA_375 config MACH_ARMADA_38X bool "Marvell Armada 380/385 boards" if ARCH_MULTI_V7 select ARM_ERRATA_720789 - select ARM_ERRATA_753970 + select PL310_ERRATA_753970 if CACHE_PL310 select ARM_GIC select ARMADA_38X_CLK select CPU_V7