yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-01-11 11:05:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/arm: Update timer access for VHE

Browse source 
Backports commit 5bc8437136fb1e7bc8b566f4f2f7269b0f990fad from qemu
This commit is contained in:
Richard Henderson 2020-03-21 15:38:45 -04:00 committed by Lioncash
parent d6150127b4
commit 8c7795dc04
1 changed files with 81 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
qemu/target/arm/helper.c
View file

@ -2106,10 +2106,18 @@ static CPAccessResult gt_cntfrq_access(CPUARMState *env, const ARMCPRegInfo *ri,
* Writable only at the highest implemented exception level. * Writable only at the highest implemented exception level.
*/ */
int el = arm_current_el(env); int el = arm_current_el(env);
uint64_t hcr;
uint32_t cntkctl;
switch (el) { switch (el) {
case 0: case 0:
if (!extract32(env->cp15.c14_cntkctl, 0, 2)) { hcr = arm_hcr_el2_eff(env);
if ((hcr & (HCR_E2H | HCR_TGE)) == (HCR_E2H | HCR_TGE)) {
cntkctl = env->cp15.cnthctl_el2;
} else {
cntkctl = env->cp15.c14_cntkctl;
}
if (!extract32(cntkctl, 0, 2)) {
return CP_ACCESS_TRAP; return CP_ACCESS_TRAP;
} }
break; break;
@ -2137,17 +2145,47 @@ static CPAccessResult gt_counter_access(CPUARMState *env, int timeridx,
{ {
unsigned int cur_el = arm_current_el(env); unsigned int cur_el = arm_current_el(env);
bool secure = arm_is_secure(env); bool secure = arm_is_secure(env);
uint64_t hcr = arm_hcr_el2_eff(env);
/* CNT[PV]CT: not visible from PL0 if ELO[PV]CTEN is zero */ switch (cur_el) {
if (cur_el == 0 && case 0:
!extract32(env->cp15.c14_cntkctl, timeridx, 1)) { /* If HCR_EL2.<E2H,TGE> == '11': check CNTHCTL_EL2.EL0[PV]CTEN. */
return CP_ACCESS_TRAP; if ((hcr & (HCR_E2H | HCR_TGE)) == (HCR_E2H | HCR_TGE)) {
} return (extract32(env->cp15.cnthctl_el2, timeridx, 1)
? CP_ACCESS_OK : CP_ACCESS_TRAP_EL2);
}
if (arm_feature(env, ARM_FEATURE_EL2) && /* CNT[PV]CT: not visible from PL0 if EL0[PV]CTEN is zero */
timeridx == GTIMER_PHYS && !secure && cur_el < 2 && if (!extract32(env->cp15.c14_cntkctl, timeridx, 1)) {
!extract32(env->cp15.cnthctl_el2, 0, 1)) { return CP_ACCESS_TRAP;
return CP_ACCESS_TRAP_EL2; }
/* If HCR_EL2.<E2H,TGE> == '10': check CNTHCTL_EL2.EL1PCTEN. */
if (hcr & HCR_E2H) {
if (timeridx == GTIMER_PHYS &&
!extract32(env->cp15.cnthctl_el2, 10, 1)) {
return CP_ACCESS_TRAP_EL2;
}
} else {
/* If HCR_EL2.<E2H> == 0: check CNTHCTL_EL2.EL1PCEN. */
if (arm_feature(env, ARM_FEATURE_EL2) &&
timeridx == GTIMER_PHYS && !secure &&
!extract32(env->cp15.cnthctl_el2, 1, 1)) {
return CP_ACCESS_TRAP_EL2;
}
}
break;
case 1:
/* Check CNTHCTL_EL2.EL1PCTEN, which changes location based on E2H. */
if (arm_feature(env, ARM_FEATURE_EL2) &&
timeridx == GTIMER_PHYS && !secure &&
(hcr & HCR_E2H
? !extract32(env->cp15.cnthctl_el2, 10, 1)
: !extract32(env->cp15.cnthctl_el2, 0, 1))) {
return CP_ACCESS_TRAP_EL2;
}
break;
} }
return CP_ACCESS_OK; return CP_ACCESS_OK;
} }
@ -2157,19 +2195,41 @@ static CPAccessResult gt_timer_access(CPUARMState *env, int timeridx,
{ {
unsigned int cur_el = arm_current_el(env); unsigned int cur_el = arm_current_el(env);
bool secure = arm_is_secure(env); bool secure = arm_is_secure(env);
uint64_t hcr = arm_hcr_el2_eff(env);
/* CNT[PV]_CVAL, CNT[PV]_CTL, CNT[PV]_TVAL: not visible from PL0 if switch (cur_el) {
* EL0[PV]TEN is zero. case 0:
*/ if ((hcr & (HCR_E2H | HCR_TGE)) == (HCR_E2H | HCR_TGE)) {
if (cur_el == 0 && /* If HCR_EL2.<E2H,TGE> == '11': check CNTHCTL_EL2.EL0[PV]TEN. */
!extract32(env->cp15.c14_cntkctl, 9 - timeridx, 1)) { return (extract32(env->cp15.cnthctl_el2, 9 - timeridx, 1)
return CP_ACCESS_TRAP; ? CP_ACCESS_OK : CP_ACCESS_TRAP_EL2);
} }
if (arm_feature(env, ARM_FEATURE_EL2) && /*
timeridx == GTIMER_PHYS && !secure && cur_el < 2 && * CNT[PV]_CVAL, CNT[PV]_CTL, CNT[PV]_TVAL: not visible from
!extract32(env->cp15.cnthctl_el2, 1, 1)) { * EL0 if EL0[PV]TEN is zero.
return CP_ACCESS_TRAP_EL2; */
if (!extract32(env->cp15.c14_cntkctl, 9 - timeridx, 1)) {
return CP_ACCESS_TRAP;
}
/* fall through */
case 1:
if (arm_feature(env, ARM_FEATURE_EL2) &&
timeridx == GTIMER_PHYS && !secure) {
if (hcr & HCR_E2H) {
/* If HCR_EL2.<E2H,TGE> == '10': check CNTHCTL_EL2.EL1PTEN. */
if (!extract32(env->cp15.cnthctl_el2, 11, 1)) {
return CP_ACCESS_TRAP_EL2;
}
} else {
/* If HCR_EL2.<E2H> == 0: check CNTHCTL_EL2.EL1PCEN. */
if (!extract32(env->cp15.cnthctl_el2, 1, 1)) {
return CP_ACCESS_TRAP_EL2;
}
}
}
break;
} }
return CP_ACCESS_OK; return CP_ACCESS_OK;
} }