target/arm: Correct the encoding of MDCCSR_EL0
Quoted 11 lines · On Tue, 29 Jun 2021 at 09:27, <[email protected]> wrote:
Signed-off-by Nick Hudson <[email protected]>--- target/arm/helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)target/arm/helper.c +0
-0
target/arm/helper.c static const ARMCPRegInfo debug_cp_reginfo[] = { · line 6336
Quoted 8 lines
target/arm/helper.c +1
-1@@ -6330,7 +6330,7 @@ static const ARMCPRegInfo debug_cp_reginfo[] = {* We don't implement the configurable EL0 access. */ { .name = "MDCCSR_EL0", .state = ARM_CP_STATE_BOTH, - .cp = 14, .opc0 = 2, .opc1 = 0, .crn = 0, .crm = 1, .opc2 = 0, + .cp = 14, .opc0 = 2, .opc1 = 3, .crn = 0, .crm = 1, .opc2 = 0, .type = ARM_CP_ALIAS, .access = PL1_R, .accessfn = access_tda, .fieldoffset = offsetof(CPUARMState, cp15.mdscr_el1), },
This fixes the encoding for AArch64, but breaks it for AArch32, where it is cp=14 opc1=0 crn=0 crm=1 opc2=0. Because this is one of those system registers where the AArch64 and AArch32 encodings don't match up, to fix the AArch64 encoding we need to replace this ARM_CP_STATE_BOTH reginfo with separate reginfo for ARM_CP_STATE_AA32 and ARM_CP_STATE_AA64, something like this:
{ .name = "MDCCSR_EL0", .state = ARM_CP_STATE_AA64,
.opc0 = 2, .opc1 = 3, .crn = 0, .crm = 1, .opc2 = 0, .type = ARM_CP_ALIAS,
.access = PL1_R, .accessfn = access_tda, .fieldoffset = offsetof(CPUARMState, cp15.mdscr_el1), },
{ .name = "DBGDSCRint", .state = ARM_CP_STATE_AA32,
.cp = 14, .opc0 = 2, .opc1 = 0, .crn = 0, .crm = 1, .opc2 = 0, .type = ARM_CP_ALIAS,
.access = PL1_R, .accessfn = access_tda, .fieldoffset = offsetoflow32(CPUARMState, cp15.mdscr_el1), },
thanks
-- PMM
Quoted 45 lines · Nick Hudson
Quoted 33 lines · Peter Maydell
Quoted 11 lines · On Tue, 29 Jun 2021 at 09:27, <[email protected]> wrote:
Signed-off-by Nick Hudson <[email protected]>---
target/arm/helper.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)target/arm/helper.c +0
-0target/arm/helper.c static const ARMCPRegInfo debug_cp_reginfo[] = { · line 6336
Quoted 8 lines
target/arm/helper.c +1
-1@@ -6330,7 +6330,7 @@ static const ARMCPRegInfo debug_cp_reginfo[] = {* We don't implement the configurable EL0 access. */ { .name = "MDCCSR_EL0", .state = ARM_CP_STATE_BOTH, - .cp = 14, .opc0 = 2, .opc1 = 0, .crn = 0, .crm = 1, .opc2 = 0, + .cp = 14, .opc0 = 2, .opc1 = 3, .crn = 0, .crm = 1, .opc2 = 0, .type = ARM_CP_ALIAS, .access = PL1_R, .accessfn = access_tda, .fieldoffset = offsetof(CPUARMState, cp15.mdscr_el1), },This fixes the encoding for AArch64, but breaks it for AArch32, where it is cp=14 opc1=0 crn=0 crm=1 opc2=0. Because this is one of those system registers where the AArch64 and AArch32 encodings don't match up, to fix the AArch64 encoding we need to replace this
ARM_CP_STATE_BOTHreginfo with separate reginfo forARM_CP_STATE_AA32andARM_CP_STATE_AA64, something like this:Quoted 11 lines
{ .name = "
MDCCSR_EL0", .state =ARM_CP_STATE_AA64,
.opc0 = 2, .opc1 = 3, .crn = 0, .crm = 1, .opc2 = 0, .type =ARM_CP_ALIAS,
.access =PL1_R, .accessfn =access_tda, .fieldoffset =offsetof(CPUARMState, cp15.mdscr_el1), },
{ .name = "DBGDSCRint", .state =ARM_CP_STATE_AA32,
.cp = 14, .opc0 = 2, .opc1 = 0, .crn = 0, .crm = 1, .opc2 = 0, .type =ARM_CP_ALIAS,
.access =PL1_R, .accessfn =access_tda, .fieldoffset =offsetoflow32(CPUARMState, cp15.mdscr_el1), },
Quoted 3 lines
Ah, yes.
As MDCCSR_EL0[30:29] only maps to DBGDSCRint[30:29] maybe it should be all RAZ?
Well, you can't make it all RAZ, because those 2 bits do still need to be mapped, but I guess in theory yes we should define read and write accessor functions for AArch64 MDCCSR_EL0 that mask out everything except [30:29].
thanks
-- PMM
PATCH 1/1 target/arm: Correct the encoding of MDCCSR_EL0
--- target/arm/helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/arm/helper.c +1 -1
@@ -6330,7 +6330,7 @@ static const ARMCPRegInfo debug_cp_reginfo[] = {* We don't implement the configurable EL0 access. */ { .name = "MDCCSR_EL0", .state = ARM_CP_STATE_BOTH, - .cp = 14, .opc0 = 2, .opc1 = 0, .crn = 0, .crm = 1, .opc2 = 0, + .cp = 14, .opc0 = 2, .opc1 = 3, .crn = 0, .crm = 1, .opc2 = 0, .type = ARM_CP_ALIAS, .access = PL1_R, .accessfn = access_tda, .fieldoffset = offsetof(CPUARMState, cp15.mdscr_el1), },
Signature · 1 line
2.17.1
Quoted 32 lines · Peter Maydell
Quoted 11 lines · On Tue, 29 Jun 2021 at 09:27, <[email protected]> wrote:
Signed-off-by Nick Hudson <[email protected]>---
target/arm/helper.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)target/arm/helper.c +0
-0target/arm/helper.c static const ARMCPRegInfo debug_cp_reginfo[] = { · line 6336
Quoted 8 lines
target/arm/helper.c +1
-1@@ -6330,7 +6330,7 @@ static const ARMCPRegInfo debug_cp_reginfo[] = {* We don't implement the configurable EL0 access. */ { .name = "MDCCSR_EL0", .state = ARM_CP_STATE_BOTH, - .cp = 14, .opc0 = 2, .opc1 = 0, .crn = 0, .crm = 1, .opc2 = 0, + .cp = 14, .opc0 = 2, .opc1 = 3, .crn = 0, .crm = 1, .opc2 = 0, .type = ARM_CP_ALIAS, .access = PL1_R, .accessfn = access_tda, .fieldoffset = offsetof(CPUARMState, cp15.mdscr_el1), },This fixes the encoding for AArch64, but breaks it for AArch32, where it is cp=14 opc1=0 crn=0 crm=1 opc2=0. Because this is one of those system registers where the AArch64 and AArch32 encodings don't match up, to fix the AArch64 encoding we need to replace this
ARM_CP_STATE_BOTHreginfo with separate reginfo forARM_CP_STATE_AA32andARM_CP_STATE_AA64, something like this:
Quoted 11 lines
{ .name = "
MDCCSR_EL0", .state =ARM_CP_STATE_AA64,
.opc0 = 2, .opc1 = 3, .crn = 0, .crm = 1, .opc2 = 0, .type =ARM_CP_ALIAS,
.access =PL1_R, .accessfn =access_tda, .fieldoffset =offsetof(CPUARMState, cp15.mdscr_el1), },
{ .name = "DBGDSCRint", .state =ARM_CP_STATE_AA32,
.cp = 14, .opc0 = 2, .opc1 = 0, .crn = 0, .crm = 1, .opc2 = 0, .type =ARM_CP_ALIAS,
.access =PL1_R, .accessfn =access_tda, .fieldoffset =offsetoflow32(CPUARMState, cp15.mdscr_el1), },
Ah, yes.
As MDCCSR_EL0[30:29] only maps to DBGDSCRint[30:29] maybe it should be all RAZ?
Thanks,
Nick
Quoted 50 lines · Peter Maydell
Quoted 45 lines · Nick Hudson
Quoted 44 lines · Peter Maydell
Quoted 11 lines · On Tue, 29 Jun 2021 at 09:27, <[email protected]> wrote:
Signed-off-by Nick Hudson <[email protected]>---
target/arm/helper.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)target/arm/helper.c +0
-0target/arm/helper.c static const ARMCPRegInfo debug_cp_reginfo[] = { · line 6336
Quoted 8 lines
target/arm/helper.c +1
-1@@ -6330,7 +6330,7 @@ static const ARMCPRegInfo debug_cp_reginfo[] = {* We don't implement the configurable EL0 access. */ { .name = "MDCCSR_EL0", .state = ARM_CP_STATE_BOTH, - .cp = 14, .opc0 = 2, .opc1 = 0, .crn = 0, .crm = 1, .opc2 = 0, + .cp = 14, .opc0 = 2, .opc1 = 3, .crn = 0, .crm = 1, .opc2 = 0, .type = ARM_CP_ALIAS, .access = PL1_R, .accessfn = access_tda, .fieldoffset = offsetof(CPUARMState, cp15.mdscr_el1), },This fixes the encoding for AArch64, but breaks it for AArch32, where it is cp=14 opc1=0 crn=0 crm=1 opc2=0. Because this is one of those system registers where the AArch64 and AArch32 encodings don't match up, to fix the AArch64 encoding we need to replace this
ARM_CP_STATE_BOTHreginfo with separate reginfo forARM_CP_STATE_AA32andARM_CP_STATE_AA64, something like this:{ .name = "
MDCCSR_EL0", .state =ARM_CP_STATE_AA64,
.opc0 = 2, .opc1 = 3, .crn = 0, .crm = 1, .opc2 = 0, .type =ARM_CP_ALIAS,
.access =PL1_R, .accessfn =access_tda, .fieldoffset =offsetof(CPUARMState, cp15.mdscr_el1), },
{ .name = "DBGDSCRint", .state =ARM_CP_STATE_AA32,
.cp = 14, .opc0 = 2, .opc1 = 0, .crn = 0, .crm = 1, .opc2 = 0, .type =ARM_CP_ALIAS,
.access =PL1_R, .accessfn =access_tda, .fieldoffset =offsetoflow32(CPUARMState, cp15.mdscr_el1), },
Quoted 8 lines
Quoted 3 lines
Ah, yes.
As MDCCSR_EL0[30:29] only maps to DBGDSCRint[30:29] maybe it should be all RAZ?
Well, you can't make it all RAZ, because those 2 bits do still need to be mapped, but I guess in theory yes we should define read and write accessor functions for AArch64
MDCCSR_EL0that mask out everything except [30:29].
Hi Peter,
Maybe I’m misreading the ARM ARM and the qemu use of mdscr_el1, but I think this is good enough / more correct. I’m somewhat confused by AA64 MDSCR_EL1 vs DBGSCRint vs DBGSCRext, however.
/* MDCCSR_EL0[30:29] map to DBGDSCRint[30:29]. Simply RAZ.
* We don't implement the configurable EL0 access.
*/
{ .name = "MDCCSR_EL0", .state = ARM_CP_STATE_AA64,
.cp = 14, .opc0 = 2, .opc1 = 3, .crn = 0, .crm = 1, .opc2 = 0,
.type = ARM_CP_CONST, .resetvalue = 0 },
/* DBGDSCRint[15,12,5:2] map to MDSCR_EL1[15,12,5:2] */
{ .name = "DBGDSCRint", .state = ARM_CP_STATE_AA32,
.cp = 14, .opc0 = 2, .opc1 = 0, .crn = 0, .crm = 1, .opc2 = 0,
.type = ARM_CP_ALIAS,
.access = PL1_R, .accessfn = access_tda,
.fieldoffset = offsetof(CPUARMState, cp15.mdscr_el1), },Please let me know if you want me to submit a new patch.
Thanks,
Nick
Quoted 50 lines · Peter Maydell
Quoted 45 lines · Nick Hudson
Quoted 44 lines · Peter Maydell
Quoted 11 lines · On Tue, 29 Jun 2021 at 09:27, <[email protected]> wrote:
Signed-off-by Nick Hudson <[email protected]>---
target/arm/helper.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)target/arm/helper.c +0
-0target/arm/helper.c static const ARMCPRegInfo debug_cp_reginfo[] = { · line 6336
Quoted 8 lines
target/arm/helper.c +1
-1@@ -6330,7 +6330,7 @@ static const ARMCPRegInfo debug_cp_reginfo[] = {* We don't implement the configurable EL0 access. */ { .name = "MDCCSR_EL0", .state = ARM_CP_STATE_BOTH, - .cp = 14, .opc0 = 2, .opc1 = 0, .crn = 0, .crm = 1, .opc2 = 0, + .cp = 14, .opc0 = 2, .opc1 = 3, .crn = 0, .crm = 1, .opc2 = 0, .type = ARM_CP_ALIAS, .access = PL1_R, .accessfn = access_tda, .fieldoffset = offsetof(CPUARMState, cp15.mdscr_el1), },This fixes the encoding for AArch64, but breaks it for AArch32, where it is cp=14 opc1=0 crn=0 crm=1 opc2=0. Because this is one of those system registers where the AArch64 and AArch32 encodings don't match up, to fix the AArch64 encoding we need to replace this
ARM_CP_STATE_BOTHreginfo with separate reginfo forARM_CP_STATE_AA32andARM_CP_STATE_AA64, something like this:{ .name = "
MDCCSR_EL0", .state =ARM_CP_STATE_AA64,
.opc0 = 2, .opc1 = 3, .crn = 0, .crm = 1, .opc2 = 0, .type =ARM_CP_ALIAS,
.access =PL1_R, .accessfn =access_tda, .fieldoffset =offsetof(CPUARMState, cp15.mdscr_el1), },
{ .name = "DBGDSCRint", .state =ARM_CP_STATE_AA32,
.cp = 14, .opc0 = 2, .opc1 = 0, .crn = 0, .crm = 1, .opc2 = 0, .type =ARM_CP_ALIAS,
.access =PL1_R, .accessfn =access_tda, .fieldoffset =offsetoflow32(CPUARMState, cp15.mdscr_el1), },
Quoted 8 lines
Quoted 3 lines
Ah, yes.
As MDCCSR_EL0[30:29] only maps to DBGDSCRint[30:29] maybe it should be all RAZ?
Well, you can't make it all RAZ, because those 2 bits do still need to be mapped, but I guess in theory yes we should define read and write accessor functions for AArch64
MDCCSR_EL0that mask out everything except [30:29].
(Apologies if you get this/similar twice - my email is doing strange things)
Hi Peter,
I think the following is acceptable in that qemu doesn’t touch MDSCR_EL1 as far as I can tell. Perhaps I’m reading the code and the ARM ARM wrong?
/* MDCCSR_EL0[30:29] map to DBGDSCRint[30:29]. Simply RAZ.
* We don't implement the configurable EL0 access.
*/
{ .name = "MDCCSR_EL0", .state = ARM_CP_STATE_AA64,
.cp = 14, .opc0 = 2, .opc1 = 3, .crn = 0, .crm = 1, .opc2 = 0,
.type = ARM_CP_CONST, .resetvalue = 0 },
/* DBGDSCRint[15,12,5:2] map to MDSCR_EL1[15,12,5:2] */
{ .name = "DBGDSCRint", .state = ARM_CP_STATE_AA32,
.cp = 14, .opc0 = 2, .opc1 = 0, .crn = 0, .crm = 1, .opc2 = 0,
.type = ARM_CP_ALIAS,
.access = PL1_R, .accessfn = access_tda,
.fieldoffset = offsetof(CPUARMState, cp15.mdscr_el1), },Please let me know if you want me to post this (or a different change) as a new diff.
Thanks,
Nick
Quoted 3 lines · Nick Hudson
Maybe I’m misreading the ARM ARM and the qemu use of
mdscr_el1, but I think this is good enough / more correct. I’m somewhat confused by AA64MDSCR_EL1vs DBGSCRint vs DBGSCRext, however.
Yeah, it is confusing and we generally haven't modeled this very well, because we've kind of only cared when guests don't work and some of the purpose of these registers is for external debug which we don't model at all.
Looking more closely at the Arm ARM:
* MDSCR_EL1 is the AArch64 register
* DBGDSCRext is the AArch32 version of that
We model these basically correctly, I think
* MDCCSR_EL0 is supposed to be an AArch64 read-only register which
has bits [30:29] of EDSCR (ie the JTAG-debugger-view of the TX/RX connection)
* DBGDSCRint is similar for AArch32, but it also has various
bits that are read-only views of bits in DBGDSCRext/MDSCR_EL1
Bits [30:29] of MDSCR_EL1 are sort-of-but-not-quite the same bits as EDSCR [30:29], but they're close enough for our purposes.
Quoted 1 line
/* MDCCSR_EL0[30:29] map to DBGDSCRint[30:29]. Simply RAZ.
(QEMU coding style requires "/*" on a line of its own.)
Quoted 5 lines
* We don't implement the configurable EL0 access.
*/
{ .name = "MDCCSR_EL0", .state = ARM_CP_STATE_AA64,
.cp = 14, .opc0 = 2, .opc1 = 3, .crn = 0, .crm = 1, .opc2 = 0,
.type = ARM_CP_CONST, .resetvalue = 0 },This seems reasonable; we don't implement the external debug Debug Communication Channel so we might as well model RXfull/TXfull as 0. It might be nice to mention in the comment that the reason we RAZ is because we don't implement the DCC.
Quoted 6 lines
/* DBGDSCRint[15,12,5:2] map to MDSCR_EL1[15,12,5:2] */ { .name = "DBGDSCRint", .state =
ARM_CP_STATE_AA32,
.cp = 14, .opc0 = 2, .opc1 = 0, .crn = 0, .crm = 1, .opc2 = 0, .type =ARM_CP_ALIAS,
.access =PL1_R, .accessfn =access_tda, .fieldoffset =offsetof(CPUARMState, cp15.mdscr_el1), },
Here we're taking advantage of the fact tha MDSCR_EL1[30:29] are close enough that we can get away with using those. It's not consistent with how we modelled MDCCSR_EL0's version of those flags but it's unlikely any guest code will care.
Quoted 1 line
Please let me know if you want me to submit a new patch.
Yes, please do.
thanks
-- PMM