* [Qemu-devel] [PATCH] target/arm: Fix CRn to be 14 for PMEVTYPER/PMEVCNTR
@ 2019-02-05 13:51 Aaron Lindsay OS
2019-02-05 13:56 ` Laurent Desnogues
2019-02-07 18:01 ` Peter Maydell
0 siblings, 2 replies; 3+ messages in thread
From: Aaron Lindsay OS @ 2019-02-05 13:51 UTC (permalink / raw)
To: qemu-arm@nongnu.org, Peter Maydell, Richard Henderson,
Laurent Desnogues
Cc: qemu-devel@nongnu.org, Aaron Lindsay OS
This bug was introduced in:
commit 5ecdd3e47cadae83a62dc92b472f1fe163b56f59
target/arm: Finish implementation of PM[X]EVCNTR and PM[X]EVTYPER
Signed-off-by: Aaron Lindsay <aaron@os.amperecomputing.com>
Reported-by: Laurent Desnogues <laurent.desnogues@gmail.com>
---
target/arm/helper.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/target/arm/helper.c b/target/arm/helper.c
index d070879894..ec2d17093c 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -5855,25 +5855,25 @@ void register_cp_regs_for_features(ARMCPU *cpu)
char *pmevtyper_name = g_strdup_printf("PMEVTYPER%d", i);
char *pmevtyper_el0_name = g_strdup_printf("PMEVTYPER%d_EL0", i);
ARMCPRegInfo pmev_regs[] = {
- { .name = pmevcntr_name, .cp = 15, .crn = 15,
+ { .name = pmevcntr_name, .cp = 15, .crn = 14,
.crm = 8 | (3 & (i >> 3)), .opc1 = 0, .opc2 = i & 7,
.access = PL0_RW, .type = ARM_CP_IO | ARM_CP_ALIAS,
.readfn = pmevcntr_readfn, .writefn = pmevcntr_writefn,
.accessfn = pmreg_access },
{ .name = pmevcntr_el0_name, .state = ARM_CP_STATE_AA64,
- .opc0 = 3, .opc1 = 3, .crn = 15, .crm = 8 | (3 & (i >> 3)),
+ .opc0 = 3, .opc1 = 3, .crn = 14, .crm = 8 | (3 & (i >> 3)),
.opc2 = i & 7, .access = PL0_RW, .accessfn = pmreg_access,
.type = ARM_CP_IO,
.readfn = pmevcntr_readfn, .writefn = pmevcntr_writefn,
.raw_readfn = pmevcntr_rawread,
.raw_writefn = pmevcntr_rawwrite },
- { .name = pmevtyper_name, .cp = 15, .crn = 15,
+ { .name = pmevtyper_name, .cp = 15, .crn = 14,
.crm = 12 | (3 & (i >> 3)), .opc1 = 0, .opc2 = i & 7,
.access = PL0_RW, .type = ARM_CP_IO | ARM_CP_ALIAS,
.readfn = pmevtyper_readfn, .writefn = pmevtyper_writefn,
.accessfn = pmreg_access },
{ .name = pmevtyper_el0_name, .state = ARM_CP_STATE_AA64,
- .opc0 = 3, .opc1 = 3, .crn = 15, .crm = 12 | (3 & (i >> 3)),
+ .opc0 = 3, .opc1 = 3, .crn = 14, .crm = 12 | (3 & (i >> 3)),
.opc2 = i & 7, .access = PL0_RW, .accessfn = pmreg_access,
.type = ARM_CP_IO,
.readfn = pmevtyper_readfn, .writefn = pmevtyper_writefn,
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] target/arm: Fix CRn to be 14 for PMEVTYPER/PMEVCNTR
2019-02-05 13:51 [Qemu-devel] [PATCH] target/arm: Fix CRn to be 14 for PMEVTYPER/PMEVCNTR Aaron Lindsay OS
@ 2019-02-05 13:56 ` Laurent Desnogues
2019-02-07 18:01 ` Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Laurent Desnogues @ 2019-02-05 13:56 UTC (permalink / raw)
To: Aaron Lindsay OS
Cc: qemu-arm@nongnu.org, Peter Maydell, Richard Henderson,
qemu-devel@nongnu.org
On Tue, Feb 5, 2019 at 2:51 PM Aaron Lindsay OS
<aaron@os.amperecomputing.com> wrote:
>
> This bug was introduced in:
> commit 5ecdd3e47cadae83a62dc92b472f1fe163b56f59
> target/arm: Finish implementation of PM[X]EVCNTR and PM[X]EVTYPER
>
> Signed-off-by: Aaron Lindsay <aaron@os.amperecomputing.com>
> Reported-by: Laurent Desnogues <laurent.desnogues@gmail.com>
Reviewed-by: Laurent Desnogues <laurent.desnogues@gmail.com>
Thanks,
Laurent
> ---
> target/arm/helper.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/target/arm/helper.c b/target/arm/helper.c
> index d070879894..ec2d17093c 100644
> --- a/target/arm/helper.c
> +++ b/target/arm/helper.c
> @@ -5855,25 +5855,25 @@ void register_cp_regs_for_features(ARMCPU *cpu)
> char *pmevtyper_name = g_strdup_printf("PMEVTYPER%d", i);
> char *pmevtyper_el0_name = g_strdup_printf("PMEVTYPER%d_EL0", i);
> ARMCPRegInfo pmev_regs[] = {
> - { .name = pmevcntr_name, .cp = 15, .crn = 15,
> + { .name = pmevcntr_name, .cp = 15, .crn = 14,
> .crm = 8 | (3 & (i >> 3)), .opc1 = 0, .opc2 = i & 7,
> .access = PL0_RW, .type = ARM_CP_IO | ARM_CP_ALIAS,
> .readfn = pmevcntr_readfn, .writefn = pmevcntr_writefn,
> .accessfn = pmreg_access },
> { .name = pmevcntr_el0_name, .state = ARM_CP_STATE_AA64,
> - .opc0 = 3, .opc1 = 3, .crn = 15, .crm = 8 | (3 & (i >> 3)),
> + .opc0 = 3, .opc1 = 3, .crn = 14, .crm = 8 | (3 & (i >> 3)),
> .opc2 = i & 7, .access = PL0_RW, .accessfn = pmreg_access,
> .type = ARM_CP_IO,
> .readfn = pmevcntr_readfn, .writefn = pmevcntr_writefn,
> .raw_readfn = pmevcntr_rawread,
> .raw_writefn = pmevcntr_rawwrite },
> - { .name = pmevtyper_name, .cp = 15, .crn = 15,
> + { .name = pmevtyper_name, .cp = 15, .crn = 14,
> .crm = 12 | (3 & (i >> 3)), .opc1 = 0, .opc2 = i & 7,
> .access = PL0_RW, .type = ARM_CP_IO | ARM_CP_ALIAS,
> .readfn = pmevtyper_readfn, .writefn = pmevtyper_writefn,
> .accessfn = pmreg_access },
> { .name = pmevtyper_el0_name, .state = ARM_CP_STATE_AA64,
> - .opc0 = 3, .opc1 = 3, .crn = 15, .crm = 12 | (3 & (i >> 3)),
> + .opc0 = 3, .opc1 = 3, .crn = 14, .crm = 12 | (3 & (i >> 3)),
> .opc2 = i & 7, .access = PL0_RW, .accessfn = pmreg_access,
> .type = ARM_CP_IO,
> .readfn = pmevtyper_readfn, .writefn = pmevtyper_writefn,
> --
> 2.20.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] target/arm: Fix CRn to be 14 for PMEVTYPER/PMEVCNTR
2019-02-05 13:51 [Qemu-devel] [PATCH] target/arm: Fix CRn to be 14 for PMEVTYPER/PMEVCNTR Aaron Lindsay OS
2019-02-05 13:56 ` Laurent Desnogues
@ 2019-02-07 18:01 ` Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Peter Maydell @ 2019-02-07 18:01 UTC (permalink / raw)
To: Aaron Lindsay OS
Cc: qemu-arm@nongnu.org, Richard Henderson, Laurent Desnogues,
qemu-devel@nongnu.org
On Tue, 5 Feb 2019 at 13:51, Aaron Lindsay OS
<aaron@os.amperecomputing.com> wrote:
>
> This bug was introduced in:
> commit 5ecdd3e47cadae83a62dc92b472f1fe163b56f59
> target/arm: Finish implementation of PM[X]EVCNTR and PM[X]EVTYPER
>
> Signed-off-by: Aaron Lindsay <aaron@os.amperecomputing.com>
> Reported-by: Laurent Desnogues <laurent.desnogues@gmail.com>
Applied to target-arm.next, thanks.
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-02-07 18:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-05 13:51 [Qemu-devel] [PATCH] target/arm: Fix CRn to be 14 for PMEVTYPER/PMEVCNTR Aaron Lindsay OS
2019-02-05 13:56 ` Laurent Desnogues
2019-02-07 18:01 ` Peter Maydell
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).