* [PATCH v18 1/5] dt-bindings: usb: dwc3: Add wakeup-source property support
2022-05-25 18:20 [PATCH v18 0/5] USB DWC3 host wake up support from system suspend Krishna Kurapati
@ 2022-05-25 18:20 ` Krishna Kurapati
2022-05-25 18:20 ` [PATCH v18 2/5] usb: dwc3: core: Host wake up support from system suspend Krishna Kurapati
` (3 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Krishna Kurapati @ 2022-05-25 18:20 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] 10+ messages in thread
* [PATCH v18 2/5] usb: dwc3: core: Host wake up support from system suspend
2022-05-25 18:20 [PATCH v18 0/5] USB DWC3 host wake up support from system suspend Krishna Kurapati
2022-05-25 18:20 ` [PATCH v18 1/5] dt-bindings: usb: dwc3: Add wakeup-source property support Krishna Kurapati
@ 2022-05-25 18:20 ` Krishna Kurapati
2022-05-26 2:43 ` Pavan Kondeti
2022-05-25 18:20 ` [PATCH v18 3/5] usb: dwc3: qcom: Add helper functions to enable,disable wake irqs Krishna Kurapati
` (2 subsequent siblings)
4 siblings, 1 reply; 10+ messages in thread
From: Krishna Kurapati @ 2022-05-25 18:20 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>
Check wakeup-source property for dwc3 core node to set the
wakeup capability. Drop the device_init_wakeup call from
runtime suspend and resume.
If the dwc3 is wakeup capable, don't power down the USB PHY(s).
The glue drivers are expected to take care of configuring the
additional wakeup settings if needed based on the dwc3 wakeup
capability status. In some SOC designs, powering off the PHY is
resulting in higher leakage, so this patch save power on such boards.
Signed-off-by: Sandeep Maheswaram <quic_c_sanm@quicinc.com>
Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com>
Reviewed-by: Pavankumar Kondeti <quic_pkondeti@quicinc.com>
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
---
drivers/usb/dwc3/core.c | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index e027c04..2b1b3f7 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -1787,6 +1787,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);
@@ -1948,11 +1949,6 @@ 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;
- }
-
/* Let controller to suspend HSPHY before PHY driver suspends */
if (dwc->dis_u2_susphy_quirk ||
dwc->dis_enblslpm_quirk) {
@@ -1967,6 +1963,11 @@ 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_can_wakeup(dwc->dev))
+ dwc3_core_exit(dwc);
+ }
break;
case DWC3_GCTL_PRTCAP_OTG:
/* do nothing during runtime_suspend */
@@ -2010,11 +2011,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 (!device_can_wakeup(dwc->dev)) {
+ ret = dwc3_core_init_for_resume(dwc);
+ if (ret)
+ return ret;
+ dwc3_set_prtcap(dwc, DWC3_GCTL_PRTCAP_HOST);
+ }
}
/* Restore GUSB2PHYCFG bits that were modified in suspend */
reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0));
@@ -2086,8 +2088,6 @@ static int dwc3_runtime_suspend(struct device *dev)
if (ret)
return ret;
- device_init_wakeup(dev, true);
-
return 0;
}
@@ -2096,8 +2096,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;
--
2.7.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v18 2/5] usb: dwc3: core: Host wake up support from system suspend
2022-05-25 18:20 ` [PATCH v18 2/5] usb: dwc3: core: Host wake up support from system suspend Krishna Kurapati
@ 2022-05-26 2:43 ` Pavan Kondeti
2022-05-27 6:12 ` Krishna Kurapati PSSNV
0 siblings, 1 reply; 10+ messages in thread
From: Pavan Kondeti @ 2022-05-26 2:43 UTC (permalink / raw)
To: Krishna Kurapati
Cc: Krzysztof Kozlowski, Rob Herring, Andy Gross, Bjorn Andersson,
Greg Kroah-Hartman, Felipe Balbi, Stephen Boyd, Doug Anderson,
Matthias Kaehlcke, Mathias Nyman, devicetree, linux-arm-msm,
linux-usb, linux-kernel, linux-pm, quic_pkondeti, quic_ppratap,
quic_vpulyala, Sandeep Maheswaram
On Wed, May 25, 2022 at 11:50:23PM +0530, Krishna Kurapati wrote:
> From: Sandeep Maheswaram <quic_c_sanm@quicinc.com>
>
> Check wakeup-source property for dwc3 core node to set the
> wakeup capability. Drop the device_init_wakeup call from
> runtime suspend and resume.
>
> If the dwc3 is wakeup capable, don't power down the USB PHY(s).
> The glue drivers are expected to take care of configuring the
> additional wakeup settings if needed based on the dwc3 wakeup
> capability status. In some SOC designs, powering off the PHY is
> resulting in higher leakage, so this patch save power on such boards.
>
> Signed-off-by: Sandeep Maheswaram <quic_c_sanm@quicinc.com>
> Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com>
> Reviewed-by: Pavankumar Kondeti <quic_pkondeti@quicinc.com>
> Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
> ---
> drivers/usb/dwc3/core.c | 26 ++++++++++++--------------
> 1 file changed, 12 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
> index e027c04..2b1b3f7 100644
> --- a/drivers/usb/dwc3/core.c
> +++ b/drivers/usb/dwc3/core.c
> @@ -1787,6 +1787,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);
> @@ -1948,11 +1949,6 @@ 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;
> - }
> -
> /* Let controller to suspend HSPHY before PHY driver suspends */
> if (dwc->dis_u2_susphy_quirk ||
> dwc->dis_enblslpm_quirk) {
> @@ -1967,6 +1963,11 @@ 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_can_wakeup(dwc->dev))
> + dwc3_core_exit(dwc);
> + }
> break;
Earlier, the dwc3 which does not support wakeup just calls dwc3_core_exit().
With this patch we are modifying the behavior. Is that intentional? I expect
it to be something like
@@ -1761,8 +1782,10 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg)
break;
case DWC3_GCTL_PRTCAP_HOST:
if (!PMSG_IS_AUTO(msg)) {
- dwc3_core_exit(dwc);
- break;
+ if (!device_can_wakeup(dwc->dev)) {
+ dwc3_core_exit(dwc);
+ break;
+ }
}
/* Let controller to suspend HSPHY before PHY driver suspends */
Thanks,
Pavan
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v18 2/5] usb: dwc3: core: Host wake up support from system suspend
2022-05-26 2:43 ` Pavan Kondeti
@ 2022-05-27 6:12 ` Krishna Kurapati PSSNV
0 siblings, 0 replies; 10+ messages in thread
From: Krishna Kurapati PSSNV @ 2022-05-27 6:12 UTC (permalink / raw)
To: Pavan Kondeti
Cc: Krzysztof Kozlowski, Rob Herring, Andy Gross, Bjorn Andersson,
Greg Kroah-Hartman, Felipe Balbi, Stephen Boyd, Doug Anderson,
Matthias Kaehlcke, Mathias Nyman, devicetree, linux-arm-msm,
linux-usb, linux-kernel, linux-pm, quic_ppratap, quic_vpulyala,
Sandeep Maheswaram
On 5/26/2022 8:13 AM, Pavan Kondeti wrote:
> On Wed, May 25, 2022 at 11:50:23PM +0530, Krishna Kurapati wrote:
>> From: Sandeep Maheswaram <quic_c_sanm@quicinc.com>
>>
>> Check wakeup-source property for dwc3 core node to set the
>> wakeup capability. Drop the device_init_wakeup call from
>> runtime suspend and resume.
>>
>> If the dwc3 is wakeup capable, don't power down the USB PHY(s).
>> The glue drivers are expected to take care of configuring the
>> additional wakeup settings if needed based on the dwc3 wakeup
>> capability status. In some SOC designs, powering off the PHY is
>> resulting in higher leakage, so this patch save power on such boards.
>>
>> Signed-off-by: Sandeep Maheswaram <quic_c_sanm@quicinc.com>
>> Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com>
>> Reviewed-by: Pavankumar Kondeti <quic_pkondeti@quicinc.com>
>> Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
>> ---
>> drivers/usb/dwc3/core.c | 26 ++++++++++++--------------
>> 1 file changed, 12 insertions(+), 14 deletions(-)
>>
>> diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
>> index e027c04..2b1b3f7 100644
>> --- a/drivers/usb/dwc3/core.c
>> +++ b/drivers/usb/dwc3/core.c
>> @@ -1787,6 +1787,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);
>> @@ -1948,11 +1949,6 @@ 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;
>> - }
>> -
>> /* Let controller to suspend HSPHY before PHY driver suspends */
>> if (dwc->dis_u2_susphy_quirk ||
>> dwc->dis_enblslpm_quirk) {
>> @@ -1967,6 +1963,11 @@ 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_can_wakeup(dwc->dev))
>> + dwc3_core_exit(dwc);
>> + }
>> break;
> Earlier, the dwc3 which does not support wakeup just calls dwc3_core_exit().
> With this patch we are modifying the behavior. Is that intentional? I expect
> it to be something like
>
> @@ -1761,8 +1782,10 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg)
> break;
> case DWC3_GCTL_PRTCAP_HOST:
> if (!PMSG_IS_AUTO(msg)) {
> - dwc3_core_exit(dwc);
> - break;
> + if (!device_can_wakeup(dwc->dev)) {
> + dwc3_core_exit(dwc);
> + break;
> + }
> }
>
> /* Let controller to suspend HSPHY before PHY driver suspends */
>
> Thanks,
> Pavan
Hi Pavan,
Thanks for pointing out that we are changing behavior. Will try to fix
it in next series.
Thanks,
Krishna,
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v18 3/5] usb: dwc3: qcom: Add helper functions to enable,disable wake irqs
2022-05-25 18:20 [PATCH v18 0/5] USB DWC3 host wake up support from system suspend Krishna Kurapati
2022-05-25 18:20 ` [PATCH v18 1/5] dt-bindings: usb: dwc3: Add wakeup-source property support Krishna Kurapati
2022-05-25 18:20 ` [PATCH v18 2/5] usb: dwc3: core: Host wake up support from system suspend Krishna Kurapati
@ 2022-05-25 18:20 ` Krishna Kurapati
2022-05-25 18:20 ` [PATCH v18 4/5] usb: dwc3: qcom: Configure wakeup interrupts during suspend Krishna Kurapati
2022-05-25 18:20 ` [PATCH v18 5/5] usb: dwc3: qcom: Keep power domain on to retain controller status Krishna Kurapati
4 siblings, 0 replies; 10+ messages in thread
From: Krishna Kurapati @ 2022-05-25 18:20 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>
Reviewed-by: Pavankumar Kondeti <quic_pkondeti@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] 10+ messages in thread
* [PATCH v18 4/5] usb: dwc3: qcom: Configure wakeup interrupts during suspend
2022-05-25 18:20 [PATCH v18 0/5] USB DWC3 host wake up support from system suspend Krishna Kurapati
` (2 preceding siblings ...)
2022-05-25 18:20 ` [PATCH v18 3/5] usb: dwc3: qcom: Add helper functions to enable,disable wake irqs Krishna Kurapati
@ 2022-05-25 18:20 ` Krishna Kurapati
2022-05-26 2:45 ` Pavan Kondeti
2022-05-25 18:20 ` [PATCH v18 5/5] usb: dwc3: qcom: Keep power domain on to retain controller status Krishna Kurapati
4 siblings, 1 reply; 10+ messages in thread
From: Krishna Kurapati @ 2022-05-25 18:20 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 line interrupts based on the USB2 device attached to
the root hub port. When HS/FS device is connected, configure the DP line
as falling edge to detect both disconnect and remote wakeup scenarios. When
LS device is connected, configure DM line as falling edge to detect both
disconnect and remote wakeup. When no device is connected, configure both
DP and DM lines as rising edge to detect HS/HS/LS device connect scenario.
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 | 72 ++++++++++++++++++++++++++++++++++++++------
1 file changed, 62 insertions(+), 10 deletions(-)
diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
index 7352124..56ecee0 100644
--- a/drivers/usb/dwc3/dwc3-qcom.c
+++ b/drivers/usb/dwc3/dwc3-qcom.c
@@ -20,7 +20,8 @@
#include <linux/usb/of.h>
#include <linux/reset.h>
#include <linux/iopoll.h>
-
+#include <linux/usb/hcd.h>
+#include <linux/usb.h>
#include "core.h"
/* USB QSCRATCH Hardware registers */
@@ -76,6 +77,7 @@ struct dwc3_qcom {
int dp_hs_phy_irq;
int dm_hs_phy_irq;
int ss_phy_irq;
+ enum usb_device_speed usb2_speed;
struct extcon_dev *edev;
struct extcon_dev *host_edev;
@@ -296,11 +298,34 @@ 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)
+enum usb_device_speed dwc3_qcom_update_usb2_speed(struct dwc3_qcom *qcom)
+{
+ struct dwc3 *dwc = platform_get_drvdata(qcom->dwc3);
+ 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)
+ return USB_SPEED_UNKNOWN;
+
+ return udev->speed;
+}
+
+static void dwc3_qcom_enable_wakeup_irq(int irq, unsigned int polarity)
{
if (!irq)
return;
+ if (polarity)
+ irq_set_irq_type(irq, polarity);
+
enable_irq(irq);
enable_irq_wake(irq);
}
@@ -318,22 +343,47 @@ static void dwc3_qcom_disable_interrupts(struct dwc3_qcom *qcom)
{
dwc3_qcom_disable_wakeup_irq(qcom->hs_phy_irq);
- dwc3_qcom_disable_wakeup_irq(qcom->dp_hs_phy_irq);
-
- dwc3_qcom_disable_wakeup_irq(qcom->dm_hs_phy_irq);
+ if (qcom->usb2_speed == USB_SPEED_LOW) {
+ dwc3_qcom_disable_wakeup_irq(qcom->dm_hs_phy_irq);
+ } else if ((qcom->usb2_speed == USB_SPEED_HIGH) ||
+ (qcom->usb2_speed == USB_SPEED_FULL)) {
+ dwc3_qcom_disable_wakeup_irq(qcom->dp_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);
+ dwc3_qcom_enable_wakeup_irq(qcom->hs_phy_irq, 0);
- dwc3_qcom_enable_wakeup_irq(qcom->dp_hs_phy_irq);
+ /*
+ * Configure DP/DM line interrupts based on the USB2 device attached to
+ * the root hub port. When HS/FS device is connected, configure the DP line
+ * as falling edge to detect both disconnect and remote wakeup scenarios. When
+ * LS device is connected, configure DM line as falling edge to detect both
+ * disconnect and remote wakeup. When no device is connected, configure both
+ * DP and DM lines as rising edge to detect HS/HS/LS device connect scenario.
+ */
- dwc3_qcom_enable_wakeup_irq(qcom->dm_hs_phy_irq);
+ if (qcom->usb2_speed == USB_SPEED_LOW) {
+ dwc3_qcom_enable_wakeup_irq(qcom->dm_hs_phy_irq,
+ IRQ_TYPE_EDGE_FALLING);
+ } else if ((qcom->usb2_speed == USB_SPEED_HIGH) ||
+ (qcom->usb2_speed == USB_SPEED_FULL)) {
+ dwc3_qcom_enable_wakeup_irq(qcom->dp_hs_phy_irq,
+ IRQ_TYPE_EDGE_FALLING);
+ } else {
+ dwc3_qcom_enable_wakeup_irq(qcom->dp_hs_phy_irq,
+ IRQ_TYPE_EDGE_RISING);
+ dwc3_qcom_enable_wakeup_irq(qcom->dm_hs_phy_irq,
+ IRQ_TYPE_EDGE_RISING);
+ }
- dwc3_qcom_enable_wakeup_irq(qcom->ss_phy_irq);
+ dwc3_qcom_enable_wakeup_irq(qcom->ss_phy_irq, 0);
}
static int dwc3_qcom_suspend(struct dwc3_qcom *qcom)
@@ -355,8 +405,10 @@ static int dwc3_qcom_suspend(struct dwc3_qcom *qcom)
if (ret)
dev_warn(qcom->dev, "failed to disable interconnect: %d\n", ret);
- if (device_may_wakeup(qcom->dev))
+ if (device_may_wakeup(qcom->dev)) {
+ qcom->usb2_speed = dwc3_qcom_update_usb2_speed(qcom);
dwc3_qcom_enable_interrupts(qcom);
+ }
qcom->is_suspended = true;
--
2.7.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v18 4/5] usb: dwc3: qcom: Configure wakeup interrupts during suspend
2022-05-25 18:20 ` [PATCH v18 4/5] usb: dwc3: qcom: Configure wakeup interrupts during suspend Krishna Kurapati
@ 2022-05-26 2:45 ` Pavan Kondeti
0 siblings, 0 replies; 10+ messages in thread
From: Pavan Kondeti @ 2022-05-26 2:45 UTC (permalink / raw)
To: Krishna Kurapati
Cc: Krzysztof Kozlowski, Rob Herring, Andy Gross, Bjorn Andersson,
Greg Kroah-Hartman, Felipe Balbi, Stephen Boyd, Doug Anderson,
Matthias Kaehlcke, Mathias Nyman, devicetree, linux-arm-msm,
linux-usb, linux-kernel, linux-pm, quic_pkondeti, quic_ppratap,
quic_vpulyala, Sandeep Maheswaram
On Wed, May 25, 2022 at 11:50:25PM +0530, Krishna Kurapati wrote:
> From: Sandeep Maheswaram <quic_c_sanm@quicinc.com>
>
> Configure DP/DM line interrupts based on the USB2 device attached to
> the root hub port. When HS/FS device is connected, configure the DP line
> as falling edge to detect both disconnect and remote wakeup scenarios. When
> LS device is connected, configure DM line as falling edge to detect both
> disconnect and remote wakeup. When no device is connected, configure both
> DP and DM lines as rising edge to detect HS/HS/LS device connect scenario.
>
> 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 | 72 ++++++++++++++++++++++++++++++++++++++------
> 1 file changed, 62 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
> index 7352124..56ecee0 100644
> --- a/drivers/usb/dwc3/dwc3-qcom.c
> +++ b/drivers/usb/dwc3/dwc3-qcom.c
<snip>
> static int dwc3_qcom_suspend(struct dwc3_qcom *qcom)
> @@ -355,8 +405,10 @@ static int dwc3_qcom_suspend(struct dwc3_qcom *qcom)
> if (ret)
> dev_warn(qcom->dev, "failed to disable interconnect: %d\n", ret);
>
> - if (device_may_wakeup(qcom->dev))
> + if (device_may_wakeup(qcom->dev)) {
> + qcom->usb2_speed = dwc3_qcom_update_usb2_speed(qcom);
> dwc3_qcom_enable_interrupts(qcom);
> + }
dwc3_qcom_update_usb2_speed() is not updating anything. can you rename the
function to dwc3_qcom_get_usb2_speed()?
Thanks,
Pavan
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v18 5/5] usb: dwc3: qcom: Keep power domain on to retain controller status
2022-05-25 18:20 [PATCH v18 0/5] USB DWC3 host wake up support from system suspend Krishna Kurapati
` (3 preceding siblings ...)
2022-05-25 18:20 ` [PATCH v18 4/5] usb: dwc3: qcom: Configure wakeup interrupts during suspend Krishna Kurapati
@ 2022-05-25 18:20 ` Krishna Kurapati
2022-05-26 2:47 ` Pavan Kondeti
4 siblings, 1 reply; 10+ messages in thread
From: Krishna Kurapati @ 2022-05-25 18:20 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>
If dwc3 is wakeup capable, keep the power domain always ON so that
wakeup from system suspend can be supported. Otherwise, keep the
power domain ON only during runtime suspend to support wakeup from
runtime suspend.
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 | 28 +++++++++++++++++++++-------
1 file changed, 21 insertions(+), 7 deletions(-)
diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
index 56ecee0..2f5b5ae 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>
@@ -756,12 +757,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)
@@ -770,6 +772,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) {
@@ -877,7 +881,17 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
if (ret)
goto interconnect_exit;
- device_init_wakeup(&pdev->dev, 1);
+ if (device_can_wakeup(&qcom->dwc3->dev)) {
+ /*
+ * Setting GENPD_FLAG_ALWAYS_ON flag takes care of keeping
+ * GEMPD on in both RT suspend and System suspend cases.
+ */
+ genpd->flags |= GENPD_FLAG_ALWAYS_ON;
+ device_init_wakeup(&pdev->dev, true);
+ } else {
+ genpd->flags |= GENPD_FLAG_RPM_ALWAYS_ON;
+ }
+
qcom->is_suspended = false;
pm_runtime_set_active(dev);
pm_runtime_enable(dev);
--
2.7.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v18 5/5] usb: dwc3: qcom: Keep power domain on to retain controller status
2022-05-25 18:20 ` [PATCH v18 5/5] usb: dwc3: qcom: Keep power domain on to retain controller status Krishna Kurapati
@ 2022-05-26 2:47 ` Pavan Kondeti
0 siblings, 0 replies; 10+ messages in thread
From: Pavan Kondeti @ 2022-05-26 2:47 UTC (permalink / raw)
To: Krishna Kurapati
Cc: Krzysztof Kozlowski, Rob Herring, Andy Gross, Bjorn Andersson,
Greg Kroah-Hartman, Felipe Balbi, Stephen Boyd, Doug Anderson,
Matthias Kaehlcke, Mathias Nyman, devicetree, linux-arm-msm,
linux-usb, linux-kernel, linux-pm, quic_pkondeti, quic_ppratap,
quic_vpulyala, Sandeep Maheswaram
On Wed, May 25, 2022 at 11:50:26PM +0530, Krishna Kurapati wrote:
> From: Sandeep Maheswaram <quic_c_sanm@quicinc.com>
>
> If dwc3 is wakeup capable, keep the power domain always ON so that
> wakeup from system suspend can be supported. Otherwise, keep the
> power domain ON only during runtime suspend to support wakeup from
> runtime suspend.
>
> 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 | 28 +++++++++++++++++++++-------
> 1 file changed, 21 insertions(+), 7 deletions(-)
>
>
<snip>
> - device_init_wakeup(&pdev->dev, 1);
> + if (device_can_wakeup(&qcom->dwc3->dev)) {
> + /*
> + * Setting GENPD_FLAG_ALWAYS_ON flag takes care of keeping
> + * GEMPD on in both RT suspend and System suspend cases.
Few typos, otherwise looks good to me.
%s/GEMPD/genpd
%s/RT/runtime
%s/System/system
Thanks,
Pavan
^ permalink raw reply [flat|nested] 10+ messages in thread