target/arm: Honor the HCR_EL2.TACR bit
This bit traps EL1 access to the auxiliary control registers. Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20200229012811.24129-9-richard.henderson@linaro.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
1803d2713b
commit
9960237769
|
@ -553,6 +553,16 @@ static CPAccessResult access_tsw(CPUARMState *env, const ARMCPRegInfo *ri,
|
|||
return CP_ACCESS_OK;
|
||||
}
|
||||
|
||||
/* Check for traps from EL1 due to HCR_EL2.TACR. */
|
||||
static CPAccessResult access_tacr(CPUARMState *env, const ARMCPRegInfo *ri,
|
||||
bool isread)
|
||||
{
|
||||
if (arm_current_el(env) == 1 && (arm_hcr_el2_eff(env) & HCR_TACR)) {
|
||||
return CP_ACCESS_TRAP_EL2;
|
||||
}
|
||||
return CP_ACCESS_OK;
|
||||
}
|
||||
|
||||
static void dacr_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value)
|
||||
{
|
||||
ARMCPU *cpu = env_archcpu(env);
|
||||
|
@ -6961,8 +6971,8 @@ static const ARMCPRegInfo ats1cp_reginfo[] = {
|
|||
static const ARMCPRegInfo actlr2_hactlr2_reginfo[] = {
|
||||
{ .name = "ACTLR2", .state = ARM_CP_STATE_AA32,
|
||||
.cp = 15, .opc1 = 0, .crn = 1, .crm = 0, .opc2 = 3,
|
||||
.access = PL1_RW, .type = ARM_CP_CONST,
|
||||
.resetvalue = 0 },
|
||||
.access = PL1_RW, .accessfn = access_tacr,
|
||||
.type = ARM_CP_CONST, .resetvalue = 0 },
|
||||
{ .name = "HACTLR2", .state = ARM_CP_STATE_AA32,
|
||||
.cp = 15, .opc1 = 4, .crn = 1, .crm = 0, .opc2 = 3,
|
||||
.access = PL2_RW, .type = ARM_CP_CONST,
|
||||
|
@ -7718,8 +7728,8 @@ void register_cp_regs_for_features(ARMCPU *cpu)
|
|||
ARMCPRegInfo auxcr_reginfo[] = {
|
||||
{ .name = "ACTLR_EL1", .state = ARM_CP_STATE_BOTH,
|
||||
.opc0 = 3, .opc1 = 0, .crn = 1, .crm = 0, .opc2 = 1,
|
||||
.access = PL1_RW, .type = ARM_CP_CONST,
|
||||
.resetvalue = cpu->reset_auxcr },
|
||||
.access = PL1_RW, .accessfn = access_tacr,
|
||||
.type = ARM_CP_CONST, .resetvalue = cpu->reset_auxcr },
|
||||
{ .name = "ACTLR_EL2", .state = ARM_CP_STATE_BOTH,
|
||||
.opc0 = 3, .opc1 = 4, .crn = 1, .crm = 0, .opc2 = 1,
|
||||
.access = PL2_RW, .type = ARM_CP_CONST,
|
||||
|
|
Loading…
Reference in a new issue