| Message ID | 742650a35d49502a994c008fd3a70eccd5391f1b.1500378931.git-series.james.hogan@imgtec.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 18/07/2017 12:55, James Hogan wrote: > Add support for the CP0_EBase.WG bit, which allows upper bits to be > written (bits 31:30 on MIPS32, or bits 63:30 on MIPS64), along with the > CP0_Config5.CV bit to control whether the exception vector for Cache > Error exceptions is forced into KSeg1. > > This is necessary on MIPS32 to support Segmentation Control and Enhanced > Virtual Addressing (EVA) extensions (where KSeg1 addresses may not > represent an unmapped uncached segment). > > It is also useful on MIPS64 to allow the exception base to reside in > XKPhys, and possibly out of range of KSEG0 and KSEG1. > > Signed-off-by: James Hogan <james.hogan@imgtec.com> > Cc: Yongbok Kim <yongbok.kim@imgtec.com> > Cc: Aurelien Jarno <aurelien@aurel32.net> > --- > Changes in v2: > - Fix CP0_EBase.WG to be read only when WG is not set in > CP0_EBase_rw_bitmask, otherwise it will be wrongly probed as present. > - Make cache error exception vector conditional on Config3.SC as well as > Config5.CV, as per the PRA, and take the CP0C3_SC definition from > patch 7 (Yongbok). > - Rename CP0_EBase_rw_bitmask to CP0_EBaseWG_rw_bitmask (Yongbok). > --- > target/mips/cpu.h | 5 ++++- > target/mips/helper.c | 14 ++++++++------ > target/mips/machine.c | 6 +++--- > target/mips/op_helper.c | 12 ++++++++++-- > target/mips/translate.c | 8 +++++--- > target/mips/translate_init.c | 1 + > 6 files changed, 31 insertions(+), 15 deletions(-) > > --- a/target/mips/op_helper.c > +++ b/target/mips/op_helper.c > @@ -1515,14 +1515,22 @@ target_ulong helper_mftc0_ebase(CPUMIPSState *env) > > void helper_mtc0_ebase(CPUMIPSState *env, target_ulong arg1) > { > - env->CP0_EBase = (env->CP0_EBase & ~0x3FFFF000) | (arg1 & 0x3FFFF000); > + target_ulong mask = 0x3FFFF000 | env->CP0_EBaseWG_rw_bitmask; > + if (arg1 & (1 << CP0EBase_WG) & mask) { isn't it just ...? if (arg1 & env->CP0_EBaseWG_rw_bitmask) { > + mask |= ~0x3FFFFFFF; > + } > + env->CP0_EBase = (env->CP0_EBase & ~mask) | (arg1 & mask); > } > > void helper_mttc0_ebase(CPUMIPSState *env, target_ulong arg1) > { > int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC); > CPUMIPSState *other = mips_cpu_map_tc(env, &other_tc); > - other->CP0_EBase = (other->CP0_EBase & ~0x3FFFF000) | (arg1 & 0x3FFFF000); > + target_ulong mask = 0x3FFFF000 | env->CP0_EBaseWG_rw_bitmask; > + if (arg1 & (1 << CP0EBase_WG) & mask) { here as well. > + mask |= ~0x3FFFFFFF; > + } > + other->CP0_EBase = (other->CP0_EBase & ~mask) | (arg1 & mask); > } > Otherwise, Reviewed-by: Yongbok Kim <yongbok.kim@imgtec.com> Regards, Yongbok
On Wed, Jul 19, 2017 at 03:54:47PM +0100, Yongbok Kim wrote: > > > On 18/07/2017 12:55, James Hogan wrote: > > Add support for the CP0_EBase.WG bit, which allows upper bits to be > > written (bits 31:30 on MIPS32, or bits 63:30 on MIPS64), along with the > > CP0_Config5.CV bit to control whether the exception vector for Cache > > Error exceptions is forced into KSeg1. > > > > This is necessary on MIPS32 to support Segmentation Control and Enhanced > > Virtual Addressing (EVA) extensions (where KSeg1 addresses may not > > represent an unmapped uncached segment). > > > > It is also useful on MIPS64 to allow the exception base to reside in > > XKPhys, and possibly out of range of KSEG0 and KSEG1. > > > > Signed-off-by: James Hogan <james.hogan@imgtec.com> > > Cc: Yongbok Kim <yongbok.kim@imgtec.com> > > Cc: Aurelien Jarno <aurelien@aurel32.net> > > --- > > Changes in v2: > > - Fix CP0_EBase.WG to be read only when WG is not set in > > CP0_EBase_rw_bitmask, otherwise it will be wrongly probed as present. > > - Make cache error exception vector conditional on Config3.SC as well as > > Config5.CV, as per the PRA, and take the CP0C3_SC definition from > > patch 7 (Yongbok). > > - Rename CP0_EBase_rw_bitmask to CP0_EBaseWG_rw_bitmask (Yongbok). > > --- > > target/mips/cpu.h | 5 ++++- > > target/mips/helper.c | 14 ++++++++------ > > target/mips/machine.c | 6 +++--- > > target/mips/op_helper.c | 12 ++++++++++-- > > target/mips/translate.c | 8 +++++--- > > target/mips/translate_init.c | 1 + > > 6 files changed, 31 insertions(+), 15 deletions(-) > > > > > > --- a/target/mips/op_helper.c > > +++ b/target/mips/op_helper.c > > @@ -1515,14 +1515,22 @@ target_ulong helper_mftc0_ebase(CPUMIPSState *env) > > > > void helper_mtc0_ebase(CPUMIPSState *env, target_ulong arg1) > > { > > - env->CP0_EBase = (env->CP0_EBase & ~0x3FFFF000) | (arg1 & 0x3FFFF000); > > + target_ulong mask = 0x3FFFF000 | env->CP0_EBaseWG_rw_bitmask; > > + if (arg1 & (1 << CP0EBase_WG) & mask) { > > isn't it just ...? > if (arg1 & env->CP0_EBaseWG_rw_bitmask) { I suppose, now that the field is specific to the WG bit. Thanks James > > > + mask |= ~0x3FFFFFFF; > > + } > > + env->CP0_EBase = (env->CP0_EBase & ~mask) | (arg1 & mask); > > } > > > > void helper_mttc0_ebase(CPUMIPSState *env, target_ulong arg1) > > { > > int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC); > > CPUMIPSState *other = mips_cpu_map_tc(env, &other_tc); > > - other->CP0_EBase = (other->CP0_EBase & ~0x3FFFF000) | (arg1 & 0x3FFFF000); > > + target_ulong mask = 0x3FFFF000 | env->CP0_EBaseWG_rw_bitmask; > > + if (arg1 & (1 << CP0EBase_WG) & mask) { > > here as well. > > > + mask |= ~0x3FFFFFFF; > > + } > > + other->CP0_EBase = (other->CP0_EBase & ~mask) | (arg1 & mask); > > } > > > > > Otherwise, > Reviewed-by: Yongbok Kim <yongbok.kim@imgtec.com> > > Regards, > Yongbok
diff --git a/target/mips/cpu.h b/target/mips/cpu.h index 4a4747af2545..2b699a0e2456 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -399,7 +399,9 @@ struct CPUMIPSState { #define CP0Ca_EC 2 target_ulong CP0_EPC; int32_t CP0_PRid; - int32_t CP0_EBase; + target_ulong CP0_EBase; + target_ulong CP0_EBaseWG_rw_bitmask; +#define CP0EBase_WG 11 target_ulong CP0_CMGCRBase; int32_t CP0_Config0; #define CP0C0_M 31 @@ -447,6 +449,7 @@ struct CPUMIPSState { #define CP0C3_MSAP 28 #define CP0C3_BP 27 #define CP0C3_BI 26 +#define CP0C3_SC 25 #define CP0C3_IPLW 21 #define CP0C3_MMAR 18 #define CP0C3_MCU 17 diff --git a/target/mips/helper.c b/target/mips/helper.c index ceaeb8ceaf49..cd07995eedb2 100644 --- a/target/mips/helper.c +++ b/target/mips/helper.c @@ -829,11 +829,7 @@ void mips_cpu_do_interrupt(CPUState *cs) goto set_EPC; case EXCP_CACHE: cause = 30; - if (env->CP0_Status & (1 << CP0St_BEV)) { - offset = 0x100; - } else { - offset = 0x20000100; - } + offset = 0x100; set_EPC: if (!(env->CP0_Status & (1 << CP0St_EXL))) { env->CP0_EPC = exception_resume_pc(env); @@ -859,9 +855,15 @@ void mips_cpu_do_interrupt(CPUState *cs) env->hflags &= ~MIPS_HFLAG_BMASK; if (env->CP0_Status & (1 << CP0St_BEV)) { env->active_tc.PC = env->exception_base + 0x200; + } else if (cause == 30 && !(env->CP0_Config3 & (1 << CP0C3_SC) && + env->CP0_Config5 & (1 << CP0C5_CV))) { + /* Force KSeg1 for cache errors */ + env->active_tc.PC = (int32_t)KSEG1_BASE | + (env->CP0_EBase & 0x1FFFF000); } else { - env->active_tc.PC = (int32_t)(env->CP0_EBase & ~0x3ff); + env->active_tc.PC = env->CP0_EBase & ~0xfff; } + env->active_tc.PC += offset; set_hflags_for_handler(env); env->CP0_Cause = (env->CP0_Cause & ~(0x1f << CP0Ca_EC)) | (cause << CP0Ca_EC); diff --git a/target/mips/machine.c b/target/mips/machine.c index 38c8fe932832..91e31a7c2fe8 100644 --- a/target/mips/machine.c +++ b/target/mips/machine.c @@ -211,8 +211,8 @@ const VMStateDescription vmstate_tlb = { const VMStateDescription vmstate_mips_cpu = { .name = "cpu", - .version_id = 8, - .minimum_version_id = 8, + .version_id = 9, + .minimum_version_id = 9, .post_load = cpu_post_load, .fields = (VMStateField[]) { /* Active TC */ @@ -272,7 +272,7 @@ const VMStateDescription vmstate_mips_cpu = { VMSTATE_INT32(env.CP0_Cause, MIPSCPU), VMSTATE_UINTTL(env.CP0_EPC, MIPSCPU), VMSTATE_INT32(env.CP0_PRid, MIPSCPU), - VMSTATE_INT32(env.CP0_EBase, MIPSCPU), + VMSTATE_UINTTL(env.CP0_EBase, MIPSCPU), VMSTATE_INT32(env.CP0_Config0, MIPSCPU), VMSTATE_INT32(env.CP0_Config1, MIPSCPU), VMSTATE_INT32(env.CP0_Config2, MIPSCPU), diff --git a/target/mips/op_helper.c b/target/mips/op_helper.c index c07f68ce1a97..ba8b159d3bac 100644 --- a/target/mips/op_helper.c +++ b/target/mips/op_helper.c @@ -1515,14 +1515,22 @@ target_ulong helper_mftc0_ebase(CPUMIPSState *env) void helper_mtc0_ebase(CPUMIPSState *env, target_ulong arg1) { - env->CP0_EBase = (env->CP0_EBase & ~0x3FFFF000) | (arg1 & 0x3FFFF000); + target_ulong mask = 0x3FFFF000 | env->CP0_EBaseWG_rw_bitmask; + if (arg1 & (1 << CP0EBase_WG) & mask) { + mask |= ~0x3FFFFFFF; + } + env->CP0_EBase = (env->CP0_EBase & ~mask) | (arg1 & mask); } void helper_mttc0_ebase(CPUMIPSState *env, target_ulong arg1) { int other_tc = env->CP0_VPEControl & (0xff << CP0VPECo_TargTC); CPUMIPSState *other = mips_cpu_map_tc(env, &other_tc); - other->CP0_EBase = (other->CP0_EBase & ~0x3FFFF000) | (arg1 & 0x3FFFF000); + target_ulong mask = 0x3FFFF000 | env->CP0_EBaseWG_rw_bitmask; + if (arg1 & (1 << CP0EBase_WG) & mask) { + mask |= ~0x3FFFFFFF; + } + other->CP0_EBase = (other->CP0_EBase & ~mask) | (arg1 & mask); } target_ulong helper_mftc0_configx(CPUMIPSState *env, target_ulong idx) diff --git a/target/mips/translate.c b/target/mips/translate.c index 556aba969a12..c9afcfe3f537 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -5326,7 +5326,8 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, int reg, int sel) break; case 1: check_insn(ctx, ISA_MIPS32R2); - gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_EBase)); + tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_EBase)); + tcg_gen_ext32s_tl(arg, arg); rn = "EBase"; break; case 3: @@ -6637,7 +6638,7 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, int reg, int sel) break; case 1: check_insn(ctx, ISA_MIPS32R2); - gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_EBase)); + tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_EBase)); rn = "EBase"; break; case 3: @@ -20292,6 +20293,7 @@ void cpu_state_reset(CPUMIPSState *env) env->CP0_SRSConf4 = env->cpu_model->CP0_SRSConf4; env->CP0_PageGrain_rw_bitmask = env->cpu_model->CP0_PageGrain_rw_bitmask; env->CP0_PageGrain = env->cpu_model->CP0_PageGrain; + env->CP0_EBaseWG_rw_bitmask = env->cpu_model->CP0_EBaseWG_rw_bitmask; env->active_fpu.fcr0 = env->cpu_model->CP1_fcr0; env->active_fpu.fcr31_rw_bitmask = env->cpu_model->CP1_fcr31_rw_bitmask; env->active_fpu.fcr31 = env->cpu_model->CP1_fcr31; @@ -20342,7 +20344,7 @@ void cpu_state_reset(CPUMIPSState *env) if (kvm_enabled()) { env->CP0_EBase |= 0x40000000; } else { - env->CP0_EBase |= 0x80000000; + env->CP0_EBase |= (int32_t)0x80000000; } if (env->CP0_Config3 & (1 << CP0C3_CMGCR)) { env->CP0_CMGCRBase = 0x1fbf8000 >> 4; diff --git a/target/mips/translate_init.c b/target/mips/translate_init.c index 6ae23e476f79..8f8196ed5a6d 100644 --- a/target/mips/translate_init.c +++ b/target/mips/translate_init.c @@ -101,6 +101,7 @@ struct mips_def_t { int32_t CP0_SRSConf4; int32_t CP0_PageGrain_rw_bitmask; int32_t CP0_PageGrain; + target_ulong CP0_EBaseWG_rw_bitmask; int insn_flags; enum mips_mmu_types mmu_type; };
Add support for the CP0_EBase.WG bit, which allows upper bits to be written (bits 31:30 on MIPS32, or bits 63:30 on MIPS64), along with the CP0_Config5.CV bit to control whether the exception vector for Cache Error exceptions is forced into KSeg1. This is necessary on MIPS32 to support Segmentation Control and Enhanced Virtual Addressing (EVA) extensions (where KSeg1 addresses may not represent an unmapped uncached segment). It is also useful on MIPS64 to allow the exception base to reside in XKPhys, and possibly out of range of KSEG0 and KSEG1. Signed-off-by: James Hogan <james.hogan@imgtec.com> Cc: Yongbok Kim <yongbok.kim@imgtec.com> Cc: Aurelien Jarno <aurelien@aurel32.net> --- Changes in v2: - Fix CP0_EBase.WG to be read only when WG is not set in CP0_EBase_rw_bitmask, otherwise it will be wrongly probed as present. - Make cache error exception vector conditional on Config3.SC as well as Config5.CV, as per the PRA, and take the CP0C3_SC definition from patch 7 (Yongbok). - Rename CP0_EBase_rw_bitmask to CP0_EBaseWG_rw_bitmask (Yongbok). --- target/mips/cpu.h | 5 ++++- target/mips/helper.c | 14 ++++++++------ target/mips/machine.c | 6 +++--- target/mips/op_helper.c | 12 ++++++++++-- target/mips/translate.c | 8 +++++--- target/mips/translate_init.c | 1 + 6 files changed, 31 insertions(+), 15 deletions(-)