arm: Leave smccc calls in .text when efi_loader=n
PATCH 1/1 arm: Leave smccc calls in .text when efi_loader=n
Commit 81ea00838c6 ("efi_loader: PSCI reset and shutdown") put the SMCCC assembly code into the efi specific code section. This is wrong when we do not have EFI_LOADER enabled, as that strips efi runtime sections from the output binary
Reported-by Michal Simek <[email protected]>
Fixes 81ea00838c6 ("efi_loader: PSCI reset and shutdown")
Signed-off-by Alexander Graf <[email protected]>
--- arch/arm/cpu/armv7/smccc-call.S | 2 ++ arch/arm/cpu/armv8/smccc-call.S | 2 ++ 2 files changed, 4 insertions(+)
arch/arm/cpu/armv7/smccc-call.S +2 -0
@@ -7,7 +7,9 @@ #include <asm/opcodes-sec.h> #include <asm/opcodes-virt.h> +#ifdef CONFIG_EFI_LOADER .section .text.efi_runtime +#endif #define UNWIND(x...) /*
arch/arm/cpu/armv8/smccc-call.S +2 -0
@@ -6,7 +6,9 @@ #include <linux/arm-smccc.h> #include <generated/asm-offsets.h> +#ifdef CONFIG_EFI_LOADER .section .text.efi_runtime +#endif .macro SMCCC instr .cfi_startproc
Signature · 1 line
2.12.3
PATCH 1/1 arm: Leave smccc calls in .text when efi_loader=n
Quoted 33 lines · Alexander Graf
Commit
81ea00838c6("efi_loader: PSCI reset and shutdown") put the SMCCC assembly code into the efi specific code section. This is wrong when we do not haveEFI_LOADERenabled, as that strips efi runtime sections from the output binaryReported-by Michal Simek <[email protected]>Fixes 81ea00838c6 ("efi_loader: PSCI reset and shutdown")Signed-off-by Alexander Graf <[email protected]>--- arch/arm/cpu/armv7/smccc-call.S | 2 ++ arch/arm/cpu/armv8/smccc-call.S | 2 ++ 2 files changed, 4 insertions(+)arch/arm/cpu/armv7/smccc-call.S +2
-0@@ -7,7 +7,9 @@ #include <asm/opcodes-sec.h> #include <asm/opcodes-virt.h> +#ifdef CONFIG_EFI_LOADER .section .text.efi_runtime +#endif #define UNWIND(x...) /*arch/arm/cpu/armv8/smccc-call.S +0
-0
arch/arm/cpu/armv8/smccc-call.S line 14
Quoted 9 lines
arch/arm/cpu/armv8/smccc-call.S +2
-0@@ -6,7 +6,9 @@ #include <linux/arm-smccc.h> #include <generated/asm-offsets.h> +#ifdef CONFIG_EFI_LOADER .section .text.efi_runtime +#endif .macro SMCCC instr .cfi_startproc
Reported-by Siva Durga Prasad Paladugu <[email protected]>
Tested-by Michal Simek <[email protected]>
Thanks,
Michal
Signature · 5 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Xilinx Microblaze Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs