| From 608746fad51559eafa4b6b3fccbf55e78ebb6539 Mon Sep 17 00:00:00 2001 |
| From: Sukadev Bhattiprolu <sukadev@linux.ibm.com> |
| Date: Mon, 6 Jan 2020 13:50:02 -0600 |
| Subject: [PATCH] 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c |
| index e15ccf19c153..79ac87f4d87b 100644 |
| --- a/arch/powerpc/xmon/xmon.c |
| +++ b/arch/powerpc/xmon/xmon.c |
| @@ -1894,15 +1894,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 |
| } |
| |
| -- |
| 2.7.4 |
| |
