All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v3 1/4] ARM: use arch_extension directive instead of arch argument
@ 2019-04-11  7:54 ` Stefan Agner
  0 siblings, 0 replies; 18+ messages in thread
From: Stefan Agner @ 2019-04-11  7:54 UTC (permalink / raw)
  To: arm
  Cc: linux, arnd, ard.biesheuvel, robin.murphy, nicolas.pitre,
	f.fainelli, rjui, sbranden, bcm-kernel-feedback-list, kgene,
	krzk, robh, ssantosh, jason, andrew, gregory.clement,
	sebastian.hesselbarth, tony, marc.w.gonzalez, mans, ndesaulniers,
	linux-arm-kernel, linux-kernel, Stefan Agner

The LLVM Target parser currently does not allow to specify the security
extension as part of -march (see also LLVM Bug 40186 [0]). When trying
to use Clang with LLVM's integrated assembler, this leads to build
errors such as this:
  clang-8: error: the clang compiler does not support '-Wa,-march=armv7-a+sec'

Use ".arch_extension sec" to enable the security extension in a more
portable fasion. Also make sure to use ".arch armv7-a" in case a v6/v7
multi-platform kernel is being built.

Note that this is technically not exactly the same as the old code
checked for availabilty of the security extension by calling as-instr.
However, there are already other sites which use ".arch_extension sec"
unconditionally, hence de-facto we need an assembler capable of
".arch_extension sec" already today (arch/arm/mm/proc-v7.S). The
arch extension "sec" is available since binutils 2.21 according to
its documentation [1].

[0] https://bugs.llvm.org/show_bug.cgi?id=40186
[1] https://sourceware.org/binutils/docs-2.21/as/ARM-Options.html

Signed-off-by: Stefan Agner <stefan@agner.ch>
Acked-by: Mans Rullgard <mans@mansr.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Krzysztof Kozlowski <krzk@kernel.org>
---
Changes since v1:
- Explicitly specify assembler architecture as armv7-a to avoid
  build issues when bulding v6/v7 multi arch kernel.

Changes since v2:
- Add armv7-a also in mach-tango
- Move .arch armv7-a outside of ifdef'ed area in sleep44xx.S
  to make the kernel compile also without CONFIG_SMP/PM.

 arch/arm/mach-bcm/Makefile         | 3 ---
 arch/arm/mach-bcm/bcm_kona_smc.c   | 2 --
 arch/arm/mach-exynos/Makefile      | 4 ----
 arch/arm/mach-exynos/exynos-smc.S  | 3 ++-
 arch/arm/mach-exynos/sleep.S       | 3 ++-
 arch/arm/mach-highbank/Makefile    | 3 ---
 arch/arm/mach-highbank/smc.S       | 3 ++-
 arch/arm/mach-keystone/Makefile    | 3 ---
 arch/arm/mach-keystone/smc.S       | 1 +
 arch/arm/mach-omap2/Makefile       | 8 --------
 arch/arm/mach-omap2/omap-headsmp.S | 2 ++
 arch/arm/mach-omap2/omap-smc.S     | 3 ++-
 arch/arm/mach-omap2/sleep33xx.S    | 1 +
 arch/arm/mach-omap2/sleep34xx.S    | 2 ++
 arch/arm/mach-omap2/sleep43xx.S    | 2 ++
 arch/arm/mach-omap2/sleep44xx.S    | 3 +++
 arch/arm/mach-tango/Makefile       | 3 ---
 arch/arm/mach-tango/smc.S          | 2 ++
 18 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/arch/arm/mach-bcm/Makefile b/arch/arm/mach-bcm/Makefile
index 8fd23b263c60..b59c813b1af4 100644
--- a/arch/arm/mach-bcm/Makefile
+++ b/arch/arm/mach-bcm/Makefile
@@ -40,9 +40,6 @@ obj-$(CONFIG_ARCH_BCM_MOBILE_L2_CACHE) += kona_l2_cache.o
 
 # Support for secure monitor traps
 obj-$(CONFIG_ARCH_BCM_MOBILE_SMC) += bcm_kona_smc.o
-ifeq ($(call as-instr,.arch_extension sec,as_has_sec),as_has_sec)
-CFLAGS_bcm_kona_smc.o		+= -Wa,-march=armv7-a+sec -DREQUIRES_SEC
-endif
 
 # BCM2835
 obj-$(CONFIG_ARCH_BCM2835)	+= board_bcm2835.o
diff --git a/arch/arm/mach-bcm/bcm_kona_smc.c b/arch/arm/mach-bcm/bcm_kona_smc.c
index a55a7ecf146a..541e850a736c 100644
--- a/arch/arm/mach-bcm/bcm_kona_smc.c
+++ b/arch/arm/mach-bcm/bcm_kona_smc.c
@@ -125,9 +125,7 @@ static int bcm_kona_do_smc(u32 service_id, u32 buffer_phys)
 		__asmeq("%2", "r4")
 		__asmeq("%3", "r5")
 		__asmeq("%4", "r6")
-#ifdef REQUIRES_SEC
 		".arch_extension sec\n"
-#endif
 		"	smc    #0\n"
 		: "=r" (ip), "=r" (r0)
 		: "r" (r4), "r" (r5), "r" (r6)
diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile
index cd00c82a1add..44de9f36fd1b 100644
--- a/arch/arm/mach-exynos/Makefile
+++ b/arch/arm/mach-exynos/Makefile
@@ -14,9 +14,5 @@ obj-$(CONFIG_PM_SLEEP)		+= suspend.o
 
 obj-$(CONFIG_SMP)		+= platsmp.o headsmp.o
 
-plus_sec := $(call as-instr,.arch_extension sec,+sec)
-AFLAGS_exynos-smc.o		:=-Wa,-march=armv7-a$(plus_sec)
-AFLAGS_sleep.o			:=-Wa,-march=armv7-a$(plus_sec)
-
 obj-$(CONFIG_EXYNOS5420_MCPM)	+= mcpm-exynos.o
 CFLAGS_mcpm-exynos.o		+= -march=armv7-a
diff --git a/arch/arm/mach-exynos/exynos-smc.S b/arch/arm/mach-exynos/exynos-smc.S
index d259532ba937..6da31e6a7acb 100644
--- a/arch/arm/mach-exynos/exynos-smc.S
+++ b/arch/arm/mach-exynos/exynos-smc.S
@@ -10,7 +10,8 @@
 /*
  * Function signature: void exynos_smc(u32 cmd, u32 arg1, u32 arg2, u32 arg3)
  */
-
+	.arch armv7-a
+	.arch_extension sec
 ENTRY(exynos_smc)
 	stmfd	sp!, {r4-r11, lr}
 	dsb
diff --git a/arch/arm/mach-exynos/sleep.S b/arch/arm/mach-exynos/sleep.S
index 2783c3a0c06a..ed93f91853b8 100644
--- a/arch/arm/mach-exynos/sleep.S
+++ b/arch/arm/mach-exynos/sleep.S
@@ -44,7 +44,8 @@ ENTRY(exynos_cpu_resume)
 ENDPROC(exynos_cpu_resume)
 
 	.align
-
+	.arch armv7-a
+	.arch_extension sec
 ENTRY(exynos_cpu_resume_ns)
 	mrc	p15, 0, r0, c0, c0, 0
 	ldr	r1, =CPU_MASK
diff --git a/arch/arm/mach-highbank/Makefile b/arch/arm/mach-highbank/Makefile
index 55840f414d3e..e7741b883d13 100644
--- a/arch/arm/mach-highbank/Makefile
+++ b/arch/arm/mach-highbank/Makefile
@@ -1,6 +1,3 @@
 obj-y					:= highbank.o system.o smc.o
 
-plus_sec := $(call as-instr,.arch_extension sec,+sec)
-AFLAGS_smc.o				:=-Wa,-march=armv7-a$(plus_sec)
-
 obj-$(CONFIG_PM_SLEEP)			+= pm.o
diff --git a/arch/arm/mach-highbank/smc.S b/arch/arm/mach-highbank/smc.S
index 407d17baaaa9..860a79135b7b 100644
--- a/arch/arm/mach-highbank/smc.S
+++ b/arch/arm/mach-highbank/smc.S
@@ -16,7 +16,8 @@
  * the monitor API number.
  * Function signature : void highbank_smc1(u32 fn, u32 arg)
  */
-
+	.arch armv7-a
+	.arch_extension sec
 ENTRY(highbank_smc1)
 	stmfd   sp!, {r4-r11, lr}
 	mov	r12, r0
diff --git a/arch/arm/mach-keystone/Makefile b/arch/arm/mach-keystone/Makefile
index f8b0dccac8dc..739b38be5696 100644
--- a/arch/arm/mach-keystone/Makefile
+++ b/arch/arm/mach-keystone/Makefile
@@ -1,9 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 obj-y					:= keystone.o smc.o
 
-plus_sec := $(call as-instr,.arch_extension sec,+sec)
-AFLAGS_smc.o				:=-Wa,-march=armv7-a$(plus_sec)
-
 obj-$(CONFIG_SMP)			+= platsmp.o
 
 # PM domain driver for Keystone SOCs
diff --git a/arch/arm/mach-keystone/smc.S b/arch/arm/mach-keystone/smc.S
index d15de8179fab..ec03dc499270 100644
--- a/arch/arm/mach-keystone/smc.S
+++ b/arch/arm/mach-keystone/smc.S
@@ -21,6 +21,7 @@
  *
  * Return: Non zero value on failure
  */
+	.arch_extension sec
 ENTRY(keystone_cpu_smc)
 	stmfd   sp!, {r4-r11, lr}
 	smc	#0
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 85d1b13c9215..f1d283995b31 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -41,11 +41,6 @@ obj-$(CONFIG_SOC_OMAP5)			+= $(omap-4-5-common) $(smp-y) sleep44xx.o
 obj-$(CONFIG_SOC_AM43XX)		+= $(omap-4-5-common)
 obj-$(CONFIG_SOC_DRA7XX)		+= $(omap-4-5-common) $(smp-y) sleep44xx.o
 
-plus_sec := $(call as-instr,.arch_extension sec,+sec)
-AFLAGS_omap-headsmp.o			:=-Wa,-march=armv7-a$(plus_sec)
-AFLAGS_omap-smc.o			:=-Wa,-march=armv7-a$(plus_sec)
-AFLAGS_sleep44xx.o			:=-Wa,-march=armv7-a$(plus_sec)
-
 # Functions loaded to SRAM
 obj-$(CONFIG_SOC_OMAP2420)		+= sram242x.o
 obj-$(CONFIG_SOC_OMAP2430)		+= sram243x.o
@@ -95,9 +90,6 @@ obj-$(CONFIG_POWER_AVS_OMAP)		+= sr_device.o
 obj-$(CONFIG_POWER_AVS_OMAP_CLASS3)    += smartreflex-class3.o
 
 AFLAGS_sleep24xx.o			:=-Wa,-march=armv6
-AFLAGS_sleep34xx.o			:=-Wa,-march=armv7-a$(plus_sec)
-AFLAGS_sleep33xx.o			:=-Wa,-march=armv7-a$(plus_sec)
-AFLAGS_sleep43xx.o			:=-Wa,-march=armv7-a$(plus_sec)
 
 endif
 
diff --git a/arch/arm/mach-omap2/omap-headsmp.S b/arch/arm/mach-omap2/omap-headsmp.S
index 4c6f14cf92a8..b26c0daaa3c1 100644
--- a/arch/arm/mach-omap2/omap-headsmp.S
+++ b/arch/arm/mach-omap2/omap-headsmp.S
@@ -58,6 +58,8 @@ ENDPROC(omap5_secondary_startup)
  * omap5_secondary_startup if the primary CPU was put into HYP mode by
  * the boot loader.
  */
+	.arch armv7-a
+	.arch_extension sec
 ENTRY(omap5_secondary_hyp_startup)
 wait_2:	ldr	r2, =AUX_CORE_BOOT0_PA	@ read from AuxCoreBoot0
 	ldr	r0, [r2]
diff --git a/arch/arm/mach-omap2/omap-smc.S b/arch/arm/mach-omap2/omap-smc.S
index 72506e6cf9e7..a14aee5e81d1 100644
--- a/arch/arm/mach-omap2/omap-smc.S
+++ b/arch/arm/mach-omap2/omap-smc.S
@@ -23,7 +23,8 @@
  * link register "lr".
  * Function signature : void omap_smc1(u32 fn, u32 arg)
  */
-
+	.arch armv7-a
+	.arch_extension sec
 ENTRY(omap_smc1)
 	stmfd   sp!, {r2-r12, lr}
 	mov	r12, r0
diff --git a/arch/arm/mach-omap2/sleep33xx.S b/arch/arm/mach-omap2/sleep33xx.S
index 47a816468cdb..68fee339d3f1 100644
--- a/arch/arm/mach-omap2/sleep33xx.S
+++ b/arch/arm/mach-omap2/sleep33xx.S
@@ -24,6 +24,7 @@
 #define BIT(nr)			(1 << (nr))
 
 	.arm
+	.arch armv7-a
 	.align 3
 
 ENTRY(am33xx_do_wfi)
diff --git a/arch/arm/mach-omap2/sleep34xx.S b/arch/arm/mach-omap2/sleep34xx.S
index 22daf4efed68..4927304b5902 100644
--- a/arch/arm/mach-omap2/sleep34xx.S
+++ b/arch/arm/mach-omap2/sleep34xx.S
@@ -97,6 +97,8 @@ ENDPROC(enable_omap3630_toggle_l2_on_restore)
  *
  * r0 = physical address of the parameters
  */
+	.arch armv7-a
+	.arch_extension sec
 ENTRY(save_secure_ram_context)
 	stmfd	sp!, {r4 - r11, lr}	@ save registers on stack
 	mov	r3, r0			@ physical address of parameters
diff --git a/arch/arm/mach-omap2/sleep43xx.S b/arch/arm/mach-omap2/sleep43xx.S
index 5b9343b58fc7..31dda92d9d03 100644
--- a/arch/arm/mach-omap2/sleep43xx.S
+++ b/arch/arm/mach-omap2/sleep43xx.S
@@ -56,6 +56,8 @@
 #define RTC_PMIC_EXT_WAKEUP_EN				BIT(0)
 
 	.arm
+	.arch armv7-a
+	.arch_extension sec
 	.align 3
 
 ENTRY(am43xx_do_wfi)
diff --git a/arch/arm/mach-omap2/sleep44xx.S b/arch/arm/mach-omap2/sleep44xx.S
index 0cae3b070208..fb559d3de1f2 100644
--- a/arch/arm/mach-omap2/sleep44xx.S
+++ b/arch/arm/mach-omap2/sleep44xx.S
@@ -21,8 +21,11 @@
 #include "omap44xx.h"
 #include "omap4-sar-layout.h"
 
+	.arch armv7-a
+
 #if defined(CONFIG_SMP) && defined(CONFIG_PM)
 
+	.arch_extension sec
 .macro	DO_SMC
 	dsb
 	smc	#0
diff --git a/arch/arm/mach-tango/Makefile b/arch/arm/mach-tango/Makefile
index da6c633d3cc0..97cd04508fa1 100644
--- a/arch/arm/mach-tango/Makefile
+++ b/arch/arm/mach-tango/Makefile
@@ -1,7 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0
-plus_sec := $(call as-instr,.arch_extension sec,+sec)
-AFLAGS_smc.o := -Wa,-march=armv7-a$(plus_sec)
-
 obj-y += setup.o smc.o
 obj-$(CONFIG_SMP) += platsmp.o
 obj-$(CONFIG_SUSPEND) += pm.o
diff --git a/arch/arm/mach-tango/smc.S b/arch/arm/mach-tango/smc.S
index 361a8dc89804..b1752aaa72bc 100644
--- a/arch/arm/mach-tango/smc.S
+++ b/arch/arm/mach-tango/smc.S
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 
+	.arch armv7-a
+	.arch_extension sec
 ENTRY(tango_smc)
 	push	{lr}
 	mov	ip, r1
-- 
2.21.0


^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH v3 1/4] ARM: use arch_extension directive instead of arch argument
@ 2019-04-11  7:54 ` Stefan Agner
  0 siblings, 0 replies; 18+ messages in thread
From: Stefan Agner @ 2019-04-11  7:54 UTC (permalink / raw)
  To: arm
  Cc: nicolas.pitre, andrew, mans, tony, Stefan Agner, robh,
	f.fainelli, gregory.clement, linux, krzk, kgene,
	bcm-kernel-feedback-list, sebastian.hesselbarth, jason, arnd,
	marc.w.gonzalez, rjui, ssantosh, linux-arm-kernel, sbranden,
	ard.biesheuvel, ndesaulniers, linux-kernel, robin.murphy

The LLVM Target parser currently does not allow to specify the security
extension as part of -march (see also LLVM Bug 40186 [0]). When trying
to use Clang with LLVM's integrated assembler, this leads to build
errors such as this:
  clang-8: error: the clang compiler does not support '-Wa,-march=armv7-a+sec'

Use ".arch_extension sec" to enable the security extension in a more
portable fasion. Also make sure to use ".arch armv7-a" in case a v6/v7
multi-platform kernel is being built.

Note that this is technically not exactly the same as the old code
checked for availabilty of the security extension by calling as-instr.
However, there are already other sites which use ".arch_extension sec"
unconditionally, hence de-facto we need an assembler capable of
".arch_extension sec" already today (arch/arm/mm/proc-v7.S). The
arch extension "sec" is available since binutils 2.21 according to
its documentation [1].

[0] https://bugs.llvm.org/show_bug.cgi?id=40186
[1] https://sourceware.org/binutils/docs-2.21/as/ARM-Options.html

Signed-off-by: Stefan Agner <stefan@agner.ch>
Acked-by: Mans Rullgard <mans@mansr.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Krzysztof Kozlowski <krzk@kernel.org>
---
Changes since v1:
- Explicitly specify assembler architecture as armv7-a to avoid
  build issues when bulding v6/v7 multi arch kernel.

Changes since v2:
- Add armv7-a also in mach-tango
- Move .arch armv7-a outside of ifdef'ed area in sleep44xx.S
  to make the kernel compile also without CONFIG_SMP/PM.

 arch/arm/mach-bcm/Makefile         | 3 ---
 arch/arm/mach-bcm/bcm_kona_smc.c   | 2 --
 arch/arm/mach-exynos/Makefile      | 4 ----
 arch/arm/mach-exynos/exynos-smc.S  | 3 ++-
 arch/arm/mach-exynos/sleep.S       | 3 ++-
 arch/arm/mach-highbank/Makefile    | 3 ---
 arch/arm/mach-highbank/smc.S       | 3 ++-
 arch/arm/mach-keystone/Makefile    | 3 ---
 arch/arm/mach-keystone/smc.S       | 1 +
 arch/arm/mach-omap2/Makefile       | 8 --------
 arch/arm/mach-omap2/omap-headsmp.S | 2 ++
 arch/arm/mach-omap2/omap-smc.S     | 3 ++-
 arch/arm/mach-omap2/sleep33xx.S    | 1 +
 arch/arm/mach-omap2/sleep34xx.S    | 2 ++
 arch/arm/mach-omap2/sleep43xx.S    | 2 ++
 arch/arm/mach-omap2/sleep44xx.S    | 3 +++
 arch/arm/mach-tango/Makefile       | 3 ---
 arch/arm/mach-tango/smc.S          | 2 ++
 18 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/arch/arm/mach-bcm/Makefile b/arch/arm/mach-bcm/Makefile
index 8fd23b263c60..b59c813b1af4 100644
--- a/arch/arm/mach-bcm/Makefile
+++ b/arch/arm/mach-bcm/Makefile
@@ -40,9 +40,6 @@ obj-$(CONFIG_ARCH_BCM_MOBILE_L2_CACHE) += kona_l2_cache.o
 
 # Support for secure monitor traps
 obj-$(CONFIG_ARCH_BCM_MOBILE_SMC) += bcm_kona_smc.o
-ifeq ($(call as-instr,.arch_extension sec,as_has_sec),as_has_sec)
-CFLAGS_bcm_kona_smc.o		+= -Wa,-march=armv7-a+sec -DREQUIRES_SEC
-endif
 
 # BCM2835
 obj-$(CONFIG_ARCH_BCM2835)	+= board_bcm2835.o
diff --git a/arch/arm/mach-bcm/bcm_kona_smc.c b/arch/arm/mach-bcm/bcm_kona_smc.c
index a55a7ecf146a..541e850a736c 100644
--- a/arch/arm/mach-bcm/bcm_kona_smc.c
+++ b/arch/arm/mach-bcm/bcm_kona_smc.c
@@ -125,9 +125,7 @@ static int bcm_kona_do_smc(u32 service_id, u32 buffer_phys)
 		__asmeq("%2", "r4")
 		__asmeq("%3", "r5")
 		__asmeq("%4", "r6")
-#ifdef REQUIRES_SEC
 		".arch_extension sec\n"
-#endif
 		"	smc    #0\n"
 		: "=r" (ip), "=r" (r0)
 		: "r" (r4), "r" (r5), "r" (r6)
diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile
index cd00c82a1add..44de9f36fd1b 100644
--- a/arch/arm/mach-exynos/Makefile
+++ b/arch/arm/mach-exynos/Makefile
@@ -14,9 +14,5 @@ obj-$(CONFIG_PM_SLEEP)		+= suspend.o
 
 obj-$(CONFIG_SMP)		+= platsmp.o headsmp.o
 
-plus_sec := $(call as-instr,.arch_extension sec,+sec)
-AFLAGS_exynos-smc.o		:=-Wa,-march=armv7-a$(plus_sec)
-AFLAGS_sleep.o			:=-Wa,-march=armv7-a$(plus_sec)
-
 obj-$(CONFIG_EXYNOS5420_MCPM)	+= mcpm-exynos.o
 CFLAGS_mcpm-exynos.o		+= -march=armv7-a
diff --git a/arch/arm/mach-exynos/exynos-smc.S b/arch/arm/mach-exynos/exynos-smc.S
index d259532ba937..6da31e6a7acb 100644
--- a/arch/arm/mach-exynos/exynos-smc.S
+++ b/arch/arm/mach-exynos/exynos-smc.S
@@ -10,7 +10,8 @@
 /*
  * Function signature: void exynos_smc(u32 cmd, u32 arg1, u32 arg2, u32 arg3)
  */
-
+	.arch armv7-a
+	.arch_extension sec
 ENTRY(exynos_smc)
 	stmfd	sp!, {r4-r11, lr}
 	dsb
diff --git a/arch/arm/mach-exynos/sleep.S b/arch/arm/mach-exynos/sleep.S
index 2783c3a0c06a..ed93f91853b8 100644
--- a/arch/arm/mach-exynos/sleep.S
+++ b/arch/arm/mach-exynos/sleep.S
@@ -44,7 +44,8 @@ ENTRY(exynos_cpu_resume)
 ENDPROC(exynos_cpu_resume)
 
 	.align
-
+	.arch armv7-a
+	.arch_extension sec
 ENTRY(exynos_cpu_resume_ns)
 	mrc	p15, 0, r0, c0, c0, 0
 	ldr	r1, =CPU_MASK
diff --git a/arch/arm/mach-highbank/Makefile b/arch/arm/mach-highbank/Makefile
index 55840f414d3e..e7741b883d13 100644
--- a/arch/arm/mach-highbank/Makefile
+++ b/arch/arm/mach-highbank/Makefile
@@ -1,6 +1,3 @@
 obj-y					:= highbank.o system.o smc.o
 
-plus_sec := $(call as-instr,.arch_extension sec,+sec)
-AFLAGS_smc.o				:=-Wa,-march=armv7-a$(plus_sec)
-
 obj-$(CONFIG_PM_SLEEP)			+= pm.o
diff --git a/arch/arm/mach-highbank/smc.S b/arch/arm/mach-highbank/smc.S
index 407d17baaaa9..860a79135b7b 100644
--- a/arch/arm/mach-highbank/smc.S
+++ b/arch/arm/mach-highbank/smc.S
@@ -16,7 +16,8 @@
  * the monitor API number.
  * Function signature : void highbank_smc1(u32 fn, u32 arg)
  */
-
+	.arch armv7-a
+	.arch_extension sec
 ENTRY(highbank_smc1)
 	stmfd   sp!, {r4-r11, lr}
 	mov	r12, r0
diff --git a/arch/arm/mach-keystone/Makefile b/arch/arm/mach-keystone/Makefile
index f8b0dccac8dc..739b38be5696 100644
--- a/arch/arm/mach-keystone/Makefile
+++ b/arch/arm/mach-keystone/Makefile
@@ -1,9 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 obj-y					:= keystone.o smc.o
 
-plus_sec := $(call as-instr,.arch_extension sec,+sec)
-AFLAGS_smc.o				:=-Wa,-march=armv7-a$(plus_sec)
-
 obj-$(CONFIG_SMP)			+= platsmp.o
 
 # PM domain driver for Keystone SOCs
diff --git a/arch/arm/mach-keystone/smc.S b/arch/arm/mach-keystone/smc.S
index d15de8179fab..ec03dc499270 100644
--- a/arch/arm/mach-keystone/smc.S
+++ b/arch/arm/mach-keystone/smc.S
@@ -21,6 +21,7 @@
  *
  * Return: Non zero value on failure
  */
+	.arch_extension sec
 ENTRY(keystone_cpu_smc)
 	stmfd   sp!, {r4-r11, lr}
 	smc	#0
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 85d1b13c9215..f1d283995b31 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -41,11 +41,6 @@ obj-$(CONFIG_SOC_OMAP5)			+= $(omap-4-5-common) $(smp-y) sleep44xx.o
 obj-$(CONFIG_SOC_AM43XX)		+= $(omap-4-5-common)
 obj-$(CONFIG_SOC_DRA7XX)		+= $(omap-4-5-common) $(smp-y) sleep44xx.o
 
-plus_sec := $(call as-instr,.arch_extension sec,+sec)
-AFLAGS_omap-headsmp.o			:=-Wa,-march=armv7-a$(plus_sec)
-AFLAGS_omap-smc.o			:=-Wa,-march=armv7-a$(plus_sec)
-AFLAGS_sleep44xx.o			:=-Wa,-march=armv7-a$(plus_sec)
-
 # Functions loaded to SRAM
 obj-$(CONFIG_SOC_OMAP2420)		+= sram242x.o
 obj-$(CONFIG_SOC_OMAP2430)		+= sram243x.o
@@ -95,9 +90,6 @@ obj-$(CONFIG_POWER_AVS_OMAP)		+= sr_device.o
 obj-$(CONFIG_POWER_AVS_OMAP_CLASS3)    += smartreflex-class3.o
 
 AFLAGS_sleep24xx.o			:=-Wa,-march=armv6
-AFLAGS_sleep34xx.o			:=-Wa,-march=armv7-a$(plus_sec)
-AFLAGS_sleep33xx.o			:=-Wa,-march=armv7-a$(plus_sec)
-AFLAGS_sleep43xx.o			:=-Wa,-march=armv7-a$(plus_sec)
 
 endif
 
diff --git a/arch/arm/mach-omap2/omap-headsmp.S b/arch/arm/mach-omap2/omap-headsmp.S
index 4c6f14cf92a8..b26c0daaa3c1 100644
--- a/arch/arm/mach-omap2/omap-headsmp.S
+++ b/arch/arm/mach-omap2/omap-headsmp.S
@@ -58,6 +58,8 @@ ENDPROC(omap5_secondary_startup)
  * omap5_secondary_startup if the primary CPU was put into HYP mode by
  * the boot loader.
  */
+	.arch armv7-a
+	.arch_extension sec
 ENTRY(omap5_secondary_hyp_startup)
 wait_2:	ldr	r2, =AUX_CORE_BOOT0_PA	@ read from AuxCoreBoot0
 	ldr	r0, [r2]
diff --git a/arch/arm/mach-omap2/omap-smc.S b/arch/arm/mach-omap2/omap-smc.S
index 72506e6cf9e7..a14aee5e81d1 100644
--- a/arch/arm/mach-omap2/omap-smc.S
+++ b/arch/arm/mach-omap2/omap-smc.S
@@ -23,7 +23,8 @@
  * link register "lr".
  * Function signature : void omap_smc1(u32 fn, u32 arg)
  */
-
+	.arch armv7-a
+	.arch_extension sec
 ENTRY(omap_smc1)
 	stmfd   sp!, {r2-r12, lr}
 	mov	r12, r0
diff --git a/arch/arm/mach-omap2/sleep33xx.S b/arch/arm/mach-omap2/sleep33xx.S
index 47a816468cdb..68fee339d3f1 100644
--- a/arch/arm/mach-omap2/sleep33xx.S
+++ b/arch/arm/mach-omap2/sleep33xx.S
@@ -24,6 +24,7 @@
 #define BIT(nr)			(1 << (nr))
 
 	.arm
+	.arch armv7-a
 	.align 3
 
 ENTRY(am33xx_do_wfi)
diff --git a/arch/arm/mach-omap2/sleep34xx.S b/arch/arm/mach-omap2/sleep34xx.S
index 22daf4efed68..4927304b5902 100644
--- a/arch/arm/mach-omap2/sleep34xx.S
+++ b/arch/arm/mach-omap2/sleep34xx.S
@@ -97,6 +97,8 @@ ENDPROC(enable_omap3630_toggle_l2_on_restore)
  *
  * r0 = physical address of the parameters
  */
+	.arch armv7-a
+	.arch_extension sec
 ENTRY(save_secure_ram_context)
 	stmfd	sp!, {r4 - r11, lr}	@ save registers on stack
 	mov	r3, r0			@ physical address of parameters
diff --git a/arch/arm/mach-omap2/sleep43xx.S b/arch/arm/mach-omap2/sleep43xx.S
index 5b9343b58fc7..31dda92d9d03 100644
--- a/arch/arm/mach-omap2/sleep43xx.S
+++ b/arch/arm/mach-omap2/sleep43xx.S
@@ -56,6 +56,8 @@
 #define RTC_PMIC_EXT_WAKEUP_EN				BIT(0)
 
 	.arm
+	.arch armv7-a
+	.arch_extension sec
 	.align 3
 
 ENTRY(am43xx_do_wfi)
diff --git a/arch/arm/mach-omap2/sleep44xx.S b/arch/arm/mach-omap2/sleep44xx.S
index 0cae3b070208..fb559d3de1f2 100644
--- a/arch/arm/mach-omap2/sleep44xx.S
+++ b/arch/arm/mach-omap2/sleep44xx.S
@@ -21,8 +21,11 @@
 #include "omap44xx.h"
 #include "omap4-sar-layout.h"
 
+	.arch armv7-a
+
 #if defined(CONFIG_SMP) && defined(CONFIG_PM)
 
+	.arch_extension sec
 .macro	DO_SMC
 	dsb
 	smc	#0
diff --git a/arch/arm/mach-tango/Makefile b/arch/arm/mach-tango/Makefile
index da6c633d3cc0..97cd04508fa1 100644
--- a/arch/arm/mach-tango/Makefile
+++ b/arch/arm/mach-tango/Makefile
@@ -1,7 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0
-plus_sec := $(call as-instr,.arch_extension sec,+sec)
-AFLAGS_smc.o := -Wa,-march=armv7-a$(plus_sec)
-
 obj-y += setup.o smc.o
 obj-$(CONFIG_SMP) += platsmp.o
 obj-$(CONFIG_SUSPEND) += pm.o
diff --git a/arch/arm/mach-tango/smc.S b/arch/arm/mach-tango/smc.S
index 361a8dc89804..b1752aaa72bc 100644
--- a/arch/arm/mach-tango/smc.S
+++ b/arch/arm/mach-tango/smc.S
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 
+	.arch armv7-a
+	.arch_extension sec
 ENTRY(tango_smc)
 	push	{lr}
 	mov	ip, r1
-- 
2.21.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH v3 2/4] ARM: OMAP2: drop explicit assembler architecture
  2019-04-11  7:54 ` Stefan Agner
@ 2019-04-11  7:54   ` Stefan Agner
  -1 siblings, 0 replies; 18+ messages in thread
From: Stefan Agner @ 2019-04-11  7:54 UTC (permalink / raw)
  To: arm
  Cc: linux, arnd, ard.biesheuvel, robin.murphy, nicolas.pitre,
	f.fainelli, rjui, sbranden, bcm-kernel-feedback-list, kgene,
	krzk, robh, ssantosh, jason, andrew, gregory.clement,
	sebastian.hesselbarth, tony, marc.w.gonzalez, mans, ndesaulniers,
	linux-arm-kernel, linux-kernel, Stefan Agner

OMAP2 depends on ARCH_MULTI_V6, which makes sure that the kernel is
compiled with -march=armv6. The compiler frontend will pass the
architecture to the assembler. There is no explicit architecture
specification necessary.

Signed-off-by: Stefan Agner <stefan@agner.ch>
---
Changes since v2:
- New patch

 arch/arm/mach-omap2/Makefile | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index f1d283995b31..600650551621 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -45,9 +45,6 @@ obj-$(CONFIG_SOC_DRA7XX)		+= $(omap-4-5-common) $(smp-y) sleep44xx.o
 obj-$(CONFIG_SOC_OMAP2420)		+= sram242x.o
 obj-$(CONFIG_SOC_OMAP2430)		+= sram243x.o
 
-AFLAGS_sram242x.o			:=-Wa,-march=armv6
-AFLAGS_sram243x.o			:=-Wa,-march=armv6
-
 # Restart code (OMAP4/5 currently in omap4-common.c)
 obj-$(CONFIG_SOC_OMAP2420)		+= omap2-restart.o
 obj-$(CONFIG_SOC_OMAP2430)		+= omap2-restart.o
@@ -89,8 +86,6 @@ obj-$(CONFIG_PM_DEBUG)			+= pm-debug.o
 obj-$(CONFIG_POWER_AVS_OMAP)		+= sr_device.o
 obj-$(CONFIG_POWER_AVS_OMAP_CLASS3)    += smartreflex-class3.o
 
-AFLAGS_sleep24xx.o			:=-Wa,-march=armv6
-
 endif
 
 ifeq ($(CONFIG_CPU_IDLE),y)
-- 
2.21.0


^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH v3 2/4] ARM: OMAP2: drop explicit assembler architecture
@ 2019-04-11  7:54   ` Stefan Agner
  0 siblings, 0 replies; 18+ messages in thread
From: Stefan Agner @ 2019-04-11  7:54 UTC (permalink / raw)
  To: arm
  Cc: nicolas.pitre, andrew, mans, tony, Stefan Agner, robh,
	f.fainelli, gregory.clement, linux, krzk, kgene,
	bcm-kernel-feedback-list, sebastian.hesselbarth, jason, arnd,
	marc.w.gonzalez, rjui, ssantosh, linux-arm-kernel, sbranden,
	ard.biesheuvel, ndesaulniers, linux-kernel, robin.murphy

OMAP2 depends on ARCH_MULTI_V6, which makes sure that the kernel is
compiled with -march=armv6. The compiler frontend will pass the
architecture to the assembler. There is no explicit architecture
specification necessary.

Signed-off-by: Stefan Agner <stefan@agner.ch>
---
Changes since v2:
- New patch

 arch/arm/mach-omap2/Makefile | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index f1d283995b31..600650551621 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -45,9 +45,6 @@ obj-$(CONFIG_SOC_DRA7XX)		+= $(omap-4-5-common) $(smp-y) sleep44xx.o
 obj-$(CONFIG_SOC_OMAP2420)		+= sram242x.o
 obj-$(CONFIG_SOC_OMAP2430)		+= sram243x.o
 
-AFLAGS_sram242x.o			:=-Wa,-march=armv6
-AFLAGS_sram243x.o			:=-Wa,-march=armv6
-
 # Restart code (OMAP4/5 currently in omap4-common.c)
 obj-$(CONFIG_SOC_OMAP2420)		+= omap2-restart.o
 obj-$(CONFIG_SOC_OMAP2430)		+= omap2-restart.o
@@ -89,8 +86,6 @@ obj-$(CONFIG_PM_DEBUG)			+= pm-debug.o
 obj-$(CONFIG_POWER_AVS_OMAP)		+= sr_device.o
 obj-$(CONFIG_POWER_AVS_OMAP_CLASS3)    += smartreflex-class3.o
 
-AFLAGS_sleep24xx.o			:=-Wa,-march=armv6
-
 endif
 
 ifeq ($(CONFIG_CPU_IDLE),y)
-- 
2.21.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH v3 3/4] ARM: mvebu: drop unnecessary label
  2019-04-11  7:54 ` Stefan Agner
@ 2019-04-11  7:54   ` Stefan Agner
  -1 siblings, 0 replies; 18+ messages in thread
From: Stefan Agner @ 2019-04-11  7:54 UTC (permalink / raw)
  To: arm
  Cc: linux, arnd, ard.biesheuvel, robin.murphy, nicolas.pitre,
	f.fainelli, rjui, sbranden, bcm-kernel-feedback-list, kgene,
	krzk, robh, ssantosh, jason, andrew, gregory.clement,
	sebastian.hesselbarth, tony, marc.w.gonzalez, mans, ndesaulniers,
	linux-arm-kernel, linux-kernel, Stefan Agner, Nicolas Pitre

The label mvebu_boot_wa_start is not necessary and causes a build
issue when building with LLVM's integrated assembler:
    AS      arch/arm/mach-mvebu/pmsu_ll.o
  arch/arm/mach-mvebu/pmsu_ll.S:59:1: error: invalid symbol redefinition
  mvebu_boot_wa_start:
  ^

Drop the label.

Signed-off-by: Stefan Agner <stefan@agner.ch>
Acked-by: Nicolas Pitre <nico@fluxnic.net>
---
 arch/arm/mach-mvebu/pmsu_ll.S | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/mach-mvebu/pmsu_ll.S b/arch/arm/mach-mvebu/pmsu_ll.S
index 88651221dbdd..c1fb713e9306 100644
--- a/arch/arm/mach-mvebu/pmsu_ll.S
+++ b/arch/arm/mach-mvebu/pmsu_ll.S
@@ -56,7 +56,6 @@ ENDPROC(armada_38x_cpu_resume)
 
 /* The following code will be executed from SRAM */
 ENTRY(mvebu_boot_wa_start)
-mvebu_boot_wa_start:
 ARM_BE8(setend	be)
 	adr	r0, 1f
 	ldr	r0, [r0]		@ load the address of the
-- 
2.21.0


^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH v3 3/4] ARM: mvebu: drop unnecessary label
@ 2019-04-11  7:54   ` Stefan Agner
  0 siblings, 0 replies; 18+ messages in thread
From: Stefan Agner @ 2019-04-11  7:54 UTC (permalink / raw)
  To: arm
  Cc: nicolas.pitre, andrew, mans, tony, Stefan Agner, robh,
	f.fainelli, gregory.clement, linux, krzk, kgene,
	bcm-kernel-feedback-list, sebastian.hesselbarth, jason, arnd,
	marc.w.gonzalez, rjui, ssantosh, linux-arm-kernel, sbranden,
	ard.biesheuvel, Nicolas Pitre, ndesaulniers, linux-kernel,
	robin.murphy

The label mvebu_boot_wa_start is not necessary and causes a build
issue when building with LLVM's integrated assembler:
    AS      arch/arm/mach-mvebu/pmsu_ll.o
  arch/arm/mach-mvebu/pmsu_ll.S:59:1: error: invalid symbol redefinition
  mvebu_boot_wa_start:
  ^

Drop the label.

Signed-off-by: Stefan Agner <stefan@agner.ch>
Acked-by: Nicolas Pitre <nico@fluxnic.net>
---
 arch/arm/mach-mvebu/pmsu_ll.S | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/mach-mvebu/pmsu_ll.S b/arch/arm/mach-mvebu/pmsu_ll.S
index 88651221dbdd..c1fb713e9306 100644
--- a/arch/arm/mach-mvebu/pmsu_ll.S
+++ b/arch/arm/mach-mvebu/pmsu_ll.S
@@ -56,7 +56,6 @@ ENDPROC(armada_38x_cpu_resume)
 
 /* The following code will be executed from SRAM */
 ENTRY(mvebu_boot_wa_start)
-mvebu_boot_wa_start:
 ARM_BE8(setend	be)
 	adr	r0, 1f
 	ldr	r0, [r0]		@ load the address of the
-- 
2.21.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH v3 4/4] ARM: mvebu: prefix coprocessor operand with p
  2019-04-11  7:54 ` Stefan Agner
@ 2019-04-11  7:54   ` Stefan Agner
  -1 siblings, 0 replies; 18+ messages in thread
From: Stefan Agner @ 2019-04-11  7:54 UTC (permalink / raw)
  To: arm
  Cc: linux, arnd, ard.biesheuvel, robin.murphy, nicolas.pitre,
	f.fainelli, rjui, sbranden, bcm-kernel-feedback-list, kgene,
	krzk, robh, ssantosh, jason, andrew, gregory.clement,
	sebastian.hesselbarth, tony, marc.w.gonzalez, mans, ndesaulniers,
	linux-arm-kernel, linux-kernel, Stefan Agner, Nicolas Pitre

In every other instance where mrc is used the coprocessor operand
is prefix with p (e.g. p15). Use the p prefix in this case too.
This fixes a build issue when using LLVM's integrated assembler:
  arch/arm/mach-mvebu/coherency_ll.S:69:6: error: invalid operand for instruction
   mrc 15, 0, r3, cr0, cr0, 5
       ^
  arch/arm/mach-mvebu/pmsu_ll.S:19:6: error: invalid operand for instruction
   mrc 15, 0, r0, cr0, cr0, 5 @ get the CPU ID
       ^

Signed-off-by: Stefan Agner <stefan@agner.ch>
Acked-by: Nicolas Pitre <nico@fluxnic.net>
---
 arch/arm/mach-mvebu/coherency_ll.S | 2 +-
 arch/arm/mach-mvebu/pmsu_ll.S      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-mvebu/coherency_ll.S b/arch/arm/mach-mvebu/coherency_ll.S
index 8b2fbc8b6bc6..2d962fe48821 100644
--- a/arch/arm/mach-mvebu/coherency_ll.S
+++ b/arch/arm/mach-mvebu/coherency_ll.S
@@ -66,7 +66,7 @@ ENDPROC(ll_get_coherency_base)
  * fabric registers
  */
 ENTRY(ll_get_coherency_cpumask)
-	mrc	15, 0, r3, cr0, cr0, 5
+	mrc	p15, 0, r3, cr0, cr0, 5
 	and	r3, r3, #15
 	mov	r2, #(1 << 24)
 	lsl	r3, r2, r3
diff --git a/arch/arm/mach-mvebu/pmsu_ll.S b/arch/arm/mach-mvebu/pmsu_ll.S
index c1fb713e9306..7aae9a25cfeb 100644
--- a/arch/arm/mach-mvebu/pmsu_ll.S
+++ b/arch/arm/mach-mvebu/pmsu_ll.S
@@ -16,7 +16,7 @@
 ENTRY(armada_38x_scu_power_up)
 	mrc     p15, 4, r1, c15, c0	@ get SCU base address
 	orr	r1, r1, #0x8		@ SCU CPU Power Status Register
-	mrc	15, 0, r0, cr0, cr0, 5	@ get the CPU ID
+	mrc	p15, 0, r0, cr0, cr0, 5	@ get the CPU ID
 	and	r0, r0, #15
 	add	r1, r1, r0
 	mov	r0, #0x0
-- 
2.21.0


^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH v3 4/4] ARM: mvebu: prefix coprocessor operand with p
@ 2019-04-11  7:54   ` Stefan Agner
  0 siblings, 0 replies; 18+ messages in thread
From: Stefan Agner @ 2019-04-11  7:54 UTC (permalink / raw)
  To: arm
  Cc: nicolas.pitre, andrew, mans, tony, Stefan Agner, robh,
	f.fainelli, gregory.clement, linux, krzk, kgene,
	bcm-kernel-feedback-list, sebastian.hesselbarth, jason, arnd,
	marc.w.gonzalez, rjui, ssantosh, linux-arm-kernel, sbranden,
	ard.biesheuvel, Nicolas Pitre, ndesaulniers, linux-kernel,
	robin.murphy

In every other instance where mrc is used the coprocessor operand
is prefix with p (e.g. p15). Use the p prefix in this case too.
This fixes a build issue when using LLVM's integrated assembler:
  arch/arm/mach-mvebu/coherency_ll.S:69:6: error: invalid operand for instruction
   mrc 15, 0, r3, cr0, cr0, 5
       ^
  arch/arm/mach-mvebu/pmsu_ll.S:19:6: error: invalid operand for instruction
   mrc 15, 0, r0, cr0, cr0, 5 @ get the CPU ID
       ^

Signed-off-by: Stefan Agner <stefan@agner.ch>
Acked-by: Nicolas Pitre <nico@fluxnic.net>
---
 arch/arm/mach-mvebu/coherency_ll.S | 2 +-
 arch/arm/mach-mvebu/pmsu_ll.S      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-mvebu/coherency_ll.S b/arch/arm/mach-mvebu/coherency_ll.S
index 8b2fbc8b6bc6..2d962fe48821 100644
--- a/arch/arm/mach-mvebu/coherency_ll.S
+++ b/arch/arm/mach-mvebu/coherency_ll.S
@@ -66,7 +66,7 @@ ENDPROC(ll_get_coherency_base)
  * fabric registers
  */
 ENTRY(ll_get_coherency_cpumask)
-	mrc	15, 0, r3, cr0, cr0, 5
+	mrc	p15, 0, r3, cr0, cr0, 5
 	and	r3, r3, #15
 	mov	r2, #(1 << 24)
 	lsl	r3, r2, r3
diff --git a/arch/arm/mach-mvebu/pmsu_ll.S b/arch/arm/mach-mvebu/pmsu_ll.S
index c1fb713e9306..7aae9a25cfeb 100644
--- a/arch/arm/mach-mvebu/pmsu_ll.S
+++ b/arch/arm/mach-mvebu/pmsu_ll.S
@@ -16,7 +16,7 @@
 ENTRY(armada_38x_scu_power_up)
 	mrc     p15, 4, r1, c15, c0	@ get SCU base address
 	orr	r1, r1, #0x8		@ SCU CPU Power Status Register
-	mrc	15, 0, r0, cr0, cr0, 5	@ get the CPU ID
+	mrc	p15, 0, r0, cr0, cr0, 5	@ get the CPU ID
 	and	r0, r0, #15
 	add	r1, r1, r0
 	mov	r0, #0x0
-- 
2.21.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 18+ messages in thread
* Re: [PATCH v3 4/4] ARM: mvebu: prefix coprocessor operand with p
  2019-04-11  7:54   ` Stefan Agner
@ 2019-04-21 17:22     ` Gregory CLEMENT
  -1 siblings, 0 replies; 18+ messages in thread
From: Gregory CLEMENT @ 2019-04-21 17:22 UTC (permalink / raw)
  To: Stefan Agner, arm
  Cc: linux, arnd, ard.biesheuvel, robin.murphy, nicolas.pitre,
	f.fainelli, rjui, sbranden, bcm-kernel-feedback-list, kgene,
	krzk, robh, ssantosh, jason, andrew, sebastian.hesselbarth, tony,
	marc.w.gonzalez, mans, ndesaulniers, linux-arm-kernel,
	linux-kernel, Stefan Agner, Nicolas Pitre

Hi Stefan,

> In every other instance where mrc is used the coprocessor operand
> is prefix with p (e.g. p15). Use the p prefix in this case too.
> This fixes a build issue when using LLVM's integrated assembler:
>   arch/arm/mach-mvebu/coherency_ll.S:69:6: error: invalid operand for instruction
>    mrc 15, 0, r3, cr0, cr0, 5
>        ^
>   arch/arm/mach-mvebu/pmsu_ll.S:19:6: error: invalid operand for instruction
>    mrc 15, 0, r0, cr0, cr0, 5 @ get the CPU ID
>        ^
>
> Signed-off-by: Stefan Agner <stefan@agner.ch>
> Acked-by: Nicolas Pitre <nico@fluxnic.net>

Applied on mvebu/arm, as well as the previous patch.

Thanks,

Gregory

> ---
>  arch/arm/mach-mvebu/coherency_ll.S | 2 +-
>  arch/arm/mach-mvebu/pmsu_ll.S      | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-mvebu/coherency_ll.S b/arch/arm/mach-mvebu/coherency_ll.S
> index 8b2fbc8b6bc6..2d962fe48821 100644
> --- a/arch/arm/mach-mvebu/coherency_ll.S
> +++ b/arch/arm/mach-mvebu/coherency_ll.S
> @@ -66,7 +66,7 @@ ENDPROC(ll_get_coherency_base)
>   * fabric registers
>   */
>  ENTRY(ll_get_coherency_cpumask)
> -	mrc	15, 0, r3, cr0, cr0, 5
> +	mrc	p15, 0, r3, cr0, cr0, 5
>  	and	r3, r3, #15
>  	mov	r2, #(1 << 24)
>  	lsl	r3, r2, r3
> diff --git a/arch/arm/mach-mvebu/pmsu_ll.S b/arch/arm/mach-mvebu/pmsu_ll.S
> index c1fb713e9306..7aae9a25cfeb 100644
> --- a/arch/arm/mach-mvebu/pmsu_ll.S
> +++ b/arch/arm/mach-mvebu/pmsu_ll.S
> @@ -16,7 +16,7 @@
>  ENTRY(armada_38x_scu_power_up)
>  	mrc     p15, 4, r1, c15, c0	@ get SCU base address
>  	orr	r1, r1, #0x8		@ SCU CPU Power Status Register
> -	mrc	15, 0, r0, cr0, cr0, 5	@ get the CPU ID
> +	mrc	p15, 0, r0, cr0, cr0, 5	@ get the CPU ID
>  	and	r0, r0, #15
>  	add	r1, r1, r0
>  	mov	r0, #0x0
> -- 
> 2.21.0
>

-- 
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com

^ permalink raw reply	[flat|nested] 18+ messages in thread
* Re: [PATCH v3 4/4] ARM: mvebu: prefix coprocessor operand with p
@ 2019-04-21 17:22     ` Gregory CLEMENT
  0 siblings, 0 replies; 18+ messages in thread
From: Gregory CLEMENT @ 2019-04-21 17:22 UTC (permalink / raw)
  To: Stefan Agner, arm
  Cc: nicolas.pitre, andrew, mans, tony, Stefan Agner, robh,
	f.fainelli, linux, krzk, kgene, bcm-kernel-feedback-list,
	sebastian.hesselbarth, jason, arnd, marc.w.gonzalez, rjui,
	ssantosh, linux-arm-kernel, sbranden, ard.biesheuvel,
	Nicolas Pitre, ndesaulniers, linux-kernel, robin.murphy

Hi Stefan,

> In every other instance where mrc is used the coprocessor operand
> is prefix with p (e.g. p15). Use the p prefix in this case too.
> This fixes a build issue when using LLVM's integrated assembler:
>   arch/arm/mach-mvebu/coherency_ll.S:69:6: error: invalid operand for instruction
>    mrc 15, 0, r3, cr0, cr0, 5
>        ^
>   arch/arm/mach-mvebu/pmsu_ll.S:19:6: error: invalid operand for instruction
>    mrc 15, 0, r0, cr0, cr0, 5 @ get the CPU ID
>        ^
>
> Signed-off-by: Stefan Agner <stefan@agner.ch>
> Acked-by: Nicolas Pitre <nico@fluxnic.net>

Applied on mvebu/arm, as well as the previous patch.

Thanks,

Gregory

> ---
>  arch/arm/mach-mvebu/coherency_ll.S | 2 +-
>  arch/arm/mach-mvebu/pmsu_ll.S      | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-mvebu/coherency_ll.S b/arch/arm/mach-mvebu/coherency_ll.S
> index 8b2fbc8b6bc6..2d962fe48821 100644
> --- a/arch/arm/mach-mvebu/coherency_ll.S
> +++ b/arch/arm/mach-mvebu/coherency_ll.S
> @@ -66,7 +66,7 @@ ENDPROC(ll_get_coherency_base)
>   * fabric registers
>   */
>  ENTRY(ll_get_coherency_cpumask)
> -	mrc	15, 0, r3, cr0, cr0, 5
> +	mrc	p15, 0, r3, cr0, cr0, 5
>  	and	r3, r3, #15
>  	mov	r2, #(1 << 24)
>  	lsl	r3, r2, r3
> diff --git a/arch/arm/mach-mvebu/pmsu_ll.S b/arch/arm/mach-mvebu/pmsu_ll.S
> index c1fb713e9306..7aae9a25cfeb 100644
> --- a/arch/arm/mach-mvebu/pmsu_ll.S
> +++ b/arch/arm/mach-mvebu/pmsu_ll.S
> @@ -16,7 +16,7 @@
>  ENTRY(armada_38x_scu_power_up)
>  	mrc     p15, 4, r1, c15, c0	@ get SCU base address
>  	orr	r1, r1, #0x8		@ SCU CPU Power Status Register
> -	mrc	15, 0, r0, cr0, cr0, 5	@ get the CPU ID
> +	mrc	p15, 0, r0, cr0, cr0, 5	@ get the CPU ID
>  	and	r0, r0, #15
>  	add	r1, r1, r0
>  	mov	r0, #0x0
> -- 
> 2.21.0
>

-- 
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 18+ messages in thread
* Re: [PATCH v3 1/4] ARM: use arch_extension directive instead of arch argument
  2019-04-11  7:54 ` Stefan Agner
@ 2019-04-23 20:19   ` Stefan Agner
  -1 siblings, 0 replies; 18+ messages in thread
From: Stefan Agner @ 2019-04-23 20:19 UTC (permalink / raw)
  To: arnd, arm, tony
  Cc: linux, ard.biesheuvel, robin.murphy, nicolas.pitre, f.fainelli,
	rjui, sbranden, bcm-kernel-feedback-list, kgene, krzk, robh,
	ssantosh, jason, andrew, gregory.clement, sebastian.hesselbarth,
	marc.w.gonzalez, mans, ndesaulniers, linux-arm-kernel,
	linux-kernel

On 11.04.2019 09:54, Stefan Agner wrote:
> The LLVM Target parser currently does not allow to specify the security
> extension as part of -march (see also LLVM Bug 40186 [0]). When trying
> to use Clang with LLVM's integrated assembler, this leads to build
> errors such as this:
>   clang-8: error: the clang compiler does not support '-Wa,-march=armv7-a+sec'
> 
> Use ".arch_extension sec" to enable the security extension in a more
> portable fasion. Also make sure to use ".arch armv7-a" in case a v6/v7
> multi-platform kernel is being built.
> 
> Note that this is technically not exactly the same as the old code
> checked for availabilty of the security extension by calling as-instr.
> However, there are already other sites which use ".arch_extension sec"
> unconditionally, hence de-facto we need an assembler capable of
> ".arch_extension sec" already today (arch/arm/mm/proc-v7.S). The
> arch extension "sec" is available since binutils 2.21 according to
> its documentation [1].
> 
> [0] https://bugs.llvm.org/show_bug.cgi?id=40186
> [1] https://sourceware.org/binutils/docs-2.21/as/ARM-Options.html
> 
> Signed-off-by: Stefan Agner <stefan@agner.ch>
> Acked-by: Mans Rullgard <mans@mansr.com>
> Acked-by: Arnd Bergmann <arnd@arndb.de>
> Acked-by: Krzysztof Kozlowski <krzk@kernel.org>

Arnd, Tony,

Patch 3 and 4 got merged by Gregory. I think the other two patches are
ready to be merged too. I think they should go in together to avoid
merge conflicts. Tony, if you agree, can you Ack patch 2 so they can get
merged through arm-soc?

--
Stefan

> ---
> Changes since v1:
> - Explicitly specify assembler architecture as armv7-a to avoid
>   build issues when bulding v6/v7 multi arch kernel.
> 
> Changes since v2:
> - Add armv7-a also in mach-tango
> - Move .arch armv7-a outside of ifdef'ed area in sleep44xx.S
>   to make the kernel compile also without CONFIG_SMP/PM.
> 
>  arch/arm/mach-bcm/Makefile         | 3 ---
>  arch/arm/mach-bcm/bcm_kona_smc.c   | 2 --
>  arch/arm/mach-exynos/Makefile      | 4 ----
>  arch/arm/mach-exynos/exynos-smc.S  | 3 ++-
>  arch/arm/mach-exynos/sleep.S       | 3 ++-
>  arch/arm/mach-highbank/Makefile    | 3 ---
>  arch/arm/mach-highbank/smc.S       | 3 ++-
>  arch/arm/mach-keystone/Makefile    | 3 ---
>  arch/arm/mach-keystone/smc.S       | 1 +
>  arch/arm/mach-omap2/Makefile       | 8 --------
>  arch/arm/mach-omap2/omap-headsmp.S | 2 ++
>  arch/arm/mach-omap2/omap-smc.S     | 3 ++-
>  arch/arm/mach-omap2/sleep33xx.S    | 1 +
>  arch/arm/mach-omap2/sleep34xx.S    | 2 ++
>  arch/arm/mach-omap2/sleep43xx.S    | 2 ++
>  arch/arm/mach-omap2/sleep44xx.S    | 3 +++
>  arch/arm/mach-tango/Makefile       | 3 ---
>  arch/arm/mach-tango/smc.S          | 2 ++
>  18 files changed, 21 insertions(+), 30 deletions(-)
> 
> diff --git a/arch/arm/mach-bcm/Makefile b/arch/arm/mach-bcm/Makefile
> index 8fd23b263c60..b59c813b1af4 100644
> --- a/arch/arm/mach-bcm/Makefile
> +++ b/arch/arm/mach-bcm/Makefile
> @@ -40,9 +40,6 @@ obj-$(CONFIG_ARCH_BCM_MOBILE_L2_CACHE) += kona_l2_cache.o
>  
>  # Support for secure monitor traps
>  obj-$(CONFIG_ARCH_BCM_MOBILE_SMC) += bcm_kona_smc.o
> -ifeq ($(call as-instr,.arch_extension sec,as_has_sec),as_has_sec)
> -CFLAGS_bcm_kona_smc.o		+= -Wa,-march=armv7-a+sec -DREQUIRES_SEC
> -endif
>  
>  # BCM2835
>  obj-$(CONFIG_ARCH_BCM2835)	+= board_bcm2835.o
> diff --git a/arch/arm/mach-bcm/bcm_kona_smc.c b/arch/arm/mach-bcm/bcm_kona_smc.c
> index a55a7ecf146a..541e850a736c 100644
> --- a/arch/arm/mach-bcm/bcm_kona_smc.c
> +++ b/arch/arm/mach-bcm/bcm_kona_smc.c
> @@ -125,9 +125,7 @@ static int bcm_kona_do_smc(u32 service_id, u32 buffer_phys)
>  		__asmeq("%2", "r4")
>  		__asmeq("%3", "r5")
>  		__asmeq("%4", "r6")
> -#ifdef REQUIRES_SEC
>  		".arch_extension sec\n"
> -#endif
>  		"	smc    #0\n"
>  		: "=r" (ip), "=r" (r0)
>  		: "r" (r4), "r" (r5), "r" (r6)
> diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile
> index cd00c82a1add..44de9f36fd1b 100644
> --- a/arch/arm/mach-exynos/Makefile
> +++ b/arch/arm/mach-exynos/Makefile
> @@ -14,9 +14,5 @@ obj-$(CONFIG_PM_SLEEP)		+= suspend.o
>  
>  obj-$(CONFIG_SMP)		+= platsmp.o headsmp.o
>  
> -plus_sec := $(call as-instr,.arch_extension sec,+sec)
> -AFLAGS_exynos-smc.o		:=-Wa,-march=armv7-a$(plus_sec)
> -AFLAGS_sleep.o			:=-Wa,-march=armv7-a$(plus_sec)
> -
>  obj-$(CONFIG_EXYNOS5420_MCPM)	+= mcpm-exynos.o
>  CFLAGS_mcpm-exynos.o		+= -march=armv7-a
> diff --git a/arch/arm/mach-exynos/exynos-smc.S
> b/arch/arm/mach-exynos/exynos-smc.S
> index d259532ba937..6da31e6a7acb 100644
> --- a/arch/arm/mach-exynos/exynos-smc.S
> +++ b/arch/arm/mach-exynos/exynos-smc.S
> @@ -10,7 +10,8 @@
>  /*
>   * Function signature: void exynos_smc(u32 cmd, u32 arg1, u32 arg2, u32 arg3)
>   */
> -
> +	.arch armv7-a
> +	.arch_extension sec
>  ENTRY(exynos_smc)
>  	stmfd	sp!, {r4-r11, lr}
>  	dsb
> diff --git a/arch/arm/mach-exynos/sleep.S b/arch/arm/mach-exynos/sleep.S
> index 2783c3a0c06a..ed93f91853b8 100644
> --- a/arch/arm/mach-exynos/sleep.S
> +++ b/arch/arm/mach-exynos/sleep.S
> @@ -44,7 +44,8 @@ ENTRY(exynos_cpu_resume)
>  ENDPROC(exynos_cpu_resume)
>  
>  	.align
> -
> +	.arch armv7-a
> +	.arch_extension sec
>  ENTRY(exynos_cpu_resume_ns)
>  	mrc	p15, 0, r0, c0, c0, 0
>  	ldr	r1, =CPU_MASK
> diff --git a/arch/arm/mach-highbank/Makefile b/arch/arm/mach-highbank/Makefile
> index 55840f414d3e..e7741b883d13 100644
> --- a/arch/arm/mach-highbank/Makefile
> +++ b/arch/arm/mach-highbank/Makefile
> @@ -1,6 +1,3 @@
>  obj-y					:= highbank.o system.o smc.o
>  
> -plus_sec := $(call as-instr,.arch_extension sec,+sec)
> -AFLAGS_smc.o				:=-Wa,-march=armv7-a$(plus_sec)
> -
>  obj-$(CONFIG_PM_SLEEP)			+= pm.o
> diff --git a/arch/arm/mach-highbank/smc.S b/arch/arm/mach-highbank/smc.S
> index 407d17baaaa9..860a79135b7b 100644
> --- a/arch/arm/mach-highbank/smc.S
> +++ b/arch/arm/mach-highbank/smc.S
> @@ -16,7 +16,8 @@
>   * the monitor API number.
>   * Function signature : void highbank_smc1(u32 fn, u32 arg)
>   */
> -
> +	.arch armv7-a
> +	.arch_extension sec
>  ENTRY(highbank_smc1)
>  	stmfd   sp!, {r4-r11, lr}
>  	mov	r12, r0
> diff --git a/arch/arm/mach-keystone/Makefile b/arch/arm/mach-keystone/Makefile
> index f8b0dccac8dc..739b38be5696 100644
> --- a/arch/arm/mach-keystone/Makefile
> +++ b/arch/arm/mach-keystone/Makefile
> @@ -1,9 +1,6 @@
>  # SPDX-License-Identifier: GPL-2.0
>  obj-y					:= keystone.o smc.o
>  
> -plus_sec := $(call as-instr,.arch_extension sec,+sec)
> -AFLAGS_smc.o				:=-Wa,-march=armv7-a$(plus_sec)
> -
>  obj-$(CONFIG_SMP)			+= platsmp.o
>  
>  # PM domain driver for Keystone SOCs
> diff --git a/arch/arm/mach-keystone/smc.S b/arch/arm/mach-keystone/smc.S
> index d15de8179fab..ec03dc499270 100644
> --- a/arch/arm/mach-keystone/smc.S
> +++ b/arch/arm/mach-keystone/smc.S
> @@ -21,6 +21,7 @@
>   *
>   * Return: Non zero value on failure
>   */
> +	.arch_extension sec
>  ENTRY(keystone_cpu_smc)
>  	stmfd   sp!, {r4-r11, lr}
>  	smc	#0
> diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
> index 85d1b13c9215..f1d283995b31 100644
> --- a/arch/arm/mach-omap2/Makefile
> +++ b/arch/arm/mach-omap2/Makefile
> @@ -41,11 +41,6 @@ obj-$(CONFIG_SOC_OMAP5)			+= $(omap-4-5-common)
> $(smp-y) sleep44xx.o
>  obj-$(CONFIG_SOC_AM43XX)		+= $(omap-4-5-common)
>  obj-$(CONFIG_SOC_DRA7XX)		+= $(omap-4-5-common) $(smp-y) sleep44xx.o
>  
> -plus_sec := $(call as-instr,.arch_extension sec,+sec)
> -AFLAGS_omap-headsmp.o			:=-Wa,-march=armv7-a$(plus_sec)
> -AFLAGS_omap-smc.o			:=-Wa,-march=armv7-a$(plus_sec)
> -AFLAGS_sleep44xx.o			:=-Wa,-march=armv7-a$(plus_sec)
> -
>  # Functions loaded to SRAM
>  obj-$(CONFIG_SOC_OMAP2420)		+= sram242x.o
>  obj-$(CONFIG_SOC_OMAP2430)		+= sram243x.o
> @@ -95,9 +90,6 @@ obj-$(CONFIG_POWER_AVS_OMAP)		+= sr_device.o
>  obj-$(CONFIG_POWER_AVS_OMAP_CLASS3)    += smartreflex-class3.o
>  
>  AFLAGS_sleep24xx.o			:=-Wa,-march=armv6
> -AFLAGS_sleep34xx.o			:=-Wa,-march=armv7-a$(plus_sec)
> -AFLAGS_sleep33xx.o			:=-Wa,-march=armv7-a$(plus_sec)
> -AFLAGS_sleep43xx.o			:=-Wa,-march=armv7-a$(plus_sec)
>  
>  endif
>  
> diff --git a/arch/arm/mach-omap2/omap-headsmp.S
> b/arch/arm/mach-omap2/omap-headsmp.S
> index 4c6f14cf92a8..b26c0daaa3c1 100644
> --- a/arch/arm/mach-omap2/omap-headsmp.S
> +++ b/arch/arm/mach-omap2/omap-headsmp.S
> @@ -58,6 +58,8 @@ ENDPROC(omap5_secondary_startup)
>   * omap5_secondary_startup if the primary CPU was put into HYP mode by
>   * the boot loader.
>   */
> +	.arch armv7-a
> +	.arch_extension sec
>  ENTRY(omap5_secondary_hyp_startup)
>  wait_2:	ldr	r2, =AUX_CORE_BOOT0_PA	@ read from AuxCoreBoot0
>  	ldr	r0, [r2]
> diff --git a/arch/arm/mach-omap2/omap-smc.S b/arch/arm/mach-omap2/omap-smc.S
> index 72506e6cf9e7..a14aee5e81d1 100644
> --- a/arch/arm/mach-omap2/omap-smc.S
> +++ b/arch/arm/mach-omap2/omap-smc.S
> @@ -23,7 +23,8 @@
>   * link register "lr".
>   * Function signature : void omap_smc1(u32 fn, u32 arg)
>   */
> -
> +	.arch armv7-a
> +	.arch_extension sec
>  ENTRY(omap_smc1)
>  	stmfd   sp!, {r2-r12, lr}
>  	mov	r12, r0
> diff --git a/arch/arm/mach-omap2/sleep33xx.S b/arch/arm/mach-omap2/sleep33xx.S
> index 47a816468cdb..68fee339d3f1 100644
> --- a/arch/arm/mach-omap2/sleep33xx.S
> +++ b/arch/arm/mach-omap2/sleep33xx.S
> @@ -24,6 +24,7 @@
>  #define BIT(nr)			(1 << (nr))
>  
>  	.arm
> +	.arch armv7-a
>  	.align 3
>  
>  ENTRY(am33xx_do_wfi)
> diff --git a/arch/arm/mach-omap2/sleep34xx.S b/arch/arm/mach-omap2/sleep34xx.S
> index 22daf4efed68..4927304b5902 100644
> --- a/arch/arm/mach-omap2/sleep34xx.S
> +++ b/arch/arm/mach-omap2/sleep34xx.S
> @@ -97,6 +97,8 @@ ENDPROC(enable_omap3630_toggle_l2_on_restore)
>   *
>   * r0 = physical address of the parameters
>   */
> +	.arch armv7-a
> +	.arch_extension sec
>  ENTRY(save_secure_ram_context)
>  	stmfd	sp!, {r4 - r11, lr}	@ save registers on stack
>  	mov	r3, r0			@ physical address of parameters
> diff --git a/arch/arm/mach-omap2/sleep43xx.S b/arch/arm/mach-omap2/sleep43xx.S
> index 5b9343b58fc7..31dda92d9d03 100644
> --- a/arch/arm/mach-omap2/sleep43xx.S
> +++ b/arch/arm/mach-omap2/sleep43xx.S
> @@ -56,6 +56,8 @@
>  #define RTC_PMIC_EXT_WAKEUP_EN				BIT(0)
>  
>  	.arm
> +	.arch armv7-a
> +	.arch_extension sec
>  	.align 3
>  
>  ENTRY(am43xx_do_wfi)
> diff --git a/arch/arm/mach-omap2/sleep44xx.S b/arch/arm/mach-omap2/sleep44xx.S
> index 0cae3b070208..fb559d3de1f2 100644
> --- a/arch/arm/mach-omap2/sleep44xx.S
> +++ b/arch/arm/mach-omap2/sleep44xx.S
> @@ -21,8 +21,11 @@
>  #include "omap44xx.h"
>  #include "omap4-sar-layout.h"
>  
> +	.arch armv7-a
> +
>  #if defined(CONFIG_SMP) && defined(CONFIG_PM)
>  
> +	.arch_extension sec
>  .macro	DO_SMC
>  	dsb
>  	smc	#0
> diff --git a/arch/arm/mach-tango/Makefile b/arch/arm/mach-tango/Makefile
> index da6c633d3cc0..97cd04508fa1 100644
> --- a/arch/arm/mach-tango/Makefile
> +++ b/arch/arm/mach-tango/Makefile
> @@ -1,7 +1,4 @@
>  # SPDX-License-Identifier: GPL-2.0
> -plus_sec := $(call as-instr,.arch_extension sec,+sec)
> -AFLAGS_smc.o := -Wa,-march=armv7-a$(plus_sec)
> -
>  obj-y += setup.o smc.o
>  obj-$(CONFIG_SMP) += platsmp.o
>  obj-$(CONFIG_SUSPEND) += pm.o
> diff --git a/arch/arm/mach-tango/smc.S b/arch/arm/mach-tango/smc.S
> index 361a8dc89804..b1752aaa72bc 100644
> --- a/arch/arm/mach-tango/smc.S
> +++ b/arch/arm/mach-tango/smc.S
> @@ -1,6 +1,8 @@
>  /* SPDX-License-Identifier: GPL-2.0 */
>  #include <linux/linkage.h>
>  
> +	.arch armv7-a
> +	.arch_extension sec
>  ENTRY(tango_smc)
>  	push	{lr}
>  	mov	ip, r1

^ permalink raw reply	[flat|nested] 18+ messages in thread
* Re: [PATCH v3 1/4] ARM: use arch_extension directive instead of arch argument
@ 2019-04-23 20:19   ` Stefan Agner
  0 siblings, 0 replies; 18+ messages in thread
From: Stefan Agner @ 2019-04-23 20:19 UTC (permalink / raw)
  To: arnd, arm, tony
  Cc: nicolas.pitre, robh, f.fainelli, mans, jason, sbranden,
	ard.biesheuvel, rjui, gregory.clement, marc.w.gonzalez,
	ndesaulniers, linux, krzk, linux-kernel, andrew, kgene,
	bcm-kernel-feedback-list, ssantosh, robin.murphy,
	linux-arm-kernel, sebastian.hesselbarth

On 11.04.2019 09:54, Stefan Agner wrote:
> The LLVM Target parser currently does not allow to specify the security
> extension as part of -march (see also LLVM Bug 40186 [0]). When trying
> to use Clang with LLVM's integrated assembler, this leads to build
> errors such as this:
>   clang-8: error: the clang compiler does not support '-Wa,-march=armv7-a+sec'
> 
> Use ".arch_extension sec" to enable the security extension in a more
> portable fasion. Also make sure to use ".arch armv7-a" in case a v6/v7
> multi-platform kernel is being built.
> 
> Note that this is technically not exactly the same as the old code
> checked for availabilty of the security extension by calling as-instr.
> However, there are already other sites which use ".arch_extension sec"
> unconditionally, hence de-facto we need an assembler capable of
> ".arch_extension sec" already today (arch/arm/mm/proc-v7.S). The
> arch extension "sec" is available since binutils 2.21 according to
> its documentation [1].
> 
> [0] https://bugs.llvm.org/show_bug.cgi?id=40186
> [1] https://sourceware.org/binutils/docs-2.21/as/ARM-Options.html
> 
> Signed-off-by: Stefan Agner <stefan@agner.ch>
> Acked-by: Mans Rullgard <mans@mansr.com>
> Acked-by: Arnd Bergmann <arnd@arndb.de>
> Acked-by: Krzysztof Kozlowski <krzk@kernel.org>

Arnd, Tony,

Patch 3 and 4 got merged by Gregory. I think the other two patches are
ready to be merged too. I think they should go in together to avoid
merge conflicts. Tony, if you agree, can you Ack patch 2 so they can get
merged through arm-soc?

--
Stefan

> ---
> Changes since v1:
> - Explicitly specify assembler architecture as armv7-a to avoid
>   build issues when bulding v6/v7 multi arch kernel.
> 
> Changes since v2:
> - Add armv7-a also in mach-tango
> - Move .arch armv7-a outside of ifdef'ed area in sleep44xx.S
>   to make the kernel compile also without CONFIG_SMP/PM.
> 
>  arch/arm/mach-bcm/Makefile         | 3 ---
>  arch/arm/mach-bcm/bcm_kona_smc.c   | 2 --
>  arch/arm/mach-exynos/Makefile      | 4 ----
>  arch/arm/mach-exynos/exynos-smc.S  | 3 ++-
>  arch/arm/mach-exynos/sleep.S       | 3 ++-
>  arch/arm/mach-highbank/Makefile    | 3 ---
>  arch/arm/mach-highbank/smc.S       | 3 ++-
>  arch/arm/mach-keystone/Makefile    | 3 ---
>  arch/arm/mach-keystone/smc.S       | 1 +
>  arch/arm/mach-omap2/Makefile       | 8 --------
>  arch/arm/mach-omap2/omap-headsmp.S | 2 ++
>  arch/arm/mach-omap2/omap-smc.S     | 3 ++-
>  arch/arm/mach-omap2/sleep33xx.S    | 1 +
>  arch/arm/mach-omap2/sleep34xx.S    | 2 ++
>  arch/arm/mach-omap2/sleep43xx.S    | 2 ++
>  arch/arm/mach-omap2/sleep44xx.S    | 3 +++
>  arch/arm/mach-tango/Makefile       | 3 ---
>  arch/arm/mach-tango/smc.S          | 2 ++
>  18 files changed, 21 insertions(+), 30 deletions(-)
> 
> diff --git a/arch/arm/mach-bcm/Makefile b/arch/arm/mach-bcm/Makefile
> index 8fd23b263c60..b59c813b1af4 100644
> --- a/arch/arm/mach-bcm/Makefile
> +++ b/arch/arm/mach-bcm/Makefile
> @@ -40,9 +40,6 @@ obj-$(CONFIG_ARCH_BCM_MOBILE_L2_CACHE) += kona_l2_cache.o
>  
>  # Support for secure monitor traps
>  obj-$(CONFIG_ARCH_BCM_MOBILE_SMC) += bcm_kona_smc.o
> -ifeq ($(call as-instr,.arch_extension sec,as_has_sec),as_has_sec)
> -CFLAGS_bcm_kona_smc.o		+= -Wa,-march=armv7-a+sec -DREQUIRES_SEC
> -endif
>  
>  # BCM2835
>  obj-$(CONFIG_ARCH_BCM2835)	+= board_bcm2835.o
> diff --git a/arch/arm/mach-bcm/bcm_kona_smc.c b/arch/arm/mach-bcm/bcm_kona_smc.c
> index a55a7ecf146a..541e850a736c 100644
> --- a/arch/arm/mach-bcm/bcm_kona_smc.c
> +++ b/arch/arm/mach-bcm/bcm_kona_smc.c
> @@ -125,9 +125,7 @@ static int bcm_kona_do_smc(u32 service_id, u32 buffer_phys)
>  		__asmeq("%2", "r4")
>  		__asmeq("%3", "r5")
>  		__asmeq("%4", "r6")
> -#ifdef REQUIRES_SEC
>  		".arch_extension sec\n"
> -#endif
>  		"	smc    #0\n"
>  		: "=r" (ip), "=r" (r0)
>  		: "r" (r4), "r" (r5), "r" (r6)
> diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile
> index cd00c82a1add..44de9f36fd1b 100644
> --- a/arch/arm/mach-exynos/Makefile
> +++ b/arch/arm/mach-exynos/Makefile
> @@ -14,9 +14,5 @@ obj-$(CONFIG_PM_SLEEP)		+= suspend.o
>  
>  obj-$(CONFIG_SMP)		+= platsmp.o headsmp.o
>  
> -plus_sec := $(call as-instr,.arch_extension sec,+sec)
> -AFLAGS_exynos-smc.o		:=-Wa,-march=armv7-a$(plus_sec)
> -AFLAGS_sleep.o			:=-Wa,-march=armv7-a$(plus_sec)
> -
>  obj-$(CONFIG_EXYNOS5420_MCPM)	+= mcpm-exynos.o
>  CFLAGS_mcpm-exynos.o		+= -march=armv7-a
> diff --git a/arch/arm/mach-exynos/exynos-smc.S
> b/arch/arm/mach-exynos/exynos-smc.S
> index d259532ba937..6da31e6a7acb 100644
> --- a/arch/arm/mach-exynos/exynos-smc.S
> +++ b/arch/arm/mach-exynos/exynos-smc.S
> @@ -10,7 +10,8 @@
>  /*
>   * Function signature: void exynos_smc(u32 cmd, u32 arg1, u32 arg2, u32 arg3)
>   */
> -
> +	.arch armv7-a
> +	.arch_extension sec
>  ENTRY(exynos_smc)
>  	stmfd	sp!, {r4-r11, lr}
>  	dsb
> diff --git a/arch/arm/mach-exynos/sleep.S b/arch/arm/mach-exynos/sleep.S
> index 2783c3a0c06a..ed93f91853b8 100644
> --- a/arch/arm/mach-exynos/sleep.S
> +++ b/arch/arm/mach-exynos/sleep.S
> @@ -44,7 +44,8 @@ ENTRY(exynos_cpu_resume)
>  ENDPROC(exynos_cpu_resume)
>  
>  	.align
> -
> +	.arch armv7-a
> +	.arch_extension sec
>  ENTRY(exynos_cpu_resume_ns)
>  	mrc	p15, 0, r0, c0, c0, 0
>  	ldr	r1, =CPU_MASK
> diff --git a/arch/arm/mach-highbank/Makefile b/arch/arm/mach-highbank/Makefile
> index 55840f414d3e..e7741b883d13 100644
> --- a/arch/arm/mach-highbank/Makefile
> +++ b/arch/arm/mach-highbank/Makefile
> @@ -1,6 +1,3 @@
>  obj-y					:= highbank.o system.o smc.o
>  
> -plus_sec := $(call as-instr,.arch_extension sec,+sec)
> -AFLAGS_smc.o				:=-Wa,-march=armv7-a$(plus_sec)
> -
>  obj-$(CONFIG_PM_SLEEP)			+= pm.o
> diff --git a/arch/arm/mach-highbank/smc.S b/arch/arm/mach-highbank/smc.S
> index 407d17baaaa9..860a79135b7b 100644
> --- a/arch/arm/mach-highbank/smc.S
> +++ b/arch/arm/mach-highbank/smc.S
> @@ -16,7 +16,8 @@
>   * the monitor API number.
>   * Function signature : void highbank_smc1(u32 fn, u32 arg)
>   */
> -
> +	.arch armv7-a
> +	.arch_extension sec
>  ENTRY(highbank_smc1)
>  	stmfd   sp!, {r4-r11, lr}
>  	mov	r12, r0
> diff --git a/arch/arm/mach-keystone/Makefile b/arch/arm/mach-keystone/Makefile
> index f8b0dccac8dc..739b38be5696 100644
> --- a/arch/arm/mach-keystone/Makefile
> +++ b/arch/arm/mach-keystone/Makefile
> @@ -1,9 +1,6 @@
>  # SPDX-License-Identifier: GPL-2.0
>  obj-y					:= keystone.o smc.o
>  
> -plus_sec := $(call as-instr,.arch_extension sec,+sec)
> -AFLAGS_smc.o				:=-Wa,-march=armv7-a$(plus_sec)
> -
>  obj-$(CONFIG_SMP)			+= platsmp.o
>  
>  # PM domain driver for Keystone SOCs
> diff --git a/arch/arm/mach-keystone/smc.S b/arch/arm/mach-keystone/smc.S
> index d15de8179fab..ec03dc499270 100644
> --- a/arch/arm/mach-keystone/smc.S
> +++ b/arch/arm/mach-keystone/smc.S
> @@ -21,6 +21,7 @@
>   *
>   * Return: Non zero value on failure
>   */
> +	.arch_extension sec
>  ENTRY(keystone_cpu_smc)
>  	stmfd   sp!, {r4-r11, lr}
>  	smc	#0
> diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
> index 85d1b13c9215..f1d283995b31 100644
> --- a/arch/arm/mach-omap2/Makefile
> +++ b/arch/arm/mach-omap2/Makefile
> @@ -41,11 +41,6 @@ obj-$(CONFIG_SOC_OMAP5)			+= $(omap-4-5-common)
> $(smp-y) sleep44xx.o
>  obj-$(CONFIG_SOC_AM43XX)		+= $(omap-4-5-common)
>  obj-$(CONFIG_SOC_DRA7XX)		+= $(omap-4-5-common) $(smp-y) sleep44xx.o
>  
> -plus_sec := $(call as-instr,.arch_extension sec,+sec)
> -AFLAGS_omap-headsmp.o			:=-Wa,-march=armv7-a$(plus_sec)
> -AFLAGS_omap-smc.o			:=-Wa,-march=armv7-a$(plus_sec)
> -AFLAGS_sleep44xx.o			:=-Wa,-march=armv7-a$(plus_sec)
> -
>  # Functions loaded to SRAM
>  obj-$(CONFIG_SOC_OMAP2420)		+= sram242x.o
>  obj-$(CONFIG_SOC_OMAP2430)		+= sram243x.o
> @@ -95,9 +90,6 @@ obj-$(CONFIG_POWER_AVS_OMAP)		+= sr_device.o
>  obj-$(CONFIG_POWER_AVS_OMAP_CLASS3)    += smartreflex-class3.o
>  
>  AFLAGS_sleep24xx.o			:=-Wa,-march=armv6
> -AFLAGS_sleep34xx.o			:=-Wa,-march=armv7-a$(plus_sec)
> -AFLAGS_sleep33xx.o			:=-Wa,-march=armv7-a$(plus_sec)
> -AFLAGS_sleep43xx.o			:=-Wa,-march=armv7-a$(plus_sec)
>  
>  endif
>  
> diff --git a/arch/arm/mach-omap2/omap-headsmp.S
> b/arch/arm/mach-omap2/omap-headsmp.S
> index 4c6f14cf92a8..b26c0daaa3c1 100644
> --- a/arch/arm/mach-omap2/omap-headsmp.S
> +++ b/arch/arm/mach-omap2/omap-headsmp.S
> @@ -58,6 +58,8 @@ ENDPROC(omap5_secondary_startup)
>   * omap5_secondary_startup if the primary CPU was put into HYP mode by
>   * the boot loader.
>   */
> +	.arch armv7-a
> +	.arch_extension sec
>  ENTRY(omap5_secondary_hyp_startup)
>  wait_2:	ldr	r2, =AUX_CORE_BOOT0_PA	@ read from AuxCoreBoot0
>  	ldr	r0, [r2]
> diff --git a/arch/arm/mach-omap2/omap-smc.S b/arch/arm/mach-omap2/omap-smc.S
> index 72506e6cf9e7..a14aee5e81d1 100644
> --- a/arch/arm/mach-omap2/omap-smc.S
> +++ b/arch/arm/mach-omap2/omap-smc.S
> @@ -23,7 +23,8 @@
>   * link register "lr".
>   * Function signature : void omap_smc1(u32 fn, u32 arg)
>   */
> -
> +	.arch armv7-a
> +	.arch_extension sec
>  ENTRY(omap_smc1)
>  	stmfd   sp!, {r2-r12, lr}
>  	mov	r12, r0
> diff --git a/arch/arm/mach-omap2/sleep33xx.S b/arch/arm/mach-omap2/sleep33xx.S
> index 47a816468cdb..68fee339d3f1 100644
> --- a/arch/arm/mach-omap2/sleep33xx.S
> +++ b/arch/arm/mach-omap2/sleep33xx.S
> @@ -24,6 +24,7 @@
>  #define BIT(nr)			(1 << (nr))
>  
>  	.arm
> +	.arch armv7-a
>  	.align 3
>  
>  ENTRY(am33xx_do_wfi)
> diff --git a/arch/arm/mach-omap2/sleep34xx.S b/arch/arm/mach-omap2/sleep34xx.S
> index 22daf4efed68..4927304b5902 100644
> --- a/arch/arm/mach-omap2/sleep34xx.S
> +++ b/arch/arm/mach-omap2/sleep34xx.S
> @@ -97,6 +97,8 @@ ENDPROC(enable_omap3630_toggle_l2_on_restore)
>   *
>   * r0 = physical address of the parameters
>   */
> +	.arch armv7-a
> +	.arch_extension sec
>  ENTRY(save_secure_ram_context)
>  	stmfd	sp!, {r4 - r11, lr}	@ save registers on stack
>  	mov	r3, r0			@ physical address of parameters
> diff --git a/arch/arm/mach-omap2/sleep43xx.S b/arch/arm/mach-omap2/sleep43xx.S
> index 5b9343b58fc7..31dda92d9d03 100644
> --- a/arch/arm/mach-omap2/sleep43xx.S
> +++ b/arch/arm/mach-omap2/sleep43xx.S
> @@ -56,6 +56,8 @@
>  #define RTC_PMIC_EXT_WAKEUP_EN				BIT(0)
>  
>  	.arm
> +	.arch armv7-a
> +	.arch_extension sec
>  	.align 3
>  
>  ENTRY(am43xx_do_wfi)
> diff --git a/arch/arm/mach-omap2/sleep44xx.S b/arch/arm/mach-omap2/sleep44xx.S
> index 0cae3b070208..fb559d3de1f2 100644
> --- a/arch/arm/mach-omap2/sleep44xx.S
> +++ b/arch/arm/mach-omap2/sleep44xx.S
> @@ -21,8 +21,11 @@
>  #include "omap44xx.h"
>  #include "omap4-sar-layout.h"
>  
> +	.arch armv7-a
> +
>  #if defined(CONFIG_SMP) && defined(CONFIG_PM)
>  
> +	.arch_extension sec
>  .macro	DO_SMC
>  	dsb
>  	smc	#0
> diff --git a/arch/arm/mach-tango/Makefile b/arch/arm/mach-tango/Makefile
> index da6c633d3cc0..97cd04508fa1 100644
> --- a/arch/arm/mach-tango/Makefile
> +++ b/arch/arm/mach-tango/Makefile
> @@ -1,7 +1,4 @@
>  # SPDX-License-Identifier: GPL-2.0
> -plus_sec := $(call as-instr,.arch_extension sec,+sec)
> -AFLAGS_smc.o := -Wa,-march=armv7-a$(plus_sec)
> -
>  obj-y += setup.o smc.o
>  obj-$(CONFIG_SMP) += platsmp.o
>  obj-$(CONFIG_SUSPEND) += pm.o
> diff --git a/arch/arm/mach-tango/smc.S b/arch/arm/mach-tango/smc.S
> index 361a8dc89804..b1752aaa72bc 100644
> --- a/arch/arm/mach-tango/smc.S
> +++ b/arch/arm/mach-tango/smc.S
> @@ -1,6 +1,8 @@
>  /* SPDX-License-Identifier: GPL-2.0 */
>  #include <linux/linkage.h>
>  
> +	.arch armv7-a
> +	.arch_extension sec
>  ENTRY(tango_smc)
>  	push	{lr}
>  	mov	ip, r1

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 18+ messages in thread
* Re: [PATCH v3 2/4] ARM: OMAP2: drop explicit assembler architecture
  2019-04-11  7:54   ` Stefan Agner
@ 2019-04-24 14:11     ` Tony Lindgren
  -1 siblings, 0 replies; 18+ messages in thread
From: Tony Lindgren @ 2019-04-24 14:11 UTC (permalink / raw)
  To: Stefan Agner
  Cc: arm, linux, arnd, ard.biesheuvel, robin.murphy, nicolas.pitre,
	f.fainelli, rjui, sbranden, bcm-kernel-feedback-list, kgene,
	krzk, robh, ssantosh, jason, andrew, gregory.clement,
	sebastian.hesselbarth, marc.w.gonzalez, mans, ndesaulniers,
	linux-arm-kernel, linux-kernel

* Stefan Agner <stefan@agner.ch> [190411 07:53]:
> OMAP2 depends on ARCH_MULTI_V6, which makes sure that the kernel is
> compiled with -march=armv6. The compiler frontend will pass the
> architecture to the assembler. There is no explicit architecture
> specification necessary.

Acked-by: Tony Lindgren <tony@atomide.com>

^ permalink raw reply	[flat|nested] 18+ messages in thread
* Re: [PATCH v3 2/4] ARM: OMAP2: drop explicit assembler architecture
@ 2019-04-24 14:11     ` Tony Lindgren
  0 siblings, 0 replies; 18+ messages in thread
From: Tony Lindgren @ 2019-04-24 14:11 UTC (permalink / raw)
  To: Stefan Agner
  Cc: nicolas.pitre, andrew, mans, robh, f.fainelli, gregory.clement,
	linux, krzk, arm, bcm-kernel-feedback-list,
	sebastian.hesselbarth, jason, arnd, marc.w.gonzalez, rjui,
	ssantosh, linux-arm-kernel, sbranden, ard.biesheuvel,
	ndesaulniers, linux-kernel, kgene, robin.murphy

* Stefan Agner <stefan@agner.ch> [190411 07:53]:
> OMAP2 depends on ARCH_MULTI_V6, which makes sure that the kernel is
> compiled with -march=armv6. The compiler frontend will pass the
> architecture to the assembler. There is no explicit architecture
> specification necessary.

Acked-by: Tony Lindgren <tony@atomide.com>

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 18+ messages in thread
* Re: [PATCH v3 1/4] ARM: use arch_extension directive instead of arch argument
  2019-04-23 20:19   ` Stefan Agner
@ 2019-04-24 14:12     ` Tony Lindgren
  -1 siblings, 0 replies; 18+ messages in thread
From: Tony Lindgren @ 2019-04-24 14:12 UTC (permalink / raw)
  To: Stefan Agner
  Cc: arnd, arm, linux, ard.biesheuvel, robin.murphy, nicolas.pitre,
	f.fainelli, rjui, sbranden, bcm-kernel-feedback-list, kgene,
	krzk, robh, ssantosh, jason, andrew, gregory.clement,
	sebastian.hesselbarth, marc.w.gonzalez, mans, ndesaulniers,
	linux-arm-kernel, linux-kernel

* Stefan Agner <stefan@agner.ch> [190423 20:20]:
> On 11.04.2019 09:54, Stefan Agner wrote:
> > The LLVM Target parser currently does not allow to specify the security
> > extension as part of -march (see also LLVM Bug 40186 [0]). When trying
> > to use Clang with LLVM's integrated assembler, this leads to build
> > errors such as this:
> >   clang-8: error: the clang compiler does not support '-Wa,-march=armv7-a+sec'
> > 
> > Use ".arch_extension sec" to enable the security extension in a more
> > portable fasion. Also make sure to use ".arch armv7-a" in case a v6/v7
> > multi-platform kernel is being built.
> > 
> > Note that this is technically not exactly the same as the old code
> > checked for availabilty of the security extension by calling as-instr.
> > However, there are already other sites which use ".arch_extension sec"
> > unconditionally, hence de-facto we need an assembler capable of
> > ".arch_extension sec" already today (arch/arm/mm/proc-v7.S). The
> > arch extension "sec" is available since binutils 2.21 according to
> > its documentation [1].
> > 
> > [0] https://bugs.llvm.org/show_bug.cgi?id=40186
> > [1] https://sourceware.org/binutils/docs-2.21/as/ARM-Options.html
> > 
> > Signed-off-by: Stefan Agner <stefan@agner.ch>
> > Acked-by: Mans Rullgard <mans@mansr.com>
> > Acked-by: Arnd Bergmann <arnd@arndb.de>
> > Acked-by: Krzysztof Kozlowski <krzk@kernel.org>
> 
> Arnd, Tony,
> 
> Patch 3 and 4 got merged by Gregory. I think the other two patches are
> ready to be merged too. I think they should go in together to avoid
> merge conflicts. Tony, if you agree, can you Ack patch 2 so they can get
> merged through arm-soc?

Sure I just acked it for you.

Thanks,

Tony

^ permalink raw reply	[flat|nested] 18+ messages in thread
* Re: [PATCH v3 1/4] ARM: use arch_extension directive instead of arch argument
@ 2019-04-24 14:12     ` Tony Lindgren
  0 siblings, 0 replies; 18+ messages in thread
From: Tony Lindgren @ 2019-04-24 14:12 UTC (permalink / raw)
  To: Stefan Agner
  Cc: nicolas.pitre, andrew, mans, robh, f.fainelli, gregory.clement,
	linux, krzk, arm, bcm-kernel-feedback-list,
	sebastian.hesselbarth, jason, arnd, marc.w.gonzalez, rjui,
	ssantosh, linux-arm-kernel, sbranden, ard.biesheuvel,
	ndesaulniers, linux-kernel, kgene, robin.murphy

* Stefan Agner <stefan@agner.ch> [190423 20:20]:
> On 11.04.2019 09:54, Stefan Agner wrote:
> > The LLVM Target parser currently does not allow to specify the security
> > extension as part of -march (see also LLVM Bug 40186 [0]). When trying
> > to use Clang with LLVM's integrated assembler, this leads to build
> > errors such as this:
> >   clang-8: error: the clang compiler does not support '-Wa,-march=armv7-a+sec'
> > 
> > Use ".arch_extension sec" to enable the security extension in a more
> > portable fasion. Also make sure to use ".arch armv7-a" in case a v6/v7
> > multi-platform kernel is being built.
> > 
> > Note that this is technically not exactly the same as the old code
> > checked for availabilty of the security extension by calling as-instr.
> > However, there are already other sites which use ".arch_extension sec"
> > unconditionally, hence de-facto we need an assembler capable of
> > ".arch_extension sec" already today (arch/arm/mm/proc-v7.S). The
> > arch extension "sec" is available since binutils 2.21 according to
> > its documentation [1].
> > 
> > [0] https://bugs.llvm.org/show_bug.cgi?id=40186
> > [1] https://sourceware.org/binutils/docs-2.21/as/ARM-Options.html
> > 
> > Signed-off-by: Stefan Agner <stefan@agner.ch>
> > Acked-by: Mans Rullgard <mans@mansr.com>
> > Acked-by: Arnd Bergmann <arnd@arndb.de>
> > Acked-by: Krzysztof Kozlowski <krzk@kernel.org>
> 
> Arnd, Tony,
> 
> Patch 3 and 4 got merged by Gregory. I think the other two patches are
> ready to be merged too. I think they should go in together to avoid
> merge conflicts. Tony, if you agree, can you Ack patch 2 so they can get
> merged through arm-soc?

Sure I just acked it for you.

Thanks,

Tony

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 18+ messages in thread
* Re: [PATCH v3 1/4] ARM: use arch_extension directive instead of arch argument
  2019-04-24 14:12     ` Tony Lindgren
@ 2019-05-16 21:48       ` Olof Johansson
  -1 siblings, 0 replies; 18+ messages in thread
From: Olof Johansson @ 2019-05-16 21:48 UTC (permalink / raw)
  To: Tony Lindgren
  Cc: Stefan Agner, arnd, arm, linux, ard.biesheuvel, robin.murphy,
	nicolas.pitre, f.fainelli, rjui, sbranden,
	bcm-kernel-feedback-list, kgene, krzk, robh, ssantosh, jason,
	andrew, gregory.clement, sebastian.hesselbarth, marc.w.gonzalez,
	mans, ndesaulniers, linux-arm-kernel, linux-kernel

On Wed, Apr 24, 2019 at 07:12:17AM -0700, Tony Lindgren wrote:
> * Stefan Agner <stefan@agner.ch> [190423 20:20]:
> > On 11.04.2019 09:54, Stefan Agner wrote:
> > > The LLVM Target parser currently does not allow to specify the security
> > > extension as part of -march (see also LLVM Bug 40186 [0]). When trying
> > > to use Clang with LLVM's integrated assembler, this leads to build
> > > errors such as this:
> > >   clang-8: error: the clang compiler does not support '-Wa,-march=armv7-a+sec'
> > > 
> > > Use ".arch_extension sec" to enable the security extension in a more
> > > portable fasion. Also make sure to use ".arch armv7-a" in case a v6/v7
> > > multi-platform kernel is being built.
> > > 
> > > Note that this is technically not exactly the same as the old code
> > > checked for availabilty of the security extension by calling as-instr.
> > > However, there are already other sites which use ".arch_extension sec"
> > > unconditionally, hence de-facto we need an assembler capable of
> > > ".arch_extension sec" already today (arch/arm/mm/proc-v7.S). The
> > > arch extension "sec" is available since binutils 2.21 according to
> > > its documentation [1].
> > > 
> > > [0] https://bugs.llvm.org/show_bug.cgi?id=40186
> > > [1] https://sourceware.org/binutils/docs-2.21/as/ARM-Options.html
> > > 
> > > Signed-off-by: Stefan Agner <stefan@agner.ch>
> > > Acked-by: Mans Rullgard <mans@mansr.com>
> > > Acked-by: Arnd Bergmann <arnd@arndb.de>
> > > Acked-by: Krzysztof Kozlowski <krzk@kernel.org>
> > 
> > Arnd, Tony,
> > 
> > Patch 3 and 4 got merged by Gregory. I think the other two patches are
> > ready to be merged too. I think they should go in together to avoid
> > merge conflicts. Tony, if you agree, can you Ack patch 2 so they can get
> > merged through arm-soc?
> 
> Sure I just acked it for you.

Hi,

These came in right around when I did the last patches for this merge
window. I'll apply them once -rc1 is out for next release.


-Olof

^ permalink raw reply	[flat|nested] 18+ messages in thread
* Re: [PATCH v3 1/4] ARM: use arch_extension directive instead of arch argument
@ 2019-05-16 21:48       ` Olof Johansson
  0 siblings, 0 replies; 18+ messages in thread
From: Olof Johansson @ 2019-05-16 21:48 UTC (permalink / raw)
  To: Tony Lindgren
  Cc: nicolas.pitre, andrew, mans, Stefan Agner, robh, f.fainelli,
	gregory.clement, linux, krzk, arm, bcm-kernel-feedback-list,
	sebastian.hesselbarth, jason, arnd, marc.w.gonzalez, rjui,
	ssantosh, linux-arm-kernel, sbranden, ard.biesheuvel,
	ndesaulniers, linux-kernel, kgene, robin.murphy

On Wed, Apr 24, 2019 at 07:12:17AM -0700, Tony Lindgren wrote:
> * Stefan Agner <stefan@agner.ch> [190423 20:20]:
> > On 11.04.2019 09:54, Stefan Agner wrote:
> > > The LLVM Target parser currently does not allow to specify the security
> > > extension as part of -march (see also LLVM Bug 40186 [0]). When trying
> > > to use Clang with LLVM's integrated assembler, this leads to build
> > > errors such as this:
> > >   clang-8: error: the clang compiler does not support '-Wa,-march=armv7-a+sec'
> > > 
> > > Use ".arch_extension sec" to enable the security extension in a more
> > > portable fasion. Also make sure to use ".arch armv7-a" in case a v6/v7
> > > multi-platform kernel is being built.
> > > 
> > > Note that this is technically not exactly the same as the old code
> > > checked for availabilty of the security extension by calling as-instr.
> > > However, there are already other sites which use ".arch_extension sec"
> > > unconditionally, hence de-facto we need an assembler capable of
> > > ".arch_extension sec" already today (arch/arm/mm/proc-v7.S). The
> > > arch extension "sec" is available since binutils 2.21 according to
> > > its documentation [1].
> > > 
> > > [0] https://bugs.llvm.org/show_bug.cgi?id=40186
> > > [1] https://sourceware.org/binutils/docs-2.21/as/ARM-Options.html
> > > 
> > > Signed-off-by: Stefan Agner <stefan@agner.ch>
> > > Acked-by: Mans Rullgard <mans@mansr.com>
> > > Acked-by: Arnd Bergmann <arnd@arndb.de>
> > > Acked-by: Krzysztof Kozlowski <krzk@kernel.org>
> > 
> > Arnd, Tony,
> > 
> > Patch 3 and 4 got merged by Gregory. I think the other two patches are
> > ready to be merged too. I think they should go in together to avoid
> > merge conflicts. Tony, if you agree, can you Ack patch 2 so they can get
> > merged through arm-soc?
> 
> Sure I just acked it for you.

Hi,

These came in right around when I did the last patches for this merge
window. I'll apply them once -rc1 is out for next release.


-Olof

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 18+ messages in thread
end of thread, other threads:[~2019-05-16 21:51 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-11  7:54 [PATCH v3 1/4] ARM: use arch_extension directive instead of arch argument Stefan Agner
2019-04-11  7:54 ` Stefan Agner
2019-04-11  7:54 ` [PATCH v3 2/4] ARM: OMAP2: drop explicit assembler architecture Stefan Agner
2019-04-11  7:54   ` Stefan Agner
2019-04-24 14:11   ` Tony Lindgren
2019-04-24 14:11     ` Tony Lindgren
2019-04-11  7:54 ` [PATCH v3 3/4] ARM: mvebu: drop unnecessary label Stefan Agner
2019-04-11  7:54   ` Stefan Agner
2019-04-11  7:54 ` [PATCH v3 4/4] ARM: mvebu: prefix coprocessor operand with p Stefan Agner
2019-04-11  7:54   ` Stefan Agner
2019-04-21 17:22   ` Gregory CLEMENT
2019-04-21 17:22     ` Gregory CLEMENT
2019-04-23 20:19 ` [PATCH v3 1/4] ARM: use arch_extension directive instead of arch argument Stefan Agner
2019-04-23 20:19   ` Stefan Agner
2019-04-24 14:12   ` Tony Lindgren
2019-04-24 14:12     ` Tony Lindgren
2019-05-16 21:48     ` Olof Johansson
2019-05-16 21:48       ` Olof Johansson

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.