On Fri, Jun 12, 2015 at 06:00:15PM +0100, Peter Maydell wrote:
> On 5 June 2015 at 11:33, Edgar E. Iglesias <[email protected]> wrote:
> > From: "Edgar E. Iglesias" <[email protected]>
> >
> > Signed-off-by: Edgar E. Iglesias <[email protected]>
> > ---
>
> > static const ARMCPRegInfo generic_timer_cp_reginfo[] = {
> > /* Note that CNTFRQ is purely reads-as-written for the benefit
> > * of software; writing it doesn't actually change the timer frequency.
> > @@ -2648,6 +2683,18 @@ static const ARMCPRegInfo el3_no_el2_cp_reginfo[] = {
> > { .name = "CNTVOFF", .cp = 15, .opc1 = 4, .crm = 14,
> > .access = PL2_RW, .type = ARM_CP_64BIT | ARM_CP_CONST,
> > .resetvalue = 0 },
> > + { .name = "CNTHP_CTL_EL2", .state = ARM_CP_STATE_AA64,
> > + .opc0 = 3, .opc1 = 4, .crn = 14, .crm = 2, .opc2 = 1,
> > + .access = PL2_RW,
> > + .readfn = arm_cp_read_zero, .writefn = arm_cp_write_ignore, },
> > + { .name = "CNTHP_CVAL_EL2", .state = ARM_CP_STATE_AA64,
> > + .opc0 = 3, .opc1 = 4, .crn = 14, .crm = 2, .opc2 = 2,
> > + .access = PL2_RW,
> > + .readfn = arm_cp_read_zero, .writefn = arm_cp_write_ignore, },
> > + { .name = "CNTHP_TVAL_EL2", .state = ARM_CP_STATE_AA64,
> > + .opc0 = 3, .opc1 = 4, .crn = 14, .crm = 2, .opc2 = 0,
> > + .access = PL2_RW,
> > + .readfn = arm_cp_read_zero, .writefn = arm_cp_write_ignore, },
>
> raz/wi should be implemented as ARM_CP_CONST...
>
> Consider ordering these three defs CVAL, TVAL, CTL, so they're
> in the natural order by opc2? (Ditto below.)
>
> Can we have the AArch32 bindings too, please?
I've added AArch32 binding, changed the reg order and used CP_CONST for next
version.
Thanks,
Edgar
>
> > REGINFO_SENTINEL
> > };
> >
> > @@ -2774,6 +2821,23 @@ static const ARMCPRegInfo el2_cp_reginfo[] = {
> > .access = PL2_RW, .type = ARM_CP_64BIT | ARM_CP_ALIAS | ARM_CP_IO,
> > .writefn = gt_cntvoff_write,
> > .fieldoffset = offsetof(CPUARMState, cp15.cntvoff_el2) },
> > + { .name = "CNTHP_CTL_EL2", .state = ARM_CP_STATE_AA64,
> > + .type = ARM_CP_IO,
> > + .opc0 = 3, .opc1 = 4, .crn = 14, .crm = 2, .opc2 = 1,
> > + .access = PL2_RW,
> > + .fieldoffset = offsetof(CPUARMState, cp15.c14_timer[GTIMER_HYP].ctl),
> > + .resetvalue = 0,
> > + .writefn = gt_hyp_ctl_write, .raw_writefn = raw_write },
> > + { .name = "CNTHP_CVAL_EL2", .state = ARM_CP_STATE_AA64,
> > + .opc0 = 3, .opc1 = 4, .crn = 14, .crm = 2, .opc2 = 2,
> > + .fieldoffset = offsetof(CPUARMState,
> > cp15.c14_timer[GTIMER_HYP].cval),
> > + .type = ARM_CP_IO, .access = PL2_RW,
> > + .writefn = gt_hyp_cval_write, .raw_writefn = raw_write },
> > + { .name = "CNTHP_TVAL_EL2", .state = ARM_CP_STATE_AA64,
> > + .opc0 = 3, .opc1 = 4, .crn = 14, .crm = 2, .opc2 = 0,
> > + .type = ARM_CP_IO, .access = PL2_RW,
> > + .resetfn = gt_hyp_cnt_reset,
> > + .readfn = gt_hyp_tval_read, .writefn = gt_hyp_tval_write },
> > #endif
> > REGINFO_SENTINEL
> > };
>
> -- PMM
