LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm: Leave smccc calls in .text when efi_loader=n 

Commit 81ea00838c ("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 <monstr@monstr.eu>
Reported-by: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
Tested-by: Michal Simek <monstr@monstr.eu>
Fixes: 81ea00838c ("efi_loader: PSCI reset and shutdown")
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Alexander Graf 2019-02-11 15:07:17 +01:00
parent 6f8f4217e7
commit 2f8ab1218f
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/cpu/armv7/smccc-call.S
View File

@ -7,7 +7,9 @@
#include <asm/opcodes-sec.h> #include <asm/opcodes-sec.h>
#include <asm/opcodes-virt.h> #include <asm/opcodes-virt.h>
#ifdef CONFIG_EFI_LOADER
.section .text.efi_runtime .section .text.efi_runtime
#endif
#define UNWIND(x...) #define UNWIND(x...)
/* /*

2
arch/arm/cpu/armv8/smccc-call.S
View File

@ -6,7 +6,9 @@
#include <linux/arm-smccc.h> #include <linux/arm-smccc.h>
#include <generated/asm-offsets.h> #include <generated/asm-offsets.h>
#ifdef CONFIG_EFI_LOADER
.section .text.efi_runtime .section .text.efi_runtime
#endif
.macro SMCCC instr .macro SMCCC instr
.cfi_startproc .cfi_startproc