From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 19 Jul 2024 15:10:31 +0000 (-0500)
Subject: Merge branch 'pci/controller/qcom'
X-Git-Tag: v6.11-rc1~97^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df5dd337283ad104ef329124d683b63d6b4dcd48;p=thirdparty%2Flinux.git

Merge branch 'pci/controller/qcom'

- Use devm_clk_bulk_get_all() to get all the clocks from DT to avoid
  writing out all the clock names (Manivannan Sadhasivam)

- Add DT binding and driver support for the SA8775P SoC (Mrinmay Sarkar)

- Refactor dw_pcie_edma_find_chip() to enable adding support for Hyper DMA
  (HDMA) (Manivannan Sadhasivam)

- Enable drivers to supply the eDMA channel count since some can't auto
  detect this (Manivannan Sadhasivam)

- Add HDMA support for the SA8775P SoC (Mrinmay Sarkar)

- Override the SA8775P NO_SNOOP default to avoid possible memory corruption
  (Mrinmay Sarkar)

- Make sure resources are disabled during PERST# assertion, even if the
  link is already disabled (Manivannan Sadhasivam)

- Vote for the CPU-PCIe ICC (interconnect) path to ensure it stays active
  even if other drivers don't vote for it (Krishna chaitanya chundru)

- Add Operating Performance Points (OPP) to scale performance state based
  on aggregate link bandwidth to improve SoC power efficiency (Krishna
  chaitanya chundru)

- Return failure instead of success if dev_pm_opp_find_freq_floor() fails
  (Dan Carpenter)

- Avoid an error pointer dereference if dev_pm_opp_find_freq_exact() fails
  (Dan Carpenter)

- Prevent use of uninitialized data in qcom_pcie_suspend_noirq() (Dan
  Carpenter)

* pci/controller/qcom:
  PCI: qcom: Prevent use of uninitialized data in qcom_pcie_suspend_noirq()
  PCI: qcom: Prevent potential error pointer dereference
  PCI: qcom: Fix missing error code in qcom_pcie_probe()
  PCI: qcom: Add OPP support to scale performance
  PCI: Bring the PCIe speed to MBps logic to new pcie_dev_speed_mbps()
  PCI: qcom: Add ICC bandwidth vote for CPU to PCIe path
  PCI: qcom-ep: Disable resources unconditionally during PERST# assert
  PCI: qcom-ep: Override NO_SNOOP attribute for SA8775P EP
  PCI: qcom: Override NO_SNOOP attribute for SA8775P RC
  PCI: epf-mhi: Enable HDMA for SA8775P SoC
  PCI: qcom-ep: Add HDMA support for SA8775P SoC
  PCI: dwc: Pass the eDMA mapping format flag directly from glue drivers
  PCI: dwc: Skip finding eDMA channels count for HDMA platforms
  PCI: dwc: Refactor dw_pcie_edma_find_chip() API
  PCI: qcom-ep: Add support for SA8775P SOC
  dt-bindings: PCI: qcom-ep: Add support for SA8775P SoC
  PCI: qcom: Use devm_clk_bulk_get_all() API
---

df5dd337283ad104ef329124d683b63d6b4dcd48
diff --cc drivers/pci/controller/dwc/pcie-qcom-ep.c
index 02a2a871a91f5,20c4a8063efb1..236229f66c808
--- a/drivers/pci/controller/dwc/pcie-qcom-ep.c
+++ b/drivers/pci/controller/dwc/pcie-qcom-ep.c
@@@ -500,14 -521,7 +521,8 @@@ err_disable_resources
  static void qcom_pcie_perst_assert(struct dw_pcie *pci)
  {
  	struct qcom_pcie_ep *pcie_ep = to_pcie_ep(pci);
- 	struct device *dev = pci->dev;
- 
- 	if (pcie_ep->link_status == QCOM_PCIE_EP_LINK_DISABLED) {
- 		dev_dbg(dev, "Link is already disabled\n");
- 		return;
- 	}
  
 +	pci_epc_deinit_notify(pci->ep.epc);
  	dw_pcie_ep_cleanup(&pci->ep);
  	qcom_pcie_disable_resources(pcie_ep);
  	pcie_ep->link_status = QCOM_PCIE_EP_LINK_DISABLED;
diff --cc drivers/pci/controller/dwc/pcie-qcom.c
index 436076612c8f5,e60432b238fb5..0180edf3310ec
--- a/drivers/pci/controller/dwc/pcie-qcom.c
+++ b/drivers/pci/controller/dwc/pcie-qcom.c
@@@ -18,9 -18,12 +18,11 @@@
  #include <linux/io.h>
  #include <linux/iopoll.h>
  #include <linux/kernel.h>
+ #include <linux/limits.h>
  #include <linux/init.h>
  #include <linux/of.h>
 -#include <linux/of_gpio.h>
  #include <linux/pci.h>
+ #include <linux/pm_opp.h>
  #include <linux/pm_runtime.h>
  #include <linux/platform_device.h>
  #include <linux/phy/pcie.h>