Re: [PATCH 2/2] usb: dwc3: core: Support the dwc3 host suspend/resume
On 18 November 2016 at 21:14, kbuild test robotwrote: > Hi Baolin, > > [auto build test ERROR on next-20161117] > [cannot apply to balbi-usb/next usb/usb-testing v4.9-rc5 v4.9-rc4 v4.9-rc3 > v4.9-rc5] > [if your patch is applied to the wrong git tree, please drop us a note to > help improve the system] > > url: > https://github.com/0day-ci/linux/commits/Baolin-Wang/usb-host-plat-Enable-xhci-plat-runtime-PM/20161118-202029 > config: i386-allmodconfig (attached as .config) > compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 > reproduce: > # save the attached .config to linux build tree > make ARCH=i386 > > All errors (new ones prefixed by >>): > >drivers/usb/dwc3/host.c: In function 'dwc3_host_suspend': >>> drivers/usb/dwc3/host.c:157:10: error: implicit declaration of function >>> 'pm_children_suspended' [-Werror=implicit-function-declaration] > while (!pm_children_suspended(xhci) && --cnt > 0) > ^ >cc1: some warnings being treated as errors > > vim +/pm_children_suspended +157 drivers/usb/dwc3/host.c > >151 int ret, cnt = DWC3_HOST_SUSPEND_COUNT; >152 >153 /* >154 * We need make sure the children of the xHCI device had been > into >155 * suspend state, or we will suspend xHCI device failed. >156 */ > > 157 while (!pm_children_suspended(xhci) && --cnt > 0) >158 msleep(DWC3_HOST_SUSPEND_TIMEOUT); >159 >160 if (cnt <= 0) { I will send out new patch to fix this building error. -- Baolin.wang Best Regards
Re: [PATCH 2/2] usb: dwc3: core: Support the dwc3 host suspend/resume
On 18 November 2016 at 21:14, kbuild test robot wrote: > Hi Baolin, > > [auto build test ERROR on next-20161117] > [cannot apply to balbi-usb/next usb/usb-testing v4.9-rc5 v4.9-rc4 v4.9-rc3 > v4.9-rc5] > [if your patch is applied to the wrong git tree, please drop us a note to > help improve the system] > > url: > https://github.com/0day-ci/linux/commits/Baolin-Wang/usb-host-plat-Enable-xhci-plat-runtime-PM/20161118-202029 > config: i386-allmodconfig (attached as .config) > compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 > reproduce: > # save the attached .config to linux build tree > make ARCH=i386 > > All errors (new ones prefixed by >>): > >drivers/usb/dwc3/host.c: In function 'dwc3_host_suspend': >>> drivers/usb/dwc3/host.c:157:10: error: implicit declaration of function >>> 'pm_children_suspended' [-Werror=implicit-function-declaration] > while (!pm_children_suspended(xhci) && --cnt > 0) > ^ >cc1: some warnings being treated as errors > > vim +/pm_children_suspended +157 drivers/usb/dwc3/host.c > >151 int ret, cnt = DWC3_HOST_SUSPEND_COUNT; >152 >153 /* >154 * We need make sure the children of the xHCI device had been > into >155 * suspend state, or we will suspend xHCI device failed. >156 */ > > 157 while (!pm_children_suspended(xhci) && --cnt > 0) >158 msleep(DWC3_HOST_SUSPEND_TIMEOUT); >159 >160 if (cnt <= 0) { I will send out new patch to fix this building error. -- Baolin.wang Best Regards
Re: [PATCH 2/2] usb: dwc3: core: Support the dwc3 host suspend/resume
Hi Baolin, [auto build test ERROR on next-20161117] [cannot apply to balbi-usb/next usb/usb-testing v4.9-rc5 v4.9-rc4 v4.9-rc3 v4.9-rc5] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Baolin-Wang/usb-host-plat-Enable-xhci-plat-runtime-PM/20161118-202029 config: i386-allmodconfig (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: # save the attached .config to linux build tree make ARCH=i386 All errors (new ones prefixed by >>): drivers/usb/dwc3/host.c: In function 'dwc3_host_suspend': >> drivers/usb/dwc3/host.c:157:10: error: implicit declaration of function >> 'pm_children_suspended' [-Werror=implicit-function-declaration] while (!pm_children_suspended(xhci) && --cnt > 0) ^ cc1: some warnings being treated as errors vim +/pm_children_suspended +157 drivers/usb/dwc3/host.c 151 int ret, cnt = DWC3_HOST_SUSPEND_COUNT; 152 153 /* 154 * We need make sure the children of the xHCI device had been into 155 * suspend state, or we will suspend xHCI device failed. 156 */ > 157 while (!pm_children_suspended(xhci) && --cnt > 0) 158 msleep(DWC3_HOST_SUSPEND_TIMEOUT); 159 160 if (cnt <= 0) { --- 0-DAY kernel test infrastructureOpen Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation .config.gz Description: application/gzip
Re: [PATCH 2/2] usb: dwc3: core: Support the dwc3 host suspend/resume
Hi Baolin, [auto build test ERROR on next-20161117] [cannot apply to balbi-usb/next usb/usb-testing v4.9-rc5 v4.9-rc4 v4.9-rc3 v4.9-rc5] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Baolin-Wang/usb-host-plat-Enable-xhci-plat-runtime-PM/20161118-202029 config: i386-allmodconfig (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: # save the attached .config to linux build tree make ARCH=i386 All errors (new ones prefixed by >>): drivers/usb/dwc3/host.c: In function 'dwc3_host_suspend': >> drivers/usb/dwc3/host.c:157:10: error: implicit declaration of function >> 'pm_children_suspended' [-Werror=implicit-function-declaration] while (!pm_children_suspended(xhci) && --cnt > 0) ^ cc1: some warnings being treated as errors vim +/pm_children_suspended +157 drivers/usb/dwc3/host.c 151 int ret, cnt = DWC3_HOST_SUSPEND_COUNT; 152 153 /* 154 * We need make sure the children of the xHCI device had been into 155 * suspend state, or we will suspend xHCI device failed. 156 */ > 157 while (!pm_children_suspended(xhci) && --cnt > 0) 158 msleep(DWC3_HOST_SUSPEND_TIMEOUT); 159 160 if (cnt <= 0) { --- 0-DAY kernel test infrastructureOpen Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation .config.gz Description: application/gzip
[PATCH 2/2] usb: dwc3: core: Support the dwc3 host suspend/resume
For some mobile devices with strict power management, we also want to suspend the host when the slave is detached for power saving. Thus we add the host suspend/resume functions to support this requirement. Signed-off-by: Baolin Wang--- drivers/usb/dwc3/Kconfig |7 ++ drivers/usb/dwc3/core.c | 26 ++- drivers/usb/dwc3/core.h | 15 + drivers/usb/dwc3/host.c | 53 ++ 4 files changed, 100 insertions(+), 1 deletion(-) diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig index a45b4f1..47bb2f3 100644 --- a/drivers/usb/dwc3/Kconfig +++ b/drivers/usb/dwc3/Kconfig @@ -47,6 +47,13 @@ config USB_DWC3_DUAL_ROLE endchoice +config USB_DWC3_HOST_SUSPEND + bool "Choose if the DWC3 host (xhci) can be suspend/resume" + depends on USB_DWC3_HOST=y || USB_DWC3_DUAL_ROLE=y + help + We can suspend the host when the slave is detached for power saving, + and resume the host when one slave is attached. + comment "Platform Glue Driver Support" config USB_DWC3_OMAP diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 9a4a5e4..7ad4bc3 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -1091,6 +1091,7 @@ static int dwc3_probe(struct platform_device *pdev) pm_runtime_use_autosuspend(dev); pm_runtime_set_autosuspend_delay(dev, DWC3_DEFAULT_AUTOSUSPEND_DELAY); pm_runtime_enable(dev); + pm_suspend_ignore_children(dev, true); ret = pm_runtime_get_sync(dev); if (ret < 0) goto err1; @@ -1215,15 +1216,27 @@ static int dwc3_remove(struct platform_device *pdev) static int dwc3_suspend_common(struct dwc3 *dwc) { unsigned long flags; + int ret; switch (dwc->dr_mode) { case USB_DR_MODE_PERIPHERAL: + spin_lock_irqsave(>lock, flags); + dwc3_gadget_suspend(dwc); + spin_unlock_irqrestore(>lock, flags); + break; case USB_DR_MODE_OTG: + ret = dwc3_host_suspend(dwc); + if (ret) + return ret; + spin_lock_irqsave(>lock, flags); dwc3_gadget_suspend(dwc); spin_unlock_irqrestore(>lock, flags); break; case USB_DR_MODE_HOST: + ret = dwc3_host_suspend(dwc); + if (ret) + return ret; default: /* do nothing */ break; @@ -1245,12 +1258,23 @@ static int dwc3_resume_common(struct dwc3 *dwc) switch (dwc->dr_mode) { case USB_DR_MODE_PERIPHERAL: + spin_lock_irqsave(>lock, flags); + dwc3_gadget_resume(dwc); + spin_unlock_irqrestore(>lock, flags); + break; case USB_DR_MODE_OTG: + ret = dwc3_host_resume(dwc); + if (ret) + return ret; + spin_lock_irqsave(>lock, flags); dwc3_gadget_resume(dwc); spin_unlock_irqrestore(>lock, flags); - /* FALLTHROUGH */ + break; case USB_DR_MODE_HOST: + ret = dwc3_host_resume(dwc); + if (ret) + return ret; default: /* do nothing */ break; diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index b585a30..db41908 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -1226,4 +1226,19 @@ static inline void dwc3_ulpi_exit(struct dwc3 *dwc) { } #endif +#if IS_ENABLED(CONFIG_USB_DWC3_HOST_SUSPEND) +int dwc3_host_suspend(struct dwc3 *dwc); +int dwc3_host_resume(struct dwc3 *dwc); +#else +static inline int dwc3_host_suspend(struct dwc3 *dwc) +{ + return 0; +} + +static inline int dwc3_host_resume(struct dwc3 *dwc) +{ + return 0; +} +#endif + #endif /* __DRIVERS_USB_DWC3_CORE_H */ diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c index ed82464..541d27c 100644 --- a/drivers/usb/dwc3/host.c +++ b/drivers/usb/dwc3/host.c @@ -19,6 +19,9 @@ #include "core.h" +#define DWC3_HOST_SUSPEND_COUNT100 +#define DWC3_HOST_SUSPEND_TIMEOUT 100 + static int dwc3_host_get_irq(struct dwc3 *dwc) { struct platform_device *dwc3_pdev = to_platform_device(dwc->dev); @@ -130,3 +133,53 @@ void dwc3_host_exit(struct dwc3 *dwc) dev_name(>xhci->dev)); platform_device_unregister(dwc->xhci); } + +#ifdef CONFIG_USB_DWC3_HOST_SUSPEND +int dwc3_host_suspend(struct dwc3 *dwc) +{ + struct device *xhci = >xhci->dev; + int ret, cnt = DWC3_HOST_SUSPEND_COUNT; + + /* +* We need make sure the children of the xHCI device had been into +* suspend state, or we will suspend xHCI device failed. +*/ + while (!pm_children_suspended(xhci) &&
[PATCH 2/2] usb: dwc3: core: Support the dwc3 host suspend/resume
For some mobile devices with strict power management, we also want to suspend the host when the slave is detached for power saving. Thus we add the host suspend/resume functions to support this requirement. Signed-off-by: Baolin Wang --- drivers/usb/dwc3/Kconfig |7 ++ drivers/usb/dwc3/core.c | 26 ++- drivers/usb/dwc3/core.h | 15 + drivers/usb/dwc3/host.c | 53 ++ 4 files changed, 100 insertions(+), 1 deletion(-) diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig index a45b4f1..47bb2f3 100644 --- a/drivers/usb/dwc3/Kconfig +++ b/drivers/usb/dwc3/Kconfig @@ -47,6 +47,13 @@ config USB_DWC3_DUAL_ROLE endchoice +config USB_DWC3_HOST_SUSPEND + bool "Choose if the DWC3 host (xhci) can be suspend/resume" + depends on USB_DWC3_HOST=y || USB_DWC3_DUAL_ROLE=y + help + We can suspend the host when the slave is detached for power saving, + and resume the host when one slave is attached. + comment "Platform Glue Driver Support" config USB_DWC3_OMAP diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 9a4a5e4..7ad4bc3 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -1091,6 +1091,7 @@ static int dwc3_probe(struct platform_device *pdev) pm_runtime_use_autosuspend(dev); pm_runtime_set_autosuspend_delay(dev, DWC3_DEFAULT_AUTOSUSPEND_DELAY); pm_runtime_enable(dev); + pm_suspend_ignore_children(dev, true); ret = pm_runtime_get_sync(dev); if (ret < 0) goto err1; @@ -1215,15 +1216,27 @@ static int dwc3_remove(struct platform_device *pdev) static int dwc3_suspend_common(struct dwc3 *dwc) { unsigned long flags; + int ret; switch (dwc->dr_mode) { case USB_DR_MODE_PERIPHERAL: + spin_lock_irqsave(>lock, flags); + dwc3_gadget_suspend(dwc); + spin_unlock_irqrestore(>lock, flags); + break; case USB_DR_MODE_OTG: + ret = dwc3_host_suspend(dwc); + if (ret) + return ret; + spin_lock_irqsave(>lock, flags); dwc3_gadget_suspend(dwc); spin_unlock_irqrestore(>lock, flags); break; case USB_DR_MODE_HOST: + ret = dwc3_host_suspend(dwc); + if (ret) + return ret; default: /* do nothing */ break; @@ -1245,12 +1258,23 @@ static int dwc3_resume_common(struct dwc3 *dwc) switch (dwc->dr_mode) { case USB_DR_MODE_PERIPHERAL: + spin_lock_irqsave(>lock, flags); + dwc3_gadget_resume(dwc); + spin_unlock_irqrestore(>lock, flags); + break; case USB_DR_MODE_OTG: + ret = dwc3_host_resume(dwc); + if (ret) + return ret; + spin_lock_irqsave(>lock, flags); dwc3_gadget_resume(dwc); spin_unlock_irqrestore(>lock, flags); - /* FALLTHROUGH */ + break; case USB_DR_MODE_HOST: + ret = dwc3_host_resume(dwc); + if (ret) + return ret; default: /* do nothing */ break; diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index b585a30..db41908 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -1226,4 +1226,19 @@ static inline void dwc3_ulpi_exit(struct dwc3 *dwc) { } #endif +#if IS_ENABLED(CONFIG_USB_DWC3_HOST_SUSPEND) +int dwc3_host_suspend(struct dwc3 *dwc); +int dwc3_host_resume(struct dwc3 *dwc); +#else +static inline int dwc3_host_suspend(struct dwc3 *dwc) +{ + return 0; +} + +static inline int dwc3_host_resume(struct dwc3 *dwc) +{ + return 0; +} +#endif + #endif /* __DRIVERS_USB_DWC3_CORE_H */ diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c index ed82464..541d27c 100644 --- a/drivers/usb/dwc3/host.c +++ b/drivers/usb/dwc3/host.c @@ -19,6 +19,9 @@ #include "core.h" +#define DWC3_HOST_SUSPEND_COUNT100 +#define DWC3_HOST_SUSPEND_TIMEOUT 100 + static int dwc3_host_get_irq(struct dwc3 *dwc) { struct platform_device *dwc3_pdev = to_platform_device(dwc->dev); @@ -130,3 +133,53 @@ void dwc3_host_exit(struct dwc3 *dwc) dev_name(>xhci->dev)); platform_device_unregister(dwc->xhci); } + +#ifdef CONFIG_USB_DWC3_HOST_SUSPEND +int dwc3_host_suspend(struct dwc3 *dwc) +{ + struct device *xhci = >xhci->dev; + int ret, cnt = DWC3_HOST_SUSPEND_COUNT; + + /* +* We need make sure the children of the xHCI device had been into +* suspend state, or we will suspend xHCI device failed. +*/ + while (!pm_children_suspended(xhci) && --cnt > 0) +