forked from Minki/linux
b42d9023a3
In commit31cdd0c39c("powerpc/xmon: Fix SPR read/write commands and add command to dump SPRs") I added two uses of the "ld" instruction in spr_access.S. "ld" is a 64-bit instruction, so shouldn't be used on 32-bit CPUs. Replace it with PPC_LL which is a macro that gives us either "ld" or "lwz" depending on whether we're 64 or 32-bit. Fixes:31cdd0c39c("powerpc/xmon: Fix SPR read/write commands and add command to dump SPRs") Cc: stable@vger.kernel.org # v4.7+ Reported-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
46 lines
747 B
ArmAsm
46 lines
747 B
ArmAsm
#include <asm/ppc_asm.h>
|
|
|
|
/* unsigned long xmon_mfspr(sprn, default_value) */
|
|
_GLOBAL(xmon_mfspr)
|
|
PPC_LL r5, .Lmfspr_table@got(r2)
|
|
b xmon_mxspr
|
|
|
|
/* void xmon_mtspr(sprn, new_value) */
|
|
_GLOBAL(xmon_mtspr)
|
|
PPC_LL r5, .Lmtspr_table@got(r2)
|
|
b xmon_mxspr
|
|
|
|
/*
|
|
* r3 = sprn
|
|
* r4 = default or new value
|
|
* r5 = table base
|
|
*/
|
|
xmon_mxspr:
|
|
/*
|
|
* To index into the table of mxsprs we need:
|
|
* i = (sprn & 0x3ff) * 8
|
|
* or using rwlinm:
|
|
* i = (sprn << 3) & (0x3ff << 3)
|
|
*/
|
|
rlwinm r3, r3, 3, 0x3ff << 3
|
|
add r5, r5, r3
|
|
mtctr r5
|
|
mr r3, r4 /* put default_value in r3 for mfspr */
|
|
bctr
|
|
|
|
.Lmfspr_table:
|
|
spr = 0
|
|
.rept 1024
|
|
mfspr r3, spr
|
|
blr
|
|
spr = spr + 1
|
|
.endr
|
|
|
|
.Lmtspr_table:
|
|
spr = 0
|
|
.rept 1024
|
|
mtspr spr, r4
|
|
blr
|
|
spr = spr + 1
|
|
.endr
|