| Message ID | 1651740973-7944-4-git-send-email-quic_kriskura@quicinc.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | USB DWC3 host wake up support from system suspend | expand |
On Thu, May 05, 2022 at 02:26:10PM +0530, Krishna Kurapati wrote: > From: Sandeep Maheswaram <quic_c_sanm@quicinc.com> > > During suspend read the status of all port and set hs phy mode > based on current speed. Use this hs phy mode to configure wakeup > interrupts in qcom glue driver. > > Check wakeup-source property for dwc3 core node to set the > wakeup capability. Drop the device_init_wakeup call from > runtime suspend and resume. > > Also check during suspend if any wakeup capable devices are > connected to the controller (directly or through hubs), if there > are none set a flag to indicate that the PHY is powered > down during suspend. > > Signed-off-by: Sandeep Maheswaram <quic_c_sanm@quicinc.com> > Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com> > --- > drivers/usb/dwc3/core.c | 33 ++++++++++++++++++++------------- > drivers/usb/dwc3/core.h | 4 ++++ > drivers/usb/dwc3/host.c | 24 ++++++++++++++++++++++++ > 3 files changed, 48 insertions(+), 13 deletions(-) > > diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c > index 950e238..cf377f5 100644 > --- a/drivers/usb/dwc3/core.c > +++ b/drivers/usb/dwc3/core.c > @@ -33,6 +33,7 @@ > #include <linux/usb/gadget.h> > #include <linux/usb/of.h> > #include <linux/usb/otg.h> > +#include <linux/usb/hcd.h> This is not needed anymore > > #include "core.h" > #include "gadget.h" > @@ -1787,6 +1788,7 @@ static int dwc3_probe(struct platform_device *pdev) > > platform_set_drvdata(pdev, dwc); > dwc3_cache_hwparams(dwc); > + device_init_wakeup(&pdev->dev, of_property_read_bool(dev->of_node, "wakeup-source")); > > spin_lock_init(&dwc->lock); > mutex_init(&dwc->mutex); > @@ -1936,6 +1938,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) > { > unsigned long flags; > u32 reg; > + struct usb_hcd *hcd = platform_get_drvdata(dwc->xhci); This isn't used anymore, delete it > > switch (dwc->current_dr_role) { > case DWC3_GCTL_PRTCAP_DEVICE: > @@ -1948,10 +1951,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) > dwc3_core_exit(dwc); > break; > case DWC3_GCTL_PRTCAP_HOST: > - if (!PMSG_IS_AUTO(msg)) { > - dwc3_core_exit(dwc); > - break; > - } > + dwc3_check_phy_speed_mode(dwc); > > /* Let controller to suspend HSPHY before PHY driver suspends */ > if (dwc->dis_u2_susphy_quirk || > @@ -1967,6 +1967,16 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) > > phy_pm_runtime_put_sync(dwc->usb2_generic_phy); > phy_pm_runtime_put_sync(dwc->usb3_generic_phy); > + > + if (!PMSG_IS_AUTO(msg)) { > + if (device_may_wakeup(dwc->dev) && > + device_wakeup_path(dwc->dev)) { nit: the indentation is odd, align it with device_may_wakeup()? > + dwc->phy_power_off = false; > + } else { > + dwc->phy_power_off = true; > + dwc3_core_exit(dwc); As commented earlier, taking the controller and PHYs completely down causes a significant power draw in some USB clients. Let's clarify what the specific benefits are of doing dwc3_core_exit() vs. entering a low power mode.
On 5/6/2022 4:18 AM, Matthias Kaehlcke wrote: > On Thu, May 05, 2022 at 02:26:10PM +0530, Krishna Kurapati wrote: >> From: Sandeep Maheswaram <quic_c_sanm@quicinc.com> >> >> During suspend read the status of all port and set hs phy mode >> based on current speed. Use this hs phy mode to configure wakeup >> interrupts in qcom glue driver. >> >> Check wakeup-source property for dwc3 core node to set the >> wakeup capability. Drop the device_init_wakeup call from >> runtime suspend and resume. >> >> Also check during suspend if any wakeup capable devices are >> connected to the controller (directly or through hubs), if there >> are none set a flag to indicate that the PHY is powered >> down during suspend. >> >> Signed-off-by: Sandeep Maheswaram <quic_c_sanm@quicinc.com> >> Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com> >> --- >> drivers/usb/dwc3/core.c | 33 ++++++++++++++++++++------------- >> drivers/usb/dwc3/core.h | 4 ++++ >> drivers/usb/dwc3/host.c | 24 ++++++++++++++++++++++++ >> 3 files changed, 48 insertions(+), 13 deletions(-) >> >> diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c >> index 950e238..cf377f5 100644 >> --- a/drivers/usb/dwc3/core.c >> +++ b/drivers/usb/dwc3/core.c >> @@ -33,6 +33,7 @@ >> #include <linux/usb/gadget.h> >> #include <linux/usb/of.h> >> #include <linux/usb/otg.h> >> +#include <linux/usb/hcd.h> > This is not needed anymore > >> >> #include "core.h" >> #include "gadget.h" >> @@ -1787,6 +1788,7 @@ static int dwc3_probe(struct platform_device *pdev) >> >> platform_set_drvdata(pdev, dwc); >> dwc3_cache_hwparams(dwc); >> + device_init_wakeup(&pdev->dev, of_property_read_bool(dev->of_node, "wakeup-source")); >> >> spin_lock_init(&dwc->lock); >> mutex_init(&dwc->mutex); >> @@ -1936,6 +1938,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) >> { >> unsigned long flags; >> u32 reg; >> + struct usb_hcd *hcd = platform_get_drvdata(dwc->xhci); > This isn't used anymore, delete it My bad, Will fix this in next version. >> >> switch (dwc->current_dr_role) { >> case DWC3_GCTL_PRTCAP_DEVICE: >> @@ -1948,10 +1951,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) >> dwc3_core_exit(dwc); >> break; >> case DWC3_GCTL_PRTCAP_HOST: >> - if (!PMSG_IS_AUTO(msg)) { >> - dwc3_core_exit(dwc); >> - break; >> - } >> + dwc3_check_phy_speed_mode(dwc); >> >> /* Let controller to suspend HSPHY before PHY driver suspends */ >> if (dwc->dis_u2_susphy_quirk || >> @@ -1967,6 +1967,16 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) >> >> phy_pm_runtime_put_sync(dwc->usb2_generic_phy); >> phy_pm_runtime_put_sync(dwc->usb3_generic_phy); >> + >> + if (!PMSG_IS_AUTO(msg)) { >> + if (device_may_wakeup(dwc->dev) && >> + device_wakeup_path(dwc->dev)) { > nit: the indentation is odd, align it with device_may_wakeup()? Sure, Will take care of it. >> + dwc->phy_power_off = false; >> + } else { >> + dwc->phy_power_off = true; >> + dwc3_core_exit(dwc); > As commented earlier, taking the controller and PHYs completely down causes a > significant power draw in some USB clients. Let's clarify what the specific > benefits are of doing dwc3_core_exit() vs. entering a low power mode. Sure, once we come to a conclusion on this, I will refresh the patches.
On Fri, May 06, 2022 at 10:41:01AM +0530, Krishna Kurapati PSSNV wrote: > > On 5/6/2022 4:18 AM, Matthias Kaehlcke wrote: > >On Thu, May 05, 2022 at 02:26:10PM +0530, Krishna Kurapati wrote: > >>From: Sandeep Maheswaram <quic_c_sanm@quicinc.com> > >> > >>During suspend read the status of all port and set hs phy mode > >>based on current speed. Use this hs phy mode to configure wakeup > >>interrupts in qcom glue driver. > >> > >>Check wakeup-source property for dwc3 core node to set the > >>wakeup capability. Drop the device_init_wakeup call from > >>runtime suspend and resume. > >> > >>Also check during suspend if any wakeup capable devices are > >>connected to the controller (directly or through hubs), if there > >>are none set a flag to indicate that the PHY is powered > >>down during suspend. > >> > >>Signed-off-by: Sandeep Maheswaram <quic_c_sanm@quicinc.com> > >>Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com> > >>--- > >> drivers/usb/dwc3/core.c | 33 ++++++++++++++++++++------------- > >> drivers/usb/dwc3/core.h | 4 ++++ > >> drivers/usb/dwc3/host.c | 24 ++++++++++++++++++++++++ > >> 3 files changed, 48 insertions(+), 13 deletions(-) > >> > >>diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c > >>index 950e238..cf377f5 100644 > >>--- a/drivers/usb/dwc3/core.c > >>+++ b/drivers/usb/dwc3/core.c > >>@@ -33,6 +33,7 @@ > >> #include <linux/usb/gadget.h> > >> #include <linux/usb/of.h> > >> #include <linux/usb/otg.h> > >>+#include <linux/usb/hcd.h> > >This is not needed anymore > > > >> #include "core.h" > >> #include "gadget.h" > >>@@ -1787,6 +1788,7 @@ static int dwc3_probe(struct platform_device *pdev) > >> platform_set_drvdata(pdev, dwc); > >> dwc3_cache_hwparams(dwc); > >>+ device_init_wakeup(&pdev->dev, of_property_read_bool(dev->of_node, "wakeup-source")); > >> spin_lock_init(&dwc->lock); > >> mutex_init(&dwc->mutex); > >>@@ -1936,6 +1938,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) > >> { > >> unsigned long flags; > >> u32 reg; > >>+ struct usb_hcd *hcd = platform_get_drvdata(dwc->xhci); > >This isn't used anymore, delete it > My bad, Will fix this in next version. > >> switch (dwc->current_dr_role) { > >> case DWC3_GCTL_PRTCAP_DEVICE: > >>@@ -1948,10 +1951,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) > >> dwc3_core_exit(dwc); > >> break; > >> case DWC3_GCTL_PRTCAP_HOST: > >>- if (!PMSG_IS_AUTO(msg)) { > >>- dwc3_core_exit(dwc); > >>- break; > >>- } > >>+ dwc3_check_phy_speed_mode(dwc); > >> /* Let controller to suspend HSPHY before PHY driver suspends */ > >> if (dwc->dis_u2_susphy_quirk || > >>@@ -1967,6 +1967,16 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) > >> phy_pm_runtime_put_sync(dwc->usb2_generic_phy); > >> phy_pm_runtime_put_sync(dwc->usb3_generic_phy); > >>+ > >>+ if (!PMSG_IS_AUTO(msg)) { > >>+ if (device_may_wakeup(dwc->dev) && > >>+ device_wakeup_path(dwc->dev)) { > >nit: the indentation is odd, align it with device_may_wakeup()? > Sure, Will take care of it. > >>+ dwc->phy_power_off = false; > >>+ } else { > >>+ dwc->phy_power_off = true; > >>+ dwc3_core_exit(dwc); > >As commented earlier, taking the controller and PHYs completely down causes a > >significant power draw in some USB clients. Let's clarify what the specific > >benefits are of doing dwc3_core_exit() vs. entering a low power mode. > Sure, once we come to a conclusion on this, I will refresh the patches. I think, Matthias is asking you to clarify in the commit description. we can even quote Matthias observations. Thanks, Pavan
On Fri, May 06, 2022 at 10:44:48AM +0530, Pavan Kondeti wrote: > On Fri, May 06, 2022 at 10:41:01AM +0530, Krishna Kurapati PSSNV wrote: > > > > On 5/6/2022 4:18 AM, Matthias Kaehlcke wrote: > > >On Thu, May 05, 2022 at 02:26:10PM +0530, Krishna Kurapati wrote: > > >>From: Sandeep Maheswaram <quic_c_sanm@quicinc.com> > > >> > > >>During suspend read the status of all port and set hs phy mode > > >>based on current speed. Use this hs phy mode to configure wakeup > > >>interrupts in qcom glue driver. > > >> > > >>Check wakeup-source property for dwc3 core node to set the > > >>wakeup capability. Drop the device_init_wakeup call from > > >>runtime suspend and resume. > > >> > > >>Also check during suspend if any wakeup capable devices are > > >>connected to the controller (directly or through hubs), if there > > >>are none set a flag to indicate that the PHY is powered > > >>down during suspend. > > >> > > >>Signed-off-by: Sandeep Maheswaram <quic_c_sanm@quicinc.com> > > >>Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com> > > >>--- > > >> drivers/usb/dwc3/core.c | 33 ++++++++++++++++++++------------- > > >> drivers/usb/dwc3/core.h | 4 ++++ > > >> drivers/usb/dwc3/host.c | 24 ++++++++++++++++++++++++ > > >> 3 files changed, 48 insertions(+), 13 deletions(-) > > >> > > >>diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c > > >>index 950e238..cf377f5 100644 > > >>--- a/drivers/usb/dwc3/core.c > > >>+++ b/drivers/usb/dwc3/core.c > > >>@@ -33,6 +33,7 @@ > > >> #include <linux/usb/gadget.h> > > >> #include <linux/usb/of.h> > > >> #include <linux/usb/otg.h> > > >>+#include <linux/usb/hcd.h> > > >This is not needed anymore > > > > > >> #include "core.h" > > >> #include "gadget.h" > > >>@@ -1787,6 +1788,7 @@ static int dwc3_probe(struct platform_device *pdev) > > >> platform_set_drvdata(pdev, dwc); > > >> dwc3_cache_hwparams(dwc); > > >>+ device_init_wakeup(&pdev->dev, of_property_read_bool(dev->of_node, "wakeup-source")); > > >> spin_lock_init(&dwc->lock); > > >> mutex_init(&dwc->mutex); > > >>@@ -1936,6 +1938,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) > > >> { > > >> unsigned long flags; > > >> u32 reg; > > >>+ struct usb_hcd *hcd = platform_get_drvdata(dwc->xhci); > > >This isn't used anymore, delete it > > My bad, Will fix this in next version. > > >> switch (dwc->current_dr_role) { > > >> case DWC3_GCTL_PRTCAP_DEVICE: > > >>@@ -1948,10 +1951,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) > > >> dwc3_core_exit(dwc); > > >> break; > > >> case DWC3_GCTL_PRTCAP_HOST: > > >>- if (!PMSG_IS_AUTO(msg)) { > > >>- dwc3_core_exit(dwc); > > >>- break; > > >>- } > > >>+ dwc3_check_phy_speed_mode(dwc); > > >> /* Let controller to suspend HSPHY before PHY driver suspends */ > > >> if (dwc->dis_u2_susphy_quirk || > > >>@@ -1967,6 +1967,16 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) > > >> phy_pm_runtime_put_sync(dwc->usb2_generic_phy); > > >> phy_pm_runtime_put_sync(dwc->usb3_generic_phy); > > >>+ > > >>+ if (!PMSG_IS_AUTO(msg)) { > > >>+ if (device_may_wakeup(dwc->dev) && > > >>+ device_wakeup_path(dwc->dev)) { > > >nit: the indentation is odd, align it with device_may_wakeup()? > > Sure, Will take care of it. > > >>+ dwc->phy_power_off = false; > > >>+ } else { > > >>+ dwc->phy_power_off = true; > > >>+ dwc3_core_exit(dwc); > > >As commented earlier, taking the controller and PHYs completely down causes a > > >significant power draw in some USB clients. Let's clarify what the specific > > >benefits are of doing dwc3_core_exit() vs. entering a low power mode. > > Sure, once we come to a conclusion on this, I will refresh the patches. > > I think, Matthias is asking you to clarify in the commit description. we can > even quote Matthias observations. Actually I would like to have a discussion about the benefits of powering down the controller and PHYs vs. entering a low power state. Maybe there are good reasons for powering everything down (e.g. significant power savings), but as we have seen there are also significant downsides, so let's make sure we understand both.
On Fri, May 06, 2022 at 08:51:22AM -0700, Matthias Kaehlcke wrote: > On Fri, May 06, 2022 at 10:44:48AM +0530, Pavan Kondeti wrote: > > On Fri, May 06, 2022 at 10:41:01AM +0530, Krishna Kurapati PSSNV wrote: > > > > > > On 5/6/2022 4:18 AM, Matthias Kaehlcke wrote: > > > >On Thu, May 05, 2022 at 02:26:10PM +0530, Krishna Kurapati wrote: > > > >>From: Sandeep Maheswaram <quic_c_sanm@quicinc.com> > > > >> > > > >>During suspend read the status of all port and set hs phy mode > > > >>based on current speed. Use this hs phy mode to configure wakeup > > > >>interrupts in qcom glue driver. > > > >> > > > >>Check wakeup-source property for dwc3 core node to set the > > > >>wakeup capability. Drop the device_init_wakeup call from > > > >>runtime suspend and resume. > > > >> > > > >>Also check during suspend if any wakeup capable devices are > > > >>connected to the controller (directly or through hubs), if there > > > >>are none set a flag to indicate that the PHY is powered > > > >>down during suspend. > > > >> > > > >>Signed-off-by: Sandeep Maheswaram <quic_c_sanm@quicinc.com> > > > >>Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com> > > > >>--- > > > >> drivers/usb/dwc3/core.c | 33 ++++++++++++++++++++------------- > > > >> drivers/usb/dwc3/core.h | 4 ++++ > > > >> drivers/usb/dwc3/host.c | 24 ++++++++++++++++++++++++ > > > >> 3 files changed, 48 insertions(+), 13 deletions(-) > > > >> > > > >>diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c > > > >>index 950e238..cf377f5 100644 > > > >>--- a/drivers/usb/dwc3/core.c > > > >>+++ b/drivers/usb/dwc3/core.c > > > >>@@ -33,6 +33,7 @@ > > > >> #include <linux/usb/gadget.h> > > > >> #include <linux/usb/of.h> > > > >> #include <linux/usb/otg.h> > > > >>+#include <linux/usb/hcd.h> > > > >This is not needed anymore > > > > > > > >> #include "core.h" > > > >> #include "gadget.h" > > > >>@@ -1787,6 +1788,7 @@ static int dwc3_probe(struct platform_device *pdev) > > > >> platform_set_drvdata(pdev, dwc); > > > >> dwc3_cache_hwparams(dwc); > > > >>+ device_init_wakeup(&pdev->dev, of_property_read_bool(dev->of_node, "wakeup-source")); > > > >> spin_lock_init(&dwc->lock); > > > >> mutex_init(&dwc->mutex); > > > >>@@ -1936,6 +1938,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) > > > >> { > > > >> unsigned long flags; > > > >> u32 reg; > > > >>+ struct usb_hcd *hcd = platform_get_drvdata(dwc->xhci); > > > >This isn't used anymore, delete it > > > My bad, Will fix this in next version. > > > >> switch (dwc->current_dr_role) { > > > >> case DWC3_GCTL_PRTCAP_DEVICE: > > > >>@@ -1948,10 +1951,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) > > > >> dwc3_core_exit(dwc); > > > >> break; > > > >> case DWC3_GCTL_PRTCAP_HOST: > > > >>- if (!PMSG_IS_AUTO(msg)) { > > > >>- dwc3_core_exit(dwc); > > > >>- break; > > > >>- } > > > >>+ dwc3_check_phy_speed_mode(dwc); > > > >> /* Let controller to suspend HSPHY before PHY driver suspends */ > > > >> if (dwc->dis_u2_susphy_quirk || > > > >>@@ -1967,6 +1967,16 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) > > > >> phy_pm_runtime_put_sync(dwc->usb2_generic_phy); > > > >> phy_pm_runtime_put_sync(dwc->usb3_generic_phy); > > > >>+ > > > >>+ if (!PMSG_IS_AUTO(msg)) { > > > >>+ if (device_may_wakeup(dwc->dev) && > > > >>+ device_wakeup_path(dwc->dev)) { > > > >nit: the indentation is odd, align it with device_may_wakeup()? > > > Sure, Will take care of it. > > > >>+ dwc->phy_power_off = false; > > > >>+ } else { > > > >>+ dwc->phy_power_off = true; > > > >>+ dwc3_core_exit(dwc); > > > >As commented earlier, taking the controller and PHYs completely down causes a > > > >significant power draw in some USB clients. Let's clarify what the specific > > > >benefits are of doing dwc3_core_exit() vs. entering a low power mode. > > > Sure, once we come to a conclusion on this, I will refresh the patches. > > > > I think, Matthias is asking you to clarify in the commit description. we can > > even quote Matthias observations. > > Actually I would like to have a discussion about the benefits of powering down > the controller and PHYs vs. entering a low power state. Maybe there are good > reasons for powering everything down (e.g. significant power savings), but > as we have seen there are also significant downsides, so let's make sure > we understand both. I found this, as I commented on the other thread: commit c4a5153e87fdf6805f63ff57556260e2554155a5 Author: Manu Gautam <mgautam@codeaurora.org> Date: Thu Jan 18 16:54:30 2018 +0530 usb: dwc3: core: Power-off core/PHYs on system_suspend in host mode Commit 689bf72c6e0d ("usb: dwc3: Don't reinitialize core during host bus-suspend/resume") updated suspend/resume routines to not power_off and reinit PHYs/core for host mode. It broke platforms that rely on DWC3 core to power_off PHYs to enter low power state on system suspend. Perform dwc3_core_exit/init only during host mode system_suspend/ resume to addresses power regression from above mentioned patch and also allow USB session to stay connected across runtime_suspend/resume in host mode. While at it also replace existing checks for HOST only dr_mode with current_dr_role to have similar core driver behavior for both Host-only and DRD+Host configurations. Fixes: 689bf72c6e0d ("usb: dwc3: Don't reinitialize core during host bus-suspend/resume") Reviewed-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Manu Gautam <mgautam@codeaurora.org> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> So apparently powering off the core and PHYs is needed on some platforms. Let's move forward with the core/PHYs off for now and try to come up with a solution (e.g. a DT property that indicates that the core/PHYs can remain powererd) in a separate patch/series.
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 950e238..cf377f5 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -33,6 +33,7 @@ #include <linux/usb/gadget.h> #include <linux/usb/of.h> #include <linux/usb/otg.h> +#include <linux/usb/hcd.h> #include "core.h" #include "gadget.h" @@ -1787,6 +1788,7 @@ static int dwc3_probe(struct platform_device *pdev) platform_set_drvdata(pdev, dwc); dwc3_cache_hwparams(dwc); + device_init_wakeup(&pdev->dev, of_property_read_bool(dev->of_node, "wakeup-source")); spin_lock_init(&dwc->lock); mutex_init(&dwc->mutex); @@ -1936,6 +1938,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) { unsigned long flags; u32 reg; + struct usb_hcd *hcd = platform_get_drvdata(dwc->xhci); switch (dwc->current_dr_role) { case DWC3_GCTL_PRTCAP_DEVICE: @@ -1948,10 +1951,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) dwc3_core_exit(dwc); break; case DWC3_GCTL_PRTCAP_HOST: - if (!PMSG_IS_AUTO(msg)) { - dwc3_core_exit(dwc); - break; - } + dwc3_check_phy_speed_mode(dwc); /* Let controller to suspend HSPHY before PHY driver suspends */ if (dwc->dis_u2_susphy_quirk || @@ -1967,6 +1967,16 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) phy_pm_runtime_put_sync(dwc->usb2_generic_phy); phy_pm_runtime_put_sync(dwc->usb3_generic_phy); + + if (!PMSG_IS_AUTO(msg)) { + if (device_may_wakeup(dwc->dev) && + device_wakeup_path(dwc->dev)) { + dwc->phy_power_off = false; + } else { + dwc->phy_power_off = true; + dwc3_core_exit(dwc); + } + } break; case DWC3_GCTL_PRTCAP_OTG: /* do nothing during runtime_suspend */ @@ -2010,11 +2020,12 @@ static int dwc3_resume_common(struct dwc3 *dwc, pm_message_t msg) break; case DWC3_GCTL_PRTCAP_HOST: if (!PMSG_IS_AUTO(msg)) { - ret = dwc3_core_init_for_resume(dwc); - if (ret) - return ret; - dwc3_set_prtcap(dwc, DWC3_GCTL_PRTCAP_HOST); - break; + if (dwc->phy_power_off) { + ret = dwc3_core_init_for_resume(dwc); + if (ret) + return ret; + dwc3_set_prtcap(dwc, DWC3_GCTL_PRTCAP_HOST); + } } /* Restore GUSB2PHYCFG bits that were modified in suspend */ reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)); @@ -2086,8 +2097,6 @@ static int dwc3_runtime_suspend(struct device *dev) if (ret) return ret; - device_init_wakeup(dev, true); - return 0; } @@ -2096,8 +2105,6 @@ static int dwc3_runtime_resume(struct device *dev) struct dwc3 *dwc = dev_get_drvdata(dev); int ret; - device_init_wakeup(dev, false); - ret = dwc3_resume_common(dwc, PMSG_AUTO_RESUME); if (ret) return ret; diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index 81c486b..37397a8 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -1155,6 +1155,9 @@ struct dwc3 { bool phys_ready; + unsigned int hs_phy_mode; + bool phy_power_off; + struct ulpi *ulpi; bool ulpi_ready; @@ -1539,6 +1542,7 @@ int dwc3_core_soft_reset(struct dwc3 *dwc); #if IS_ENABLED(CONFIG_USB_DWC3_HOST) || IS_ENABLED(CONFIG_USB_DWC3_DUAL_ROLE) int dwc3_host_init(struct dwc3 *dwc); void dwc3_host_exit(struct dwc3 *dwc); +void dwc3_check_phy_speed_mode(struct dwc3 *dwc); #else static inline int dwc3_host_init(struct dwc3 *dwc) { return 0; } diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c index eda8719..3902b56 100644 --- a/drivers/usb/dwc3/host.c +++ b/drivers/usb/dwc3/host.c @@ -13,6 +13,7 @@ #include <linux/platform_device.h> #include "core.h" +#include "../host/xhci.h" static void dwc3_host_fill_xhci_irq_res(struct dwc3 *dwc, int irq, char *name) @@ -138,3 +139,26 @@ void dwc3_host_exit(struct dwc3 *dwc) { platform_device_unregister(dwc->xhci); } + +void dwc3_check_phy_speed_mode(struct dwc3 *dwc) +{ + int i, num_ports; + u32 reg; + struct usb_hcd *hcd = platform_get_drvdata(dwc->xhci); + struct xhci_hcd *xhci_hcd = hcd_to_xhci(hcd); + + dwc->hs_phy_mode = 0; + + reg = readl(&xhci_hcd->cap_regs->hcs_params1); + + num_ports = HCS_MAX_PORTS(reg); + for (i = 0; i < num_ports; i++) { + reg = readl(&xhci_hcd->op_regs->port_status_base + i * NUM_PORT_REGS); + if (reg & PORT_PE) { + if (DEV_HIGHSPEED(reg) || DEV_FULLSPEED(reg)) + dwc->hs_phy_mode |= PHY_MODE_USB_HOST_HS; + else if (DEV_LOWSPEED(reg)) + dwc->hs_phy_mode |= PHY_MODE_USB_HOST_LS; + } + } +}