All of lore.kernel.org
 help / color / mirror / Atom feed
* [v16 0/5] USB DWC3 host wake up support from system suspend
@ 2022-05-12 18:23 Krishna Kurapati
  2022-05-12 18:23 ` [v16 1/5] dt-bindings: usb: dwc3: Add wakeup-source property support Krishna Kurapati
                   ` (4 more replies)
  0 siblings, 5 replies; 13+ messages in thread
From: Krishna Kurapati @ 2022-05-12 18:23 UTC (permalink / raw)
  To: Krzysztof Kozlowski, Rob Herring, Andy Gross, Bjorn Andersson,
	Greg Kroah-Hartman, Felipe Balbi, Stephen Boyd, Doug Anderson,
	Matthias Kaehlcke, Mathias Nyman
  Cc: devicetree, linux-arm-msm, linux-usb, linux-kernel, linux-pm,
	quic_pkondeti, quic_ppratap, quic_vpulyala, Krishna Kurapati

Avoiding phy powerdown in host mode when wakeup capable devices are 
connected, so that it can be wake up by devices.
Keep usb30_prim gdsc active to retain controller status
during suspend/resume.

Changes in v16:
Added changes to power down the phy's during suspend only if dwc3
is not wakeup capable.

Changes in v15:
Added patch to enable wakeup for xhci-plat based on children wakeup status.
Used device_wakeup_path instead of device_children_wakeup_capable

Changes in v14:
Added patch for device_children_wakeup_capable.
Used device_children_wakeup_capable instead of usb_wakeup_enabled_descendants.
Fixed minor nit picks in v13 reported by Matthias.

Changes in v13:
Moved the dt bindings patch to start.
Changed dwc3_set_phy_speed_mode to dwc3_check_phy_speed_mode.
Check wakep-source property for dwc3 core node to set the
wakeup capability. Drop the device_init_wakeup call from
runtime suspend and resume.
Added GENPD_FLAG_RPM_ALWAYS_ON and set GENPD_FLAG_ALWAYS_ON if
wakeup is supported.

Changes in v12:
Squashed PATCH 1/5 and 2/5 of v11.
Added dt bindings and device tree entry for wakeup-source property
for dwc3 core node.
Dropped redundant phy_set_mode call.


Changes in v11:
Moving back to v8 version
https://patchwork.kernel.org/project/linux-arm-msm/cover/1624882097-23265-1-git-send-email-sanm@codeaurora.org
as we are getting interrupts during suspend
when enabling both DP hs phy irq and DM hs phy irq.
Moved the set phy mode function to dwc3/core.c from xhci-plat.c
We didn't find any other option other than accessing xhci from dwc.

Changes in v10:
PATCH 1/6: Change device_set_wakeup_capable to device_set_wakeup_enable
PATCH 2/6: Remove redundant else part in dwc3_resume_common
PATCH 4/6: Change the irg flags
PATCH 5/6: Set flag GENPD_FLAG_ALWAYS_ON
PATCH 6/6: Remove disable interrupts function and enable
interrupts in probe.


Changes in v9:
Checking with device_may_makeup property instead of phy_power_off flag.
Changed the IRQ flags and removed hs_phy_mode variable.

Changes in v8:
Moved the dwc3 suspend quirk code in dwc3/host.c to xhci-plat.c
Checking phy_power_off flag instead of usb_wakeup_enabled_descendants 
to keep gdsc active.

Changes in v7:
Change in commit text and message in PATCH 1/5 and PATCH 5/5
as per Matthias suggestion.
Added curly braces for if and else if sections in PATCH 4/5.

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):
  dt-bindings: usb: dwc3: Add wakeup-source property support
  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: Keep power domain on to retain controller status

 .../devicetree/bindings/usb/snps,dwc3.yaml         |  5 ++
 drivers/usb/dwc3/core.c                            | 30 +++----
 drivers/usb/dwc3/core.h                            |  4 +
 drivers/usb/dwc3/dwc3-qcom.c                       | 91 +++++++++++++---------
 drivers/usb/dwc3/host.c                            | 24 ++++++
 5 files changed, 104 insertions(+), 50 deletions(-)

-- 
2.7.4


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [v16 1/5] dt-bindings: usb: dwc3: Add wakeup-source property support
  2022-05-12 18:23 [v16 0/5] USB DWC3 host wake up support from system suspend Krishna Kurapati
@ 2022-05-12 18:23 ` Krishna Kurapati
  2022-05-13 12:33   ` Rob Herring
  2022-05-12 18:23 ` [v16 2/5] usb: dwc3: core: Host wake up support from system suspend Krishna Kurapati
                   ` (3 subsequent siblings)
  4 siblings, 1 reply; 13+ messages in thread
From: Krishna Kurapati @ 2022-05-12 18:23 UTC (permalink / raw)
  To: Krzysztof Kozlowski, Rob Herring, Andy Gross, Bjorn Andersson,
	Greg Kroah-Hartman, Felipe Balbi, Stephen Boyd, Doug Anderson,
	Matthias Kaehlcke, Mathias Nyman
  Cc: devicetree, linux-arm-msm, linux-usb, linux-kernel, linux-pm,
	quic_pkondeti, quic_ppratap, quic_vpulyala, Sandeep Maheswaram,
	Krishna Kurapati

From: Sandeep Maheswaram <quic_c_sanm@quicinc.com>

Added support for wakeup-source property. This property can be
used to check and power down the phy during system suspend if
wake up is not supported.

Signed-off-by: Sandeep Maheswaram <quic_c_sanm@quicinc.com>
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com>
---
 Documentation/devicetree/bindings/usb/snps,dwc3.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Documentation/devicetree/bindings/usb/snps,dwc3.yaml b/Documentation/devicetree/bindings/usb/snps,dwc3.yaml
index f4471f8..4d4de2f 100644
--- a/Documentation/devicetree/bindings/usb/snps,dwc3.yaml
+++ b/Documentation/devicetree/bindings/usb/snps,dwc3.yaml
@@ -341,6 +341,11 @@ properties:
       This port is used with the 'usb-role-switch' property  to connect the
       dwc3 to type C connector.
 
+  wakeup-source:
+    $ref: /schemas/types.yaml#/definitions/flag
+    description:
+      Enable USB remote wakeup.
+
 unevaluatedProperties: false
 
 required:
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [v16 2/5] usb: dwc3: core: Host wake up support from system suspend
  2022-05-12 18:23 [v16 0/5] USB DWC3 host wake up support from system suspend Krishna Kurapati
  2022-05-12 18:23 ` [v16 1/5] dt-bindings: usb: dwc3: Add wakeup-source property support Krishna Kurapati
@ 2022-05-12 18:23 ` Krishna Kurapati
  2022-05-12 22:40   ` Matthias Kaehlcke
  2022-05-12 18:23 ` [v16 3/5] usb: dwc3: qcom: Add helper functions to enable,disable wake irqs Krishna Kurapati
                   ` (2 subsequent siblings)
  4 siblings, 1 reply; 13+ messages in thread
From: Krishna Kurapati @ 2022-05-12 18:23 UTC (permalink / raw)
  To: Krzysztof Kozlowski, Rob Herring, Andy Gross, Bjorn Andersson,
	Greg Kroah-Hartman, Felipe Balbi, Stephen Boyd, Doug Anderson,
	Matthias Kaehlcke, Mathias Nyman
  Cc: devicetree, linux-arm-msm, linux-usb, linux-kernel, linux-pm,
	quic_pkondeti, quic_ppratap, quic_vpulyala, Sandeep Maheswaram,
	Krishna Kurapati

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 | 30 +++++++++++++++++-------------
 drivers/usb/dwc3/core.h |  4 ++++
 drivers/usb/dwc3/host.c | 24 ++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 01115df..8bcabc5 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -1785,6 +1785,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);
@@ -1946,10 +1947,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 ||
@@ -1965,6 +1963,15 @@ 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))
+				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 */
@@ -2008,11 +2015,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));
@@ -2084,8 +2092,6 @@ static int dwc3_runtime_suspend(struct device *dev)
 	if (ret)
 		return ret;
 
-	device_init_wakeup(dev, true);
-
 	return 0;
 }
 
@@ -2094,8 +2100,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 f56c30c..e19b40a 100644
--- a/drivers/usb/dwc3/host.c
+++ b/drivers/usb/dwc3/host.c
@@ -12,6 +12,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)
@@ -136,3 +137,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;
+		}
+	}
+}
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [v16 3/5] usb: dwc3: qcom: Add helper functions to enable,disable wake irqs
  2022-05-12 18:23 [v16 0/5] USB DWC3 host wake up support from system suspend Krishna Kurapati
  2022-05-12 18:23 ` [v16 1/5] dt-bindings: usb: dwc3: Add wakeup-source property support Krishna Kurapati
  2022-05-12 18:23 ` [v16 2/5] usb: dwc3: core: Host wake up support from system suspend Krishna Kurapati
@ 2022-05-12 18:23 ` Krishna Kurapati
  2022-05-12 18:23 ` [v16 4/5] usb: dwc3: qcom: Configure wakeup interrupts during suspend Krishna Kurapati
  2022-05-12 18:23 ` [v16 5/5] usb: dwc3: qcom: Keep power domain on to retain controller status Krishna Kurapati
  4 siblings, 0 replies; 13+ messages in thread
From: Krishna Kurapati @ 2022-05-12 18:23 UTC (permalink / raw)
  To: Krzysztof Kozlowski, Rob Herring, Andy Gross, Bjorn Andersson,
	Greg Kroah-Hartman, Felipe Balbi, Stephen Boyd, Doug Anderson,
	Matthias Kaehlcke, Mathias Nyman
  Cc: devicetree, linux-arm-msm, linux-usb, linux-kernel, linux-pm,
	quic_pkondeti, quic_ppratap, quic_vpulyala, Sandeep Maheswaram,
	Krishna Kurapati

From: Sandeep Maheswaram <quic_c_sanm@quicinc.com>

Adding helper functions to enable,disable wake irqs to make
the code simple and readable.

Signed-off-by: Sandeep Maheswaram <quic_c_sanm@quicinc.com>
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com>
---
 drivers/usb/dwc3/dwc3-qcom.c | 58 ++++++++++++++++++++------------------------
 1 file changed, 26 insertions(+), 32 deletions(-)

diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
index 6cba990..7352124 100644
--- a/drivers/usb/dwc3/dwc3-qcom.c
+++ b/drivers/usb/dwc3/dwc3-qcom.c
@@ -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)
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [v16 4/5] usb: dwc3: qcom: Configure wakeup interrupts during suspend
  2022-05-12 18:23 [v16 0/5] USB DWC3 host wake up support from system suspend Krishna Kurapati
                   ` (2 preceding siblings ...)
  2022-05-12 18:23 ` [v16 3/5] usb: dwc3: qcom: Add helper functions to enable,disable wake irqs Krishna Kurapati
@ 2022-05-12 18:23 ` Krishna Kurapati
  2022-05-12 18:23 ` [v16 5/5] usb: dwc3: qcom: Keep power domain on to retain controller status Krishna Kurapati
  4 siblings, 0 replies; 13+ messages in thread
From: Krishna Kurapati @ 2022-05-12 18:23 UTC (permalink / raw)
  To: Krzysztof Kozlowski, Rob Herring, Andy Gross, Bjorn Andersson,
	Greg Kroah-Hartman, Felipe Balbi, Stephen Boyd, Doug Anderson,
	Matthias Kaehlcke, Mathias Nyman
  Cc: devicetree, linux-arm-msm, linux-usb, linux-kernel, linux-pm,
	quic_pkondeti, quic_ppratap, quic_vpulyala, Sandeep Maheswaram,
	Krishna Kurapati

From: Sandeep Maheswaram <quic_c_sanm@quicinc.com>

Configure DP/DM interrupts to detect line state changes based on
hs_phy_mode. Enable the triggers opposite of what the current
DP, DM levels. For HS/FS mode enable DM interrupt and for LS enable DP
interrupt.

Signed-off-by: Sandeep Maheswaram <quic_c_sanm@quicinc.com>
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com>
---
 drivers/usb/dwc3/dwc3-qcom.c | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
index 7352124..9804a19 100644
--- a/drivers/usb/dwc3/dwc3-qcom.c
+++ b/drivers/usb/dwc3/dwc3-qcom.c
@@ -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);
 }
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [v16 5/5] usb: dwc3: qcom: Keep power domain on to retain controller status
  2022-05-12 18:23 [v16 0/5] USB DWC3 host wake up support from system suspend Krishna Kurapati
                   ` (3 preceding siblings ...)
  2022-05-12 18:23 ` [v16 4/5] usb: dwc3: qcom: Configure wakeup interrupts during suspend Krishna Kurapati
@ 2022-05-12 18:23 ` Krishna Kurapati
  2022-05-12 22:46   ` Matthias Kaehlcke
  4 siblings, 1 reply; 13+ messages in thread
From: Krishna Kurapati @ 2022-05-12 18:23 UTC (permalink / raw)
  To: Krzysztof Kozlowski, Rob Herring, Andy Gross, Bjorn Andersson,
	Greg Kroah-Hartman, Felipe Balbi, Stephen Boyd, Doug Anderson,
	Matthias Kaehlcke, Mathias Nyman
  Cc: devicetree, linux-arm-msm, linux-usb, linux-kernel, linux-pm,
	quic_pkondeti, quic_ppratap, quic_vpulyala, Sandeep Maheswaram,
	Krishna Kurapati

From: Sandeep Maheswaram <quic_c_sanm@quicinc.com>

Keep the power domain always on during runtime suspend or if the
controller supports wakeup in order to retain controller status
and to support wakeup from devices.

Signed-off-by: Sandeep Maheswaram <quic_c_sanm@quicinc.com>
Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com>
---
 drivers/usb/dwc3/dwc3-qcom.c | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
index 9804a19..1f9589a 100644
--- a/drivers/usb/dwc3/dwc3-qcom.c
+++ b/drivers/usb/dwc3/dwc3-qcom.c
@@ -17,6 +17,7 @@
 #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>
@@ -718,12 +719,13 @@ dwc3_qcom_create_urs_usb_platdev(struct device *dev)
 
 static int dwc3_qcom_probe(struct platform_device *pdev)
 {
-	struct device_node	*np = pdev->dev.of_node;
-	struct device		*dev = &pdev->dev;
-	struct dwc3_qcom	*qcom;
-	struct resource		*res, *parent_res = NULL;
-	int			ret, i;
-	bool			ignore_pipe_clk;
+	struct device_node *np = pdev->dev.of_node;
+	struct device *dev = &pdev->dev;
+	struct dwc3_qcom *qcom;
+	struct resource	*res, *parent_res = NULL;
+	int ret, i;
+	bool ignore_pipe_clk;
+	struct generic_pm_domain *genpd;
 
 	qcom = devm_kzalloc(&pdev->dev, sizeof(*qcom), GFP_KERNEL);
 	if (!qcom)
@@ -732,6 +734,8 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, qcom);
 	qcom->dev = &pdev->dev;
 
+	genpd = pd_to_genpd(qcom->dev->pm_domain);
+
 	if (has_acpi_companion(dev)) {
 		qcom->acpi_pdata = acpi_device_get_match_data(dev);
 		if (!qcom->acpi_pdata) {
@@ -839,7 +843,12 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
 	if (ret)
 		goto interconnect_exit;
 
-	device_init_wakeup(&pdev->dev, 1);
+	genpd->flags |= GENPD_FLAG_RPM_ALWAYS_ON;
+
+	if (device_may_wakeup(&qcom->dwc3->dev)) {
+		genpd->flags |= GENPD_FLAG_ALWAYS_ON;
+		device_init_wakeup(&pdev->dev, true);
+	}
 	qcom->is_suspended = false;
 	pm_runtime_set_active(dev);
 	pm_runtime_enable(dev);
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* Re: [v16 2/5] usb: dwc3: core: Host wake up support from system suspend
  2022-05-12 18:23 ` [v16 2/5] usb: dwc3: core: Host wake up support from system suspend Krishna Kurapati
@ 2022-05-12 22:40   ` Matthias Kaehlcke
  2022-05-13  3:58     ` Krishna Kurapati PSSNV
  0 siblings, 1 reply; 13+ messages in thread
From: Matthias Kaehlcke @ 2022-05-12 22:40 UTC (permalink / raw)
  To: Krishna Kurapati
  Cc: Krzysztof Kozlowski, Rob Herring, Andy Gross, Bjorn Andersson,
	Greg Kroah-Hartman, Felipe Balbi, Stephen Boyd, Doug Anderson,
	Mathias Nyman, devicetree, linux-arm-msm, linux-usb,
	linux-kernel, linux-pm, quic_pkondeti, quic_ppratap,
	quic_vpulyala, Sandeep Maheswaram

On Thu, May 12, 2022 at 11:53:19PM +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 | 30 +++++++++++++++++-------------
>  drivers/usb/dwc3/core.h |  4 ++++
>  drivers/usb/dwc3/host.c | 24 ++++++++++++++++++++++++
>  3 files changed, 45 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
> index 01115df..8bcabc5 100644
> --- a/drivers/usb/dwc3/core.c
> +++ b/drivers/usb/dwc3/core.c
> @@ -1785,6 +1785,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);
> @@ -1946,10 +1947,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 ||
> @@ -1965,6 +1963,15 @@ 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))

I think this should be device_can_wakeup(), i.e. hardware capability instead of
device policy. A drawback of powering the PHYs off is that it causes a high
power consumption of certain peripherals if VBUS is still supplied, so this
should be limited to platforms where the PHYs must be powered off (using wakeup
capability as a proxy for now).


> +				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 */
> @@ -2008,11 +2015,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));
> @@ -2084,8 +2092,6 @@ static int dwc3_runtime_suspend(struct device *dev)
>  	if (ret)
>  		return ret;
>  
> -	device_init_wakeup(dev, true);
> -
>  	return 0;
>  }
>  
> @@ -2094,8 +2100,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 f56c30c..e19b40a 100644
> --- a/drivers/usb/dwc3/host.c
> +++ b/drivers/usb/dwc3/host.c
> @@ -12,6 +12,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)
> @@ -136,3 +137,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;
> +		}
> +	}
> +}

I anticipate that it might raise concerns from maintainers that
dwc3_check_phy_speed_mode() accesses xHCI data structures and
registers directly. Could there be a generic HCD API that provides
this functionality (if implemented by the specific HCD)?

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [v16 5/5] usb: dwc3: qcom: Keep power domain on to retain controller status
  2022-05-12 18:23 ` [v16 5/5] usb: dwc3: qcom: Keep power domain on to retain controller status Krishna Kurapati
@ 2022-05-12 22:46   ` Matthias Kaehlcke
  0 siblings, 0 replies; 13+ messages in thread
From: Matthias Kaehlcke @ 2022-05-12 22:46 UTC (permalink / raw)
  To: Krishna Kurapati
  Cc: Krzysztof Kozlowski, Rob Herring, Andy Gross, Bjorn Andersson,
	Greg Kroah-Hartman, Felipe Balbi, Stephen Boyd, Doug Anderson,
	Mathias Nyman, devicetree, linux-arm-msm, linux-usb,
	linux-kernel, linux-pm, quic_pkondeti, quic_ppratap,
	quic_vpulyala, Sandeep Maheswaram

On Thu, May 12, 2022 at 11:53:22PM +0530, Krishna Kurapati wrote:
> From: Sandeep Maheswaram <quic_c_sanm@quicinc.com>
> 
> Keep the power domain always on during runtime suspend or if the
> controller supports wakeup in order to retain controller status
> and to support wakeup from devices.
> 
> Signed-off-by: Sandeep Maheswaram <quic_c_sanm@quicinc.com>
> Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com>
> ---
>  drivers/usb/dwc3/dwc3-qcom.c | 23 ++++++++++++++++-------
>  1 file changed, 16 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
> index 9804a19..1f9589a 100644
> --- a/drivers/usb/dwc3/dwc3-qcom.c
> +++ b/drivers/usb/dwc3/dwc3-qcom.c
> @@ -17,6 +17,7 @@
>  #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>
> @@ -718,12 +719,13 @@ dwc3_qcom_create_urs_usb_platdev(struct device *dev)
>  
>  static int dwc3_qcom_probe(struct platform_device *pdev)
>  {
> -	struct device_node	*np = pdev->dev.of_node;
> -	struct device		*dev = &pdev->dev;
> -	struct dwc3_qcom	*qcom;
> -	struct resource		*res, *parent_res = NULL;
> -	int			ret, i;
> -	bool			ignore_pipe_clk;
> +	struct device_node *np = pdev->dev.of_node;
> +	struct device *dev = &pdev->dev;
> +	struct dwc3_qcom *qcom;
> +	struct resource	*res, *parent_res = NULL;
> +	int ret, i;
> +	bool ignore_pipe_clk;
> +	struct generic_pm_domain *genpd;
>  
>  	qcom = devm_kzalloc(&pdev->dev, sizeof(*qcom), GFP_KERNEL);
>  	if (!qcom)
> @@ -732,6 +734,8 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
>  	platform_set_drvdata(pdev, qcom);
>  	qcom->dev = &pdev->dev;
>  
> +	genpd = pd_to_genpd(qcom->dev->pm_domain);
> +
>  	if (has_acpi_companion(dev)) {
>  		qcom->acpi_pdata = acpi_device_get_match_data(dev);
>  		if (!qcom->acpi_pdata) {
> @@ -839,7 +843,12 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
>  	if (ret)
>  		goto interconnect_exit;
>  
> -	device_init_wakeup(&pdev->dev, 1);
> +	genpd->flags |= GENPD_FLAG_RPM_ALWAYS_ON;
> +
> +	if (device_may_wakeup(&qcom->dwc3->dev)) {

This should probably be device_can_wakeup(), otherwise you'll have to set/clear
the flag before suspending (the wakeup policy might change after the device is
probed). Also I'm not sure if switching the domain off can impact the power
consumption of some connected peripherals, as is observed when the PHYs are
powered off (I could confirm this if needed).

> +		genpd->flags |= GENPD_FLAG_ALWAYS_ON;
> +		device_init_wakeup(&pdev->dev, true);
> +	}
>  	qcom->is_suspended = false;
>  	pm_runtime_set_active(dev);
>  	pm_runtime_enable(dev);
> -- 
> 2.7.4
> 

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [v16 2/5] usb: dwc3: core: Host wake up support from system suspend
  2022-05-12 22:40   ` Matthias Kaehlcke
@ 2022-05-13  3:58     ` Krishna Kurapati PSSNV
  2022-05-16  4:43       ` Pavan Kondeti
  0 siblings, 1 reply; 13+ messages in thread
From: Krishna Kurapati PSSNV @ 2022-05-13  3:58 UTC (permalink / raw)
  To: Matthias Kaehlcke
  Cc: Krzysztof Kozlowski, Rob Herring, Andy Gross, Bjorn Andersson,
	Greg Kroah-Hartman, Felipe Balbi, Stephen Boyd, Doug Anderson,
	Mathias Nyman, devicetree, linux-arm-msm, linux-usb,
	linux-kernel, linux-pm, quic_pkondeti, quic_ppratap,
	quic_vpulyala, Sandeep Maheswaram


On 5/13/2022 4:10 AM, Matthias Kaehlcke wrote:
> On Thu, May 12, 2022 at 11:53:19PM +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 | 30 +++++++++++++++++-------------
>>   drivers/usb/dwc3/core.h |  4 ++++
>>   drivers/usb/dwc3/host.c | 24 ++++++++++++++++++++++++
>>   3 files changed, 45 insertions(+), 13 deletions(-)
>>
>> diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
>> index 01115df..8bcabc5 100644
>> --- a/drivers/usb/dwc3/core.c
>> +++ b/drivers/usb/dwc3/core.c
>> @@ -1785,6 +1785,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);
>> @@ -1946,10 +1947,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 ||
>> @@ -1965,6 +1963,15 @@ 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))
> I think this should be device_can_wakeup(), i.e. hardware capability instead of
> device policy. A drawback of powering the PHYs off is that it causes a high
> power consumption of certain peripherals if VBUS is still supplied, so this
> should be limited to platforms where the PHYs must be powered off (using wakeup
> capability as a proxy for now).
Thnaks Mathias for the review. Will make this change in the next patchset.
>> +				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 */
>> @@ -2008,11 +2015,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));
>> @@ -2084,8 +2092,6 @@ static int dwc3_runtime_suspend(struct device *dev)
>>   	if (ret)
>>   		return ret;
>>   
>> -	device_init_wakeup(dev, true);
>> -
>>   	return 0;
>>   }
>>   
>> @@ -2094,8 +2100,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 f56c30c..e19b40a 100644
>> --- a/drivers/usb/dwc3/host.c
>> +++ b/drivers/usb/dwc3/host.c
>> @@ -12,6 +12,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)
>> @@ -136,3 +137,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;
>> +		}
>> +	}
>> +}
> I anticipate that it might raise concerns from maintainers that
> dwc3_check_phy_speed_mode() accesses xHCI data structures and
> registers directly. Could there be a generic HCD API that provides
> this functionality (if implemented by the specific HCD)?

Hi Mathias, we are not sure if there is any such API present currently.

Hi Alan, can you help suggest any API (if present) that we can reuse 
here to avoid

xhci registers and structs here in dwc3.


^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [v16 1/5] dt-bindings: usb: dwc3: Add wakeup-source property support
  2022-05-12 18:23 ` [v16 1/5] dt-bindings: usb: dwc3: Add wakeup-source property support Krishna Kurapati
@ 2022-05-13 12:33   ` Rob Herring
  0 siblings, 0 replies; 13+ messages in thread
From: Rob Herring @ 2022-05-13 12:33 UTC (permalink / raw)
  To: Krishna Kurapati
  Cc: Mathias Nyman, linux-kernel, quic_ppratap, Andy Gross,
	Matthias Kaehlcke, linux-usb, Greg Kroah-Hartman, quic_pkondeti,
	Stephen Boyd, Bjorn Andersson, Doug Anderson, quic_vpulyala,
	Rob Herring, devicetree, Felipe Balbi, linux-pm,
	Krzysztof Kozlowski, Sandeep Maheswaram, linux-arm-msm

On Thu, 12 May 2022 23:53:18 +0530, Krishna Kurapati wrote:
> From: Sandeep Maheswaram <quic_c_sanm@quicinc.com>
> 
> Added support for wakeup-source property. This property can be
> used to check and power down the phy during system suspend if
> wake up is not supported.
> 
> Signed-off-by: Sandeep Maheswaram <quic_c_sanm@quicinc.com>
> Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
> Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com>
> ---
>  Documentation/devicetree/bindings/usb/snps,dwc3.yaml | 5 +++++
>  1 file changed, 5 insertions(+)
> 

Running 'make dtbs_check' with the schema in this patch gives the
following warnings. Consider if they are expected or the schema is
incorrect. These may not be new warnings.

Note that it is not yet a requirement to have 0 warnings for dtbs_check.
This will change in the future.

Full log is available here: https://patchwork.ozlabs.org/patch/


dwc3@10000000: $nodename:0: 'dwc3@10000000' does not match '^usb(@.*)?'
	arch/arm/boot/dts/qcom-ipq8064-ap148.dtb
	arch/arm/boot/dts/qcom-ipq8064-rb3011.dtb

dwc3@11000000: $nodename:0: 'dwc3@11000000' does not match '^usb(@.*)?'
	arch/arm/boot/dts/qcom-ipq8064-ap148.dtb
	arch/arm/boot/dts/qcom-ipq8064-rb3011.dtb

dwc3@6000000: $nodename:0: 'dwc3@6000000' does not match '^usb(@.*)?'
	arch/arm/boot/dts/qcom-ipq4018-ap120c-ac-bit.dtb
	arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dtb
	arch/arm/boot/dts/qcom-ipq4018-jalapeno.dtb
	arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1-c1.dtb
	arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dtb
	arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c3.dtb
	arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1-c1.dtb
	arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1-c2.dtb

dwc3@6a00000: $nodename:0: 'dwc3@6a00000' does not match '^usb(@.*)?'
	arch/arm64/boot/dts/qcom/apq8096-db820c.dtb
	arch/arm64/boot/dts/qcom/apq8096-ifc6640.dtb
	arch/arm64/boot/dts/qcom/msm8996-mtp.dtb
	arch/arm64/boot/dts/qcom/msm8996-pmi8996-sony-xperia-tone-dora.dtb
	arch/arm64/boot/dts/qcom/msm8996-pmi8996-sony-xperia-tone-kagura.dtb
	arch/arm64/boot/dts/qcom/msm8996-pmi8996-sony-xperia-tone-keyaki.dtb
	arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone-dora.dtb
	arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone-kagura.dtb
	arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone-keyaki.dtb
	arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dtb
	arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dtb

dwc3@7580000: $nodename:0: 'dwc3@7580000' does not match '^usb(@.*)?'
	arch/arm64/boot/dts/qcom/qcs404-evb-1000.dtb
	arch/arm64/boot/dts/qcom/qcs404-evb-4000.dtb

dwc3@7600000: $nodename:0: 'dwc3@7600000' does not match '^usb(@.*)?'
	arch/arm64/boot/dts/qcom/apq8096-db820c.dtb
	arch/arm64/boot/dts/qcom/apq8096-ifc6640.dtb
	arch/arm64/boot/dts/qcom/msm8996-mtp.dtb
	arch/arm64/boot/dts/qcom/msm8996-pmi8996-sony-xperia-tone-dora.dtb
	arch/arm64/boot/dts/qcom/msm8996-pmi8996-sony-xperia-tone-kagura.dtb
	arch/arm64/boot/dts/qcom/msm8996-pmi8996-sony-xperia-tone-keyaki.dtb
	arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone-dora.dtb
	arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone-kagura.dtb
	arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone-keyaki.dtb
	arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dtb
	arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dtb

dwc3@78c0000: $nodename:0: 'dwc3@78c0000' does not match '^usb(@.*)?'
	arch/arm64/boot/dts/qcom/qcs404-evb-1000.dtb
	arch/arm64/boot/dts/qcom/qcs404-evb-4000.dtb

dwc3@8a00000: $nodename:0: 'dwc3@8a00000' does not match '^usb(@.*)?'
	arch/arm64/boot/dts/qcom/ipq8074-hk01.dtb
	arch/arm64/boot/dts/qcom/ipq8074-hk10-c1.dtb
	arch/arm64/boot/dts/qcom/ipq8074-hk10-c2.dtb
	arch/arm/boot/dts/qcom-ipq4018-ap120c-ac-bit.dtb
	arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dtb
	arch/arm/boot/dts/qcom-ipq4018-jalapeno.dtb
	arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1-c1.dtb
	arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dtb
	arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c3.dtb
	arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1-c1.dtb
	arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1-c2.dtb

dwc3@8c00000: $nodename:0: 'dwc3@8c00000' does not match '^usb(@.*)?'
	arch/arm64/boot/dts/qcom/ipq8074-hk01.dtb
	arch/arm64/boot/dts/qcom/ipq8074-hk10-c1.dtb
	arch/arm64/boot/dts/qcom/ipq8074-hk10-c2.dtb

dwc3@9900000: $nodename:0: 'dwc3@9900000' does not match '^usb(@.*)?'
	arch/arm/boot/dts/stih407-b2120.dtb
	arch/arm/boot/dts/stih410-b2120.dtb
	arch/arm/boot/dts/stih410-b2260.dtb
	arch/arm/boot/dts/stih418-b2199.dtb
	arch/arm/boot/dts/stih418-b2264.dtb

dwc3@a600000: $nodename:0: 'dwc3@a600000' does not match '^usb(@.*)?'
	arch/arm64/boot/dts/qcom/sa8155p-adp.dtb
	arch/arm64/boot/dts/qcom/sc7180-idp.dtb
	arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dtb
	arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1-lte.dtb
	arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r3.dtb
	arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r3-lte.dtb
	arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r2.dtb
	arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r3.dtb
	arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r4.dtb
	arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r4.dtb
	arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dtb
	arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r9.dtb
	arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dtb
	arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r9.dtb
	arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dtb
	arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dtb
	arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1-kb.dtb
	arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1-lte.dtb
	arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dtb
	arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dtb
	arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dtb
	arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dtb
	arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dtb
	arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dtb
	arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dtb
	arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1-lte.dtb
	arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dtb
	arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2-lte.dtb
	arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r3.dtb
	arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r3-lte.dtb
	arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dtb
	arch/arm64/boot/dts/qcom/sc7180-trogdor-r1-lte.dtb
	arch/arm64/boot/dts/qcom/sdm845-cheza-r1.dtb
	arch/arm64/boot/dts/qcom/sdm845-cheza-r2.dtb
	arch/arm64/boot/dts/qcom/sdm845-cheza-r3.dtb
	arch/arm64/boot/dts/qcom/sdm845-db845c.dtb
	arch/arm64/boot/dts/qcom/sdm845-mtp.dtb
	arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dtb
	arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dtb
	arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dtb
	arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dtb
	arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dtb
	arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-apollo.dtb
	arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dtb
	arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dtb
	arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dtb
	arch/arm64/boot/dts/qcom/sm8150-hdk.dtb
	arch/arm64/boot/dts/qcom/sm8150-microsoft-surface-duo.dtb
	arch/arm64/boot/dts/qcom/sm8150-mtp.dtb
	arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano-bahamut.dtb
	arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano-griffin.dtb
	arch/arm/boot/dts/qcom-sdx55-mtp.dtb
	arch/arm/boot/dts/qcom-sdx55-t55.dtb
	arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dtb

dwc3@a800000: $nodename:0: 'dwc3@a800000' does not match '^usb(@.*)?'
	arch/arm64/boot/dts/qcom/msm8998-asus-novago-tp370ql.dtb
	arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dtb
	arch/arm64/boot/dts/qcom/msm8998-hp-envy-x2.dtb
	arch/arm64/boot/dts/qcom/msm8998-lenovo-miix-630.dtb
	arch/arm64/boot/dts/qcom/msm8998-mtp.dtb
	arch/arm64/boot/dts/qcom/msm8998-oneplus-cheeseburger.dtb
	arch/arm64/boot/dts/qcom/msm8998-oneplus-dumpling.dtb
	arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino-lilac.dtb
	arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino-maple.dtb
	arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino-poplar.dtb
	arch/arm64/boot/dts/qcom/sdm845-cheza-r1.dtb
	arch/arm64/boot/dts/qcom/sdm845-cheza-r2.dtb
	arch/arm64/boot/dts/qcom/sdm845-cheza-r3.dtb
	arch/arm64/boot/dts/qcom/sdm845-db845c.dtb
	arch/arm64/boot/dts/qcom/sdm845-mtp.dtb
	arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dtb
	arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dtb
	arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dtb
	arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dtb
	arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dtb
	arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-apollo.dtb
	arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dtb
	arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dtb
	arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dtb

dwusb@19000000: $nodename:0: 'dwusb@19000000' does not match '^usb(@.*)?'
	arch/arm64/boot/dts/apm/apm-merlin.dtb
	arch/arm64/boot/dts/apm/apm-mustang.dtb

dwusb@19800000: $nodename:0: 'dwusb@19800000' does not match '^usb(@.*)?'
	arch/arm64/boot/dts/apm/apm-mustang.dtb

usb@38100000: port@0: 'compatible' is a required property
	arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dtb
	arch/arm64/boot/dts/freescale/imx8mq-librem5-r2.dtb
	arch/arm64/boot/dts/freescale/imx8mq-librem5-r3.dtb
	arch/arm64/boot/dts/freescale/imx8mq-librem5-r4.dtb

usb@38100000: port@1: 'compatible' is a required property
	arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dtb
	arch/arm64/boot/dts/freescale/imx8mq-librem5-r2.dtb
	arch/arm64/boot/dts/freescale/imx8mq-librem5-r3.dtb
	arch/arm64/boot/dts/freescale/imx8mq-librem5-r4.dtb

usb@65a00000: phys: [[41], [42], [43], [44]] is too long
	arch/arm64/boot/dts/socionext/uniphier-pxs3-ref.dtb

usb@65a00000: phys: [[47], [48], [49], [50]] is too long
	arch/arm/boot/dts/uniphier-ld6b-ref.dtb

usb@65a00000: phys: [[48], [49], [50], [51]] is too long
	arch/arm/boot/dts/uniphier-pxs2-gentil.dtb
	arch/arm/boot/dts/uniphier-pxs2-vodka.dtb

usb@65a00000: phys: [[50], [51], [52], [53], [54], [55]] is too long
	arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dtb

usb@65a00000: phys: [[52], [53], [54], [55], [56], [57]] is too long
	arch/arm64/boot/dts/socionext/uniphier-ld20-akebi96.dtb

usb@65a00000: phys: [[55], [56], [57], [58], [59], [60]] is too long
	arch/arm64/boot/dts/socionext/uniphier-ld20-global.dtb

usb@65c00000: phys: [[55], [56], [57]] is too long
	arch/arm64/boot/dts/socionext/uniphier-pxs3-ref.dtb

usb@65c00000: phys: [[56], [57], [58]] is too long
	arch/arm/boot/dts/uniphier-ld6b-ref.dtb

usb@65c00000: phys: [[57], [58], [59]] is too long
	arch/arm/boot/dts/uniphier-pxs2-gentil.dtb
	arch/arm/boot/dts/uniphier-pxs2-vodka.dtb

usb@fe200000: interrupt-names: 'oneOf' conditional failed, one must be fixed:
	arch/arm64/boot/dts/xilinx/avnet-ultra96-rev1.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-smk-k26-revA.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zc1232-revA.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zc1254-revA.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zc1275-revA.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm017-dc3.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.0.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.1.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dtb

usb@fe300000: interrupt-names: 'oneOf' conditional failed, one must be fixed:
	arch/arm64/boot/dts/xilinx/avnet-ultra96-rev1.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-smk-k26-revA.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zc1232-revA.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zc1254-revA.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zc1275-revA.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm017-dc3.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.0.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.1.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dtb
	arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dtb

usb@ff100000: resets: [[31, 144, 8], [31, 144, 7], [31, 144, 6], [31, 144, 5]] is too long
	arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dtb

usb@ff100000: snps,tx_de_emphasis:0: [0, 0, 0, 1] is too long
	arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dtb
	arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dtb


^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [v16 2/5] usb: dwc3: core: Host wake up support from system suspend
  2022-05-13  3:58     ` Krishna Kurapati PSSNV
@ 2022-05-16  4:43       ` Pavan Kondeti
  2022-05-16 15:04         ` Pavan Kondeti
  0 siblings, 1 reply; 13+ messages in thread
From: Pavan Kondeti @ 2022-05-16  4:43 UTC (permalink / raw)
  To: Krishna Kurapati PSSNV
  Cc: Matthias Kaehlcke, Krzysztof Kozlowski, Rob Herring, Andy Gross,
	Bjorn Andersson, Greg Kroah-Hartman, Felipe Balbi, Stephen Boyd,
	Doug Anderson, Mathias Nyman, devicetree, linux-arm-msm,
	linux-usb, linux-kernel, linux-pm, quic_pkondeti, quic_ppratap,
	quic_vpulyala, Sandeep Maheswaram

On Fri, May 13, 2022 at 09:28:16AM +0530, Krishna Kurapati PSSNV wrote:
> 
> On 5/13/2022 4:10 AM, Matthias Kaehlcke wrote:
> >On Thu, May 12, 2022 at 11:53:19PM +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 | 30 +++++++++++++++++-------------
> >>  drivers/usb/dwc3/core.h |  4 ++++
> >>  drivers/usb/dwc3/host.c | 24 ++++++++++++++++++++++++
> >>  3 files changed, 45 insertions(+), 13 deletions(-)
> >>
> >>diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
> >>index 01115df..8bcabc5 100644
> >>--- a/drivers/usb/dwc3/core.c
> >>+++ b/drivers/usb/dwc3/core.c
> >>@@ -1785,6 +1785,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);
> >>@@ -1946,10 +1947,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 ||
> >>@@ -1965,6 +1963,15 @@ 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))
> >I think this should be device_can_wakeup(), i.e. hardware capability instead of
> >device policy. A drawback of powering the PHYs off is that it causes a high
> >power consumption of certain peripherals if VBUS is still supplied, so this
> >should be limited to platforms where the PHYs must be powered off (using wakeup
> >capability as a proxy for now).
> Thnaks Mathias for the review. Will make this change in the next patchset.
> >>+				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 */
> >>@@ -2008,11 +2015,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));
> >>@@ -2084,8 +2092,6 @@ static int dwc3_runtime_suspend(struct device *dev)
> >>  	if (ret)
> >>  		return ret;
> >>-	device_init_wakeup(dev, true);
> >>-
> >>  	return 0;
> >>  }
> >>@@ -2094,8 +2100,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 f56c30c..e19b40a 100644
> >>--- a/drivers/usb/dwc3/host.c
> >>+++ b/drivers/usb/dwc3/host.c
> >>@@ -12,6 +12,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)
> >>@@ -136,3 +137,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;
> >>+		}
> >>+	}
> >>+}
> >I anticipate that it might raise concerns from maintainers that
> >dwc3_check_phy_speed_mode() accesses xHCI data structures and
> >registers directly. Could there be a generic HCD API that provides
> >this functionality (if implemented by the specific HCD)?
> 
> Hi Mathias, we are not sure if there is any such API present currently.
> 
> Hi Alan, can you help suggest any API (if present) that we can reuse here to
> avoid
> 
> xhci registers and structs here in dwc3.
> 

We can probably do something like below to query the speed. This avoids adding
another API and does not touch the underlying registers.

Pls define enum usb_device_speed usb2_speed in dwc3 structure.

diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c
index f29a264..fed1c58 100644
--- a/drivers/usb/dwc3/host.c
+++ b/drivers/usb/dwc3/host.c
@@ -9,9 +9,29 @@
 
 #include <linux/acpi.h>
 #include <linux/platform_device.h>
+#include <linux/usb.h>
 
 #include "core.h"
 
+void dwc3_update_hs_phy_speed(struct dwc3 *dwc)
+{
+	struct usb_hcd	*hcd = platform_get_drvdata(dwc->xhci);
+	struct usb_device *udev;
+
+	/*
+	 * It is possible to query the speed of all children of
+	 * USB2.0 root hub via usb_hub_for_each_child(). DWC3 code
+	 * currently supports only 1 port per controller. So
+	 * this is sufficient.
+	 */
+	udev = usb_hub_find_child(hcd->self.root_hub, 1);
+
+	if (udev)
+		dwc->usb2_speed = udev->speed;
+	else
+		dwc->usb2_speed = USB_SPEED_UNKNOWN;
+}
+
 static int dwc3_host_get_irq(struct dwc3 *dwc)
 {
 	struct platform_device	*dwc3_pdev = to_platform_device(dwc->dev);


Thanks,
Pavan

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* Re: [v16 2/5] usb: dwc3: core: Host wake up support from system suspend
  2022-05-16  4:43       ` Pavan Kondeti
@ 2022-05-16 15:04         ` Pavan Kondeti
  2022-05-16 23:13           ` Matthias Kaehlcke
  0 siblings, 1 reply; 13+ messages in thread
From: Pavan Kondeti @ 2022-05-16 15:04 UTC (permalink / raw)
  To: Pavan Kondeti
  Cc: Krishna Kurapati PSSNV, Matthias Kaehlcke, Krzysztof Kozlowski,
	Rob Herring, Andy Gross, Bjorn Andersson, Greg Kroah-Hartman,
	Felipe Balbi, Stephen Boyd, Doug Anderson, Mathias Nyman,
	devicetree, linux-arm-msm, linux-usb, linux-kernel, linux-pm,
	quic_ppratap, quic_vpulyala, Sandeep Maheswaram

On Mon, May 16, 2022 at 10:13:27AM +0530, Pavan Kondeti wrote:
> On Fri, May 13, 2022 at 09:28:16AM +0530, Krishna Kurapati PSSNV wrote:
> > 
> > On 5/13/2022 4:10 AM, Matthias Kaehlcke wrote:
> > >On Thu, May 12, 2022 at 11:53:19PM +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 | 30 +++++++++++++++++-------------
> > >>  drivers/usb/dwc3/core.h |  4 ++++
> > >>  drivers/usb/dwc3/host.c | 24 ++++++++++++++++++++++++
> > >>  3 files changed, 45 insertions(+), 13 deletions(-)
> > >>
> > >>diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
> > >>index 01115df..8bcabc5 100644
> > >>--- a/drivers/usb/dwc3/core.c
> > >>+++ b/drivers/usb/dwc3/core.c
> > >>@@ -1785,6 +1785,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);
> > >>@@ -1946,10 +1947,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 ||
> > >>@@ -1965,6 +1963,15 @@ 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))
> > >I think this should be device_can_wakeup(), i.e. hardware capability instead of
> > >device policy. A drawback of powering the PHYs off is that it causes a high
> > >power consumption of certain peripherals if VBUS is still supplied, so this
> > >should be limited to platforms where the PHYs must be powered off (using wakeup
> > >capability as a proxy for now).
> > Thnaks Mathias for the review. Will make this change in the next patchset.
> > >>+				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 */
> > >>@@ -2008,11 +2015,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));
> > >>@@ -2084,8 +2092,6 @@ static int dwc3_runtime_suspend(struct device *dev)
> > >>  	if (ret)
> > >>  		return ret;
> > >>-	device_init_wakeup(dev, true);
> > >>-
> > >>  	return 0;
> > >>  }
> > >>@@ -2094,8 +2100,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 f56c30c..e19b40a 100644
> > >>--- a/drivers/usb/dwc3/host.c
> > >>+++ b/drivers/usb/dwc3/host.c
> > >>@@ -12,6 +12,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)
> > >>@@ -136,3 +137,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;
> > >>+		}
> > >>+	}
> > >>+}
> > >I anticipate that it might raise concerns from maintainers that
> > >dwc3_check_phy_speed_mode() accesses xHCI data structures and
> > >registers directly. Could there be a generic HCD API that provides
> > >this functionality (if implemented by the specific HCD)?
> > 
> > Hi Mathias, we are not sure if there is any such API present currently.
> > 
> > Hi Alan, can you help suggest any API (if present) that we can reuse here to
> > avoid
> > 
> > xhci registers and structs here in dwc3.
> > 
> 
> We can probably do something like below to query the speed. This avoids adding
> another API and does not touch the underlying registers.
> 
> Pls define enum usb_device_speed usb2_speed in dwc3 structure.
> 
> diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c
> index f29a264..fed1c58 100644
> --- a/drivers/usb/dwc3/host.c
> +++ b/drivers/usb/dwc3/host.c
> @@ -9,9 +9,29 @@
>  
>  #include <linux/acpi.h>
>  #include <linux/platform_device.h>
> +#include <linux/usb.h>
>  
>  #include "core.h"
>  
> +void dwc3_update_hs_phy_speed(struct dwc3 *dwc)
> +{
> +	struct usb_hcd	*hcd = platform_get_drvdata(dwc->xhci);
> +	struct usb_device *udev;
> +
> +	/*
> +	 * It is possible to query the speed of all children of
> +	 * USB2.0 root hub via usb_hub_for_each_child(). DWC3 code
> +	 * currently supports only 1 port per controller. So
> +	 * this is sufficient.
> +	 */
> +	udev = usb_hub_find_child(hcd->self.root_hub, 1);
> +
> +	if (udev)
> +		dwc->usb2_speed = udev->speed;
> +	else
> +		dwc->usb2_speed = USB_SPEED_UNKNOWN;
> +}
> +
>  static int dwc3_host_get_irq(struct dwc3 *dwc)
>  {
>  	struct platform_device	*dwc3_pdev = to_platform_device(dwc->dev);
> 
> 
I am also thinking why dwc core needs to cache usb2_speed since dwc3-qcom glue
driver is the only sole user. We also require it only during suspend and does
not bother about dwc::usb2_speed correctness outside suspend. Lets move this
to dwc3-qcom suspend routines where we have to rely on USB2 speed for
configuring the D+/D- interrupt.

Thanks,
Pavan

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [v16 2/5] usb: dwc3: core: Host wake up support from system suspend
  2022-05-16 15:04         ` Pavan Kondeti
@ 2022-05-16 23:13           ` Matthias Kaehlcke
  0 siblings, 0 replies; 13+ messages in thread
From: Matthias Kaehlcke @ 2022-05-16 23:13 UTC (permalink / raw)
  To: Pavan Kondeti
  Cc: Krishna Kurapati PSSNV, Krzysztof Kozlowski, Rob Herring,
	Andy Gross, Bjorn Andersson, Greg Kroah-Hartman, Felipe Balbi,
	Stephen Boyd, Doug Anderson, Mathias Nyman, devicetree,
	linux-arm-msm, linux-usb, linux-kernel, linux-pm, quic_ppratap,
	quic_vpulyala, Sandeep Maheswaram

On Mon, May 16, 2022 at 08:34:45PM +0530, Pavan Kondeti wrote:
> On Mon, May 16, 2022 at 10:13:27AM +0530, Pavan Kondeti wrote:
> > On Fri, May 13, 2022 at 09:28:16AM +0530, Krishna Kurapati PSSNV wrote:
> > > 
> > > On 5/13/2022 4:10 AM, Matthias Kaehlcke wrote:
> > > >On Thu, May 12, 2022 at 11:53:19PM +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 | 30 +++++++++++++++++-------------
> > > >>  drivers/usb/dwc3/core.h |  4 ++++
> > > >>  drivers/usb/dwc3/host.c | 24 ++++++++++++++++++++++++
> > > >>  3 files changed, 45 insertions(+), 13 deletions(-)
> > > >>
> > > >>diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
> > > >>index 01115df..8bcabc5 100644
> > > >>--- a/drivers/usb/dwc3/core.c
> > > >>+++ b/drivers/usb/dwc3/core.c
> > > >>@@ -1785,6 +1785,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);
> > > >>@@ -1946,10 +1947,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 ||
> > > >>@@ -1965,6 +1963,15 @@ 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))
> > > >I think this should be device_can_wakeup(), i.e. hardware capability instead of
> > > >device policy. A drawback of powering the PHYs off is that it causes a high
> > > >power consumption of certain peripherals if VBUS is still supplied, so this
> > > >should be limited to platforms where the PHYs must be powered off (using wakeup
> > > >capability as a proxy for now).
> > > Thnaks Mathias for the review. Will make this change in the next patchset.
> > > >>+				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 */
> > > >>@@ -2008,11 +2015,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));
> > > >>@@ -2084,8 +2092,6 @@ static int dwc3_runtime_suspend(struct device *dev)
> > > >>  	if (ret)
> > > >>  		return ret;
> > > >>-	device_init_wakeup(dev, true);
> > > >>-
> > > >>  	return 0;
> > > >>  }
> > > >>@@ -2094,8 +2100,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 f56c30c..e19b40a 100644
> > > >>--- a/drivers/usb/dwc3/host.c
> > > >>+++ b/drivers/usb/dwc3/host.c
> > > >>@@ -12,6 +12,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)
> > > >>@@ -136,3 +137,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;
> > > >>+		}
> > > >>+	}
> > > >>+}
> > > >I anticipate that it might raise concerns from maintainers that
> > > >dwc3_check_phy_speed_mode() accesses xHCI data structures and
> > > >registers directly. Could there be a generic HCD API that provides
> > > >this functionality (if implemented by the specific HCD)?
> > > 
> > > Hi Mathias, we are not sure if there is any such API present currently.
> > > 
> > > Hi Alan, can you help suggest any API (if present) that we can reuse here to
> > > avoid
> > > 
> > > xhci registers and structs here in dwc3.
> > > 
> > 
> > We can probably do something like below to query the speed. This avoids adding
> > another API and does not touch the underlying registers.
> > 
> > Pls define enum usb_device_speed usb2_speed in dwc3 structure.
> > 
> > diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c
> > index f29a264..fed1c58 100644
> > --- a/drivers/usb/dwc3/host.c
> > +++ b/drivers/usb/dwc3/host.c
> > @@ -9,9 +9,29 @@
> >  
> >  #include <linux/acpi.h>
> >  #include <linux/platform_device.h>
> > +#include <linux/usb.h>
> >  
> >  #include "core.h"
> >  
> > +void dwc3_update_hs_phy_speed(struct dwc3 *dwc)
> > +{
> > +	struct usb_hcd	*hcd = platform_get_drvdata(dwc->xhci);
> > +	struct usb_device *udev;
> > +
> > +	/*
> > +	 * It is possible to query the speed of all children of
> > +	 * USB2.0 root hub via usb_hub_for_each_child(). DWC3 code
> > +	 * currently supports only 1 port per controller. So
> > +	 * this is sufficient.
> > +	 */
> > +	udev = usb_hub_find_child(hcd->self.root_hub, 1);
> > +
> > +	if (udev)
> > +		dwc->usb2_speed = udev->speed;
> > +	else
> > +		dwc->usb2_speed = USB_SPEED_UNKNOWN;
> > +}
> > +
> >  static int dwc3_host_get_irq(struct dwc3 *dwc)
> >  {
> >  	struct platform_device	*dwc3_pdev = to_platform_device(dwc->dev);
> > 
> > 
> I am also thinking why dwc core needs to cache usb2_speed since dwc3-qcom glue
> driver is the only sole user. We also require it only during suspend and does
> not bother about dwc::usb2_speed correctness outside suspend. Lets move this
> to dwc3-qcom suspend routines where we have to rely on USB2 speed for
> configuring the D+/D- interrupt.

I like both of your suggestions. If something like dwc3_update_hs_phy_speed()
works properly here we should have finally sorted out all the layering issues
Felipe was unhappy about.

^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2022-05-16 23:13 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-12 18:23 [v16 0/5] USB DWC3 host wake up support from system suspend Krishna Kurapati
2022-05-12 18:23 ` [v16 1/5] dt-bindings: usb: dwc3: Add wakeup-source property support Krishna Kurapati
2022-05-13 12:33   ` Rob Herring
2022-05-12 18:23 ` [v16 2/5] usb: dwc3: core: Host wake up support from system suspend Krishna Kurapati
2022-05-12 22:40   ` Matthias Kaehlcke
2022-05-13  3:58     ` Krishna Kurapati PSSNV
2022-05-16  4:43       ` Pavan Kondeti
2022-05-16 15:04         ` Pavan Kondeti
2022-05-16 23:13           ` Matthias Kaehlcke
2022-05-12 18:23 ` [v16 3/5] usb: dwc3: qcom: Add helper functions to enable,disable wake irqs Krishna Kurapati
2022-05-12 18:23 ` [v16 4/5] usb: dwc3: qcom: Configure wakeup interrupts during suspend Krishna Kurapati
2022-05-12 18:23 ` [v16 5/5] usb: dwc3: qcom: Keep power domain on to retain controller status Krishna Kurapati
2022-05-12 22:46   ` Matthias Kaehlcke

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.