| Message ID | 1408716154-26101-8-git-send-email-nm@ti.com |
|---|---|
| State | New |
| Headers | show |
Nishanth Menon <nm@ti.com> writes: > From: Rajendra Nayak <rnayak@ti.com> > > On OMAP5 / DRA7, prevent a CPU powerdomain OFF and resulting MPU OSWR > and instead attempt a CPU RET and side effect, MPU RET in suspend. > > Signed-off-by: Rajendra Nayak <rnayak@ti.com> > [nm@ti.com: update to do save_state only on DRA7] > Signed-off-by: Nishanth Menon <nm@ti.com> > --- > arch/arm/mach-omap2/omap-mpuss-lowpower.c | 4 ++++ > arch/arm/mach-omap2/omap-wakeupgen.c | 2 +- > arch/arm/mach-omap2/pm44xx.c | 9 +++++++-- > 3 files changed, 12 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c > index 207fce2..0d640eb 100644 > --- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c > +++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c > @@ -242,6 +242,10 @@ int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state) > save_state = 1; > break; > case PWRDM_POWER_RET: > + if (soc_is_omap54xx() || soc_is_dra7xx()) { Aren't we trying to get away from these soc_* checks for anything other than init code? Kevin > + save_state = 0; > + break; > + } > default: > /* > * CPUx CSWR is invalid hardware state. Also CPUx OSWR > diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c > index e844e16..87c1c0d 100644 > --- a/arch/arm/mach-omap2/omap-wakeupgen.c > +++ b/arch/arm/mach-omap2/omap-wakeupgen.c > @@ -381,7 +381,7 @@ static struct notifier_block irq_notifier_block = { > static void __init irq_pm_init(void) > { > /* FIXME: Remove this when MPU OSWR support is added */ > - if (!soc_is_omap54xx()) > + if (!soc_is_omap54xx() && !soc_is_dra7xx()) > cpu_pm_register_notifier(&irq_notifier_block); > } > #else > diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c > index b6f243d..c063833 100644 > --- a/arch/arm/mach-omap2/pm44xx.c > +++ b/arch/arm/mach-omap2/pm44xx.c > @@ -36,6 +36,8 @@ struct power_state { > struct list_head node; > }; > > +static u32 cpu_suspend_state = PWRDM_POWER_OFF; > + > static LIST_HEAD(pwrst_list); > > #ifdef CONFIG_SUSPEND > @@ -66,7 +68,7 @@ static int omap4_pm_suspend(void) > * domain CSWR is not supported by hardware. > * More details can be found in OMAP4430 TRM section 4.3.4.2. > */ > - omap4_enter_lowpower(cpu_id, PWRDM_POWER_OFF); > + omap4_enter_lowpower(cpu_id, cpu_suspend_state); > > /* Restore next powerdomain state */ > list_for_each_entry(pwrst, &pwrst_list, node) { > @@ -112,8 +114,11 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm, void *unused) > * through hotplug path and CPU0 explicitly programmed > * further down in the code path > */ > - if (!strncmp(pwrdm->name, "cpu", 3)) > + if (!strncmp(pwrdm->name, "cpu", 3)) { > + if (soc_is_omap54xx() || soc_is_dra7xx()) > + cpu_suspend_state = PWRDM_POWER_RET; > return 0; > + } > > pwrst = kmalloc(sizeof(struct power_state), GFP_ATOMIC); > if (!pwrst) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
On 08/27/2014 01:58 PM, Kevin Hilman wrote: > Nishanth Menon <nm@ti.com> writes: > >> From: Rajendra Nayak <rnayak@ti.com> >> >> On OMAP5 / DRA7, prevent a CPU powerdomain OFF and resulting MPU OSWR >> and instead attempt a CPU RET and side effect, MPU RET in suspend. >> >> Signed-off-by: Rajendra Nayak <rnayak@ti.com> >> [nm@ti.com: update to do save_state only on DRA7] >> Signed-off-by: Nishanth Menon <nm@ti.com> >> --- >> arch/arm/mach-omap2/omap-mpuss-lowpower.c | 4 ++++ >> arch/arm/mach-omap2/omap-wakeupgen.c | 2 +- >> arch/arm/mach-omap2/pm44xx.c | 9 +++++++-- >> 3 files changed, 12 insertions(+), 3 deletions(-) >> >> diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c >> index 207fce2..0d640eb 100644 >> --- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c >> +++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c >> @@ -242,6 +242,10 @@ int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state) >> save_state = 1; >> break; >> case PWRDM_POWER_RET: >> + if (soc_is_omap54xx() || soc_is_dra7xx()) { > > Aren't we trying to get away from these soc_* checks for anything other > than init code? I would expect that to take place in stages as part of which the next level of cleanup is to move PRM into drivers. Currently our wakeupgen, prm code does have quiet a few needs of dealing with soc_is checks primarily from having to re-architect code in two different directions - we want to move into just one direction eventually - to prm drivers and as less code in mach-omap2 which is already in the works.
* Nishanth Menon <nm@ti.com> [140827 12:05]: > On 08/27/2014 01:58 PM, Kevin Hilman wrote: > > Nishanth Menon <nm@ti.com> writes: > > > >> From: Rajendra Nayak <rnayak@ti.com> > >> > >> On OMAP5 / DRA7, prevent a CPU powerdomain OFF and resulting MPU OSWR > >> and instead attempt a CPU RET and side effect, MPU RET in suspend. > >> > >> Signed-off-by: Rajendra Nayak <rnayak@ti.com> > >> [nm@ti.com: update to do save_state only on DRA7] > >> Signed-off-by: Nishanth Menon <nm@ti.com> > >> --- > >> arch/arm/mach-omap2/omap-mpuss-lowpower.c | 4 ++++ > >> arch/arm/mach-omap2/omap-wakeupgen.c | 2 +- > >> arch/arm/mach-omap2/pm44xx.c | 9 +++++++-- > >> 3 files changed, 12 insertions(+), 3 deletions(-) > >> > >> diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c > >> index 207fce2..0d640eb 100644 > >> --- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c > >> +++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c > >> @@ -242,6 +242,10 @@ int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state) > >> save_state = 1; > >> break; > >> case PWRDM_POWER_RET: > >> + if (soc_is_omap54xx() || soc_is_dra7xx()) { > > > > Aren't we trying to get away from these soc_* checks for anything other > > than init code? > > I would expect that to take place in stages as part of which the next > level of cleanup is to move PRM into drivers. Currently our wakeupgen, > prm code does have quiet a few needs of dealing with soc_is checks > primarily from having to re-architect code in two different directions > - we want to move into just one direction eventually - to prm drivers > and as less code in mach-omap2 which is already in the works. Why don't you just set some flag at init time based on the soc_is check and then test that here? That limits the use of soc_is to init code only which makes it easier to phase it out completely eventually. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
On Wednesday 27 August 2014 03:41 PM, Tony Lindgren wrote: > * Nishanth Menon <nm@ti.com> [140827 12:05]: >> On 08/27/2014 01:58 PM, Kevin Hilman wrote: >>> Nishanth Menon <nm@ti.com> writes: >>> >>>> From: Rajendra Nayak <rnayak@ti.com> >>>> >>>> On OMAP5 / DRA7, prevent a CPU powerdomain OFF and resulting MPU OSWR >>>> and instead attempt a CPU RET and side effect, MPU RET in suspend. >>>> >>>> Signed-off-by: Rajendra Nayak <rnayak@ti.com> >>>> [nm@ti.com: update to do save_state only on DRA7] >>>> Signed-off-by: Nishanth Menon <nm@ti.com> >>>> --- >>>> arch/arm/mach-omap2/omap-mpuss-lowpower.c | 4 ++++ >>>> arch/arm/mach-omap2/omap-wakeupgen.c | 2 +- >>>> arch/arm/mach-omap2/pm44xx.c | 9 +++++++-- >>>> 3 files changed, 12 insertions(+), 3 deletions(-) >>>> >>>> diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c >>>> index 207fce2..0d640eb 100644 >>>> --- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c >>>> +++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c >>>> @@ -242,6 +242,10 @@ int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state) >>>> save_state = 1; >>>> break; >>>> case PWRDM_POWER_RET: >>>> + if (soc_is_omap54xx() || soc_is_dra7xx()) { >>> >>> Aren't we trying to get away from these soc_* checks for anything other >>> than init code? >> >> I would expect that to take place in stages as part of which the next >> level of cleanup is to move PRM into drivers. Currently our wakeupgen, >> prm code does have quiet a few needs of dealing with soc_is checks >> primarily from having to re-architect code in two different directions >> - we want to move into just one direction eventually - to prm drivers >> and as less code in mach-omap2 which is already in the works. > > Why don't you just set some flag at init time based on the > soc_is check and then test that here? That limits the use of > soc_is to init code only which makes it easier to phase it > out completely eventually. > Indeed. Infact the version of the code I tried posting last year was using a flag which was initialised during init. Same can be done her. Regards, Santosh -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
On 08/27/2014 02:43 PM, Santosh Shilimkar wrote: > On Wednesday 27 August 2014 03:41 PM, Tony Lindgren wrote: >> * Nishanth Menon <nm@ti.com> [140827 12:05]: >>> On 08/27/2014 01:58 PM, Kevin Hilman wrote: >>>> Nishanth Menon <nm@ti.com> writes: >>>> >>>>> From: Rajendra Nayak <rnayak@ti.com> >>>>> >>>>> On OMAP5 / DRA7, prevent a CPU powerdomain OFF and resulting MPU OSWR >>>>> and instead attempt a CPU RET and side effect, MPU RET in suspend. >>>>> >>>>> Signed-off-by: Rajendra Nayak <rnayak@ti.com> >>>>> [nm@ti.com: update to do save_state only on DRA7] >>>>> Signed-off-by: Nishanth Menon <nm@ti.com> >>>>> --- >>>>> arch/arm/mach-omap2/omap-mpuss-lowpower.c | 4 ++++ >>>>> arch/arm/mach-omap2/omap-wakeupgen.c | 2 +- >>>>> arch/arm/mach-omap2/pm44xx.c | 9 +++++++-- >>>>> 3 files changed, 12 insertions(+), 3 deletions(-) >>>>> >>>>> diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c >>>>> index 207fce2..0d640eb 100644 >>>>> --- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c >>>>> +++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c >>>>> @@ -242,6 +242,10 @@ int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state) >>>>> save_state = 1; >>>>> break; >>>>> case PWRDM_POWER_RET: >>>>> + if (soc_is_omap54xx() || soc_is_dra7xx()) { >>>> >>>> Aren't we trying to get away from these soc_* checks for anything other >>>> than init code? >>> >>> I would expect that to take place in stages as part of which the next >>> level of cleanup is to move PRM into drivers. Currently our wakeupgen, >>> prm code does have quiet a few needs of dealing with soc_is checks >>> primarily from having to re-architect code in two different directions >>> - we want to move into just one direction eventually - to prm drivers >>> and as less code in mach-omap2 which is already in the works. >> >> Why don't you just set some flag at init time based on the >> soc_is check and then test that here? That limits the use of >> soc_is to init code only which makes it easier to phase it >> out completely eventually. >> > Indeed. Infact the version of the code I tried posting last year was > using a flag which was initialised during init. Same can be > done her. OK. will try something along that line in the next rev.
diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c index 207fce2..0d640eb 100644 --- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c +++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c @@ -242,6 +242,10 @@ int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state) save_state = 1; break; case PWRDM_POWER_RET: + if (soc_is_omap54xx() || soc_is_dra7xx()) { + save_state = 0; + break; + } default: /* * CPUx CSWR is invalid hardware state. Also CPUx OSWR diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c index e844e16..87c1c0d 100644 --- a/arch/arm/mach-omap2/omap-wakeupgen.c +++ b/arch/arm/mach-omap2/omap-wakeupgen.c @@ -381,7 +381,7 @@ static struct notifier_block irq_notifier_block = { static void __init irq_pm_init(void) { /* FIXME: Remove this when MPU OSWR support is added */ - if (!soc_is_omap54xx()) + if (!soc_is_omap54xx() && !soc_is_dra7xx()) cpu_pm_register_notifier(&irq_notifier_block); } #else diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c index b6f243d..c063833 100644 --- a/arch/arm/mach-omap2/pm44xx.c +++ b/arch/arm/mach-omap2/pm44xx.c @@ -36,6 +36,8 @@ struct power_state { struct list_head node; }; +static u32 cpu_suspend_state = PWRDM_POWER_OFF; + static LIST_HEAD(pwrst_list); #ifdef CONFIG_SUSPEND @@ -66,7 +68,7 @@ static int omap4_pm_suspend(void) * domain CSWR is not supported by hardware. * More details can be found in OMAP4430 TRM section 4.3.4.2. */ - omap4_enter_lowpower(cpu_id, PWRDM_POWER_OFF); + omap4_enter_lowpower(cpu_id, cpu_suspend_state); /* Restore next powerdomain state */ list_for_each_entry(pwrst, &pwrst_list, node) { @@ -112,8 +114,11 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm, void *unused) * through hotplug path and CPU0 explicitly programmed * further down in the code path */ - if (!strncmp(pwrdm->name, "cpu", 3)) + if (!strncmp(pwrdm->name, "cpu", 3)) { + if (soc_is_omap54xx() || soc_is_dra7xx()) + cpu_suspend_state = PWRDM_POWER_RET; return 0; + } pwrst = kmalloc(sizeof(struct power_state), GFP_ATOMIC); if (!pwrst)