Skip to contentSkip to conversation

Add new PowerPC Special Purpose Registers

PATCH In review dan tan 3 participants 5 messages Jan 7, 2025 – Jan 9, 2025

lore
Share & tools
lore

dan tan

author
#0 lore raw

v3 cover Add new PowerPC Special Purpose Registers

From: dan tan <[email protected]>

*** BLURB HERE ***
Version 3 summary:
RWMR (Region Weighted Mode Register) -
- change the register to generic read/write from nop/write

Version 2 summary:
(DAWR1,DAWRX1):
- spec reference: https://files.openpower.foundation/s/EgCy7C43p2NSRfR
- corrected commit message format
- combine DAWR(0/1) handling into a single function
- add DAWR1 & DAWRX1 to init_proc_POWER10() only.

RWMR (Region Weighted Mode Register) -
- corrected the previous definition as ITV1
- spec reference:
https://ibm.ent.box.com/s/tmklq90ze7aj8f4n32er1mu3sy9u8k3k (Power9)
- it appears that part of the previous upstream request SPRs (SPR_POWER_MMCR3, SPR_POWER_SIER2, SPR_POWER_SIER3) are already in the current master. Therefore, removed those from this request.

dan tan (2):
ppc/pnv: Add new PowerPC Special Purpose Registers (DAWR1,DAWRX1) ppc/pnv: Add new PowerPC Special Purpose Registers (RWMR)

 include/hw/ppc/spapr.h   |  2 +-
 target/ppc/cpu.h         |  8 +++--
 target/ppc/helper.h      |  4 +--
 target/ppc/spr_common.h  |  2 ++
 hw/ppc/spapr_hcall.c     | 24 ++++++++------
 target/ppc/cpu.c         | 69 ++++++++++++++++++++++++++--------------
 target/ppc/cpu_init.c    | 20 ++++++++++++
 target/ppc/excp_helper.c | 11 ++++++-
 target/ppc/machine.c     |  5 ++-
 target/ppc/misc_helper.c |  8 ++---
 target/ppc/translate.c   | 21 ++++++++++--
 11 files changed, 127 insertions(+), 47 deletions(-)
Signature · 1 line
2.39.5
author
#1 lore raw

PATCH v3 1/2 ppc/pnv: Add new PowerPC Special Purpose Registers (DAWR1, DAWRX1)

From: dan tan <[email protected]>

The handling of the following two registers are added to POWER10 -
- DAWR1 (0x0bd, 189) - Data Address Watchpoint 1
- DAWRX1 (0x0b5, 181) - Data Address Watchpoint Extension 1

---
ver 3 no change

ver 2 summary:
- spec reference: https://files.openpower.foundation/s/EgCy7C43p2NSRfR
- corrected commit message format
- combine DAWR(0/1) handling into a single function
- add DAWR1 & DAWRX1 to init_proc_POWER10() only.

---
 include/hw/ppc/spapr.h   |  2 +-
 target/ppc/cpu.h         |  7 ++--
 target/ppc/helper.h      |  4 +--
 target/ppc/spr_common.h  |  2 ++
 hw/ppc/spapr_hcall.c     | 24 ++++++++------
 target/ppc/cpu.c         | 69 ++++++++++++++++++++++++++--------------
 target/ppc/cpu_init.c    | 15 +++++++++
 target/ppc/excp_helper.c | 11 ++++++-
 target/ppc/machine.c     |  5 ++-
 target/ppc/misc_helper.c |  8 ++---
 target/ppc/translate.c   | 21 ++++++++++--
 11 files changed, 121 insertions(+), 47 deletions(-)
include/hw/ppc/spapr.h +1 -1
index af4aa1cb0f..8282136745 100644
@@ -403,7 +403,7 @@ struct SpaprMachineState {
 
 /* Values for 2nd argument to H_SET_MODE */
 #define H_SET_MODE_RESOURCE_SET_CIABR           1
-#define H_SET_MODE_RESOURCE_SET_DAWR0           2
+#define H_SET_MODE_RESOURCE_SET_DAWR            2
 #define H_SET_MODE_RESOURCE_ADDR_TRANS_MODE     3
 #define H_SET_MODE_RESOURCE_LE                  4
 
target/ppc/cpu.h +4 -3
index 2ffac2ed03..6d074e67dc 100644
@@ -1261,6 +1261,7 @@ struct CPUArchState {
     ppc_slb_t slb[MAX_SLB_ENTRIES]; /* PowerPC 64 SLB area */
     struct CPUBreakpoint *ciabr_breakpoint;
     struct CPUWatchpoint *dawr0_watchpoint;
+    struct CPUWatchpoint *dawr1_watchpoint;
 #endif
     target_ulong sr[32];   /* segment registers */
     uint32_t nb_BATs;      /* number of BATs */
@@ -1587,9 +1588,9 @@ void ppc_store_sdr1(CPUPPCState *env, target_ulong value);
 void ppc_store_lpcr(PowerPCCPU *cpu, target_ulong val);
 void ppc_update_ciabr(CPUPPCState *env);
 void ppc_store_ciabr(CPUPPCState *env, target_ulong value);
-void ppc_update_daw0(CPUPPCState *env);
-void ppc_store_dawr0(CPUPPCState *env, target_ulong value);
-void ppc_store_dawrx0(CPUPPCState *env, uint32_t value);
+void ppc_update_daw(CPUPPCState *env, uint32_t daw);
+void ppc_store_dawr(CPUPPCState *env, target_ulong value, uint32_t dawr);
+void ppc_store_dawrx(CPUPPCState *env, uint32_t value, uint32_t dawrx);
 #endif /* !defined(CONFIG_USER_ONLY) */
 void ppc_store_msr(CPUPPCState *env, target_ulong value);
 
target/ppc/helper.h +2 -2
index 5a77e761bd..28d6bf1bde 100644
@@ -26,8 +26,8 @@ DEF_HELPER_2(rfebb, void, env, tl)
 DEF_HELPER_2(store_lpcr, void, env, tl)
 DEF_HELPER_2(store_pcr, void, env, tl)
 DEF_HELPER_2(store_ciabr, void, env, tl)
-DEF_HELPER_2(store_dawr0, void, env, tl)
-DEF_HELPER_2(store_dawrx0, void, env, tl)
+DEF_HELPER_3(store_dawr, void, env, tl, i32)
+DEF_HELPER_3(store_dawrx, void, env, tl, i32)
 DEF_HELPER_2(store_mmcr0, void, env, tl)
 DEF_HELPER_2(store_mmcr1, void, env, tl)
 DEF_HELPER_2(store_mmcrA, void, env, tl)
target/ppc/spr_common.h +2 -0
index 01aff449bc..ff67139ec1 100644
@@ -164,7 +164,9 @@ void spr_read_cfar(DisasContext *ctx, int gprn, int sprn);
 void spr_write_cfar(DisasContext *ctx, int sprn, int gprn);
 void spr_write_ciabr(DisasContext *ctx, int sprn, int gprn);
 void spr_write_dawr0(DisasContext *ctx, int sprn, int gprn);
+void spr_write_dawr1(DisasContext *ctx, int sprn, int gprn);
 void spr_write_dawrx0(DisasContext *ctx, int sprn, int gprn);
+void spr_write_dawrx1(DisasContext *ctx, int sprn, int gprn);
 void spr_write_ureg(DisasContext *ctx, int sprn, int gprn);
 void spr_read_purr(DisasContext *ctx, int gprn, int sprn);
 void spr_write_purr(DisasContext *ctx, int sprn, int gprn);
hw/ppc/spapr_hcall.c +14 -10
index 5e1d020e3d..e693e950a7 100644
@@ -818,11 +818,11 @@ static target_ulong h_set_mode_resource_set_ciabr(PowerPCCPU *cpu,
     return H_SUCCESS;
 }
 
-static target_ulong h_set_mode_resource_set_dawr0(PowerPCCPU *cpu,
-                                                  SpaprMachineState *spapr,
-                                                  target_ulong mflags,
-                                                  target_ulong value1,
-                                                  target_ulong value2)
+static target_ulong h_set_mode_resource_set_dawr(PowerPCCPU *cpu,
+                                                 SpaprMachineState *spapr,
+                                                 target_ulong mflags,
+                                                 target_ulong value1,
+                                                 target_ulong value2)
 {
     CPUPPCState *env = &cpu->env;
 
@@ -835,8 +835,12 @@ static target_ulong h_set_mode_resource_set_dawr0(PowerPCCPU *cpu,
         return H_P4;
     }
 
-    ppc_store_dawr0(env, value1);
-    ppc_store_dawrx0(env, value2);
+    ppc_store_dawr(env, value1, SPR_DAWR0);
+    ppc_store_dawrx(env, value2, SPR_DAWRX0);
+    if (env->excp_model > POWERPC_EXCP_POWER10) {
+        ppc_store_dawr(env, value1, SPR_DAWR1);
+        ppc_store_dawrx(env, value2, SPR_DAWRX1);
+    }
 
     return H_SUCCESS;
 }
@@ -914,9 +918,9 @@ static target_ulong h_set_mode(PowerPCCPU *cpu, SpaprMachineState *spapr,
         ret = h_set_mode_resource_set_ciabr(cpu, spapr, args[0], args[2],
                                             args[3]);
         break;
-    case H_SET_MODE_RESOURCE_SET_DAWR0:
-        ret = h_set_mode_resource_set_dawr0(cpu, spapr, args[0], args[2],
-                                            args[3]);
+    case H_SET_MODE_RESOURCE_SET_DAWR:
+        ret = h_set_mode_resource_set_dawr(cpu, spapr, args[0], args[2],
+                                           args[3]);
         break;
     case H_SET_MODE_RESOURCE_LE:
         ret = h_set_mode_resource_le(cpu, spapr, args[0], args[2], args[3]);
target/ppc/cpu.c +46 -23

99 lines not on this page · raw message

target/ppc/cpu_init.c +15 -0
index 1253dbf622..7844e16ea5 100644
@@ -5910,6 +5910,20 @@ static void register_power10_dexcr_sprs(CPUPPCState *env)
             0);
 }
 
+static void register_power10_dbg_sprs(CPUPPCState *env)
+{
+    spr_register_kvm_hv(env, SPR_DAWR1, "DAWR1",
+                        SPR_NOACCESS, SPR_NOACCESS,
+                        SPR_NOACCESS, SPR_NOACCESS,
+                        &spr_read_generic, &spr_write_dawr1,
+                        KVM_REG_PPC_DAWR, 0x00000000);
+    spr_register_kvm_hv(env, SPR_DAWRX1, "DAWRX1",
+                        SPR_NOACCESS, SPR_NOACCESS,
+                        SPR_NOACCESS, SPR_NOACCESS,
+                        &spr_read_generic, &spr_write_dawrx1,
+                        KVM_REG_PPC_DAWRX, 0x00000000);
+}
+
 /*
  * Initialize PMU counter overflow timers for Power8 and
  * newer Power chips when using TCG.
@@ -6568,6 +6582,7 @@ static void init_proc_POWER10(CPUPPCState *env)
 {
     register_power9_common_sprs(env);
     register_HEIR64_spr(env);
+    register_power10_dbg_sprs(env);
     register_power10_hash_sprs(env);
     register_power10_dexcr_sprs(env);
     register_power10_pmu_sup_sprs(env);
target/ppc/excp_helper.c +10 -1
index 9f811af0a4..9512525e52 100644
@@ -3279,10 +3279,19 @@ bool ppc_cpu_debug_check_watchpoint(CPUState *cs, CPUWatchpoint *wp)
 {
 #if defined(TARGET_PPC64)
     CPUPPCState *env = cpu_env(cs);
+    bool match = false;
+    uint32_t dawrx;
 
     if (env->insns_flags2 & PPC2_ISA207S) {
         if (wp == env->dawr0_watchpoint) {
-            uint32_t dawrx = env->spr[SPR_DAWRX0];
+            dawrx = env->spr[SPR_DAWRX0];
+            match = true;
+        } else if (wp == env->dawr1_watchpoint) {
+            dawrx = env->spr[SPR_DAWRX1];
+            match = true;
+        }
+
+        if (match == true) {
             bool wt = extract32(dawrx, PPC_BIT_NR(59), 1);
             bool wti = extract32(dawrx, PPC_BIT_NR(60), 1);
             bool hv = extract32(dawrx, PPC_BIT_NR(61), 1);
target/ppc/machine.c +4 -1
index 717bf93e88..4c510e6fed 100644
@@ -264,7 +264,10 @@ static int cpu_post_load(void *opaque, int version_id)
         /* Re-set breaks based on regs */
 #if defined(TARGET_PPC64)
         ppc_update_ciabr(env);
-        ppc_update_daw0(env);
+        ppc_update_daw(env, SPR_DAWR0);
+        if (env->excp_model > POWERPC_EXCP_POWER10) {
+            ppc_update_daw(env, SPR_DAWR1);
+        }
 #endif
         /*
          * TCG needs to re-start the decrementer timer and/or raise the
target/ppc/misc_helper.c +4 -4
index f0ca80153b..1bebb5a8a7 100644
@@ -223,14 +223,14 @@ void helper_store_ciabr(CPUPPCState *env, target_ulong value)
     ppc_store_ciabr(env, value);
 }
 
-void helper_store_dawr0(CPUPPCState *env, target_ulong value)
+void helper_store_dawr(CPUPPCState *env, target_ulong value, uint32_t dawr)
 {
-    ppc_store_dawr0(env, value);
+    ppc_store_dawr(env, value, dawr);
 }
 
-void helper_store_dawrx0(CPUPPCState *env, target_ulong value)
+void helper_store_dawrx(CPUPPCState *env, target_ulong value, uint32_t dawrx)
 {
-    ppc_store_dawrx0(env, value);
+    ppc_store_dawrx(env, value, dawrx);
 }
 
 /*
target/ppc/translate.c +19 -2
index 47ca50a064..0187b5ab2f 100644
@@ -628,14 +628,31 @@ void spr_write_ciabr(DisasContext *ctx, int sprn, int gprn)
 void spr_write_dawr0(DisasContext *ctx, int sprn, int gprn)
 {
     translator_io_start(&ctx->base);
-    gen_helper_store_dawr0(tcg_env, cpu_gpr[gprn]);
+    gen_helper_store_dawr(tcg_env, cpu_gpr[gprn],
+                          tcg_constant_i32(SPR_DAWR0));
 }
 
 void spr_write_dawrx0(DisasContext *ctx, int sprn, int gprn)
 {
     translator_io_start(&ctx->base);
-    gen_helper_store_dawrx0(tcg_env, cpu_gpr[gprn]);
+    gen_helper_store_dawrx(tcg_env, cpu_gpr[gprn],
+                           tcg_constant_i32(SPR_DAWRX0));
 }
+
+void spr_write_dawr1(DisasContext *ctx, int sprn, int gprn)
+{
+    translator_io_start(&ctx->base);
+    gen_helper_store_dawr(tcg_env, cpu_gpr[gprn],
+                          tcg_constant_i32(SPR_DAWR1));
+}
+
+void spr_write_dawrx1(DisasContext *ctx, int sprn, int gprn)
+{
+    translator_io_start(&ctx->base);
+    gen_helper_store_dawrx(tcg_env, cpu_gpr[gprn],
+                          tcg_constant_i32(SPR_DAWRX1));
+}
+
 #endif /* defined(TARGET_PPC64) && !defined(CONFIG_USER_ONLY) */
 
 /* CTR */
Signature · 1 line
2.39.5
author
#2 lore raw

PATCH v3 2/2 ppc/pnv: Add new PowerPC Special Purpose Registers (RWMR)

In reply to dan tan

From: dan tan <[email protected]>

Register RWMR - Region Weighted Mode Register
for privileged access in Power9 and Power10

It controls what the SPURR register produces.

Specs:
- Power9: https://ibm.ent.box.com/s/tmklq90ze7aj8f4n32er1mu3sy9u8k3k
- Power10: https://files.openpower.foundation/s/EgCy7C43p2NSRfR

---
Ver 3 summary:
- change the register to generic read/write from nop/write

Ver 2 summary:
- corrected the previous definition as ITV1
- spec reference:
https://ibm.ent.box.com/s/tmklq90ze7aj8f4n32er1mu3sy9u8k3k (Power9)
- it appears that part of the previous upstream submission SPRs (SPR_POWER_MMCR3, SPR_POWER_SIER2, SPR_POWER_SIER3) are already in the current master. Therefore, removed those from this request.

---
 target/ppc/cpu.h      | 1 +
 target/ppc/cpu_init.c | 5 +++++
 2 files changed, 6 insertions(+)
target/ppc/cpu.h +1 -0
index 6d074e67dc..fefc741672 100644
@@ -2099,6 +2099,7 @@ void ppc_compat_add_property(Object *obj, const char *name,
 #define SPR_440_INV3          (0x373)
 #define SPR_440_ITV0          (0x374)
 #define SPR_440_ITV1          (0x375)
+#define SPR_RWMR              (0x375)
 #define SPR_440_ITV2          (0x376)
 #define SPR_440_ITV3          (0x377)
 #define SPR_440_CCR1          (0x378)
target/ppc/cpu_init.c +5 -0
index 7844e16ea5..fd7e001ade 100644
@@ -5773,6 +5773,11 @@ static void register_power9_book4_sprs(CPUPPCState *env)
                      SPR_NOACCESS, SPR_NOACCESS,
                      &spr_read_generic, &spr_write_generic,
                      KVM_REG_PPC_WORT, 0);
+    spr_register_hv(env, SPR_RWMR, "RWMR",
+                 SPR_NOACCESS, SPR_NOACCESS,
+                 &spr_read_generic, &spr_write_generic,
+                 &spr_read_generic, &spr_write_generic,
+                 0x00000000);
 #endif
 }
 
Signature · 1 line
2.39.5
#3 lore raw
In reply to dan tan

+ Shivaprasad (had posted patches for DAWR1/DAWRX1 earlier)

https://lore.kernel.org/qemu-devel/170679876639.188422.11634974895844092362.stgit@ltc-boston1.aus.stglabs.ibm.com/

Quoted 40 lines · dan tan

From: dan tan <[email protected]>

*** BLURB HERE ***
Version 3 summary:
RWMR (Region Weighted Mode Register) -
- change the register to generic read/write from nop/write

Version 2 summary:
(DAWR1,DAWRX1):
- spec reference: https://files.openpower.foundation/s/EgCy7C43p2NSRfR
- corrected commit message format
- combine DAWR(0/1) handling into a single function
- add DAWR1 & DAWRX1 to init_proc_POWER10() only.

RWMR (Region Weighted Mode Register) -
- corrected the previous definition as ITV1
- spec reference:
https://ibm.ent.box.com/s/tmklq90ze7aj8f4n32er1mu3sy9u8k3k (Power9)
- it appears that part of the previous upstream request SPRs (SPR_POWER_MMCR3, SPR_POWER_SIER2, SPR_POWER_SIER3) are already in the current master. Therefore, removed those from this request.

dan tan (2):
ppc/pnv: Add new PowerPC Special Purpose Registers (DAWR1,DAWRX1) ppc/pnv: Add new PowerPC Special Purpose Registers (RWMR)

  include/hw/ppc/spapr.h   |  2 +-
  target/ppc/cpu.h         |  8 +++--
  target/ppc/helper.h      |  4 +--
  target/ppc/spr_common.h  |  2 ++
  hw/ppc/spapr_hcall.c     | 24 ++++++++------
  target/ppc/cpu.c         | 69 ++++++++++++++++++++++++++--------------
  target/ppc/cpu_init.c    | 20 ++++++++++++
  target/ppc/excp_helper.c | 11 ++++++-
  target/ppc/machine.c     |  5 ++-
  target/ppc/misc_helper.c |  8 ++---
  target/ppc/translate.c   | 21 ++++++++++--
  11 files changed, 127 insertions(+), 47 deletions(-)
#4 lore raw

Hi Harsh,

Thank you for pointing that out!
I will withdraw my submission.

regards,
--
email:[email protected]

Quoted 48 lines · Harsh Prateek Bora

+ Shivaprasad (had posted patches for DAWR1/DAWRX1 earlier)

https://lore.kernel.org/qemu-devel/170679876639.188422.11634974895844092362.stgit@ltc-boston1.aus.stglabs.ibm.com/

Quoted 43 lines · dan tan

From: dan tan <[email protected]>

*** BLURB HERE ***
Version 3 summary:
RWMR (Region Weighted Mode Register) -
- change the register to generic read/write from nop/write

Version 2 summary:
(DAWR1,DAWRX1):
- spec reference:
https://files.openpower.foundation/s/EgCy7C43p2NSRfR
- corrected commit message format
- combine DAWR(0/1) handling into a single function
- add DAWR1 & DAWRX1 to init_proc_POWER10() only.

RWMR (Region Weighted Mode Register) -
- corrected the previous definition as ITV1
- spec reference:

https://ibm.ent.box.com/s/tmklq90ze7aj8f4n32er1mu3sy9u8k3k (Power9)
- it appears that part of the previous upstream request SPRs (SPR_POWER_MMCR3, SPR_POWER_SIER2, SPR_POWER_SIER3) are already in the current master. Therefore, removed those from this request.

dan tan (2):
ppc/pnv: Add new PowerPC Special Purpose Registers (DAWR1,DAWRX1) ppc/pnv: Add new PowerPC Special Purpose Registers (RWMR)

  include/hw/ppc/spapr.h   |  2 +-
  target/ppc/cpu.h         |  8 +++--
  target/ppc/helper.h      |  4 +--
  target/ppc/spr_common.h  |  2 ++
  hw/ppc/spapr_hcall.c     | 24 ++++++++------
  target/ppc/cpu.c         | 69 
++++++++++++++++++++++++++--------------
  target/ppc/cpu_init.c    | 20 ++++++++++++
  target/ppc/excp_helper.c | 11 ++++++-
  target/ppc/machine.c     |  5 ++-
  target/ppc/misc_helper.c |  8 ++---
  target/ppc/translate.c   | 21 ++++++++++--
  11 files changed, 127 insertions(+), 47 deletions(-)