From: Sandeep Maheswaram <quic_c_sanm@quicinc.com>
To: Rob Herring <robh+dt@kernel.org>, Andy Gross <agross@kernel.org>,
"Bjorn Andersson" <bjorn.andersson@linaro.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Felipe Balbi <balbi@kernel.org>,
Stephen Boyd <swboyd@chromium.org>,
Doug Anderson <dianders@chromium.org>,
"Matthias Kaehlcke" <mka@chromium.org>,
Mathias Nyman <mathias.nyman@intel.com>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
"Rafael J . Wysocki" <rafael@kernel.org>,
Len Brown <len.brown@intel.com>, Pavel Machek <pavel@ucw.cz>
Cc: <linux-pm@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-arm-msm@vger.kernel.org>, <linux-usb@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <quic_pkondeti@quicinc.com>,
<quic_ppratap@quicinc.com>, <quic_kriskura@quicinc.com>,
<quic_vpulyala@quicinc.com>,
Sandeep Maheswaram <quic_c_sanm@quicinc.com>
Subject: [PATCH v14 3/7] usb: dwc3: core: Host wake up support from system suspend
Date: Wed, 20 Apr 2022 00:41:06 +0530 [thread overview]
Message-ID: <1650395470-31333-4-git-send-email-quic_c_sanm@quicinc.com> (raw)
In-Reply-To: <1650395470-31333-1-git-send-email-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>
---
v14:
Used device_children_wakeup_capable instead of usb_wakeup_enabled_descendants.
v13:
Changed dwc3_set_phy_speed_mode to dwc3_check_phy_speed_mode.
Removed device_init_wakeup calls from dwc3_runtime_suspend and dwc3_runtime_resume
as we have a new dt property wakeup-source.
drivers/usb/dwc3/core.c | 33 ++++++++++++++++++++-------------
drivers/usb/dwc3/core.h | 4 ++++
drivers/usb/dwc3/host.c | 24 ++++++++++++++++++++++++
3 files changed, 48 insertions(+), 13 deletions(-)
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 1170b80..898aa66 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -32,6 +32,7 @@
#include <linux/usb/gadget.h>
#include <linux/usb/of.h>
#include <linux/usb/otg.h>
+#include <linux/usb/hcd.h>
#include "core.h"
#include "gadget.h"
@@ -1723,6 +1724,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);
@@ -1865,6 +1867,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg)
{
unsigned long flags;
u32 reg;
+ struct usb_hcd *hcd = platform_get_drvdata(dwc->xhci);
switch (dwc->current_dr_role) {
case DWC3_GCTL_PRTCAP_DEVICE:
@@ -1877,10 +1880,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 ||
@@ -1896,6 +1896,16 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg)
phy_pm_runtime_put_sync(dwc->usb2_generic_phy);
phy_pm_runtime_put_sync(dwc->usb3_generic_phy);
+
+ if (!PMSG_IS_AUTO(msg)) {
+ if (device_may_wakeup(dwc->dev) &&
+ device_children_wakeup_capable(&hcd->self.root_hub->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 */
@@ -1939,11 +1949,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));
@@ -2015,8 +2026,6 @@ static int dwc3_runtime_suspend(struct device *dev)
if (ret)
return ret;
- device_init_wakeup(dev, true);
-
return 0;
}
@@ -2025,8 +2034,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 5c9d467..6a5845f 100644
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -1154,6 +1154,9 @@ struct dwc3 {
bool phys_ready;
+ unsigned int hs_phy_mode;
+ bool phy_power_off;
+
struct ulpi *ulpi;
bool ulpi_ready;
@@ -1537,6 +1540,7 @@ int dwc3_core_soft_reset(struct dwc3 *dwc);
#if IS_ENABLED(CONFIG_USB_DWC3_HOST) || IS_ENABLED(CONFIG_USB_DWC3_DUAL_ROLE)
int dwc3_host_init(struct dwc3 *dwc);
void dwc3_host_exit(struct dwc3 *dwc);
+void dwc3_check_phy_speed_mode(struct dwc3 *dwc);
#else
static inline int dwc3_host_init(struct dwc3 *dwc)
{ return 0; }
diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c
index eda8719..3902b56 100644
--- a/drivers/usb/dwc3/host.c
+++ b/drivers/usb/dwc3/host.c
@@ -13,6 +13,7 @@
#include <linux/platform_device.h>
#include "core.h"
+#include "../host/xhci.h"
static void dwc3_host_fill_xhci_irq_res(struct dwc3 *dwc,
int irq, char *name)
@@ -138,3 +139,26 @@ void dwc3_host_exit(struct dwc3 *dwc)
{
platform_device_unregister(dwc->xhci);
}
+
+void dwc3_check_phy_speed_mode(struct dwc3 *dwc)
+{
+ int i, num_ports;
+ u32 reg;
+ struct usb_hcd *hcd = platform_get_drvdata(dwc->xhci);
+ struct xhci_hcd *xhci_hcd = hcd_to_xhci(hcd);
+
+ dwc->hs_phy_mode = 0;
+
+ reg = readl(&xhci_hcd->cap_regs->hcs_params1);
+
+ num_ports = HCS_MAX_PORTS(reg);
+ for (i = 0; i < num_ports; i++) {
+ reg = readl(&xhci_hcd->op_regs->port_status_base + i * NUM_PORT_REGS);
+ if (reg & PORT_PE) {
+ if (DEV_HIGHSPEED(reg) || DEV_FULLSPEED(reg))
+ dwc->hs_phy_mode |= PHY_MODE_USB_HOST_HS;
+ else if (DEV_LOWSPEED(reg))
+ dwc->hs_phy_mode |= PHY_MODE_USB_HOST_LS;
+ }
+ }
+}
--
2.7.4
next prev parent reply other threads:[~2022-04-19 19:11 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-19 19:11 [PATCH v14 0/7] USB DWC3 host wake up support from system suspend Sandeep Maheswaram
2022-04-19 19:11 ` [PATCH v14 1/7] dt-bindings: usb: dwc3: Add wakeup-source property support Sandeep Maheswaram
2022-04-19 19:11 ` [PATCH v14 2/7] PM / wakeup: Add device_children_wakeup_capable() Sandeep Maheswaram
2022-04-22 11:57 ` Rafael J. Wysocki
2022-04-22 18:44 ` Matthias Kaehlcke
2022-04-25 13:03 ` Pavan Kondeti
2022-04-29 12:59 ` Pavan Kondeti
2022-04-29 19:19 ` Matthias Kaehlcke
2022-04-30 3:11 ` Pavan Kondeti
2022-05-03 0:57 ` Matthias Kaehlcke
2022-04-19 19:11 ` Sandeep Maheswaram [this message]
2022-05-04 17:46 ` [PATCH v14 3/7] usb: dwc3: core: Host wake up support from system suspend Matthias Kaehlcke
2022-05-05 3:26 ` Pavan Kondeti
2022-05-05 16:45 ` Matthias Kaehlcke
2022-05-06 3:01 ` Pavan Kondeti
2022-05-06 16:43 ` Matthias Kaehlcke
2022-04-19 19:11 ` [PATCH v14 4/7] usb: dwc3: qcom: Add helper functions to enable,disable wake irqs Sandeep Maheswaram
2022-04-19 19:11 ` [PATCH v14 5/7] usb: dwc3: qcom: Configure wakeup interrupts during suspend Sandeep Maheswaram
2022-04-19 19:11 ` [PATCH v14 6/7] usb: dwc3: qcom: Keep power domain on to retain controller status Sandeep Maheswaram
2022-04-19 19:11 ` [PATCH v14 7/7] arm64: dts: qcom: sc7280: Add wakeup-source property for USB node Sandeep Maheswaram
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1650395470-31333-4-git-send-email-quic_c_sanm@quicinc.com \
--to=quic_c_sanm@quicinc.com \
--cc=agross@kernel.org \
--cc=balbi@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=dianders@chromium.org \
--cc=gregkh@linuxfoundation.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=len.brown@intel.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mathias.nyman@intel.com \
--cc=mka@chromium.org \
--cc=pavel@ucw.cz \
--cc=quic_kriskura@quicinc.com \
--cc=quic_pkondeti@quicinc.com \
--cc=quic_ppratap@quicinc.com \
--cc=quic_vpulyala@quicinc.com \
--cc=rafael@kernel.org \
--cc=robh+dt@kernel.org \
--cc=swboyd@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).