Wei, Peter, On Feb 10 18:07, Peter Maydell wrote: > From: Wei Huang <w...@redhat.com> > > This patch adds access support for PMINTENSET_EL1. > > Signed-off-by: Wei Huang <w...@redhat.com> > Reviewed-by: Peter Maydell <peter.mayd...@linaro.org> > Message-id: 1486504171-26807-4-git-send-email-...@redhat.com > Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> > --- > target/arm/cpu.h | 2 +- > target/arm/helper.c | 10 +++++++++- > 2 files changed, 10 insertions(+), 2 deletions(-) > > diff --git a/target/arm/cpu.h b/target/arm/cpu.h > index edc1f76..0956a54 100644 > --- a/target/arm/cpu.h > +++ b/target/arm/cpu.h > @@ -309,7 +309,7 @@ typedef struct CPUARMState { > uint32_t c9_pmovsr; /* perf monitor overflow status */ > uint32_t c9_pmuserenr; /* perf monitor user enable */ > uint64_t c9_pmselr; /* perf monitor counter selection register */ > - uint32_t c9_pminten; /* perf monitor interrupt enables */ > + uint64_t c9_pminten; /* perf monitor interrupt enables */
PMINTENSET_EL1 and PMINTENCLR_EL1 are both 32-bit registers, just like their AArch32 counterparts. Is there a reason I'm missing for why this has been changed to a uint64_t? There are a number of other 32-bit PMU registers also currently being represented by uint64_t. -Aaron > union { /* Memory attribute redirection */ > struct { > #ifdef HOST_WORDS_BIGENDIAN > diff --git a/target/arm/helper.c b/target/arm/helper.c > index b837d36..5358ac6 100644 > --- a/target/arm/helper.c > +++ b/target/arm/helper.c > @@ -1275,9 +1275,17 @@ static const ARMCPRegInfo v7_cp_reginfo[] = { > .writefn = pmuserenr_write, .raw_writefn = raw_write }, > { .name = "PMINTENSET", .cp = 15, .crn = 9, .crm = 14, .opc1 = 0, .opc2 > = 1, > .access = PL1_RW, .accessfn = access_tpm, > - .fieldoffset = offsetof(CPUARMState, cp15.c9_pminten), > + .type = ARM_CP_ALIAS, > + .fieldoffset = offsetoflow32(CPUARMState, cp15.c9_pminten), > .resetvalue = 0, > .writefn = pmintenset_write, .raw_writefn = raw_write }, > + { .name = "PMINTENSET_EL1", .state = ARM_CP_STATE_AA64, > + .opc0 = 3, .opc1 = 0, .crn = 9, .crm = 14, .opc2 = 1, > + .access = PL1_RW, .accessfn = access_tpm, > + .type = ARM_CP_IO, > + .fieldoffset = offsetof(CPUARMState, cp15.c9_pminten), > + .writefn = pmintenset_write, .raw_writefn = raw_write, > + .resetvalue = 0x0 }, > { .name = "PMINTENCLR", .cp = 15, .crn = 9, .crm = 14, .opc1 = 0, .opc2 > = 2, > .access = PL1_RW, .accessfn = access_tpm, .type = ARM_CP_ALIAS, > .fieldoffset = offsetof(CPUARMState, cp15.c9_pminten), > -- > 2.7.4 > > -- Qualcomm Datacenter Technologies as an affiliate of Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.