target-arm: Add MDCR_EL2
PATCH 1/1 target-arm: Add MDCR_EL2
---
This patch is a prerequisite for a debug exception routing patch:
https://lists.gnu.org/archive/html/qemu-devel/2015-09/msg03542.html
target-arm/cpu-qom.h | 1 + target-arm/cpu.c | 1 + target-arm/cpu.h | 1 + target-arm/cpu64.c | 1 + target-arm/helper.c | 13 +++++++++++++ 5 files changed, 17 insertions(+)
target-arm/cpu-qom.h +1 -0
@@ -167,6 +167,7 @@ typedef struct ARMCPU {uint64_t id_aa64mmfr0;uint64_t id_aa64mmfr1;uint32_t dbgdidr; +uint32_t mdcr;uint32_t clidr;uint64_t mp_affinity;/* MP ID without feature bits */ /* The elements of this array are the CCSIDR values for each cache,
target-arm/cpu.c +1 -0
@@ -1125,6 +1125,7 @@ static void cortex_a15_initfn(Object *obj) cpu->id_isar3 =0x11112131 ; cpu->id_isar4 =0x10011142 ; cpu->dbgdidr =0x3515f021 ; + cpu->mdcr =0x00000006 ; cpu->clidr =0x0a200023 ; cpu->ccsidr[0 ] =0x701fe00a ;/* 32K L1 dcache */ cpu->ccsidr[1 ] =0x201fe00a ;/* 32K L1 icache */
target-arm/cpu.h +1 -0
@@ -380,6 +380,7 @@ typedef struct CPUARMState {uint64_t dbgwvr[16 ];/* watchpoint value registers */ uint64_t dbgwcr[16 ];/* watchpoint control registers */ uint64_t mdscr_el1; +uint64_t mdcr_el2;/* If the counter is enabled, this stores the last time the counter * was reset. Otherwise it stores the counter value */
target-arm/cpu64.c +1 -0
@@ -136,6 +136,7 @@ static void aarch64_a57_initfn(Object *obj) cpu->id_aa64isar0 =0x00011120 ; cpu->id_aa64mmfr0 =0x00001124 ; cpu->dbgdidr =0x3516d000 ; + cpu->mdcr =0x00000006 ; cpu->clidr =0x0a200023 ; cpu->ccsidr[0 ] =0x701fe00a ;/* 32KB L1 dcache */ cpu->ccsidr[1 ] =0x201fe012 ;/* 48KB L1 icache */
target-arm/helper.c +13 -0
@@ -3221,6 +3221,9 @@ static const ARMCPRegInfo el3_no_el2_cp_reginfo[] = { { .name = "CNTHP_CTL_EL2", .state = ARM_CP_STATE_BOTH, .opc0 = 3, .opc1 = 4, .crn = 14, .crm = 2, .opc2 = 1, .access = PL2_RW, .type = ARM_CP_CONST, .resetvalue = 0 }, + { .name = "MDCR_EL2", .state = ARM_CP_STATE_BOTH, + .opc0 = 3, .opc1 = 4, .crn = 1, .crm = 1, .opc2 = 1, + .access = PL2_RW, .type = ARM_CP_CONST, .resetvalue = 0 }, REGINFO_SENTINEL };
@@ -3870,6 +3873,13 @@ static void define_debug_regs(ARMCPU *cpu) .name = "DBGDIDR", .cp = 14, .crn = 0, .crm = 0, .opc1 = 0, .opc2 = 0, .access = PL0_R, .type = ARM_CP_CONST, .resetvalue = cpu->dbgdidr, }; +ARMCPRegInfo mdcr_el2 = { + .name ="MDCR_EL2" , .state =ARM_CP_STATE_BOTH , + .opc0 =3 , .opc1 =4 , .crn =1 , .crm =1 , .opc2 =1 , + .access =PL2_RW , + .fieldoffset = offsetof(CPUARMState, cp15.mdcr_el2), + .resetvalue = cpu->mdcr, + };/* Note that all these register fields hold "number of Xs minus 1". */ brps =extract32 (cpu->dbgdidr,24 ,4 );
@@ -3894,6 +3904,9 @@ static void define_debug_regs(ARMCPU *cpu)if (arm_feature (&cpu->env,ARM_FEATURE_LPAE )) {define_arm_cp_regs (cpu, debug_lpae_cp_reginfo); } +if (arm_feature (&cpu->env,ARM_FEATURE_EL2 )) { +define_one_arm_cp_reg (cpu, &mdcr_el2); + }for (i =0 ; i < brps +1 ; i++) {ARMCPRegInfo dbgregs[] = {
Signature · 1 line
1.9.1
Quoted 42 lines · Sergey Fedorov
Signed-off-by Sergey Fedorov <[email protected]>---
This patch is a prerequisite for a debug exception routing patch:
https://lists.gnu.org/archive/html/qemu-devel/2015-09/msg03542.htmltarget-arm/cpu-qom.h | 1 + target-arm/cpu.c | 1 + target-arm/cpu.h | 1 + target-arm/cpu64.c | 1 + target-arm/helper.c | 13 +++++++++++++ 5 files changed, 17 insertions(+)target-arm/cpu-qom.h +1
-0@@ -167,6 +167,7 @@ typedef struct ARMCPU {uint64_t id_aa64mmfr0;uint64_t id_aa64mmfr1;uint32_t dbgdidr; +uint32_t mdcr;uint32_t clidr;uint64_t mp_affinity;/* MP ID without feature bits */ /* The elements of this array are the CCSIDR values for each cache, target-arm/cpu.c +1
-0@@ -1125,6 +1125,7 @@ static void cortex_a15_initfn(Object *obj) cpu->id_isar3 =0x11112131 ; cpu->id_isar4 =0x10011142 ; cpu->dbgdidr =0x3515f021 ; + cpu->mdcr =0x00000006 ; cpu->clidr =0x0a200023 ; cpu->ccsidr[0 ] =0x701fe00a ;/* 32K L1 dcache */ cpu->ccsidr[1 ] =0x201fe00a ;/* 32K L1 icache */ target-arm/cpu.h +0
-0
target-arm/cpu.h typedef struct CPUARMState { · line 383
Quoted 4 lines
target-arm/cpu.h +1
-0@@ -380,6 +380,7 @@ typedef struct CPUARMState {uint64_t dbgwvr[16 ];/* watchpoint value registers */ uint64_t dbgwcr[16 ];/* watchpoint control registers */ uint64_t mdscr_el1; +uint64_t mdcr_el2;
Given we already have banked el3 regs shouldn't this be:
uint64_6 mdcr_el[4]
?
Quoted 53 lines
target-arm/cpu.h +0
-0/* If the counter is enabled, this stores the last time the counter * was reset. Otherwise it stores the counter value */ target-arm/cpu64.c +1
-0@@ -136,6 +136,7 @@ static void aarch64_a57_initfn(Object *obj) cpu->id_aa64isar0 =0x00011120 ; cpu->id_aa64mmfr0 =0x00001124 ; cpu->dbgdidr =0x3516d000 ; + cpu->mdcr =0x00000006 ; cpu->clidr =0x0a200023 ; cpu->ccsidr[0 ] =0x701fe00a ;/* 32KB L1 dcache */ cpu->ccsidr[1 ] =0x201fe012 ;/* 48KB L1 icache */ target-arm/helper.c +13
-0@@ -3221,6 +3221,9 @@ static const ARMCPRegInfo el3_no_el2_cp_reginfo[] = { { .name = "CNTHP_CTL_EL2", .state = ARM_CP_STATE_BOTH, .opc0 = 3, .opc1 = 4, .crn = 14, .crm = 2, .opc2 = 1, .access = PL2_RW, .type = ARM_CP_CONST, .resetvalue = 0 }, + { .name = "MDCR_EL2", .state = ARM_CP_STATE_BOTH, + .opc0 = 3, .opc1 = 4, .crn = 1, .crm = 1, .opc2 = 1, + .access = PL2_RW, .type = ARM_CP_CONST, .resetvalue = 0 }, REGINFO_SENTINEL };@@ -3870,6 +3873,13 @@ static void define_debug_regs(ARMCPU *cpu) .name = "DBGDIDR", .cp = 14, .crn = 0, .crm = 0, .opc1 = 0, .opc2 = 0, .access = PL0_R, .type = ARM_CP_CONST, .resetvalue = cpu->dbgdidr, }; +ARMCPRegInfo mdcr_el2 = { + .name ="MDCR_EL2" , .state =ARM_CP_STATE_BOTH , + .opc0 =3 , .opc1 =4 , .crn =1 , .crm =1 , .opc2 =1 , + .access =PL2_RW , + .fieldoffset = offsetof(CPUARMState, cp15.mdcr_el2), + .resetvalue = cpu->mdcr, + };/* Note that all these register fields hold "number of Xs minus 1". */ brps =extract32 (cpu->dbgdidr,24 ,4 );@@ -3894,6 +3904,9 @@ static void define_debug_regs(ARMCPU *cpu)if (arm_feature (&cpu->env,ARM_FEATURE_LPAE )) {define_arm_cp_regs (cpu, debug_lpae_cp_reginfo); } +if (arm_feature (&cpu->env,ARM_FEATURE_EL2 )) { +define_one_arm_cp_reg (cpu, &mdcr_el2); + }for (i =0 ; i < brps +1 ; i++) {ARMCPRegInfo dbgregs[] = {
Signature · 1 line
Alex Bennée
Quoted 52 lines · Alex Bennée
Quoted 42 lines · Sergey Fedorov
Signed-off-by Sergey Fedorov <[email protected]>---
This patch is a prerequisite for a debug exception routing patch:
https://lists.gnu.org/archive/html/qemu-devel/2015-09/msg03542.htmltarget-arm/cpu-qom.h | 1 + target-arm/cpu.c | 1 + target-arm/cpu.h | 1 + target-arm/cpu64.c | 1 + target-arm/helper.c | 13 +++++++++++++ 5 files changed, 17 insertions(+)target-arm/cpu-qom.h +1
-0@@ -167,6 +167,7 @@ typedef struct ARMCPU {uint64_t id_aa64mmfr0;uint64_t id_aa64mmfr1;uint32_t dbgdidr; +uint32_t mdcr;uint32_t clidr;uint64_t mp_affinity;/* MP ID without feature bits */ /* The elements of this array are the CCSIDR values for each cache, target-arm/cpu.c +1
-0@@ -1125,6 +1125,7 @@ static void cortex_a15_initfn(Object *obj) cpu->id_isar3 =0x11112131 ; cpu->id_isar4 =0x10011142 ; cpu->dbgdidr =0x3515f021 ; + cpu->mdcr =0x00000006 ; cpu->clidr =0x0a200023 ; cpu->ccsidr[0 ] =0x701fe00a ;/* 32K L1 dcache */ cpu->ccsidr[1 ] =0x201fe00a ;/* 32K L1 icache */ target-arm/cpu.h +0
-0target-arm/cpu.h typedef struct CPUARMState { · line 383
Quoted 4 lines
target-arm/cpu.h +1
-0@@ -380,6 +380,7 @@ typedef struct CPUARMState {uint64_t dbgwvr[16 ];/* watchpoint value registers */ uint64_t dbgwcr[16 ];/* watchpoint control registers */ uint64_t mdscr_el1; +uint64_t mdcr_el2;Given we already have banked el3 regs shouldn't this be:
Quoted 3 lines
uint64_6 mdcr_el[4]?
You could argue either way, but since there's only an MDCR_EL2 and an MDCR_EL3 and they're not really the same field format there won't be any code that wants to do mdcr_el[x], so I think calling the field mdcr_el2 is ok.
-- PMM
Quoted 53 lines · Peter Maydell
Quoted 52 lines · Alex Bennée
Quoted 42 lines · Sergey Fedorov
Signed-off-by Sergey Fedorov <[email protected]>---
This patch is a prerequisite for a debug exception routing patch:
https://lists.gnu.org/archive/html/qemu-devel/2015-09/msg03542.htmltarget-arm/cpu-qom.h | 1 + target-arm/cpu.c | 1 + target-arm/cpu.h | 1 + target-arm/cpu64.c | 1 + target-arm/helper.c | 13 +++++++++++++ 5 files changed, 17 insertions(+)target-arm/cpu-qom.h +1
-0@@ -167,6 +167,7 @@ typedef struct ARMCPU {uint64_t id_aa64mmfr0;uint64_t id_aa64mmfr1;uint32_t dbgdidr; +uint32_t mdcr;uint32_t clidr;uint64_t mp_affinity;/* MP ID without feature bits */ /* The elements of this array are the CCSIDR values for each cache, target-arm/cpu.c +1
-0@@ -1125,6 +1125,7 @@ static void cortex_a15_initfn(Object *obj) cpu->id_isar3 =0x11112131 ; cpu->id_isar4 =0x10011142 ; cpu->dbgdidr =0x3515f021 ; + cpu->mdcr =0x00000006 ; cpu->clidr =0x0a200023 ; cpu->ccsidr[0 ] =0x701fe00a ;/* 32K L1 dcache */ cpu->ccsidr[1 ] =0x201fe00a ;/* 32K L1 icache */ target-arm/cpu.h +0
-0target-arm/cpu.h typedef struct CPUARMState { · line 383
Quoted 4 lines
target-arm/cpu.h +1
-0@@ -380,6 +380,7 @@ typedef struct CPUARMState {uint64_t dbgwvr[16 ];/* watchpoint value registers */ uint64_t dbgwcr[16 ];/* watchpoint control registers */ uint64_t mdscr_el1; +uint64_t mdcr_el2;Given we already have banked el3 regs shouldn't this be:
Quoted 8 lines
Quoted 3 lines
uint64_6 mdcr_el[4]?
You could argue either way, but since there's only an
MDCR_EL2and anMDCR_EL3and they're not really the same field format there won't be any code that wants to do mdcr_el[x], so I think calling the fieldmdcr_el2is ok.
Fair enough that makes sense.
Signature · 1 line
Alex Bennée
Quoted 18 lines · Sergey Fedorov
Signed-off-by Sergey Fedorov <[email protected]>---
This patch is a prerequisite for a debug exception routing patch:
https://lists.gnu.org/archive/html/qemu-devel/2015-09/msg03542.htmltarget-arm/cpu-qom.h | 1 + target-arm/cpu.c | 1 + target-arm/cpu.h | 1 + target-arm/cpu64.c | 1 + target-arm/helper.c | 13 +++++++++++++ 5 files changed, 17 insertions(+)target-arm/cpu-qom.h +0
-0
target-arm/cpu-qom.h typedef struct ARMCPU { · line 170
Quoted 4 lines
target-arm/cpu-qom.h +1
-0@@ -167,6 +167,7 @@ typedef struct ARMCPU {uint64_t id_aa64mmfr0;uint64_t id_aa64mmfr1;uint32_t dbgdidr; +uint32_t mdcr;
This field should be named mdcr_el2 if we have it, but:
the reset value for this register is defined architecturally, so we don't need to specify it per CPU. (It's "all 0s, except the bottom field resets to the same value as PMCR.N". Strictly speaking some fields are defined to be architecturally unknown and so might differ per CPU, but only in ways which a guest doesn't care about. We typically model these in the same way for all guest CPUs in QEMU.)
thanks
-- PMM
Quoted 23 lines · Peter Maydell
Quoted 18 lines · Sergey Fedorov
Signed-off-by Sergey Fedorov <[email protected]>---
This patch is a prerequisite for a debug exception routing patch:
https://lists.gnu.org/archive/html/qemu-devel/2015-09/msg03542.htmltarget-arm/cpu-qom.h | 1 + target-arm/cpu.c | 1 + target-arm/cpu.h | 1 + target-arm/cpu64.c | 1 + target-arm/helper.c | 13 +++++++++++++ 5 files changed, 17 insertions(+)target-arm/cpu-qom.h +0
-0target-arm/cpu-qom.h typedef struct ARMCPU { · line 170
Quoted 4 lines
target-arm/cpu-qom.h +1
-0@@ -167,6 +167,7 @@ typedef struct ARMCPU {uint64_t id_aa64mmfr0;uint64_t id_aa64mmfr1;uint32_t dbgdidr; +uint32_t mdcr;
Quoted 9 lines
This field should be named
mdcr_el2if we have it, but:
the reset value for this register is defined architecturally, so we don't need to specify it per CPU. (It's "all 0s, except the bottom field resets to the same value as PMCR.N". Strictly speaking some fields are defined to be architecturally unknown and so might differ per CPU, but only in ways which a guest doesn't care about. We typically model these in the same way for all guest CPUs in QEMU.)
We reset PMCR_EL0 to cpu->midr & 0xff000000. So if we want to reset MDCR_EL2.N with PMCR_EL0.N we should reset PMCR_EL0.N to the proper value somehow first. I think we could reset PMCR_EL0 with its own reset value from a dedicated ARMCPU structure field independent from MIDR_EL1 reset value. This makes sense considering that most of PMCR_EL0's fields are RO/UNKNOWN. What do you think?
Best regards,
Sergey
Quoted 12 lines · Sergey Fedorov
Quoted 10 lines · Peter Maydell
On 28 September 2015 at 11:37, Sergey Fedorov <[email protected]> wrote:
This field should be namedmdcr_el2if we have it, but:
the reset value for this register is defined architecturally, so we don't need to specify it per CPU. (It's "all 0s, except the bottom field resets to the same value as PMCR.N". Strictly speaking some fields are defined to be architecturally
unknown and so might differ per CPU, but only in ways which
a guest doesn't care about. We typically model these in
the same way for all guest CPUs in QEMU.)
Quoted 6 lines
We reset
PMCR_EL0tocpu->midr&0xff000000. So if we want to reset MDCR_EL2.N with PMCR_EL0.N we should reset PMCR_EL0.N to the proper value somehow first. I think we could resetPMCR_EL0with its own reset value from a dedicated ARMCPU structure field independent fromMIDR_EL1reset value. This makes sense considering that most of PMCR_EL0's fields are RO/UNKNOWN. What do you think?
At the moment we don't implement any perf counters except the cycle counter, so I think PMCR_EL0.N is already being reset to the proper value...
-- PMM
Quoted 18 lines · Peter Maydell
Quoted 11 lines · Sergey Fedorov
Quoted 10 lines · Peter Maydell
On 28 September 2015 at 11:37, Sergey Fedorov <[email protected]> wrote:
This field should be namedmdcr_el2if we have it, but:
the reset value for this register is defined architecturally, so we don't need to specify it per CPU. (It's "all 0s, except the bottom field resets to the same value as PMCR.N". Strictly speaking some fields are defined to be architecturally
unknown and so might differ per CPU, but only in ways which
a guest doesn't care about. We typically model these in
the same way for all guest CPUs in QEMU.)Quoted 6 lines
We reset
PMCR_EL0tocpu->midr&0xff000000. So if we want to reset MDCR_EL2.N with PMCR_EL0.N we should reset PMCR_EL0.N to the proper value somehow first. I think we could resetPMCR_EL0with its own reset value from a dedicated ARMCPU structure field independent fromMIDR_EL1reset value. This makes sense considering that most of PMCR_EL0's fields are RO/UNKNOWN. What do you think?
Quoted 3 lines
At the moment we don't implement any perf counters except the cycle counter, so I think PMCR_EL0.N is already being reset to the proper value...
Seems like I should just simply use zero as a reset value for MDCR_EL2 register :)
Quoted 19 lines · Sergey Fedorov
Quoted 18 lines · Peter Maydell
Quoted 17 lines · Sergey Fedorov
Quoted 10 lines · Peter Maydell
On 28 September 2015 at 11:37, Sergey Fedorov <[email protected]> wrote:
This field should be namedmdcr_el2if we have it, but:
the reset value for this register is defined architecturally, so we don't need to specify it per CPU. (It's "all 0s, except the bottom field resets to the same value as PMCR.N". Strictly speaking some fields are defined to be architecturally
unknown and so might differ per CPU, but only in ways which
a guest doesn't care about. We typically model these in
the same way for all guest CPUs in QEMU.)We reset
PMCR_EL0tocpu->midr&0xff000000. So if we want to reset MDCR_EL2.N with PMCR_EL0.N we should reset PMCR_EL0.N to the proper value somehow first. I think we could resetPMCR_EL0with its own reset value from a dedicated ARMCPU structure field independent fromMIDR_EL1reset value. This makes sense considering that most of PMCR_EL0's fields are RO/UNKNOWN. What do you think?
Quoted 5 lines
Quoted 3 lines
At the moment we don't implement any perf counters except the cycle counter, so I think PMCR_EL0.N is already being reset to the proper value...
Seems like I should just simply use zero as a reset value for
MDCR_EL2register :)
Peter, would be okay to use zero as a reset value for MDCR_EL2 in this patch?
Best regards,
Sergey
Quoted 20 lines · Sergey Fedorov
Quoted 19 lines · Sergey Fedorov
Quoted 18 lines · Peter Maydell
Quoted 17 lines · Sergey Fedorov
Quoted 10 lines · Peter Maydell
On 28 September 2015 at 11:37, Sergey Fedorov <[email protected]> wrote:
This field should be namedmdcr_el2if we have it, but:
the reset value for this register is defined architecturally, so we don't need to specify it per CPU. (It's "all 0s, except the bottom field resets to the same value as PMCR.N". Strictly speaking some fields are defined to be architecturally
unknown and so might differ per CPU, but only in ways which
a guest doesn't care about. We typically model these in
the same way for all guest CPUs in QEMU.)We reset
PMCR_EL0tocpu->midr&0xff000000. So if we want to reset MDCR_EL2.N with PMCR_EL0.N we should reset PMCR_EL0.N to the proper value somehow first. I think we could resetPMCR_EL0with its own reset value from a dedicated ARMCPU structure field independent fromMIDR_EL1reset value. This makes sense considering that most of PMCR_EL0's fields are RO/UNKNOWN. What do you think?
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
At the moment we don't implement any perf counters except the cycle counter, so I think PMCR_EL0.N is already being reset to the proper value...
Seems like I should just simply use zero as a reset value for
MDCR_EL2register :)Peter, would be okay to use zero as a reset value for
MDCR_EL2in this patch?
Yes; you could add a brief comment that this assumes there are no other performance counters.
-- PMM