From patchwork Wed Sep 24 08:27:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 4962571 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E50EC9F32B for ; Wed, 24 Sep 2014 08:29:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 121F32010C for ; Wed, 24 Sep 2014 08:29:56 +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 E26C4200D5 for ; Wed, 24 Sep 2014 08:29:54 +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 1XWhvL-0004oj-4g; Wed, 24 Sep 2014 08:27:43 +0000 Received: from mailout4.w1.samsung.com ([210.118.77.14]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XWhvI-0004ZA-As for linux-arm-kernel@lists.infradead.org; Wed, 24 Sep 2014 08:27:40 +0000 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NCE00GKXCY50F30@mailout4.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Wed, 24 Sep 2014 09:30:05 +0100 (BST) X-AuditID: cbfec7f4-b7f156d0000063c7-02-542280640cbe Received: from eusync3.samsung.com ( [203.254.199.213]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id F6.A1.25543.46082245; Wed, 24 Sep 2014 09:27:16 +0100 (BST) Received: from AMDC1943.digital.local ([106.116.151.171]) by eusync3.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0NCE00G8BCTC3N60@eusync3.samsung.com>; Wed, 24 Sep 2014 09:27:16 +0100 (BST) From: Krzysztof Kozlowski To: Russell King , Will Deacon , "David A. Long" , Mark Rutland , Vinayak Kale , Laura Abbott , Krzysztof Kozlowski , Nicolas Pitre , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] ARM: cacheflush: Fix v7_exit_coherency_flush exynos build breakage on ARMv6 Date: Wed, 24 Sep 2014 10:27:02 +0200 Message-id: <1411547222-677-1-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprPLMWRmVeSWpSXmKPExsVy+t/xq7opDUohBu1v1S02zljPajH14RM2 i497FrBZvH5haNG74CqbxdmmN+wW2ztnsFtsenyN1eLyrjlsFrcv81qsPXKX3WLp9YtMFp+e /WO3WLXrD6PFvGen2SxefjzB4iDg8XH9J0aPNfPWMHq0NPeweVzu62Xy2DnrLrvHplWdbB53 ru1h89i8pN6jb8sqRo/Pm+QCuKK4bFJSczLLUov07RK4Mk6+/8tc8Jm34urpmewNjJe5uxg5 OCQETCTebfHqYuQEMsUkLtxbzwZiCwksZZT4ui28i5ELyO5jkni56CczSIJNwFhi8/IlbCAJ EYEWZol758+CdTALNDFJTNnHC2ILCyRKbJyzlwXEZhFQldg2ZQkLyDJeAVeJ3p36EMvkJE4e m8w6gZF7ASPDKkbR1NLkguKk9FxDveLE3OLSvHS95PzcTYyQQP2yg3HxMatDjAIcjEo8vBPE lUKEWBPLiitzDzFKcDArifCeKAUK8aYkVlalFuXHF5XmpBYfYmTi4JRqYKzl37nuAsfDKSln zrpvSpbyEYvb5GwTtWPaavEFseoWCQosPlO//fOWq7q/g7lktcdD9QNlcTPb/+dYla8K3BHw vvfOWT/vKU+5n83mtU7yYXxeHGP4b/ania+d6zYn1VW/n5DcUfWhc5rPtOu7bVbPudLHsUzh qqPEpCjmU4d5Lwhu0RRNaVFiKc5INNRiLipOBACD/6g0MgIAAA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140924_012740_517837_AE23CE7F X-CRM114-Status: GOOD ( 11.17 ) X-Spam-Score: -5.7 (-----) Cc: Kukjin Kim , Bartlomiej Zolnierkiewicz , Tomasz Figa , Kyungmin Park , Mark Brown , Marek Szyprowski X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 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.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, 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 This fixes build breakage of platsmp.c if ARMv6 was chosen for compile time options (e.g. by building allmodconfig): $ make allmodconfig $ make CC arch/arm/mach-exynos/platsmp.o /tmp/ccdQM0Eg.s: Assembler messages: /tmp/ccdQM0Eg.s:432: Error: selected processor does not support ARM mode `isb ' /tmp/ccdQM0Eg.s:437: Error: selected processor does not support ARM mode `isb ' /tmp/ccdQM0Eg.s:438: Error: selected processor does not support ARM mode `dsb ' make[1]: *** [arch/arm/mach-exynos/platsmp.o] Error 1 The error was introduced in commit "ARM: EXYNOS: Move code from hotplug.c to platsmp.c". Previously code using v7_exit_coherency_flush() macro was built with '-march=armv7-a' flag but this flag dissapeared during the movement. Fix this by annotating the v7_exit_coherency_flush() asm code with armv7-a architecture. Signed-off-by: Krzysztof Kozlowski Reported-by: Mark Brown Link: http://www.spinics.net/lists/linux-samsung-soc/msg36790.html Acked-by: Nicolas Pitre Acked-by: Kukjin Kim --- Changes since v1: 1. Use armv7-a arch annotation instead replacing isb/dsb with macros. Suggsted by Nicolas Pitre. --- arch/arm/include/asm/cacheflush.h | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h index 79ecb4f34ffb..10e78d00a0bb 100644 --- a/arch/arm/include/asm/cacheflush.h +++ b/arch/arm/include/asm/cacheflush.h @@ -466,6 +466,7 @@ static inline void __sync_cache_range_r(volatile void *p, size_t size) */ #define v7_exit_coherency_flush(level) \ asm volatile( \ + ".arch armv7-a \n\t" \ "stmfd sp!, {fp, ip} \n\t" \ "mrc p15, 0, r0, c1, c0, 0 @ get SCTLR \n\t" \ "bic r0, r0, #"__stringify(CR_C)" \n\t" \