From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 15 Jan 2024 18:10:37 +0000 (-0600)
Subject: Merge branch 'pci/controller/dwc'
X-Git-Tag: v6.8-rc1~63^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=787c72b1d45be57f902f13a84552b118fa61e063;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'pci/controller/dwc'

- Convert fu740 CONFIG_PCIE_FU740 dependency from SOC_SIFIVE to ARCH_SIFIVE
  (Conor Dooley)

- Align iATU mapping for endpoint MSI-X (Niklas Cassel)

- Drop "host_" prefix from struct dw_pcie_host_ops members (Yoshihiro
  Shimoda)

- Drop "ep_" prefix from struct dw_pcie_ep_ops members (Yoshihiro Shimoda)

- Rename struct dw_pcie_ep_ops.func_conf_select() to .get_dbi_offset() to
  be more descriptive (Yoshihiro Shimoda)

- Add Endpoint DBI accessors to encapsulate offset lookups (Yoshihiro
  Shimoda)

- Cast iproc and rcar-gen4 of_device_get_match_data() results to uintptr_t
  to avoid clang "cast to smaller integer type" warnings (Justin Stitt,
  Yoshihiro Shimoda)

* pci/controller/dwc:
  PCI: rcar-gen4: Fix -Wvoid-pointer-to-enum-cast error
  PCI: iproc: Fix -Wvoid-pointer-to-enum-cast warning
  PCI: dwc: Add dw_pcie_ep_{read,write}_dbi[2] helpers
  PCI: dwc: Rename .func_conf_select to .get_dbi_offset in struct dw_pcie_ep_ops
  PCI: dwc: Rename .ep_init to .init in struct dw_pcie_ep_ops
  PCI: dwc: Drop host prefix from struct dw_pcie_host_ops members
  PCI: dwc: endpoint: Fix dw_pcie_ep_raise_msix_irq() alignment support
  PCI: dwc: Convert SOC_SIFIVE to ARCH_SIFIVE
---

787c72b1d45be57f902f13a84552b118fa61e063
diff --cc drivers/pci/controller/dwc/pcie-intel-gw.c
index c9c93524e01dc,be52e9db44af6..acbe4f6d3291d
--- a/drivers/pci/controller/dwc/pcie-intel-gw.c
+++ b/drivers/pci/controller/dwc/pcie-intel-gw.c
@@@ -391,7 -391,7 +391,7 @@@ static const struct dw_pcie_ops intel_p
  };
  
  static const struct dw_pcie_host_ops intel_pcie_dw_ops = {
- 	.host_init =		intel_pcie_rc_init,
 -	.init =		intel_pcie_rc_init,
++	.init = intel_pcie_rc_init,
  };
  
  static int intel_pcie_probe(struct platform_device *pdev)
diff --cc drivers/pci/controller/dwc/pcie-keembay.c
index 289bff99d7628,3c38e047d5edd..60776b1fac758
--- a/drivers/pci/controller/dwc/pcie-keembay.c
+++ b/drivers/pci/controller/dwc/pcie-keembay.c
@@@ -325,7 -325,7 +325,7 @@@ keembay_pcie_get_features(struct dw_pci
  }
  
  static const struct dw_pcie_ep_ops keembay_pcie_ep_ops = {
- 	.ep_init	= keembay_pcie_ep_init,
 -	.init	= keembay_pcie_ep_init,
++	.init		= keembay_pcie_ep_init,
  	.raise_irq	= keembay_pcie_ep_raise_irq,
  	.get_features	= keembay_pcie_get_features,
  };