From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, "Alex Bennée" <alex.bennee@linaro.org>
Subject: [PATCH v7 26/41] target/arm: Update timer access for VHE
Date: Thu, 6 Feb 2020 10:54:33 +0000 [thread overview]
Message-ID: <20200206105448.4726-27-richard.henderson@linaro.org> (raw)
In-Reply-To: <20200206105448.4726-1-richard.henderson@linaro.org>
Tested-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/arm/helper.c | 102 +++++++++++++++++++++++++++++++++++---------
1 file changed, 81 insertions(+), 21 deletions(-)
diff --git a/target/arm/helper.c b/target/arm/helper.c
index 996865a3a2..992ab2a15f 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -2324,10 +2324,18 @@ static CPAccessResult gt_cntfrq_access(CPUARMState *env, const ARMCPRegInfo *ri,
* Writable only at the highest implemented exception level.
*/
int el = arm_current_el(env);
+ uint64_t hcr;
+ uint32_t cntkctl;
switch (el) {
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;
}
break;
@@ -2355,17 +2363,47 @@ static CPAccessResult gt_counter_access(CPUARMState *env, int timeridx,
{
unsigned int cur_el = arm_current_el(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 */
- if (cur_el == 0 &&
- !extract32(env->cp15.c14_cntkctl, timeridx, 1)) {
- return CP_ACCESS_TRAP;
- }
+ switch (cur_el) {
+ case 0:
+ /* If HCR_EL2.<E2H,TGE> == '11': check CNTHCTL_EL2.EL0[PV]CTEN. */
+ 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) &&
- timeridx == GTIMER_PHYS && !secure && cur_el < 2 &&
- !extract32(env->cp15.cnthctl_el2, 0, 1)) {
- return CP_ACCESS_TRAP_EL2;
+ /* CNT[PV]CT: not visible from PL0 if EL0[PV]CTEN is zero */
+ if (!extract32(env->cp15.c14_cntkctl, timeridx, 1)) {
+ return CP_ACCESS_TRAP;
+ }
+
+ /* 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;
}
@@ -2375,19 +2413,41 @@ static CPAccessResult gt_timer_access(CPUARMState *env, int timeridx,
{
unsigned int cur_el = arm_current_el(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
- * EL0[PV]TEN is zero.
- */
- if (cur_el == 0 &&
- !extract32(env->cp15.c14_cntkctl, 9 - timeridx, 1)) {
- return CP_ACCESS_TRAP;
- }
+ switch (cur_el) {
+ case 0:
+ if ((hcr & (HCR_E2H | HCR_TGE)) == (HCR_E2H | HCR_TGE)) {
+ /* If HCR_EL2.<E2H,TGE> == '11': check CNTHCTL_EL2.EL0[PV]TEN. */
+ return (extract32(env->cp15.cnthctl_el2, 9 - timeridx, 1)
+ ? CP_ACCESS_OK : CP_ACCESS_TRAP_EL2);
+ }
- if (arm_feature(env, ARM_FEATURE_EL2) &&
- timeridx == GTIMER_PHYS && !secure && cur_el < 2 &&
- !extract32(env->cp15.cnthctl_el2, 1, 1)) {
- return CP_ACCESS_TRAP_EL2;
+ /*
+ * CNT[PV]_CVAL, CNT[PV]_CTL, CNT[PV]_TVAL: not visible from
+ * EL0 if EL0[PV]TEN is zero.
+ */
+ 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;
}
--
2.20.1
next prev parent reply other threads:[~2020-02-06 11:11 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-06 10:54 [PATCH v7 00/41] target/arm: Implement ARMv8.1-VHE Richard Henderson
2020-02-06 10:54 ` [PATCH v7 01/41] target/arm: Define isar_feature_aa64_vh Richard Henderson
2020-02-06 10:54 ` [PATCH v7 02/41] target/arm: Enable HCR_E2H for VHE Richard Henderson
2020-02-06 10:54 ` [PATCH v7 03/41] target/arm: Add CONTEXTIDR_EL2 Richard Henderson
2020-02-06 10:54 ` [PATCH v7 04/41] target/arm: Add TTBR1_EL2 Richard Henderson
2020-02-06 10:54 ` [PATCH v7 05/41] target/arm: Update CNTVCT_EL0 for VHE Richard Henderson
2020-02-06 10:54 ` [PATCH v7 06/41] target/arm: Split out vae1_tlbmask Richard Henderson
2020-02-06 10:54 ` [PATCH v7 07/41] target/arm: Split out alle1_tlbmask Richard Henderson
2020-02-06 10:54 ` [PATCH v7 08/41] target/arm: Simplify tlb_force_broadcast alternatives Richard Henderson
2020-02-06 10:54 ` [PATCH v7 09/41] target/arm: Rename ARMMMUIdx*_S12NSE* to ARMMMUIdx*_E10_* Richard Henderson
2020-02-06 10:54 ` [PATCH v7 10/41] target/arm: Rename ARMMMUIdx_S2NS to ARMMMUIdx_Stage2 Richard Henderson
2020-02-06 10:54 ` [PATCH v7 11/41] target/arm: Rename ARMMMUIdx_S1NSE* to ARMMMUIdx_Stage1_E* Richard Henderson
2020-02-06 10:54 ` [PATCH v7 12/41] target/arm: Rename ARMMMUIdx_S1SE[01] to ARMMMUIdx_SE10_[01] Richard Henderson
2020-02-06 10:54 ` [PATCH v7 13/41] target/arm: Rename ARMMMUIdx*_S1E3 to ARMMMUIdx*_SE3 Richard Henderson
2020-02-06 10:54 ` [PATCH v7 14/41] target/arm: Rename ARMMMUIdx_S1E2 to ARMMMUIdx_E2 Richard Henderson
2020-02-06 10:54 ` [PATCH v7 15/41] target/arm: Recover 4 bits from TBFLAGs Richard Henderson
2020-02-06 10:54 ` [PATCH v7 16/41] target/arm: Expand TBFLAG_ANY.MMUIDX to 4 bits Richard Henderson
2020-02-06 10:54 ` [PATCH v7 17/41] target/arm: Rearrange ARMMMUIdxBit Richard Henderson
2020-02-06 10:54 ` [PATCH v7 18/41] target/arm: Tidy ARMMMUIdx m-profile definitions Richard Henderson
2020-02-06 10:54 ` [PATCH v7 19/41] target/arm: Reorganize ARMMMUIdx Richard Henderson
2020-02-06 10:54 ` [PATCH v7 20/41] target/arm: Add regime_has_2_ranges Richard Henderson
2020-02-06 10:54 ` [PATCH v7 21/41] target/arm: Update arm_mmu_idx for VHE Richard Henderson
2020-02-06 10:54 ` [PATCH v7 22/41] target/arm: Update arm_sctlr " Richard Henderson
2020-02-06 10:54 ` [PATCH v7 23/41] target/arm: Update aa64_zva_access for EL2 Richard Henderson
2020-02-06 10:54 ` [PATCH v7 24/41] target/arm: Update ctr_el0_access " Richard Henderson
2020-02-06 10:54 ` [PATCH v7 25/41] target/arm: Add the hypervisor virtual counter Richard Henderson
2020-02-06 10:54 ` Richard Henderson [this message]
2020-02-06 10:54 ` [PATCH v7 27/41] target/arm: Update define_one_arm_cp_reg_with_opaque for VHE Richard Henderson
2020-02-06 10:54 ` [PATCH v7 28/41] target/arm: Add VHE system register redirection and aliasing Richard Henderson
2020-02-06 10:54 ` [PATCH v7 29/41] target/arm: Add VHE timer " Richard Henderson
2020-02-06 10:54 ` [PATCH v7 30/41] target/arm: Flush tlb for ASID changes in EL2&0 translation regime Richard Henderson
2020-02-06 10:54 ` [PATCH v7 31/41] target/arm: Flush tlbs for E2&0 " Richard Henderson
2020-02-06 10:54 ` [PATCH v7 32/41] target/arm: Update arm_phys_excp_target_el for TGE Richard Henderson
2020-02-06 10:54 ` [PATCH v7 33/41] target/arm: Update {fp,sve}_exception_el for VHE Richard Henderson
2020-02-06 10:54 ` [PATCH v7 34/41] target/arm: check TGE and E2H flags for EL0 pauth traps Richard Henderson
2020-02-06 10:54 ` [PATCH v7 35/41] target/arm: Update get_a64_user_mem_index for VHE Richard Henderson
2020-02-06 10:54 ` [PATCH v7 36/41] target/arm: Update arm_cpu_do_interrupt_aarch64 " Richard Henderson
2020-02-06 10:54 ` [PATCH v7 37/41] target/arm: Enable ARMv8.1-VHE in -cpu max Richard Henderson
2020-02-06 10:54 ` [PATCH v7 38/41] target/arm: Move arm_excp_unmasked to cpu.c Richard Henderson
2020-02-06 10:54 ` [PATCH v7 39/41] target/arm: Pass more cpu state to arm_excp_unmasked Richard Henderson
2020-02-06 10:54 ` [PATCH v7 40/41] target/arm: Use bool for unmasked in arm_excp_unmasked Richard Henderson
2020-02-06 10:54 ` [PATCH v7 41/41] target/arm: Raise only one interrupt in arm_cpu_exec_interrupt Richard Henderson
2020-02-07 11:52 ` [PATCH v7 00/41] target/arm: Implement ARMv8.1-VHE Peter Maydell
2020-03-31 15:33 ` Jonathan Cameron
2020-03-31 17:29 ` Jonathan Cameron
2020-03-31 18:59 ` Richard Henderson
2020-04-01 10:45 ` Jonathan Cameron
2020-04-01 16:01 ` Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200206105448.4726-27-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).