From: Sergey Fedorov <serge.fdrv@gmail.com>
To: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org
Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
qemu-arm@nongnu.org, patches@linaro.org
Subject: Re: [Qemu-devel] [PATCH 5/6] target-arm: Implement MDCR_EL2.TDA and MDCR_EL2.TDA traps
Date: Mon, 8 Feb 2016 19:31:42 +0300 [thread overview]
Message-ID: <56B8C2EE.5090700@gmail.com> (raw)
In-Reply-To: <1454690704-16233-6-git-send-email-peter.maydell@linaro.org>
One of the MDCR_EL2's should be MDCR_EL3 instead.
On 05.02.2016 19:45, Peter Maydell wrote:
> Implement the debug register traps controlled by MDCR_EL2.TDA
> and MDCR_EL3.TDA.
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
> target-arm/helper.c | 39 ++++++++++++++++++++++++++++++---------
> 1 file changed, 30 insertions(+), 9 deletions(-)
>
> diff --git a/target-arm/helper.c b/target-arm/helper.c
> index 8c2adbc..064b415 100644
> --- a/target-arm/helper.c
> +++ b/target-arm/helper.c
> @@ -420,6 +420,24 @@ static CPAccessResult access_tdra(CPUARMState *env, const ARMCPRegInfo *ri,
> return CP_ACCESS_OK;
> }
>
> +/* Check for traps to general debug registers, which are controlled
> + * by MDCR_EL2.TDA for EL2 and MDCR_EL3.TDA for EL3.
> + */
> +static CPAccessResult access_tda(CPUARMState *env, const ARMCPRegInfo *ri,
> + bool isread)
> +{
> + int el = arm_current_el(env);
> +
> + if (el < 2 && (env->cp15.mdcr_el2 & MDCR_TDA)
> + && !arm_is_secure_below_el3(env)) {
> + return CP_ACCESS_TRAP_EL2;
> + }
> + if (el < 3 && (env->cp15.mdcr_el3 & MDCR_TDA)) {
> + return CP_ACCESS_TRAP_EL3;
> + }
> + return CP_ACCESS_OK;
> +}
> +
> static void dacr_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value)
> {
> ARMCPU *cpu = arm_env_get_cpu(env);
> @@ -3385,7 +3403,8 @@ static const ARMCPRegInfo el3_no_el2_cp_reginfo[] = {
> .access = PL2_RW, .type = ARM_CP_CONST, .resetvalue = 0 },
> { .name = "MDCR_EL2", .state = ARM_CP_STATE_BOTH,
> .opc0 = 3, .opc1 = 4, .crn = 1, .crm = 1, .opc2 = 1,
> - .access = PL2_RW, .type = ARM_CP_CONST, .resetvalue = 0 },
> + .access = PL2_RW, .accessfn = access_tda,
> + .type = ARM_CP_CONST, .resetvalue = 0 },
> { .name = "HPFAR_EL2", .state = ARM_CP_STATE_BOTH,
> .opc0 = 3, .opc1 = 4, .crn = 6, .crm = 0, .opc2 = 4,
> .access = PL2_RW, .accessfn = access_el3_aa32ns_aa64any,
> @@ -3804,7 +3823,7 @@ static const ARMCPRegInfo debug_cp_reginfo[] = {
> /* Monitor debug system control register; the 32-bit alias is DBGDSCRext. */
> { .name = "MDSCR_EL1", .state = ARM_CP_STATE_BOTH,
> .cp = 14, .opc0 = 2, .opc1 = 0, .crn = 0, .crm = 2, .opc2 = 2,
> - .access = PL1_RW,
> + .access = PL1_RW, .accessfn = access_tda,
> .fieldoffset = offsetof(CPUARMState, cp15.mdscr_el1),
> .resetvalue = 0 },
> /* MDCCSR_EL0, aka DBGDSCRint. This is a read-only mirror of MDSCR_EL1.
> @@ -3813,7 +3832,7 @@ static const ARMCPRegInfo debug_cp_reginfo[] = {
> { .name = "MDCCSR_EL0", .state = ARM_CP_STATE_BOTH,
> .cp = 14, .opc0 = 2, .opc1 = 0, .crn = 0, .crm = 1, .opc2 = 0,
> .type = ARM_CP_ALIAS,
> - .access = PL1_R,
> + .access = PL1_R, .accessfn = access_tda,
>From ARMv8 ARM rev. A.h: "If MDSCR_EL1.TDCC==1, EL0 read accesses to
this register are trapped to EL1." But it seems like we just don't
implement "Config-RO for EL0" so far. Maybe it's worth to implement a
separate function for checks controlled by MDSCR_EL1.TDCC?
> .fieldoffset = offsetof(CPUARMState, cp15.mdscr_el1), },
> { .name = "OSLAR_EL1", .state = ARM_CP_STATE_BOTH,
> .cp = 14, .opc0 = 2, .opc1 = 0, .crn = 1, .crm = 0, .opc2 = 4,
> @@ -3835,7 +3854,8 @@ static const ARMCPRegInfo debug_cp_reginfo[] = {
> */
> { .name = "DBGVCR",
> .cp = 14, .opc1 = 0, .crn = 0, .crm = 7, .opc2 = 0,
> - .access = PL1_RW, .type = ARM_CP_NOP },
> + .access = PL1_RW, .accessfn = access_tda,
> + .type = ARM_CP_NOP },
> REGINFO_SENTINEL
> };
>
> @@ -4100,7 +4120,8 @@ static void define_debug_regs(ARMCPU *cpu)
> int wrps, brps, ctx_cmps;
> ARMCPRegInfo dbgdidr = {
> .name = "DBGDIDR", .cp = 14, .crn = 0, .crm = 0, .opc1 = 0, .opc2 = 0,
> - .access = PL0_R, .type = ARM_CP_CONST, .resetvalue = cpu->dbgdidr,
> + .access = PL0_R, .accessfn = access_tda,
> + .type = ARM_CP_CONST, .resetvalue = cpu->dbgdidr,
The same concern as above.
Kind regards,
Sergey
> };
>
> /* Note that all these register fields hold "number of Xs minus 1". */
> @@ -4131,13 +4152,13 @@ static void define_debug_regs(ARMCPU *cpu)
> ARMCPRegInfo dbgregs[] = {
> { .name = "DBGBVR", .state = ARM_CP_STATE_BOTH,
> .cp = 14, .opc0 = 2, .opc1 = 0, .crn = 0, .crm = i, .opc2 = 4,
> - .access = PL1_RW,
> + .access = PL1_RW, .accessfn = access_tda,
> .fieldoffset = offsetof(CPUARMState, cp15.dbgbvr[i]),
> .writefn = dbgbvr_write, .raw_writefn = raw_write
> },
> { .name = "DBGBCR", .state = ARM_CP_STATE_BOTH,
> .cp = 14, .opc0 = 2, .opc1 = 0, .crn = 0, .crm = i, .opc2 = 5,
> - .access = PL1_RW,
> + .access = PL1_RW, .accessfn = access_tda,
> .fieldoffset = offsetof(CPUARMState, cp15.dbgbcr[i]),
> .writefn = dbgbcr_write, .raw_writefn = raw_write
> },
> @@ -4150,13 +4171,13 @@ static void define_debug_regs(ARMCPU *cpu)
> ARMCPRegInfo dbgregs[] = {
> { .name = "DBGWVR", .state = ARM_CP_STATE_BOTH,
> .cp = 14, .opc0 = 2, .opc1 = 0, .crn = 0, .crm = i, .opc2 = 6,
> - .access = PL1_RW,
> + .access = PL1_RW, .accessfn = access_tda,
> .fieldoffset = offsetof(CPUARMState, cp15.dbgwvr[i]),
> .writefn = dbgwvr_write, .raw_writefn = raw_write
> },
> { .name = "DBGWCR", .state = ARM_CP_STATE_BOTH,
> .cp = 14, .opc0 = 2, .opc1 = 0, .crn = 0, .crm = i, .opc2 = 7,
> - .access = PL1_RW,
> + .access = PL1_RW, .accessfn = access_tda,
> .fieldoffset = offsetof(CPUARMState, cp15.dbgwcr[i]),
> .writefn = dbgwcr_write, .raw_writefn = raw_write
> },
next prev parent reply other threads:[~2016-02-08 16:31 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-05 16:44 [Qemu-devel] [PATCH 0/6] target-arm: Implement various EL3 traps Peter Maydell
2016-02-05 16:44 ` [Qemu-devel] [PATCH 1/6] target-arm: correct CNTFRQ access rights Peter Maydell
2016-02-08 15:25 ` Sergey Fedorov
2016-02-08 15:30 ` Peter Maydell
2016-02-05 16:45 ` [Qemu-devel] [PATCH 2/6] target-arm: Fix handling of SCR.SMD Peter Maydell
2016-02-08 15:40 ` [Qemu-devel] [Qemu-arm] " Sergey Fedorov
2016-02-05 16:45 ` [Qemu-devel] [PATCH 3/6] target-arm: Implement MDCR_EL3.TDOSA and MDCR_EL2.TDOSA traps Peter Maydell
2016-02-08 15:49 ` [Qemu-devel] [Qemu-arm] " Sergey Fedorov
2016-02-05 16:45 ` [Qemu-devel] [PATCH 4/6] target-arm: Implement MDCR_EL2.TDRA traps Peter Maydell
2016-02-08 15:56 ` Sergey Fedorov
2016-02-05 16:45 ` [Qemu-devel] [PATCH 5/6] target-arm: Implement MDCR_EL2.TDA and MDCR_EL2.TDA traps Peter Maydell
2016-02-08 16:31 ` Sergey Fedorov [this message]
2016-02-08 16:38 ` Peter Maydell
2016-02-08 16:44 ` Sergey Fedorov
2016-02-05 16:45 ` [Qemu-devel] [PATCH 6/6] target-arm: Report correct syndrome for FPEXC32_EL2 traps Peter Maydell
2016-02-08 16:40 ` Sergey Fedorov
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=56B8C2EE.5090700@gmail.com \
--to=serge.fdrv@gmail.com \
--cc=edgar.iglesias@gmail.com \
--cc=patches@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.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).