* [PATCH v2] PCI: qcom: Fix pipe clock imbalance
@ 2022-04-01 13:33 Johan Hovold
2022-04-04 13:53 ` Bjorn Andersson
2022-04-13 10:57 ` Lorenzo Pieralisi
0 siblings, 2 replies; 3+ messages in thread
From: Johan Hovold @ 2022-04-01 13:33 UTC (permalink / raw)
To: Lorenzo Pieralisi, Stanimir Varbanov, Andy Gross, Bjorn Andersson
Cc: Rob Herring, Krzysztof Wilczyński, Bjorn Helgaas,
Dmitry Baryshkov, linux-pci, linux-arm-msm, linux-kernel,
Johan Hovold, stable
Commit ed8cc3b1fc84 ("PCI: qcom: Add support for SDM845 PCIe
controller") introduced a clock imbalance by enabling the pipe clock
both in init() and in post_init() but only disabling 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.
Fixes: ed8cc3b1fc84 ("PCI: qcom: Add support for SDM845 PCIe controller")
Cc: stable@vger.kernel.org # 5.6
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
Changes in v2
- Capitalise "Fix" in subject line according to PCI subsystem
convention
drivers/pci/controller/dwc/pcie-qcom.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c
index b79d98e5e228..20a0e6533a1c 100644
--- a/drivers/pci/controller/dwc/pcie-qcom.c
+++ b/drivers/pci/controller/dwc/pcie-qcom.c
@@ -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);
--
2.35.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] PCI: qcom: Fix pipe clock imbalance
2022-04-01 13:33 [PATCH v2] PCI: qcom: Fix pipe clock imbalance Johan Hovold
@ 2022-04-04 13:53 ` Bjorn Andersson
2022-04-13 10:57 ` Lorenzo Pieralisi
1 sibling, 0 replies; 3+ messages in thread
From: Bjorn Andersson @ 2022-04-04 13:53 UTC (permalink / raw)
To: Johan Hovold
Cc: Lorenzo Pieralisi, Stanimir Varbanov, Andy Gross, Rob Herring,
Krzysztof Wilczy??ski, Bjorn Helgaas, Dmitry Baryshkov,
linux-pci, linux-arm-msm, linux-kernel, stable
On Fri 01 Apr 06:33 PDT 2022, Johan Hovold wrote:
> Commit ed8cc3b1fc84 ("PCI: qcom: Add support for SDM845 PCIe
> controller") introduced a clock imbalance by enabling the pipe clock
> both in init() and in post_init() but only disabling 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.
>
> Fixes: ed8cc3b1fc84 ("PCI: qcom: Add support for SDM845 PCIe controller")
> Cc: stable@vger.kernel.org # 5.6
> Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
> ---
>
> Changes in v2
> - Capitalise "Fix" in subject line according to PCI subsystem
> convention
>
>
> drivers/pci/controller/dwc/pcie-qcom.c | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c
> index b79d98e5e228..20a0e6533a1c 100644
> --- a/drivers/pci/controller/dwc/pcie-qcom.c
> +++ b/drivers/pci/controller/dwc/pcie-qcom.c
> @@ -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);
>
> --
> 2.35.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] PCI: qcom: Fix pipe clock imbalance
2022-04-01 13:33 [PATCH v2] PCI: qcom: Fix pipe clock imbalance Johan Hovold
2022-04-04 13:53 ` Bjorn Andersson
@ 2022-04-13 10:57 ` Lorenzo Pieralisi
1 sibling, 0 replies; 3+ messages in thread
From: Lorenzo Pieralisi @ 2022-04-13 10:57 UTC (permalink / raw)
To: Johan Hovold, Stanimir Varbanov, Andy Gross, Bjorn Andersson
Cc: Lorenzo Pieralisi, linux-pci, linux-arm-msm, Dmitry Baryshkov,
Bjorn Helgaas, Krzysztof Wilczyński, linux-kernel,
Rob Herring
On Fri, 1 Apr 2022 15:33:51 +0200, Johan Hovold wrote:
> Commit ed8cc3b1fc84 ("PCI: qcom: Add support for SDM845 PCIe
> controller") introduced a clock imbalance by enabling the pipe clock
> both in init() and in post_init() but only disabling 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.
>
> [...]
Applied to pci/qcom, thanks!
[1/1] PCI: qcom: Fix pipe clock imbalance
https://git.kernel.org/lpieralisi/pci/c/dcd9011f59
Thanks,
Lorenzo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-04-13 10:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-01 13:33 [PATCH v2] PCI: qcom: Fix pipe clock imbalance Johan Hovold
2022-04-04 13:53 ` Bjorn Andersson
2022-04-13 10:57 ` Lorenzo Pieralisi
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).