Patch "powerpc/xmon: Don't use ld on 32-bit" has been added to the 4.8-stable tree

Patch "powerpc/xmon: Don't use ld on 32-bit" has been added to the 4.8-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    powerpc/xmon: Don't use ld on 32-bit

to the 4.8-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     powerpc-xmon-don-t-use-ld-on-32-bit.patch
and it can be found in the queue-4.8 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From b42d9023a31e384504f5b53fc9a437d5536a3f63 Mon Sep 17 00:00:00 2001
From: Michael Ellerman <mpe@ellerman.id.au>
Date: Fri, 9 Sep 2016 14:01:07 +1000
Subject: powerpc/xmon: Don't use ld on 32-bit

From: Michael Ellerman <mpe@ellerman.id.au>

commit b42d9023a31e384504f5b53fc9a437d5536a3f63 upstream.

In commit 31cdd0c39c75 ("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: 31cdd0c39c75 ("powerpc/xmon: Fix SPR read/write commands and add command to dump SPRs")
Reported-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 arch/powerpc/xmon/spr_access.S |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/arch/powerpc/xmon/spr_access.S
+++ b/arch/powerpc/xmon/spr_access.S
@@ -2,12 +2,12 @@
 
 /* unsigned long xmon_mfspr(sprn, default_value) */
 _GLOBAL(xmon_mfspr)
-	ld	r5, .Lmfspr_table@got(r2)
+	PPC_LL	r5, .Lmfspr_table@got(r2)
 	b	xmon_mxspr
 
 /* void xmon_mtspr(sprn, new_value) */
 _GLOBAL(xmon_mtspr)
-	ld	r5, .Lmtspr_table@got(r2)
+	PPC_LL	r5, .Lmtspr_table@got(r2)
 	b	xmon_mxspr
 
 /*


Patches currently in stable-queue which might be from mpe@ellerman.id.au are

queue-4.8/powerpc-powernv-pass-cpu-endian-pe-number-to-opal_pci_eeh_freeze_clear.patch
queue-4.8/powerpc-powernv-use-cpu-endian-hub-diag-data-type-in-pnv_eeh_get_and_dump_hub_diag.patch
queue-4.8/powerpc-vdso64-use-double-word-compare-on-pointers.patch
queue-4.8/powerpc-mm-hash64-fix-might_have_hea-check.patch
queue-4.8/powerpc-pseries-fix-stack-corruption-in-htpe-code.patch
queue-4.8/powerpc-eeh-null-check-uses-of-eeh_pe_bus_get.patch
queue-4.8/powerpc-mm-update-force_max_zoneorder-range-to-allow-hugetlb-w-4k.patch
queue-4.8/powerpc-powernv-use-cpu-endian-pest-in-pnv_pci_dump_p7ioc_diag_data.patch
queue-4.8/powerpc-64-fix-incorrect-return-value-from-__copy_tofrom_user.patch
queue-4.8/powerpc-xmon-don-t-use-ld-on-32-bit.patch