* [PATCH] PCI: qcom: Make sure PCIe is reset before init for rev 2.1.0
@ 2020-09-01 12:49 Ansuel Smith
2020-09-01 14:31 ` Sasha Levin
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Ansuel Smith @ 2020-09-01 12:49 UTC (permalink / raw)
To: Stanimir Varbanov
Cc: Ansuel Smith, stable, Andy Gross, Bjorn Andersson,
Lorenzo Pieralisi, Rob Herring, Bjorn Helgaas, Philipp Zabel,
linux-arm-msm, linux-pci, linux-kernel
Qsdk U-Boot can incorrectly leave the PCIe interface in an undefined
state if bootm command is used instead of bootipq. This is caused by the
not deinit of PCIe when bootm is called. Reset the PCIe before init
anyway to fix this U-Boot bug.
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Fixes: 82a823833f4e ("PCI: qcom: Add Qualcomm PCIe controller driver")
Cc: stable@vger.kernel.org # v4.19+
---
drivers/pci/controller/dwc/pcie-qcom.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c
index 3aac77a295ba..82336bbaf8dc 100644
--- a/drivers/pci/controller/dwc/pcie-qcom.c
+++ b/drivers/pci/controller/dwc/pcie-qcom.c
@@ -302,6 +302,9 @@ static void qcom_pcie_deinit_2_1_0(struct qcom_pcie *pcie)
reset_control_assert(res->por_reset);
reset_control_assert(res->ext_reset);
reset_control_assert(res->phy_reset);
+
+ writel(1, pcie->parf + PCIE20_PARF_PHY_CTRL);
+
regulator_bulk_disable(ARRAY_SIZE(res->supplies), res->supplies);
}
@@ -314,6 +317,16 @@ static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie)
u32 val;
int ret;
+ /* reset the PCIe interface as uboot can leave it undefined state */
+ reset_control_assert(res->pci_reset);
+ reset_control_assert(res->axi_reset);
+ reset_control_assert(res->ahb_reset);
+ reset_control_assert(res->por_reset);
+ reset_control_assert(res->ext_reset);
+ reset_control_assert(res->phy_reset);
+
+ writel(1, pcie->parf + PCIE20_PARF_PHY_CTRL);
+
ret = regulator_bulk_enable(ARRAY_SIZE(res->supplies), res->supplies);
if (ret < 0) {
dev_err(dev, "cannot enable regulators\n");
--
2.27.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] PCI: qcom: Make sure PCIe is reset before init for rev 2.1.0
2020-09-01 12:49 [PATCH] PCI: qcom: Make sure PCIe is reset before init for rev 2.1.0 Ansuel Smith
@ 2020-09-01 14:31 ` Sasha Levin
2020-09-01 16:55 ` Bjorn Andersson
2020-09-07 11:02 ` Lorenzo Pieralisi
2 siblings, 0 replies; 4+ messages in thread
From: Sasha Levin @ 2020-09-01 14:31 UTC (permalink / raw)
To: Sasha Levin, Ansuel Smith, Stanimir Varbanov; +Cc: Ansuel Smith, stable, stable
Hi
[This is an automated email]
This commit has been processed because it contains a "Fixes:" tag
fixing commit: 82a823833f4e ("PCI: qcom: Add Qualcomm PCIe controller driver").
The bot has tested the following trees: v5.8.5, v5.4.61, v4.19.142, v4.14.195, v4.9.234.
v5.8.5: Failed to apply! Possible dependencies:
8b6f0330b5f9 ("PCI: qcom: Add missing ipq806x clocks in PCIe driver")
dd58318c019f ("PCI: qcom: Change duplicate PCI reset to phy reset")
ee367e2cdd22 ("PCI: qcom: Add missing reset for ipq806x")
v5.4.61: Failed to apply! Possible dependencies:
8b6f0330b5f9 ("PCI: qcom: Add missing ipq806x clocks in PCIe driver")
dd58318c019f ("PCI: qcom: Change duplicate PCI reset to phy reset")
ee367e2cdd22 ("PCI: qcom: Add missing reset for ipq806x")
v4.19.142: Failed to apply! Possible dependencies:
8b6f0330b5f9 ("PCI: qcom: Add missing ipq806x clocks in PCIe driver")
dd58318c019f ("PCI: qcom: Change duplicate PCI reset to phy reset")
ee367e2cdd22 ("PCI: qcom: Add missing reset for ipq806x")
v4.14.195: Failed to apply! Possible dependencies:
68e7c15ceb8d ("PCI: qcom: Use regulator bulk api for apq8064 supplies")
8b6f0330b5f9 ("PCI: qcom: Add missing ipq806x clocks in PCIe driver")
dd58318c019f ("PCI: qcom: Change duplicate PCI reset to phy reset")
ee367e2cdd22 ("PCI: qcom: Add missing reset for ipq806x")
v4.9.234: Failed to apply! Possible dependencies:
19ce01cc8cbc ("PCI: dwc: all: Rename cfg_read/cfg_write to read/write")
1d77040bde2d ("PCI: layerscape: Add LS1046a support")
1f6c4501c667 ("PCI: dra7xx: Group PHY API invocations")
442ec4c04d12 ("PCI: dwc: all: Split struct pcie_port into host-only and core structures")
5d76117f070d ("PCI: qcom: Add support for IPQ8074 PCIe controller")
68e7c15ceb8d ("PCI: qcom: Use regulator bulk api for apq8064 supplies")
90d52d57ccac ("PCI: qcom: Add support for IPQ4019 PCIe controller")
9bcf0a6fdc50 ("PCI: dwc: all: Use platform_set_drvdata() to save private data")
ab5fe4f4d31e ("PCI: dra7xx: Add support to force RC to work in GEN1 mode")
b8f2a8565603 ("PCI: qcom: Limit TLP size to 2K to work around hardware issue")
d0491fc39bdd ("PCI: qcom: Add support for MSM8996 PCIe controller")
deff11f884f0 ("PCI: qcom: Use block IP version for operations")
e594233803aa ("PCI: layerscape: Remove redundant error message from ls_pcie_probe()")
ebe85a44aad4 ("PCI: dra7xx: Enable MSI and legacy interrupts simultaneously")
ee367e2cdd22 ("PCI: qcom: Add missing reset for ipq806x")
NOTE: The patch will not be queued to stable trees until it is upstream.
How should we proceed with this patch?
--
Thanks
Sasha
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] PCI: qcom: Make sure PCIe is reset before init for rev 2.1.0
2020-09-01 12:49 [PATCH] PCI: qcom: Make sure PCIe is reset before init for rev 2.1.0 Ansuel Smith
2020-09-01 14:31 ` Sasha Levin
@ 2020-09-01 16:55 ` Bjorn Andersson
2020-09-07 11:02 ` Lorenzo Pieralisi
2 siblings, 0 replies; 4+ messages in thread
From: Bjorn Andersson @ 2020-09-01 16:55 UTC (permalink / raw)
To: Ansuel Smith
Cc: Stanimir Varbanov, stable, Andy Gross, Lorenzo Pieralisi,
Rob Herring, Bjorn Helgaas, Philipp Zabel, linux-arm-msm,
linux-pci, linux-kernel
On Tue 01 Sep 07:49 CDT 2020, Ansuel Smith wrote:
> Qsdk U-Boot can incorrectly leave the PCIe interface in an undefined
> state if bootm command is used instead of bootipq. This is caused by the
> not deinit of PCIe when bootm is called. Reset the PCIe before init
> anyway to fix this U-Boot bug.
>
Looks sensible.
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Regards,
Bjorn
> Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
> Fixes: 82a823833f4e ("PCI: qcom: Add Qualcomm PCIe controller driver")
> Cc: stable@vger.kernel.org # v4.19+
> ---
> drivers/pci/controller/dwc/pcie-qcom.c | 13 +++++++++++++
> 1 file changed, 13 insertions(+)
>
> diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c
> index 3aac77a295ba..82336bbaf8dc 100644
> --- a/drivers/pci/controller/dwc/pcie-qcom.c
> +++ b/drivers/pci/controller/dwc/pcie-qcom.c
> @@ -302,6 +302,9 @@ static void qcom_pcie_deinit_2_1_0(struct qcom_pcie *pcie)
> reset_control_assert(res->por_reset);
> reset_control_assert(res->ext_reset);
> reset_control_assert(res->phy_reset);
> +
> + writel(1, pcie->parf + PCIE20_PARF_PHY_CTRL);
> +
> regulator_bulk_disable(ARRAY_SIZE(res->supplies), res->supplies);
> }
>
> @@ -314,6 +317,16 @@ static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie)
> u32 val;
> int ret;
>
> + /* reset the PCIe interface as uboot can leave it undefined state */
> + reset_control_assert(res->pci_reset);
> + reset_control_assert(res->axi_reset);
> + reset_control_assert(res->ahb_reset);
> + reset_control_assert(res->por_reset);
> + reset_control_assert(res->ext_reset);
> + reset_control_assert(res->phy_reset);
> +
> + writel(1, pcie->parf + PCIE20_PARF_PHY_CTRL);
> +
> ret = regulator_bulk_enable(ARRAY_SIZE(res->supplies), res->supplies);
> if (ret < 0) {
> dev_err(dev, "cannot enable regulators\n");
> --
> 2.27.0
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] PCI: qcom: Make sure PCIe is reset before init for rev 2.1.0
2020-09-01 12:49 [PATCH] PCI: qcom: Make sure PCIe is reset before init for rev 2.1.0 Ansuel Smith
2020-09-01 14:31 ` Sasha Levin
2020-09-01 16:55 ` Bjorn Andersson
@ 2020-09-07 11:02 ` Lorenzo Pieralisi
2 siblings, 0 replies; 4+ messages in thread
From: Lorenzo Pieralisi @ 2020-09-07 11:02 UTC (permalink / raw)
To: Ansuel Smith
Cc: Stanimir Varbanov, stable, Andy Gross, Bjorn Andersson,
Rob Herring, Bjorn Helgaas, Philipp Zabel, linux-arm-msm,
linux-pci, linux-kernel
On Tue, Sep 01, 2020 at 02:49:54PM +0200, Ansuel Smith wrote:
> Qsdk U-Boot can incorrectly leave the PCIe interface in an undefined
> state if bootm command is used instead of bootipq. This is caused by the
> not deinit of PCIe when bootm is called. Reset the PCIe before init
> anyway to fix this U-Boot bug.
>
> Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
> Fixes: 82a823833f4e ("PCI: qcom: Add Qualcomm PCIe controller driver")
> Cc: stable@vger.kernel.org # v4.19+
> ---
> drivers/pci/controller/dwc/pcie-qcom.c | 13 +++++++++++++
> 1 file changed, 13 insertions(+)
Applied to pci/qcom, thanks.
Lorenzo
> diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c
> index 3aac77a295ba..82336bbaf8dc 100644
> --- a/drivers/pci/controller/dwc/pcie-qcom.c
> +++ b/drivers/pci/controller/dwc/pcie-qcom.c
> @@ -302,6 +302,9 @@ static void qcom_pcie_deinit_2_1_0(struct qcom_pcie *pcie)
> reset_control_assert(res->por_reset);
> reset_control_assert(res->ext_reset);
> reset_control_assert(res->phy_reset);
> +
> + writel(1, pcie->parf + PCIE20_PARF_PHY_CTRL);
> +
> regulator_bulk_disable(ARRAY_SIZE(res->supplies), res->supplies);
> }
>
> @@ -314,6 +317,16 @@ static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie)
> u32 val;
> int ret;
>
> + /* reset the PCIe interface as uboot can leave it undefined state */
> + reset_control_assert(res->pci_reset);
> + reset_control_assert(res->axi_reset);
> + reset_control_assert(res->ahb_reset);
> + reset_control_assert(res->por_reset);
> + reset_control_assert(res->ext_reset);
> + reset_control_assert(res->phy_reset);
> +
> + writel(1, pcie->parf + PCIE20_PARF_PHY_CTRL);
> +
> ret = regulator_bulk_enable(ARRAY_SIZE(res->supplies), res->supplies);
> if (ret < 0) {
> dev_err(dev, "cannot enable regulators\n");
> --
> 2.27.0
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-09-07 11:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-01 12:49 [PATCH] PCI: qcom: Make sure PCIe is reset before init for rev 2.1.0 Ansuel Smith
2020-09-01 14:31 ` Sasha Levin
2020-09-01 16:55 ` Bjorn Andersson
2020-09-07 11:02 ` Lorenzo Pieralisi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.