[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[xen master] Arm32: MSR to SPSR needs qualification

commit 93031fbe9f4c341a2e7950a088025ea550291433
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Fri Jun 11 15:04:24 2021 +0200
Commit:     Stefano Stabellini <sstabellini@xxxxxxxxxx>
CommitDate: Fri Jun 11 15:05:24 2021 -0700

    Arm32: MSR to SPSR needs qualification
    The Arm ARM's description of MSR (ARM DDI 0406C.d section B9.3.12)
    doesn't even allow for plain "SPSR" here, and while gas accepts this, it
    takes it to mean SPSR_cf. Yet surely all of SPSR wants updating on this
    path, not just the lowest and highest 8 bits.
    Fixes: dfcffb128be4 ("xen/arm32: SPSR_hyp/SPSR")
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Reviewed-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>
 xen/arch/arm/arm32/entry.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xen/arch/arm/arm32/entry.S b/xen/arch/arm/arm32/entry.S
index 4e421109db..38826142ad 100644
--- a/xen/arch/arm/arm32/entry.S
+++ b/xen/arch/arm/arm32/entry.S
@@ -395,7 +395,7 @@ return_to_hypervisor:
         ldr r11, [sp, #UREGS_pc]
         msr ELR_hyp, r11
         ldr r11, [sp, #UREGS_cpsr]
-        msr SPSR, r11
+        msr SPSR_cxsf, r11
          * Hardening branch predictor may require to setup a different
generated by git-patchbot for /home/xen/git/xen.git#master



Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.