powerpc/xmon: don't access ASDR in VMs

commit c2a20711fc181e7f22ee5c16c28cb9578af84729 upstream.

ASDR is HV-privileged and must only be accessed in HV-mode.
Fixes a Program Check (0x700) when xmon in a VM dumps SPRs.

Fixes: d1e1b351f50f ("powerpc/xmon: Add ISA v3.0 SPRs to SPR dump")
Cc: stable@vger.kernel.org # v4.14+
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.ibm.com>
Reviewed-by: Andrew Donnellan <ajd@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200107021633.GB29843@us.ibm.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index a7056049709eff4816186455dac2c774ee2de1c2..03d23075ac4390e44223739fb239c7910310c657 100644 (file)
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -1949,15 +1949,14 @@ static void dump_300_sprs(void)
 
        printf("pidr   = %.16lx  tidr  = %.16lx\n",
                mfspr(SPRN_PID), mfspr(SPRN_TIDR));
-       printf("asdr   = %.16lx  psscr = %.16lx\n",
-               mfspr(SPRN_ASDR), hv ? mfspr(SPRN_PSSCR)
-                                       : mfspr(SPRN_PSSCR_PR));
+       printf("psscr  = %.16lx\n",
+               hv ? mfspr(SPRN_PSSCR) : mfspr(SPRN_PSSCR_PR));
 
        if (!hv)
                return;
 
-       printf("ptcr   = %.16lx\n",
-               mfspr(SPRN_PTCR));
+       printf("ptcr   = %.16lx  asdr  = %.16lx\n",
+               mfspr(SPRN_PTCR), mfspr(SPRN_ASDR));
 #endif
 }