From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 6 Feb 2026 23:09:46 +0000 (-0600)
Subject: Merge branch 'pci/controller/dwc-qcom'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b2e9baa9fd497235b6e1c791f12fdbe7957b48a;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'pci/controller/dwc-qcom'

- Parse PERST# from all PCIe bridge nodes for future platforms that will
  have PERST# in Switch Downstream Ports as well as in Root Ports
  (Manivannan Sadhasivam)

- Rename qcom PERST# assert/deassert helpers, e.g., qcom_ep_reset_assert(),
  to avoid confusion with Endpoint interfaces (Manivannan Sadhasivam)

* pci/controller/dwc-qcom:
  PCI: qcom: Rename PERST# assert/deassert helpers for uniformity
  PCI: qcom: Parse PERST# from all PCIe bridge nodes

# Conflicts:
#	drivers/pci/controller/dwc/pcie-qcom.c
---

9b2e9baa9fd497235b6e1c791f12fdbe7957b48a
diff --cc drivers/pci/controller/dwc/pcie-qcom.c
index 59769d13c2b70,7d12fb081e009..5462361985494
--- a/drivers/pci/controller/dwc/pcie-qcom.c
+++ b/drivers/pci/controller/dwc/pcie-qcom.c
@@@ -1303,13 -1321,10 +1311,13 @@@ static int qcom_pcie_host_init(struct d
  	if (pcie->cfg->ops->post_init) {
  		ret = pcie->cfg->ops->post_init(pcie);
  		if (ret)
 -			goto err_disable_phy;
 +			goto err_pwrctrl_power_off;
  	}
  
 +	dw_pcie_remove_capability(pcie->pci, PCI_CAP_ID_MSIX);
 +	dw_pcie_remove_ext_capability(pcie->pci, PCI_EXT_CAP_ID_DPC);
 +
- 	qcom_ep_reset_deassert(pcie);
+ 	qcom_pcie_perst_deassert(pcie);
  
  	if (pcie->cfg->ops->config_sid) {
  		ret = pcie->cfg->ops->config_sid(pcie);
@@@ -1320,12 -1335,7 +1328,12 @@@
  	return 0;
  
  err_assert_reset:
- 	qcom_ep_reset_assert(pcie);
+ 	qcom_pcie_perst_assert(pcie);
 +err_pwrctrl_power_off:
 +	pci_pwrctrl_power_off_devices(pci->dev);
 +err_pwrctrl_destroy:
 +	if (ret != -EPROBE_DEFER)
 +		pci_pwrctrl_destroy_devices(pci->dev);
  err_disable_phy:
  	qcom_pcie_phy_power_off(pcie);
  err_deinit:
@@@ -1339,13 -1349,7 +1347,13 @@@ static void qcom_pcie_host_deinit(struc
  	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
  	struct qcom_pcie *pcie = to_qcom_pcie(pci);
  
- 	qcom_ep_reset_assert(pcie);
+ 	qcom_pcie_perst_assert(pcie);
 +
 +	/*
 +	 * No need to destroy pwrctrl devices as this function only gets called
 +	 * during system suspend as of now.
 +	 */
 +	pci_pwrctrl_power_off_devices(pci->dev);
  	qcom_pcie_phy_power_off(pcie);
  	pcie->cfg->ops->deinit(pcie);
  }
@@@ -1944,8 -2059,12 +2010,10 @@@ static int qcom_pcie_probe(struct platf
  
  	return 0;
  
 -err_host_deinit:
 -	dw_pcie_host_deinit(pp);
  err_phy_exit:
- 	list_for_each_entry_safe(port, tmp, &pcie->ports, list) {
+ 	list_for_each_entry_safe(port, tmp_port, &pcie->ports, list) {
+ 		list_for_each_entry_safe(perst, tmp_perst, &port->perst, list)
+ 			list_del(&perst->list);
  		phy_exit(port->phy);
  		list_del(&port->list);
  	}