Skip to contentSkip to conversation

PCI: add a new directory for designware core

PATCH Superseded Kishon Vijay Abraham I 1 participant 1 message Jan 5, 2017

Subsystems (3)

v4 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 PCI: add a new directory for designware core

group all the PCI drivers that use designware core in dwc directory. dwc IP is capable of operating in both host mode and device mode and keeping it inside the *host* directory is misleading. This is in preparation for adding endpoint mode support in dwc driver.

Cc Thomas Petazzoni <[email protected]>
Cc Minghuan Lian <[email protected]>
Cc Mingkai Hu <[email protected]>
Cc Roy Zang <[email protected]>
Cc Richard Zhu <[email protected]>
Cc Lucas Stach <[email protected]>
Cc Murali Karicheri <[email protected]>
Cc Jingoo Han <[email protected]>
Cc Joao Pinto <[email protected]>
Cc Pratyush Anand <[email protected]>
Cc Niklas Cassel <[email protected]>
Cc Jesper Nilsson <[email protected]>
Cc Zhou Wang <[email protected]>
Cc Gabriele Paoloni <[email protected]>
Cc Stanimir Varbanov <[email protected]>

---
Changes from v3:
*) Moved pci-keystone.h to dwc directory which was missed earlier

Changes from v2:
*) update MAINTAINERS file

Changes from v1:
*) instead of renaming *host* directory to *controller* directory,
move all the dwc drivers to dwc/ directory.
Next Steps:
Split pcie-designware.c to core, host-only and endpoint-only files.

 MAINTAINERS                                      |   22 ++---
 drivers/pci/Kconfig                              |    1 +
 drivers/pci/Makefile                             |    3 +
 drivers/pci/dwc/Kconfig                          |  108 +++++++++++++++++++++
 drivers/pci/dwc/Makefile                         |   23 +++++
 drivers/pci/{host => dwc}/pci-dra7xx.c           |    0
 drivers/pci/{host => dwc}/pci-exynos.c           |    0
 drivers/pci/{host => dwc}/pci-imx6.c             |    0
 drivers/pci/{host => dwc}/pci-keystone-dw.c      |    0
 drivers/pci/{host => dwc}/pci-keystone.c         |    0
 drivers/pci/{host => dwc}/pci-keystone.h         |    0
 drivers/pci/{host => dwc}/pci-layerscape.c       |    0
 drivers/pci/{host => dwc}/pcie-armada8k.c        |    0
 drivers/pci/{host => dwc}/pcie-artpec6.c         |    0
 drivers/pci/{host => dwc}/pcie-designware-plat.c |    0
 drivers/pci/{host => dwc}/pcie-designware.c      |    0
 drivers/pci/{host => dwc}/pcie-designware.h      |    0
 drivers/pci/{host => dwc}/pcie-hisi.c            |    0
 drivers/pci/{host => dwc}/pcie-qcom.c            |    0
 drivers/pci/{host => dwc}/pcie-spear13xx.c       |    0
 drivers/pci/host/Kconfig                         |  113 ----------------------
 drivers/pci/host/Makefile                        |   12 ---
 22 files changed, 146 insertions(+), 136 deletions(-)
 create mode 100644 drivers/pci/dwc/Kconfig
 create mode 100644 drivers/pci/dwc/Makefile
 rename drivers/pci/{host => dwc}/pci-dra7xx.c (100%)
 rename drivers/pci/{host => dwc}/pci-exynos.c (100%)
 rename drivers/pci/{host => dwc}/pci-imx6.c (100%)
 rename drivers/pci/{host => dwc}/pci-keystone-dw.c (100%)
 rename drivers/pci/{host => dwc}/pci-keystone.c (100%)
 rename drivers/pci/{host => dwc}/pci-keystone.h (100%)
 rename drivers/pci/{host => dwc}/pci-layerscape.c (100%)
 rename drivers/pci/{host => dwc}/pcie-armada8k.c (100%)
 rename drivers/pci/{host => dwc}/pcie-artpec6.c (100%)
 rename drivers/pci/{host => dwc}/pcie-designware-plat.c (100%)
 rename drivers/pci/{host => dwc}/pcie-designware.c (100%)
 rename drivers/pci/{host => dwc}/pcie-designware.h (100%)
 rename drivers/pci/{host => dwc}/pcie-hisi.c (100%)
 rename drivers/pci/{host => dwc}/pcie-qcom.c (100%)
 rename drivers/pci/{host => dwc}/pcie-spear13xx.c (100%)
MAINTAINERS +11 -11
index cfff2c9..8672f18 100644
@@ -9429,7 +9429,7 @@ L:	[email protected]
 L:	[email protected]
 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 <[email protected]>
@@ -9447,7 +9447,7 @@ L:	[email protected]
 L:	[email protected]
 L:	[email protected]
 S:	Maintained
-F:	drivers/pci/host/*layerscape*
+F:	drivers/pci/dwc/*layerscape*
 
 PCI DRIVER FOR IMX6
 M:	Richard Zhu <[email protected]>
@@ -9456,14 +9456,14 @@ L:	[email protected]
 L:	[email protected] (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 <[email protected]>
 L:	[email protected]
 L:	[email protected] (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 <[email protected]>
@@ -9495,7 +9495,7 @@ L:	[email protected]
 L:	[email protected]
 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 <[email protected]>
@@ -9510,7 +9510,7 @@ L:	[email protected]
 L:	[email protected] (moderated for non-subscribers)
 L:	[email protected] (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 <[email protected]>
@@ -9518,7 +9518,7 @@ M:	Joao Pinto <[email protected]>
 L:	[email protected]
 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 <[email protected]>
@@ -9539,7 +9539,7 @@ PCIE DRIVER FOR ST SPEAR13XX
 M:	Pratyush Anand <[email protected]>
 L:	[email protected]
 S:	Maintained
-F:	drivers/pci/host/*spear*
+F:	drivers/pci/dwc/*spear*
 
 PCI MSI DRIVER FOR ALTERA MSI IP
 M:	Ley Foon Tan <[email protected]>
@@ -9564,7 +9564,7 @@ L:	[email protected]
 L:	[email protected]
 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 <[email protected]>
@@ -9572,7 +9572,7 @@ M:	Gabriele Paoloni <[email protected]>
 L:	[email protected]
 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 <[email protected]>
@@ -9588,7 +9588,7 @@ M:     Stanimir Varbanov <[email protected]>
 L:     [email protected]
 L:     [email protected]
 S:     Maintained
-F:     drivers/pci/host/*qcom*
+F:     drivers/pci/dwc/*qcom*
 
 PCIE DRIVER FOR CAVIUM THUNDERX
 M:	David Daney <[email protected]>
drivers/pci/Kconfig +1 -0
index 6555eb7..df14142 100644
@@ -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/Makefile +3 -0
index 8db5079..b7e9751 100644
@@ -66,5 +66,8 @@ obj-$(CONFIG_OF) += of.o
 
 ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG
 
+# PCI dwc controller drivers
+obj-y += dwc/
+
 # PCI host controller drivers
 obj-y += host/
drivers/pci/dwc/Kconfig new file +108 -0

108 lines not on this page · raw message

drivers/pci/dwc/Makefile new file +23 -0
new file mode 100644
index 0000000..7d27c14
@@ -0,0 +1,23 @@
+obj-$(CONFIG_PCIE_DW) += pcie-designware.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
drivers/pci/dwc/pci-dra7xx.c renamed from drivers/pci/host/pci-dra7xx.c +0 -0
similarity index 100%
rename from drivers/pci/host/pci-dra7xx.c
rename to drivers/pci/dwc/pci-dra7xx.c
drivers/pci/dwc/pci-exynos.c renamed from drivers/pci/host/pci-exynos.c +0 -0
similarity index 100%
rename from drivers/pci/host/pci-exynos.c
rename to drivers/pci/dwc/pci-exynos.c
drivers/pci/dwc/pci-imx6.c renamed from drivers/pci/host/pci-imx6.c +0 -0
similarity index 100%
rename from drivers/pci/host/pci-imx6.c
rename to drivers/pci/dwc/pci-imx6.c
drivers/pci/dwc/pci-keystone-dw.c renamed from drivers/pci/host/pci-keystone-dw.c +0 -0
similarity index 100%
rename from drivers/pci/host/pci-keystone-dw.c
rename to drivers/pci/dwc/pci-keystone-dw.c
drivers/pci/dwc/pci-keystone.c renamed from drivers/pci/host/pci-keystone.c +0 -0
similarity index 100%
rename from drivers/pci/host/pci-keystone.c
rename to drivers/pci/dwc/pci-keystone.c
drivers/pci/dwc/pci-keystone.h renamed from drivers/pci/host/pci-keystone.h +0 -0
similarity index 100%
rename from drivers/pci/host/pci-keystone.h
rename to drivers/pci/dwc/pci-keystone.h
drivers/pci/dwc/pci-layerscape.c renamed from drivers/pci/host/pci-layerscape.c +0 -0
similarity index 100%
rename from drivers/pci/host/pci-layerscape.c
rename to drivers/pci/dwc/pci-layerscape.c
drivers/pci/dwc/pcie-armada8k.c renamed from drivers/pci/host/pcie-armada8k.c +0 -0
similarity index 100%
rename from drivers/pci/host/pcie-armada8k.c
rename to drivers/pci/dwc/pcie-armada8k.c
drivers/pci/dwc/pcie-artpec6.c renamed from drivers/pci/host/pcie-artpec6.c +0 -0
similarity index 100%
rename from drivers/pci/host/pcie-artpec6.c
rename to drivers/pci/dwc/pcie-artpec6.c
drivers/pci/dwc/pcie-designware-plat.c renamed from drivers/pci/host/pcie-designware-plat.c +0 -0
similarity index 100%
rename from drivers/pci/host/pcie-designware-plat.c
rename to drivers/pci/dwc/pcie-designware-plat.c
drivers/pci/dwc/pcie-designware.c renamed from drivers/pci/host/pcie-designware.c +0 -0
similarity index 100%
rename from drivers/pci/host/pcie-designware.c
rename to drivers/pci/dwc/pcie-designware.c
drivers/pci/dwc/pcie-designware.h renamed from drivers/pci/host/pcie-designware.h +0 -0
similarity index 100%
rename from drivers/pci/host/pcie-designware.h
rename to drivers/pci/dwc/pcie-designware.h
drivers/pci/dwc/pcie-hisi.c renamed from drivers/pci/host/pcie-hisi.c +0 -0
similarity index 100%
rename from drivers/pci/host/pcie-hisi.c
rename to drivers/pci/dwc/pcie-hisi.c
drivers/pci/dwc/pcie-qcom.c renamed from drivers/pci/host/pcie-qcom.c +0 -0
similarity index 100%
rename from drivers/pci/host/pcie-qcom.c
rename to drivers/pci/dwc/pcie-qcom.c
drivers/pci/dwc/pcie-spear13xx.c renamed from drivers/pci/host/pcie-spear13xx.c +0 -0
similarity index 100%
rename from drivers/pci/host/pcie-spear13xx.c
rename to drivers/pci/dwc/pcie-spear13xx.c
drivers/pci/host/Kconfig +0 -113

149 lines not on this page · raw message

drivers/pci/host/Makefile +0 -12
index bfe3179..4d36866 100644
@@ -1,8 +1,3 @@
-obj-$(CONFIG_PCIE_DW) += pcie-designware.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_PCI_HYPERV) += pci-hyperv.o
 obj-$(CONFIG_PCI_MVEBU) += pci-mvebu.o
 obj-$(CONFIG_PCI_AARDVARK) += pci-aardvark.o
@@ -11,12 +6,9 @@ obj-$(CONFIG_PCI_RCAR_GEN2) += pci-rcar-gen2.o
 obj-$(CONFIG_PCIE_RCAR) += pcie-rcar.o
 obj-$(CONFIG_PCI_HOST_COMMON) += pci-host-common.o
 obj-$(CONFIG_PCI_HOST_GENERIC) += pci-host-generic.o
-obj-$(CONFIG_PCIE_SPEAR13XX) += pcie-spear13xx.o
-obj-$(CONFIG_PCI_KEYSTONE) += pci-keystone-dw.o pci-keystone.o
 obj-$(CONFIG_PCIE_XILINX) += pcie-xilinx.o
 obj-$(CONFIG_PCIE_XILINX_NWL) += pcie-xilinx-nwl.o
 obj-$(CONFIG_PCI_XGENE_MSI) += pci-xgene-msi.o
-obj-$(CONFIG_PCI_LAYERSCAPE) += pci-layerscape.o
 obj-$(CONFIG_PCI_VERSATILE) += pci-versatile.o
 obj-$(CONFIG_PCIE_IPROC) += pcie-iproc.o
 obj-$(CONFIG_PCIE_IPROC_MSI) += pcie-iproc-msi.o
@@ -24,9 +16,6 @@ obj-$(CONFIG_PCIE_IPROC_PLATFORM) += pcie-iproc-platform.o
 obj-$(CONFIG_PCIE_IPROC_BCMA) += pcie-iproc-bcma.o
 obj-$(CONFIG_PCIE_ALTERA) += pcie-altera.o
 obj-$(CONFIG_PCIE_ALTERA_MSI) += pcie-altera-msi.o
-obj-$(CONFIG_PCIE_QCOM) += pcie-qcom.o
-obj-$(CONFIG_PCIE_ARMADA_8K) += pcie-armada8k.o
-obj-$(CONFIG_PCIE_ARTPEC6) += pcie-artpec6.o
 obj-$(CONFIG_PCIE_ROCKCHIP) += pcie-rockchip.o
 obj-$(CONFIG_VMD) += vmd.o
 
@@ -40,7 +29,6 @@ obj-$(CONFIG_VMD) += vmd.o
 # 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
 obj-$(CONFIG_ARM64) += pci-thunder-ecam.o
 obj-$(CONFIG_ARM64) += pci-thunder-pem.o
 obj-$(CONFIG_ARM64) += pci-xgene.o
Signature · 1 line
1.7.9.5