* [PATCH 1/5] powerpc/xmon: Remove unused externs
@ 2016-07-07 12:54 Michael Ellerman
2016-07-07 12:54 ` [PATCH 2/5] powerpc/xmon: Move static regno into its only user Michael Ellerman
` (4 more replies)
0 siblings, 5 replies; 10+ messages in thread
From: Michael Ellerman @ 2016-07-07 12:54 UTC (permalink / raw)
To: linuxppc-dev
None of these are used, or have been since we merged ppc & ppc64.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
arch/powerpc/xmon/xmon.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index c5e155108be5..f351ba6a58ab 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -184,9 +184,6 @@ static void dump_tlb_book3e(void);
static int xmon_no_auto_backtrace;
-extern void xmon_enter(void);
-extern void xmon_leave(void);
-
#ifdef CONFIG_PPC64
#define REG "%.16lx"
#else
@@ -1686,8 +1683,6 @@ write_spr(int n, unsigned long val)
}
static unsigned long regno;
-extern char exc_prolog;
-extern char dec_exc;
static void dump_one_spr(int spr, bool show_unimplemented)
{
--
2.7.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/5] powerpc/xmon: Move static regno into its only user
2016-07-07 12:54 [PATCH 1/5] powerpc/xmon: Remove unused externs Michael Ellerman
@ 2016-07-07 12:54 ` Michael Ellerman
2016-07-15 10:53 ` [2/5] " Michael Ellerman
2016-07-07 12:54 ` [PATCH 3/5] powerpc/xmon: Adjust spacing of existing SPRs to make room for more Michael Ellerman
` (3 subsequent siblings)
4 siblings, 1 reply; 10+ messages in thread
From: Michael Ellerman @ 2016-07-07 12:54 UTC (permalink / raw)
To: linuxppc-dev
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
arch/powerpc/xmon/xmon.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index f351ba6a58ab..369501283994 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -1682,7 +1682,6 @@ write_spr(int n, unsigned long val)
catch_spr_faults = 0;
}
-static unsigned long regno;
static void dump_one_spr(int spr, bool show_unimplemented)
{
@@ -1714,6 +1713,7 @@ static void dump_one_spr(int spr, bool show_unimplemented)
static void super_regs(void)
{
+ static unsigned long regno;
int cmd;
int spr;
--
2.7.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/5] powerpc/xmon: Adjust spacing of existing SPRs to make room for more
2016-07-07 12:54 [PATCH 1/5] powerpc/xmon: Remove unused externs Michael Ellerman
2016-07-07 12:54 ` [PATCH 2/5] powerpc/xmon: Move static regno into its only user Michael Ellerman
@ 2016-07-07 12:54 ` Michael Ellerman
2016-07-15 10:53 ` [3/5] " Michael Ellerman
2016-07-07 12:54 ` [PATCH 4/5] powerpc/xmon: Dump ISA 2.06 SPRs Michael Ellerman
` (2 subsequent siblings)
4 siblings, 1 reply; 10+ messages in thread
From: Michael Ellerman @ 2016-07-07 12:54 UTC (permalink / raw)
To: linuxppc-dev
Purely to make it pleasing to the eye.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
arch/powerpc/xmon/xmon.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 369501283994..efe6f4ee4634 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -1725,14 +1725,15 @@ static void super_regs(void)
asm("mr %0,1" : "=r" (sp) :);
asm("mr %0,2" : "=r" (toc) :);
- printf("msr = "REG" sprg0= "REG"\n",
+ printf("msr = "REG" sprg0 = "REG"\n",
mfmsr(), mfspr(SPRN_SPRG0));
- printf("pvr = "REG" sprg1= "REG"\n",
+ printf("pvr = "REG" sprg1 = "REG"\n",
mfspr(SPRN_PVR), mfspr(SPRN_SPRG1));
- printf("dec = "REG" sprg2= "REG"\n",
+ printf("dec = "REG" sprg2 = "REG"\n",
mfspr(SPRN_DEC), mfspr(SPRN_SPRG2));
- printf("sp = "REG" sprg3= "REG"\n", sp, mfspr(SPRN_SPRG3));
- printf("toc = "REG" dar = "REG"\n", toc, mfspr(SPRN_DAR));
+ printf("sp = "REG" sprg3 = "REG"\n", sp, mfspr(SPRN_SPRG3));
+ printf("toc = "REG" dar = "REG"\n", toc, mfspr(SPRN_DAR));
+
return;
}
case 'w': {
--
2.7.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 4/5] powerpc/xmon: Dump ISA 2.06 SPRs
2016-07-07 12:54 [PATCH 1/5] powerpc/xmon: Remove unused externs Michael Ellerman
2016-07-07 12:54 ` [PATCH 2/5] powerpc/xmon: Move static regno into its only user Michael Ellerman
2016-07-07 12:54 ` [PATCH 3/5] powerpc/xmon: Adjust spacing of existing SPRs to make room for more Michael Ellerman
@ 2016-07-07 12:54 ` Michael Ellerman
2016-07-15 10:53 ` [4/5] " Michael Ellerman
2016-07-07 12:54 ` [PATCH 5/5] powerpc/xmon: Dump ISA 2.07 SPRs Michael Ellerman
2016-07-15 10:53 ` [1/5] powerpc/xmon: Remove unused externs Michael Ellerman
4 siblings, 1 reply; 10+ messages in thread
From: Michael Ellerman @ 2016-07-07 12:54 UTC (permalink / raw)
To: linuxppc-dev
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
arch/powerpc/xmon/xmon.c | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index efe6f4ee4634..ed6f73a74378 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -1682,6 +1682,35 @@ write_spr(int n, unsigned long val)
catch_spr_faults = 0;
}
+static void dump_206_sprs(void)
+{
+#ifdef CONFIG_PPC64
+ if (!cpu_has_feature(CPU_FTR_ARCH_206))
+ return;
+
+ /* Actually some of these pre-date 2.06, but whatevs */
+
+ printf("srr0 = %.16x srr1 = %.16x dsisr = %.8x\n",
+ mfspr(SPRN_SRR0), mfspr(SPRN_SRR1), mfspr(SPRN_DSISR));
+ printf("dscr = %.16x ppr = %.16x pir = %.8x\n",
+ mfspr(SPRN_DSCR), mfspr(SPRN_PPR), mfspr(SPRN_PIR));
+
+ if (!(mfmsr() & MSR_HV))
+ return;
+
+ printf("sdr1 = %.16x hdar = %.16x hdsisr = %.8x\n",
+ mfspr(SPRN_SDR1), mfspr(SPRN_HDAR), mfspr(SPRN_HDSISR));
+ printf("hsrr0 = %.16x hsrr1 = %.16x hdec = %.8x\n",
+ mfspr(SPRN_HSRR0), mfspr(SPRN_HSRR1), mfspr(SPRN_HDEC));
+ printf("lpcr = %.16x pcr = %.16x lpidr = %.8x\n",
+ mfspr(SPRN_LPCR), mfspr(SPRN_PCR), mfspr(SPRN_LPID));
+ printf("hsprg0 = %.16x hsprg1 = %.16x\n",
+ mfspr(SPRN_HSPRG0), mfspr(SPRN_HSPRG1));
+ printf("dabr = %.16x dabrx = %.16x\n",
+ mfspr(SPRN_DABR), mfspr(SPRN_DABRX));
+#endif
+}
+
static void dump_one_spr(int spr, bool show_unimplemented)
{
@@ -1734,6 +1763,8 @@ static void super_regs(void)
printf("sp = "REG" sprg3 = "REG"\n", sp, mfspr(SPRN_SPRG3));
printf("toc = "REG" dar = "REG"\n", toc, mfspr(SPRN_DAR));
+ dump_206_sprs();
+
return;
}
case 'w': {
--
2.7.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 5/5] powerpc/xmon: Dump ISA 2.07 SPRs
2016-07-07 12:54 [PATCH 1/5] powerpc/xmon: Remove unused externs Michael Ellerman
` (2 preceding siblings ...)
2016-07-07 12:54 ` [PATCH 4/5] powerpc/xmon: Dump ISA 2.06 SPRs Michael Ellerman
@ 2016-07-07 12:54 ` Michael Ellerman
2016-07-15 10:53 ` [5/5] " Michael Ellerman
2016-07-15 10:53 ` [1/5] powerpc/xmon: Remove unused externs Michael Ellerman
4 siblings, 1 reply; 10+ messages in thread
From: Michael Ellerman @ 2016-07-07 12:54 UTC (permalink / raw)
To: linuxppc-dev
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
arch/powerpc/include/asm/reg.h | 1 +
arch/powerpc/xmon/xmon.c | 44 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 45 insertions(+)
diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
index 320136f5fe28..ac4be83f8fdc 100644
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@ -268,6 +268,7 @@
#define DSISR_KEYFAULT 0x00200000 /* Key fault */
#define SPRN_TBRL 0x10C /* Time Base Read Lower Register (user, R/O) */
#define SPRN_TBRU 0x10D /* Time Base Read Upper Register (user, R/O) */
+#define SPRN_CIR 0x11B /* Chip Information Register (hyper, R/0) */
#define SPRN_TBWL 0x11C /* Time Base Lower Register (super, R/W) */
#define SPRN_TBWU 0x11D /* Time Base Upper Register (super, R/W) */
#define SPRN_TBU40 0x11E /* Timebase upper 40 bits (hyper, R/W) */
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index ed6f73a74378..e6036b2da69a 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -1711,6 +1711,49 @@ static void dump_206_sprs(void)
#endif
}
+static void dump_207_sprs(void)
+{
+#ifdef CONFIG_PPC64
+ unsigned long msr;
+
+ if (!cpu_has_feature(CPU_FTR_ARCH_207S))
+ return;
+
+ printf("dpdes = %.16x tir = %.16x cir = %.8x\n",
+ mfspr(SPRN_DPDES), mfspr(SPRN_TIR), mfspr(SPRN_CIR));
+
+ printf("fscr = %.16x tar = %.16x pspb = %.8x\n",
+ mfspr(SPRN_FSCR), mfspr(SPRN_TAR), mfspr(SPRN_PSPB));
+
+ msr = mfmsr();
+ if (msr & MSR_TM) {
+ /* Only if TM has been enabled in the kernel */
+ printf("tfhar = %.16x tfiar = %.16x texasr = %.16x\n",
+ mfspr(SPRN_TFHAR), mfspr(SPRN_TFIAR),
+ mfspr(SPRN_TEXASR));
+ }
+
+ printf("mmcr0 = %.16x mmcr1 = %.16x mmcr2 = %.16x\n",
+ mfspr(SPRN_MMCR0), mfspr(SPRN_MMCR1), mfspr(SPRN_MMCR2));
+ printf("pmc1 = %.8x pmc2 = %.8x pmc3 = %.8x pmc4 = %.8x\n",
+ mfspr(SPRN_PMC1), mfspr(SPRN_PMC2),
+ mfspr(SPRN_PMC3), mfspr(SPRN_PMC4));
+ printf("mmcra = %.16x siar = %.16x pmc5 = %.8x\n",
+ mfspr(SPRN_MMCRA), mfspr(SPRN_SIAR), mfspr(SPRN_PMC5));
+ printf("sdar = %.16x sier = %.16x pmc6 = %.8x\n",
+ mfspr(SPRN_SDAR), mfspr(SPRN_SIER), mfspr(SPRN_PMC6));
+ printf("ebbhr = %.16x ebbrr = %.16x bescr = %.16x\n",
+ mfspr(SPRN_EBBHR), mfspr(SPRN_EBBRR), mfspr(SPRN_BESCR));
+
+ if (!(msr & MSR_HV))
+ return;
+
+ printf("hfscr = %.16x dhdes = %.16x rpr = %.16x\n",
+ mfspr(SPRN_HFSCR), mfspr(SPRN_DHDES), mfspr(SPRN_RPR));
+ printf("dawr = %.16x dawrx = %.16x ciabr = %.16x\n",
+ mfspr(SPRN_DAWR), mfspr(SPRN_DAWRX), mfspr(SPRN_CIABR));
+#endif
+}
static void dump_one_spr(int spr, bool show_unimplemented)
{
@@ -1764,6 +1807,7 @@ static void super_regs(void)
printf("toc = "REG" dar = "REG"\n", toc, mfspr(SPRN_DAR));
dump_206_sprs();
+ dump_207_sprs();
return;
}
--
2.7.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [1/5] powerpc/xmon: Remove unused externs
2016-07-07 12:54 [PATCH 1/5] powerpc/xmon: Remove unused externs Michael Ellerman
` (3 preceding siblings ...)
2016-07-07 12:54 ` [PATCH 5/5] powerpc/xmon: Dump ISA 2.07 SPRs Michael Ellerman
@ 2016-07-15 10:53 ` Michael Ellerman
4 siblings, 0 replies; 10+ messages in thread
From: Michael Ellerman @ 2016-07-15 10:53 UTC (permalink / raw)
To: Michael Ellerman, linuxppc-dev
On Thu, 2016-07-07 at 12:54:26 UTC, Michael Ellerman wrote:
> None of these are used, or have been since we merged ppc & ppc64.
>
> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Applied to powerpc next.
https://git.kernel.org/powerpc/c/5b71eff78267a1e0d2f178a8b5
cheers
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [2/5] powerpc/xmon: Move static regno into its only user
2016-07-07 12:54 ` [PATCH 2/5] powerpc/xmon: Move static regno into its only user Michael Ellerman
@ 2016-07-15 10:53 ` Michael Ellerman
0 siblings, 0 replies; 10+ messages in thread
From: Michael Ellerman @ 2016-07-15 10:53 UTC (permalink / raw)
To: Michael Ellerman, linuxppc-dev
On Thu, 2016-07-07 at 12:54:27 UTC, Michael Ellerman wrote:
> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Applied to powerpc next.
https://git.kernel.org/powerpc/c/13629dad1e30e310bb21baa102
cheers
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [3/5] powerpc/xmon: Adjust spacing of existing SPRs to make room for more
2016-07-07 12:54 ` [PATCH 3/5] powerpc/xmon: Adjust spacing of existing SPRs to make room for more Michael Ellerman
@ 2016-07-15 10:53 ` Michael Ellerman
0 siblings, 0 replies; 10+ messages in thread
From: Michael Ellerman @ 2016-07-15 10:53 UTC (permalink / raw)
To: Michael Ellerman, linuxppc-dev
On Thu, 2016-07-07 at 12:54:28 UTC, Michael Ellerman wrote:
> Purely to make it pleasing to the eye.
>
> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Applied to powerpc next.
https://git.kernel.org/powerpc/c/56346ad88d65fd60dde7b0535f
cheers
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [4/5] powerpc/xmon: Dump ISA 2.06 SPRs
2016-07-07 12:54 ` [PATCH 4/5] powerpc/xmon: Dump ISA 2.06 SPRs Michael Ellerman
@ 2016-07-15 10:53 ` Michael Ellerman
0 siblings, 0 replies; 10+ messages in thread
From: Michael Ellerman @ 2016-07-15 10:53 UTC (permalink / raw)
To: Michael Ellerman, linuxppc-dev
On Thu, 2016-07-07 at 12:54:29 UTC, Michael Ellerman wrote:
> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Applied to powerpc next.
https://git.kernel.org/powerpc/c/1846193b178dcc58435fdc5735
cheers
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [5/5] powerpc/xmon: Dump ISA 2.07 SPRs
2016-07-07 12:54 ` [PATCH 5/5] powerpc/xmon: Dump ISA 2.07 SPRs Michael Ellerman
@ 2016-07-15 10:53 ` Michael Ellerman
0 siblings, 0 replies; 10+ messages in thread
From: Michael Ellerman @ 2016-07-15 10:53 UTC (permalink / raw)
To: Michael Ellerman, linuxppc-dev
On Thu, 2016-07-07 at 12:54:30 UTC, Michael Ellerman wrote:
> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Applied to powerpc next.
https://git.kernel.org/powerpc/c/e0ddf7a24558b356d5cf5ecc12
cheers
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2016-07-15 10:53 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-07 12:54 [PATCH 1/5] powerpc/xmon: Remove unused externs Michael Ellerman
2016-07-07 12:54 ` [PATCH 2/5] powerpc/xmon: Move static regno into its only user Michael Ellerman
2016-07-15 10:53 ` [2/5] " Michael Ellerman
2016-07-07 12:54 ` [PATCH 3/5] powerpc/xmon: Adjust spacing of existing SPRs to make room for more Michael Ellerman
2016-07-15 10:53 ` [3/5] " Michael Ellerman
2016-07-07 12:54 ` [PATCH 4/5] powerpc/xmon: Dump ISA 2.06 SPRs Michael Ellerman
2016-07-15 10:53 ` [4/5] " Michael Ellerman
2016-07-07 12:54 ` [PATCH 5/5] powerpc/xmon: Dump ISA 2.07 SPRs Michael Ellerman
2016-07-15 10:53 ` [5/5] " Michael Ellerman
2016-07-15 10:53 ` [1/5] powerpc/xmon: Remove unused externs Michael Ellerman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.