| Message ID | 20140819152405.GA12002@atomide.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi, On Tue, Aug 19, 2014 at 08:24:05AM -0700, Tony Lindgren wrote: > Commit 43fef47f94a1 (mfd: twl4030-power: Add a configuration to turn > off oscillator during off-idle) added support for configuring the PMIC > to cut off resources during deeper idle states to save power. [...] > Fixes: 43fef47f94a1 (mfd: twl4030-power: Add a configuration to turn off oscillator during off-idle) > Cc: stable@vger.kernel.org # v3.16 > Signed-off-by: Tony Lindgren <tony@atomide.com> Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi> A. -- 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 Tue, 19 Aug 2014, Tony Lindgren wrote: > Commit 43fef47f94a1 (mfd: twl4030-power: Add a configuration to turn > off oscillator during off-idle) added support for configuring the PMIC > to cut off resources during deeper idle states to save power. > > This however caused regression for n900 display power that needed the > PMIC configuration to be disabled with commit d937678ab625 (ARM: dts: > Revert enabling of twl configuration for n900). > > Turns out the root cause of the problem is that we must use > TWL4030_RESCONFIG_UNDEF instead of DEV_GRP_NULL to avoid disabling > regulators that may have been enabled before the init function > for twl4030-power.c runs. With TWL4030_RESCONFIG_UNDEF we let the > regulator framework control the regulators like it should. Here we > need to only configure the sys_clken and sys_off_mode triggers for > the regulators that cannot be done by the regulator framework as > it's not running at that point. > > This allows us to enable the PMIC configuration for n900. > > Fixes: 43fef47f94a1 (mfd: twl4030-power: Add a configuration to turn off oscillator during off-idle) > Cc: stable@vger.kernel.org # v3.16 > Signed-off-by: Tony Lindgren <tony@atomide.com> > > --- > > Lee, can you please pick this one for the v3.17-rc series? Applied with Aaro's Tested-by.
On 2014-08-19 08:24:05 [-0700], Tony Lindgren wrote: > > This allows us to enable the PMIC configuration for n900. > > Fixes: 43fef47f94a1 (mfd: twl4030-power: Add a configuration to turn off oscillator during off-idle) My beaglebone-ab does not like this. With this patch applied I end up with: [ 2.437316] Waiting for root device /dev/mmcblk0p2... [ 4.428192] mmc0: card never left busy state [ 4.432647] mmc0: error -110 whilst initialising SD card I noticed this after I disabled lock debugging and tracing (syscall tracing was enabled). Enabling both again makes the error go away. With debugging + tracing disabled (so the error pops up) and git bisect I get this commit (daebabd57) reported. A diff between a good/bad bootlog (with lock-debug + tracing switched off): | smartreflex smartreflex.0: omap_sr_probe: SmartReflex driver initialized | smartreflex smartreflex.1: omap_sr_probe: SmartReflex driver initialized | hsusb2_vbus: disabling | VPLL2: disabling | VUSB3V1: disabling |+VDAC: disabling |+VAUX3: disabling | Waiting for root device /dev/mmcblk0p2... |-mmc0: host does not support reading read-only switch. assuming write-enable. |-mmc0: new high speed SDHC card at address 1234 |-mmcblk0: mmc0:1234 SA04G 3.63 GiB |- mmcblk0: p1 p2 p3 |-BTRFS: device fsid 2e050bbb-1520-425e-a215-1e5bf865c7dc devid 1 transid 496 /dev/root |-BTRFS info (device mmcblk0p2): disk space caching is enabled |-BTRFS: detected SSD devices, enabling SSD mode |-VFS: Mounted root (btrfs filesystem) readonly on device 0:13. |-devtmpfs: mounted |-Freeing unused kernel memory: 216K (c051a000 - c0550000) |-BTRFS info (device mmcblk0p2): disk space caching is enabled |- |-Please press Enter to activate this console. |+mmc0: card never left busy state |+mmc0: error -110 whilst initialising SD card reverting this commit on top of -rc3 makes mmc0 work again. Sebastian -- 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
--- a/arch/arm/boot/dts/omap3-n900.dts +++ b/arch/arm/boot/dts/omap3-n900.dts @@ -361,7 +361,7 @@ }; twl_power: power { - compatible = "ti,twl4030-power-n900"; + compatible = "ti,twl4030-power-n900", "ti,twl4030-power-idle-osc-off"; ti,use_poweroff; }; }; --- a/drivers/mfd/twl4030-power.c +++ b/drivers/mfd/twl4030-power.c @@ -724,24 +724,24 @@ static struct twl4030_script *omap3_idle_scripts[] = { * above. */ static struct twl4030_resconfig omap3_idle_rconfig[] = { - TWL_REMAP_SLEEP(RES_VAUX1, DEV_GRP_NULL, 0, 0), - TWL_REMAP_SLEEP(RES_VAUX2, DEV_GRP_NULL, 0, 0), - TWL_REMAP_SLEEP(RES_VAUX3, DEV_GRP_NULL, 0, 0), - TWL_REMAP_SLEEP(RES_VAUX4, DEV_GRP_NULL, 0, 0), - TWL_REMAP_SLEEP(RES_VMMC1, DEV_GRP_NULL, 0, 0), - TWL_REMAP_SLEEP(RES_VMMC2, DEV_GRP_NULL, 0, 0), + TWL_REMAP_SLEEP(RES_VAUX1, TWL4030_RESCONFIG_UNDEF, 0, 0), + TWL_REMAP_SLEEP(RES_VAUX2, TWL4030_RESCONFIG_UNDEF, 0, 0), + TWL_REMAP_SLEEP(RES_VAUX3, TWL4030_RESCONFIG_UNDEF, 0, 0), + TWL_REMAP_SLEEP(RES_VAUX4, TWL4030_RESCONFIG_UNDEF, 0, 0), + TWL_REMAP_SLEEP(RES_VMMC1, TWL4030_RESCONFIG_UNDEF, 0, 0), + TWL_REMAP_SLEEP(RES_VMMC2, TWL4030_RESCONFIG_UNDEF, 0, 0), TWL_REMAP_OFF(RES_VPLL1, DEV_GRP_P1, 3, 1), TWL_REMAP_SLEEP(RES_VPLL2, DEV_GRP_P1, 0, 0), - TWL_REMAP_SLEEP(RES_VSIM, DEV_GRP_NULL, 0, 0), - TWL_REMAP_SLEEP(RES_VDAC, DEV_GRP_NULL, 0, 0), + TWL_REMAP_SLEEP(RES_VSIM, TWL4030_RESCONFIG_UNDEF, 0, 0), + TWL_REMAP_SLEEP(RES_VDAC, TWL4030_RESCONFIG_UNDEF, 0, 0), TWL_REMAP_SLEEP(RES_VINTANA1, TWL_DEV_GRP_P123, 1, 2), TWL_REMAP_SLEEP(RES_VINTANA2, TWL_DEV_GRP_P123, 0, 2), TWL_REMAP_SLEEP(RES_VINTDIG, TWL_DEV_GRP_P123, 1, 2), TWL_REMAP_SLEEP(RES_VIO, TWL_DEV_GRP_P123, 2, 2), TWL_REMAP_OFF(RES_VDD1, DEV_GRP_P1, 4, 1), TWL_REMAP_OFF(RES_VDD2, DEV_GRP_P1, 3, 1), - TWL_REMAP_SLEEP(RES_VUSB_1V5, DEV_GRP_NULL, 0, 0), - TWL_REMAP_SLEEP(RES_VUSB_1V8, DEV_GRP_NULL, 0, 0), + TWL_REMAP_SLEEP(RES_VUSB_1V5, TWL4030_RESCONFIG_UNDEF, 0, 0), + TWL_REMAP_SLEEP(RES_VUSB_1V8, TWL4030_RESCONFIG_UNDEF, 0, 0), TWL_REMAP_SLEEP(RES_VUSB_3V1, TWL_DEV_GRP_P123, 0, 0), /* Resource #20 USB charge pump skipped */ TWL_REMAP_SLEEP(RES_REGEN, TWL_DEV_GRP_P123, 2, 1),
Commit 43fef47f94a1 (mfd: twl4030-power: Add a configuration to turn off oscillator during off-idle) added support for configuring the PMIC to cut off resources during deeper idle states to save power. This however caused regression for n900 display power that needed the PMIC configuration to be disabled with commit d937678ab625 (ARM: dts: Revert enabling of twl configuration for n900). Turns out the root cause of the problem is that we must use TWL4030_RESCONFIG_UNDEF instead of DEV_GRP_NULL to avoid disabling regulators that may have been enabled before the init function for twl4030-power.c runs. With TWL4030_RESCONFIG_UNDEF we let the regulator framework control the regulators like it should. Here we need to only configure the sys_clken and sys_off_mode triggers for the regulators that cannot be done by the regulator framework as it's not running at that point. This allows us to enable the PMIC configuration for n900. Fixes: 43fef47f94a1 (mfd: twl4030-power: Add a configuration to turn off oscillator during off-idle) Cc: stable@vger.kernel.org # v3.16 Signed-off-by: Tony Lindgren <tony@atomide.com> --- Lee, can you please pick this one for the v3.17-rc series? -- 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