PCI: qcom: Fix pipe clock imbalance
authorJohan Hovold <johan+linaro@kernel.org>
Fri, 1 Apr 2022 13:33:51 +0000 (15:33 +0200)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 24 May 2022 21:39:51 +0000 (16:39 -0500)
Fix a clock imbalance introduced by ed8cc3b1fc84 ("PCI: qcom: Add support
for SDM845 PCIe controller"), which enables the pipe clock both in init()
and in post_init() but only disables in post_deinit().

Note that the pipe clock was also never disabled in the init() error
paths and that enabling the clock before powering up the PHY looks
questionable.

Link: https://lore.kernel.org/r/20220401133351.10113-1-johan+linaro@kernel.org
Fixes: ed8cc3b1fc84 ("PCI: qcom: Add support for SDM845 PCIe controller")
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: stable@vger.kernel.org # 5.6
drivers/pci/controller/dwc/pcie-qcom.c

index 375f27a..925324d 100644 (file)
@@ -1238,12 +1238,6 @@ static int qcom_pcie_init_2_7_0(struct qcom_pcie *pcie)
                goto err_disable_clocks;
        }
 
-       ret = clk_prepare_enable(res->pipe_clk);
-       if (ret) {
-               dev_err(dev, "cannot prepare/enable pipe clock\n");
-               goto err_disable_clocks;
-       }
-
        /* Wait for reset to complete, required on SM8450 */
        usleep_range(1000, 1500);