musb/dsps: suspend related patches for 3.14 (rebased)
Subsystems (2)
v2 cover musb/dsps: suspend related patches for 3.14 (rebased)
v1 -> v2:
* *un*conditionally save and restore registers upon suspend/resume rather than only doing it for the DSPS glue.
* do not call musb_port_reset() from glue, but rather introduce a flag and let musb-hdrc.ko do it.
* dropped 'usb: musb: dsps: indentation and whitespace fixes'
Daniel Mack (4):
usb: musb: unconditionally save and restore the context on suspend
usb: musb: call musb_port_suspend from musb_bus_suspend
usb: musb: dsps: add {tx,rx}_mode to wrapper
usb: musb: dsps: add support for suspend and resume
drivers/usb/musb/musb_core.c | 14 ++++++++- drivers/usb/musb/musb_dsps.c | 64 +++++++++++++++++++++++++++++++++++++++++ drivers/usb/musb/musb_host.c | 9 +++++- drivers/usb/musb/musb_host.h | 4 +++ drivers/usb/musb/musb_virthub.c | 4 +-- include/linux/usb/musb.h | 3 ++ 6 files changed, 94 insertions(+), 4 deletions(-)
Signature · 1 line
1.8.4.2
A message that is not in the archive (sent off-list or not yet received): 1385414803-13212-1-git-send-email-zonque-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
PATCH v2 3/4 usb: musb: dsps: add {tx,rx}_mode to wrapper
rx_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 · 6 lines
1.8.4.2 -- 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 v2 4/4 usb: musb: dsps: add support for suspend and resume
In reply to a message not in the archiveThe 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 explicitly de-assert the port reset upon resume on this platform, but musb_port_reset() should not be called from glue layers.
Hence, introduce a flag in struct musb_hdrc_config for this.
--- drivers/usb/musb/musb_dsps.c | 60 +++++++++++++++++++++++++++++++++++++++++ drivers/usb/musb/musb_host.c | 7 ++++- drivers/usb/musb/musb_host.h | 2 ++ drivers/usb/musb/musb_virthub.c | 2 +- include/linux/usb/musb.h | 3 +++ 5 files changed, 72 insertions(+), 2 deletions(-)
drivers/usb/musb/musb_dsps.c +60 -0
@@ -112,6 +112,19 @@ struct dsps_musb_wrapper {u8 poll_seconds; }; +/* +* register shadow for suspend +*/ +struct dsps_context { +u32 control; +u32 epintr; +u32 coreintr; +u32 phy_utmi; +u32 mode; +u32 tx_mode; +u32 rx_mode; +}; +/** * DSPS glue structure. */
@@ -121,6 +134,8 @@ struct dsps_glue {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 */ + +struct dsps_context context; };static void dsps_musb_try_idle (struct musb *musb,unsigned long timeout)
@@ -506,9 +521,11 @@ static int dsps_create_musb_pdev(struct dsps_glue *glue, } pdata.config = config; pdata.platform_ops = &dsps_ops; + pdata.restore_after_suspend =1 ; config->num_eps =get_int_prop (dn,"mentor,num-eps" ); config->ram_bits =get_int_prop (dn,"mentor,ram-bits" ); + config->host_port_deassert_reset_at_resume =1 ; pdata.mode =get_musb_port_mode (dev);/* DT keeps this entry in mA, musb expects it as per USB spec */ pdata.power =get_int_prop (dn,"mentor,power" ) /2 ;
@@ -632,11 +649,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; +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); + +return 0 ; +} + +static int dsps_resume (struct device *dev) +{ +struct dsps_glue *glue =dev_get_drvdata (dev); +const struct dsps_musb_wrapper *wrp = glue->wrp; +struct musb *musb =platform_get_drvdata (glue->musb); +void __iomem *mbase = musb->ctrl_base; + +dsps_writel (mbase, wrp->control, glue->context.control); +dsps_writel (mbase, wrp->epintr_set, glue->context.epintr); +dsps_writel (mbase, wrp->coreintr_set, glue->context.coreintr); +dsps_writel (mbase, wrp->phy_utmi, glue->context.phy_utmi); +dsps_writel (mbase, wrp->mode, glue->context.mode); +dsps_writel (mbase, wrp->tx_mode, glue->context.tx_mode); +dsps_writel (mbase, wrp->rx_mode, glue->context.rx_mode); + +//musb_port_reset(musb, false); + +return 0 ; +} +#endif + +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" , + .pm = &dsps_pm_ops, .of_match_table = musb_dsps_of_match, }, };
drivers/usb/musb/musb_host.c +6 -1
@@ -2464,7 +2464,12 @@ static int musb_bus_suspend(struct usb_hcd *hcd)static int musb_bus_resume (struct usb_hcd *hcd) { -/* resuming child port does the work */ +struct musb *musb =hcd_to_musb (hcd); + +if (musb->config && + musb->config->host_port_deassert_reset_at_resume) +musb_port_reset (musb, false); +return 0 ; }
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;
include/linux/usb/musb.h +3 -0
@@ -76,6 +76,9 @@ struct musb_hdrc_config { unsigned dma:1 __deprecated; /* supports DMA */ unsigned vendor_req:1 __deprecated; /* vendor registers required */ +/* need to explicitly de-assert the port reset after resume? */ + unsigned host_port_deassert_reset_at_resume:1; +u8 num_eps;/* number of endpoints _with_ ep0 */ u8 dma_channels__deprecated ;/* number of dma channels */ u8 dyn_fifo_size;/* dynamic size in bytes */
Signature · 6 lines
1.8.4.2 -- 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
Re: [PATCH v2 4/4] usb: musb: dsps: add support for suspend and resume
Hi,
Quoted 6 lines · Daniel Mack
drivers/usb/musb/musb_dsps.c +6
-0+static int dsps_resume (struct device *dev) +{ +struct dsps_glue *glue =dev_get_drvdata (dev); +const struct dsps_musb_wrapper *wrp = glue->wrp; +struct musb *musb =platform_get_drvdata (glue->musb); +void __iomem *mbase = musb->ctrl_base;
drivers/usb/musb/musb_dsps.c static const struct of_device_id musb_dsps_of_match[] = { · line 686
Quoted 10 lines
drivers/usb/musb/musb_dsps.c +10
-0+ +dsps_writel (mbase, wrp->control, glue->context.control); +dsps_writel (mbase, wrp->epintr_set, glue->context.epintr); +dsps_writel (mbase, wrp->coreintr_set, glue->context.coreintr); +dsps_writel (mbase, wrp->phy_utmi, glue->context.phy_utmi); +dsps_writel (mbase, wrp->mode, glue->context.mode); +dsps_writel (mbase, wrp->tx_mode, glue->context.tx_mode); +dsps_writel (mbase, wrp->rx_mode, glue->context.rx_mode); + +//musb_port_reset(musb, false);
????
Signature · 1 line
balbi
Re: [PATCH v2 4/4] usb: musb: dsps: add support for suspend and resume
Quoted 13 lines · Felipe Balbi
Hi,
Quoted 10 lines · Daniel Mack
drivers/usb/musb/musb_dsps.c +10
-0+static int dsps_resume (struct device *dev) +{ +struct dsps_glue *glue =dev_get_drvdata (dev); +const struct dsps_musb_wrapper *wrp = glue->wrp; +struct musb *musb =platform_get_drvdata (glue->musb); +void __iomem *mbase = musb->ctrl_base; + +dsps_writel (mbase, wrp->control, glue->context.control); +dsps_writel (mbase, wrp->epintr_set, glue->context.epintr); +dsps_writel (mbase, wrp->coreintr_set, glue->context.coreintr);
Quoted 9 lines
drivers/usb/musb/musb_dsps.c static const struct of_device_id musb_dsps_of_match[] = { · line 686
Quoted 6 lines
drivers/usb/musb/musb_dsps.c +6
-0+dsps_writel (mbase, wrp->phy_utmi, glue->context.phy_utmi); +dsps_writel (mbase, wrp->mode, glue->context.mode); +dsps_writel (mbase, wrp->tx_mode, glue->context.tx_mode); +dsps_writel (mbase, wrp->rx_mode, glue->context.rx_mode); + +//musb_port_reset(musb, false); ????
Urgs. Development left-over. Sorry. You want me to resend the whole series or just this last patch?
Daniel
Re: [PATCH v2 4/4] usb: musb: dsps: add support for suspend and resume
Quoted 24 lines · Daniel Mack
Quoted 13 lines · Felipe Balbi
Hi,
Quoted 10 lines · Daniel Mack
drivers/usb/musb/musb_dsps.c +10
-0+static int dsps_resume (struct device *dev) +{ +struct dsps_glue *glue =dev_get_drvdata (dev); +const struct dsps_musb_wrapper *wrp = glue->wrp; +struct musb *musb =platform_get_drvdata (glue->musb); +void __iomem *mbase = musb->ctrl_base; + +dsps_writel (mbase, wrp->control, glue->context.control); +dsps_writel (mbase, wrp->epintr_set, glue->context.epintr); +dsps_writel (mbase, wrp->coreintr_set, glue->context.coreintr);Quoted 9 lines
drivers/usb/musb/musb_dsps.c static const struct of_device_id musb_dsps_of_match[] = { · line 686
Quoted 6 lines
drivers/usb/musb/musb_dsps.c +6
-0+dsps_writel (mbase, wrp->phy_utmi, glue->context.phy_utmi); +dsps_writel (mbase, wrp->mode, glue->context.mode); +dsps_writel (mbase, wrp->tx_mode, glue->context.tx_mode); +dsps_writel (mbase, wrp->rx_mode, glue->context.rx_mode); + +//musb_port_reset(musb, false); ????
Quoted 2 lines
Urgs. Development left-over. Sorry. You want me to resend the whole series or just this last patch?
just the last patch is fine :-)
Signature · 1 line
balbi
Re: [PATCH v2 4/4] usb: musb: dsps: add support for suspend and resume
Quoted 25 lines · Felipe Balbi
Quoted 24 lines · Daniel Mack
Quoted 22 lines · Felipe Balbi
Hi,
Quoted 6 lines · Daniel Mack
drivers/usb/musb/musb_dsps.c +6
-0+static int dsps_resume (struct device *dev) +{ +struct dsps_glue *glue =dev_get_drvdata (dev); +const struct dsps_musb_wrapper *wrp = glue->wrp; +struct musb *musb =platform_get_drvdata (glue->musb); +void __iomem *mbase = musb->ctrl_base;drivers/usb/musb/musb_dsps.c static const struct of_device_id musb_dsps_of_match[] = { · line 686
Quoted 10 lines
drivers/usb/musb/musb_dsps.c +10
-0+ +dsps_writel (mbase, wrp->control, glue->context.control); +dsps_writel (mbase, wrp->epintr_set, glue->context.epintr); +dsps_writel (mbase, wrp->coreintr_set, glue->context.coreintr); +dsps_writel (mbase, wrp->phy_utmi, glue->context.phy_utmi); +dsps_writel (mbase, wrp->mode, glue->context.mode); +dsps_writel (mbase, wrp->tx_mode, glue->context.tx_mode); +dsps_writel (mbase, wrp->rx_mode, glue->context.rx_mode); + +//musb_port_reset(musb, false); ????
Quoted 4 lines
Quoted 2 lines
Urgs. Development left-over. Sorry. You want me to resend the whole series or just this last patch?
just the last patch is fine :-)
Sorry, there was one more hunk that shouldn't be there. I'll resend a v4 with all the patches included again, for reference.
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH v2 4/4] usb: musb: dsps: add support for suspend and resume
Quoted 26 lines · Daniel Mack
Quoted 25 lines · Felipe Balbi
Quoted 24 lines · Daniel Mack
Quoted 22 lines · Felipe Balbi
Hi,
Quoted 6 lines · Daniel Mack
drivers/usb/musb/musb_dsps.c +6
-0+static int dsps_resume (struct device *dev) +{ +struct dsps_glue *glue =dev_get_drvdata (dev); +const struct dsps_musb_wrapper *wrp = glue->wrp; +struct musb *musb =platform_get_drvdata (glue->musb); +void __iomem *mbase = musb->ctrl_base;drivers/usb/musb/musb_dsps.c static const struct of_device_id musb_dsps_of_match[] = { · line 686
Quoted 10 lines
drivers/usb/musb/musb_dsps.c +10
-0+ +dsps_writel (mbase, wrp->control, glue->context.control); +dsps_writel (mbase, wrp->epintr_set, glue->context.epintr); +dsps_writel (mbase, wrp->coreintr_set, glue->context.coreintr); +dsps_writel (mbase, wrp->phy_utmi, glue->context.phy_utmi); +dsps_writel (mbase, wrp->mode, glue->context.mode); +dsps_writel (mbase, wrp->tx_mode, glue->context.tx_mode); +dsps_writel (mbase, wrp->rx_mode, glue->context.rx_mode); + +//musb_port_reset(musb, false); ????
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
Urgs. Development left-over. Sorry. You want me to resend the whole series or just this last patch?
just the last patch is fine :-)
Sorry, there was one more hunk that shouldn't be there. I'll resend a v4 with all the patches included again, for reference.
ok, thanks :-)
Signature · 1 line
balbi
PATCH v2 1/4 usb: musb: unconditionally 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, and because it shouldn't cause any trouble on other platforms, do it unconditionally for all of them.
--- drivers/usb/musb/musb_core.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/usb/musb/musb_core.c +13 -1
@@ -2215,16 +2215,28 @@ static int musb_suspend(struct device *dev)*/ } +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); + +/* +* 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). +* +* For the DSPS glue layer though, a full register restore has to +* be done. As it shouldn't harm other platforms, we do it +* unconditionally. */ + +musb_restore_context (musb); +return 0 ; }
Signature · 1 line
1.8.4.2
PATCH v2 2/4 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.4.2