usb: dwc3: qcom: Don't leave BCR asserted

commit ef8abc0ba49ce717e6bc4124e88e59982671f3b5 upstream.

Leaving the USB BCR asserted prevents the associated GDSC to turn on. This
blocks any subsequent attempts of probing the device, e.g. after a probe
deferral, with the following showing in the log:

[    1.332226] usb30_prim_gdsc status stuck at 'off'

Leave the BCR deasserted when exiting the driver to avoid this issue.

Cc: stable <stable@kernel.org>
Fixes: a4333c3a6ba9 ("usb: dwc3: Add Qualcomm DWC3 glue driver")
Acked-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: Krishna Kurapati <krishna.kurapati@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20250709132900.3408752-1-krishna.kurapati@oss.qualcomm.com
[ adapted to individual clock management instead of bulk clock operations ]
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
index 58683bb672e9522deb321c38daffd856c0d9029c..9b7485b84302d1f207474fe6176f44776dbd1b59 100644 (file)
--- a/drivers/usb/dwc3/dwc3-qcom.c
+++ b/drivers/usb/dwc3/dwc3-qcom.c
@@ -763,13 +763,13 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
        ret = reset_control_deassert(qcom->resets);
        if (ret) {
                dev_err(&pdev->dev, "failed to deassert resets, err=%d\n", ret);
-               goto reset_assert;
+               return ret;
        }
 
        ret = dwc3_qcom_clk_init(qcom, of_clk_get_parent_count(np));
        if (ret) {
                dev_err_probe(dev, ret, "failed to get clocks\n");
-               goto reset_assert;
+               return ret;
        }
 
        qcom->qscratch_base = devm_platform_ioremap_resource(pdev, 0);
@@ -835,8 +835,6 @@ clk_disable:
                clk_disable_unprepare(qcom->clks[i]);
                clk_put(qcom->clks[i]);
        }
-reset_assert:
-       reset_control_assert(qcom->resets);
 
        return ret;
 }
@@ -857,8 +855,6 @@ static void dwc3_qcom_remove(struct platform_device *pdev)
        qcom->num_clocks = 0;
 
        dwc3_qcom_interconnect_exit(qcom);
-       reset_control_assert(qcom->resets);
-
        pm_runtime_allow(dev);
        pm_runtime_disable(dev);
 }