| Message ID | 1364205910-32392-16-git-send-email-santosh.shilimkar@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Santosh Shilimkar <santosh.shilimkar@ti.com> writes: > The OMAP5 idle driver can re-use most of OMAP4 CPUidle driver > implementation. Also the next derivative SOCs are going to re-use > the MPUSS so, same driver with minor updates can be re-used. > > Prepare the code so that its easier to add CPUidle support for > OMAP5 devices. > > Acked-by: Nishanth Menon <nm@ti.com> > Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> > --- > arch/arm/mach-omap2/cpuidle44xx.c | 31 ++++++++++++++++--------------- > 1 file changed, 16 insertions(+), 15 deletions(-) > > diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c > index b8a22f0..ac6d526 100644 > --- a/arch/arm/mach-omap2/cpuidle44xx.c > +++ b/arch/arm/mach-omap2/cpuidle44xx.c > @@ -1,7 +1,7 @@ > /* > - * OMAP4 CPU idle Routines > + * OMAP4PLUS CPU idle Routines nit: s/PLUS/+/ in a few other places in this patch also. > * > - * Copyright (C) 2011 Texas Instruments, Inc. > + * Copyright (C) 2011-2013 Texas Instruments, Inc. > * Santosh Shilimkar <santosh.shilimkar@ti.com> > * Rajendra Nayak <rnayak@ti.com> > * > @@ -24,13 +24,13 @@ > #include "clockdomain.h" > > /* Machine specific information */ > -struct omap4_idle_statedata { > +struct idle_statedata { > u32 cpu_state; > u32 mpu_logic_state; > u32 mpu_state; > }; > > -static struct omap4_idle_statedata omap4_idle_data[] = { > +static struct idle_statedata omap4_idle_data[] = { > { > .cpu_state = PWRDM_POWER_ON, > .mpu_state = PWRDM_POWER_ON, > @@ -53,11 +53,12 @@ static struct clockdomain *cpu_clkdm[NR_CPUS]; > > static atomic_t abort_barrier; > static bool cpu_done[NR_CPUS]; > +static struct idle_statedata *state_ptr = &omap4_idle_data[0]; The assignment at init time (from the next patch) should be done here for 44xx, and the next patch can just add OMAP5 support. Kevin
On Thursday 04 April 2013 02:40 AM, Kevin Hilman wrote: > Santosh Shilimkar <santosh.shilimkar@ti.com> writes: > >> The OMAP5 idle driver can re-use most of OMAP4 CPUidle driver >> implementation. Also the next derivative SOCs are going to re-use >> the MPUSS so, same driver with minor updates can be re-used. >> >> Prepare the code so that its easier to add CPUidle support for >> OMAP5 devices. >> >> Acked-by: Nishanth Menon <nm@ti.com> >> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> >> --- >> arch/arm/mach-omap2/cpuidle44xx.c | 31 ++++++++++++++++--------------- >> 1 file changed, 16 insertions(+), 15 deletions(-) >> >> diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c >> index b8a22f0..ac6d526 100644 >> --- a/arch/arm/mach-omap2/cpuidle44xx.c >> +++ b/arch/arm/mach-omap2/cpuidle44xx.c >> @@ -1,7 +1,7 @@ >> /* >> - * OMAP4 CPU idle Routines >> + * OMAP4PLUS CPU idle Routines > > nit: s/PLUS/+/ > > in a few other places in this patch also. > yes. Will update that. >> @@ -24,13 +24,13 @@ >> #include "clockdomain.h" >> >> /* Machine specific information */ >> -struct omap4_idle_statedata { >> +struct idle_statedata { >> u32 cpu_state; >> u32 mpu_logic_state; >> u32 mpu_state; >> }; >> >> -static struct omap4_idle_statedata omap4_idle_data[] = { >> +static struct idle_statedata omap4_idle_data[] = { >> { >> .cpu_state = PWRDM_POWER_ON, >> .mpu_state = PWRDM_POWER_ON, >> @@ -53,11 +53,12 @@ static struct clockdomain *cpu_clkdm[NR_CPUS]; >> >> static atomic_t abort_barrier; >> static bool cpu_done[NR_CPUS]; >> +static struct idle_statedata *state_ptr = &omap4_idle_data[0]; > > The assignment at init time (from the next patch) should be done here > for 44xx, and the next patch can just add OMAP5 support. > You don't need that to be differentiated at init at this patch since only OMAP4 is supported and static assignment takes care of it. Next patch ofcouse we need to differentiate and hence added the checks there. Regards, Santosh
diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c index b8a22f0..ac6d526 100644 --- a/arch/arm/mach-omap2/cpuidle44xx.c +++ b/arch/arm/mach-omap2/cpuidle44xx.c @@ -1,7 +1,7 @@ /* - * OMAP4 CPU idle Routines + * OMAP4PLUS CPU idle Routines * - * Copyright (C) 2011 Texas Instruments, Inc. + * Copyright (C) 2011-2013 Texas Instruments, Inc. * Santosh Shilimkar <santosh.shilimkar@ti.com> * Rajendra Nayak <rnayak@ti.com> * @@ -24,13 +24,13 @@ #include "clockdomain.h" /* Machine specific information */ -struct omap4_idle_statedata { +struct idle_statedata { u32 cpu_state; u32 mpu_logic_state; u32 mpu_state; }; -static struct omap4_idle_statedata omap4_idle_data[] = { +static struct idle_statedata omap4_idle_data[] = { { .cpu_state = PWRDM_POWER_ON, .mpu_state = PWRDM_POWER_ON, @@ -53,11 +53,12 @@ static struct clockdomain *cpu_clkdm[NR_CPUS]; static atomic_t abort_barrier; static bool cpu_done[NR_CPUS]; +static struct idle_statedata *state_ptr = &omap4_idle_data[0]; /* Private functions */ /** - * omap4_enter_idle_coupled_[simple/coupled] - OMAP4 cpuidle entry functions + * omap_enter_idle_[simple/coupled] - OMAP4PLUS cpuidle entry functions * @dev: cpuidle device * @drv: cpuidle driver * @index: the index of state to be entered @@ -66,7 +67,7 @@ static bool cpu_done[NR_CPUS]; * specified low power state selected by the governor. * Returns the amount of time spent in the low power state. */ -static int omap4_enter_idle_simple(struct cpuidle_device *dev, +static int omap_enter_idle_simple(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index) { @@ -74,11 +75,11 @@ static int omap4_enter_idle_simple(struct cpuidle_device *dev, return index; } -static int omap4_enter_idle_coupled(struct cpuidle_device *dev, +static int omap_enter_idle_coupled(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index) { - struct omap4_idle_statedata *cx = &omap4_idle_data[index]; + struct idle_statedata *cx = state_ptr + index; int cpu_id = smp_processor_id(); /* @@ -167,7 +168,7 @@ static void omap_setup_broadcast_timer(void *arg) clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ON, &cpu); } -static DEFINE_PER_CPU(struct cpuidle_device, omap4_idle_dev); +static DEFINE_PER_CPU(struct cpuidle_device, omap_idle_dev); static struct cpuidle_driver omap4_idle_driver = { .name = "omap4_idle", @@ -179,7 +180,7 @@ static struct cpuidle_driver omap4_idle_driver = { .exit_latency = 2 + 2, .target_residency = 5, .flags = CPUIDLE_FLAG_TIME_VALID, - .enter = omap4_enter_idle_simple, + .enter = omap_enter_idle_simple, .name = "C1", .desc = "CPUx ON, MPUSS ON" }, @@ -188,7 +189,7 @@ static struct cpuidle_driver omap4_idle_driver = { .exit_latency = 328 + 440, .target_residency = 960, .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_COUPLED, - .enter = omap4_enter_idle_coupled, + .enter = omap_enter_idle_coupled, .name = "C2", .desc = "CPUx OFF, MPUSS CSWR", }, @@ -197,7 +198,7 @@ static struct cpuidle_driver omap4_idle_driver = { .exit_latency = 460 + 518, .target_residency = 1100, .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_COUPLED, - .enter = omap4_enter_idle_coupled, + .enter = omap_enter_idle_coupled, .name = "C3", .desc = "CPUx OFF, MPUSS OSWR", }, @@ -209,9 +210,9 @@ static struct cpuidle_driver omap4_idle_driver = { /* Public functions */ /** - * omap4_idle_init - Init routine for OMAP4 idle + * omap4_idle_init - Init routine for OMAP4PLUS idle * - * Registers the OMAP4 specific cpuidle driver to the cpuidle + * Registers the OMAP4PLUS specific cpuidle driver to the cpuidle * framework with the valid set of states. */ int __init omap4_idle_init(void) @@ -239,7 +240,7 @@ int __init omap4_idle_init(void) } for_each_cpu(cpu_id, cpu_online_mask) { - dev = &per_cpu(omap4_idle_dev, cpu_id); + dev = &per_cpu(omap_idle_dev, cpu_id); dev->cpu = cpu_id; #ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED dev->coupled_cpus = *cpu_online_mask;