| Message ID | 1521232280-13089-5-git-send-email-alindsay@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 16 March 2018 at 20:31, Aaron Lindsay <alindsay@codeaurora.org> wrote: > They share the same underlying state > > Signed-off-by: Aaron Lindsay <alindsay@codeaurora.org> > --- > target/arm/helper.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/target/arm/helper.c b/target/arm/helper.c > index 5e48982..5634561 100644 > --- a/target/arm/helper.c > +++ b/target/arm/helper.c > @@ -1318,7 +1318,7 @@ static const ARMCPRegInfo v7_cp_reginfo[] = { > .fieldoffset = offsetof(CPUARMState, cp15.c9_pmselr), > .writefn = pmselr_write, .raw_writefn = raw_write, }, > { .name = "PMCCNTR", .cp = 15, .crn = 9, .crm = 13, .opc1 = 0, .opc2 = 0, > - .access = PL0_RW, .resetvalue = 0, .type = ARM_CP_IO, > + .access = PL0_RW, .resetvalue = 0, .type = ARM_CP_ALIAS | ARM_CP_IO, > .readfn = pmccntr_read, .writefn = pmccntr_write32, > .accessfn = pmreg_access_ccntr }, > { .name = "PMCCNTR_EL0", .state = ARM_CP_STATE_AA64, > -- Does this fix an observed bug (presumably migration related), or is it just something you saw in code inspection ? Worth noting in the commit message if the former. Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM
On Apr 12 17:10, Peter Maydell wrote: > On 16 March 2018 at 20:31, Aaron Lindsay <alindsay@codeaurora.org> wrote: > > They share the same underlying state > > > > Signed-off-by: Aaron Lindsay <alindsay@codeaurora.org> > > --- > > target/arm/helper.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/target/arm/helper.c b/target/arm/helper.c > > index 5e48982..5634561 100644 > > --- a/target/arm/helper.c > > +++ b/target/arm/helper.c > > @@ -1318,7 +1318,7 @@ static const ARMCPRegInfo v7_cp_reginfo[] = { > > .fieldoffset = offsetof(CPUARMState, cp15.c9_pmselr), > > .writefn = pmselr_write, .raw_writefn = raw_write, }, > > { .name = "PMCCNTR", .cp = 15, .crn = 9, .crm = 13, .opc1 = 0, .opc2 = 0, > > - .access = PL0_RW, .resetvalue = 0, .type = ARM_CP_IO, > > + .access = PL0_RW, .resetvalue = 0, .type = ARM_CP_ALIAS | ARM_CP_IO, > > .readfn = pmccntr_read, .writefn = pmccntr_write32, > > .accessfn = pmreg_access_ccntr }, > > { .name = "PMCCNTR_EL0", .state = ARM_CP_STATE_AA64, > > -- > > Does this fix an observed bug (presumably migration related), > or is it just something you saw in code inspection ? > Worth noting in the commit message if the former. Purely code inspection. I forget now, but I think I found it after chasing down some other register issue in the vicinity and noticed this while digging around. -Aaron > Reviewed-by: Peter Maydell <peter.maydell@linaro.org> > > thanks > -- PMM
diff --git a/target/arm/helper.c b/target/arm/helper.c index 5e48982..5634561 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -1318,7 +1318,7 @@ static const ARMCPRegInfo v7_cp_reginfo[] = { .fieldoffset = offsetof(CPUARMState, cp15.c9_pmselr), .writefn = pmselr_write, .raw_writefn = raw_write, }, { .name = "PMCCNTR", .cp = 15, .crn = 9, .crm = 13, .opc1 = 0, .opc2 = 0, - .access = PL0_RW, .resetvalue = 0, .type = ARM_CP_IO, + .access = PL0_RW, .resetvalue = 0, .type = ARM_CP_ALIAS | ARM_CP_IO, .readfn = pmccntr_read, .writefn = pmccntr_write32, .accessfn = pmreg_access_ccntr }, { .name = "PMCCNTR_EL0", .state = ARM_CP_STATE_AA64,
They share the same underlying state Signed-off-by: Aaron Lindsay <alindsay@codeaurora.org> --- target/arm/helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)