From: Greg Kroah-Hartman Date: Mon, 14 Dec 2020 17:22:12 +0000 (+0100) Subject: 4.14-stable patches X-Git-Tag: v5.10.1~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c26d85ff6e28f35c08bfb84f59da1bfdd88562c1;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: pci-qcom-add-missing-reset-for-ipq806x.patch --- diff --git a/queue-4.14/pci-qcom-add-missing-reset-for-ipq806x.patch b/queue-4.14/pci-qcom-add-missing-reset-for-ipq806x.patch new file mode 100644 index 00000000000..d03b45cf7d4 --- /dev/null +++ b/queue-4.14/pci-qcom-add-missing-reset-for-ipq806x.patch @@ -0,0 +1,69 @@ +From foo@baz Mon Dec 14 06:04:25 PM CET 2020 +From: Ansuel Smith +Date: Mon, 15 Jun 2020 23:06:00 +0200 +Subject: PCI: qcom: Add missing reset for ipq806x + +From: Ansuel Smith + +commit ee367e2cdd2202b5714982739e684543cd2cee0e upstream + +Add missing ext reset used by ipq8064 SoC in PCIe qcom driver. + +Link: https://lore.kernel.org/r/20200615210608.21469-5-ansuelsmth@gmail.com +Fixes: 82a823833f4e ("PCI: qcom: Add Qualcomm PCIe controller driver") +Signed-off-by: Sham Muthayyan +Signed-off-by: Ansuel Smith +Signed-off-by: Lorenzo Pieralisi +Reviewed-by: Rob Herring +Reviewed-by: Philipp Zabel +Acked-by: Stanimir Varbanov +Cc: stable@vger.kernel.org # v4.5+ +[sudip: manual backport] +Signed-off-by: Sudip Mukherjee +Signed-off-by: Greg Kroah-Hartman +--- + drivers/pci/dwc/pcie-qcom.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +--- a/drivers/pci/dwc/pcie-qcom.c ++++ b/drivers/pci/dwc/pcie-qcom.c +@@ -96,6 +96,7 @@ struct qcom_pcie_resources_2_1_0 { + struct reset_control *ahb_reset; + struct reset_control *por_reset; + struct reset_control *phy_reset; ++ struct reset_control *ext_reset; + struct regulator *vdda; + struct regulator *vdda_phy; + struct regulator *vdda_refclk; +@@ -265,6 +266,10 @@ static int qcom_pcie_get_resources_2_1_0 + if (IS_ERR(res->por_reset)) + return PTR_ERR(res->por_reset); + ++ res->ext_reset = devm_reset_control_get_optional_exclusive(dev, "ext"); ++ if (IS_ERR(res->ext_reset)) ++ return PTR_ERR(res->ext_reset); ++ + res->phy_reset = devm_reset_control_get_exclusive(dev, "phy"); + return PTR_ERR_OR_ZERO(res->phy_reset); + } +@@ -277,6 +282,7 @@ static void qcom_pcie_deinit_2_1_0(struc + 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->pci_reset); + clk_disable_unprepare(res->iface_clk); + clk_disable_unprepare(res->core_clk); +@@ -342,6 +348,12 @@ static int qcom_pcie_init_2_1_0(struct q + goto err_deassert_ahb; + } + ++ ret = reset_control_deassert(res->ext_reset); ++ if (ret) { ++ dev_err(dev, "cannot deassert ext reset\n"); ++ goto err_deassert_ahb; ++ } ++ + /* enable PCIe clocks and resets */ + val = readl(pcie->parf + PCIE20_PARF_PHY_CTRL); + val &= ~BIT(0); diff --git a/queue-4.14/series b/queue-4.14/series index ec4b0e1ba3b..545410a55c1 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -13,3 +13,4 @@ pinctrl-amd-remove-debounce-filter-setting-in-irq-type-setting.patch kbuild-avoid-static_assert-for-genksyms.patch scsi-be2iscsi-revert-fix-a-theoretical-leak-in-beiscsi_create_eqs.patch x86-mm-mem_encrypt-fix-definition-of-pmd_flags_dec_wp.patch +pci-qcom-add-missing-reset-for-ipq806x.patch