USB DWC3 host wake up support from system suspend

Avoiding phy powerdown when wakeup capable devices are connected.

Avoiding phy powerdown when wakeup capable devices are connected.

Signed-off-by Sandeep Maheswaram <[email protected]>

---
 drivers/usb/dwc3/core.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

drivers/usb/dwc3/core.c +0 -0

index 94fdbe5..9ecd7ac 100644

drivers/usb/dwc3/core.c +0 -1

 			dwc3_core_exit(dwc);
 			break;
 		}

@@ -1763,13 +1763,15 @@ 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)) {

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.

Signed-off-by Sandeep Maheswaram <[email protected]>

---
 drivers/usb/dwc3/core.h |  3 +++
 drivers/usb/dwc3/host.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)

drivers/usb/dwc3/core.h +3 -0

index ce6bd84..f05546c 100644
@@ -1113,6 +1113,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 +0 -0

index f29a264..3db042c 100644

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.

Signed-off-by Sandeep Maheswaram <[email protected]>

---
 drivers/usb/dwc3/core.h |  3 +++
 drivers/usb/dwc3/host.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)

drivers/usb/dwc3/core.h +3 -0

index ce6bd84..f05546c 100644
@@ -1113,6 +1113,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 +0 -0

index f29a264..3db042c 100644

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.

Signed-off-by Sandeep Maheswaram <[email protected]>

---
 drivers/usb/dwc3/core.h |  3 +++
 drivers/usb/dwc3/host.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)

drivers/usb/dwc3/core.h +3 -0

index ce6bd84..f05546c 100644
@@ -1113,6 +1113,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 +18 -0

index f29a264..3db042c 100644
@@ -11,6 +11,13 @@
 #include <linux/platform_device.h>
 
 #include "core.h"
+#include "../host/xhci.h"
+#include "../host/xhci-plat.h"
+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 +122,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 +141,50 @@ int dwc3_host_init(struct dwc3 *dwc)
 	return ret;
 }
 
+static void dwc3_set_phy_mode(struct usb_hcd *hcd)
+{
+
+	int i, num_ports;

drivers/usb/dwc3/host.c +13 -0

+	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);

drivers/usb/dwc3/host.c +7 -0

+
+	if (usb_wakeup_enabled_descendants(hcd->self.root_hub))
+		dwc->phy_power_off = false;
+
+	return 0;
+}
+
 void dwc3_host_exit(struct dwc3 *dwc)
 {
 	platform_device_unregister(dwc->xhci);

Configure interrupts based on hs_phy_mode to avoid triggering of interrupts during system suspend and suspends successfully. Set genpd active wakeup flag for usb gdsc if wakeup capable devices are connected so that wake up happens without reenumeration. Add helper functions to enable,disable wake irqs.

Quoted 5 lines · Sandeep Maheswaram

Configure interrupts based on hs_phy_mode to avoid triggering of interrupts during system suspend and suspends successfully. Set genpd active wakeup flag for usb gdsc if wakeup capable devices are connected so that wake up happens without reenumeration. Add helper functions to enable,disable wake irqs.

That feels like a lot of different things all in one patch.

Quoted 8 lines · Greg Kroah-Hartman

Quoted 5 lines · Sandeep Maheswaram

Configure interrupts based on hs_phy_mode to avoid triggering of interrupts during system suspend and suspends successfully. Set genpd active wakeup flag for usb gdsc if wakeup capable devices are connected so that wake up happens without reenumeration. Add helper functions to enable,disable wake irqs.

That feels like a lot of different things all in one patch.

Sandeep: one thing you could do to reduce the churn is to add dwc3_qcom_enable/disable_wakeup_irq() in a separate patch, without any functional changes. Then this patch would only add the different branches based on the PHY mode.

The handling of the power domain could probably also be done in a separate patch, if I recall correctly it is only an optimization.