Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 23:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

arm: Disable HVC PSCI calls by default

Browse source 
All systems that are running on armv8 are running bare metal with firmware
that implements PSCI running in EL3. That means we don't really need to expose
the hypercall variants of them.

This patch leaves the code in, but makes the code explicit enough to have the
compiler optimize it out. With this we don't need to worry about hvc vs smc
calling convention when calling psci helper functions.

Signed-off-by: Alexander Graf <agraf@suse.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Alexander Graf 2016-08-16 21:08:46 +02:00
parent 80a4800ee1
commit 51bfb5b6f5
4 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
arch/arm/cpu/armv8/fwcall.c
View file

@ -17,7 +17,7 @@
* x0~x7: input arguments * x0~x7: input arguments
* x0~x3: output arguments * x0~x3: output arguments
*/ */
void hvc_call(struct pt_regs *args) static void hvc_call(struct pt_regs *args)
{ {
asm volatile( asm volatile(
"ldr x0, %0\n" "ldr x0, %0\n"
@ -75,13 +75,21 @@ void smc_call(struct pt_regs *args)
"x16", "x17"); "x16", "x17");
} }
void __noreturn psci_system_reset(bool conduit_smc) /*
* For now, all systems we support run at least in EL2 and thus
* trigger PSCI calls to EL3 using SMC. If anyone ever wants to
* use PSCI on U-Boot running below a hypervisor, please detect
* this and set the flag accordingly.
*/
static const bool use_smc_for_psci = true;
void __noreturn psci_system_reset(void)
{ {
struct pt_regs regs; struct pt_regs regs;
regs.regs[0] = ARM_PSCI_0_2_FN_SYSTEM_RESET; regs.regs[0] = ARM_PSCI_0_2_FN_SYSTEM_RESET;
if (conduit_smc) if (use_smc_for_psci)
smc_call(&regs); smc_call(&regs);
else else
hvc_call(&regs); hvc_call(&regs);

11
arch/arm/include/asm/system.h
View file

@ -106,15 +106,6 @@ void smp_kick_all_cpus(void);
void flush_l3_cache(void); void flush_l3_cache(void);
/*
*Issue a hypervisor call in accordance with ARM "SMC Calling convention",
* DEN0028A
*
* @args: input and output arguments
*
*/
void hvc_call(struct pt_regs *args);
/* /*
*Issue a secure monitor call in accordance with ARM "SMC Calling convention", *Issue a secure monitor call in accordance with ARM "SMC Calling convention",
* DEN0028A * DEN0028A
@ -124,7 +115,7 @@ void hvc_call(struct pt_regs *args);
*/ */
void smc_call(struct pt_regs *args); void smc_call(struct pt_regs *args);
void __noreturn psci_system_reset(bool smc); void __noreturn psci_system_reset(void);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */

2
arch/arm/mach-meson/board.c
View file

@ -43,7 +43,7 @@ void dram_init_banksize(void)
void reset_cpu(ulong addr) void reset_cpu(ulong addr)
{ {
psci_system_reset(true); psci_system_reset();
} }
static struct mm_region gxbb_mem_map[] = { static struct mm_region gxbb_mem_map[] = {

2
board/xilinx/zynqmp/zynqmp.c
View file

@ -430,5 +430,5 @@ int board_usb_cleanup(int index, enum usb_init_type init)
void reset_misc(void) void reset_misc(void)
{ {
psci_system_reset(true); psci_system_reset();
} }