USB DWC3 host wake up support from system suspend
Subsystems (3)
v6 cover USB DWC3 host wake up support from system suspend
Avoiding phy powerdown in host mode when wakeup capable devices are connected, so that it can be wake up by devices.
Set GENPD_FLAG_ACTIVE_WAKEUP flag to keep usb30_prim gdsc active when wakeup capable devices are connected to the host.
Changes in v6:
Addressed comments in host.c and core.c
Separated the patches in dwc3-qcom.c to make it simple. Dropped wakeup-source change as it is not related to this series.
Changes in v5:
Added phy_power_off flag to check presence of wakeup capable devices. Dropped patch[v4,4/5] as it is present linux-next. Addressed comments in host.c and dwc3-qcom.c.
Changes in v4:
Addressed Matthias comments raised in v3.
Changes in v3:
Removed need_phy_for_wakeup flag and by default avoiding phy powerdown. Addressed Matthias comments and added entry for DEV_SUPERSPEED. Added suspend_quirk in dwc3 host and moved the dwc3_set_phy_speed_flags. Added wakeup-source dt entry and reading in dwc-qcom.c glue driver.
Changes in v2:
Dropped the patch in clock to set GENPD_FLAG_ACTIVE_WAKEUP flag and setting in usb dwc3 driver.
Separated the core patch and glue driver patch.
Made need_phy_for_wakeup flag part of dwc structure and hs_phy_flags as unsgined int.
Adrressed the comment on device_init_wakeup call. Corrected offset for reading portsc register.
Added pacth to support wakeup in xo shutdown case.
Sandeep Maheswaram (5):
usb: dwc3: host: Add suspend_quirk for dwc3 host
usb: dwc3: core: Host wake up support from system suspend
usb: dwc3: qcom: Add helper functions to enable,disable wake irqs
usb: dwc3: qcom: Configure wakeup interrupts during suspend
usb: dwc3: qcom: Set genpd active wakeup flag for usb gdsc
drivers/usb/dwc3/core.c | 7 ++-- drivers/usb/dwc3/core.h | 3 ++ drivers/usb/dwc3/dwc3-qcom.c | 85 ++++++++++++++++++++++++++++---------------- drivers/usb/dwc3/host.c | 59 ++++++++++++++++++++++++++++++ 4 files changed, 122 insertions(+), 32 deletions(-)
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v6 1/5 usb: dwc3: host: Add suspend_quirk for dwc3 host
Adding suspend quirk function for dwc3 host which will be called during xhci suspend.
Setting hs_phy_mode, ss_phy_mode , phy_power_off flags and phy mode during host suspend.
--- drivers/usb/dwc3/core.h | 3 +++ drivers/usb/dwc3/host.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+)
drivers/usb/dwc3/core.h +3 -0
@@ -1111,6 +1111,9 @@ struct dwc3 {bool phys_ready; +unsigned int hs_phy_mode; +bool phy_power_off; +struct ulpi *ulpi;bool ulpi_ready;
drivers/usb/dwc3/host.c +59 -0
77 lines not on this page · raw message
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v6 1/5] usb: dwc3: host: Add suspend_quirk for dwc3 host
Quoted 6 lines · Sandeep Maheswaram
Subject: usb: dwc3: host: Add
suspend_quirkfor dwc3 hostAdding suspend quirk function for dwc3 host which will be called during xhci suspend.
Settinghs_phy_mode,ss_phy_mode,phy_power_offflags and phy mode during host suspend.
This describes in other words what the code already tells us, but doesn't really explain why this change is needed.
An attempt to be a bit clearer:
Subject: usb: dwc3: host: Set PHY mode during suspend
During suspend read the status of all port and make sure the PHYs are in the correct mode (mka@: why is it necessary to call phy_set_mode(), shouldn't the PHYs already be in the correct mode if they are operational?). Keep track of the mode of the HS PHY to be able to configure wakeup properly.
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 should be powered down during suspend.
Just a starting point, I'm sure it has room for improvement.
Quoted 109 lines
Signed-off-by Sandeep Maheswaram <[email protected]>--- drivers/usb/dwc3/core.h | 3 +++ drivers/usb/dwc3/host.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+)drivers/usb/dwc3/core.h +3
-0@@ -1111,6 +1111,9 @@ struct dwc3 {bool phys_ready; +unsigned int hs_phy_mode; +bool phy_power_off; +struct ulpi *ulpi;bool ulpi_ready;drivers/usb/dwc3/host.c +59
-0@@ -11,6 +11,14 @@#include <linux/platform_device.h> #include "core.h" +#include "../host/xhci.h" +#include "../host/xhci-plat.h" + +static int xhci_dwc3_suspend_quirk (struct usb_hcd *hcd); + +static const struct xhci_plat_priv xhci_plat_dwc3_xhci = { + .suspend_quirk = xhci_dwc3_suspend_quirk, +};static int dwc3_host_get_irq (struct dwc3 *dwc) {@@ -115,6 +123,13 @@ int dwc3_host_init(struct dwc3 *dwc) } } + ret =platform_device_add_data (xhci, &xhci_plat_dwc3_xhci, +sizeof (struct xhci_plat_priv )); +if (ret) { +dev_err (dwc->dev,"failed to add data to xHCI\n" ); + goto err; + } + ret =platform_device_add (xhci);if (ret) {dev_err (dwc->dev,"failed to register xHCI device\n" );@@ -127,6 +142,50 @@ int dwc3_host_init(struct dwc3 *dwc)return ret; } +static void dwc3_set_phy_mode (struct usb_hcd *hcd) +{ + +int i, num_ports; +u32 reg; +unsigned int ss_phy_mode =0 ; +struct dwc3 *dwc =dev_get_drvdata (hcd->self.controller->parent); +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 *0x04 ); +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 ; + +if (DEV_SUPERSPEED (reg)) + ss_phy_mode |=PHY_MODE_USB_HOST_SS ; + } + } +phy_set_mode (dwc->usb2_generic_phy, dwc->hs_phy_mode); +phy_set_mode (dwc->usb3_generic_phy, ss_phy_mode); +} + +int xhci_dwc3_suspend_quirk (struct usb_hcd *hcd) +{ +struct dwc3 *dwc =dev_get_drvdata (hcd->self.controller->parent); + +dwc3_set_phy_mode (hcd); + +if (usb_wakeup_enabled_descendants (hcd->self.root_hub)) + dwc->phy_power_off = false; +else + dwc->phy_power_off = true; + +return 0 ; +} +void dwc3_host_exit (struct dwc3 *dwc) {platform_device_unregister (dwc->xhci);Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v6 2/5 usb: dwc3: core: Host wake up support from system suspend
In reply to Sandeep MaheswaramAvoiding phy powerdown when wakeup capable devices are connected by checking phy_power_off flag.
Phy should be on to wake up the device from suspend using wakeup capable devices such as keyboard and mouse.
--- drivers/usb/dwc3/core.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/usb/dwc3/core.c +5 -2
@@ -1701,7 +1701,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)) { +if (!PMSG_IS_AUTO (msg) && dwc->phy_power_off) {dwc3_core_exit (dwc);break ; }
@@ -1762,13 +1762,16 @@ static int dwc3_resume_common(struct dwc3 *dwc, pm_message_t msg)spin_unlock_irqrestore (&dwc->lock, flags);break ;case DWC3_GCTL_PRTCAP_HOST : -if (!PMSG_IS_AUTO (msg)) { +if (!PMSG_IS_AUTO (msg) && dwc->phy_power_off) { ret =dwc3_core_init_for_resume (dwc);if (ret)return ret;dwc3_set_prtcap (dwc,DWC3_GCTL_PRTCAP_HOST );break ; + }else { +dwc3_set_prtcap (dwc,DWC3_GCTL_PRTCAP_HOST ); } +/* Restore GUSB2PHYCFG bits that were modified in suspend */ reg =dwc3_readl (dwc->regs,DWC3_GUSB2PHYCFG (0 ));if (dwc->dis_u2_susphy_quirk)
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v6 2/5] usb: dwc3: core: Host wake up support from system suspend
Quoted 6 lines · Sandeep Maheswaram
Avoiding phy powerdown when wakeup capable devices are connected by checking
phy_power_offflag.
Phy should be on to wake up the device from suspend using wakeup capable devices such as keyboard and mouse.Signed-off-by Sandeep Maheswaram <[email protected]>
PATCH v6 3/5 usb: dwc3: qcom: Add helper functions to enable,disable wake irqs
In reply to Sandeep MaheswaramAdding helper functions to enable,disable wake irqs to make the code simple and readable.
--- drivers/usb/dwc3/dwc3-qcom.c | 58 ++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 32 deletions(-)
drivers/usb/dwc3/dwc3-qcom.c +26 -32
@@ -296,50 +296,44 @@ static void dwc3_qcom_interconnect_exit(struct dwc3_qcom *qcom)icc_put (qcom->icc_path_apps); } +static void dwc3_qcom_enable_wakeup_irq (int irq) +{ +if (!irq) +return ; + +enable_irq (irq); +enable_irq_wake (irq); +} + +static void dwc3_qcom_disable_wakeup_irq (int irq) +{ +if (!irq) +return ; + +disable_irq_wake (irq); +disable_irq_nosync (irq); +} +static void dwc3_qcom_disable_interrupts (struct dwc3_qcom *qcom) { -if (qcom->hs_phy_irq) { -disable_irq_wake (qcom->hs_phy_irq); -disable_irq_nosync (qcom->hs_phy_irq); - } +dwc3_qcom_disable_wakeup_irq (qcom->hs_phy_irq); -if (qcom->dp_hs_phy_irq) { -disable_irq_wake (qcom->dp_hs_phy_irq); -disable_irq_nosync (qcom->dp_hs_phy_irq); - } +dwc3_qcom_disable_wakeup_irq (qcom->dp_hs_phy_irq); -if (qcom->dm_hs_phy_irq) { -disable_irq_wake (qcom->dm_hs_phy_irq); -disable_irq_nosync (qcom->dm_hs_phy_irq); - } +dwc3_qcom_disable_wakeup_irq (qcom->dm_hs_phy_irq); -if (qcom->ss_phy_irq) { -disable_irq_wake (qcom->ss_phy_irq); -disable_irq_nosync (qcom->ss_phy_irq); - } +dwc3_qcom_disable_wakeup_irq (qcom->ss_phy_irq); }static void dwc3_qcom_enable_interrupts (struct dwc3_qcom *qcom) { -if (qcom->hs_phy_irq) { -enable_irq (qcom->hs_phy_irq); -enable_irq_wake (qcom->hs_phy_irq); - } +dwc3_qcom_enable_wakeup_irq (qcom->hs_phy_irq); -if (qcom->dp_hs_phy_irq) { -enable_irq (qcom->dp_hs_phy_irq); -enable_irq_wake (qcom->dp_hs_phy_irq); - } +dwc3_qcom_enable_wakeup_irq (qcom->dp_hs_phy_irq); -if (qcom->dm_hs_phy_irq) { -enable_irq (qcom->dm_hs_phy_irq); -enable_irq_wake (qcom->dm_hs_phy_irq); - } +dwc3_qcom_enable_wakeup_irq (qcom->dm_hs_phy_irq); -if (qcom->ss_phy_irq) { -enable_irq (qcom->ss_phy_irq); -enable_irq_wake (qcom->ss_phy_irq); - } +dwc3_qcom_enable_wakeup_irq (qcom->ss_phy_irq); }static int dwc3_qcom_suspend (struct dwc3_qcom *qcom)
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v6 3/5] usb: dwc3: qcom: Add helper functions to enable,disable wake irqs
Quoted 4 lines · Sandeep Maheswaram
Adding helper functions to enable,disable wake irqs to make the code simple and readable.
Signed-off-by Sandeep Maheswaram <[email protected]>
PATCH v6 4/5 usb: dwc3: qcom: Configure wakeup interrupts during suspend
In reply to Sandeep MaheswaramConfigure interrupts based on hs_phy_mode to avoid triggering of interrupts during system suspend and suspend the device successfully.
--- drivers/usb/dwc3/dwc3-qcom.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-)
drivers/usb/dwc3/dwc3-qcom.c +20 -6
@@ -316,22 +316,36 @@ static void dwc3_qcom_disable_wakeup_irq(int irq)static void dwc3_qcom_disable_interrupts (struct dwc3_qcom *qcom) { -dwc3_qcom_disable_wakeup_irq (qcom->hs_phy_irq); +struct dwc3 *dwc =platform_get_drvdata (qcom->dwc3); -dwc3_qcom_disable_wakeup_irq (qcom->dp_hs_phy_irq); +dwc3_qcom_disable_wakeup_irq (qcom->hs_phy_irq); -dwc3_qcom_disable_wakeup_irq (qcom->dm_hs_phy_irq); +if (dwc->hs_phy_mode &PHY_MODE_USB_HOST_LS ) +dwc3_qcom_disable_wakeup_irq (qcom->dp_hs_phy_irq); +else if (dwc->hs_phy_mode &PHY_MODE_USB_HOST_HS ) +dwc3_qcom_disable_wakeup_irq (qcom->dm_hs_phy_irq); +else { +dwc3_qcom_disable_wakeup_irq (qcom->dp_hs_phy_irq); +dwc3_qcom_disable_wakeup_irq (qcom->dm_hs_phy_irq); + }dwc3_qcom_disable_wakeup_irq (qcom->ss_phy_irq); }static void dwc3_qcom_enable_interrupts (struct dwc3_qcom *qcom) { -dwc3_qcom_enable_wakeup_irq (qcom->hs_phy_irq); +struct dwc3 *dwc =platform_get_drvdata (qcom->dwc3); -dwc3_qcom_enable_wakeup_irq (qcom->dp_hs_phy_irq); +dwc3_qcom_enable_wakeup_irq (qcom->hs_phy_irq); -dwc3_qcom_enable_wakeup_irq (qcom->dm_hs_phy_irq); +if (dwc->hs_phy_mode &PHY_MODE_USB_HOST_LS ) +dwc3_qcom_enable_wakeup_irq (qcom->dp_hs_phy_irq); +else if (dwc->hs_phy_mode &PHY_MODE_USB_HOST_HS ) +dwc3_qcom_enable_wakeup_irq (qcom->dm_hs_phy_irq); +else { +dwc3_qcom_enable_wakeup_irq (qcom->dp_hs_phy_irq); +dwc3_qcom_enable_wakeup_irq (qcom->dm_hs_phy_irq); + }dwc3_qcom_enable_wakeup_irq (qcom->ss_phy_irq); }
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v6 4/5] usb: dwc3: qcom: Configure wakeup interrupts during suspend
Quoted 21 lines · Sandeep Maheswaram
Configure interrupts based on
hs_phy_modeto avoid triggering of interrupts during system suspend and suspend the device successfully.Signed-off-by Sandeep Maheswaram <[email protected]>--- drivers/usb/dwc3/dwc3-qcom.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-)drivers/usb/dwc3/dwc3-qcom.c +2
-2@@ -316,22 +316,36 @@ static void dwc3_qcom_disable_wakeup_irq(int irq)static void dwc3_qcom_disable_interrupts (struct dwc3_qcom *qcom) { -dwc3_qcom_disable_wakeup_irq (qcom->hs_phy_irq); +struct dwc3 *dwc =platform_get_drvdata (qcom->dwc3); -dwc3_qcom_disable_wakeup_irq (qcom->dp_hs_phy_irq); +dwc3_qcom_disable_wakeup_irq (qcom->hs_phy_irq);
drivers/usb/dwc3/dwc3-qcom.c static void dwc3_qcom_disable_wakeup_irq(int irq) · line 330
Quoted 10 lines
drivers/usb/dwc3/dwc3-qcom.c +8
-1-dwc3_qcom_disable_wakeup_irq (qcom->dm_hs_phy_irq); +if (dwc->hs_phy_mode &PHY_MODE_USB_HOST_LS ) +dwc3_qcom_disable_wakeup_irq (qcom->dp_hs_phy_irq); +else if (dwc->hs_phy_mode &PHY_MODE_USB_HOST_HS ) +dwc3_qcom_disable_wakeup_irq (qcom->dm_hs_phy_irq); +else { +dwc3_qcom_disable_wakeup_irq (qcom->dp_hs_phy_irq); +dwc3_qcom_disable_wakeup_irq (qcom->dm_hs_phy_irq); + }
nit: 'if' and 'else if' branches should also have curly braces since 'else' has them.
Quoted 10 lines
drivers/usb/dwc3/dwc3-qcom.c +2
-2dwc3_qcom_disable_wakeup_irq (qcom->ss_phy_irq); }static void dwc3_qcom_enable_interrupts (struct dwc3_qcom *qcom) { -dwc3_qcom_enable_wakeup_irq (qcom->hs_phy_irq); +struct dwc3 *dwc =platform_get_drvdata (qcom->dwc3); -dwc3_qcom_enable_wakeup_irq (qcom->dp_hs_phy_irq); +dwc3_qcom_enable_wakeup_irq (qcom->hs_phy_irq);
drivers/usb/dwc3/dwc3-qcom.c static void dwc3_qcom_disable_wakeup_irq(int irq) · line 348
Quoted 10 lines
drivers/usb/dwc3/dwc3-qcom.c +8
-1-dwc3_qcom_enable_wakeup_irq (qcom->dm_hs_phy_irq); +if (dwc->hs_phy_mode &PHY_MODE_USB_HOST_LS ) +dwc3_qcom_enable_wakeup_irq (qcom->dp_hs_phy_irq); +else if (dwc->hs_phy_mode &PHY_MODE_USB_HOST_HS ) +dwc3_qcom_enable_wakeup_irq (qcom->dm_hs_phy_irq); +else { +dwc3_qcom_enable_wakeup_irq (qcom->dp_hs_phy_irq); +dwc3_qcom_enable_wakeup_irq (qcom->dm_hs_phy_irq); + }
ditto
drivers/usb/dwc3/dwc3-qcom.c static void dwc3_qcom_disable_wakeup_irq(int irq) · line 351
Quoted 2 lines
drivers/usb/dwc3/dwc3-qcom.c +0
-0dwc3_qcom_enable_wakeup_irq (qcom->ss_phy_irq); }
Other than the nits:
PATCH v6 5/5 usb: dwc3: qcom: Set genpd active wakeup flag for usb gdsc
In reply to Sandeep MaheswaramSet genpd active wakeup flag for usb gdsc if wakeup capable devices are connected so that wake up happens without reenumeration.
--- drivers/usb/dwc3/dwc3-qcom.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/usb/dwc3/dwc3-qcom.c +17 -0
@@ -17,9 +17,11 @@#include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/phy/phy.h> +#include <linux/pm_domain.h> #include <linux/usb/of.h> #include <linux/reset.h> #include <linux/iopoll.h> +#include <linux/usb/hcd.h> #include "core.h"
@@ -354,10 +356,19 @@ static int dwc3_qcom_suspend(struct dwc3_qcom *qcom) {u32 val;int i, ret; +struct dwc3 *dwc =platform_get_drvdata (qcom->dwc3); +struct usb_hcd *hcd; +struct generic_pm_domain *genpd =pd_to_genpd (qcom->dev->pm_domain);if (qcom->is_suspended)return 0 ; +if (dwc->xhci) { + hcd =platform_get_drvdata (dwc->xhci); +if (usb_wakeup_enabled_descendants (hcd->self.root_hub)) + genpd->flags |=GENPD_FLAG_ACTIVE_WAKEUP ; + } + val =readl (qcom->qscratch_base +PWR_EVNT_IRQ_STAT_REG );if (!(val &PWR_EVNT_LPM_IN_L2_MASK ))dev_err (qcom->dev,"HS-PHY not in L2\n" );
@@ -382,9 +393,15 @@ static int dwc3_qcom_resume(struct dwc3_qcom *qcom)int ret;int i; +struct dwc3 *dwc =platform_get_drvdata (qcom->dwc3); +struct generic_pm_domain *genpd =pd_to_genpd (qcom->dev->pm_domain); +if (!qcom->is_suspended)return 0 ; +if (dwc->xhci) + genpd->flags &= ~GENPD_FLAG_ACTIVE_WAKEUP ; +if (device_may_wakeup (qcom->dev))dwc3_qcom_disable_interrupts (qcom);
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v6 5/5] usb: dwc3: qcom: Set genpd active wakeup flag for usb gdsc
Quoted 4 lines · Sandeep Maheswaram
Subject: usb: dwc3: qcom: Set genpd active wakeup flag for usb gdsc
Set genpd active wakeup flag for usb gdsc if wakeup capable devices are connected so that wake up happens without reenumeration.
Better describe things are a higher level, rather than getting into the details of how you achieve it. That's what the code is for.
e.g.:
Subject: usb: dwc3: qcom: Keep power domain on to support wakeup
If wakeup capable devices are connected to the controller (directly or through hubs) at suspend time keep the power domain on in order to support wakeup from these devices.