| Message ID | 1362139864-9233-7-git-send-email-santosh.shilimkar@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 17:40-20130301, Santosh Shilimkar wrote: > In addition to the standard power-management technique, the OMAP5 > MPU subsystem also employs an SR3-APG (mercury) power management > technology to reduce leakage. Mercury fast is employed here - might be good to note that. > > It allows for full logic and memories retention on MPU_C0 and MPU_C1 and > is controlled by the PRCM_MPU. > > Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> > --- > arch/arm/mach-omap2/omap-mpuss-lowpower.c | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > > diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c > index bcd2efb..9fda96b 100644 > --- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c > +++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c > @@ -360,6 +360,20 @@ int __cpuinit omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state) > > > /* > + * Enable Mercury Fast HG retention mode by default. > + */ > +static void enable_mercury_retention_mode(void) > +{ > + u32 reg; > + > + reg = omap4_prcm_mpu_read_inst_reg(OMAP54XX_PRCM_MPU_DEVICE_INST, > + OMAP54XX_PRCM_MPU_PRM_PSCON_COUNT_OFFSET); > + reg |= BIT(24) | BIT(25); Can we please use macros here? we are setting BIT(25) - fast ramp-up (Mercury fast) Vs 0 (which would have been mercury slow) BIT(24) is mercury enable basically. OMAP4 prm-regbits-44xx.h did not have these ofcourse, so might be a different bit file or so? > + omap4_prcm_mpu_write_inst_reg(reg, OMAP54XX_PRCM_MPU_DEVICE_INST, > + OMAP54XX_PRCM_MPU_PRM_PSCON_COUNT_OFFSET); > +} > + > +/* > * Initialise OMAP4 MPUSS > */ > int __init omap4_mpuss_init(void) > @@ -438,6 +452,9 @@ int __init omap4_mpuss_init(void) > cpu_context_offset = OMAP54XX_RM_CPU0_CPU0_CONTEXT_OFFSET; > } > > + if (soc_is_omap54xx()) > + enable_mercury_retention_mode(); > + > return 0; > } > > -- > 1.7.9.5 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
On Saturday 02 March 2013 01:12 AM, Nishanth Menon wrote: > On 17:40-20130301, Santosh Shilimkar wrote: >> In addition to the standard power-management technique, the OMAP5 >> MPU subsystem also employs an SR3-APG (mercury) power management >> technology to reduce leakage. > Mercury fast is employed here - might be good to note that. Slow is completly descoped from validation and only supported mode is mercury fast which was the intention. So lets not add any confusion since other state isn't supported. >> >> It allows for full logic and memories retention on MPU_C0 and MPU_C1 and >> is controlled by the PRCM_MPU. >> >> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> >> --- >> arch/arm/mach-omap2/omap-mpuss-lowpower.c | 17 +++++++++++++++++ >> 1 file changed, 17 insertions(+) >> >> diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c >> index bcd2efb..9fda96b 100644 >> --- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c >> +++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c >> @@ -360,6 +360,20 @@ int __cpuinit omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state) >> >> >> /* >> + * Enable Mercury Fast HG retention mode by default. >> + */ >> +static void enable_mercury_retention_mode(void) >> +{ >> + u32 reg; >> + >> + reg = omap4_prcm_mpu_read_inst_reg(OMAP54XX_PRCM_MPU_DEVICE_INST, >> + OMAP54XX_PRCM_MPU_PRM_PSCON_COUNT_OFFSET); >> + reg |= BIT(24) | BIT(25); > Can we please use macros here? > we are setting BIT(25) - fast ramp-up (Mercury fast) Vs 0 (which would > have been mercury slow) > BIT(24) is mercury enable basically. OMAP4 prm-regbits-44xx.h did not > have these ofcourse, so might be a different bit file or so? As already commented above, only mode supported is mercury fast and hence to avoid any further confusion, i have used bit fields. In short, to enable the mercury on O5, both bits needs to be set. And to avoid any fast/slow confusion, I haven't used macro's. Regards Santosh -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 11:22-20130302, Santosh Shilimkar wrote: > On Saturday 02 March 2013 01:12 AM, Nishanth Menon wrote: > > On 17:40-20130301, Santosh Shilimkar wrote: > >> In addition to the standard power-management technique, the OMAP5 > >> MPU subsystem also employs an SR3-APG (mercury) power management > >> technology to reduce leakage. > > Mercury fast is employed here - might be good to note that. > Slow is completly descoped from validation and only supported mode > is mercury fast which was the intention. So lets not add any confusion > since other state isn't supported. understood and agreed. > >> > >> It allows for full logic and memories retention on MPU_C0 and MPU_C1 and > >> is controlled by the PRCM_MPU. > >> > >> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> > >> --- > >> arch/arm/mach-omap2/omap-mpuss-lowpower.c | 17 +++++++++++++++++ > >> 1 file changed, 17 insertions(+) > >> > >> diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c > >> index bcd2efb..9fda96b 100644 > >> --- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c > >> +++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c > >> @@ -360,6 +360,20 @@ int __cpuinit omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state) > >> > >> > >> /* > >> + * Enable Mercury Fast HG retention mode by default. > >> + */ > >> +static void enable_mercury_retention_mode(void) > >> +{ > >> + u32 reg; > >> + > >> + reg = omap4_prcm_mpu_read_inst_reg(OMAP54XX_PRCM_MPU_DEVICE_INST, > >> + OMAP54XX_PRCM_MPU_PRM_PSCON_COUNT_OFFSET); > >> + reg |= BIT(24) | BIT(25); > > Can we please use macros here? > > we are setting BIT(25) - fast ramp-up (Mercury fast) Vs 0 (which would > > have been mercury slow) > > BIT(24) is mercury enable basically. OMAP4 prm-regbits-44xx.h did not > > have these ofcourse, so might be a different bit file or so? > As already commented above, only mode supported is mercury fast and > hence to avoid any further confusion, i have used bit fields. > In short, to enable the mercury on O5, both bits needs to be set. > And to avoid any fast/slow confusion, I haven't used macro's. I see the usage as a slightly better version of: reg |= 0x3000000 shrug.. Register bit define is slightly better from review perspective.
diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c index bcd2efb..9fda96b 100644 --- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c +++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c @@ -360,6 +360,20 @@ int __cpuinit omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state) /* + * Enable Mercury Fast HG retention mode by default. + */ +static void enable_mercury_retention_mode(void) +{ + u32 reg; + + reg = omap4_prcm_mpu_read_inst_reg(OMAP54XX_PRCM_MPU_DEVICE_INST, + OMAP54XX_PRCM_MPU_PRM_PSCON_COUNT_OFFSET); + reg |= BIT(24) | BIT(25); + omap4_prcm_mpu_write_inst_reg(reg, OMAP54XX_PRCM_MPU_DEVICE_INST, + OMAP54XX_PRCM_MPU_PRM_PSCON_COUNT_OFFSET); +} + +/* * Initialise OMAP4 MPUSS */ int __init omap4_mpuss_init(void) @@ -438,6 +452,9 @@ int __init omap4_mpuss_init(void) cpu_context_offset = OMAP54XX_RM_CPU0_CPU0_CONTEXT_OFFSET; } + if (soc_is_omap54xx()) + enable_mercury_retention_mode(); + return 0; }
In addition to the standard power-management technique, the OMAP5 MPU subsystem also employs an SR3-APG (mercury) power management technology to reduce leakage. It allows for full logic and memories retention on MPU_C0 and MPU_C1 and is controlled by the PRCM_MPU. Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> --- arch/arm/mach-omap2/omap-mpuss-lowpower.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)