usb: dwc3: qcom: fix wakeup implementation
authorJohan Hovold <johan+linaro@kernel.org>
Thu, 4 Aug 2022 15:10:00 +0000 (17:10 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 18 Aug 2022 17:33:40 +0000 (19:33 +0200)
It is the Qualcomm glue wakeup interrupts that may be able to wake the
system from suspend and this can now be described in the devicetree.

Move the wakeup-source property handling over from the core driver and
instead propagate the capability setting to the core device during
probe.

This is needed as there is currently no way for the core driver to query
the wakeup setting of the glue device, but it is the core driver that
manages the PHY power state during suspend.

Also don't leave the PHYs enabled when system wakeup has been disabled
through sysfs.

Fixes: a0e53ba3242e ("usb: dwc3: core: Host wake up support from system suspend")
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20220804151001.23612-9-johan+linaro@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/dwc3/core.c
drivers/usb/dwc3/dwc3-qcom.c

index 16d1f328775f4095655957483857eeedb9b0b88e..8c8e32651473c09bf8fc282befe4fcb0120565a8 100644 (file)
@@ -1822,7 +1822,6 @@ 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);
@@ -1984,7 +1983,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) && !device_can_wakeup(dwc->dev)) {
+               if (!PMSG_IS_AUTO(msg) && !device_may_wakeup(dwc->dev)) {
                        dwc3_core_exit(dwc);
                        break;
                }
@@ -2045,7 +2044,7 @@ 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) && !device_can_wakeup(dwc->dev)) {
+               if (!PMSG_IS_AUTO(msg) && !device_may_wakeup(dwc->dev)) {
                        ret = dwc3_core_init_for_resume(dwc);
                        if (ret)
                                return ret;
index 6ae0b7fc4e2cdfe537bbc57bb5e669acf45539c7..b05f67d206d2ce5c50a0be123e2dcc778934f9a7 100644 (file)
@@ -786,6 +786,7 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
        struct resource         *res, *parent_res = NULL;
        int                     ret, i;
        bool                    ignore_pipe_clk;
+       bool                    wakeup_source;
 
        qcom = devm_kzalloc(&pdev->dev, sizeof(*qcom), GFP_KERNEL);
        if (!qcom)
@@ -901,7 +902,10 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
        if (ret)
                goto interconnect_exit;
 
-       device_init_wakeup(&pdev->dev, 1);
+       wakeup_source = of_property_read_bool(dev->of_node, "wakeup-source");
+       device_init_wakeup(&pdev->dev, wakeup_source);
+       device_init_wakeup(&qcom->dwc3->dev, wakeup_source);
+
        qcom->is_suspended = false;
        pm_runtime_set_active(dev);
        pm_runtime_enable(dev);