ppc/pnv: Add PowerPC Special Purpose Registers
PATCH 1/1 ppc/pnv: Add PowerPC Special Purpose Registers
The handling of the following two registers are added -
DAWR1 (0x0bd, 189) - Data Address Watchpoint 1 DAWRX1 (0x0b5, 181) - Data Address Watchpoint Extension 1
--- target/ppc/cpu.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ target/ppc/cpu.h | 6 ++++++ target/ppc/cpu_init.c | 10 ++++++++++ target/ppc/excp_helper.c | 11 ++++++++++- target/ppc/helper.h | 2 ++ target/ppc/machine.c | 1 + target/ppc/misc_helper.c | 10 ++++++++++ target/ppc/spr_common.h | 2 ++ target/ppc/translate.c | 12 ++++++++++++ 9 files changed, 104 insertions(+), 1 deletion(-)
target/ppc/cpu.c +51 -0
@@ -188,6 +188,57 @@ void ppc_store_dawrx0(CPUPPCState *env, uint32_t val) env->spr[SPR_DAWRX0 ] = val;ppc_update_daw0 (env); } + +void ppc_update_daw1 (CPUPPCState *env) +{ +CPUState *cs =env_cpu (env); +target_ulong deaw = env->spr[SPR_DAWR1 ] &PPC_BITMASK (0 ,60 ); +uint32_t dawrx = env->spr[SPR_DAWRX1 ]; +int mrd =extract32 (dawrx,PPC_BIT_NR (48 ),54 -48 ); +bool dw =extract32 (dawrx,PPC_BIT_NR (57 ),1 ); +bool dr =extract32 (dawrx,PPC_BIT_NR (58 ),1 ); +bool hv =extract32 (dawrx,PPC_BIT_NR (61 ),1 ); +bool sv =extract32 (dawrx,PPC_BIT_NR (62 ),1 ); +bool pr =extract32 (dawrx,PPC_BIT_NR (62 ),1 ); +vaddr len; +int flags; + +if (env->dawr1_watchpoint) { +cpu_watchpoint_remove_by_ref (cs, env->dawr1_watchpoint); + env->dawr1_watchpoint =NULL ; + } + +if (!dr && !dw) { +return ; + } + +if (!hv && !sv && !pr) { +return ; + } + + len = (mrd +1 ) *8 ; + flags =BP_CPU |BP_STOP_BEFORE_ACCESS ; +if (dr) { + flags |=BP_MEM_READ ; + } +if (dw) { + flags |=BP_MEM_WRITE ; + } + +cpu_watchpoint_insert (cs, deaw, len, flags, &env->dawr1_watchpoint); +} + +void ppc_store_dawr1 (CPUPPCState *env,target_ulong val) +{ + env->spr[SPR_DAWR1 ] = val; +ppc_update_daw1 (env); +} + +void ppc_store_dawrx1 (CPUPPCState *env,uint32_t val) +{ + env->spr[SPR_DAWRX1 ] = val; +ppc_update_daw1 (env); +}#endif #endif
target/ppc/cpu.h +6 -0
@@ -1237,6 +1237,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 */
@@ -1552,6 +1553,9 @@ 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_daw1 (CPUPPCState *env); +void ppc_store_dawr1 (CPUPPCState *env,target_ulong value); +void ppc_store_dawrx1 (CPUPPCState *env,uint32_t value);#endif /* !defined(CONFIG_USER_ONLY) */ void ppc_store_msr (CPUPPCState *env,target_ulong value);
@@ -1737,9 +1741,11 @@ void ppc_compat_add_property(Object *obj, const char *name,#define SPR_PSPB (0x09F)#define SPR_DPDES (0x0B0)#define SPR_DAWR0 (0x0B4) +#define SPR_DAWR1 (0x0B5)#define SPR_RPR (0x0BA)#define SPR_CIABR (0x0BB)#define SPR_DAWRX0 (0x0BC) +#define SPR_DAWRX1 (0x0BD)#define SPR_HFSCR (0x0BE)#define SPR_VRSAVE (0x100)#define SPR_USPRG0 (0x100)
target/ppc/cpu_init.c +10 -0
@@ -5119,11 +5119,21 @@ static void register_book3s_207_dbg_sprs(CPUPPCState *env)SPR_NOACCESS ,SPR_NOACCESS , &spr_read_generic, &spr_write_dawr0, KVM_REG_PPC_DAWR, 0x00000000); +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_DAWRX0 ,"DAWRX0" ,SPR_NOACCESS ,SPR_NOACCESS ,SPR_NOACCESS ,SPR_NOACCESS , &spr_read_generic, &spr_write_dawrx0,KVM_REG_PPC_DAWRX ,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 ); spr_register_kvm_hv(env, SPR_CIABR, "CIABR", SPR_NOACCESS, SPR_NOACCESS, SPR_NOACCESS, SPR_NOACCESS,
target/ppc/excp_helper.c +10 -1
@@ -3314,10 +3314,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/helper.h +2 -0
@@ -27,7 +27,9 @@ 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_dawr1, void, env, tl) DEF_HELPER_2(store_dawrx0, void, env, tl) +DEF_HELPER_2(store_dawrx1, void, env, tl) DEF_HELPER_2(store_mmcr0, void, env, tl) DEF_HELPER_2(store_mmcr1, void, env, tl)DEF_HELPER_3 (store_pmc, void, env, i32, i64)
target/ppc/machine.c +1 -0
@@ -326,6 +326,7 @@ static int cpu_post_load(void *opaque, int version_id)#if defined(TARGET_PPC64 )ppc_update_ciabr (env);ppc_update_daw0 (env); +ppc_update_daw1 (env);#endif /* * TCG needs to re-start the decrementer timer and/or raise the
target/ppc/misc_helper.c +10 -0
@@ -209,11 +209,21 @@ void helper_store_dawr0(CPUPPCState *env, target_ulong value)ppc_store_dawr0 (env, value); } +void helper_store_dawr1 (CPUPPCState *env,target_ulong value) +{ +ppc_store_dawr1 (env, value); +} +void helper_store_dawrx0 (CPUPPCState *env,target_ulong value) {ppc_store_dawrx0 (env, value); } +void helper_store_dawrx1 (CPUPPCState *env,target_ulong value) +{ +ppc_store_dawrx1 (env, value); +} +/* * DPDES register is shared. Each bit reflects the state of the * doorbell interrupt of a thread of the same core.
target/ppc/spr_common.h +2 -0
@@ -161,7 +161,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);
target/ppc/translate.c +12 -0
@@ -588,11 +588,23 @@ void spr_write_dawr0(DisasContext *ctx, int sprn, int gprn) gen_helper_store_dawr0(tcg_env, cpu_gpr[gprn]); } +void spr_write_dawr1 (DisasContext *ctx,int sprn,int gprn) +{ +translator_io_start (&ctx->base); +gen_helper_store_dawr1 (tcg_env, cpu_gpr[gprn]); +} +void spr_write_dawrx0 (DisasContext *ctx,int sprn,int gprn) {translator_io_start (&ctx->base);gen_helper_store_dawrx0 (tcg_env, cpu_gpr[gprn]); } + +void spr_write_dawrx1 (DisasContext *ctx,int sprn,int gprn) +{ +translator_io_start (&ctx->base); +gen_helper_store_dawrx1 (tcg_env, cpu_gpr[gprn]); +}#endif /* defined(TARGET_PPC64) && !defined(CONFIG_USER_ONLY) */ /* CTR */
Signature · 1 line
1.8.3.1
Quoted 5 lines · dan tan
The handling of the following two registers are added -
DAWR1 (0x0bd, 189) - Data Address Watchpoint 1 DAWRX1 (0x0b5, 181) - Data Address Watchpoint Extension 1Signed-off-by dan tan <[email protected]>
Small nit, but there's some extra whitespace on the left here and in Subject header which is normally not required.
Quoted 49 lines
--- target/ppc/cpu.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ target/ppc/cpu.h | 6 ++++++ target/ppc/cpu_init.c | 10 ++++++++++ target/ppc/excp_helper.c | 11 ++++++++++- target/ppc/helper.h | 2 ++ target/ppc/machine.c | 1 + target/ppc/misc_helper.c | 10 ++++++++++ target/ppc/spr_common.h | 2 ++ target/ppc/translate.c | 12 ++++++++++++ 9 files changed, 104 insertions(+), 1 deletion(-)target/ppc/cpu.c +29
-0@@ -188,6 +188,57 @@ void ppc_store_dawrx0(CPUPPCState *env, uint32_t val) env->spr[SPR_DAWRX0 ] = val;ppc_update_daw0 (env); } + +void ppc_update_daw1 (CPUPPCState *env) +{ +CPUState *cs =env_cpu (env); +target_ulong deaw = env->spr[SPR_DAWR1 ] &PPC_BITMASK (0 ,60 ); +uint32_t dawrx = env->spr[SPR_DAWRX1 ]; +int mrd =extract32 (dawrx,PPC_BIT_NR (48 ),54 -48 ); +bool dw =extract32 (dawrx,PPC_BIT_NR (57 ),1 ); +bool dr =extract32 (dawrx,PPC_BIT_NR (58 ),1 ); +bool hv =extract32 (dawrx,PPC_BIT_NR (61 ),1 ); +bool sv =extract32 (dawrx,PPC_BIT_NR (62 ),1 ); +bool pr =extract32 (dawrx,PPC_BIT_NR (62 ),1 ); +vaddr len; +int flags; + +if (env->dawr1_watchpoint) { +cpu_watchpoint_remove_by_ref (cs, env->dawr1_watchpoint); + env->dawr1_watchpoint =NULL ; + } + +if (!dr && !dw) { +return ; + } + +if (!hv && !sv && !pr) { +return ; + } + + len = (mrd +1 ) *8 ;
target/ppc/cpu.c void ppc_store_dawrx0(CPUPPCState *env, uint32_t val) · line 229
Quoted 10 lines
target/ppc/cpu.c +10
-0+ flags =BP_CPU |BP_STOP_BEFORE_ACCESS ; +if (dr) { + flags |=BP_MEM_READ ; + } +if (dw) { + flags |=BP_MEM_WRITE ; + } + +cpu_watchpoint_insert (cs, deaw, len, flags, &env->dawr1_watchpoint); +}
I would say this is just beyond the point where we should share code with daw0. You could make a function that takes DAWR(x) SPR numbers or values, and a pointer to the watchpoint to use.
Quoted 62 lines
target/ppc/cpu.c +12
-0+ +void ppc_store_dawr1 (CPUPPCState *env,target_ulong val) +{ + env->spr[SPR_DAWR1 ] = val; +ppc_update_daw1 (env); +} + +void ppc_store_dawrx1 (CPUPPCState *env,uint32_t val) +{ + env->spr[SPR_DAWRX1 ] = val; +ppc_update_daw1 (env); +}#endif #endif target/ppc/cpu.h +6
-0@@ -1237,6 +1237,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 */ @@ -1552,6 +1553,9 @@ 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_daw1 (CPUPPCState *env); +void ppc_store_dawr1 (CPUPPCState *env,target_ulong value); +void ppc_store_dawrx1 (CPUPPCState *env,uint32_t value);#endif /* !defined(CONFIG_USER_ONLY) */ void ppc_store_msr (CPUPPCState *env,target_ulong value);@@ -1737,9 +1741,11 @@ void ppc_compat_add_property(Object *obj, const char *name,#define SPR_PSPB (0x09F)#define SPR_DPDES (0x0B0)#define SPR_DAWR0 (0x0B4) +#define SPR_DAWR1 (0x0B5)#define SPR_RPR (0x0BA)#define SPR_CIABR (0x0BB)#define SPR_DAWRX0 (0x0BC) +#define SPR_DAWRX1 (0x0BD)#define SPR_HFSCR (0x0BE)#define SPR_VRSAVE (0x100)#define SPR_USPRG0 (0x100)target/ppc/cpu_init.c +5
-0@@ -5119,11 +5119,21 @@ static void register_book3s_207_dbg_sprs(CPUPPCState *env)SPR_NOACCESS ,SPR_NOACCESS , &spr_read_generic, &spr_write_dawr0, KVM_REG_PPC_DAWR, 0x00000000); +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 );
target/ppc/cpu_init.c static void register_book3s_207_dbg_sprs(CPUPPCState *env) · line 5136
Quoted 10 lines
target/ppc/cpu_init.c +5
-0spr_register_kvm_hv (env,SPR_DAWRX0 ,"DAWRX0" ,SPR_NOACCESS ,SPR_NOACCESS ,SPR_NOACCESS ,SPR_NOACCESS , &spr_read_generic, &spr_write_dawrx0,KVM_REG_PPC_DAWRX ,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 );
These are new for POWER10, no? This is adding them for P8/9 too.
Thanks,
Nick
PATCH 1/1 ppc/pnv: Add PowerPC Special Purpose Registers (SPRs):
In reply to dan tan The handling of the following SPRs are added -
ITV1 (0x375, 885) - noop (not in Power10 ISA)
SIER2 (0x2f0, 752) - Sampled Instruction Event Register 2
SIER2 (0x2f1, 753) - Sampled Instruction Event Register 3
MMCR3 (0x2f2, 754) - Performance Monitor Mode Control Register 3
Signed-off-by: dan tan <[email protected]>
---
target/ppc/cpu.h | 4 ++++
target/ppc/cpu_init.c | 17 +++++++++++++++++
2 files changed, 21 insertions(+)target/ppc/cpu.h +4 -0
@@ -1933,6 +1933,9 @@ void ppc_compat_add_property(Object *obj, const char *name,#define SPR_BOOKE_TLB2CFG (0x2B2)#define SPR_BOOKE_TLB3CFG (0x2B3)#define SPR_BOOKE_EPR (0x2BE) +#define SPR_POWER_SIER2 (0x2F0) +#define SPR_POWER_SIER3 (0x2F1) +#define SPR_POWER_MMCR3 (0x2F2)#define SPR_PERF0 (0x300)#define SPR_RCPU_MI_RBA0 (0x300)#define SPR_MPC_MI_CTR (0x300)
@@ -2053,6 +2056,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_ITV1 (0x375)#define SPR_440_ITV2 (0x376)#define SPR_440_ITV3 (0x377)#define SPR_440_CCR1 (0x378)
target/ppc/cpu_init.c +17 -0
@@ -5294,6 +5294,18 @@ static void register_power8_pmu_sup_sprs(CPUPPCState *env)SPR_NOACCESS ,SPR_NOACCESS , &spr_read_generic, &spr_write_generic, KVM_REG_PPC_CSIGR, 0x00000000); +spr_register_kvm (env,SPR_POWER_MMCR3 ,"MMCR3" , +SPR_NOACCESS ,SPR_NOACCESS , + &spr_read_generic, &spr_write_generic, +KVM_REG_PPC_MMCR3 ,0x00000000 ); +spr_register_kvm (env,SPR_POWER_SIER2 ,"SIER2" , +SPR_NOACCESS ,SPR_NOACCESS , + &spr_read_generic, &spr_write_generic, +KVM_REG_PPC_SIER2 ,0x00000000 ); +spr_register_kvm (env,SPR_POWER_SIER3 ,"SIER3" , +SPR_NOACCESS ,SPR_NOACCESS , + &spr_read_generic, &spr_write_generic, +KVM_REG_PPC_SIER3 ,0x00000000 ); }static void register_power8_pmu_user_sprs (CPUPPCState *env)
@@ -5670,6 +5682,11 @@ static void register_power_common_book4_sprs(CPUPPCState *env) &spr_access_nop, &spr_write_generic, &spr_access_nop, &spr_write_generic, 0x00000000); +spr_register_hv (env,SPR_ITV1 ,"ITV1" , +SPR_NOACCESS ,SPR_NOACCESS , + &spr_access_nop, &spr_write_generic, + &spr_access_nop, &spr_write_generic, +0x00000000 );#endif }
Signature · 1 line
1.8.3.1
Re: [PATCH] ppc/pnv: Add PowerPC Special Purpose Registers (SPRs):
Quoted 2 lines · dan tan
The handling of the following SPRs are added -
ITV1 (0x375, 885) - noop (not in Power10 ISA)
I can't see where this is defined. Not in P10 user manual AFAIKS?
Quoted 3 lines
SIER2 (0x2f0, 752) - Sampled Instruction Event Register 2
SIER2 (0x2f1, 753) - Sampled Instruction Event Register 3
MMCR3 (0x2f2, 754) - Performance Monitor Mode Control Register 3These are new in POWER10 (ISA 3.1) too.
Thanks,
Nick
Quoted 64 lines
Signed-off-by dan tan <[email protected]>--- target/ppc/cpu.h | 4 ++++ target/ppc/cpu_init.c | 17 +++++++++++++++++ 2 files changed, 21 insertions(+)target/ppc/cpu.h +4
-0@@ -1933,6 +1933,9 @@ void ppc_compat_add_property(Object *obj, const char *name,#define SPR_BOOKE_TLB2CFG (0x2B2)#define SPR_BOOKE_TLB3CFG (0x2B3)#define SPR_BOOKE_EPR (0x2BE) +#define SPR_POWER_SIER2 (0x2F0) +#define SPR_POWER_SIER3 (0x2F1) +#define SPR_POWER_MMCR3 (0x2F2)#define SPR_PERF0 (0x300)#define SPR_RCPU_MI_RBA0 (0x300)#define SPR_MPC_MI_CTR (0x300)@@ -2053,6 +2056,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_ITV1 (0x375)#define SPR_440_ITV2 (0x376)#define SPR_440_ITV3 (0x377)#define SPR_440_CCR1 (0x378)target/ppc/cpu_init.c +17
-0@@ -5294,6 +5294,18 @@ static void register_power8_pmu_sup_sprs(CPUPPCState *env)SPR_NOACCESS ,SPR_NOACCESS , &spr_read_generic, &spr_write_generic, KVM_REG_PPC_CSIGR, 0x00000000); +spr_register_kvm (env,SPR_POWER_MMCR3 ,"MMCR3" , +SPR_NOACCESS ,SPR_NOACCESS , + &spr_read_generic, &spr_write_generic, +KVM_REG_PPC_MMCR3 ,0x00000000 ); +spr_register_kvm (env,SPR_POWER_SIER2 ,"SIER2" , +SPR_NOACCESS ,SPR_NOACCESS , + &spr_read_generic, &spr_write_generic, +KVM_REG_PPC_SIER2 ,0x00000000 ); +spr_register_kvm (env,SPR_POWER_SIER3 ,"SIER3" , +SPR_NOACCESS ,SPR_NOACCESS , + &spr_read_generic, &spr_write_generic, +KVM_REG_PPC_SIER3 ,0x00000000 ); }static void register_power8_pmu_user_sprs (CPUPPCState *env)@@ -5670,6 +5682,11 @@ static void register_power_common_book4_sprs(CPUPPCState *env) &spr_access_nop, &spr_write_generic, &spr_access_nop, &spr_write_generic, 0x00000000); +spr_register_hv (env,SPR_ITV1 ,"ITV1" , +SPR_NOACCESS ,SPR_NOACCESS , + &spr_access_nop, &spr_write_generic, + &spr_access_nop, &spr_write_generic, +0x00000000 );#endif }