From: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Sergey Fedorov <serge.fdrv@gmail.com>,
qemu-arm@nongnu.org, qemu-devel@nongnu.org, patches@linaro.org
Subject: Re: [Qemu-devel] [PATCH v2 1/6] target-arm: correct CNTFRQ access rights
Date: Fri, 12 Feb 2016 15:45:46 +0100 [thread overview]
Message-ID: <20160212144546.GD31433@toto> (raw)
In-Reply-To: <1455206609-28009-2-git-send-email-peter.maydell@linaro.org>
On Thu, Feb 11, 2016 at 04:03:24PM +0000, Peter Maydell wrote:
> Correct some corner cases we were getting wrong for
> CNTFRQ access rights:
> * should UNDEF from 32-bit Secure EL1
> * only writable from the highest implemented exception level,
> which might not be EL1 now
>
> To clarify the code, provide a new utility function
> arm_highest_el() which returns the highest implemented
> exception level.
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
> Rewritten to use arm_highest_el() to improve clarity
> ---
> target-arm/cpu.h | 12 ++++++++++++
> target-arm/helper.c | 29 ++++++++++++++++++++++++++---
> 2 files changed, 38 insertions(+), 3 deletions(-)
>
> diff --git a/target-arm/cpu.h b/target-arm/cpu.h
> index 5137632..afbf366 100644
> --- a/target-arm/cpu.h
> +++ b/target-arm/cpu.h
> @@ -1255,6 +1255,18 @@ static inline bool cptype_valid(int cptype)
> #define PL1_RW (PL1_R | PL1_W)
> #define PL0_RW (PL0_R | PL0_W)
>
> +/* Return the highest implemented Exception Level */
> +static inline int arm_highest_el(CPUARMState *env)
> +{
> + if (arm_feature(env, ARM_FEATURE_EL3)) {
> + return 3;
> + }
> + if (arm_feature(env, ARM_FEATURE_EL2)) {
> + return 2;
> + }
> + return 1;
> +}
> +
> /* Return the current Exception Level (as per ARMv8; note that this differs
> * from the ARMv7 Privilege Level).
> */
> diff --git a/target-arm/helper.c b/target-arm/helper.c
> index 2f9db72..4d27c00 100644
> --- a/target-arm/helper.c
> +++ b/target-arm/helper.c
> @@ -1218,10 +1218,33 @@ static const ARMCPRegInfo v6k_cp_reginfo[] = {
> static CPAccessResult gt_cntfrq_access(CPUARMState *env, const ARMCPRegInfo *ri,
> bool isread)
> {
> - /* CNTFRQ: not visible from PL0 if both PL0PCTEN and PL0VCTEN are zero */
> - if (arm_current_el(env) == 0 && !extract32(env->cp15.c14_cntkctl, 0, 2)) {
> - return CP_ACCESS_TRAP;
> + /* CNTFRQ: not visible from PL0 if both PL0PCTEN and PL0VCTEN are zero.
> + * Writable only at the highest implemented exception level.
> + */
> + int el = arm_current_el(env);
> +
> + switch (el) {
> + case 0:
> + if (!extract32(env->cp15.c14_cntkctl, 0, 2)) {
> + return CP_ACCESS_TRAP;
> + }
> + break;
> + case 1:
> + if (!isread && ri->state == ARM_CP_STATE_AA32 &&
> + arm_is_secure_below_el3(env)) {
> + /* Accesses from 32-bit Secure EL1 UNDEF (*not* trap to EL3!) */
> + return CP_ACCESS_TRAP_UNCATEGORIZED;
> + }
> + break;
> + case 2:
> + case 3:
> + break;
> }
> +
> + if (!isread && el < arm_highest_el(env)) {
> + return CP_ACCESS_TRAP_UNCATEGORIZED;
> + }
> +
> return CP_ACCESS_OK;
> }
>
> --
> 1.9.1
>
next prev parent reply other threads:[~2016-02-12 14:48 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-11 16:03 [Qemu-devel] [PATCH v2 0/6] target-arm: Implement various EL3 traps Peter Maydell
2016-02-11 16:03 ` [Qemu-devel] [PATCH v2 1/6] target-arm: correct CNTFRQ access rights Peter Maydell
2016-02-11 16:10 ` Sergey Fedorov
2016-02-12 14:45 ` Edgar E. Iglesias [this message]
2016-02-11 16:03 ` [Qemu-devel] [PATCH v2 2/6] target-arm: Fix handling of SCR.SMD Peter Maydell
2016-02-12 9:13 ` Edgar E. Iglesias
2016-02-11 16:03 ` [Qemu-devel] [PATCH v2 3/6] target-arm: Implement MDCR_EL3.TDOSA and MDCR_EL2.TDOSA traps Peter Maydell
2016-02-11 16:03 ` [Qemu-devel] [PATCH v2 4/6] target-arm: Implement MDCR_EL2.TDRA traps Peter Maydell
2016-02-11 16:03 ` [Qemu-devel] [PATCH v2 5/6] target-arm: Implement MDCR_EL3.TDA and MDCR_EL2.TDA traps Peter Maydell
2016-02-11 16:03 ` [Qemu-devel] [PATCH v2 6/6] target-arm: Report correct syndrome for FPEXC32_EL2 traps Peter Maydell
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=20160212144546.GD31433@toto \
--to=edgar.iglesias@gmail.com \
--cc=patches@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=serge.fdrv@gmail.com \
/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).