PCI: dwc: Add CONFIG_PCIE_DW_HOST to enable PCI dwc host

Now that PCI designware host has a separate file, add a new PCIE_DW_HOST
config symbol to select the host-only driver. This will enable to
independently select host support and endpoint support (when it's added).

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/dwc/Kconfig b/drivers/pci/dwc/Kconfig
index deae261992f23c7a8b6b6959ff675c83ff06674d..ab92a0c6643f57ee45fcd958ab49af7bd81024f0 100644 (file)
--- a/drivers/pci/dwc/Kconfig
+++ b/drivers/pci/dwc/Kconfig
@@ -3,13 +3,17 @@ menu "DesignWare PCI Core Support"
 
 config PCIE_DW
        bool
+
+config PCIE_DW_HOST
+        bool
        depends on PCI_MSI_IRQ_DOMAIN
+        select PCIE_DW
 
 config PCI_DRA7XX
        bool "TI DRA7xx PCIe controller"
        depends on OF && HAS_IOMEM && TI_PIPE3
        depends on PCI_MSI_IRQ_DOMAIN
-       select PCIE_DW
+       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
@@ -18,7 +22,7 @@ config PCI_DRA7XX
 config PCIE_DW_PLAT
        bool "Platform bus based DesignWare PCIe Controller"
        depends on PCI_MSI_IRQ_DOMAIN
-       select PCIE_DW
+       select PCIE_DW_HOST
        ---help---
         This selects the DesignWare PCIe controller support. Select this if
         you have a PCIe controller on Platform bus.
@@ -32,21 +36,21 @@ config PCI_EXYNOS
        depends on SOC_EXYNOS5440
        depends on PCI_MSI_IRQ_DOMAIN
        select PCIEPORTBUS
-       select PCIE_DW
+       select PCIE_DW_HOST
 
 config PCI_IMX6
        bool "Freescale i.MX6 PCIe controller"
        depends on SOC_IMX6Q
        depends on PCI_MSI_IRQ_DOMAIN
        select PCIEPORTBUS
-       select PCIE_DW
+       select PCIE_DW_HOST
 
 config PCIE_SPEAR13XX
        bool "STMicroelectronics SPEAr PCIe controller"
        depends on ARCH_SPEAR13XX
        depends on PCI_MSI_IRQ_DOMAIN
        select PCIEPORTBUS
-       select PCIE_DW
+       select PCIE_DW_HOST
        help
          Say Y here if you want PCIe support on SPEAr13XX SoCs.
 
@@ -55,7 +59,7 @@ config PCI_KEYSTONE
        depends on ARCH_KEYSTONE
        depends on PCI_MSI_IRQ_DOMAIN
        select PCIEPORTBUS
-       select PCIE_DW
+       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
@@ -67,7 +71,7 @@ config PCI_LAYERSCAPE
        depends on OF && (ARM || ARCH_LAYERSCAPE)
        depends on PCI_MSI_IRQ_DOMAIN
        select MFD_SYSCON
-       select PCIE_DW
+       select PCIE_DW_HOST
        help
          Say Y here if you want PCIe controller support on Layerscape SoCs.
 
@@ -76,7 +80,7 @@ config PCI_HISI
        bool "HiSilicon Hip05 and Hip06 SoCs PCIe controllers"
        depends on PCI_MSI_IRQ_DOMAIN
        select PCIEPORTBUS
-       select PCIE_DW
+       select PCIE_DW_HOST
        help
          Say Y here if you want PCIe controller support on HiSilicon
          Hip05 and Hip06 SoCs
@@ -86,7 +90,7 @@ config PCIE_QCOM
        depends on ARCH_QCOM && OF
        depends on PCI_MSI_IRQ_DOMAIN
        select PCIEPORTBUS
-       select PCIE_DW
+       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
@@ -97,7 +101,7 @@ config PCIE_ARMADA_8K
        depends on ARCH_MVEBU
        depends on PCI_MSI_IRQ_DOMAIN
        select PCIEPORTBUS
-       select PCIE_DW
+       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
@@ -109,7 +113,7 @@ config PCIE_ARTPEC6
        depends on MACH_ARTPEC6
        depends on PCI_MSI_IRQ_DOMAIN
        select PCIEPORTBUS
-       select PCIE_DW
+       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.

diff --git a/drivers/pci/dwc/Makefile b/drivers/pci/dwc/Makefile
index 3b57e55d97b3a9326cec18e27ce77e51e7333010..a2df13c287989fa4d4b71a2283798ee7e052ba18 100644 (file)
--- a/drivers/pci/dwc/Makefile
+++ b/drivers/pci/dwc/Makefile
@@ -1,4 +1,5 @@
-obj-$(CONFIG_PCIE_DW) += pcie-designware.o pcie-designware-host.o
+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

diff --git a/drivers/pci/dwc/pcie-designware.h b/drivers/pci/dwc/pcie-designware.h
index 30547708f18e6cc9bb29e05411728d8a9b2cad89..cd3b8713fe5044a7d3e4366f201972759ce3fcab 100644 (file)
--- a/drivers/pci/dwc/pcie-designware.h
+++ b/drivers/pci/dwc/pcie-designware.h
@@ -161,10 +161,6 @@ struct dw_pcie {
 
 int dw_pcie_read(void __iomem *addr, int size, u32 *val);
 int dw_pcie_write(void __iomem *addr, int size, u32 val);
-irqreturn_t dw_handle_msi_irq(struct pcie_port *pp);
-void dw_pcie_msi_init(struct pcie_port *pp);
-void dw_pcie_setup_rc(struct pcie_port *pp);
-int dw_pcie_host_init(struct pcie_port *pp);
 
 u32 dw_pcie_readl_dbi(struct dw_pcie *pci, u32 reg);
 void dw_pcie_writel_dbi(struct dw_pcie *pci, u32 reg, u32 val);
@@ -174,4 +170,29 @@ void dw_pcie_prog_outbound_atu(struct dw_pcie *pci, int index,
                               int type, u64 cpu_addr, u64 pci_addr,
                               u32 size);
 void dw_pcie_setup(struct dw_pcie *pci);
+
+#ifdef CONFIG_PCIE_DW_HOST
+irqreturn_t dw_handle_msi_irq(struct pcie_port *pp);
+void dw_pcie_msi_init(struct pcie_port *pp);
+void dw_pcie_setup_rc(struct pcie_port *pp);
+int dw_pcie_host_init(struct pcie_port *pp);
+#else
+static inline irqreturn_t dw_handle_msi_irq(struct pcie_port *pp)
+{
+       return IRQ_NONE;
+}
+
+static inline void dw_pcie_msi_init(struct pcie_port *pp)
+{
+}
+
+static inline void dw_pcie_setup_rc(struct pcie_port *pp)
+{
+}
+
+static inline int dw_pcie_host_init(struct pcie_port *pp)
+{
+       return 0;
+}
+#endif
 #endif /* _PCIE_DESIGNWARE_H */