diff mbox series

powerpc/xmon: don't access ASDR in VMs

Message ID 20200107021633.GB29843@us.ibm.com (mailing list archive)
State Accepted
Commit c2a20711fc181e7f22ee5c16c28cb9578af84729
Headers show
Series powerpc/xmon: don't access ASDR in VMs | expand

Checks

Context Check Description
snowpatch_ozlabs/apply_patch success Successfully applied on branch powerpc/merge (20862247a368dbb75d6e97d82345999adaacf3cc)
snowpatch_ozlabs/build-ppc64le success Build succeeded
snowpatch_ozlabs/build-ppc64be success Build succeeded
snowpatch_ozlabs/build-ppc64e success Build succeeded
snowpatch_ozlabs/build-pmac32 success Build succeeded
snowpatch_ozlabs/checkpatch warning total: 0 errors, 0 warnings, 2 checks, 19 lines checked
snowpatch_ozlabs/needsstable success Patch has no Fixes tags

Commit Message

Sukadev Bhattiprolu Jan. 7, 2020, 2:16 a.m. UTC 
From 91a77dbea3c909ff15c66cded37f1334304a293d 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 1/1] powerpc/xmon: don't access ASDR in VMs

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

Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.ibm.com>
---
 arch/powerpc/xmon/xmon.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

Comments

Andrew Donnellan Jan. 7, 2020, 2:59 a.m. UTC | #1 
On 7/1/20 1:16 pm, Sukadev Bhattiprolu wrote:
>  From 91a77dbea3c909ff15c66cded37f1334304a293d 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 1/1] powerpc/xmon: don't access ASDR in VMs
> 
> ASDR is HV-privileged and must only be accessed in HV-mode.
> Fixes a Program Check (0x700) when xmon in a VM dumps SPRs.
> 
> Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.ibm.com>

I think this should be:

  Fixes: d1e1b351f50f9 ("powerpc/xmon: Add ISA v3.0 SPRs to SPR dump")
  Cc: stable@vger.kernel.org

Apart from that

Reviewed-by: Andrew Donnellan <ajd@linux.ibm.com>
Michael Ellerman Jan. 29, 2020, 5:17 a.m. UTC | #2 
On Tue, 2020-01-07 at 02:16:33 UTC, Sukadev Bhattiprolu wrote:
> >From 91a77dbea3c909ff15c66cded37f1334304a293d 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 1/1] powerpc/xmon: don't access ASDR in VMs
> 
> ASDR is HV-privileged and must only be accessed in HV-mode.
> Fixes a Program Check (0x700) when xmon in a VM dumps SPRs.
> 
> Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.ibm.com>

Applied to powerpc next, thanks.

https://git.kernel.org/powerpc/c/c2a20711fc181e7f22ee5c16c28cb9578af84729

cheers
diff mbox series

Patch

diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 02fae453c2ec..b8d179b5cf4f 100644
--- 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
 }