From: Alexander Graf <agraf@suse.de>
Date: Mon, 11 Feb 2019 14:07:17 +0000 (+0100)
Subject: arm: Leave smccc calls in .text when efi_loader=n
X-Git-Tag: v2019.04-rc2~13^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2f8ab1218f74dbaeffffb0a53094ead58bee41c5;p=platform%2Fkernel%2Fu-boot.git

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 <monstr@monstr.eu>
Reported-by: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
Tested-by: Michal Simek <monstr@monstr.eu>
Fixes: 81ea00838c6 ("efi_loader: PSCI reset and shutdown")
Signed-off-by: Alexander Graf <agraf@suse.de>
---

diff --git a/arch/arm/cpu/armv7/smccc-call.S b/arch/arm/cpu/armv7/smccc-call.S
index eae69e3..f70728f 100644
--- a/arch/arm/cpu/armv7/smccc-call.S
+++ b/arch/arm/cpu/armv7/smccc-call.S
@@ -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...)
 	/*
diff --git a/arch/arm/cpu/armv8/smccc-call.S b/arch/arm/cpu/armv8/smccc-call.S
index 86de4b4..dc92b28 100644
--- a/arch/arm/cpu/armv8/smccc-call.S
+++ b/arch/arm/cpu/armv8/smccc-call.S
@@ -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