Fix LEAVE_HYP macro: spsr is not guaranteed to contain valid value at this

point, e.g. on RaspberryPi 2 when control is passed from loader to kernel
it contains garbage. So we use cpsr as a base for new cpsr value: if we
have reached this point it means current value is OK

Reviewed by:	andrew

diff --git a/sys/arm/arm/locore-v6.S b/sys/arm/arm/locore-v6.S
index 5a5222877da946b294f6d8b80c4a636bb56c4b0f..6aa61f358af1864d0e2401de43dad491a7d45196 100644 (file)
--- a/sys/arm/arm/locore-v6.S
+++ b/sys/arm/arm/locore-v6.S
@@ -74,9 +74,11 @@ __FBSDID("$FreeBSD$");
        teq     r0, #(PSR_HYP32_MODE) /* Hyp Mode? */                   ;\
        bne     1f                                                      ;\
        /* Ensure that IRQ, FIQ and Aborts will be disabled after eret */ ;\
-       mrs     r0, spsr                                                ;\
+       mrs     r0, cpsr                                                ;\
+       bic     r0, r0, #(PSR_MODE)                                     ;\
+       orr     r0, r0, #(PSR_SVC32_MODE)                               ;\
        orr     r0, r0, #(PSR_I | PSR_F | PSR_A)                        ;\
-       msr     spsr, r0                                                ;\
+       msr     spsr_cxsf, r0                                           ;\
        /* Exit hypervisor mode */                                      ;\
        adr     lr, 1f                                                  ;\
        MSR_ELR_HYP(14)                                                 ;\