Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'pci/host-designware' into next 

* pci/host-designware:
  PCI: dwc: Remove dependency of designware on CONFIG_PCI
  PCI: dwc: Add CONFIG_PCIE_DW_HOST to enable PCI dwc host
  PCI: dwc: Split pcie-designware.c into host and core files
  PCI: dwc: designware: Fix style errors in pcie-designware.c
  PCI: dwc: designware: Parse "num-lanes" property in dw_pcie_setup_rc()
  PCI: dwc: all: Split struct pcie_port into host-only and core structures
  PCI: dwc: designware: Get device pointer at the start of dw_pcie_host_init()
  PCI: dwc: all: Rename cfg_read/cfg_write to read/write
  PCI: dwc: all: Use platform_set_drvdata() to save private data
  PCI: dwc: designware: Move register defines to designware header file
  PCI: dwc: Use PTR_ERR_OR_ZERO to simplify code
  PCI: dra7xx: Group PHY API invocations
  PCI: dra7xx: Enable MSI and legacy interrupts simultaneously
  PCI: dra7xx: Add support to force RC to work in GEN1 mode
  PCI: dra7xx: Simplify probe code with devm_gpiod_get_optional()
  PCI: Move DesignWare IP support to new drivers/pci/dwc/ directory
  PCI: designware: Check for iATU unroll only on platforms that use ATU
parents 4c2ae32d 7a2b3f02

MAINTAINERS

+11 −11
Original line number Diff line number Diff line
@@ -9429,7 +9429,7 @@ L: linux-pci@vger.kernel.org 
L:	linux-arm-kernel@lists.infradead.org

S:	Maintained

F:	Documentation/devicetree/bindings/pci/pci-armada8k.txt

F:	drivers/pci/host/pcie-armada8k.c

F:	drivers/pci/dwc/pcie-armada8k.c



PCI DRIVER FOR APPLIEDMICRO XGENE

M:	Tanmay Inamdar <tinamdar@apm.com>
@@ -9447,7 +9447,7 @@ L: linuxppc-dev@lists.ozlabs.org 
L:	linux-pci@vger.kernel.org

L:	linux-arm-kernel@lists.infradead.org

S:	Maintained

F:	drivers/pci/host/*layerscape*

F:	drivers/pci/dwc/*layerscape*



PCI DRIVER FOR IMX6

M:	Richard Zhu <hongxing.zhu@nxp.com>
@@ -9456,14 +9456,14 @@ L: linux-pci@vger.kernel.org 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt

F:	drivers/pci/host/*imx6*

F:	drivers/pci/dwc/*imx6*



PCI DRIVER FOR TI KEYSTONE

M:	Murali Karicheri <m-karicheri2@ti.com>

L:	linux-pci@vger.kernel.org

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	drivers/pci/host/*keystone*

F:	drivers/pci/dwc/*keystone*



PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)

M:	Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
@@ -9495,7 +9495,7 @@ L: linux-omap@vger.kernel.org 
L:	linux-pci@vger.kernel.org

S:	Supported

F:	Documentation/devicetree/bindings/pci/ti-pci.txt

F:	drivers/pci/host/pci-dra7xx.c

F:	drivers/pci/dwc/pci-dra7xx.c



PCI DRIVER FOR RENESAS R-CAR

M:	Simon Horman <horms@verge.net.au>
@@ -9510,7 +9510,7 @@ L: linux-pci@vger.kernel.org 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)

S:	Maintained

F:	drivers/pci/host/pci-exynos.c

F:	drivers/pci/dwc/pci-exynos.c



PCI DRIVER FOR SYNOPSIS DESIGNWARE

M:	Jingoo Han <jingoohan1@gmail.com>
@@ -9518,7 +9518,7 @@ M: Joao Pinto <Joao.Pinto@synopsys.com> 
L:	linux-pci@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/bindings/pci/designware-pcie.txt

F:	drivers/pci/host/*designware*

F:	drivers/pci/dwc/*designware*



PCI DRIVER FOR GENERIC OF HOSTS

M:	Will Deacon <will.deacon@arm.com>
@@ -9539,7 +9539,7 @@ PCIE DRIVER FOR ST SPEAR13XX 
M:	Pratyush Anand <pratyush.anand@gmail.com>

L:	linux-pci@vger.kernel.org

S:	Maintained

F:	drivers/pci/host/*spear*

F:	drivers/pci/dwc/*spear*



PCI MSI DRIVER FOR ALTERA MSI IP

M:	Ley Foon Tan <lftan@altera.com>
@@ -9564,7 +9564,7 @@ L: linux-arm-kernel@axis.com 
L:	linux-pci@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/bindings/pci/axis,artpec*

F:	drivers/pci/host/*artpec*

F:	drivers/pci/dwc/*artpec*



PCIE DRIVER FOR HISILICON

M:	Zhou Wang <wangzhou1@hisilicon.com>
@@ -9572,7 +9572,7 @@ M: Gabriele Paoloni <gabriele.paoloni@huawei.com> 
L:	linux-pci@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/bindings/pci/hisilicon-pcie.txt

F:	drivers/pci/host/pcie-hisi.c

F:	drivers/pci/dwc/pcie-hisi.c



PCIE DRIVER FOR ROCKCHIP

M:	Shawn Lin <shawn.lin@rock-chips.com>
@@ -9588,7 +9588,7 @@ M: Stanimir Varbanov <svarbanov@mm-sol.com> 
L:     linux-pci@vger.kernel.org

L:     linux-arm-msm@vger.kernel.org

S:     Maintained

F:     drivers/pci/host/*qcom*

F:     drivers/pci/dwc/*qcom*



PCIE DRIVER FOR CAVIUM THUNDERX

M:	David Daney <david.daney@cavium.com>

drivers/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ obj-$(CONFIG_PINCTRL) += pinctrl/ 
obj-$(CONFIG_GPIOLIB)		+= gpio/

obj-y				+= pwm/

obj-$(CONFIG_PCI)		+= pci/

# PCI dwc controller drivers

obj-y				+= pci/dwc/



obj-$(CONFIG_PARISC)		+= parisc/

obj-$(CONFIG_RAPIDIO)		+= rapidio/

obj-y				+= video/

drivers/pci/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -132,4 +132,5 @@ config PCI_HYPERV 
          PCI devices from a PCI backend to support PCI driver domains.



source "drivers/pci/hotplug/Kconfig"

source "drivers/pci/dwc/Kconfig"

source "drivers/pci/host/Kconfig"

drivers/pci/dwc/Kconfig

0 → 100644
+132 −0
Original line number Diff line number Diff line 
menu "DesignWare PCI Core Support"



config PCIE_DW

	bool



config PCIE_DW_HOST

        bool

	depends on PCI

	depends on PCI_MSI_IRQ_DOMAIN

        select PCIE_DW



config PCI_DRA7XX

	bool "TI DRA7xx PCIe controller"

	depends on PCI

	depends on OF && HAS_IOMEM && TI_PIPE3

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIE_DW_HOST

	help

	 Enables support for the PCIe controller in the DRA7xx SoC.  There

	 are two instances of PCIe controller in DRA7xx.  This controller can

	 act both as EP and RC.  This reuses the Designware core.



config PCIE_DW_PLAT

	bool "Platform bus based DesignWare PCIe Controller"

	depends on PCI

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIE_DW_HOST

	---help---

	 This selects the DesignWare PCIe controller support. Select this if

	 you have a PCIe controller on Platform bus.



	 If you have a controller with this interface, say Y or M here.



	 If unsure, say N.



config PCI_EXYNOS

	bool "Samsung Exynos PCIe controller"

	depends on PCI

	depends on SOC_EXYNOS5440

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIEPORTBUS

	select PCIE_DW_HOST



config PCI_IMX6

	bool "Freescale i.MX6 PCIe controller"

	depends on PCI

	depends on SOC_IMX6Q

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIEPORTBUS

	select PCIE_DW_HOST



config PCIE_SPEAR13XX

	bool "STMicroelectronics SPEAr PCIe controller"

	depends on PCI

	depends on ARCH_SPEAR13XX

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIEPORTBUS

	select PCIE_DW_HOST

	help

	  Say Y here if you want PCIe support on SPEAr13XX SoCs.



config PCI_KEYSTONE

	bool "TI Keystone PCIe controller"

	depends on PCI

	depends on ARCH_KEYSTONE

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIEPORTBUS

	select PCIE_DW_HOST

	help

	  Say Y here if you want to enable PCI controller support on Keystone

	  SoCs. The PCI controller on Keystone is based on Designware hardware

	  and therefore the driver re-uses the Designware core functions to

	  implement the driver.



config PCI_LAYERSCAPE

	bool "Freescale Layerscape PCIe controller"

	depends on PCI

	depends on OF && (ARM || ARCH_LAYERSCAPE)

	depends on PCI_MSI_IRQ_DOMAIN

	select MFD_SYSCON

	select PCIE_DW_HOST

	help

	  Say Y here if you want PCIe controller support on Layerscape SoCs.



config PCI_HISI

	depends on OF && ARM64

	bool "HiSilicon Hip05 and Hip06 SoCs PCIe controllers"

	depends on PCI

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIEPORTBUS

	select PCIE_DW_HOST

	help

	  Say Y here if you want PCIe controller support on HiSilicon

	  Hip05 and Hip06 SoCs



config PCIE_QCOM

	bool "Qualcomm PCIe controller"

	depends on PCI

	depends on ARCH_QCOM && OF

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIEPORTBUS

	select PCIE_DW_HOST

	help

	  Say Y here to enable PCIe controller support on Qualcomm SoCs. The

	  PCIe controller uses the Designware core plus Qualcomm-specific

	  hardware wrappers.



config PCIE_ARMADA_8K

	bool "Marvell Armada-8K PCIe controller"

	depends on PCI

	depends on ARCH_MVEBU

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIEPORTBUS

	select PCIE_DW_HOST

	help

	  Say Y here if you want to enable PCIe controller support on

	  Armada-8K SoCs. The PCIe controller on Armada-8K is based on

	  Designware hardware and therefore the driver re-uses the

	  Designware core functions to implement the driver.



config PCIE_ARTPEC6

	bool "Axis ARTPEC-6 PCIe controller"

	depends on PCI

	depends on MACH_ARTPEC6

	depends on PCI_MSI_IRQ_DOMAIN

	select PCIEPORTBUS

	select PCIE_DW_HOST

	help

	  Say Y here to enable PCIe controller support on Axis ARTPEC-6

	  SoCs.  This PCIe controller uses the DesignWare core.



endmenu

drivers/pci/dwc/Makefile

0 → 100644
+24 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_PCIE_DW) += pcie-designware.o

obj-$(CONFIG_PCIE_DW_HOST) += pcie-designware-host.o

obj-$(CONFIG_PCIE_DW_PLAT) += pcie-designware-plat.o

obj-$(CONFIG_PCI_DRA7XX) += pci-dra7xx.o

obj-$(CONFIG_PCI_EXYNOS) += pci-exynos.o

obj-$(CONFIG_PCI_IMX6) += pci-imx6.o

obj-$(CONFIG_PCIE_SPEAR13XX) += pcie-spear13xx.o

obj-$(CONFIG_PCI_KEYSTONE) += pci-keystone-dw.o pci-keystone.o

obj-$(CONFIG_PCI_LAYERSCAPE) += pci-layerscape.o

obj-$(CONFIG_PCIE_QCOM) += pcie-qcom.o

obj-$(CONFIG_PCIE_ARMADA_8K) += pcie-armada8k.o

obj-$(CONFIG_PCIE_ARTPEC6) += pcie-artpec6.o



# The following drivers are for devices that use the generic ACPI

# pci_root.c driver but don't support standard ECAM config access.

# They contain MCFG quirks to replace the generic ECAM accessors with

# device-specific ones that are shared with the DT driver.



# The ACPI driver is generic and should not require driver-specific

# config options to be enabled, so we always build these drivers on

# ARM64 and use internal ifdefs to only build the pieces we need

# depending on whether ACPI, the DT driver, or both are enabled.



obj-$(CONFIG_ARM64) += pcie-hisi.o