Commit 3b353982 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/qcom' 

- Make sure PCIe is reset before init to work around QSDK U-Boot issue
  (Ansuel Smith)

- Set iproc affinity mask on MSI interrupts (Mark Tomlinson)

* remotes/lorenzo/pci/qcom:
  PCI: qcom: Make sure PCIe is reset before init for rev 2.1.0
parents be36e9b9 d3d4d028

drivers/pci/controller/dwc/pcie-qcom.c

+13 −0
Original line number Diff line number Diff line
@@ -297,6 +297,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);

}
@@ -309,6 +312,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");

CRA Git | Maintained and supported by SUSTech CRA and CCSE