mirror of
https://github.com/yuzu-emu/unicorn.git
synced 2024-12-23 16:35:30 +00:00
target/arm: Honor the HCR_EL2.{TVM,TRVM} bits
These bits trap EL1 access to various virtual memory controls. Backports commit 84929218512c19ec9a296fbfd7b39219e0c592ae from qemu
This commit is contained in:
Richard Henderson
Lioncash
parent
7cd75be7c8
commit
7ee27e5d93
|
|
@ -370,6 +370,19 @@ static CPAccessResult access_tpm(CPUARMState *env, const ARMCPRegInfo *ri,
|
|||
return CP_ACCESS_OK;
|
||||
}
|
||||
|
||||
/* Check for traps from EL1 due to HCR_EL2.TVM and HCR_EL2.TRVM. */
|
||||
static CPAccessResult access_tvm_trvm(CPUARMState *env, const ARMCPRegInfo *ri,
|
||||
bool isread)
|
||||
{
|
||||
if (arm_current_el(env) == 1) {
|
||||
uint64_t trap = isread ? HCR_TRVM : HCR_TVM;
|
||||
if (arm_hcr_el2_eff(env) & trap) {
|
||||
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);
|
||||
|
|
@ -639,12 +652,14 @@ static const ARMCPRegInfo cp_reginfo[] = {
|
|||
*/
|
||||
{ .name = "CONTEXTIDR_EL1", .state = ARM_CP_STATE_BOTH,
|
||||
.opc0 = 3, .opc1 = 0, .crn = 13, .crm = 0, .opc2 = 1,
|
||||
.access = PL1_RW, .secure = ARM_CP_SECSTATE_NS,
|
||||
.access = PL1_RW, .accessfn = access_tvm_trvm,
|
||||
.secure = ARM_CP_SECSTATE_NS,
|
||||
.fieldoffset = offsetof(CPUARMState, cp15.contextidr_el[1]),
|
||||
.resetvalue = 0, .writefn = contextidr_write, .raw_writefn = raw_write, },
|
||||
{ .name = "CONTEXTIDR_S", .state = ARM_CP_STATE_AA32,
|
||||
.cp = 15, .opc1 = 0, .crn = 13, .crm = 0, .opc2 = 1,
|
||||
.access = PL1_RW, .secure = ARM_CP_SECSTATE_S,
|
||||
.access = PL1_RW, .accessfn = access_tvm_trvm,
|
||||
.secure = ARM_CP_SECSTATE_S,
|
||||
.fieldoffset = offsetof(CPUARMState, cp15.contextidr_s),
|
||||
.resetvalue = 0, .writefn = contextidr_write, .raw_writefn = raw_write, },
|
||||
REGINFO_SENTINEL
|
||||
|
|
@ -657,7 +672,7 @@ static const ARMCPRegInfo not_v8_cp_reginfo[] = {
|
|||
/* MMU Domain access control / MPU write buffer control */
|
||||
{ .name = "DACR",
|
||||
.cp = 15, .opc1 = CP_ANY, .crn = 3, .crm = CP_ANY, .opc2 = CP_ANY,
|
||||
.access = PL1_RW, .resetvalue = 0,
|
||||
.access = PL1_RW, .accessfn = access_tvm_trvm, .resetvalue = 0,
|
||||
.writefn = dacr_write, .raw_writefn = raw_write,
|
||||
.bank_fieldoffsets = { offsetoflow32(CPUARMState, cp15.dacr_s),
|
||||
offsetoflow32(CPUARMState, cp15.dacr_ns) } },
|
||||
|
|
@ -850,7 +865,7 @@ static const ARMCPRegInfo v6_cp_reginfo[] = {
|
|||
{ .name = "DMB", .cp = 15, .crn = 7, .crm = 10, .opc1 = 0, .opc2 = 5,
|
||||
.access = PL0_W, .type = ARM_CP_NOP },
|
||||
{ .name = "IFAR", .cp = 15, .crn = 6, .crm = 0, .opc1 = 0, .opc2 = 2,
|
||||
.access = PL1_RW,
|
||||
.access = PL1_RW, .accessfn = access_tvm_trvm,
|
||||
.bank_fieldoffsets = { offsetof(CPUARMState, cp15.ifar_s),
|
||||
offsetof(CPUARMState, cp15.ifar_ns) },
|
||||
.resetvalue = 0, },
|
||||
|
|
@ -2006,16 +2021,19 @@ static const ARMCPRegInfo v7_cp_reginfo[] = {
|
|||
*/
|
||||
{ .name = "AFSR0_EL1", .state = ARM_CP_STATE_BOTH,
|
||||
.opc0 = 3, .opc1 = 0, .crn = 5, .crm = 1, .opc2 = 0,
|
||||
.access = PL1_RW, .type = ARM_CP_CONST, .resetvalue = 0 },
|
||||
.access = PL1_RW, .accessfn = access_tvm_trvm,
|
||||
.type = ARM_CP_CONST, .resetvalue = 0 },
|
||||
{ .name = "AFSR1_EL1", .state = ARM_CP_STATE_BOTH,
|
||||
.opc0 = 3, .opc1 = 0, .crn = 5, .crm = 1, .opc2 = 1,
|
||||
.access = PL1_RW, .type = ARM_CP_CONST, .resetvalue = 0 },
|
||||
.access = PL1_RW, .accessfn = access_tvm_trvm,
|
||||
.type = ARM_CP_CONST, .resetvalue = 0 },
|
||||
/* MAIR can just read-as-written because we don't implement caches
|
||||
* and so don't need to care about memory attributes.
|
||||
*/
|
||||
{ .name = "MAIR_EL1", .state = ARM_CP_STATE_AA64,
|
||||
.opc0 = 3, .opc1 = 0, .crn = 10, .crm = 2, .opc2 = 0,
|
||||
.access = PL1_RW, .fieldoffset = offsetof(CPUARMState, cp15.mair_el[1]),
|
||||
.access = PL1_RW, .accessfn = access_tvm_trvm,
|
||||
.fieldoffset = offsetof(CPUARMState, cp15.mair_el[1]),
|
||||
.resetvalue = 0 },
|
||||
{ .name = "MAIR_EL3", .state = ARM_CP_STATE_AA64,
|
||||
.opc0 = 3, .opc1 = 6, .crn = 10, .crm = 2, .opc2 = 0,
|
||||
|
|
@ -2029,12 +2047,14 @@ static const ARMCPRegInfo v7_cp_reginfo[] = {
|
|||
* handled in the field definitions.
|
||||
*/
|
||||
{ .name = "MAIR0", .state = ARM_CP_STATE_AA32,
|
||||
.cp = 15, .opc1 = 0, .crn = 10, .crm = 2, .opc2 = 0, .access = PL1_RW,
|
||||
.cp = 15, .opc1 = 0, .crn = 10, .crm = 2, .opc2 = 0,
|
||||
.access = PL1_RW, .accessfn = access_tvm_trvm,
|
||||
.bank_fieldoffsets = { offsetof(CPUARMState, cp15.mair0_s),
|
||||
offsetof(CPUARMState, cp15.mair0_ns) },
|
||||
.resetfn = arm_cp_reset_ignore },
|
||||
{ .name = "MAIR1", .state = ARM_CP_STATE_AA32,
|
||||
.cp = 15, .opc1 = 0, .crn = 10, .crm = 2, .opc2 = 1, .access = PL1_RW,
|
||||
.cp = 15, .opc1 = 0, .crn = 10, .crm = 2, .opc2 = 1,
|
||||
.access = PL1_RW, .accessfn = access_tvm_trvm,
|
||||
.bank_fieldoffsets = { offsetof(CPUARMState, cp15.mair1_s),
|
||||
offsetof(CPUARMState, cp15.mair1_ns) },
|
||||
.resetfn = arm_cp_reset_ignore },
|
||||
|
|
@ -3677,20 +3697,21 @@ static void vttbr_write(CPUARMState *env, const ARMCPRegInfo *ri,
|
|||
|
||||
static const ARMCPRegInfo vmsa_pmsa_cp_reginfo[] = {
|
||||
{ .name = "DFSR", .cp = 15, .crn = 5, .crm = 0, .opc1 = 0, .opc2 = 0,
|
||||
.access = PL1_RW, .type = ARM_CP_ALIAS,
|
||||
.access = PL1_RW, .accessfn = access_tvm_trvm, .type = ARM_CP_ALIAS,
|
||||
.bank_fieldoffsets = { offsetoflow32(CPUARMState, cp15.dfsr_s),
|
||||
offsetoflow32(CPUARMState, cp15.dfsr_ns) }, },
|
||||
{ .name = "IFSR", .cp = 15, .crn = 5, .crm = 0, .opc1 = 0, .opc2 = 1,
|
||||
.access = PL1_RW, .resetvalue = 0,
|
||||
.access = PL1_RW, .accessfn = access_tvm_trvm, .resetvalue = 0,
|
||||
.bank_fieldoffsets = { offsetoflow32(CPUARMState, cp15.ifsr_s),
|
||||
offsetoflow32(CPUARMState, cp15.ifsr_ns) } },
|
||||
{ .name = "DFAR", .cp = 15, .opc1 = 0, .crn = 6, .crm = 0, .opc2 = 0,
|
||||
.access = PL1_RW, .resetvalue = 0,
|
||||
.access = PL1_RW, .accessfn = access_tvm_trvm, .resetvalue = 0,
|
||||
.bank_fieldoffsets = { offsetof(CPUARMState, cp15.dfar_s),
|
||||
offsetof(CPUARMState, cp15.dfar_ns) } },
|
||||
{ .name = "FAR_EL1", .state = ARM_CP_STATE_AA64,
|
||||
.opc0 = 3, .crn = 6, .crm = 0, .opc1 = 0, .opc2 = 0,
|
||||
.access = PL1_RW, .fieldoffset = offsetof(CPUARMState, cp15.far_el[1]),
|
||||
.access = PL1_RW, .accessfn = access_tvm_trvm,
|
||||
.fieldoffset = offsetof(CPUARMState, cp15.far_el[1]),
|
||||
.resetvalue = 0, },
|
||||
REGINFO_SENTINEL
|
||||
};
|
||||
|
|
@ -3698,25 +3719,29 @@ static const ARMCPRegInfo vmsa_pmsa_cp_reginfo[] = {
|
|||
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,
|
||||
.access = PL1_RW, .accessfn = access_tvm_trvm,
|
||||
.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,
|
||||
.access = PL1_RW, .writefn = vmsa_ttbr_write, .resetvalue = 0,
|
||||
.access = PL1_RW, .accessfn = access_tvm_trvm,
|
||||
.writefn = vmsa_ttbr_write, .resetvalue = 0,
|
||||
.bank_fieldoffsets = { offsetof(CPUARMState, cp15.ttbr0_s),
|
||||
offsetof(CPUARMState, cp15.ttbr0_ns) } },
|
||||
{ .name = "TTBR1_EL1", .state = ARM_CP_STATE_BOTH,
|
||||
.opc0 = 3, .opc1 = 0, .crn = 2, .crm = 0, .opc2 = 1,
|
||||
.access = PL1_RW, .writefn = vmsa_ttbr_write, .resetvalue = 0,
|
||||
.access = PL1_RW, .accessfn = access_tvm_trvm,
|
||||
.writefn = vmsa_ttbr_write, .resetvalue = 0,
|
||||
.bank_fieldoffsets = { offsetof(CPUARMState, cp15.ttbr1_s),
|
||||
offsetof(CPUARMState, cp15.ttbr1_ns) } },
|
||||
{ .name = "TCR_EL1", .state = ARM_CP_STATE_AA64,
|
||||
.opc0 = 3, .crn = 2, .crm = 0, .opc1 = 0, .opc2 = 2,
|
||||
.access = PL1_RW, .writefn = vmsa_tcr_el12_write,
|
||||
.access = PL1_RW, .accessfn = access_tvm_trvm,
|
||||
.writefn = vmsa_tcr_el12_write,
|
||||
.resetfn = vmsa_ttbcr_reset, .raw_writefn = raw_write,
|
||||
.fieldoffset = offsetof(CPUARMState, cp15.tcr_el[1]) },
|
||||
{ .name = "TTBCR", .cp = 15, .crn = 2, .crm = 0, .opc1 = 0, .opc2 = 2,
|
||||
.access = PL1_RW, .type = ARM_CP_ALIAS, .writefn = vmsa_ttbcr_write,
|
||||
.access = PL1_RW, .accessfn = access_tvm_trvm,
|
||||
.type = ARM_CP_ALIAS, .writefn = vmsa_ttbcr_write,
|
||||
.raw_writefn = vmsa_ttbcr_raw_write,
|
||||
.bank_fieldoffsets = { offsetoflow32(CPUARMState, cp15.tcr_el[3]),
|
||||
offsetoflow32(CPUARMState, cp15.tcr_el[1])} },
|
||||
|
|
@ -3728,7 +3753,8 @@ static const ARMCPRegInfo vmsa_cp_reginfo[] = {
|
|||
*/
|
||||
static const ARMCPRegInfo ttbcr2_reginfo = {
|
||||
.name = "TTBCR2", .cp = 15, .opc1 = 0, .crn = 2, .crm = 0, .opc2 = 3,
|
||||
.access = PL1_RW, .type = ARM_CP_ALIAS,
|
||||
.access = PL1_RW, .accessfn = access_tvm_trvm,
|
||||
.type = ARM_CP_ALIAS,
|
||||
.bank_fieldoffsets = { offsetofhigh32(CPUARMState, cp15.tcr_el[3]),
|
||||
offsetofhigh32(CPUARMState, cp15.tcr_el[1]) },
|
||||
};
|
||||
|
|
@ -3948,23 +3974,25 @@ static const ARMCPRegInfo lpae_cp_reginfo[] = {
|
|||
/* NOP AMAIR0/1 */
|
||||
{ .name = "AMAIR0", .state = ARM_CP_STATE_BOTH,
|
||||
.opc0 = 3, .crn = 10, .crm = 3, .opc1 = 0, .opc2 = 0,
|
||||
.access = PL1_RW, .type = ARM_CP_CONST,
|
||||
.resetvalue = 0 },
|
||||
.access = PL1_RW, .accessfn = access_tvm_trvm,
|
||||
.type = ARM_CP_CONST, .resetvalue = 0 },
|
||||
/* AMAIR1 is mapped to AMAIR_EL1[63:32] */
|
||||
{ .name = "AMAIR1", .cp = 15, .crn = 10, .crm = 3, .opc1 = 0, .opc2 = 1,
|
||||
.access = PL1_RW, .type = ARM_CP_CONST,
|
||||
.resetvalue = 0 },
|
||||
.access = PL1_RW, .accessfn = access_tvm_trvm,
|
||||
.type = ARM_CP_CONST, .resetvalue = 0 },
|
||||
{ .name = "PAR", .cp = 15, .crm = 7, .opc1 = 0,
|
||||
.access = PL1_RW, .type = ARM_CP_64BIT, .resetvalue = 0,
|
||||
.bank_fieldoffsets = { offsetof(CPUARMState, cp15.par_s),
|
||||
offsetof(CPUARMState, cp15.par_ns)} },
|
||||
{ .name = "TTBR0", .cp = 15, .crm = 2, .opc1 = 0,
|
||||
.access = PL1_RW, .type = ARM_CP_64BIT | ARM_CP_ALIAS,
|
||||
.access = PL1_RW, .accessfn = access_tvm_trvm,
|
||||
.type = ARM_CP_64BIT | ARM_CP_ALIAS,
|
||||
.bank_fieldoffsets = { offsetof(CPUARMState, cp15.ttbr0_s),
|
||||
offsetof(CPUARMState, cp15.ttbr0_ns) },
|
||||
.writefn = vmsa_ttbr_write, },
|
||||
{ .name = "TTBR1", .cp = 15, .crm = 2, .opc1 = 1,
|
||||
.access = PL1_RW, .type = ARM_CP_64BIT | ARM_CP_ALIAS,
|
||||
.access = PL1_RW, .accessfn = access_tvm_trvm,
|
||||
.type = ARM_CP_64BIT | ARM_CP_ALIAS,
|
||||
.bank_fieldoffsets = { offsetof(CPUARMState, cp15.ttbr1_s),
|
||||
offsetof(CPUARMState, cp15.ttbr1_ns) },
|
||||
.writefn = vmsa_ttbr_write, },
|
||||
|
|
@ -4696,7 +4724,7 @@ static const ARMCPRegInfo v8_cp_reginfo[] = {
|
|||
.type = ARM_CP_NOP, .access = PL1_W },
|
||||
/* MMU Domain access control / MPU write buffer control */
|
||||
{ .name = "DACR", .cp = 15, .opc1 = 0, .crn = 3, .crm = 0, .opc2 = 0,
|
||||
.access = PL1_RW, .resetvalue = 0,
|
||||
.access = PL1_RW, .accessfn = access_tvm_trvm, .resetvalue = 0,
|
||||
.writefn = dacr_write, .raw_writefn = raw_write,
|
||||
.bank_fieldoffsets = { offsetoflow32(CPUARMState, cp15.dacr_s),
|
||||
offsetoflow32(CPUARMState, cp15.dacr_ns) } },
|
||||
|
|
@ -7552,7 +7580,7 @@ void register_cp_regs_for_features(ARMCPU *cpu)
|
|||
ARMCPRegInfo sctlr = {
|
||||
.name = "SCTLR", .state = ARM_CP_STATE_BOTH,
|
||||
.opc0 = 3, .opc1 = 0, .crn = 1, .crm = 0, .opc2 = 0,
|
||||
.access = PL1_RW,
|
||||
.access = PL1_RW, .accessfn = access_tvm_trvm,
|
||||
.bank_fieldoffsets = { offsetof(CPUARMState, cp15.sctlr_s),
|
||||
offsetof(CPUARMState, cp15.sctlr_ns) },
|
||||
.writefn = sctlr_write, .resetvalue = cpu->reset_sctlr,
|
||||
|
|
|
|||
Loading…
Reference in a new issue