From dadfbc2e604e636760ab4f1367ebc446a2ca51c2 Mon Sep 17 00:00:00 2001 From: Brandon Bergren Date: Wed, 23 Sep 2020 00:28:47 +0000 Subject: [PATCH] [PowerPC64LE] LE opal_call() implementation OPAL runs in big endian, so we need to rfid into it to switch endian atomically when branching to it, and we need to do the RETURN_TO_NATIVE_ENDIAN dance when it returns to us. Sponsored by: Tag1 Consulting, Inc. --- sys/powerpc/powernv/opal.c | 2 +- sys/powerpc/powernv/opalcall.S | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/sys/powerpc/powernv/opal.c b/sys/powerpc/powernv/opal.c index 63d9c40b30d..ba404f48559 100644 --- a/sys/powerpc/powernv/opal.c +++ b/sys/powerpc/powernv/opal.c @@ -57,7 +57,7 @@ opal_check(void) OF_getencprop(opal, "opal-entry-address", val, sizeof(val)); opal_entrypoint = ((uint64_t)val[0] << 32) | val[1]; - opal_msr = mfmsr() & ~(PSL_EE | PSL_IR | PSL_DR | PSL_SE); + opal_msr = mfmsr() & ~(PSL_EE | PSL_IR | PSL_DR | PSL_SE | PSL_LE); opal_initialized = 1; diff --git a/sys/powerpc/powernv/opalcall.S b/sys/powerpc/powernv/opalcall.S index 56ba5c7f186..208a4d431a2 100644 --- a/sys/powerpc/powernv/opalcall.S +++ b/sys/powerpc/powernv/opalcall.S @@ -84,6 +84,10 @@ ASENTRY(opal_call) xori %r3,%r3,1 #endif +#ifdef __LITTLE_ENDIAN__ + mtsrr1 %r3 +#endif + /* Shift registers over */ mr %r3,%r4 mr %r4,%r5 @@ -93,8 +97,23 @@ ASENTRY(opal_call) mr %r8,%r9 mr %r9,%r10 +#ifdef __LITTLE_ENDIAN__ + /* We need to rfid to switch endian. */ + mfctr %r11 + mtsrr0 %r11 + LOAD_LR_NIA +1: + mflr %r11 + addi %r11, %r11, (2f-1b) + mtlr %r11 + /* Call OPAL */ + rfid +2: + RETURN_TO_NATIVE_ENDIAN +#else /* Call OPAL */ bctrl +#endif /* Restore MSR */ mtmsrd %r31