usb: musb_dsps: support for suspend and resume
Subsystems (2)
v3 cover usb: musb_dsps: support for suspend and resume
v3 of my musb_dsps suspend patches.
With these patches applied, I can successfully bring an AM335x board to suspend with a USB media connected, and access it again after resume.
This works for both PIO mode and CPPI41 enabled configurations, together with Sebasitian's and my cppi41 patches recently posted.
Felipe, this work was rebased and now applies cleanly on top of your current 'next' branch. IOW, on top of "usb: musb: cppi41: allow to defer probing if DMA isn't yet available".
Thanks,
Daniel
v2 -> v3
* dropped "usb: musb: move port reset to worker" which is not crucial for this series.
* added another cosmetic cleanup patch (#5)
Daniel Mack (5):
usb: musb: call musb_port_suspend from musb_bus_suspend
usb: musb: conditionally save and restore the context on suspend
usb: musb: dsps: add {tx,rx}_mode to wrapper
usb: musb: dsps: add support for suspend and resume
usb: musb: dsps: indentation and whitespace fixes
drivers/usb/musb/musb_core.c | 17 +++++++- drivers/usb/musb/musb_core.h | 1 + drivers/usb/musb/musb_dsps.c | 86 +++++++++++++++++++++++++++++++++++------ drivers/usb/musb/musb_host.c | 2 + drivers/usb/musb/musb_host.h | 4 ++ drivers/usb/musb/musb_virthub.c | 4 +- include/linux/usb/musb.h | 1 + 7 files changed, 100 insertions(+), 15 deletions(-)
Signature · 1 line
1.8.3.1
A message that is not in the archive (sent off-list or not yet received): 1382089175-13487-1-git-send-email-zonque-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
PATCH v3 5/5 usb: musb: dsps: indentation and whitespace fixes
Just a cosmetic thing, no functional change.
--- drivers/usb/musb/musb_dsps.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)
drivers/usb/musb/musb_dsps.c +11 -12
@@ -131,9 +131,9 @@ struct dsps_context {struct dsps_glue {struct device *dev;struct platform_device *musb;/* child musb pdev */ -const struct dsps_musb_wrapper *wrp;/* wrapper register offsets */ +const struct dsps_musb_wrapper *wrp;/* wrapper register offsets */ struct timer_list timer;/* otg_workaround timer */ -unsigned long last_timer;/* last timer data for each instance */ +unsigned long last_timer;/* last timer data for each instance */ struct dsps_context context; };
@@ -213,7 +213,7 @@ static void dsps_musb_disable(struct musb *musb)dsps_writel (reg_base, wrp->coreintr_clear, wrp->usb_bitmap);dsps_writel (reg_base, wrp->epintr_clear, - wrp->txep_bitmap | wrp->rxep_bitmap); + wrp->txep_bitmap | wrp->rxep_bitmap);dsps_writeb (musb->mregs,MUSB_DEVCTL ,0 ); }
@@ -234,7 +234,7 @@ static void otg_timer(unsigned long _musb)*/ devctl =dsps_readb (mregs,MUSB_DEVCTL );dev_dbg (musb->controller,"Poll devctl %02x (%s)\n" , devctl, -usb_otg_state_string (musb->xceiv->state)); +usb_otg_state_string (musb->xceiv->state));spin_lock_irqsave (&musb->lock, flags);switch (musb->xceiv->state) {
@@ -298,7 +298,7 @@ static irqreturn_t dsps_interrupt(int irq, void *hci)dsps_writel (reg_base, wrp->coreintr_status, usbintr);dev_dbg (musb->controller,"usbintr (%x) epintr(%x)\n" , - usbintr, epintr); + usbintr, epintr);/* * DRVVBUS IRQs are the only proxy we have (a very poor one!) for * DSPS IP's missing ID change IRQ. We need an ID change IRQ to
@@ -348,10 +348,9 @@ static irqreturn_t dsps_interrupt(int irq, void *hci)/* NOTE: this must complete power-on within 100 ms. */ dev_dbg (musb->controller,"VBUS %s (%s)%s, devctl %02x\n" , - drvvbus ?"on" :"off" , -usb_otg_state_string (musb->xceiv->state), - err ?" ERROR" :"" , - devctl); + drvvbus ?"on" :"off" , +usb_otg_state_string (musb->xceiv->state), + err ?" ERROR" :"" , devctl); ret =IRQ_HANDLED ; }
@@ -692,9 +691,9 @@ static SIMPLE_DEV_PM_OPS(dsps_pm_ops, dsps_suspend, dsps_resume);static struct platform_driver dsps_usbss_driver = { .probe = dsps_probe, - .remove = dsps_remove, - .driver = { - .name ="musb-dsps" , + .remove = dsps_remove, + .driver = { + .name ="musb-dsps" , .pm = &dsps_pm_ops, .of_match_table = musb_dsps_of_match, },
Signature · 6 lines
1.8.3.1 -- 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 6 lines · Daniel Mack
v3 of my
musb_dspssuspend patches.With these patches applied, I can successfully bring an AM335x board to suspend with a USB media connected, and access it again after resume.
Quoted 6 lines
This works for both PIO mode and CPPI41 enabled configurations, together with Sebasitian's and my cppi41 patches recently posted.
Felipe, this work was rebased and now applies cleanly on top of your current 'next' branch. IOW, on top of "usb: musb: cppi41: allow to defer probing if DMA isn't yet available".
Sounds good. What happend to the patch series where you used a workqueue do defer some sleeping code that caused "sleeping while atomic" warnings?
Quoted 4 lines
Thanks,
Daniel
Sebastian
--
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): [email protected]
Quoted 10 lines · Sebastian Andrzej Siewior
Quoted 9 lines · Daniel Mack
v3 of my
musb_dspssuspend patches.With these patches applied, I can successfully bring an AM335x board to suspend with a USB media connected, and access it again after resume.
This works for both PIO mode and CPPI41 enabled configurations, together with Sebasitian's and my cppi41 patches recently posted.
Quoted 7 lines
Quoted 3 lines
Felipe, this work was rebased and now applies cleanly on top of your current 'next' branch. IOW, on top of "usb: musb: cppi41: allow to defer probing if DMA isn't yet available".
Sounds good. What happend to the patch series where you used a workqueue do defer some sleeping code that caused "sleeping while atomic" warnings?
As mentioned, that doesn't hit me anymore with the current patch stack.
That doesn't mean we should ignore that issue, of course, we're still sleeping while atomic. But I removed the patch from the series for now, so we can address that separately.
Thanks,
Daniel
--
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 5 lines · Daniel Mack
As mentioned, that doesn't hit me anymore with the current patch stack.
That doesn't mean we should ignore that issue, of course, we're still sleeping while atomic. But I removed the patch from the series for now, so we can address that separately.
Ach okay, I though you found a different solution.
Quoted 3 lines
Thanks,
Daniel
Sebastian
Quoted 7 lines · Sebastian Andrzej Siewior
Quoted 6 lines · Daniel Mack
v3 of my
musb_dspssuspend patches.With these patches applied, I can successfully bring an AM335x board to suspend with a USB media connected, and access it again after resume.
Quoted 8 lines
Quoted 6 lines
This works for both PIO mode and CPPI41 enabled configurations, together with Sebasitian's and my cppi41 patches recently posted.
Felipe, this work was rebased and now applies cleanly on top of your current 'next' branch. IOW, on top of "usb: musb: cppi41: allow to defer probing if DMA isn't yet available".
Sounds good.
Felipe, do you think that series is good to be taken for 3.13?
Thanks,
Daniel
--
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
PATCH v3 1/5 usb: musb: call musb_port_suspend from musb_bus_suspend
In reply to Daniel MackMake musb_port_suspend() externally available, and call it when to host goes into suspend. This allows the core to go into suspend while a device is connected.
--- drivers/usb/musb/musb_host.c | 2 ++ drivers/usb/musb/musb_host.h | 2 ++ drivers/usb/musb/musb_virthub.c | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-)
drivers/usb/musb/musb_host.c +2 -0
@@ -2433,6 +2433,8 @@ static int musb_bus_suspend(struct usb_hcd *hcd)struct musb *musb =hcd_to_musb (hcd);u8 devctl; +musb_port_suspend (musb, true); +if (!is_host_active (musb))return 0 ;
drivers/usb/musb/musb_host.h +2 -0
@@ -92,6 +92,7 @@ extern void musb_host_rx(struct musb *, u8);extern void musb_root_disconnect (struct musb *musb);extern void musb_host_resume_root_hub (struct musb *musb);extern void musb_host_poke_root_hub (struct musb *musb); +extern void musb_port_suspend (struct musb *musb,bool do_suspend);#else static inline struct musb *hcd_to_musb (struct usb_hcd *hcd) {
@@ -121,6 +122,7 @@ static inline void musb_root_disconnect(struct musb *musb) {}static inline void musb_host_resume_root_hub (struct musb *musb) {}static inline void musb_host_poll_rh_status (struct musb *musb) {}static inline void musb_host_poke_root_hub (struct musb *musb) {} +static inline void musb_port_suspend (struct musb *musb,bool do_suspend) {}#endif struct usb_hcd ;
drivers/usb/musb/musb_virthub.c +1 -1
@@ -44,7 +44,7 @@#include "musb_core.h" -static void musb_port_suspend (struct musb *musb,bool do_suspend) +void musb_port_suspend (struct musb *musb,bool do_suspend) {struct usb_otg *otg = musb->xceiv->otg;u8 power;
Signature · 1 line
1.8.3.1
PATCH v3 2/5 usb: musb: conditionally save and restore the context on suspend
In reply to Daniel MackIt appears not all platforms featuring a musb core need to save the musb core registers at suspend time and restore them on resume.
The dsps platform does, however. So add a bit in struct musb_hdrc_platform_data to let platforms specify their need of such action being taken.
--- drivers/usb/musb/musb_core.c | 17 ++++++++++++++++- include/linux/usb/musb.h | 1 + 2 files changed, 17 insertions(+), 1 deletion(-)
drivers/usb/musb/musb_core.c +16 -1
@@ -2200,6 +2200,7 @@ static int musb_suspend(struct device *dev) {struct musb *musb =dev_to_musb (dev);unsigned long flags; +struct musb_hdrc_platform_data *plat =dev_get_platdata (dev);spin_lock_irqsave (&musb->lock, flags);
@@ -2213,16 +2214,30 @@ static int musb_suspend(struct device *dev)*/ } +if (plat->restore_after_suspend) +musb_save_context (musb); +spin_unlock_irqrestore (&musb->lock, flags);return 0 ; }static int musb_resume_noirq (struct device *dev) { -/* for static cmos like DaVinci, register values were preserved +struct musb *musb =dev_to_musb (dev); +struct musb_hdrc_platform_data *plat =dev_get_platdata (dev); + +/* +* For static cmos like DaVinci, register values were preserved * unless for some reason the whole soc powered down or the USB * module got reset through the PSC (vs just being disabled). +* +* The plaform data tells us about the necessity of saving and +* restoring the context across a suspend cycle. */ + +if (plat->restore_after_suspend) +musb_restore_context (musb); +return 0 ; }
include/linux/usb/musb.h +1 -0
@@ -100,6 +100,7 @@ struct musb_hdrc_platform_data {u8 mode; u8 has_mailbox:1; + u8 restore_after_suspend:1;/* for clk_get() */ const char *clock;
Signature · 1 line
1.8.3.1
PATCH v3 3/5 usb: musb: dsps: add {tx,rx}_mode to wrapper
In reply to Daniel Mackrx_mode and tx_mode need to be read at suspend time and restored on resume for dsps platforms. So add it to the wrapper struct first, and initialize the values.
--- drivers/usb/musb/musb_dsps.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/musb/musb_dsps.c +4 -0
@@ -83,6 +83,8 @@ struct dsps_musb_wrapper {u16 coreintr_status;u16 phy_utmi;u16 mode; +u16 tx_mode; +u16 rx_mode;/* bit positions for control */ unsigned reset:5;
@@ -605,6 +607,8 @@ static const struct dsps_musb_wrapper am33xx_driver_data = { .coreintr_status = 0x34, .phy_utmi = 0xe0, .mode = 0xe8, + .tx_mode = 0x70, + .rx_mode = 0x74, .reset = 0, .otg_disable = 21, .iddig = 8,
Signature · 1 line
1.8.3.1
PATCH v3 4/5 usb: musb: dsps: add support for suspend and resume
In reply to Daniel MackThe dsps platform needs to save save some registers at suspend time and restore them after resume. This patch adds a struct for these registers, and also lets the musb core know that the core registers need to be saved as well.
We also have to call musb_port_reset() for this platform upon resume, so this function has to be made non-static.
--- drivers/usb/musb/musb_core.h | 1 + drivers/usb/musb/musb_dsps.c | 59 +++++++++++++++++++++++++++++++++++++++++ drivers/usb/musb/musb_host.h | 2 ++ drivers/usb/musb/musb_virthub.c | 2 +- 4 files changed, 63 insertions(+), 1 deletion(-)
drivers/usb/musb/musb_core.h +1 -0
@@ -294,6 +294,7 @@ struct musb {irqreturn_t (*isr)(int ,void *);struct work_struct irq_work; +u16 hwvers;u16 intrrxe;
drivers/usb/musb/musb_dsps.c +59 -0
88 lines not on this page · raw message
drivers/usb/musb/musb_host.h +2 -0
@@ -93,6 +93,7 @@ extern void musb_root_disconnect(struct musb *musb);extern void musb_host_resume_root_hub (struct musb *musb);extern void musb_host_poke_root_hub (struct musb *musb);extern void musb_port_suspend (struct musb *musb,bool do_suspend); +extern void musb_port_reset (struct musb *musb,bool do_reset);#else static inline struct musb *hcd_to_musb (struct usb_hcd *hcd) {
@@ -123,6 +124,7 @@ static inline void musb_host_resume_root_hub(struct musb *musb) {}static inline void musb_host_poll_rh_status (struct musb *musb) {}static inline void musb_host_poke_root_hub (struct musb *musb) {}static inline void musb_port_suspend (struct musb *musb,bool do_suspend) {} +static inline void musb_port_reset (struct musb *musb) {}#endif struct usb_hcd ;
drivers/usb/musb/musb_virthub.c +1 -1
@@ -109,7 +109,7 @@ void musb_port_suspend(struct musb *musb, bool do_suspend) } } -static void musb_port_reset (struct musb *musb,bool do_reset) +void musb_port_reset (struct musb *musb,bool do_reset) {u8 power;void __iomem *mbase = musb->mregs;
Signature · 1 line
1.8.3.1
Re: [PATCH v3 4/5] usb: musb: dsps: add support for suspend and resume
Quoted 13 lines · Daniel Mack
drivers/usb/musb/musb_dsps.c +5
-0@@ -632,11 +648,54 @@ static const struct of_device_id musb_dsps_of_match[] = { };MODULE_DEVICE_TABLE (of, musb_dsps_of_match); +#ifdef CONFIG_PM +static int dsps_suspend (struct device *dev) +{ +struct dsps_glue *glue =dev_get_drvdata (dev); +const struct dsps_musb_wrapper *wrp = glue->wrp;
drivers/usb/musb/musb_dsps.c static const struct of_device_id musb_dsps_of_match[] = { · line 665
Quoted 10 lines
drivers/usb/musb/musb_dsps.c +10
-0+struct musb *musb =platform_get_drvdata (glue->musb); +void __iomem *mbase = musb->ctrl_base; + + glue->context.control =dsps_readl (mbase, wrp->control); + glue->context.epintr =dsps_readl (mbase, wrp->epintr_set); + glue->context.coreintr =dsps_readl (mbase, wrp->coreintr_set); + glue->context.phy_utmi =dsps_readl (mbase, wrp->phy_utmi); + glue->context.mode =dsps_readl (mbase, wrp->mode); + glue->context.tx_mode =dsps_readl (mbase, wrp->tx_mode); + glue->context.rx_mode =dsps_readl (mbase, wrp->rx_mode);
Looking at this made me wonder, what about
drivers/usb/phy/phy-am335x-control.c
Since it seems to work for you, maybe we don't need this after all :P
Sebastian
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH v3 4/5] usb: musb: dsps: add support for suspend and resume
Quoted 28 lines · Sebastian Andrzej Siewior
Quoted 13 lines · Daniel Mack
drivers/usb/musb/musb_dsps.c +5
-0@@ -632,11 +648,54 @@ static const struct of_device_id musb_dsps_of_match[] = { };MODULE_DEVICE_TABLE (of, musb_dsps_of_match); +#ifdef CONFIG_PM +static int dsps_suspend (struct device *dev) +{ +struct dsps_glue *glue =dev_get_drvdata (dev); +const struct dsps_musb_wrapper *wrp = glue->wrp;drivers/usb/musb/musb_dsps.c static const struct of_device_id musb_dsps_of_match[] = { · line 665
Quoted 10 lines
drivers/usb/musb/musb_dsps.c +10
-0+struct musb *musb =platform_get_drvdata (glue->musb); +void __iomem *mbase = musb->ctrl_base; + + glue->context.control =dsps_readl (mbase, wrp->control); + glue->context.epintr =dsps_readl (mbase, wrp->epintr_set); + glue->context.coreintr =dsps_readl (mbase, wrp->coreintr_set); + glue->context.phy_utmi =dsps_readl (mbase, wrp->phy_utmi); + glue->context.mode =dsps_readl (mbase, wrp->mode); + glue->context.tx_mode =dsps_readl (mbase, wrp->tx_mode); + glue->context.rx_mode =dsps_readl (mbase, wrp->rx_mode);Looking at this made me wonder, what about
Quoted 3 lines
drivers/usb/phy/phy-am335x-control.cSince it seems to work for you, maybe we don't need this after all :P
Yes, I thought that needs fixing as well, but at least on my system, it doesn't. So I skipped that for now.
Daniel
--
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