usb : musb: Offmode fix for idle path
Subsystems (7)
PATCH v3 9/9 usb : musb: Offmode fix for idle path
With OMAP core-off support musb was not functional as context was getting lost after wakeup from core-off. And also musb was blocking the core-off after loading the gadget driver even with no cable connected sometimes.
Added the idle and wakeup APIs in the platform layer which will be called in the idle and wakeup path.
Used the pm_runtime_put_sysc API to configure the
musb to force idle/standby modes, saving the context and disable the clk in while idling if there is no activity on the usb bus.
Used the pm_runtime_get_sync API to configure the musb to no idle/standby modes, enable the clock and restore the context after wakeup when there is no activity on the usb bus.
--- arch/arm/mach-omap2/cpuidle34xx.c | 1 arch/arm/mach-omap2/pm34xx.c | 3 arch/arm/mach-omap2/usb-musb.c | 107 ++++++++++++++++++++++++++++++++++ arch/arm/plat-omap/include/plat/usb.h | 2 drivers/usb/musb/musb_core.c | 15 ++++ drivers/usb/musb/omap2430.c | 14 ++++ include/linux/usb/musb.h | 9 ++ 7 files changed, 149 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/cpuidle34xx.c +1 -0
@@ -31,6 +31,7 @@#include <plat/clockdomain.h> #include <plat/control.h> #include <plat/serial.h> +#include <plat/usb.h> #include "pm.h"
arch/arm/mach-omap2/pm34xx.c +3 -0
@@ -38,6 +38,7 @@#include <plat/prcm.h> #include <plat/gpmc.h> #include <plat/dma.h> +#include <plat/usb.h> #include <asm/tlbflush.h>
@@ -324,11 +325,13 @@ static void restore_table_entry(void)void omap3_device_idle (void ) {omap2_gpio_prepare_for_idle (); +musb_prepare_for_idle (); }void omap3_device_resume (void ) {omap2_gpio_resume_after_idle (); +musb_wakeup_from_idle (); }void omap_sram_idle (void )
arch/arm/mach-omap2/usb-musb.c +104 -0
146 lines not on this page · raw message
arch/arm/plat-omap/include/plat/usb.h +2 -0
@@ -79,6 +79,8 @@ extern void usb_ehci_init(const struct eextern void usb_ohci_init (const struct ohci_hcd_omap_platform_data *pdata); +extern void musb_prepare_for_idle (void ); +extern void musb_wakeup_from_idle (void );#endif
drivers/usb/musb/musb_core.c +13 -2
@@ -2410,6 +2410,7 @@ static int musb_suspend(struct device *dstruct platform_device *pdev =to_platform_device (dev);unsigned long flags;struct musb *musb =dev_to_musb (&pdev->dev); +struct musb_hdrc_platform_data *plat = dev->platform_data;if (!musb->clock)return 0 ;
@@ -2425,6 +2426,9 @@ static int musb_suspend(struct device *d* they will even be wakeup-enabled. */ } + +if (plat->save_context) + plat->save_context =1 ;pm_runtime_put_sync (dev);#ifndef CONFIG_PM_RUNTIME
@@ -2443,10 +2447,13 @@ static int musb_resume_noirq(struct devi {struct platform_device *pdev =to_platform_device (dev);struct musb *musb =dev_to_musb (&pdev->dev); +struct musb_hdrc_platform_data *plat = dev->platform_data;if (!musb->clock)return 0 ; +if (plat->restore_context) + plat->restore_context =1 ;pm_runtime_get_sync (dev);#ifndef CONFIG_PM_RUNTIME
@@ -2468,16 +2475,20 @@ static int musb_resume_noirq(struct devistatic int musb_runtime_suspend (struct device *dev) {struct musb *musb =dev_to_musb (dev); +struct musb_hdrc_platform_data *plat = dev->platform_data; -musb_save_context (musb); +if (plat->save_context) +musb_save_context (musb);return 0 ; }static int musb_runtime_resume (struct device *dev) {struct musb *musb =dev_to_musb (dev); +struct musb_hdrc_platform_data *plat = dev->platform_data; -musb_restore_context (musb); +if (plat->restore_context) +musb_restore_context (musb);return 0 ; }static const struct dev_pm_ops musb_dev_pm_ops = {
drivers/usb/musb/omap2430.c +14 -0
@@ -189,6 +189,19 @@ int musb_platform_set_mode(struct musb *return 0 ; } +int is_musb_active (struct device *dev) +{ +struct musb *musb; + +#ifdef CONFIG_USB_MUSB_HDRC_HCD +/* usbcore insists dev->driver_data is a "struct hcd *" */ + musb =hcd_to_musb (dev_get_drvdata (dev)); +#else + musb =dev_get_drvdata (dev); +#endif +return musb->is_active; +} +int __init musb_platform_init (struct musb *musb) {u32 l;
@@ -232,6 +245,7 @@ int __init musb_platform_init(struct mus musb->board_set_vbus = omap_set_vbus;setup_timer (&musb_idle_timer, musb_do_idle, (unsigned long ) musb); + plat->is_usb_active = is_musb_active;return 0 ; }
include/linux/usb/musb.h +13 -0
@@ -93,6 +93,8 @@ struct musb_hdrc_config { }; +struct device ; +struct musb_hdrc_platform_data {/* MUSB_HOST, MUSB_PERIPHERAL, or MUSB_OTG */ u8 mode;
@@ -126,6 +128,17 @@ struct musb_hdrc_platform_data {/* Architecture specific board data */ void *board_data; + +/* check usb device active state*/ +int (*is_usb_active)(struct device *dev); + +/* +* Used for saving and restoring the registers only when core +* next state is off and previous state was off. +* Otherwise avoid save restore. +*/ +int save_context; +int restore_context; };
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 158 lines
-----Original Message-----
From: Hema HK [mailto:[email protected]]
Sent: Thursday, September 23, 2010 6:01 AM
To: [email protected]; [email protected]
Cc: Hema HK; Maulik Mankad; Felipe Balbi; Tony Lindgren; Kevin Hilman; Cousson, Benoit; Paul Walmsley
Subject: [PATCH 9/9 v3] usb : musb: Offmode fix for idle pathWith OMAP core-off support musb was not functional as context was getting lost after wakeup from core-off. And also musb was blocking the core-off after loading the gadget driver even with no cable connected sometimes.
Added the idle and wakeup APIs in the platform layer which will be called in the idle and wakeup path.
Used the
pm_runtime_put_syscAPI to configure the
musb to force idle/standby modes, saving the context and disable the clk in
while idling if there is no activity on the usb bus.Used the
pm_runtime_get_syncAPI to configure the musb to no idle/standby modes, enable the clock and restore the context after wakeup when there is no activity on the usb bus.Signed-off-by Hema HK <[email protected]>Signed-off-by Maulik Mankad <[email protected]>Cc Felipe Balbi <[email protected]>Cc Tony Lindgren <[email protected]>Cc Kevin Hilman <[email protected]>Cc Cousson, Benoit <[email protected]>Cc Paul Walmsley <[email protected]>--- arch/arm/mach-omap2/cpuidle34xx.c | 1 arch/arm/mach-omap2/pm34xx.c | 3 arch/arm/mach-omap2/usb-musb.c | 107 ++++++++++++++++++++++++++++++++++ arch/arm/plat-omap/include/plat/usb.h | 2 drivers/usb/musb/musb_core.c | 15 ++++ drivers/usb/musb/omap2430.c | 14 ++++ include/linux/usb/musb.h | 9 ++ 7 files changed, 149 insertions(+), 2 deletions(-)Index:
linux-omap-pm/arch/arm/mach-omap2/cpuidle34xx.c
===================================================================arch/arm/mach-omap2/cpuidle34xx.c +1
-0@@ -31,6 +31,7 @@#include <plat/clockdomain.h> #include <plat/control.h> #include <plat/serial.h> +#include <plat/usb.h> #include "pm.h" Index:
linux-omap-pm/arch/arm/mach-omap2/pm34xx.c
===================================================================arch/arm/mach-omap2/pm34xx.c +3
-0@@ -38,6 +38,7 @@#include <plat/prcm.h> #include <plat/gpmc.h> #include <plat/dma.h> +#include <plat/usb.h> #include <asm/tlbflush.h> @@ -324,11 +325,13 @@ static void restore_table_entry(void)void omap3_device_idle (void ) {omap2_gpio_prepare_for_idle (); +musb_prepare_for_idle (); }void omap3_device_resume (void ) {omap2_gpio_resume_after_idle (); +musb_wakeup_from_idle (); }void omap_sram_idle (void )Index:
linux-omap-pm/arch/arm/mach-omap2/usb-musb.c
===================================================================arch/arm/mach-omap2/usb-musb.c +30
-0@@ -25,16 +25,21 @@#include <linux/io.h> #include <linux/usb/musb.h> +#include <linux/pm_runtime.h> #include <mach/hardware.h> #include <mach/irqs.h> #include <plat/usb.h> #include <plat/omap_device.h> +#include <plat/powerdomain.h> #ifdef CONFIG_USB_MUSB_SOC static const char name[] ="musb_hdrc" ;#define MAX_OMAP_MUSB_HWMOD_NAME_LEN 16 +struct omap_hwmod *oh_p; +static struct powerdomain *core_pwrdm; +static struct musb_hdrc_config musb_config = { .multipoint =1 , .dyn_fifo = 1,@@ -58,6 +63,10 @@ static struct musb_hdrc_platform_data mu* "mode", and should be passed to usb_musb_init(). */ .power = 50, /* up to 100 mA */ + +/* OMAP supports offmode */ + .save_context = 1, + .restore_context = 1, };static u64 musb_dmamask =DMA_BIT_MASK (32 );@@ -80,6 +89,7 @@ void __init usb_musb_init(struct omap_muconst char *oh_name ="usb_otg_hs" ;struct musb_hdrc_platform_data *pdata; + core_pwrdm =pwrdm_lookup ("per_pwrdm" ); oh =omap_hwmod_lookup (oh_name);if (!oh) {@@ -97,6 +107,7 @@ void __init usb_musb_init(struct omap_mu musb_plat.extvbus = board_data->extvbus; pdata = &musb_plat; + oh_p = oh; od = omap_device_build(name, bus_id, oh, pdata, sizeof(struct musb_hdrc_platform_data),@@ -115,8 +126,101 @@ void __init usb_musb_init(struct omap_muput_device (dev); } +void musb_prepare_for_idle () +{ +int core_next_state; +struct omap_hwmod *oh = oh_p; +struct omap_device *od; +struct platform_device *pdev; +struct musb_hdrc_platform_data *pdata; +struct device *dev; + +if (!core_pwrdm) +return ; + + core_next_state =pwrdm_read_next_pwrst (core_pwrdm); +if (core_next_state >=PWRDM_POWER_INACTIVE ) +return ; +if (!oh) +return ; + + od = oh->od;
arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(struct omap_mu · line 157
Quoted 10 lines
arch/arm/mach-omap2/usb-musb.c +10
-0+ pdev = &od->pdev; + +if (!pdev) +return ; + dev = &pdev->dev; + +if (dev->driver) { + pdata = dev->platform_data; + +if (pdata->is_usb_active)
Don't you need a start brace here?
Also a tab is required if this if condition is under if (dev->driver)
Quoted 35 lines
arch/arm/mach-omap2/usb-musb.c +35
-0+if (!pdata->is_usb_active (dev)) { +if (core_next_state ==PWRDM_POWER_OFF ) { + pdata->save_context =1 ; +pm_runtime_put_sync (dev); + }else if (core_next_state ==PWRDM_POWER_RET ) { + pdata->save_context =0 ; +pm_runtime_put_sync (dev); + } + } + } +} + +void musb_wakeup_from_idle () +{ +int core_next_state; +int core_prev_state; +struct omap_hwmod *oh = oh_p; +struct omap_device *od; +struct platform_device *pdev; +struct device *dev; +struct musb_hdrc_platform_data *pdata; + +if (!core_pwrdm) +return ; + + core_next_state =pwrdm_read_next_pwrst (core_pwrdm); + +if (core_next_state >=PWRDM_POWER_INACTIVE ) +return ; + core_prev_state =pwrdm_read_prev_pwrst (core_pwrdm); + +if (!oh) +return ; + od = oh->od; + pdev = &od->pdev;
arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(struct omap_mu · line 202
Quoted 10 lines
arch/arm/mach-omap2/usb-musb.c +10
-0+ +if (!pdev) +return ; + + dev = &pdev->dev; + +if (dev->driver) { + pdata = dev->platform_data; + +if (pdata->is_usb_active)
Braces needed for this if condition?
arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(struct omap_mu · line 213
Quoted 11 lines
arch/arm/mach-omap2/usb-musb.c +11
-0+if (!pdata->is_usb_active (dev)) { +if (core_prev_state ==PWRDM_POWER_OFF ) { + pdata->restore_context =1 ; +pm_runtime_get_sync (dev); + }else { + pdata->restore_context =0 ; +pm_runtime_get_sync (dev); + } + } + } +}
Regards,
Maulik
A message that is not in the archive (sent off-list or not yet received): CE25F9D2A56A423C84BED8BC132A07FB-wD+IZp/g4/[email protected]
Hello.
Quoted 31 lines · Maulik
Quoted 31 lines
-----Original Message-----
From: Hema HK [mailto:[email protected]]
Sent: Thursday, September 23, 2010 6:01 AM
To: [email protected]; [email protected]
Cc: Hema HK; Maulik Mankad; Felipe Balbi; Tony Lindgren; Kevin Hilman;
Cousson, Benoit; Paul Walmsley
Subject: [PATCH 9/9 v3] usb : musb: Offmode fix for idle pathWith OMAP core-off support musb was not functional as context was getting lost after wakeup from core-off. And also musb was blocking the core-off after loading the gadget driver even with no cable connected sometimes.
Added the idle and wakeup APIs in the platform layer which will be called in the idle and wakeup path.
Used the
pm_runtime_put_syscAPI to configure the
musb to force idle/standby modes, saving the context and disable the clk in
while idling if there is no activity on the usb bus.Used the
pm_runtime_get_syncAPI to configure the musb to no idle/standby modes, enable the clock and restore the context after wakeup when there is no activity on the usb bus.Signed-off-by Hema HK<[email protected]>Signed-off-by Maulik Mankad<[email protected]>Cc Felipe Balbi<[email protected]>Cc Tony Lindgren<[email protected]>Cc Kevin Hilman<[email protected]>Cc Cousson, Benoit<[email protected]>Cc Paul Walmsley<[email protected]>
[...]
Quoted 4 lines
Quoted 4 lines
Index:
linux-omap-pm/arch/arm/mach-omap2/usb-musb.c
===================================================================arch/arm/mach-omap2/usb-musb.c +0
-0
[...]
Quoted 27 lines
Quoted 27 lines
arch/arm/mach-omap2/usb-musb.c +23
-0@@ -115,8 +126,101 @@ void __init usb_musb_init(struct omap_muput_device (dev); } +void musb_prepare_for_idle () +{ +int core_next_state; +struct omap_hwmod *oh = oh_p; +struct omap_device *od; +struct platform_device *pdev; +struct musb_hdrc_platform_data *pdata; +struct device *dev; + +if (!core_pwrdm) +return ; + + core_next_state =pwrdm_read_next_pwrst (core_pwrdm); +if (core_next_state>=PWRDM_POWER_INACTIVE ) +return ; +if (!oh) +return ; + + od = oh->od; + pdev =&od->pdev; + +if (!pdev) +return ;
Quoted 8 lines
arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(struct omap_mu · line 157
Quoted 6 lines
arch/arm/mach-omap2/usb-musb.c +6
-0+ dev =&pdev->dev; + +if (dev->driver) { + pdata = dev->platform_data; + +if (pdata->is_usb_active)Don't you need a start brace here?
No if the *if* only embraces one statement as here. But the next *if* can
be collapsed into this one.
Quoted 1 line
Also a tab is required if this if condition is under if (
dev->driver)
Yeah.
Quoted 1 line
arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(struct omap_mu · line 158
Quoted 1 line
arch/arm/mach-omap2/usb-musb.c +1
-0+if (!pdata->is_usb_active (dev)) {
Brace not necessary.
Quoted 38 lines
Quoted 38 lines
arch/arm/mach-omap2/usb-musb.c +38
-0+if (core_next_state ==PWRDM_POWER_OFF ) { + pdata->save_context =1 ; +pm_runtime_put_sync (dev); + }else if (core_next_state ==PWRDM_POWER_RET ) { + pdata->save_context =0 ; +pm_runtime_put_sync (dev); + } + } + } +} + +void musb_wakeup_from_idle () +{ +int core_next_state; +int core_prev_state; +struct omap_hwmod *oh = oh_p; +struct omap_device *od; +struct platform_device *pdev; +struct device *dev; +struct musb_hdrc_platform_data *pdata; + +if (!core_pwrdm) +return ; + + core_next_state =pwrdm_read_next_pwrst (core_pwrdm); + +if (core_next_state>=PWRDM_POWER_INACTIVE ) +return ; + core_prev_state =pwrdm_read_prev_pwrst (core_pwrdm); + +if (!oh) +return ; + od = oh->od; + pdev =&od->pdev; + +if (!pdev) +return ; +
Quoted 8 lines
arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(struct omap_mu · line 157
Quoted 6 lines
arch/arm/mach-omap2/usb-musb.c +6
-0+ dev =&pdev->dev; + +if (dev->driver) { + pdata = dev->platform_data; + +if (pdata->is_usb_active)Braces needed for this if condition?
No. But the next *if* can be collapsed into the previous.
Quoted 11 lines
arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(struct omap_mu · line 213
Quoted 11 lines
arch/arm/mach-omap2/usb-musb.c +11
-0+if (!pdata->is_usb_active (dev)) { +if (core_prev_state ==PWRDM_POWER_OFF ) { + pdata->restore_context =1 ; +pm_runtime_get_sync (dev); + }else { + pdata->restore_context =0 ; +pm_runtime_get_sync (dev); + } + } + } +}
WBR, Sergei
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): 1285201846-26599-1-git-send-email-hemahk-l0cyMroinI0@public.gmane.org
Hi,
Quoted 8 lines · Hema
With OMAP core-off support musb was not functional as context was getting lost after wakeup from core-off. And also musb was blocking the core-off after loading the gadget driver even with no cable connected sometimes.
Added the idle and wakeup APIs in the platform layer which will be called in the idle and wakeup path.
Used the
pm_runtime_put_syscAPI to configure the
pm_runtime_put_sync(), typo.
Quoted 2 lines
musb to force idle/standby modes, saving the context and disable the clk in while idling if there is no activity on the usb bus.
this part is a bit fuzzy, care to re-phrase ?
Quoted 98 lines
Used the
pm_runtime_get_syncAPI to configure the musb to no idle/standby modes, enable the clock and restore the context after wakeup when there is no activity on the usb bus.Signed-off-by Hema HK <[email protected]>Signed-off-by Maulik Mankad <[email protected]>Cc Felipe Balbi <[email protected]>Cc Tony Lindgren <[email protected]>Cc Kevin Hilman <[email protected]>Cc Cousson, Benoit <[email protected]>Cc Paul Walmsley <[email protected]>---
arch/arm/mach-omap2/cpuidle34xx.c | 1 arch/arm/mach-omap2/pm34xx.c | 3 arch/arm/mach-omap2/usb-musb.c | 107 ++++++++++++++++++++++++++++++++++ arch/arm/plat-omap/include/plat/usb.h | 2 drivers/usb/musb/musb_core.c | 15 ++++ drivers/usb/musb/omap2430.c | 14 ++++ include/linux/usb/musb.h | 9 ++ 7 files changed, 149 insertions(+), 2 deletions(-)Index:
linux-omap-pm/arch/arm/mach-omap2/cpuidle34xx.c
===================================================================arch/arm/mach-omap2/cpuidle34xx.c +1
-0@@ -31,6 +31,7 @@#include <plat/clockdomain.h> #include <plat/control.h> #include <plat/serial.h> +#include <plat/usb.h> #include "pm.h" Index:
linux-omap-pm/arch/arm/mach-omap2/pm34xx.c
===================================================================arch/arm/mach-omap2/pm34xx.c +3
-0@@ -38,6 +38,7 @@#include <plat/prcm.h> #include <plat/gpmc.h> #include <plat/dma.h> +#include <plat/usb.h> #include <asm/tlbflush.h> @@ -324,11 +325,13 @@ static void restore_table_entry(void)void omap3_device_idle (void ) {omap2_gpio_prepare_for_idle (); +musb_prepare_for_idle (); }void omap3_device_resume (void ) {omap2_gpio_resume_after_idle (); +musb_wakeup_from_idle (); }void omap_sram_idle (void )Index:
linux-omap-pm/arch/arm/mach-omap2/usb-musb.c
===================================================================arch/arm/mach-omap2/usb-musb.c +9
-0@@ -25,16 +25,21 @@#include <linux/io.h> #include <linux/usb/musb.h> +#include <linux/pm_runtime.h> #include <mach/hardware.h> #include <mach/irqs.h> #include <plat/usb.h> #include <plat/omap_device.h> +#include <plat/powerdomain.h> #ifdef CONFIG_USB_MUSB_SOC static const char name[] ="musb_hdrc" ;#define MAX_OMAP_MUSB_HWMOD_NAME_LEN 16 +struct omap_hwmod *oh_p; +static struct powerdomain *core_pwrdm; +static struct musb_hdrc_config musb_config = { .multipoint =1 , .dyn_fifo = 1,@@ -58,6 +63,10 @@ static struct musb_hdrc_platform_data mu* "mode", and should be passed to usb_musb_init(). */ .power = 50, /* up to 100 mA */ + +/* OMAP supports offmode */ + .save_context = 1, + .restore_context = 1, };static u64 musb_dmamask =DMA_BIT_MASK (32 );
arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(struct omap_mu · line 92
Quoted 4 lines
arch/arm/mach-omap2/usb-musb.c +1
-0@@ -80,6 +89,7 @@ void __init usb_musb_init(struct omap_muconst char *oh_name ="usb_otg_hs" ;struct musb_hdrc_platform_data *pdata; + core_pwrdm =pwrdm_lookup ("per_pwrdm" );
per or core ???
Quoted 31 lines
arch/arm/mach-omap2/usb-musb.c +20
-0@@ -97,6 +107,7 @@ void __init usb_musb_init(struct omap_mu musb_plat.extvbus = board_data->extvbus; pdata = &musb_plat; + oh_p = oh; od = omap_device_build(name, bus_id, oh, pdata, sizeof(struct musb_hdrc_platform_data),@@ -115,8 +126,101 @@ void __init usb_musb_init(struct omap_muput_device (dev); } +void musb_prepare_for_idle () +{ +int core_next_state; +struct omap_hwmod *oh = oh_p; +struct omap_device *od; +struct platform_device *pdev; +struct musb_hdrc_platform_data *pdata; +struct device *dev; + +if (!core_pwrdm) +return ; + + core_next_state =pwrdm_read_next_pwrst (core_pwrdm); +if (core_next_state >=PWRDM_POWER_INACTIVE ) +return ; +if (!oh) +return ; + + od = oh->od;
arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(struct omap_mu · line 157
Quoted 10 lines
arch/arm/mach-omap2/usb-musb.c +10
-0+ pdev = &od->pdev; + +if (!pdev) +return ; + dev = &pdev->dev; + +if (dev->driver) { + pdata = dev->platform_data; + +if (pdata->is_usb_active)
indentation is wrong. And you can save some of it:
if (!dev->driver)
return;
pdata = dev->platform_data;
if (!pdata->is_usb_active)
return;
if (!pdata->is_usb_active(dev)) {
switch (core_next_state) {
case PWRDM_POWER_OFF:
pdata->save_context = 1;
pm_runtime_put_sync(dev);
break;
case PWRDM_POWER_RET:
pdata->save_context = 0;
pm_runtime_put_sync(dev);
break;
default:
pr_debug("what ??\n");
}
}Quoted 13 lines
Index:
linux-omap-pm/drivers/usb/musb/musb_core.c
===================================================================drivers/usb/musb/musb_core.c +1
-0@@ -2410,6 +2410,7 @@ static int musb_suspend(struct device *dstruct platform_device *pdev =to_platform_device (dev);unsigned long flags;struct musb *musb =dev_to_musb (&pdev->dev); +struct musb_hdrc_platform_data *plat = dev->platform_data;if (!musb->clock)return 0 ;
drivers/usb/musb/musb_core.c static int musb_suspend(struct device *d · line 2431
Quoted 6 lines
drivers/usb/musb/musb_core.c +3
-0@@ -2425,6 +2426,9 @@ static int musb_suspend(struct device *d* they will even be wakeup-enabled. */ } + +if (plat->save_context) + plat->save_context =1 ;
what ??
if plat->save_context is 1, then set it to 1 ???
drivers/usb/musb/musb_core.c static int musb_resume_noirq(struct devi · line 2449
Quoted 4 lines
drivers/usb/musb/musb_core.c +0
-0@@ -2443,10 +2447,13 @@ static int musb_resume_noirq(struct devi {struct platform_device *pdev =to_platform_device (dev);struct musb *musb =dev_to_musb (&pdev->dev);
just now I notice these, hah, funny :-p pdev isn't even needed. Has been there for quite a while I believe.
Commit 48fea965 should have changed that line, but that's ok, we will clean it later.
drivers/usb/musb/musb_core.c static int musb_resume_noirq(struct devi · line 2456
Quoted 7 lines
drivers/usb/musb/musb_core.c +3
-0+struct musb_hdrc_platform_data *plat = dev->platform_data;if (!musb->clock)return 0 ; +if (plat->restore_context) + plat->restore_context =1 ;
also here?? there's something wrong.
drivers/usb/musb/musb_core.c static int musb_resume_noirq(struct devi · line 2481
Quoted 9 lines
drivers/usb/musb/musb_core.c +3
-1@@ -2468,16 +2475,20 @@ static int musb_resume_noirq(struct devistatic int musb_runtime_suspend (struct device *dev) {struct musb *musb =dev_to_musb (dev); +struct musb_hdrc_platform_data *plat = dev->platform_data; -musb_save_context (musb); +if (plat->save_context) +musb_save_context (musb);
this looks better.
drivers/usb/musb/musb_core.c struct musb_hdrc_platform_data { · line 133
Quoted 7 lines
drivers/usb/musb/musb_core.c +3
-0@@ -126,6 +128,17 @@ struct musb_hdrc_platform_data {/* Architecture specific board data */ void *board_data; + +/* check usb device active state*/ +int (*is_usb_active)(struct device *dev);
where is it used ??
Signature · 5 lines
balbi -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi again,
Quoted 9 lines · Felipe
include/linux/usb/musb.h struct musb_hdrc_platform_data { · line 133
Quoted 7 lines
include/linux/usb/musb.h +3
-0@@ -126,6 +128,17 @@ struct musb_hdrc_platform_data {/* Architecture specific board data */ void *board_data; + +/* check usb device active state*/ +int (*is_usb_active)(struct device *dev);where is it used ??
sorry, now I see, I was searching for is_musb_active (the name of the function :-)
Signature · 1 line
balbi
Hi,
Quoted 24 lines
-----Original Message-----
From: Balbi, Felipe
Sent: Thursday, September 23, 2010 12:19 PM
To: Kalliguddi, Hema
Cc: [email protected]; [email protected]; Mankad, Maulik Ojas; Balbi, Felipe; Tony Lindgren; Kevin Hilman; Cousson, Benoit; Paul Walmsley
Subject: Re: [PATCH 9/9 v3] usb : musb: Offmode fix for idle pathHi,
Quoted 1 line · Hema
With OMAP core-off support musb was not functional as context
was getting
Quoted 1 line
lost after wakeup from core-off. And also musb was blocking
the core-off
Quoted 1 line
after loading the gadget driver even with no cable connected
sometimes.
Quoted 5 lines
Added the idle and wakeup APIs in the platform layer which will be called in the idle and wakeup path.
Used the
pm_runtime_put_syscAPI to configure the
Quoted 8 lines
pm_runtime_put_sync(), typo.Quoted 1 line
musb to force idle/standby modes, saving the context and
disable the clk in
Quoted 1 line
while idling if there is no activity on the usb bus.
this part is a bit fuzzy, care to re-phrase ?
Ok. I will re-phrase it.
Quoted 97 lines
Quoted 12 lines
Used the
pm_runtime_get_syncAPI to configure the musb to no idle/standby modes, enable the clock and restore the context after wakeup when there is no activity on the usb bus.Signed-off-by Hema HK <[email protected]>Signed-off-by Maulik Mankad <[email protected]>Cc Felipe Balbi <[email protected]>Cc Tony Lindgren <[email protected]>Cc Kevin Hilman <[email protected]>Cc Cousson, Benoit <[email protected]>Cc Paul Walmsley <[email protected]>Quoted 4 lines
---
arch/arm/mach-omap2/cpuidle34xx.c | 1 arch/arm/mach-omap2/pm34xx.c | 3 arch/arm/mach-omap2/usb-musb.c | 107++++++++++++++++++++++++++++++++++
Quoted 80 lines
arch/arm/plat-omap/include/plat/usb.h | 2 drivers/usb/musb/musb_core.c | 15 ++++ drivers/usb/musb/omap2430.c | 14 ++++ include/linux/usb/musb.h | 9 ++ 7 files changed, 149 insertions(+), 2 deletions(-)Index:
linux-omap-pm/arch/arm/mach-omap2/cpuidle34xx.c
===================================================================arch/arm/mach-omap2/cpuidle34xx.c +1
-0@@ -31,6 +31,7 @@#include <plat/clockdomain.h> #include <plat/control.h> #include <plat/serial.h> +#include <plat/usb.h> #include "pm.h" Index:
linux-omap-pm/arch/arm/mach-omap2/pm34xx.c
===================================================================arch/arm/mach-omap2/pm34xx.c +3
-0@@ -38,6 +38,7 @@#include <plat/prcm.h> #include <plat/gpmc.h> #include <plat/dma.h> +#include <plat/usb.h> #include <asm/tlbflush.h> @@ -324,11 +325,13 @@ static void restore_table_entry(void)void omap3_device_idle (void ) {omap2_gpio_prepare_for_idle (); +musb_prepare_for_idle (); }void omap3_device_resume (void ) {omap2_gpio_resume_after_idle (); +musb_wakeup_from_idle (); }void omap_sram_idle (void )Index:
linux-omap-pm/arch/arm/mach-omap2/usb-musb.c
===================================================================arch/arm/mach-omap2/usb-musb.c +9
-0@@ -25,16 +25,21 @@#include <linux/io.h> #include <linux/usb/musb.h> +#include <linux/pm_runtime.h> #include <mach/hardware.h> #include <mach/irqs.h> #include <plat/usb.h> #include <plat/omap_device.h> +#include <plat/powerdomain.h> #ifdef CONFIG_USB_MUSB_SOC static const char name[] ="musb_hdrc" ;#define MAX_OMAP_MUSB_HWMOD_NAME_LEN 16 +struct omap_hwmod *oh_p; +static struct powerdomain *core_pwrdm; +static struct musb_hdrc_config musb_config = { .multipoint =1 , .dyn_fifo = 1,@@ -58,6 +63,10 @@ static struct musb_hdrc_platform_data mu* "mode", and should be passed to usb_musb_init(). */ .power = 50, /* up to 100 mA */ + +/* OMAP supports offmode */ + .save_context = 1, + .restore_context = 1, };
Quoted 9 lines
arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(struct omap_mu · line 92
Quoted 6 lines
arch/arm/mach-omap2/usb-musb.c +1
-0static u64 musb_dmamask =DMA_BIT_MASK (32 );@@ -80,6 +89,7 @@ void __init usb_musb_init(struct omap_muconst char *oh_name ="usb_otg_hs" ;struct musb_hdrc_platform_data *pdata; + core_pwrdm =pwrdm_lookup ("per_pwrdm" );per or core ???
Oh! It should be core. Now I understand why save/restore counts were not matching with Core-off counts.
Thanks for pointing this out.
Quoted 35 lines
Quoted 35 lines
arch/arm/mach-omap2/usb-musb.c +24
-0@@ -97,6 +107,7 @@ void __init usb_musb_init(struct omap_mu musb_plat.extvbus = board_data->extvbus; pdata = &musb_plat; + oh_p = oh; od = omap_device_build(name, bus_id, oh, pdata, sizeof(struct musb_hdrc_platform_data),@@ -115,8 +126,101 @@ void __init usb_musb_init(struct omap_muput_device (dev); } +void musb_prepare_for_idle () +{ +int core_next_state; +struct omap_hwmod *oh = oh_p; +struct omap_device *od; +struct platform_device *pdev; +struct musb_hdrc_platform_data *pdata; +struct device *dev; + +if (!core_pwrdm) +return ; + + core_next_state =pwrdm_read_next_pwrst (core_pwrdm); +if (core_next_state >=PWRDM_POWER_INACTIVE ) +return ; +if (!oh) +return ; + + od = oh->od; + pdev = &od->pdev; + +if (!pdev) +return ;
Quoted 8 lines
arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(struct omap_mu · line 157
Quoted 6 lines
arch/arm/mach-omap2/usb-musb.c +6
-0+ dev = &pdev->dev; + +if (dev->driver) { + pdata = dev->platform_data; + +if (pdata->is_usb_active)indentation is wrong. And you can save some of it:
Maulik is pointed this out and I will fixing it.
Quoted 46 lines
if (!dev->driver) return; pdata = dev->platform_data; if (!pdata->is_usb_active) return; if (!pdata->is_usb_active(dev)) { switch (core_next_state) { case PWRDM_POWER_OFF: pdata->save_context = 1; pm_runtime_put_sync(dev); break; case PWRDM_POWER_RET: pdata->save_context = 0; pm_runtime_put_sync(dev); break; default: pr_debug("what ??\n"); } }Quoted 13 lines
Index:
linux-omap-pm/drivers/usb/musb/musb_core.c
===================================================================drivers/usb/musb/musb_core.c +1
-0@@ -2410,6 +2410,7 @@ static int musb_suspend(struct device *dstruct platform_device *pdev =to_platform_device (dev);unsigned long flags;struct musb *musb =dev_to_musb (&pdev->dev); +struct musb_hdrc_platform_data *plat = dev->platform_data;if (!musb->clock)return 0 ;drivers/usb/musb/musb_core.c static int musb_suspend(struct device *d · line 2431
Quoted 6 lines
drivers/usb/musb/musb_core.c +3
-0@@ -2425,6 +2426,9 @@ static int musb_suspend(struct device *d* they will even be wakeup-enabled. */ } + +if (plat->save_context) + plat->save_context =1 ;what ??
Quoted 2 lines
if
plat->save_contextis 1, then set it to 1 ???
This is mistake. I messed it up. I had another flag for offmode support, which I removed later. i will correct this.
Quoted 9 lines
drivers/usb/musb/musb_core.c static int musb_resume_noirq(struct devi · line 2449
Quoted 4 lines
drivers/usb/musb/musb_core.c +0
-0@@ -2443,10 +2447,13 @@ static int musb_resume_noirq(struct devi {struct platform_device *pdev =to_platform_device (dev);struct musb *musb =dev_to_musb (&pdev->dev);just now I notice these, hah, funny :-p pdev isn't even needed. Has been
there for quite a while I believe.
Quoted 3 lines
Commit
48fea965should have changed that line, but that's ok, we will clean it later.
Yehh :-)
If it is OK, I can clean it up with this patch only.
Quoted 10 lines
drivers/usb/musb/musb_core.c static int musb_resume_noirq(struct devi · line 2456
Quoted 7 lines
drivers/usb/musb/musb_core.c +3
-0+struct musb_hdrc_platform_data *plat = dev->platform_data;if (!musb->clock)return 0 ; +if (plat->restore_context) + plat->restore_context =1 ;also here?? there's something wrong.
Yes...
Quoted 14 lines
drivers/usb/musb/musb_core.c static int musb_resume_noirq(struct devi · line 2481
Quoted 9 lines
drivers/usb/musb/musb_core.c +3
-1@@ -2468,16 +2475,20 @@ static int musb_resume_noirq(struct devistatic int musb_runtime_suspend (struct device *dev) {struct musb *musb =dev_to_musb (dev); +struct musb_hdrc_platform_data *plat = dev->platform_data; -musb_save_context (musb); +if (plat->save_context) +musb_save_context (musb);this looks better.
Quoted 2 lines
drivers/usb/musb/musb_core.c +0
-0@@ -126,6 +128,17 @@ struct musb_hdrc_platform_data {
Quoted 8 lines
drivers/usb/musb/musb_core.c struct musb_hdrc_platform_data { · line 133
Quoted 5 lines
drivers/usb/musb/musb_core.c +3
-0/* Architecture specific board data */ void *board_data; + +/* check usb device active state*/ +int (*is_usb_active)(struct device *dev);where is it used ??
This you got it already.
Quoted 3 lines
Signature · 1 line
balbi
A message that is not in the archive (sent off-list or not yet received): E0D41E29EB0DAC4E9F3FF173962E9E94027863D9EB-/tLxBxkBPtCIQmiDNMet8wC/[email protected]
Hi,
Quoted 3 lines · Hema
Oh! It should be core. Now I understand why save/restore counts were not matching with Core-off counts.
Thanks for pointing this out.
ok, please be more careful next time, we could have committed without noticing this :-)
Quoted 5 lines
Quoted 2 lines
if
plat->save_contextis 1, then set it to 1 ???This is mistake. I messed it up. I had another flag for offmode support, which I removed later. i will correct this.
ok.
Quoted 9 lines
Quoted 9 lines
drivers/usb/musb/musb_core.c static int musb_resume_noirq(struct devi · line 2449
Quoted 4 lines
drivers/usb/musb/musb_core.c +0
-0@@ -2443,10 +2447,13 @@ static int musb_resume_noirq(struct devi {struct platform_device *pdev =to_platform_device (dev);struct musb *musb =dev_to_musb (&pdev->dev);just now I notice these, hah, funny :-p pdev isn't even needed. Has been
there for quite a while I believe.
Quoted 5 lines
Quoted 3 lines
Commit
48fea965should have changed that line, but that's ok, we will clean it later.Yehh :-)
If it is OK, I can clean it up with this patch only.
nope, it's not part of this patch. leave it as is for now.
Signature · 5 lines
balbi -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Kevin,
Quoted 148 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Kalliguddi, Hema
Sent: Thursday, September 23, 2010 1:29 PM
To: Balbi, Felipe
Cc: [email protected]; [email protected]; Mankad, Maulik Ojas; Tony Lindgren; Kevin Hilman; Cousson, Benoit; Paul Walmsley
Subject: RE: [PATCH 9/9 v3] usb : musb: Offmode fix for idle pathHi,
Quoted 24 lines
-----Original Message-----
From: Balbi, Felipe
Sent: Thursday, September 23, 2010 12:19 PM
To: Kalliguddi, Hema
Cc: [email protected]; [email protected]; Mankad, Maulik Ojas; Balbi, Felipe; Tony Lindgren; Kevin Hilman; Cousson, Benoit; Paul Walmsley
Subject: Re: [PATCH 9/9 v3] usb : musb: Offmode fix for idle pathHi,
Quoted 1 line · Hema
With OMAP core-off support musb was not functional as context
was getting
Quoted 1 line
lost after wakeup from core-off. And also musb was blocking
the core-off
Quoted 1 line
after loading the gadget driver even with no cable connected
sometimes.
Quoted 5 lines
Added the idle and wakeup APIs in the platform layer which will be called in the idle and wakeup path.
Used the
pm_runtime_put_syscAPI to configure theQuoted 8 lines
pm_runtime_put_sync(), typo.Quoted 1 line
musb to force idle/standby modes, saving the context and
disable the clk in
Quoted 1 line
while idling if there is no activity on the usb bus.
this part is a bit fuzzy, care to re-phrase ?
Ok. I will re-phrase it.
Quoted 102 lines
Quoted 12 lines
Used the
pm_runtime_get_syncAPI to configure the musb to no idle/standby modes, enable the clock and restore the context after wakeup when there is no activity on the usb bus.Signed-off-by Hema HK <[email protected]>Signed-off-by Maulik Mankad <[email protected]>Cc Felipe Balbi <[email protected]>Cc Tony Lindgren <[email protected]>Cc Kevin Hilman <[email protected]>Cc Cousson, Benoit <[email protected]>Cc Paul Walmsley <[email protected]>Quoted 4 lines
---
arch/arm/mach-omap2/cpuidle34xx.c | 1 arch/arm/mach-omap2/pm34xx.c | 3 arch/arm/mach-omap2/usb-musb.c | 107++++++++++++++++++++++++++++++++++
Quoted 85 lines
arch/arm/plat-omap/include/plat/usb.h | 2 drivers/usb/musb/musb_core.c | 15 ++++ drivers/usb/musb/omap2430.c | 14 ++++ include/linux/usb/musb.h | 9 ++ 7 files changed, 149 insertions(+), 2 deletions(-)Index:
linux-omap-pm/arch/arm/mach-omap2/cpuidle34xx.c
===================================================================arch/arm/mach-omap2/cpuidle34xx.c +1
-0@@ -31,6 +31,7 @@#include <plat/clockdomain.h> #include <plat/control.h> #include <plat/serial.h> +#include <plat/usb.h> #include "pm.h" Index:
linux-omap-pm/arch/arm/mach-omap2/pm34xx.c
===================================================================arch/arm/mach-omap2/pm34xx.c +3
-0@@ -38,6 +38,7 @@#include <plat/prcm.h> #include <plat/gpmc.h> #include <plat/dma.h> +#include <plat/usb.h> #include <asm/tlbflush.h> @@ -324,11 +325,13 @@ static void restore_table_entry(void)void omap3_device_idle (void ) {omap2_gpio_prepare_for_idle (); +musb_prepare_for_idle (); }void omap3_device_resume (void ) {omap2_gpio_resume_after_idle (); +musb_wakeup_from_idle (); }void omap_sram_idle (void )Index:
linux-omap-pm/arch/arm/mach-omap2/usb-musb.c
===================================================================arch/arm/mach-omap2/usb-musb.c +9
-0@@ -25,16 +25,21 @@#include <linux/io.h> #include <linux/usb/musb.h> +#include <linux/pm_runtime.h> #include <mach/hardware.h> #include <mach/irqs.h> #include <plat/usb.h> #include <plat/omap_device.h> +#include <plat/powerdomain.h> #ifdef CONFIG_USB_MUSB_SOC static const char name[] ="musb_hdrc" ;#define MAX_OMAP_MUSB_HWMOD_NAME_LEN 16 +struct omap_hwmod *oh_p; +static struct powerdomain *core_pwrdm; +static struct musb_hdrc_config musb_config = { .multipoint =1 , .dyn_fifo = 1,@@ -58,6 +63,10 @@ static struct musb_hdrc_platform_data mu* "mode", and should be passed to usb_musb_init(). */ .power = 50, /* up to 100 mA */ + +/* OMAP supports offmode */ + .save_context = 1, + .restore_context = 1, };static u64 musb_dmamask =DMA_BIT_MASK (32 );@@ -80,6 +89,7 @@ void __init usb_musb_init(struct omap_muconst char *oh_name ="usb_otg_hs" ;struct musb_hdrc_platform_data *pdata;
Quoted 8 lines
Quoted 4 lines
arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(struct omap_mu · line 92
Quoted 1 line
arch/arm/mach-omap2/usb-musb.c +1
-0+ core_pwrdm =pwrdm_lookup ("per_pwrdm" );per or core ???
Oh! It should be core. Now I understand why save/restore counts were not matching with
Core-off counts.
Thanks for pointing this out.
If I call pm_runtime_put_sync and pm_runtime_get_sync based on the core domain state then the USB connect/reset interrupt is not triggered once the core hits off.
In omap3_enter_idle_bm() there is no core next state being programmed to PRCM register, but the drivers functions which are called from omap3_device_idle are suppose to read the core next state from the PRCM register.
I am missing something here?
If I use the per_pwrdm states to save the context and restore everything works fine.
Quoted 155 lines
Quoted 36 lines
Quoted 36 lines
arch/arm/mach-omap2/usb-musb.c +24
-0@@ -97,6 +107,7 @@ void __init usb_musb_init(struct omap_mu musb_plat.extvbus = board_data->extvbus; pdata = &musb_plat; + oh_p = oh; od = omap_device_build(name, bus_id, oh, pdata, sizeof(struct musb_hdrc_platform_data),@@ -115,8 +126,101 @@ void __init usb_musb_init(struct omap_muput_device (dev); } +void musb_prepare_for_idle () +{ +int core_next_state; +struct omap_hwmod *oh = oh_p; +struct omap_device *od; +struct platform_device *pdev; +struct musb_hdrc_platform_data *pdata; +struct device *dev; + +if (!core_pwrdm) +return ; + + core_next_state =pwrdm_read_next_pwrst (core_pwrdm); +if (core_next_state >=PWRDM_POWER_INACTIVE ) +return ; +if (!oh) +return ; + + od = oh->od; + pdev = &od->pdev; + +if (!pdev) +return ;Quoted 8 lines
arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(struct omap_mu · line 157
Quoted 6 lines
arch/arm/mach-omap2/usb-musb.c +6
-0+ dev = &pdev->dev; + +if (dev->driver) { + pdata = dev->platform_data; + +if (pdata->is_usb_active)indentation is wrong. And you can save some of it:
Maulik is pointed this out and I will fixing it.
Quoted 46 lines
if (!dev->driver) return; pdata = dev->platform_data; if (!pdata->is_usb_active) return; if (!pdata->is_usb_active(dev)) { switch (core_next_state) { case PWRDM_POWER_OFF: pdata->save_context = 1; pm_runtime_put_sync(dev); break; case PWRDM_POWER_RET: pdata->save_context = 0; pm_runtime_put_sync(dev); break; default: pr_debug("what ??\n"); } }Quoted 13 lines
Index:
linux-omap-pm/drivers/usb/musb/musb_core.c
===================================================================drivers/usb/musb/musb_core.c +1
-0@@ -2410,6 +2410,7 @@ static int musb_suspend(struct device *dstruct platform_device *pdev =to_platform_device (dev);unsigned long flags;struct musb *musb =dev_to_musb (&pdev->dev); +struct musb_hdrc_platform_data *plat = dev->platform_data;if (!musb->clock)return 0 ;drivers/usb/musb/musb_core.c static int musb_suspend(struct device *d · line 2431
Quoted 6 lines
drivers/usb/musb/musb_core.c +3
-0@@ -2425,6 +2426,9 @@ static int musb_suspend(struct device *d* they will even be wakeup-enabled. */ } + +if (plat->save_context) + plat->save_context =1 ;what ??
Quoted 2 lines
if
plat->save_contextis 1, then set it to 1 ???This is mistake. I messed it up. I had another flag for offmode support, which I removed later. i will correct this.
Quoted 9 lines
drivers/usb/musb/musb_core.c static int musb_resume_noirq(struct devi · line 2449
Quoted 4 lines
drivers/usb/musb/musb_core.c +0
-0@@ -2443,10 +2447,13 @@ static int musb_resume_noirq(struct devi {struct platform_device *pdev =to_platform_device (dev);struct musb *musb =dev_to_musb (&pdev->dev);just now I notice these, hah, funny :-p pdev isn't even needed. Has been
there for quite a while I believe.Quoted 3 lines
Commit
48fea965should have changed that line, but that's ok, we will clean it later.Yehh :-)
If it is OK, I can clean it up with this patch only.Quoted 10 lines
drivers/usb/musb/musb_core.c static int musb_resume_noirq(struct devi · line 2456
Quoted 7 lines
drivers/usb/musb/musb_core.c +3
-0+struct musb_hdrc_platform_data *plat = dev->platform_data;if (!musb->clock)return 0 ; +if (plat->restore_context) + plat->restore_context =1 ;also here?? there's something wrong.
Yes...
Quoted 14 lines
drivers/usb/musb/musb_core.c static int musb_resume_noirq(struct devi · line 2481
Quoted 9 lines
drivers/usb/musb/musb_core.c +3
-1@@ -2468,16 +2475,20 @@ static int musb_resume_noirq(struct devistatic int musb_runtime_suspend (struct device *dev) {struct musb *musb =dev_to_musb (dev); +struct musb_hdrc_platform_data *plat = dev->platform_data; -musb_save_context (musb); +if (plat->save_context) +musb_save_context (musb);this looks better.
Quoted 2 lines
drivers/usb/musb/musb_core.c +0
-0@@ -126,6 +128,17 @@ struct musb_hdrc_platform_data {Quoted 8 lines
drivers/usb/musb/musb_core.c struct musb_hdrc_platform_data { · line 133
Quoted 5 lines
drivers/usb/musb/musb_core.c +3
-0/* Architecture specific board data */ void *board_data; + +/* check usb device active state*/ +int (*is_usb_active)(struct device *dev);where is it used ??
This you got it already.
Quoted 3 lines
Signature · 2 lines
balbi --To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
"Kalliguddi, Hema" <[email protected]> writes:
[...]
Quoted 15 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
static u64
musb_dmamask=DMA_BIT_MASK(32);(quoted diff) +0
-0@@ -80,6 +89,7 @@ void __init usb_musb_init(struct omap_mu const char *oh_name = "usb_otg_hs"; struct musb_hdrc_platform_data *pdata;Quoted 8 lines
Quoted 4 lines
Review void __init usb_musb_init(struct omap_mu · line 92
Quoted 1 line
(quoted diff) +1
-0+ core_pwrdm = pwrdm_lookup("per_pwrdm");per or core ???
Oh! It should be core. Now I understand why save/restore counts were not matching with
Core-off counts.
Thanks for pointing this out.
Quoted 8 lines
If I call
pm_runtime_put_syncandpm_runtime_get_syncbased on the core domain state then the USB connect/reset interrupt is not triggered once the core hits off.In
omap3_enter_idle_bm()there is no core next state being programmed to PRCM register,but the drivers functions which are called from
omap3_device_idleare suppose to read the core next state from the PRCM register.
I am missing something here?
Ah, this is indeed a big problem. Good catch.
Both the CORE and MPU states are programmed in omap3_enter_idle(), but that doesn't happen until after omap3_device_idle(). hmmm....
Quoted 1 line
If I use the
per_pwrdmstates to save the context and restore everything works fine.
Yes, because PER is programmed in omap3_enter_idle_bm() so it's available already in the registers.
I've updated my "idle reorg" series which creates omap3_device_idle &_resume (and enables interrupts in CPUidle.) I updated it to
not call omap3_device_idle until the MPU & CORE registers are programmed (diff below.) This is in my pm-wip/idle-reorg branch, which is based on pm-core.
Thanks,
Kevin
arch/arm/mach-omap2/cpuidle34xx.c +8 -4
@@ -125,14 +125,16 @@ static int omap3_enter_idle(struct cpuidle_device *dev, current_cx_state = *cx; -/* Used to keep track of the total time in idle */ -getnstimeofday (&ts_preidle); +pwrdm_set_next_pwrst (mpu_pd, mpu_state); +pwrdm_set_next_pwrst (core_pd, core_state); + +omap3_device_idle ();local_irq_disable ();local_fiq_disable (); -pwrdm_set_next_pwrst (mpu_pd, mpu_state); -pwrdm_set_next_pwrst (core_pd, core_state); +/* Used to keep track of the total time in idle */ +getnstimeofday (&ts_preidle);if (omap_irq_pending () ||need_resched ()) goto return_sleep_time;
@@ -157,6 +159,8 @@ return_sleep_time:local_irq_enable ();local_fiq_enable (); +omap3_device_resume (); +return ts_idle.tv_nsec /NSEC_PER_USEC + ts_idle.tv_sec *USEC_PER_SEC ; }
Quoted 2 lines · Hema HK
With OMAP core-off support musb was not functional as context was getting lost after wakeup from core-off.
This should be a separate patch.
Quoted 2 lines
And also musb was blocking the core-off after loading the gadget driver even with no cable connected sometimes.
this too
Quoted 2 lines
Added the idle and wakeup APIs in the platform layer which will be called in the idle and wakeup path.
And this errata fix should be a separate patch, with reference to the errata etc.
Quoted 3 lines
Used the
pm_runtime_put_syscAPI to configure the
musb to force idle/standby modes, saving the context and disable the clk in while idling if there is no activity on the usb bus.
Why? This should not be part of the idle path.
If there is no activity on the bus, why hasn't the musb driver already runtime suspended itself?
If the driver want's to runtime_suspend itself based on inactivity, it
should use an inactivity timer, not hook into the idle loop. The
runtime PM API has a function for a deferred suspend
int pm_schedule_suspend(struct device *dev, unsigned int delay)
The only thing in the idle loop in the current code is the errata fix, and even that I'm not sure I'm ready to merge.
I'd really like to see even the errata fix out of the idle
path. I wonder if usb-musb.c could create a periodic, deferrable timer
to fire that ensure that autoidle is disabled.
Quoted 3 lines
Used the
pm_runtime_get_syncAPI to configure the musb to no idle/standby modes, enable the clock and restore the context after wakeup when there is no activity on the usb bus.
Why would you wakeup MUSB in the idle path if there is no activity on the bus?
I don't understand the motiviation or these last two changes, and they are a departure from the behavior of the previous code.
At a minimum, they should be separated into a separate patch, and thoroughly described, including an answer to "why?"
Kevin
Quoted 346 lines
Signed-off-by Hema HK <[email protected]>Signed-off-by Maulik Mankad <[email protected]>Cc Felipe Balbi <[email protected]>Cc Tony Lindgren <[email protected]>Cc Kevin Hilman <[email protected]>Cc Cousson, Benoit <[email protected]>Cc Paul Walmsley <[email protected]>--- arch/arm/mach-omap2/cpuidle34xx.c | 1 arch/arm/mach-omap2/pm34xx.c | 3 arch/arm/mach-omap2/usb-musb.c | 107 ++++++++++++++++++++++++++++++++++ arch/arm/plat-omap/include/plat/usb.h | 2 drivers/usb/musb/musb_core.c | 15 ++++ drivers/usb/musb/omap2430.c | 14 ++++ include/linux/usb/musb.h | 9 ++ 7 files changed, 149 insertions(+), 2 deletions(-)Index:
linux-omap-pm/arch/arm/mach-omap2/cpuidle34xx.c
===================================================================arch/arm/mach-omap2/cpuidle34xx.c +1
-0@@ -31,6 +31,7 @@#include <plat/clockdomain.h> #include <plat/control.h> #include <plat/serial.h> +#include <plat/usb.h> #include "pm.h" Index:
linux-omap-pm/arch/arm/mach-omap2/pm34xx.c
===================================================================arch/arm/mach-omap2/pm34xx.c +3
-0@@ -38,6 +38,7 @@#include <plat/prcm.h> #include <plat/gpmc.h> #include <plat/dma.h> +#include <plat/usb.h> #include <asm/tlbflush.h> @@ -324,11 +325,13 @@ static void restore_table_entry(void)void omap3_device_idle (void ) {omap2_gpio_prepare_for_idle (); +musb_prepare_for_idle (); }void omap3_device_resume (void ) {omap2_gpio_resume_after_idle (); +musb_wakeup_from_idle (); }void omap_sram_idle (void )Index:
linux-omap-pm/arch/arm/mach-omap2/usb-musb.c
===================================================================arch/arm/mach-omap2/usb-musb.c +104
-0@@ -25,16 +25,21 @@#include <linux/io.h> #include <linux/usb/musb.h> +#include <linux/pm_runtime.h> #include <mach/hardware.h> #include <mach/irqs.h> #include <plat/usb.h> #include <plat/omap_device.h> +#include <plat/powerdomain.h> #ifdef CONFIG_USB_MUSB_SOC static const char name[] ="musb_hdrc" ;#define MAX_OMAP_MUSB_HWMOD_NAME_LEN 16 +struct omap_hwmod *oh_p; +static struct powerdomain *core_pwrdm; +static struct musb_hdrc_config musb_config = { .multipoint =1 , .dyn_fifo = 1,@@ -58,6 +63,10 @@ static struct musb_hdrc_platform_data mu* "mode", and should be passed to usb_musb_init(). */ .power = 50, /* up to 100 mA */ + +/* OMAP supports offmode */ + .save_context = 1, + .restore_context = 1, };static u64 musb_dmamask =DMA_BIT_MASK (32 );@@ -80,6 +89,7 @@ void __init usb_musb_init(struct omap_muconst char *oh_name ="usb_otg_hs" ;struct musb_hdrc_platform_data *pdata; + core_pwrdm =pwrdm_lookup ("per_pwrdm" ); oh =omap_hwmod_lookup (oh_name);if (!oh) {@@ -97,6 +107,7 @@ void __init usb_musb_init(struct omap_mu musb_plat.extvbus = board_data->extvbus; pdata = &musb_plat; + oh_p = oh; od = omap_device_build(name, bus_id, oh, pdata, sizeof(struct musb_hdrc_platform_data),@@ -115,8 +126,101 @@ void __init usb_musb_init(struct omap_muput_device (dev); } +void musb_prepare_for_idle () +{ +int core_next_state; +struct omap_hwmod *oh = oh_p; +struct omap_device *od; +struct platform_device *pdev; +struct musb_hdrc_platform_data *pdata; +struct device *dev; + +if (!core_pwrdm) +return ; + + core_next_state =pwrdm_read_next_pwrst (core_pwrdm); +if (core_next_state >=PWRDM_POWER_INACTIVE ) +return ; +if (!oh) +return ; + + od = oh->od; + pdev = &od->pdev; + +if (!pdev) +return ; + dev = &pdev->dev; + +if (dev->driver) { + pdata = dev->platform_data; + +if (pdata->is_usb_active) +if (!pdata->is_usb_active (dev)) { +if (core_next_state ==PWRDM_POWER_OFF ) { + pdata->save_context =1 ; +pm_runtime_put_sync (dev); + }else if (core_next_state ==PWRDM_POWER_RET ) { + pdata->save_context =0 ; +pm_runtime_put_sync (dev); + } + } + } +} + +void musb_wakeup_from_idle () +{ +int core_next_state; +int core_prev_state; +struct omap_hwmod *oh = oh_p; +struct omap_device *od; +struct platform_device *pdev; +struct device *dev; +struct musb_hdrc_platform_data *pdata; + +if (!core_pwrdm) +return ; + + core_next_state =pwrdm_read_next_pwrst (core_pwrdm); + +if (core_next_state >=PWRDM_POWER_INACTIVE ) +return ; + core_prev_state =pwrdm_read_prev_pwrst (core_pwrdm); + +if (!oh) +return ; + od = oh->od; + pdev = &od->pdev; + +if (!pdev) +return ; + + dev = &pdev->dev; + +if (dev->driver) { + pdata = dev->platform_data; + +if (pdata->is_usb_active) +if (!pdata->is_usb_active (dev)) { +if (core_prev_state ==PWRDM_POWER_OFF ) { + pdata->restore_context =1 ; +pm_runtime_get_sync (dev); + }else { + pdata->restore_context =0 ; +pm_runtime_get_sync (dev); + } + } + } +}#else void __init usb_musb_init (struct omap_musb_board_data *board_data) { } + +void musb_prepare_for_idle () +{ +} + +void musb_wakeup_from_idle () +{ +}#endif /* CONFIG_USB_MUSB_SOC */ Index:
linux-omap-pm/arch/arm/plat-omap/include/plat/usb.h
===================================================================arch/arm/plat-omap/include/plat/usb.h +2
-0@@ -79,6 +79,8 @@ extern void usb_ehci_init(const struct eextern void usb_ohci_init (const struct ohci_hcd_omap_platform_data *pdata); +extern void musb_prepare_for_idle (void ); +extern void musb_wakeup_from_idle (void );#endif Index:
linux-omap-pm/drivers/usb/musb/musb_core.c
===================================================================drivers/usb/musb/musb_core.c +13
-2@@ -2410,6 +2410,7 @@ static int musb_suspend(struct device *dstruct platform_device *pdev =to_platform_device (dev);unsigned long flags;struct musb *musb =dev_to_musb (&pdev->dev); +struct musb_hdrc_platform_data *plat = dev->platform_data;if (!musb->clock)return 0 ;@@ -2425,6 +2426,9 @@ static int musb_suspend(struct device *d* they will even be wakeup-enabled. */ } + +if (plat->save_context) + plat->save_context =1 ;pm_runtime_put_sync (dev);#ifndef CONFIG_PM_RUNTIME @@ -2443,10 +2447,13 @@ static int musb_resume_noirq(struct devi {struct platform_device *pdev =to_platform_device (dev);struct musb *musb =dev_to_musb (&pdev->dev); +struct musb_hdrc_platform_data *plat = dev->platform_data;if (!musb->clock)return 0 ; +if (plat->restore_context) + plat->restore_context =1 ;pm_runtime_get_sync (dev);#ifndef CONFIG_PM_RUNTIME @@ -2468,16 +2475,20 @@ static int musb_resume_noirq(struct devistatic int musb_runtime_suspend (struct device *dev) {struct musb *musb =dev_to_musb (dev); +struct musb_hdrc_platform_data *plat = dev->platform_data; -musb_save_context (musb); +if (plat->save_context) +musb_save_context (musb);return 0 ; }static int musb_runtime_resume (struct device *dev) {struct musb *musb =dev_to_musb (dev); +struct musb_hdrc_platform_data *plat = dev->platform_data; -musb_restore_context (musb); +if (plat->restore_context) +musb_restore_context (musb);return 0 ; }static const struct dev_pm_ops musb_dev_pm_ops = {Index:
linux-omap-pm/drivers/usb/musb/omap2430.c
===================================================================drivers/usb/musb/omap2430.c +14
-0@@ -189,6 +189,19 @@ int musb_platform_set_mode(struct musb *return 0 ; } +int is_musb_active (struct device *dev) +{ +struct musb *musb; + +#ifdef CONFIG_USB_MUSB_HDRC_HCD +/* usbcore insists dev->driver_data is a "struct hcd *" */ + musb =hcd_to_musb (dev_get_drvdata (dev)); +#else + musb =dev_get_drvdata (dev); +#endif +return musb->is_active; +} +int __init musb_platform_init (struct musb *musb) {u32 l;@@ -232,6 +245,7 @@ int __init musb_platform_init(struct mus musb->board_set_vbus = omap_set_vbus;setup_timer (&musb_idle_timer, musb_do_idle, (unsigned long ) musb); + plat->is_usb_active = is_musb_active;return 0 ; }Index:
linux-omap-pm/include/linux/usb/musb.h
===================================================================include/linux/usb/musb.h +13
-0@@ -93,6 +93,8 @@ struct musb_hdrc_config { }; +struct device ; +struct musb_hdrc_platform_data {/* MUSB_HOST, MUSB_PERIPHERAL, or MUSB_OTG */ u8 mode;@@ -126,6 +128,17 @@ struct musb_hdrc_platform_data {/* Architecture specific board data */ void *board_data; + +/* check usb device active state*/ +int (*is_usb_active)(struct device *dev); + +/* +* Used for saving and restoring the registers only when core +* next state is off and previous state was off. +* Otherwise avoid save restore. +*/ +int save_context; +int restore_context; };
Hi,
Quoted 9 lines
-----Original Message-----
From: Kevin Hilman [mailto:[email protected]]
Sent: Saturday, September 25, 2010 1:12 AM
To: Kalliguddi, Hema
Cc: [email protected]; [email protected]; Mankad, Maulik Ojas; Balbi, Felipe; Tony Lindgren; Cousson, Benoit; Paul Walmsley
Subject: Re: [PATCH 9/9 v3] usb : musb: Offmode fix for idle path
Quoted 8 lines
Quoted 1 line · Hema HK
With OMAP core-off support musb was not functional as
context was getting
Quoted 1 line
lost after wakeup from core-off.
This should be a separate patch.
Let me give the description of the musb offmode support in the idle path. With the current mainline code, offmode in the idle path is not supported with usb. When the core hits off and wakes up the musb will not be functional. This patch is to support the musb functionality with offmode enabled in the idle path.
Below are the requirements to support retention and offmode of OMAP in idle path with usb enabled During idle and when there is no activity on the bus:
1.Since there is no hardware context save/restore supported in OMAP for musb, software has to save the context.
2.Configure the musb in force idle/standby mode during idle mode
3.May or may not disable the interface clock(as interface clock is autogated) and the functional clock is from ULPI phy on triton chip.
When OMAP awakes:
1.enable the clock if it is disabled.and
2.Configure it back to no idle/standby or smart idle/standby after wakeup. 3.Restore the context back.
Idling of device can be done when there is no activity on the bus by using the pm_runtime_put_sync apis in when device disconnects or suspends, but resuming has to done as soon as the omap is wokenup from retention or core off, as we have to put back the musb in known state ie restore the conext atleast enabling D+/D- lines,enabling interrupts and configuring the no idle/standby or smart idle/standby to even capture the irqs. Otherwise we will not be able to capture the musb connect/reset or resume/remote wakeup events as D+/D- lines will disabled when the context is lost duribg offmode.
If I use the pm_runtime_put_sync in disconnect/suspend handler when device suspends/disconnects and use pm_runtime_get_sync when OMAP wakesup, then there will be mismatch in the usecount.
We could have achieved the same by using the triton connect/disconnect events to idle/resume musb, but some of the phys do not support the connect/disconnect events.
So cameup with the design of idling musb device in idle loop and resume once the OMAP wakes up. All this done onl when the musb is not active.
Since the IDLE REQ/ACK protocol is broken, the recommendation from ip team is to configure the musb in force idle/standby during omap retention and offmode.
Since we have to touch the sysconfig registers and context save/restore everytime, I am using the runtime pm apis.
Quoted 11 lines
Quoted 2 lines
And also musb was blocking the core-off after loading the gadget driver even with no cable connected sometimes.
this too
Quoted 2 lines
Added the idle and wakeup APIs in the platform layer which will be called in the idle and wakeup path.
And this errata fix should be a separate patch, with reference to the errata etc.
This is not an errata, this is requirement from the ip. it is mentioned in the functional spec that when device is not use put it in force idle/standby mode.
Quoted 26 lines
Quoted 2 lines
Used the
pm_runtime_put_syscAPI to configure the musb to force idle/standby modes, saving the context anddisable the clk in
Quoted 1 line
while idling if there is no activity on the usb bus.
Why? This should not be part of the idle path.
If there is no activity on the bus, why hasn't the musb driver already runtime suspended itself?
If the driver want's to
runtime_suspenditself based on inactivity, it
should use an inactivity timer, not hook into the idle loop. The
runtime PM API has a function for a deferred suspendint
pm_schedule_suspend(struct device *dev, unsigned int delay)The only thing in the idle loop in the current code is the errata fix, and even that I'm not sure I'm ready to merge.
I'd really like to see even the errata fix out of the idle
path. I wonder ifusb-musb.ccould create a periodic,
deferrable timer
to fire that ensure that autoidle is disabled.
Quoted 7 lines
Quoted 3 lines
Used the
pm_runtime_get_syncAPI to configure the musb to no idle/standby modes, enable the clock and restore the context after wakeup when there is no activity on the usb bus.Why would you wakeup MUSB in the idle path if there is no activity on the bus?
This is because MUSB has to be in known good state to capture any musb interrupts.
Quoted 3 lines
I don't understand the motiviation or these last two changes, and they are a departure from the behavior of the previous code.
Can you please let mw know which 2 changes you reering to? You mean assing function to check whether the device is active and adding 2 flags for conext save/restore?
Quoted 357 lines
At a minimum, they should be separated into a separate patch, and thoroughly described, including an answer to "why?"
Kevin
Quoted 8 lines
Signed-off-by Hema HK <[email protected]>Signed-off-by Maulik Mankad <[email protected]>Cc Felipe Balbi <[email protected]>Cc Tony Lindgren <[email protected]>Cc Kevin Hilman <[email protected]>Cc Cousson, Benoit <[email protected]>Cc Paul Walmsley <[email protected]>Quoted 4 lines
--- arch/arm/mach-omap2/cpuidle34xx.c | 1 arch/arm/mach-omap2/pm34xx.c | 3 arch/arm/mach-omap2/usb-musb.c | 107++++++++++++++++++++++++++++++++++
Quoted 125 lines
arch/arm/plat-omap/include/plat/usb.h | 2 drivers/usb/musb/musb_core.c | 15 ++++ drivers/usb/musb/omap2430.c | 14 ++++ include/linux/usb/musb.h | 9 ++ 7 files changed, 149 insertions(+), 2 deletions(-)Index:
linux-omap-pm/arch/arm/mach-omap2/cpuidle34xx.c
===================================================================arch/arm/mach-omap2/cpuidle34xx.c +1
-0@@ -31,6 +31,7 @@#include <plat/clockdomain.h> #include <plat/control.h> #include <plat/serial.h> +#include <plat/usb.h> #include "pm.h" Index:
linux-omap-pm/arch/arm/mach-omap2/pm34xx.c
===================================================================arch/arm/mach-omap2/pm34xx.c +3
-0@@ -38,6 +38,7 @@#include <plat/prcm.h> #include <plat/gpmc.h> #include <plat/dma.h> +#include <plat/usb.h> #include <asm/tlbflush.h> @@ -324,11 +325,13 @@ static void restore_table_entry(void)void omap3_device_idle (void ) {omap2_gpio_prepare_for_idle (); +musb_prepare_for_idle (); }void omap3_device_resume (void ) {omap2_gpio_resume_after_idle (); +musb_wakeup_from_idle (); }void omap_sram_idle (void )Index:
linux-omap-pm/arch/arm/mach-omap2/usb-musb.c
===================================================================arch/arm/mach-omap2/usb-musb.c +35
-0@@ -25,16 +25,21 @@#include <linux/io.h> #include <linux/usb/musb.h> +#include <linux/pm_runtime.h> #include <mach/hardware.h> #include <mach/irqs.h> #include <plat/usb.h> #include <plat/omap_device.h> +#include <plat/powerdomain.h> #ifdef CONFIG_USB_MUSB_SOC static const char name[] ="musb_hdrc" ;#define MAX_OMAP_MUSB_HWMOD_NAME_LEN 16 +struct omap_hwmod *oh_p; +static struct powerdomain *core_pwrdm; +static struct musb_hdrc_config musb_config = { .multipoint =1 , .dyn_fifo = 1,@@ -58,6 +63,10 @@ static struct musb_hdrc_platform_data mu* "mode", and should be passed to usb_musb_init(). */ .power = 50, /* up to 100 mA */ + +/* OMAP supports offmode */ + .save_context = 1, + .restore_context = 1, };static u64 musb_dmamask =DMA_BIT_MASK (32 );@@ -80,6 +89,7 @@ void __init usb_musb_init(struct omap_muconst char *oh_name ="usb_otg_hs" ;struct musb_hdrc_platform_data *pdata; + core_pwrdm =pwrdm_lookup ("per_pwrdm" ); oh =omap_hwmod_lookup (oh_name);if (!oh) {@@ -97,6 +107,7 @@ void __init usb_musb_init(struct omap_mu musb_plat.extvbus = board_data->extvbus; pdata = &musb_plat; + oh_p = oh; od = omap_device_build(name, bus_id, oh, pdata, sizeof(struct musb_hdrc_platform_data),@@ -115,8 +126,101 @@ void __init usb_musb_init(struct omap_muput_device (dev); } +void musb_prepare_for_idle () +{ +int core_next_state; +struct omap_hwmod *oh = oh_p; +struct omap_device *od; +struct platform_device *pdev; +struct musb_hdrc_platform_data *pdata; +struct device *dev; + +if (!core_pwrdm) +return ; + + core_next_state =pwrdm_read_next_pwrst (core_pwrdm); +if (core_next_state >=PWRDM_POWER_INACTIVE ) +return ; +if (!oh) +return ; + + od = oh->od; + pdev = &od->pdev; + +if (!pdev) +return ; + dev = &pdev->dev;arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(struct omap_mu · line 162
Quoted 10 lines
arch/arm/mach-omap2/usb-musb.c +10
-0+ +if (dev->driver) { + pdata = dev->platform_data; + +if (pdata->is_usb_active) +if (!pdata->is_usb_active (dev)) { +if (core_next_state ==PWRDM_POWER_OFF ) { + pdata->save_context =1 ; +pm_runtime_put_sync (dev); + } else if (core_next_state ==
PWRDM_POWER_RET) {Quoted 32 lines
arch/arm/mach-omap2/usb-musb.c +32
-0+ pdata->save_context =0 ; +pm_runtime_put_sync (dev); + } + } + } +} + +void musb_wakeup_from_idle () +{ +int core_next_state; +int core_prev_state; +struct omap_hwmod *oh = oh_p; +struct omap_device *od; +struct platform_device *pdev; +struct device *dev; +struct musb_hdrc_platform_data *pdata; + +if (!core_pwrdm) +return ; + + core_next_state =pwrdm_read_next_pwrst (core_pwrdm); + +if (core_next_state >=PWRDM_POWER_INACTIVE ) +return ; + core_prev_state =pwrdm_read_prev_pwrst (core_pwrdm); + +if (!oh) +return ; + od = oh->od; + pdev = &od->pdev; + +if (!pdev)arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(struct omap_mu
Quoted 10 lines
arch/arm/mach-omap2/usb-musb.c +10
-0+return ; + + dev = &pdev->dev; + +if (dev->driver) { + pdata = dev->platform_data; + +if (pdata->is_usb_active) +if (!pdata->is_usb_active (dev)) { + if (core_prev_state ==
PWRDM_POWER_OFF) {Quoted 27 lines
arch/arm/mach-omap2/usb-musb.c +17
-0+ pdata->restore_context =1 ; + pm_runtime_get_sync(dev); + }else { + pdata->restore_context =0 ; +pm_runtime_get_sync (dev); + } + } + } +}#else void __init usb_musb_init (struct omap_musb_board_data *board_data) { } + +void musb_prepare_for_idle () +{ +} + +void musb_wakeup_from_idle () +{ +}#endif /* CONFIG_USB_MUSB_SOC */ Index:
linux-omap-pm/arch/arm/plat-omap/include/plat/usb.h
===================================================================arch/arm/plat-omap/include/plat/usb.h extern void usb_ehci_init(const struct e · line 80
Quoted 2 lines
arch/arm/plat-omap/include/plat/usb.h +0
-0@@ -79,6 +79,8 @@ extern void usb_ehci_init(const struct e extern void usb_ohci_init(const struct
ohci_hcd_omap_platform_data*pdata);Quoted 90 lines
arch/arm/plat-omap/include/plat/usb.h +2
-0+extern void musb_prepare_for_idle (void ); +extern void musb_wakeup_from_idle (void );#endif Index:
linux-omap-pm/drivers/usb/musb/musb_core.c
===================================================================drivers/usb/musb/musb_core.c +13
-2@@ -2410,6 +2410,7 @@ static int musb_suspend(struct device *dstruct platform_device *pdev =to_platform_device (dev);unsigned long flags;struct musb *musb =dev_to_musb (&pdev->dev); +struct musb_hdrc_platform_data *plat = dev->platform_data;if (!musb->clock)return 0 ;@@ -2425,6 +2426,9 @@ static int musb_suspend(struct device *d* they will even be wakeup-enabled. */ } + +if (plat->save_context) + plat->save_context =1 ;pm_runtime_put_sync (dev);#ifndef CONFIG_PM_RUNTIME @@ -2443,10 +2447,13 @@ static int musb_resume_noirq(struct devi {struct platform_device *pdev =to_platform_device (dev);struct musb *musb =dev_to_musb (&pdev->dev); +struct musb_hdrc_platform_data *plat = dev->platform_data;if (!musb->clock)return 0 ; +if (plat->restore_context) + plat->restore_context =1 ;pm_runtime_get_sync (dev);#ifndef CONFIG_PM_RUNTIME @@ -2468,16 +2475,20 @@ static int musb_resume_noirq(struct devistatic int musb_runtime_suspend (struct device *dev) {struct musb *musb =dev_to_musb (dev); +struct musb_hdrc_platform_data *plat = dev->platform_data; -musb_save_context (musb); +if (plat->save_context) +musb_save_context (musb);return 0 ; }static int musb_runtime_resume (struct device *dev) {struct musb *musb =dev_to_musb (dev); +struct musb_hdrc_platform_data *plat = dev->platform_data; -musb_restore_context (musb); +if (plat->restore_context) +musb_restore_context (musb);return 0 ; }static const struct dev_pm_ops musb_dev_pm_ops = {Index:
linux-omap-pm/drivers/usb/musb/omap2430.c
===================================================================drivers/usb/musb/omap2430.c +13
-0@@ -189,6 +189,19 @@ int musb_platform_set_mode(struct musb *return 0 ; } +int is_musb_active (struct device *dev) +{ +struct musb *musb; + +#ifdef CONFIG_USB_MUSB_HDRC_HCD +/* usbcore insists dev->driver_data is a "struct hcd *" */ + musb =hcd_to_musb (dev_get_drvdata (dev)); +#else + musb =dev_get_drvdata (dev); +#endif +return musb->is_active; +} +int __init musb_platform_init (struct musb *musb) {u32 l;drivers/usb/musb/omap2430.c int __init musb_platform_init(struct mus · line 247
Quoted 3 lines
drivers/usb/musb/omap2430.c +0
-0@@ -232,6 +245,7 @@ int __init musb_platform_init(struct mus musb->board_set_vbus = omap_set_vbus; setup_timer(&musb_idle_timer, musb_do_idle, (unsignedlong) musb);
Quoted 35 lines
drivers/usb/musb/omap2430.c +1
-0+ plat->is_usb_active = is_musb_active;return 0 ; }Index:
linux-omap-pm/include/linux/usb/musb.h
===================================================================include/linux/usb/musb.h +13
-0@@ -93,6 +93,8 @@ struct musb_hdrc_config { }; +struct device ; +struct musb_hdrc_platform_data {/* MUSB_HOST, MUSB_PERIPHERAL, or MUSB_OTG */ u8 mode;@@ -126,6 +128,17 @@ struct musb_hdrc_platform_data {/* Architecture specific board data */ void *board_data; + +/* check usb device active state*/ +int (*is_usb_active)(struct device *dev); + +/* +* Used for saving and restoring the registers only when core +* next state is off and previous state was off. +* Otherwise avoid save restore. +*/ +int save_context; +int restore_context; };
A message that is not in the archive (sent off-list or not yet received): E0D41E29EB0DAC4E9F3FF173962E9E9402DB3F8825-/tLxBxkBPtCIQmiDNMet8wC/[email protected]
Quoted 11 lines · Hema
Quoted 11 lines
-----Original Message-----
From: Kevin Hilman [mailto:[email protected]]
Sent: Saturday, September 25, 2010 1:12 AM
To: Kalliguddi, Hema
Cc: [email protected]; [email protected]; Mankad, Maulik Ojas; Balbi, Felipe; Tony Lindgren; Cousson,
Benoit; Paul Walmsley
Subject: Re: [PATCH 9/9 v3] usb : musb: Offmode fix for idle pathHema HK <[email protected]> writes:
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
With OMAP core-off support musb was not functional as
context was getting
Quoted 1 line
lost after wakeup from core-off.
This should be a separate patch.
Let me give the description of the musb offmode support in the idle path.
The detail you provided below is very good, and this is the level of detail that needs to go into the changelogs.
Quoted 3 lines
With the current mainline code, offmode in the idle path is not supported with usb. When the core hits off and wakes up the musb will not be functional. This patch is to support the musb functionality with offmode enabled in the idle path.
OK, what about the PM branch. I was under the impression that offmode was working fine in the PM branch.
And, looking at the PM branch, the only thing done in the idle path is the disable of autoidle upon wakeup. Everything else (context save/restore etc.) is done in the driver.
Quoted 6 lines
Below are the requirements to support retention and offmode of OMAP in idle path with usb enabled During idle and when there is no activity on the bus:
1.Since there is no hardware context save/restore supported in OMAP for musb, software has to save the context.
2.Configure the musb in force idle/standby mode during idle mode
This needs more detailed description (TRM reference, etc.)
Quoted 7 lines
3.May or may not disable the interface clock(as interface clock is autogated) and the functional clock is from ULPI phy on triton chip.
When OMAP awakes:
1.enable the clock if it is disabled.and
2.Configure it back to no idle/standby or smart idle/standby after wakeup.
In the PM branch, this part is done in idle.
Quoted 1 line
3.Restore the context back.
But this is done by the driver.
Quoted 1 line
Idling of device can be done when there is no activity on the bus by using the
pm_runtime_put_sync
n> apis in when device disconnects or suspends, but resuming has to done as soon as the omap is wokenup from
Quoted 5 lines
retention or core off, as we have to put back the musb in known state ie restore the conext atleast enabling D+/D- lines,enabling interrupts and configuring the no idle/standby or smart idle/standby to even capture the irqs. Otherwise we will not be able to capture the musb connect/reset or resume/remote wakeup events as D+/D- lines will disabled when the context is lost duribg offmode.
Quoted 8 lines
If I use the
pm_runtime_put_syncin disconnect/suspend handler when device suspends/disconnects and usepm_runtime_get_syncwhen OMAP wakesup, then there will be mismatch in the usecount.We could have achieved the same by using the triton connect/disconnect events to idle/resume musb, but some of the phys do not support the connect/disconnect events.
So cameup with the design of idling musb device in idle loop and resume once the OMAP wakes up. All this done onl when the musb is not active.
Rather than seeing more work done in the idle path, I would rather be moving code out of the idle path.
Did you consider using a (deferrable) timer during no-activity times which periodically checks to be sure the IP is in force idle/standby?
Quoted 2 lines
Since the IDLE REQ/ACK protocol is broken, the recommendation from ip team is to configure the musb in force idle/standby during omap retention and offmode.
Yes, this is in the PM branch and there is an errata number for it there. Please reference that errata when implementing this feature (both in the changelog and in the code.)
Kevin
Quoted 51 lines
Since we have to touch the sysconfig registers and context save/restore everytime, I am using the runtime pm apis.
Quoted 11 lines
Quoted 2 lines
And also musb was blocking the core-off after loading the gadget driver even with no cable connected sometimes.
this too
Quoted 2 lines
Added the idle and wakeup APIs in the platform layer which will be called in the idle and wakeup path.
And this errata fix should be a separate patch, with reference to the errata etc.
This is not an errata, this is requirement from the ip. it is mentioned in the functional spec that when device is not use put it in force idle/standby mode.
Quoted 26 lines
Quoted 2 lines
Used the
pm_runtime_put_syscAPI to configure the musb to force idle/standby modes, saving the context anddisable the clk in
Quoted 1 line
while idling if there is no activity on the usb bus.
Why? This should not be part of the idle path.
If there is no activity on the bus, why hasn't the musb driver already runtime suspended itself?
If the driver want's to
runtime_suspenditself based on inactivity, it
should use an inactivity timer, not hook into the idle loop. The
runtime PM API has a function for a deferred suspendint
pm_schedule_suspend(struct device *dev, unsigned int delay)The only thing in the idle loop in the current code is the errata fix, and even that I'm not sure I'm ready to merge.
I'd really like to see even the errata fix out of the idle
path. I wonder ifusb-musb.ccould create a periodic,
deferrable timer
to fire that ensure that autoidle is disabled.Quoted 7 lines
Quoted 3 lines
Used the
pm_runtime_get_syncAPI to configure the musb to no idle/standby modes, enable the clock and restore the context after wakeup when there is no activity on the usb bus.Why would you wakeup MUSB in the idle path if there is no activity on the bus?
Quoted 366 lines
This is because MUSB has to be in known good state to capture any musb interrupts.
Quoted 3 lines
I don't understand the motiviation or these last two changes, and they are a departure from the behavior of the previous code.
Can you please let mw know which 2 changes you reering to? You mean assing function to check whether the device is active and adding 2 flags for conext save/restore?
Quoted 357 lines
At a minimum, they should be separated into a separate patch, and thoroughly described, including an answer to "why?"
Kevin
Quoted 8 lines
Signed-off-by Hema HK <[email protected]>Signed-off-by Maulik Mankad <[email protected]>Cc Felipe Balbi <[email protected]>Cc Tony Lindgren <[email protected]>Cc Kevin Hilman <[email protected]>Cc Cousson, Benoit <[email protected]>Cc Paul Walmsley <[email protected]>Quoted 4 lines
--- arch/arm/mach-omap2/cpuidle34xx.c | 1 arch/arm/mach-omap2/pm34xx.c | 3 arch/arm/mach-omap2/usb-musb.c | 107++++++++++++++++++++++++++++++++++
Quoted 125 lines
arch/arm/plat-omap/include/plat/usb.h | 2 drivers/usb/musb/musb_core.c | 15 ++++ drivers/usb/musb/omap2430.c | 14 ++++ include/linux/usb/musb.h | 9 ++ 7 files changed, 149 insertions(+), 2 deletions(-)Index:
linux-omap-pm/arch/arm/mach-omap2/cpuidle34xx.c
===================================================================arch/arm/mach-omap2/cpuidle34xx.c +1
-0@@ -31,6 +31,7 @@#include <plat/clockdomain.h> #include <plat/control.h> #include <plat/serial.h> +#include <plat/usb.h> #include "pm.h" Index:
linux-omap-pm/arch/arm/mach-omap2/pm34xx.c
===================================================================arch/arm/mach-omap2/pm34xx.c +3
-0@@ -38,6 +38,7 @@#include <plat/prcm.h> #include <plat/gpmc.h> #include <plat/dma.h> +#include <plat/usb.h> #include <asm/tlbflush.h> @@ -324,11 +325,13 @@ static void restore_table_entry(void)void omap3_device_idle (void ) {omap2_gpio_prepare_for_idle (); +musb_prepare_for_idle (); }void omap3_device_resume (void ) {omap2_gpio_resume_after_idle (); +musb_wakeup_from_idle (); }void omap_sram_idle (void )Index:
linux-omap-pm/arch/arm/mach-omap2/usb-musb.c
===================================================================arch/arm/mach-omap2/usb-musb.c +35
-0@@ -25,16 +25,21 @@#include <linux/io.h> #include <linux/usb/musb.h> +#include <linux/pm_runtime.h> #include <mach/hardware.h> #include <mach/irqs.h> #include <plat/usb.h> #include <plat/omap_device.h> +#include <plat/powerdomain.h> #ifdef CONFIG_USB_MUSB_SOC static const char name[] ="musb_hdrc" ;#define MAX_OMAP_MUSB_HWMOD_NAME_LEN 16 +struct omap_hwmod *oh_p; +static struct powerdomain *core_pwrdm; +static struct musb_hdrc_config musb_config = { .multipoint =1 , .dyn_fifo = 1,@@ -58,6 +63,10 @@ static struct musb_hdrc_platform_data mu* "mode", and should be passed to usb_musb_init(). */ .power = 50, /* up to 100 mA */ + +/* OMAP supports offmode */ + .save_context = 1, + .restore_context = 1, };static u64 musb_dmamask =DMA_BIT_MASK (32 );@@ -80,6 +89,7 @@ void __init usb_musb_init(struct omap_muconst char *oh_name ="usb_otg_hs" ;struct musb_hdrc_platform_data *pdata; + core_pwrdm =pwrdm_lookup ("per_pwrdm" ); oh =omap_hwmod_lookup (oh_name);if (!oh) {@@ -97,6 +107,7 @@ void __init usb_musb_init(struct omap_mu musb_plat.extvbus = board_data->extvbus; pdata = &musb_plat; + oh_p = oh; od = omap_device_build(name, bus_id, oh, pdata, sizeof(struct musb_hdrc_platform_data),@@ -115,8 +126,101 @@ void __init usb_musb_init(struct omap_muput_device (dev); } +void musb_prepare_for_idle () +{ +int core_next_state; +struct omap_hwmod *oh = oh_p; +struct omap_device *od; +struct platform_device *pdev; +struct musb_hdrc_platform_data *pdata; +struct device *dev; + +if (!core_pwrdm) +return ; + + core_next_state =pwrdm_read_next_pwrst (core_pwrdm); +if (core_next_state >=PWRDM_POWER_INACTIVE ) +return ; +if (!oh) +return ; + + od = oh->od; + pdev = &od->pdev; + +if (!pdev) +return ; + dev = &pdev->dev;arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(struct omap_mu · line 162
Quoted 10 lines
arch/arm/mach-omap2/usb-musb.c +10
-0+ +if (dev->driver) { + pdata = dev->platform_data; + +if (pdata->is_usb_active) +if (!pdata->is_usb_active (dev)) { +if (core_next_state ==PWRDM_POWER_OFF ) { + pdata->save_context =1 ; +pm_runtime_put_sync (dev); + } else if (core_next_state ==
PWRDM_POWER_RET) {Quoted 32 lines
arch/arm/mach-omap2/usb-musb.c +32
-0+ pdata->save_context =0 ; +pm_runtime_put_sync (dev); + } + } + } +} + +void musb_wakeup_from_idle () +{ +int core_next_state; +int core_prev_state; +struct omap_hwmod *oh = oh_p; +struct omap_device *od; +struct platform_device *pdev; +struct device *dev; +struct musb_hdrc_platform_data *pdata; + +if (!core_pwrdm) +return ; + + core_next_state =pwrdm_read_next_pwrst (core_pwrdm); + +if (core_next_state >=PWRDM_POWER_INACTIVE ) +return ; + core_prev_state =pwrdm_read_prev_pwrst (core_pwrdm); + +if (!oh) +return ; + od = oh->od; + pdev = &od->pdev; + +if (!pdev)arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(struct omap_mu
Quoted 10 lines
arch/arm/mach-omap2/usb-musb.c +10
-0+return ; + + dev = &pdev->dev; + +if (dev->driver) { + pdata = dev->platform_data; + +if (pdata->is_usb_active) +if (!pdata->is_usb_active (dev)) { + if (core_prev_state ==
PWRDM_POWER_OFF) {Quoted 27 lines
arch/arm/mach-omap2/usb-musb.c +17
-0+ pdata->restore_context =1 ; + pm_runtime_get_sync(dev); + }else { + pdata->restore_context =0 ; +pm_runtime_get_sync (dev); + } + } + } +}#else void __init usb_musb_init (struct omap_musb_board_data *board_data) { } + +void musb_prepare_for_idle () +{ +} + +void musb_wakeup_from_idle () +{ +}#endif /* CONFIG_USB_MUSB_SOC */ Index:
linux-omap-pm/arch/arm/plat-omap/include/plat/usb.h
===================================================================arch/arm/plat-omap/include/plat/usb.h extern void usb_ehci_init(const struct e · line 80
Quoted 2 lines
arch/arm/plat-omap/include/plat/usb.h +0
-0@@ -79,6 +79,8 @@ extern void usb_ehci_init(const struct e extern void usb_ohci_init(const struct
ohci_hcd_omap_platform_data*pdata);Quoted 90 lines
arch/arm/plat-omap/include/plat/usb.h +2
-0+extern void musb_prepare_for_idle (void ); +extern void musb_wakeup_from_idle (void );#endif Index:
linux-omap-pm/drivers/usb/musb/musb_core.c
===================================================================drivers/usb/musb/musb_core.c +13
-2@@ -2410,6 +2410,7 @@ static int musb_suspend(struct device *dstruct platform_device *pdev =to_platform_device (dev);unsigned long flags;struct musb *musb =dev_to_musb (&pdev->dev); +struct musb_hdrc_platform_data *plat = dev->platform_data;if (!musb->clock)return 0 ;@@ -2425,6 +2426,9 @@ static int musb_suspend(struct device *d* they will even be wakeup-enabled. */ } + +if (plat->save_context) + plat->save_context =1 ;pm_runtime_put_sync (dev);#ifndef CONFIG_PM_RUNTIME @@ -2443,10 +2447,13 @@ static int musb_resume_noirq(struct devi {struct platform_device *pdev =to_platform_device (dev);struct musb *musb =dev_to_musb (&pdev->dev); +struct musb_hdrc_platform_data *plat = dev->platform_data;if (!musb->clock)return 0 ; +if (plat->restore_context) + plat->restore_context =1 ;pm_runtime_get_sync (dev);#ifndef CONFIG_PM_RUNTIME @@ -2468,16 +2475,20 @@ static int musb_resume_noirq(struct devistatic int musb_runtime_suspend (struct device *dev) {struct musb *musb =dev_to_musb (dev); +struct musb_hdrc_platform_data *plat = dev->platform_data; -musb_save_context (musb); +if (plat->save_context) +musb_save_context (musb);return 0 ; }static int musb_runtime_resume (struct device *dev) {struct musb *musb =dev_to_musb (dev); +struct musb_hdrc_platform_data *plat = dev->platform_data; -musb_restore_context (musb); +if (plat->restore_context) +musb_restore_context (musb);return 0 ; }static const struct dev_pm_ops musb_dev_pm_ops = {Index:
linux-omap-pm/drivers/usb/musb/omap2430.c
===================================================================drivers/usb/musb/omap2430.c +13
-0@@ -189,6 +189,19 @@ int musb_platform_set_mode(struct musb *return 0 ; } +int is_musb_active (struct device *dev) +{ +struct musb *musb; + +#ifdef CONFIG_USB_MUSB_HDRC_HCD +/* usbcore insists dev->driver_data is a "struct hcd *" */ + musb =hcd_to_musb (dev_get_drvdata (dev)); +#else + musb =dev_get_drvdata (dev); +#endif +return musb->is_active; +} +int __init musb_platform_init (struct musb *musb) {u32 l;drivers/usb/musb/omap2430.c int __init musb_platform_init(struct mus · line 247
Quoted 3 lines
drivers/usb/musb/omap2430.c +0
-0@@ -232,6 +245,7 @@ int __init musb_platform_init(struct mus musb->board_set_vbus = omap_set_vbus; setup_timer(&musb_idle_timer, musb_do_idle, (unsignedlong) musb);
Quoted 35 lines
drivers/usb/musb/omap2430.c +1
-0+ plat->is_usb_active = is_musb_active;return 0 ; }Index:
linux-omap-pm/include/linux/usb/musb.h
===================================================================include/linux/usb/musb.h +13
-0@@ -93,6 +93,8 @@ struct musb_hdrc_config { }; +struct device ; +struct musb_hdrc_platform_data {/* MUSB_HOST, MUSB_PERIPHERAL, or MUSB_OTG */ u8 mode;@@ -126,6 +128,17 @@ struct musb_hdrc_platform_data {/* Architecture specific board data */ void *board_data; + +/* check usb device active state*/ +int (*is_usb_active)(struct device *dev); + +/* +* Used for saving and restoring the registers only when core +* next state is off and previous state was off. +* Otherwise avoid save restore. +*/ +int save_context; +int restore_context; };
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Kevin,
Quoted 35 lines
-----Original Message-----
From: Kevin Hilman [mailto:[email protected]]
Sent: Tuesday, September 28, 2010 12:27 AM
To: Kalliguddi, Hema
Cc: [email protected]; [email protected]; Mankad, Maulik Ojas; Balbi, Felipe; Tony Lindgren; Cousson, Benoit; Paul Walmsley
Subject: Re: [PATCH 9/9 v3] usb : musb: Offmode fix for idle pathQuoted 11 lines · Hema
Quoted 11 lines
-----Original Message-----
From: Kevin Hilman [mailto:[email protected]]
Sent: Saturday, September 25, 2010 1:12 AM
To: Kalliguddi, Hema
Cc: [email protected]; [email protected]; Mankad, Maulik Ojas; Balbi, Felipe; Tony Lindgren; Cousson, Benoit; Paul Walmsley
Subject: Re: [PATCH 9/9 v3] usb : musb: Offmode fix for idle pathHema HK <[email protected]> writes:
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
With OMAP core-off support musb was not functional as
context was getting
Quoted 1 line
lost after wakeup from core-off.
This should be a separate patch.
Let me give the description of the musb offmode support in
the idle path.
The detail you provided below is very good, and this is the level of detail that needs to go into the changelogs.
Quoted 9 lines
Quoted 1 line
With the current mainline code, offmode in the idle path is
not supported with usb.
Quoted 2 lines
When the core hits off and wakes up the musb will not be functional. This patch is to support the musb functionality with offmode
enabled in the idle path.
OK, what about the PM branch. I was under the impression that offmode was working fine in the PM branch.
In current PM branch, the core hits retention and off mode without usb drive loaded. Once after loading the musb driver it may not retention/off also as the driver is configuring musb in smart idle/standby. Even if it hits retention/off as it might work sometimes,MUSB is not functional.because there is no context save/restore done in the driver.
Quoted 4 lines
And, looking at the PM branch, the only thing done in the idle path is the disable of autoidle upon wakeup. Everything else (context save/restore etc.) is done in the driver.
No.There is no context save/restore done in the driver today.
Quoted 11 lines
Quoted 1 line
Below are the requirements to support retention and offmode
of OMAP in idle path with usb enabled
Quoted 3 lines
During idle and when there is no activity on the bus:
1.Since there is no hardware context save/restore supported
in OMAP for musb, software
Quoted 2 lines
has to save the context.
2.Configure the musb in force idle/standby mode during idle modeThis needs more detailed description (TRM reference, etc.)
I have provided the link to the public TRM and I had refered to the exact section of the TRM sometime in the older version the patches, when Benoit and you had asked for the description.
Quoted 4 lines
Quoted 1 line
3.May or may not disable the interface clock(as interface
clock is autogated)
Quoted 2 lines
and the functional clock is from ULPI phy on triton chip.
Quoted 8 lines
Quoted 4 lines
When OMAP awakes:
1.enable the clock if it is disabled.and 2.Configure it back to no idle/standby or smart idle/standby
after wakeup.
In the PM branch, this part is done in idle.
I only see the disable autoidle bit function the idle path in pm branch. There is no code for setting the no idle/standby or smart idle/standby bits in the idle path.
Quoted 4 lines
Quoted 1 line
3.Restore the context back.
But this is done by the driver.
No. current driver is not doing any context save/restore.
Quoted 469 lines
Quoted 1 line
Idling of device can be done when there is no activity on
the bus by using the
pm_runtime_put_sync
n> apis in when device disconnects or suspends, but resuming has to done as soon as the omap is wokenup fromQuoted 1 line
retention or core off, as we have to put back the musb in
known state ie restore the conext atleast
Quoted 1 line
enabling D+/D- lines,enabling interrupts and configuring the
no idle/standby or smart idle/standby
Quoted 1 line
to even capture the irqs. Otherwise we will not be able to
capture the musb connect/reset or resume/remote
Quoted 1 line
wakeup events as D+/D- lines will disabled when the context
is lost duribg offmode.
Quoted 2 lines
If I use the
pm_runtime_put_syncin disconnect/suspendhandler when device suspends/disconnects
Quoted 1 line
and use
pm_runtime_get_syncwhen OMAP wakesup, then therewill be mismatch in the usecount.
Quoted 2 lines
We could have achieved the same by using the triton
connect/disconnect events to idle/resume musb,
Quoted 3 lines
but some of the phys do not support the connect/disconnect events.
So cameup with the design of idling musb device in idle loop
and resume once the OMAP wakes up.
Quoted 1 line
All this done onl when the musb is not active.
Rather than seeing more work done in the idle path, I would rather be moving code out of the idle path.
Did you consider using a (deferrable) timer during no-activity times which periodically checks to be sure the IP is in force idle/standby?
Quoted 1 line
Since the IDLE REQ/ACK protocol is broken, the
recommendation from ip team is to
Quoted 1 line
configure the musb in force idle/standby during omap
retention and offmode.
Yes, this is in the PM branch and there is an errata number for it there. Please reference that errata when implementing this feature (both in the changelog and in the code.)
Kevin
Quoted 1 line
Since we have to touch the sysconfig registers and context
save/restore everytime,
Quoted 7 lines
I am using the runtime pm apis.
Quoted 5 lines
Quoted 2 lines
And also musb was blocking the core-off after loading the gadget driver even with no cable connected sometimes.
this too
Quoted 7 lines
Quoted 6 lines
Quoted 2 lines
Added the idle and wakeup APIs in the platform layer which will be called in the idle and wakeup path.
And this errata fix should be a separate patch, with reference to the errata etc.
This is not an errata, this is requirement from the ip. it
is mentioned in
Quoted 1 line
the functional spec that when device is not use put it in
force idle/standby mode.
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Used the
pm_runtime_put_syscAPI to configure the musb to force idle/standby modes, saving the context andQuoted 8 lines
Quoted 8 lines
disable the clk in
Quoted 1 line
while idling if there is no activity on the usb bus.
Why? This should not be part of the idle path.
If there is no activity on the bus, why hasn't the musb
driver already
Quoted 3 lines
Quoted 3 lines
runtime suspended itself?
If the driver want's to
runtime_suspenditself based oninactivity, it
Quoted 6 lines
Quoted 6 lines
should use an inactivity timer, not hook into the idle loop. The
runtime PM API has a function for a deferred suspendint
pm_schedule_suspend(struct device *dev, unsigned int delay)The only thing in the idle loop in the current code is the
errata fix,
Quoted 7 lines
Quoted 7 lines
and even that I'm not sure I'm ready to merge.
I'd really like to see even the errata fix out of the idle
path. I wonder ifusb-musb.ccould create a periodic,
deferrable timer
to fire that ensure that autoidle is disabled.Quoted 8 lines
Quoted 7 lines
Quoted 3 lines
Used the
pm_runtime_get_syncAPI to configure the musb to no idle/standby modes, enable the clock and restore the context after wakeup when there is no activity on the usb bus.Why would you wakeup MUSB in the idle path if there is no activity on the bus?
This is because MUSB has to be in known good state to
capture any musb interrupts.
Quoted 2 lines
Quoted 2 lines
I don't understand the motiviation or these last two
changes, and they
Quoted 363 lines
Quoted 2 lines
are a departure from the behavior of the previous code.
Can you please let mw know which 2 changes you reering to? You mean assing function to check whether the device is active and adding 2 flags for conext save/restore?
Quoted 357 lines
At a minimum, they should be separated into a separate patch, and thoroughly described, including an answer to "why?"
Kevin
Quoted 8 lines
Signed-off-by Hema HK <[email protected]>Signed-off-by Maulik Mankad <[email protected]>Cc Felipe Balbi <[email protected]>Cc Tony Lindgren <[email protected]>Cc Kevin Hilman <[email protected]>Cc Cousson, Benoit <[email protected]>Cc Paul Walmsley <[email protected]>Quoted 4 lines
--- arch/arm/mach-omap2/cpuidle34xx.c | 1 arch/arm/mach-omap2/pm34xx.c | 3 arch/arm/mach-omap2/usb-musb.c | 107++++++++++++++++++++++++++++++++++
Quoted 125 lines
arch/arm/plat-omap/include/plat/usb.h | 2 drivers/usb/musb/musb_core.c | 15 ++++ drivers/usb/musb/omap2430.c | 14 ++++ include/linux/usb/musb.h | 9 ++ 7 files changed, 149 insertions(+), 2 deletions(-)Index:
linux-omap-pm/arch/arm/mach-omap2/cpuidle34xx.c
===================================================================arch/arm/mach-omap2/cpuidle34xx.c +1
-0@@ -31,6 +31,7 @@#include <plat/clockdomain.h> #include <plat/control.h> #include <plat/serial.h> +#include <plat/usb.h> #include "pm.h" Index:
linux-omap-pm/arch/arm/mach-omap2/pm34xx.c
===================================================================arch/arm/mach-omap2/pm34xx.c +3
-0@@ -38,6 +38,7 @@#include <plat/prcm.h> #include <plat/gpmc.h> #include <plat/dma.h> +#include <plat/usb.h> #include <asm/tlbflush.h> @@ -324,11 +325,13 @@ static void restore_table_entry(void)void omap3_device_idle (void ) {omap2_gpio_prepare_for_idle (); +musb_prepare_for_idle (); }void omap3_device_resume (void ) {omap2_gpio_resume_after_idle (); +musb_wakeup_from_idle (); }void omap_sram_idle (void )Index:
linux-omap-pm/arch/arm/mach-omap2/usb-musb.c
===================================================================arch/arm/mach-omap2/usb-musb.c +35
-0@@ -25,16 +25,21 @@#include <linux/io.h> #include <linux/usb/musb.h> +#include <linux/pm_runtime.h> #include <mach/hardware.h> #include <mach/irqs.h> #include <plat/usb.h> #include <plat/omap_device.h> +#include <plat/powerdomain.h> #ifdef CONFIG_USB_MUSB_SOC static const char name[] ="musb_hdrc" ;#define MAX_OMAP_MUSB_HWMOD_NAME_LEN 16 +struct omap_hwmod *oh_p; +static struct powerdomain *core_pwrdm; +static struct musb_hdrc_config musb_config = { .multipoint =1 , .dyn_fifo = 1,@@ -58,6 +63,10 @@ static struct musb_hdrc_platform_data mu* "mode", and should be passed to usb_musb_init(). */ .power = 50, /* up to 100 mA */ + +/* OMAP supports offmode */ + .save_context = 1, + .restore_context = 1, };static u64 musb_dmamask =DMA_BIT_MASK (32 );@@ -80,6 +89,7 @@ void __init usb_musb_init(struct omap_muconst char *oh_name ="usb_otg_hs" ;struct musb_hdrc_platform_data *pdata; + core_pwrdm =pwrdm_lookup ("per_pwrdm" ); oh =omap_hwmod_lookup (oh_name);if (!oh) {@@ -97,6 +107,7 @@ void __init usb_musb_init(struct omap_mu musb_plat.extvbus = board_data->extvbus; pdata = &musb_plat; + oh_p = oh; od = omap_device_build(name, bus_id, oh, pdata, sizeof(struct musb_hdrc_platform_data),@@ -115,8 +126,101 @@ void __init usb_musb_init(struct omap_muput_device (dev); } +void musb_prepare_for_idle () +{ +int core_next_state; +struct omap_hwmod *oh = oh_p; +struct omap_device *od; +struct platform_device *pdev; +struct musb_hdrc_platform_data *pdata; +struct device *dev; + +if (!core_pwrdm) +return ; + + core_next_state =pwrdm_read_next_pwrst (core_pwrdm); +if (core_next_state >=PWRDM_POWER_INACTIVE ) +return ; +if (!oh) +return ; + + od = oh->od; + pdev = &od->pdev; + +if (!pdev) +return ; + dev = &pdev->dev;arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(struct omap_mu · line 162
Quoted 10 lines
arch/arm/mach-omap2/usb-musb.c +10
-0+ +if (dev->driver) { + pdata = dev->platform_data; + +if (pdata->is_usb_active) +if (!pdata->is_usb_active (dev)) { +if (core_next_state ==PWRDM_POWER_OFF ) { + pdata->save_context =1 ; +pm_runtime_put_sync (dev); + } else if (core_next_state ==
PWRDM_POWER_RET) {Quoted 32 lines
arch/arm/mach-omap2/usb-musb.c +32
-0+ pdata->save_context =0 ; +pm_runtime_put_sync (dev); + } + } + } +} + +void musb_wakeup_from_idle () +{ +int core_next_state; +int core_prev_state; +struct omap_hwmod *oh = oh_p; +struct omap_device *od; +struct platform_device *pdev; +struct device *dev; +struct musb_hdrc_platform_data *pdata; + +if (!core_pwrdm) +return ; + + core_next_state =pwrdm_read_next_pwrst (core_pwrdm); + +if (core_next_state >=PWRDM_POWER_INACTIVE ) +return ; + core_prev_state =pwrdm_read_prev_pwrst (core_pwrdm); + +if (!oh) +return ; + od = oh->od; + pdev = &od->pdev; + +if (!pdev)arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(struct omap_mu
Quoted 10 lines
arch/arm/mach-omap2/usb-musb.c +10
-0+return ; + + dev = &pdev->dev; + +if (dev->driver) { + pdata = dev->platform_data; + +if (pdata->is_usb_active) +if (!pdata->is_usb_active (dev)) { + if (core_prev_state ==
PWRDM_POWER_OFF) {Quoted 27 lines
arch/arm/mach-omap2/usb-musb.c +17
-0+ pdata->restore_context =1 ; + pm_runtime_get_sync(dev); + }else { + pdata->restore_context =0 ; +pm_runtime_get_sync (dev); + } + } + } +}#else void __init usb_musb_init (struct omap_musb_board_data *board_data) { } + +void musb_prepare_for_idle () +{ +} + +void musb_wakeup_from_idle () +{ +}#endif /* CONFIG_USB_MUSB_SOC */ Index:
linux-omap-pm/arch/arm/plat-omap/include/plat/usb.h
===================================================================arch/arm/plat-omap/include/plat/usb.h extern void usb_ehci_init(const struct e · line 80
Quoted 2 lines
arch/arm/plat-omap/include/plat/usb.h +0
-0@@ -79,6 +79,8 @@ extern void usb_ehci_init(const struct e extern void usb_ohci_init(const struct
ohci_hcd_omap_platform_data*pdata);Quoted 90 lines
arch/arm/plat-omap/include/plat/usb.h +2
-0+extern void musb_prepare_for_idle (void ); +extern void musb_wakeup_from_idle (void );#endif Index:
linux-omap-pm/drivers/usb/musb/musb_core.c
===================================================================drivers/usb/musb/musb_core.c +13
-2@@ -2410,6 +2410,7 @@ static int musb_suspend(struct device *dstruct platform_device *pdev =to_platform_device (dev);unsigned long flags;struct musb *musb =dev_to_musb (&pdev->dev); +struct musb_hdrc_platform_data *plat = dev->platform_data;if (!musb->clock)return 0 ;@@ -2425,6 +2426,9 @@ static int musb_suspend(struct device *d* they will even be wakeup-enabled. */ } + +if (plat->save_context) + plat->save_context =1 ;pm_runtime_put_sync (dev);#ifndef CONFIG_PM_RUNTIME @@ -2443,10 +2447,13 @@ static int musb_resume_noirq(struct devi {struct platform_device *pdev =to_platform_device (dev);struct musb *musb =dev_to_musb (&pdev->dev); +struct musb_hdrc_platform_data *plat = dev->platform_data;if (!musb->clock)return 0 ; +if (plat->restore_context) + plat->restore_context =1 ;pm_runtime_get_sync (dev);#ifndef CONFIG_PM_RUNTIME @@ -2468,16 +2475,20 @@ static int musb_resume_noirq(struct devistatic int musb_runtime_suspend (struct device *dev) {struct musb *musb =dev_to_musb (dev); +struct musb_hdrc_platform_data *plat = dev->platform_data; -musb_save_context (musb); +if (plat->save_context) +musb_save_context (musb);return 0 ; }static int musb_runtime_resume (struct device *dev) {struct musb *musb =dev_to_musb (dev); +struct musb_hdrc_platform_data *plat = dev->platform_data; -musb_restore_context (musb); +if (plat->restore_context) +musb_restore_context (musb);return 0 ; }static const struct dev_pm_ops musb_dev_pm_ops = {Index:
linux-omap-pm/drivers/usb/musb/omap2430.c
===================================================================drivers/usb/musb/omap2430.c +13
-0@@ -189,6 +189,19 @@ int musb_platform_set_mode(struct musb *return 0 ; } +int is_musb_active (struct device *dev) +{ +struct musb *musb; + +#ifdef CONFIG_USB_MUSB_HDRC_HCD +/* usbcore insists dev->driver_data is a "struct hcd *" */ + musb =hcd_to_musb (dev_get_drvdata (dev)); +#else + musb =dev_get_drvdata (dev); +#endif +return musb->is_active; +} +int __init musb_platform_init (struct musb *musb) {u32 l;drivers/usb/musb/omap2430.c int __init musb_platform_init(struct mus · line 247
Quoted 3 lines
drivers/usb/musb/omap2430.c +0
-0@@ -232,6 +245,7 @@ int __init musb_platform_init(struct mus musb->board_set_vbus = omap_set_vbus; setup_timer(&musb_idle_timer, musb_do_idle, (unsignedlong) musb);
Quoted 35 lines
drivers/usb/musb/omap2430.c +1
-0+ plat->is_usb_active = is_musb_active;return 0 ; }Index:
linux-omap-pm/include/linux/usb/musb.h
===================================================================include/linux/usb/musb.h +13
-0@@ -93,6 +93,8 @@ struct musb_hdrc_config { }; +struct device ; +struct musb_hdrc_platform_data {/* MUSB_HOST, MUSB_PERIPHERAL, or MUSB_OTG */ u8 mode;@@ -126,6 +128,17 @@ struct musb_hdrc_platform_data {/* Architecture specific board data */ void *board_data; + +/* check usb device active state*/ +int (*is_usb_active)(struct device *dev); + +/* +* Used for saving and restoring the registers only when core +* next state is off and previous state was off. +* Otherwise avoid save restore. +*/ +int save_context; +int restore_context; };
A message that is not in the archive (sent off-list or not yet received): E0D41E29EB0DAC4E9F3FF173962E9E9402DB3F8F1E-/tLxBxkBPtCIQmiDNMet8wC/[email protected]
Quoted 58 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Kalliguddi, Hema
Sent: Tuesday, September 28, 2010 10:07 AM
To: Kevin Hilman
Cc: [email protected]; [email protected]; Mankad, Maulik Ojas; Balbi, Felipe; Tony Lindgren; Cousson,
Benoit; Paul Walmsley
Subject: RE: [PATCH 9/9 v3] usb : musb: Offmode fix for idle pathKevin,
Quoted 35 lines
-----Original Message-----
From: Kevin Hilman [mailto:[email protected]]
Sent: Tuesday, September 28, 2010 12:27 AM
To: Kalliguddi, Hema
Cc: [email protected]; [email protected]; Mankad, Maulik Ojas; Balbi, Felipe; Tony Lindgren; Cousson,
Benoit; Paul Walmsley
Subject: Re: [PATCH 9/9 v3] usb : musb: Offmode fix for idle pathQuoted 11 lines · Hema
Quoted 11 lines
-----Original Message-----
From: Kevin Hilman [mailto:[email protected]]
Sent: Saturday, September 25, 2010 1:12 AM
To: Kalliguddi, Hema
Cc: [email protected]; [email protected]; Mankad, Maulik Ojas; Balbi, Felipe; Tony Lindgren; Cousson,
Benoit; Paul Walmsley
Subject: Re: [PATCH 9/9 v3] usb : musb: Offmode fix for idle pathHema HK <[email protected]> writes:
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
With OMAP core-off support musb was not functional as
context was getting
Quoted 1 line
lost after wakeup from core-off.
This should be a separate patch.
Let me give the description of the musb offmode support in
the idle path.
The detail you provided below is very good, and this is the level of detail that needs to go into the changelogs.
Quoted 9 lines
Quoted 1 line
With the current mainline code, offmode in the idle path is
not supported with usb.
Quoted 2 lines
When the core hits off and wakes up the musb will not be functional. This patch is to support the musb functionality with offmode
enabled in the idle path.
OK, what about the PM branch. I was under the impression that offmode was working fine in the PM branch.
Quoted 10 lines
In current PM branch, the core hits retention and off mode without usb drive loaded.
Once after loading the musb driver it may not retention/off also as the driver is
configuring musb in smart idle/standby. Even if it hits retention/off as it might
work sometimes,MUSB is not functional.because there is no context save/restore
done in the driver.
Just to clarify, I mean there is no context save/restore done in the sleep while idle path. It is done for global suspend path
Quoted 528 lines
Quoted 1 line
And, looking at the PM branch, the only thing done in the
idle path is
Quoted 3 lines
the disable of autoidle upon wakeup. Everything else (context save/restore etc.) is done in the driver.
No.There is no context save/restore done in the driver today.
Quoted 11 lines
Quoted 1 line
Below are the requirements to support retention and offmode
of OMAP in idle path with usb enabled
Quoted 3 lines
During idle and when there is no activity on the bus:
1.Since there is no hardware context save/restore supported
in OMAP for musb, software
Quoted 2 lines
has to save the context.
2.Configure the musb in force idle/standby mode during idle modeThis needs more detailed description (TRM reference, etc.)
I have provided the link to the public TRM and I had refered to the exact section
of the TRM sometime in the older version the patches, when Benoit and you had asked
for the description.Quoted 4 lines
Quoted 1 line
3.May or may not disable the interface clock(as interface
clock is autogated)
Quoted 2 lines
and the functional clock is from ULPI phy on triton chip.
Quoted 8 lines
Quoted 4 lines
When OMAP awakes:
1.enable the clock if it is disabled.and 2.Configure it back to no idle/standby or smart idle/standby
after wakeup.
In the PM branch, this part is done in idle.
I only see the disable autoidle bit function the idle path in pm branch.
There is no code for setting the no idle/standby or smart idle/standby bits
in the idle path.Quoted 4 lines
Quoted 1 line
3.Restore the context back.
But this is done by the driver.
No. current driver is not doing any context save/restore.
Quoted 37 lines
Quoted 1 line
Idling of device can be done when there is no activity on
the bus by using the
pm_runtime_put_sync
n> apis in when device disconnects or suspends, but resuming has to done as soon as the omap is wokenup fromQuoted 1 line
retention or core off, as we have to put back the musb in
known state ie restore the conext atleast
Quoted 1 line
enabling D+/D- lines,enabling interrupts and configuring the
no idle/standby or smart idle/standby
Quoted 1 line
to even capture the irqs. Otherwise we will not be able to
capture the musb connect/reset or resume/remote
Quoted 1 line
wakeup events as D+/D- lines will disabled when the context
is lost duribg offmode.
Quoted 2 lines
If I use the
pm_runtime_put_syncin disconnect/suspendhandler when device suspends/disconnects
Quoted 1 line
and use
pm_runtime_get_syncwhen OMAP wakesup, then therewill be mismatch in the usecount.
Quoted 2 lines
We could have achieved the same by using the triton
connect/disconnect events to idle/resume musb,
Quoted 3 lines
but some of the phys do not support the connect/disconnect events.
So cameup with the design of idling musb device in idle loop
and resume once the OMAP wakes up.
Quoted 1 line
All this done onl when the musb is not active.
Rather than seeing more work done in the idle path, I would rather be moving code out of the idle path.
Did you consider using a (deferrable) timer during no-activity times which periodically checks to be sure the IP is in force idle/standby?
Quoted 1 line
Since the IDLE REQ/ACK protocol is broken, the
recommendation from ip team is to
Quoted 1 line
configure the musb in force idle/standby during omap
retention and offmode.
Quoted 19 lines
Yes, this is in the PM branch and there is an errata number for it there. Please reference that errata when implementing this feature (both in the changelog and in the code.)
Kevin
Quoted 1 line
Since we have to touch the sysconfig registers and context
save/restore everytime,
Quoted 11 lines
I am using the runtime pm apis.
Quoted 9 lines
Quoted 2 lines
And also musb was blocking the core-off after loading the gadget driver even with no cable connected sometimes.
this too
Quoted 2 lines
Added the idle and wakeup APIs in the platform layer which will be called in the idle and wakeup path.
And this errata fix should be a separate patch, with
reference to the
Quoted 22 lines
Quoted 3 lines
Quoted 2 lines
errata etc.
This is not an errata, this is requirement from the ip. it
is mentioned in
Quoted 1 line
the functional spec that when device is not use put it in
force idle/standby mode.
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Used the
pm_runtime_put_syscAPI to configure the musb to force idle/standby modes, saving the context andQuoted 8 lines
Quoted 8 lines
disable the clk in
Quoted 1 line
while idling if there is no activity on the usb bus.
Why? This should not be part of the idle path.
If there is no activity on the bus, why hasn't the musb
driver already
Quoted 3 lines
Quoted 3 lines
runtime suspended itself?
If the driver want's to
runtime_suspenditself based onQuoted 20 lines
inactivity, it
Quoted 6 lines
Quoted 6 lines
should use an inactivity timer, not hook into the idle loop. The
runtime PM API has a function for a deferred suspendint
pm_schedule_suspend(struct device *dev, unsigned int delay)The only thing in the idle loop in the current code is the
errata fix,
Quoted 12 lines
Quoted 12 lines
and even that I'm not sure I'm ready to merge.
I'd really like to see even the errata fix out of the idle
path. I wonder ifusb-musb.ccould create a periodic,
deferrable timer
to fire that ensure that autoidle is disabled.Quoted 3 lines
Used the
pm_runtime_get_syncAPI to configure the musb to no idle/standby modes, enable the clock and restore the context after wakeup when there is no activity on the usb bus.Why would you wakeup MUSB in the idle path if there is no
activity on
Quoted 39 lines
Quoted 3 lines
Quoted 2 lines
the bus?
This is because MUSB has to be in known good state to
capture any musb interrupts.
Quoted 2 lines
Quoted 2 lines
I don't understand the motiviation or these last two
changes, and they
Quoted 32 lines
Quoted 2 lines
are a departure from the behavior of the previous code.
Can you please let mw know which 2 changes you reering to? You mean assing function to check whether the device is active and adding 2 flags for conext save/restore?
Quoted 26 lines
At a minimum, they should be separated into a separate patch, and thoroughly described, including an answer to "why?"
Kevin
Quoted 8 lines
Signed-off-by Hema HK <[email protected]>Signed-off-by Maulik Mankad <[email protected]>Cc Felipe Balbi <[email protected]>Cc Tony Lindgren <[email protected]>Cc Kevin Hilman <[email protected]>Cc Cousson, Benoit <[email protected]>Cc Paul Walmsley <[email protected]>Quoted 4 lines
--- arch/arm/mach-omap2/cpuidle34xx.c | 1 arch/arm/mach-omap2/pm34xx.c | 3 arch/arm/mach-omap2/usb-musb.c | 107++++++++++++++++++++++++++++++++++
Quoted 8 lines
arch/arm/plat-omap/include/plat/usb.h | 2 drivers/usb/musb/musb_core.c | 15 ++++ drivers/usb/musb/omap2430.c | 14 ++++ include/linux/usb/musb.h | 9 ++ 7 files changed, 149 insertions(+), 2 deletions(-)Index:
linux-omap-pm/arch/arm/mach-omap2/cpuidle34xx.c===================================================================
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
arch/arm/mach-omap2/cpuidle34xx.c +1
-0@@ -31,6 +31,7 @@#include <plat/clockdomain.h> #include <plat/control.h> #include <plat/serial.h> +#include <plat/usb.h> Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
arch/arm/mach-omap2/cpuidle34xx.c +0
-0#include "pm.h" Index:
linux-omap-pm/arch/arm/mach-omap2/pm34xx.c===================================================================
Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
arch/arm/mach-omap2/pm34xx.c +3
-0@@ -38,6 +38,7 @@#include <plat/prcm.h> #include <plat/gpmc.h> #include <plat/dma.h> +#include <plat/usb.h> #include <asm/tlbflush.h> @@ -324,11 +325,13 @@ static void restore_table_entry(void)void omap3_device_idle (void ) {omap2_gpio_prepare_for_idle (); +musb_prepare_for_idle (); }void omap3_device_resume (void ) {omap2_gpio_resume_after_idle (); +musb_wakeup_from_idle (); }Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
arch/arm/mach-omap2/pm34xx.c +0
-0void omap_sram_idle (void )Index:
linux-omap-pm/arch/arm/mach-omap2/usb-musb.c===================================================================
Quoted 46 lines
Quoted 46 lines
Quoted 46 lines
Quoted 46 lines
arch/arm/mach-omap2/usb-musb.c +10
-0@@ -25,16 +25,21 @@#include <linux/io.h> #include <linux/usb/musb.h> +#include <linux/pm_runtime.h> #include <mach/hardware.h> #include <mach/irqs.h> #include <plat/usb.h> #include <plat/omap_device.h> +#include <plat/powerdomain.h> #ifdef CONFIG_USB_MUSB_SOC static const char name[] ="musb_hdrc" ;#define MAX_OMAP_MUSB_HWMOD_NAME_LEN 16 +struct omap_hwmod *oh_p; +static struct powerdomain *core_pwrdm; +static struct musb_hdrc_config musb_config = { .multipoint =1 , .dyn_fifo = 1,@@ -58,6 +63,10 @@ static struct musb_hdrc_platform_data mu* "mode", and should be passed to usb_musb_init(). */ .power = 50, /* up to 100 mA */ + +/* OMAP supports offmode */ + .save_context = 1, + .restore_context = 1, };static u64 musb_dmamask =DMA_BIT_MASK (32 );@@ -80,6 +89,7 @@ void __init usb_musb_init(struct omap_muconst char *oh_name ="usb_otg_hs" ;struct musb_hdrc_platform_data *pdata; + core_pwrdm =pwrdm_lookup ("per_pwrdm" ); oh =omap_hwmod_lookup (oh_name);if (!oh) {@@ -97,6 +107,7 @@ void __init usb_musb_init(struct omap_mu musb_plat.extvbus = board_data->extvbus;Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(struct omap_mu · line 113
Quoted 5 lines
arch/arm/mach-omap2/usb-musb.c +1
-0pdata = &musb_plat; + oh_p = oh; od = omap_device_build(name, bus_id, oh, pdata, sizeof(struct
musb_hdrc_platform_data),Quoted 82 lines
Quoted 82 lines
Quoted 82 lines
Quoted 28 lines
arch/arm/mach-omap2/usb-musb.c +24
-0@@ -115,8 +126,101 @@ void __init usb_musb_init(struct omap_muput_device (dev); } +void musb_prepare_for_idle () +{ +int core_next_state; +struct omap_hwmod *oh = oh_p; +struct omap_device *od; +struct platform_device *pdev; +struct musb_hdrc_platform_data *pdata; +struct device *dev; + +if (!core_pwrdm) +return ; + + core_next_state =pwrdm_read_next_pwrst (core_pwrdm); +if (core_next_state >=PWRDM_POWER_INACTIVE ) +return ; +if (!oh) +return ; + + od = oh->od; + pdev = &od->pdev; + +if (!pdev) +return ; + dev = &pdev->dev;arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(struct omap_mu · line 162
Quoted 10 lines
arch/arm/mach-omap2/usb-musb.c +10
-0+ +if (dev->driver) { + pdata = dev->platform_data; + +if (pdata->is_usb_active) +if (!pdata->is_usb_active (dev)) { +if (core_next_state ==PWRDM_POWER_OFF ) { + pdata->save_context =1 ; +pm_runtime_put_sync (dev); + } else if (core_next_state ==
PWRDM_POWER_RET) {Quoted 32 lines
arch/arm/mach-omap2/usb-musb.c +32
-0+ pdata->save_context =0 ; +pm_runtime_put_sync (dev); + } + } + } +} + +void musb_wakeup_from_idle () +{ +int core_next_state; +int core_prev_state; +struct omap_hwmod *oh = oh_p; +struct omap_device *od; +struct platform_device *pdev; +struct device *dev; +struct musb_hdrc_platform_data *pdata; + +if (!core_pwrdm) +return ; + + core_next_state =pwrdm_read_next_pwrst (core_pwrdm); + +if (core_next_state >=PWRDM_POWER_INACTIVE ) +return ; + core_prev_state =pwrdm_read_prev_pwrst (core_pwrdm); + +if (!oh) +return ; + od = oh->od; + pdev = &od->pdev; + +if (!pdev)arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(struct omap_mu · line 204
Quoted 10 lines
arch/arm/mach-omap2/usb-musb.c +10
-0+return ; + + dev = &pdev->dev; + +if (dev->driver) { + pdata = dev->platform_data; + +if (pdata->is_usb_active) +if (!pdata->is_usb_active (dev)) { + if (core_prev_state ==
PWRDM_POWER_OFF) {Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(struct omap_mu · line 215
Quoted 11 lines
arch/arm/mach-omap2/usb-musb.c +9
-0+ pdata->restore_context =1 ; + pm_runtime_get_sync(dev); + }else { + pdata->restore_context =0 ; +pm_runtime_get_sync (dev); + } + } + } +}#else void __init usb_musb_init(struct omap_musb_board_data
*board_data)Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
arch/arm/mach-omap2/usb-musb.c +3
-0{ } + +void musb_prepare_for_idle () +{Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
arch/arm/mach-omap2/usb-musb.c +5
-0+} + +void musb_wakeup_from_idle () +{ +}#endif /* CONFIG_USB_MUSB_SOC */ Index:
linux-omap-pm/arch/arm/plat-omap/include/plat/usb.h===================================================================
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
arch/arm/plat-omap/include/plat/usb.h extern void usb_ehci_init(const struct e · line 80
Quoted 5 lines
arch/arm/plat-omap/include/plat/usb.h +0
-0@@ -79,6 +79,8 @@ extern void usb_ehci_init(const struct e extern void usb_ohci_init(const struct
ohci_hcd_omap_platform_data*pdata);Quoted 1 line
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
arch/arm/plat-omap/include/plat/usb.h +2
-0+extern void musb_prepare_for_idle (void ); +extern void musb_wakeup_from_idle (void );#endif Index:
linux-omap-pm/drivers/usb/musb/musb_core.c===================================================================
Quoted 51 lines
Quoted 51 lines
Quoted 51 lines
Quoted 51 lines
drivers/usb/musb/musb_core.c +11
-1@@ -2410,6 +2410,7 @@ static int musb_suspend(struct device *dstruct platform_device *pdev =to_platform_device (dev);unsigned long flags;struct musb *musb =dev_to_musb (&pdev->dev); +struct musb_hdrc_platform_data *plat = dev->platform_data;if (!musb->clock)return 0 ;@@ -2425,6 +2426,9 @@ static int musb_suspend(struct device *d* they will even be wakeup-enabled. */ } + +if (plat->save_context) + plat->save_context =1 ;pm_runtime_put_sync (dev);#ifndef CONFIG_PM_RUNTIME @@ -2443,10 +2447,13 @@ static int musb_resume_noirq(struct devi {struct platform_device *pdev =to_platform_device (dev);struct musb *musb =dev_to_musb (&pdev->dev); +struct musb_hdrc_platform_data *plat = dev->platform_data;if (!musb->clock)return 0 ; +if (plat->restore_context) + plat->restore_context =1 ;pm_runtime_get_sync (dev);#ifndef CONFIG_PM_RUNTIME @@ -2468,16 +2475,20 @@ static int musb_resume_noirq(struct devistatic int musb_runtime_suspend (struct device *dev) {struct musb *musb =dev_to_musb (dev); +struct musb_hdrc_platform_data *plat = dev->platform_data; -musb_save_context (musb); +if (plat->save_context) +musb_save_context (musb);return 0 ; }static int musb_runtime_resume (struct device *dev) {struct musb *musb =dev_to_musb (dev); +struct musb_hdrc_platform_data *plat = dev->platform_data;Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/usb/musb/musb_core.c +2
-1-musb_restore_context (musb); +if (plat->restore_context) +musb_restore_context (musb);return 0 ; }static const struct dev_pm_ops musb_dev_pm_ops = {Index:
linux-omap-pm/drivers/usb/musb/omap2430.c===================================================================
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
drivers/usb/musb/omap2430.c +13
-0@@ -189,6 +189,19 @@ int musb_platform_set_mode(struct musb *return 0 ; } +int is_musb_active (struct device *dev) +{ +struct musb *musb; + +#ifdef CONFIG_USB_MUSB_HDRC_HCD +/* usbcore insists dev->driver_data is a "struct hcd *" */ + musb =hcd_to_musb (dev_get_drvdata (dev)); +#else + musb =dev_get_drvdata (dev); +#endif +return musb->is_active; +} +int __init musb_platform_init (struct musb *musb) {u32 l;@@ -232,6 +245,7 @@ int __init musb_platform_init(struct mus musb->board_set_vbus = omap_set_vbus;Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/usb/musb/omap2430.c int __init musb_platform_init(struct mus · line 247
Quoted 1 line
drivers/usb/musb/omap2430.c +0
-0setup_timer(&musb_idle_timer, musb_do_idle, (unsignedlong) musb);
Quoted 6 lines
drivers/usb/musb/omap2430.c +1
-0+ plat->is_usb_active = is_musb_active;return 0 ; }Index:
linux-omap-pm/include/linux/usb/musb.h===================================================================
Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
include/linux/usb/musb.h +9
-0@@ -93,6 +93,8 @@ struct musb_hdrc_config { }; +struct device ; +struct musb_hdrc_platform_data {/* MUSB_HOST, MUSB_PERIPHERAL, or MUSB_OTG */ u8 mode;@@ -126,6 +128,17 @@ struct musb_hdrc_platform_data {/* Architecture specific board data */ void *board_data; + +/* check usb device active state*/ +int (*is_usb_active)(struct device *dev); + +/* +* Used for saving and restoring the registers only when core +* next state is off and previous state was off. Quoted 9 lines
Quoted 8 lines
Quoted 8 lines
include/linux/usb/musb.h struct musb_hdrc_platform_data { · line 144
Quoted 7 lines
include/linux/usb/musb.h +4
-0+* Otherwise avoid save restore. +*/ +int save_context; +int restore_context; };
Quoted 5 lines
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 50 lines · Hema
Quoted 35 lines
-----Original Message-----
From: Kevin Hilman [mailto:[email protected]]
Sent: Tuesday, September 28, 2010 12:27 AM
To: Kalliguddi, Hema
Cc: [email protected]; [email protected]; Mankad, Maulik Ojas; Balbi, Felipe; Tony Lindgren; Cousson, Benoit; Paul Walmsley
Subject: Re: [PATCH 9/9 v3] usb : musb: Offmode fix for idle pathQuoted 11 lines · Hema
Quoted 11 lines
-----Original Message-----
From: Kevin Hilman [mailto:[email protected]]
Sent: Saturday, September 25, 2010 1:12 AM
To: Kalliguddi, Hema
Cc: [email protected]; [email protected]; Mankad, Maulik Ojas; Balbi, Felipe; Tony Lindgren; Cousson, Benoit; Paul Walmsley
Subject: Re: [PATCH 9/9 v3] usb : musb: Offmode fix for idle pathHema HK <[email protected]> writes:
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
With OMAP core-off support musb was not functional as
context was getting
Quoted 1 line
lost after wakeup from core-off.
This should be a separate patch.
Let me give the description of the musb offmode support in
the idle path.
The detail you provided below is very good, and this is the level of detail that needs to go into the changelogs.
Quoted 9 lines
Quoted 1 line
With the current mainline code, offmode in the idle path is
not supported with usb.
Quoted 2 lines
When the core hits off and wakes up the musb will not be functional. This patch is to support the musb functionality with offmode
enabled in the idle path.
OK, what about the PM branch. I was under the impression that offmode was working fine in the PM branch.
In current PM branch, the core hits retention and off mode without usb drive loaded. Once after loading the musb driver it may not retention/off also as the driver is configuring musb in smart idle/standby. Even if it hits retention/off as it might work sometimes,MUSB is not functional.because there is no context save/restore done in the driver.
Quoted 5 lines
Quoted 4 lines
And, looking at the PM branch, the only thing done in the idle path is the disable of autoidle upon wakeup. Everything else (context save/restore etc.) is done in the driver.
No.There is no context save/restore done in the driver today.
There is, just not in the idle path as you pointed out.
The point of all this is that the changelog and documentation is not clear (at least to me) about all these details save/restore in idle, or in suspend/resume etc., and why the result is different (or needs to be different) from the current code.
Quoted 6 lines
Quoted 6 lines
Quoted 1 line
Below are the requirements to support retention and offmode
of OMAP in idle path with usb enabled
Quoted 3 lines
During idle and when there is no activity on the bus:
1.Since there is no hardware context save/restore supported
in OMAP for musb, software
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
has to save the context.
2.Configure the musb in force idle/standby mode during idle modeThis needs more detailed description (TRM reference, etc.)
I have provided the link to the public TRM and I had refered to the exact section of the TRM sometime in the older version the patches, when Benoit and you had asked for the description.
The TRM reference and detailed description in the code and in the changelog that introduces this feature.
Quoted 8 lines
Quoted 8 lines
Quoted 1 line
3.May or may not disable the interface clock(as interface
clock is autogated)
Quoted 6 lines
and the functional clock is from ULPI phy on triton chip.
When OMAP awakes:
1.enable the clock if it is disabled.and 2.Configure it back to no idle/standby or smart idle/standby
Quoted 7 lines
Quoted 4 lines
after wakeup.
In the PM branch, this part is done in idle.
I only see the disable autoidle bit function the idle path in pm branch. There is no code for setting the no idle/standby or smart idle/standby bits in the idle path.
Exactly.
So, in a separate patch, please describe in detail which parts need to be done in suspend/resume and which parts need to be done in idle and which parts need to be done in both. And please explain why.
As I mentioned in my original comments, this patch mixes many unrelated changes together into a single patch called 'offmode fix'.
Kevin
Quoted 475 lines
Quoted 4 lines
Quoted 1 line
3.Restore the context back.
But this is done by the driver.
No. current driver is not doing any context save/restore.
Quoted 469 lines
Quoted 1 line
Idling of device can be done when there is no activity on
the bus by using the
pm_runtime_put_sync
n> apis in when device disconnects or suspends, but resuming has to done as soon as the omap is wokenup fromQuoted 1 line
retention or core off, as we have to put back the musb in
known state ie restore the conext atleast
Quoted 1 line
enabling D+/D- lines,enabling interrupts and configuring the
no idle/standby or smart idle/standby
Quoted 1 line
to even capture the irqs. Otherwise we will not be able to
capture the musb connect/reset or resume/remote
Quoted 1 line
wakeup events as D+/D- lines will disabled when the context
is lost duribg offmode.
Quoted 2 lines
If I use the
pm_runtime_put_syncin disconnect/suspendhandler when device suspends/disconnects
Quoted 1 line
and use
pm_runtime_get_syncwhen OMAP wakesup, then therewill be mismatch in the usecount.
Quoted 2 lines
We could have achieved the same by using the triton
connect/disconnect events to idle/resume musb,
Quoted 3 lines
but some of the phys do not support the connect/disconnect events.
So cameup with the design of idling musb device in idle loop
and resume once the OMAP wakes up.
Quoted 1 line
All this done onl when the musb is not active.
Rather than seeing more work done in the idle path, I would rather be moving code out of the idle path.
Did you consider using a (deferrable) timer during no-activity times which periodically checks to be sure the IP is in force idle/standby?
Quoted 1 line
Since the IDLE REQ/ACK protocol is broken, the
recommendation from ip team is to
Quoted 1 line
configure the musb in force idle/standby during omap
retention and offmode.
Yes, this is in the PM branch and there is an errata number for it there. Please reference that errata when implementing this feature (both in the changelog and in the code.)
Kevin
Quoted 1 line
Since we have to touch the sysconfig registers and context
save/restore everytime,
Quoted 7 lines
I am using the runtime pm apis.
Quoted 5 lines
Quoted 2 lines
And also musb was blocking the core-off after loading the gadget driver even with no cable connected sometimes.
this too
Quoted 7 lines
Quoted 6 lines
Quoted 2 lines
Added the idle and wakeup APIs in the platform layer which will be called in the idle and wakeup path.
And this errata fix should be a separate patch, with reference to the errata etc.
This is not an errata, this is requirement from the ip. it
is mentioned in
Quoted 1 line
the functional spec that when device is not use put it in
force idle/standby mode.
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Used the
pm_runtime_put_syscAPI to configure the musb to force idle/standby modes, saving the context andQuoted 8 lines
Quoted 8 lines
disable the clk in
Quoted 1 line
while idling if there is no activity on the usb bus.
Why? This should not be part of the idle path.
If there is no activity on the bus, why hasn't the musb
driver already
Quoted 3 lines
Quoted 3 lines
runtime suspended itself?
If the driver want's to
runtime_suspenditself based oninactivity, it
Quoted 6 lines
Quoted 6 lines
should use an inactivity timer, not hook into the idle loop. The
runtime PM API has a function for a deferred suspendint
pm_schedule_suspend(struct device *dev, unsigned int delay)The only thing in the idle loop in the current code is the
errata fix,
Quoted 7 lines
Quoted 7 lines
and even that I'm not sure I'm ready to merge.
I'd really like to see even the errata fix out of the idle
path. I wonder ifusb-musb.ccould create a periodic,
deferrable timer
to fire that ensure that autoidle is disabled.Quoted 8 lines
Quoted 7 lines
Quoted 3 lines
Used the
pm_runtime_get_syncAPI to configure the musb to no idle/standby modes, enable the clock and restore the context after wakeup when there is no activity on the usb bus.Why would you wakeup MUSB in the idle path if there is no activity on the bus?
This is because MUSB has to be in known good state to
capture any musb interrupts.
Quoted 2 lines
Quoted 2 lines
I don't understand the motiviation or these last two
changes, and they
Quoted 363 lines
Quoted 2 lines
are a departure from the behavior of the previous code.
Can you please let mw know which 2 changes you reering to? You mean assing function to check whether the device is active and adding 2 flags for conext save/restore?
Quoted 357 lines
At a minimum, they should be separated into a separate patch, and thoroughly described, including an answer to "why?"
Kevin
Quoted 8 lines
Signed-off-by Hema HK <[email protected]>Signed-off-by Maulik Mankad <[email protected]>Cc Felipe Balbi <[email protected]>Cc Tony Lindgren <[email protected]>Cc Kevin Hilman <[email protected]>Cc Cousson, Benoit <[email protected]>Cc Paul Walmsley <[email protected]>Quoted 4 lines
--- arch/arm/mach-omap2/cpuidle34xx.c | 1 arch/arm/mach-omap2/pm34xx.c | 3 arch/arm/mach-omap2/usb-musb.c | 107++++++++++++++++++++++++++++++++++
Quoted 125 lines
arch/arm/plat-omap/include/plat/usb.h | 2 drivers/usb/musb/musb_core.c | 15 ++++ drivers/usb/musb/omap2430.c | 14 ++++ include/linux/usb/musb.h | 9 ++ 7 files changed, 149 insertions(+), 2 deletions(-)Index:
linux-omap-pm/arch/arm/mach-omap2/cpuidle34xx.c
===================================================================arch/arm/mach-omap2/cpuidle34xx.c +1
-0@@ -31,6 +31,7 @@#include <plat/clockdomain.h> #include <plat/control.h> #include <plat/serial.h> +#include <plat/usb.h> #include "pm.h" Index:
linux-omap-pm/arch/arm/mach-omap2/pm34xx.c
===================================================================arch/arm/mach-omap2/pm34xx.c +3
-0@@ -38,6 +38,7 @@#include <plat/prcm.h> #include <plat/gpmc.h> #include <plat/dma.h> +#include <plat/usb.h> #include <asm/tlbflush.h> @@ -324,11 +325,13 @@ static void restore_table_entry(void)void omap3_device_idle (void ) {omap2_gpio_prepare_for_idle (); +musb_prepare_for_idle (); }void omap3_device_resume (void ) {omap2_gpio_resume_after_idle (); +musb_wakeup_from_idle (); }void omap_sram_idle (void )Index:
linux-omap-pm/arch/arm/mach-omap2/usb-musb.c
===================================================================arch/arm/mach-omap2/usb-musb.c +35
-0@@ -25,16 +25,21 @@#include <linux/io.h> #include <linux/usb/musb.h> +#include <linux/pm_runtime.h> #include <mach/hardware.h> #include <mach/irqs.h> #include <plat/usb.h> #include <plat/omap_device.h> +#include <plat/powerdomain.h> #ifdef CONFIG_USB_MUSB_SOC static const char name[] ="musb_hdrc" ;#define MAX_OMAP_MUSB_HWMOD_NAME_LEN 16 +struct omap_hwmod *oh_p; +static struct powerdomain *core_pwrdm; +static struct musb_hdrc_config musb_config = { .multipoint =1 , .dyn_fifo = 1,@@ -58,6 +63,10 @@ static struct musb_hdrc_platform_data mu* "mode", and should be passed to usb_musb_init(). */ .power = 50, /* up to 100 mA */ + +/* OMAP supports offmode */ + .save_context = 1, + .restore_context = 1, };static u64 musb_dmamask =DMA_BIT_MASK (32 );@@ -80,6 +89,7 @@ void __init usb_musb_init(struct omap_muconst char *oh_name ="usb_otg_hs" ;struct musb_hdrc_platform_data *pdata; + core_pwrdm =pwrdm_lookup ("per_pwrdm" ); oh =omap_hwmod_lookup (oh_name);if (!oh) {@@ -97,6 +107,7 @@ void __init usb_musb_init(struct omap_mu musb_plat.extvbus = board_data->extvbus; pdata = &musb_plat; + oh_p = oh; od = omap_device_build(name, bus_id, oh, pdata, sizeof(struct musb_hdrc_platform_data),@@ -115,8 +126,101 @@ void __init usb_musb_init(struct omap_muput_device (dev); } +void musb_prepare_for_idle () +{ +int core_next_state; +struct omap_hwmod *oh = oh_p; +struct omap_device *od; +struct platform_device *pdev; +struct musb_hdrc_platform_data *pdata; +struct device *dev; + +if (!core_pwrdm) +return ; + + core_next_state =pwrdm_read_next_pwrst (core_pwrdm); +if (core_next_state >=PWRDM_POWER_INACTIVE ) +return ; +if (!oh) +return ; + + od = oh->od; + pdev = &od->pdev; + +if (!pdev) +return ; + dev = &pdev->dev;arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(struct omap_mu · line 162
Quoted 10 lines
arch/arm/mach-omap2/usb-musb.c +10
-0+ +if (dev->driver) { + pdata = dev->platform_data; + +if (pdata->is_usb_active) +if (!pdata->is_usb_active (dev)) { +if (core_next_state ==PWRDM_POWER_OFF ) { + pdata->save_context =1 ; +pm_runtime_put_sync (dev); + } else if (core_next_state ==
PWRDM_POWER_RET) {Quoted 32 lines
arch/arm/mach-omap2/usb-musb.c +32
-0+ pdata->save_context =0 ; +pm_runtime_put_sync (dev); + } + } + } +} + +void musb_wakeup_from_idle () +{ +int core_next_state; +int core_prev_state; +struct omap_hwmod *oh = oh_p; +struct omap_device *od; +struct platform_device *pdev; +struct device *dev; +struct musb_hdrc_platform_data *pdata; + +if (!core_pwrdm) +return ; + + core_next_state =pwrdm_read_next_pwrst (core_pwrdm); + +if (core_next_state >=PWRDM_POWER_INACTIVE ) +return ; + core_prev_state =pwrdm_read_prev_pwrst (core_pwrdm); + +if (!oh) +return ; + od = oh->od; + pdev = &od->pdev; + +if (!pdev)arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(struct omap_mu
Quoted 10 lines
arch/arm/mach-omap2/usb-musb.c +10
-0+return ; + + dev = &pdev->dev; + +if (dev->driver) { + pdata = dev->platform_data; + +if (pdata->is_usb_active) +if (!pdata->is_usb_active (dev)) { + if (core_prev_state ==
PWRDM_POWER_OFF) {Quoted 27 lines
arch/arm/mach-omap2/usb-musb.c +17
-0+ pdata->restore_context =1 ; + pm_runtime_get_sync(dev); + }else { + pdata->restore_context =0 ; +pm_runtime_get_sync (dev); + } + } + } +}#else void __init usb_musb_init (struct omap_musb_board_data *board_data) { } + +void musb_prepare_for_idle () +{ +} + +void musb_wakeup_from_idle () +{ +}#endif /* CONFIG_USB_MUSB_SOC */ Index:
linux-omap-pm/arch/arm/plat-omap/include/plat/usb.h
===================================================================arch/arm/plat-omap/include/plat/usb.h extern void usb_ehci_init(const struct e · line 80
Quoted 2 lines
arch/arm/plat-omap/include/plat/usb.h +0
-0@@ -79,6 +79,8 @@ extern void usb_ehci_init(const struct e extern void usb_ohci_init(const struct
ohci_hcd_omap_platform_data*pdata);Quoted 90 lines
arch/arm/plat-omap/include/plat/usb.h +2
-0+extern void musb_prepare_for_idle (void ); +extern void musb_wakeup_from_idle (void );#endif Index:
linux-omap-pm/drivers/usb/musb/musb_core.c
===================================================================drivers/usb/musb/musb_core.c +13
-2@@ -2410,6 +2410,7 @@ static int musb_suspend(struct device *dstruct platform_device *pdev =to_platform_device (dev);unsigned long flags;struct musb *musb =dev_to_musb (&pdev->dev); +struct musb_hdrc_platform_data *plat = dev->platform_data;if (!musb->clock)return 0 ;@@ -2425,6 +2426,9 @@ static int musb_suspend(struct device *d* they will even be wakeup-enabled. */ } + +if (plat->save_context) + plat->save_context =1 ;pm_runtime_put_sync (dev);#ifndef CONFIG_PM_RUNTIME @@ -2443,10 +2447,13 @@ static int musb_resume_noirq(struct devi {struct platform_device *pdev =to_platform_device (dev);struct musb *musb =dev_to_musb (&pdev->dev); +struct musb_hdrc_platform_data *plat = dev->platform_data;if (!musb->clock)return 0 ; +if (plat->restore_context) + plat->restore_context =1 ;pm_runtime_get_sync (dev);#ifndef CONFIG_PM_RUNTIME @@ -2468,16 +2475,20 @@ static int musb_resume_noirq(struct devistatic int musb_runtime_suspend (struct device *dev) {struct musb *musb =dev_to_musb (dev); +struct musb_hdrc_platform_data *plat = dev->platform_data; -musb_save_context (musb); +if (plat->save_context) +musb_save_context (musb);return 0 ; }static int musb_runtime_resume (struct device *dev) {struct musb *musb =dev_to_musb (dev); +struct musb_hdrc_platform_data *plat = dev->platform_data; -musb_restore_context (musb); +if (plat->restore_context) +musb_restore_context (musb);return 0 ; }static const struct dev_pm_ops musb_dev_pm_ops = {Index:
linux-omap-pm/drivers/usb/musb/omap2430.c
===================================================================drivers/usb/musb/omap2430.c +13
-0@@ -189,6 +189,19 @@ int musb_platform_set_mode(struct musb *return 0 ; } +int is_musb_active (struct device *dev) +{ +struct musb *musb; + +#ifdef CONFIG_USB_MUSB_HDRC_HCD +/* usbcore insists dev->driver_data is a "struct hcd *" */ + musb =hcd_to_musb (dev_get_drvdata (dev)); +#else + musb =dev_get_drvdata (dev); +#endif +return musb->is_active; +} +int __init musb_platform_init (struct musb *musb) {u32 l;drivers/usb/musb/omap2430.c int __init musb_platform_init(struct mus · line 247
Quoted 3 lines
drivers/usb/musb/omap2430.c +0
-0@@ -232,6 +245,7 @@ int __init musb_platform_init(struct mus musb->board_set_vbus = omap_set_vbus; setup_timer(&musb_idle_timer, musb_do_idle, (unsignedlong) musb);
Quoted 35 lines
drivers/usb/musb/omap2430.c +1
-0+ plat->is_usb_active = is_musb_active;return 0 ; }Index:
linux-omap-pm/include/linux/usb/musb.h
===================================================================include/linux/usb/musb.h +13
-0@@ -93,6 +93,8 @@ struct musb_hdrc_config { }; +struct device ; +struct musb_hdrc_platform_data {/* MUSB_HOST, MUSB_PERIPHERAL, or MUSB_OTG */ u8 mode;@@ -126,6 +128,17 @@ struct musb_hdrc_platform_data {/* Architecture specific board data */ void *board_data; + +/* check usb device active state*/ +int (*is_usb_active)(struct device *dev); + +/* +* Used for saving and restoring the registers only when core +* next state is off and previous state was off. +* Otherwise avoid save restore. +*/ +int save_context; +int restore_context; };
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 74 lines
-----Original Message-----
From: Kevin Hilman [mailto:[email protected]]
Sent: Tuesday, September 28, 2010 9:14 PM
To: Kalliguddi, Hema
Cc: [email protected]; [email protected]; Mankad, Maulik Ojas; Balbi, Felipe; Tony Lindgren; Cousson,
Benoit; Paul Walmsley
Subject: Re: [PATCH 9/9 v3] usb : musb: Offmode fix for idle pathQuoted 30 lines · Hema
Quoted 30 lines
-----Original Message-----
From: Kevin Hilman [mailto:[email protected]]
Sent: Tuesday, September 28, 2010 12:27 AM
To: Kalliguddi, Hema
Cc: [email protected]; [email protected]; Mankad, Maulik Ojas; Balbi, Felipe; Tony Lindgren; Cousson,
Benoit; Paul Walmsley
Subject: Re: [PATCH 9/9 v3] usb : musb: Offmode fix for idle pathQuoted 19 lines · Hema
Quoted 9 lines
-----Original Message-----
From: Kevin Hilman [mailto:[email protected]]
Sent: Saturday, September 25, 2010 1:12 AM
To: Kalliguddi, Hema
Cc: [email protected]; [email protected]; Mankad, Maulik Ojas; Balbi, Felipe; Tony Lindgren; Cousson,
Benoit; Paul Walmsley
Subject: Re: [PATCH 9/9 v3] usb : musb: Offmode fix for idle pathQuoted 8 lines
Quoted 1 line · Hema HK
With OMAP core-off support musb was not functional as
context was getting
Quoted 1 line
lost after wakeup from core-off.
This should be a separate patch.
Let me give the description of the musb offmode support in
Quoted 8 lines
Quoted 8 lines
the idle path.
The detail you provided below is very good, and this is the level of detail that needs to go into the changelogs.
Quoted 1 line
With the current mainline code, offmode in the idle path is
not supported with usb.
Quoted 1 line
When the core hits off and wakes up the musb will not be
functional.
Quoted 4 lines
Quoted 4 lines
Quoted 1 line
This patch is to support the musb functionality with offmode
enabled in the idle path.
OK, what about the PM branch. I was under the impression
that offmode
Quoted 3 lines
Quoted 2 lines
was working fine in the PM branch.
In current PM branch, the core hits retention and off mode
without usb drive loaded.
Quoted 1 line
Once after loading the musb driver it may not retention/off
also as the driver is
Quoted 1 line
configuring musb in smart idle/standby. Even if it hits
retention/off as it might
Quoted 1 line
work sometimes,MUSB is not functional.because there is no
context save/restore
Quoted 3 lines
done in the driver.
Quoted 1 line
And, looking at the PM branch, the only thing done in the
idle path is
Quoted 3 lines
Quoted 3 lines
the disable of autoidle upon wakeup. Everything else (context save/restore etc.) is done in the driver.
Quoted 9 lines
Quoted 1 line
No.There is no context save/restore done in the driver today.
There is, just not in the idle path as you pointed out.
The point of all this is that the changelog and documentation is not clear (at least to me) about all these details save/restore in idle, or in suspend/resume etc., and why the result is different (or needs to be different) from the current code.
There is no difference in the settings or the result in the idle path or global suspend/resume path.
GLOBAL SUSPEND/RESUME:
-------------------------
In the current PM line, musb is configured to force idle and forcestandby mode by default when the device is registered.
When there is no driver loaded, theere is no issue, core hits retention/offmode.
When the musb driver is loaded, it configures it into smart idle/standby mode. So when pm_ops .suspend/resume apis are called during global suspend/resume, context save/restore and clock disable/enable is happening, the observation is that sometimes, the core hits retention/offmode, but not consistently.
The recomandation from the ip team to configure it to force idle/standby mode when device is not used.
For the global suspend/resume, this is being achieved by setting the oh flags (HWMOD_SWSUP_SIDLE and HWMOD_SWSUP_MSTANDBY)in the hwmod data structure for OMAP2 OMAP3 and OMAP4.Description of why these flags are needed are mentioned in the respective patches.
By calling runtime put_sync and get_sync apis in the driver pm_ops .suspend/resume will configure the musb in the required mode and save/restore the context is taken care in the runtime_suspend/resume hooks.
This change is done in the [PATCH 8/9 v3] usb : musb: Using runtime pm apis for musb.
IDLE PATH RRETENTION/OFFMODE SUPPORT:
-------------------------------------
The current pm line musb is not functional when the core hits offmode and wakesup. This patch is to support offmode/retention with musb functional.
This patch has only the required changes for supporting the musb with with idle path offmode.
This patch is only for supporting offmode with musb in the idle path. No other changes as part of this patch.
Quoted 40 lines
Quoted 4 lines
Quoted 4 lines
Quoted 1 line
Below are the requirements to support retention and offmode
of OMAP in idle path with usb enabled
Quoted 2 lines
During idle and when there is no activity on the bus:
Quoted 8 lines
Quoted 7 lines
Quoted 1 line
1.Since there is no hardware context save/restore supported
in OMAP for musb, software
Quoted 2 lines
has to save the context.
2.Configure the musb in force idle/standby mode during idle modeThis needs more detailed description (TRM reference, etc.)
I have provided the link to the public TRM and I had refered
to the exact section
Quoted 1 line
of the TRM sometime in the older version the patches, when
Benoit and you had asked
Quoted 1 line
for the description.
The TRM reference and detailed description in the code and in the changelog that introduces this feature.
Quoted 6 lines
Quoted 6 lines
Quoted 1 line
3.May or may not disable the interface clock(as interface
clock is autogated)
Quoted 4 lines
and the functional clock is from ULPI phy on triton chip.
When OMAP awakes:
Quoted 7 lines
Quoted 6 lines
Quoted 2 lines
1.enable the clock if it is disabled.and 2.Configure it back to no idle/standby or smart idle/standby
after wakeup.
In the PM branch, this part is done in idle.
I only see the disable autoidle bit function the idle path
in pm branch.
Quoted 1 line
There is no code for setting the no idle/standby or smart
idle/standby bits
Quoted 1 line
in the idle path.
Exactly.
Quoted 67 lines
So, in a separate patch, please describe in detail which parts need to be done in suspend/resume and which parts need to be done in idle and which parts need to be done in both. And please explain why.
As I mentioned in my original comments, this patch mixes many unrelated changes together into a single patch called 'offmode fix'.
Kevin
Quoted 57 lines
Quoted 4 lines
Quoted 1 line
3.Restore the context back.
But this is done by the driver.
No. current driver is not doing any context save/restore.
Quoted 51 lines
Quoted 1 line
Idling of device can be done when there is no activity on
the bus by using the
pm_runtime_put_sync
n> apis in when device disconnects or suspends, but resuming has to done as soon as the omap is wokenup fromQuoted 1 line
retention or core off, as we have to put back the musb in
known state ie restore the conext atleast
Quoted 1 line
enabling D+/D- lines,enabling interrupts and configuring the
no idle/standby or smart idle/standby
Quoted 1 line
to even capture the irqs. Otherwise we will not be able to
capture the musb connect/reset or resume/remote
Quoted 1 line
wakeup events as D+/D- lines will disabled when the context
is lost duribg offmode.
Quoted 2 lines
If I use the
pm_runtime_put_syncin disconnect/suspendhandler when device suspends/disconnects
Quoted 1 line
and use
pm_runtime_get_syncwhen OMAP wakesup, then therewill be mismatch in the usecount.
Quoted 2 lines
We could have achieved the same by using the triton
connect/disconnect events to idle/resume musb,
Quoted 3 lines
but some of the phys do not support the connect/disconnect events.
So cameup with the design of idling musb device in idle loop
and resume once the OMAP wakes up.
Quoted 1 line
All this done onl when the musb is not active.
Rather than seeing more work done in the idle path, I would rather be moving code out of the idle path.
Did you consider using a (deferrable) timer during no-activity times which periodically checks to be sure the IP is in force idle/standby?
Quoted 1 line
Since the IDLE REQ/ACK protocol is broken, the
recommendation from ip team is to
Quoted 1 line
configure the musb in force idle/standby during omap
retention and offmode.
Yes, this is in the PM branch and there is an errata number for it there. Please reference that errata when implementing this feature (both in the changelog and in the code.)
Kevin
Quoted 1 line
Since we have to touch the sysconfig registers and context
save/restore everytime,
Quoted 6 lines
I am using the runtime pm apis.
Quoted 4 lines
Quoted 2 lines
And also musb was blocking the core-off after loading the gadget driver even with no cable connected sometimes.
this too
There is no changes done in this patch for this. This is taken care of by using oh flags in the respective hwmod data structure addition patches.
I will remove this changelog from this patch.
Quoted 22 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 3 lines
Added the idle and wakeup APIs in the platform layer which will be called in the idle and wakeup path.
And this errata fix should be a separate patch, with
reference to the
Quoted 16 lines
Quoted 16 lines
Quoted 3 lines
Quoted 2 lines
errata etc.
This is not an errata, this is requirement from the ip. it
is mentioned in
Quoted 1 line
the functional spec that when device is not use put it in
force idle/standby mode.
Quoted 10 lines
Quoted 9 lines
Quoted 4 lines
Used the
pm_runtime_put_syscAPI to configure the musb to force idle/standby modes, saving the context anddisable the clk in
Quoted 1 line
while idling if there is no activity on the usb bus.
Why? This should not be part of the idle path.
I hope I have answered this in my previous description.
Quoted 389 lines
Quoted 21 lines
Quoted 21 lines
Quoted 2 lines
Quoted 2 lines
If there is no activity on the bus, why hasn't the musb
driver already
Quoted 3 lines
Quoted 3 lines
runtime suspended itself?
If the driver want's to
runtime_suspenditself based oninactivity, it
Quoted 6 lines
Quoted 6 lines
should use an inactivity timer, not hook into the idle loop. The
runtime PM API has a function for a deferred suspendint
pm_schedule_suspend(struct device *dev, unsigned int delay)The only thing in the idle loop in the current code is the
errata fix,
Quoted 7 lines
Quoted 7 lines
and even that I'm not sure I'm ready to merge.
I'd really like to see even the errata fix out of the idle
path. I wonder ifusb-musb.ccould create a periodic,
deferrable timer
to fire that ensure that autoidle is disabled.Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 3 lines
Used the
pm_runtime_get_syncAPI to configure the musb to no idle/standby modes, enable the clock and restore the context after wakeup when there is no activity on the usb bus.Why would you wakeup MUSB in the idle path if there is no
activity on
Quoted 31 lines
Quoted 31 lines
Quoted 3 lines
Quoted 2 lines
the bus?
This is because MUSB has to be in known good state to
capture any musb interrupts.
Quoted 2 lines
Quoted 2 lines
I don't understand the motiviation or these last two
changes, and they
Quoted 24 lines
Quoted 2 lines
are a departure from the behavior of the previous code.
Can you please let mw know which 2 changes you reering to? You mean assing function to check whether the device is active and adding 2 flags for conext save/restore?
Quoted 18 lines
At a minimum, they should be separated into a separate patch, and thoroughly described, including an answer to "why?"
Kevin
Quoted 8 lines
Signed-off-by Hema HK <[email protected]>Signed-off-by Maulik Mankad <[email protected]>Cc Felipe Balbi <[email protected]>Cc Tony Lindgren <[email protected]>Cc Kevin Hilman <[email protected]>Cc Cousson, Benoit <[email protected]>Cc Paul Walmsley <[email protected]>Quoted 4 lines
--- arch/arm/mach-omap2/cpuidle34xx.c | 1 arch/arm/mach-omap2/pm34xx.c | 3 arch/arm/mach-omap2/usb-musb.c | 107++++++++++++++++++++++++++++++++++
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
arch/arm/plat-omap/include/plat/usb.h | 2 drivers/usb/musb/musb_core.c | 15 ++++ drivers/usb/musb/omap2430.c | 14 ++++ include/linux/usb/musb.h | 9 ++ 7 files changed, 149 insertions(+), 2 deletions(-)Index:
linux-omap-pm/arch/arm/mach-omap2/cpuidle34xx.c===================================================================
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
arch/arm/mach-omap2/cpuidle34xx.c +1
-0@@ -31,6 +31,7 @@#include <plat/clockdomain.h> #include <plat/control.h> #include <plat/serial.h> +#include <plat/usb.h> Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
arch/arm/mach-omap2/cpuidle34xx.c +0
-0#include "pm.h" Index:
linux-omap-pm/arch/arm/mach-omap2/pm34xx.c===================================================================
Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
arch/arm/mach-omap2/pm34xx.c +3
-0@@ -38,6 +38,7 @@#include <plat/prcm.h> #include <plat/gpmc.h> #include <plat/dma.h> +#include <plat/usb.h> #include <asm/tlbflush.h> @@ -324,11 +325,13 @@ static void restore_table_entry(void)void omap3_device_idle (void ) {omap2_gpio_prepare_for_idle (); +musb_prepare_for_idle (); }void omap3_device_resume (void ) {omap2_gpio_resume_after_idle (); +musb_wakeup_from_idle (); }Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
arch/arm/mach-omap2/pm34xx.c +0
-0void omap_sram_idle (void )Index:
linux-omap-pm/arch/arm/mach-omap2/usb-musb.c===================================================================
Quoted 46 lines
Quoted 46 lines
Quoted 46 lines
Quoted 46 lines
Quoted 46 lines
arch/arm/mach-omap2/usb-musb.c +10
-0@@ -25,16 +25,21 @@#include <linux/io.h> #include <linux/usb/musb.h> +#include <linux/pm_runtime.h> #include <mach/hardware.h> #include <mach/irqs.h> #include <plat/usb.h> #include <plat/omap_device.h> +#include <plat/powerdomain.h> #ifdef CONFIG_USB_MUSB_SOC static const char name[] ="musb_hdrc" ;#define MAX_OMAP_MUSB_HWMOD_NAME_LEN 16 +struct omap_hwmod *oh_p; +static struct powerdomain *core_pwrdm; +static struct musb_hdrc_config musb_config = { .multipoint =1 , .dyn_fifo = 1,@@ -58,6 +63,10 @@ static struct musb_hdrc_platform_data mu* "mode", and should be passed to usb_musb_init(). */ .power = 50, /* up to 100 mA */ + +/* OMAP supports offmode */ + .save_context = 1, + .restore_context = 1, };static u64 musb_dmamask =DMA_BIT_MASK (32 );@@ -80,6 +89,7 @@ void __init usb_musb_init(struct omap_muconst char *oh_name ="usb_otg_hs" ;struct musb_hdrc_platform_data *pdata; + core_pwrdm =pwrdm_lookup ("per_pwrdm" ); oh =omap_hwmod_lookup (oh_name);if (!oh) {@@ -97,6 +107,7 @@ void __init usb_musb_init(struct omap_mu musb_plat.extvbus = board_data->extvbus;Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(struct omap_mu · line 113
Quoted 5 lines
arch/arm/mach-omap2/usb-musb.c +1
-0pdata = &musb_plat; + oh_p = oh; od = omap_device_build(name, bus_id, oh, pdata, sizeof(struct
musb_hdrc_platform_data),Quoted 82 lines
Quoted 82 lines
Quoted 82 lines
Quoted 82 lines
Quoted 28 lines
arch/arm/mach-omap2/usb-musb.c +24
-0@@ -115,8 +126,101 @@ void __init usb_musb_init(struct omap_muput_device (dev); } +void musb_prepare_for_idle () +{ +int core_next_state; +struct omap_hwmod *oh = oh_p; +struct omap_device *od; +struct platform_device *pdev; +struct musb_hdrc_platform_data *pdata; +struct device *dev; + +if (!core_pwrdm) +return ; + + core_next_state =pwrdm_read_next_pwrst (core_pwrdm); +if (core_next_state >=PWRDM_POWER_INACTIVE ) +return ; +if (!oh) +return ; + + od = oh->od; + pdev = &od->pdev; + +if (!pdev) +return ; + dev = &pdev->dev;arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(struct omap_mu · line 162
Quoted 10 lines
arch/arm/mach-omap2/usb-musb.c +10
-0+ +if (dev->driver) { + pdata = dev->platform_data; + +if (pdata->is_usb_active) +if (!pdata->is_usb_active (dev)) { +if (core_next_state ==PWRDM_POWER_OFF ) { + pdata->save_context =1 ; +pm_runtime_put_sync (dev); + } else if (core_next_state ==
PWRDM_POWER_RET) {Quoted 32 lines
arch/arm/mach-omap2/usb-musb.c +32
-0+ pdata->save_context =0 ; +pm_runtime_put_sync (dev); + } + } + } +} + +void musb_wakeup_from_idle () +{ +int core_next_state; +int core_prev_state; +struct omap_hwmod *oh = oh_p; +struct omap_device *od; +struct platform_device *pdev; +struct device *dev; +struct musb_hdrc_platform_data *pdata; + +if (!core_pwrdm) +return ; + + core_next_state =pwrdm_read_next_pwrst (core_pwrdm); + +if (core_next_state >=PWRDM_POWER_INACTIVE ) +return ; + core_prev_state =pwrdm_read_prev_pwrst (core_pwrdm); + +if (!oh) +return ; + od = oh->od; + pdev = &od->pdev; + +if (!pdev)arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(struct omap_mu · line 204
Quoted 10 lines
arch/arm/mach-omap2/usb-musb.c +10
-0+return ; + + dev = &pdev->dev; + +if (dev->driver) { + pdata = dev->platform_data; + +if (pdata->is_usb_active) +if (!pdata->is_usb_active (dev)) { + if (core_prev_state ==
PWRDM_POWER_OFF) {Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
arch/arm/mach-omap2/usb-musb.c void __init usb_musb_init(struct omap_mu · line 215
Quoted 11 lines
arch/arm/mach-omap2/usb-musb.c +9
-0+ pdata->restore_context =1 ; + pm_runtime_get_sync(dev); + }else { + pdata->restore_context =0 ; +pm_runtime_get_sync (dev); + } + } + } +}#else void __init usb_musb_init(struct omap_musb_board_data
*board_data)Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
arch/arm/mach-omap2/usb-musb.c +3
-0{ } + +void musb_prepare_for_idle () +{Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
arch/arm/mach-omap2/usb-musb.c +5
-0+} + +void musb_wakeup_from_idle () +{ +}#endif /* CONFIG_USB_MUSB_SOC */ Index:
linux-omap-pm/arch/arm/plat-omap/include/plat/usb.h===================================================================
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
arch/arm/plat-omap/include/plat/usb.h extern void usb_ehci_init(const struct e · line 80
Quoted 5 lines
arch/arm/plat-omap/include/plat/usb.h +0
-0@@ -79,6 +79,8 @@ extern void usb_ehci_init(const struct e extern void usb_ohci_init(const struct
ohci_hcd_omap_platform_data*pdata);Quoted 1 line
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
arch/arm/plat-omap/include/plat/usb.h +2
-0+extern void musb_prepare_for_idle (void ); +extern void musb_wakeup_from_idle (void );#endif Index:
linux-omap-pm/drivers/usb/musb/musb_core.c===================================================================
Quoted 51 lines
Quoted 51 lines
Quoted 51 lines
Quoted 51 lines
Quoted 51 lines
drivers/usb/musb/musb_core.c +11
-1@@ -2410,6 +2410,7 @@ static int musb_suspend(struct device *dstruct platform_device *pdev =to_platform_device (dev);unsigned long flags;struct musb *musb =dev_to_musb (&pdev->dev); +struct musb_hdrc_platform_data *plat = dev->platform_data;if (!musb->clock)return 0 ;@@ -2425,6 +2426,9 @@ static int musb_suspend(struct device *d* they will even be wakeup-enabled. */ } + +if (plat->save_context) + plat->save_context =1 ;pm_runtime_put_sync (dev);#ifndef CONFIG_PM_RUNTIME @@ -2443,10 +2447,13 @@ static int musb_resume_noirq(struct devi {struct platform_device *pdev =to_platform_device (dev);struct musb *musb =dev_to_musb (&pdev->dev); +struct musb_hdrc_platform_data *plat = dev->platform_data;if (!musb->clock)return 0 ; +if (plat->restore_context) + plat->restore_context =1 ;pm_runtime_get_sync (dev);#ifndef CONFIG_PM_RUNTIME @@ -2468,16 +2475,20 @@ static int musb_resume_noirq(struct devistatic int musb_runtime_suspend (struct device *dev) {struct musb *musb =dev_to_musb (dev); +struct musb_hdrc_platform_data *plat = dev->platform_data; -musb_save_context (musb); +if (plat->save_context) +musb_save_context (musb);return 0 ; }static int musb_runtime_resume (struct device *dev) {struct musb *musb =dev_to_musb (dev); +struct musb_hdrc_platform_data *plat = dev->platform_data;Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/usb/musb/musb_core.c +2
-1-musb_restore_context (musb); +if (plat->restore_context) +musb_restore_context (musb);return 0 ; }static const struct dev_pm_ops musb_dev_pm_ops = {Index:
linux-omap-pm/drivers/usb/musb/omap2430.c===================================================================
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
drivers/usb/musb/omap2430.c +13
-0@@ -189,6 +189,19 @@ int musb_platform_set_mode(struct musb *return 0 ; } +int is_musb_active (struct device *dev) +{ +struct musb *musb; + +#ifdef CONFIG_USB_MUSB_HDRC_HCD +/* usbcore insists dev->driver_data is a "struct hcd *" */ + musb =hcd_to_musb (dev_get_drvdata (dev)); +#else + musb =dev_get_drvdata (dev); +#endif +return musb->is_active; +} +int __init musb_platform_init (struct musb *musb) {u32 l;@@ -232,6 +245,7 @@ int __init musb_platform_init(struct mus musb->board_set_vbus = omap_set_vbus;Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/usb/musb/omap2430.c int __init musb_platform_init(struct mus · line 247
Quoted 1 line
drivers/usb/musb/omap2430.c +0
-0setup_timer(&musb_idle_timer, musb_do_idle, (unsignedlong) musb);
Quoted 6 lines
drivers/usb/musb/omap2430.c +1
-0+ plat->is_usb_active = is_musb_active;return 0 ; }Index:
linux-omap-pm/include/linux/usb/musb.h===================================================================
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
include/linux/usb/musb.h +2
-0@@ -93,6 +93,8 @@ struct musb_hdrc_config { }; +struct device ; +struct musb_hdrc_platform_data {/* MUSB_HOST, MUSB_PERIPHERAL, or MUSB_OTG */ u8 mode;@@ -126,6 +128,17 @@ struct musb_hdrc_platform_data {
Quoted 20 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
include/linux/usb/musb.h struct musb_hdrc_platform_data { · line 136
Quoted 8 lines
include/linux/usb/musb.h +6
-0/* Architecture specific board data */ void *board_data; + +/* check usb device active state*/ +int (*is_usb_active)(struct device *dev); + +/* +* Used for saving and restoring the registers only when core
Quoted 10 lines
Quoted 10 lines
Quoted 9 lines
Quoted 9 lines
Quoted 8 lines
include/linux/usb/musb.h +5
-0+* next state is off and previous state was off. +* Otherwise avoid save restore. +*/ +int save_context; +int restore_context; };
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html