target/arm: Mark up sysregs for HFGRTR bits 12..23
Mark up the sysreg definitions for the registers trapped by HFGRTR/HFGWTR bits 12..23. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Tested-by: Fuad Tabba <tabba@google.com> Message-id: 20230130182459.3309057-12-peter.maydell@linaro.org Message-id: 20230127175507.2895013-12-peter.maydell@linaro.org
This commit is contained in:
parent
158c276c74
commit
b19ed03c4c
|
@ -591,6 +591,18 @@ typedef enum FGTBit {
|
|||
DO_BIT(HFGRTR, CCSIDR_EL1),
|
||||
DO_BIT(HFGRTR, CLIDR_EL1),
|
||||
DO_BIT(HFGRTR, CONTEXTIDR_EL1),
|
||||
DO_BIT(HFGRTR, CPACR_EL1),
|
||||
DO_BIT(HFGRTR, CSSELR_EL1),
|
||||
DO_BIT(HFGRTR, CTR_EL0),
|
||||
DO_BIT(HFGRTR, DCZID_EL0),
|
||||
DO_BIT(HFGRTR, ESR_EL1),
|
||||
DO_BIT(HFGRTR, FAR_EL1),
|
||||
DO_BIT(HFGRTR, ISR_EL1),
|
||||
DO_BIT(HFGRTR, LORC_EL1),
|
||||
DO_BIT(HFGRTR, LOREA_EL1),
|
||||
DO_BIT(HFGRTR, LORID_EL1),
|
||||
DO_BIT(HFGRTR, LORN_EL1),
|
||||
DO_BIT(HFGRTR, LORSA_EL1),
|
||||
} FGTBit;
|
||||
|
||||
#undef DO_BIT
|
||||
|
|
|
@ -869,6 +869,7 @@ static const ARMCPRegInfo v6_cp_reginfo[] = {
|
|||
.access = PL1_RW, .type = ARM_CP_CONST, .resetvalue = 0, },
|
||||
{ .name = "CPACR", .state = ARM_CP_STATE_BOTH, .opc0 = 3,
|
||||
.crn = 1, .crm = 0, .opc1 = 0, .opc2 = 2, .accessfn = cpacr_access,
|
||||
.fgt = FGT_CPACR_EL1,
|
||||
.access = PL1_RW, .fieldoffset = offsetof(CPUARMState, cp15.cpacr_el1),
|
||||
.resetfn = cpacr_reset, .writefn = cpacr_write, .readfn = cpacr_read },
|
||||
};
|
||||
|
@ -2170,6 +2171,7 @@ static const ARMCPRegInfo v7_cp_reginfo[] = {
|
|||
.opc0 = 3, .crn = 0, .crm = 0, .opc1 = 2, .opc2 = 0,
|
||||
.access = PL1_RW,
|
||||
.accessfn = access_tid4,
|
||||
.fgt = FGT_CSSELR_EL1,
|
||||
.writefn = csselr_write, .resetvalue = 0,
|
||||
.bank_fieldoffsets = { offsetof(CPUARMState, cp15.csselr_s),
|
||||
offsetof(CPUARMState, cp15.csselr_ns) } },
|
||||
|
@ -2233,6 +2235,7 @@ static const ARMCPRegInfo v7_cp_reginfo[] = {
|
|||
.resetfn = arm_cp_reset_ignore },
|
||||
{ .name = "ISR_EL1", .state = ARM_CP_STATE_BOTH,
|
||||
.opc0 = 3, .opc1 = 0, .crn = 12, .crm = 1, .opc2 = 0,
|
||||
.fgt = FGT_ISR_EL1,
|
||||
.type = ARM_CP_NO_RAW, .access = PL1_R, .readfn = isr_read },
|
||||
/* 32 bit ITLB invalidates */
|
||||
{ .name = "ITLBIALL", .cp = 15, .opc1 = 0, .crn = 8, .crm = 5, .opc2 = 0,
|
||||
|
@ -4135,6 +4138,7 @@ static const ARMCPRegInfo vmsa_pmsa_cp_reginfo[] = {
|
|||
{ .name = "FAR_EL1", .state = ARM_CP_STATE_AA64,
|
||||
.opc0 = 3, .crn = 6, .crm = 0, .opc1 = 0, .opc2 = 0,
|
||||
.access = PL1_RW, .accessfn = access_tvm_trvm,
|
||||
.fgt = FGT_FAR_EL1,
|
||||
.fieldoffset = offsetof(CPUARMState, cp15.far_el[1]),
|
||||
.resetvalue = 0, },
|
||||
};
|
||||
|
@ -4143,6 +4147,7 @@ static const ARMCPRegInfo vmsa_cp_reginfo[] = {
|
|||
{ .name = "ESR_EL1", .state = ARM_CP_STATE_AA64,
|
||||
.opc0 = 3, .crn = 5, .crm = 2, .opc1 = 0, .opc2 = 0,
|
||||
.access = PL1_RW, .accessfn = access_tvm_trvm,
|
||||
.fgt = FGT_ESR_EL1,
|
||||
.fieldoffset = offsetof(CPUARMState, cp15.esr_el[1]), .resetvalue = 0, },
|
||||
{ .name = "TTBR0_EL1", .state = ARM_CP_STATE_BOTH,
|
||||
.opc0 = 3, .opc1 = 0, .crn = 2, .crm = 0, .opc2 = 0,
|
||||
|
@ -5215,6 +5220,7 @@ static const ARMCPRegInfo v8_cp_reginfo[] = {
|
|||
{ .name = "DCZID_EL0", .state = ARM_CP_STATE_AA64,
|
||||
.opc0 = 3, .opc1 = 3, .opc2 = 7, .crn = 0, .crm = 0,
|
||||
.access = PL0_R, .type = ARM_CP_NO_RAW,
|
||||
.fgt = FGT_DCZID_EL0,
|
||||
.readfn = aa64_dczid_read },
|
||||
{ .name = "DC_ZVA", .state = ARM_CP_STATE_AA64,
|
||||
.opc0 = 1, .opc1 = 3, .crn = 7, .crm = 4, .opc2 = 1,
|
||||
|
@ -7005,22 +7011,27 @@ static const ARMCPRegInfo lor_reginfo[] = {
|
|||
{ .name = "LORSA_EL1", .state = ARM_CP_STATE_AA64,
|
||||
.opc0 = 3, .opc1 = 0, .crn = 10, .crm = 4, .opc2 = 0,
|
||||
.access = PL1_RW, .accessfn = access_lor_other,
|
||||
.fgt = FGT_LORSA_EL1,
|
||||
.type = ARM_CP_CONST, .resetvalue = 0 },
|
||||
{ .name = "LOREA_EL1", .state = ARM_CP_STATE_AA64,
|
||||
.opc0 = 3, .opc1 = 0, .crn = 10, .crm = 4, .opc2 = 1,
|
||||
.access = PL1_RW, .accessfn = access_lor_other,
|
||||
.fgt = FGT_LOREA_EL1,
|
||||
.type = ARM_CP_CONST, .resetvalue = 0 },
|
||||
{ .name = "LORN_EL1", .state = ARM_CP_STATE_AA64,
|
||||
.opc0 = 3, .opc1 = 0, .crn = 10, .crm = 4, .opc2 = 2,
|
||||
.access = PL1_RW, .accessfn = access_lor_other,
|
||||
.fgt = FGT_LORN_EL1,
|
||||
.type = ARM_CP_CONST, .resetvalue = 0 },
|
||||
{ .name = "LORC_EL1", .state = ARM_CP_STATE_AA64,
|
||||
.opc0 = 3, .opc1 = 0, .crn = 10, .crm = 4, .opc2 = 3,
|
||||
.access = PL1_RW, .accessfn = access_lor_other,
|
||||
.fgt = FGT_LORC_EL1,
|
||||
.type = ARM_CP_CONST, .resetvalue = 0 },
|
||||
{ .name = "LORID_EL1", .state = ARM_CP_STATE_AA64,
|
||||
.opc0 = 3, .opc1 = 0, .crn = 10, .crm = 4, .opc2 = 7,
|
||||
.access = PL1_R, .accessfn = access_lor_ns,
|
||||
.fgt = FGT_LORID_EL1,
|
||||
.type = ARM_CP_CONST, .resetvalue = 0 },
|
||||
};
|
||||
|
||||
|
@ -8619,6 +8630,7 @@ void register_cp_regs_for_features(ARMCPU *cpu)
|
|||
{ .name = "CTR_EL0", .state = ARM_CP_STATE_AA64,
|
||||
.opc0 = 3, .opc1 = 3, .opc2 = 1, .crn = 0, .crm = 0,
|
||||
.access = PL0_R, .accessfn = ctr_el0_access,
|
||||
.fgt = FGT_CTR_EL0,
|
||||
.type = ARM_CP_CONST, .resetvalue = cpu->ctr },
|
||||
/* TCMTR and TLBTR exist in v8 but have no 64-bit versions */
|
||||
{ .name = "TCMTR",
|
||||
|
|
Loading…
Reference in New Issue