[Xen-devel,v4,12/19] fixup! xen/arm64: Add ARM_SMCCC_ARCH_WORKAROUND_1 BP hardening support

Message ID 20180223164753.27311-13-julien.grall@arm.com
State New
Headers show
Series
  • xen/arm: PSCI 1.1 and SMCCC-1.1 support and XSA-254 variant 2 update
Related show

Commit Message

Julien Grall Feb. 23, 2018, 4:47 p.m.
---
 xen/arch/arm/arm64/bpi.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/xen/arch/arm/arm64/bpi.S b/xen/arch/arm/arm64/bpi.S
index 981fb83a88..b59e307b0f 100644
--- a/xen/arch/arm/arm64/bpi.S
+++ b/xen/arch/arm/arm64/bpi.S
@@ -85,8 +85,8 @@  ENTRY(__psci_hyp_bp_inval_end)
 
 ENTRY(__smccc_workaround_1_smc_start)
     sub     sp, sp, #(8 * 4)
-    stp     x2, x3, [sp, #(8 * 0)]
     stp     x0, x1, [sp, #(8 * 2)]
+    stp     x2, x3, [sp, #(8 * 0)]
     mov     w0, #ARM_SMCCC_ARCH_WORKAROUND_1_FID
     smc     #0
     ldp     x2, x3, [sp, #(8 * 0)]