Commit 787c72b1 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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
parents 78fe51fc 7682f19c

drivers/pci/controller/dwc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ config PCI_EXYNOS 
config PCIE_FU740

	bool "SiFive FU740 PCIe controller"

	depends on PCI_MSI

	depends on SOC_SIFIVE || COMPILE_TEST

	depends on ARCH_SIFIVE || COMPILE_TEST

	select PCIE_DW_HOST

	help

	  Say Y here if you want PCIe controller support for the SiFive

drivers/pci/controller/dwc/pci-dra7xx.c

+2 −2
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ static int dra7xx_pcie_init_irq_domain(struct dw_pcie_rp *pp) 
}



static const struct dw_pcie_host_ops dra7xx_pcie_host_ops = {

	.host_init = dra7xx_pcie_host_init,

	.init = dra7xx_pcie_host_init,

};



static void dra7xx_pcie_ep_init(struct dw_pcie_ep *ep)
@@ -436,7 +436,7 @@ dra7xx_pcie_get_features(struct dw_pcie_ep *ep) 
}



static const struct dw_pcie_ep_ops pcie_ep_ops = {

	.ep_init = dra7xx_pcie_ep_init,

	.init = dra7xx_pcie_ep_init,

	.raise_irq = dra7xx_pcie_raise_irq,

	.get_features = dra7xx_pcie_get_features,

};

drivers/pci/controller/dwc/pci-exynos.c

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ static int exynos_pcie_host_init(struct dw_pcie_rp *pp) 
}



static const struct dw_pcie_host_ops exynos_pcie_host_ops = {

	.host_init = exynos_pcie_host_init,

	.init = exynos_pcie_host_init,

};



static int exynos_add_pcie_port(struct exynos_pcie *ep,

drivers/pci/controller/dwc/pci-imx6.c

+3 −3
Original line number Diff line number Diff line
@@ -1039,8 +1039,8 @@ static void imx6_pcie_host_exit(struct dw_pcie_rp *pp) 
}



static const struct dw_pcie_host_ops imx6_pcie_host_ops = {

	.host_init = imx6_pcie_host_init,

	.host_deinit = imx6_pcie_host_exit,

	.init = imx6_pcie_host_init,

	.deinit = imx6_pcie_host_exit,

};



static const struct dw_pcie_ops dw_pcie_ops = {
@@ -1093,7 +1093,7 @@ imx6_pcie_ep_get_features(struct dw_pcie_ep *ep) 
}



static const struct dw_pcie_ep_ops pcie_ep_ops = {

	.ep_init = imx6_pcie_ep_init,

	.init = imx6_pcie_ep_init,

	.raise_irq = imx6_pcie_ep_raise_irq,

	.get_features = imx6_pcie_ep_get_features,

};

drivers/pci/controller/dwc/pci-keystone.c

+4 −4
Original line number Diff line number Diff line
@@ -838,12 +838,12 @@ static int __init ks_pcie_host_init(struct dw_pcie_rp *pp) 
}



static const struct dw_pcie_host_ops ks_pcie_host_ops = {

	.host_init = ks_pcie_host_init,

	.msi_host_init = ks_pcie_msi_host_init,

	.init = ks_pcie_host_init,

	.msi_init = ks_pcie_msi_host_init,

};



static const struct dw_pcie_host_ops ks_pcie_am654_host_ops = {

	.host_init = ks_pcie_host_init,

	.init = ks_pcie_host_init,

};



static irqreturn_t ks_pcie_err_irq_handler(int irq, void *priv)
@@ -944,7 +944,7 @@ ks_pcie_am654_get_features(struct dw_pcie_ep *ep) 
}



static const struct dw_pcie_ep_ops ks_pcie_am654_ep_ops = {

	.ep_init = ks_pcie_am654_ep_init,

	.init = ks_pcie_am654_ep_init,

	.raise_irq = ks_pcie_am654_raise_irq,

	.get_features = &ks_pcie_am654_get_features,

};