| Message ID | 1654139515-8177-1-git-send-email-quic_kriskura@quicinc.com |
|---|---|
| Headers | show |
| Series | USB DWC3 host wake up support from system suspend | expand |
Hi Krishna, On Thu, Jun 02, 2022 at 08:41:55AM +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(-) > > 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. > + */ The comments provided at [1] are not addressed. Pls fix it. https://lore.kernel.org/linux-usb/20220526024741.GP15121@hu-pkondeti-hyd.qualcomm.com/ Thanks, Pavan
On Thu, Jun 02, 2022 at 08:41:54AM +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 > @@ -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; > The comments provided at [1] are not addressed. Pls take a look Thanks, Pavan [1] https://lore.kernel.org/linux-usb/20220526024558.GO15121@hu-pkondeti-hyd.qualcomm.com/
Hi Krishna, On Thu, Jun 02, 2022 at 08:41:52AM +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> > --- > drivers/usb/dwc3/core.c | 10 +++------- > 1 file changed, 3 insertions(+), 7 deletions(-) > > diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c > index e027c04..c9d7fe3 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,7 +1949,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) > dwc3_core_exit(dwc); > break; > case DWC3_GCTL_PRTCAP_HOST: > - if (!PMSG_IS_AUTO(msg)) { > + if (!PMSG_IS_AUTO(msg) && !device_can_wakeup(dwc->dev)) { > dwc3_core_exit(dwc); > break; > } > @@ -2009,12 +2010,11 @@ static int dwc3_resume_common(struct dwc3 *dwc, pm_message_t msg) > spin_unlock_irqrestore(&dwc->lock, flags); > break; > case DWC3_GCTL_PRTCAP_HOST: > - if (!PMSG_IS_AUTO(msg)) { > + if (!PMSG_IS_AUTO(msg) && !device_can_wakeup(dwc->dev)) { > ret = dwc3_core_init_for_resume(dwc); > if (ret) > return ret; > dwc3_set_prtcap(dwc, DWC3_GCTL_PRTCAP_HOST); > - break; > } We should break here for the case the device does not support wakeup and PM transition is system suspend. See the suspend block above where we break correctly. Thanks, Pavan