10 files changed, 71 insertions, 80 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 97d07ed60a0b..dcb2e0c55be4 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1279,6 +1279,9 @@ config PCI_DOMAINS
         bool
         depends on PCI
 
+config PCI_DOMAINS_GENERIC
+        def_bool PCI_DOMAINS
+
 config PCI_NANOENGINE
         bool "BSE nanoEngine PCI support"
         depends on SA1100_NANOENGINE
diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h
index 8292b5f81e23..28b9bb35949e 100644
--- a/arch/arm/include/asm/mach/pci.h
+++ b/arch/arm/include/asm/mach/pci.h
@@ -19,9 +19,6 @@ struct pci_bus;
 struct device;
 
 struct hw_pci {
-#ifdef CONFIG_PCI_DOMAINS
-        int             domain;
-#endif
 #ifdef CONFIG_PCI_MSI
         struct msi_controller *msi_ctrl;
 #endif
@@ -45,9 +42,6 @@ struct hw_pci {
  * Per-controller structure
  */
 struct pci_sys_data {
-#ifdef CONFIG_PCI_DOMAINS
-        int             domain;
-#endif
 #ifdef CONFIG_PCI_MSI
         struct msi_controller *msi_ctrl;
 #endif
diff --git a/arch/arm/include/asm/pci.h b/arch/arm/include/asm/pci.h
index 7e95d8535e24..585dc33a7a24 100644
--- a/arch/arm/include/asm/pci.h
+++ b/arch/arm/include/asm/pci.h
@@ -18,13 +18,6 @@ static inline int pcibios_assign_all_busses(void)
 }
 
 #ifdef CONFIG_PCI_DOMAINS
-static inline int pci_domain_nr(struct pci_bus *bus)
-{
-        struct pci_sys_data *root = bus->sysdata;
-
-        return root->domain;
-}
-
 static inline int pci_proc_domain(struct pci_bus *bus)
 {
         return pci_domain_nr(bus);
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c
index a4effd6d8f2f..ddd75c58b1e8 100644
--- a/arch/arm/kernel/bios32.c
+++ b/arch/arm/kernel/bios32.c
@@ -463,9 +463,6 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw,
                 if (!sys)
                         panic("PCI: unable to allocate sys data!");
 
-#ifdef CONFIG_PCI_DOMAINS
-                sys->domain  = hw->domain;
-#endif
 #ifdef CONFIG_PCI_MSI
                 sys->msi_ctrl = hw->msi_ctrl;
 #endif
diff --git a/arch/arm/mach-cns3xxx/pcie.c b/arch/arm/mach-cns3xxx/pcie.c
index 45d6bd09e6ef..f6bf9f623d70 100644
--- a/arch/arm/mach-cns3xxx/pcie.c
+++ b/arch/arm/mach-cns3xxx/pcie.c
@@ -30,18 +30,15 @@ struct cns3xxx_pcie {
         unsigned int irqs[2];
         struct resource res_io;
         struct resource res_mem;
-        struct hw_pci hw_pci;
-
+        int port;
         bool linked;
 };
 
-static struct cns3xxx_pcie cns3xxx_pcie[]; /* forward decl. */
-
 static struct cns3xxx_pcie *sysdata_to_cnspci(void *sysdata)
 {
         struct pci_sys_data *root = sysdata;
 
-        return &cns3xxx_pcie[root->domain];
+        return root->private_data;
 }
 
 static struct cns3xxx_pcie *pdev_to_cnspci(const struct pci_dev *dev)
@@ -192,13 +189,7 @@ static struct cns3xxx_pcie cns3xxx_pcie[] = {
                         .flags = IORESOURCE_MEM,
                 },
                 .irqs = { IRQ_CNS3XXX_PCIE0_RC, IRQ_CNS3XXX_PCIE0_DEVICE, },
-                .hw_pci = {
-                        .domain = 0,
-                        .nr_controllers = 1,
-                        .ops = &cns3xxx_pcie_ops,
-                        .setup = cns3xxx_pci_setup,
-                        .map_irq = cns3xxx_pcie_map_irq,
-                },
+                .port = 0,
         },
         [1] = {
                 .host_regs = (void __iomem *)CNS3XXX_PCIE1_HOST_BASE_VIRT,
@@ -217,19 +208,13 @@ static struct cns3xxx_pcie cns3xxx_pcie[] = {
                         .flags = IORESOURCE_MEM,
                 },
                 .irqs = { IRQ_CNS3XXX_PCIE1_RC, IRQ_CNS3XXX_PCIE1_DEVICE, },
-                .hw_pci = {
-                        .domain = 1,
-                        .nr_controllers = 1,
-                        .ops = &cns3xxx_pcie_ops,
-                        .setup = cns3xxx_pci_setup,
-                        .map_irq = cns3xxx_pcie_map_irq,
-                },
+                .port = 1,
         },
 };
 
 static void __init cns3xxx_pcie_check_link(struct cns3xxx_pcie *cnspci)
 {
-        int port = cnspci->hw_pci.domain;
+        int port = cnspci->port;
         u32 reg;
         unsigned long time;
 
@@ -260,9 +245,9 @@ static void __init cns3xxx_pcie_check_link(struct cns3xxx_pcie *cnspci)
 
 static void __init cns3xxx_pcie_hw_init(struct cns3xxx_pcie *cnspci)
 {
-        int port = cnspci->hw_pci.domain;
+        int port = cnspci->port;
         struct pci_sys_data sd = {
-                .domain = port,
+                .private_data = cnspci,
         };
         struct pci_bus bus = {
                 .number = 0,
@@ -323,6 +308,14 @@ static int cns3xxx_pcie_abort_handler(unsigned long addr, unsigned int fsr,
 void __init cns3xxx_pcie_init_late(void)
 {
         int i;
+        void *private_data;
+        struct hw_pci hw_pci = {
+               .nr_controllers = 1,
+               .ops = &cns3xxx_pcie_ops,
+               .setup = cns3xxx_pci_setup,
+               .map_irq = cns3xxx_pcie_map_irq,
+               .private_data = &private_data,
+        };
 
         pcibios_min_io = 0;
         pcibios_min_mem = 0;
@@ -335,7 +328,8 @@ void __init cns3xxx_pcie_init_late(void)
                 cns3xxx_pwr_soft_rst(0x1 << PM_SOFT_RST_REG_OFFST_PCIE(i));
                 cns3xxx_pcie_check_link(&cns3xxx_pcie[i]);
                 cns3xxx_pcie_hw_init(&cns3xxx_pcie[i]);
-                pci_common_init(&cns3xxx_pcie[i].hw_pci);
+                private_data = &cns3xxx_pcie[i];
+                pci_common_init(&hw_pci);
         }
 
         pci_assign_unassigned_resources();
diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c
index ce5836c14ec1..6f93c24ca801 100644
--- a/arch/arm64/kernel/pci.c
+++ b/arch/arm64/kernel/pci.c
@@ -46,25 +46,3 @@ int pcibios_add_device(struct pci_dev *dev)
 
         return 0;
 }
-
-
-#ifdef CONFIG_PCI_DOMAINS_GENERIC
-static bool dt_domain_found = false;
-
-void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent)
-{
-        int domain = of_get_pci_domain_nr(parent->of_node);
-
-        if (domain >= 0) {
-                dt_domain_found = true;
-        } else if (dt_domain_found == true) {
-                dev_err(parent, "Node %s is missing \"linux,pci-domain\" property in DT\n",
-                        parent->of_node->full_name);
-                return;
-        } else {
-                domain = pci_get_new_domain_nr();
-        }
-
-        bus->domain_nr = domain;
-}
-#endif
diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
index 1dd759596b0a..1309cfbaa719 100644
--- a/drivers/pci/host/pci-mvebu.c
+++ b/drivers/pci/host/pci-mvebu.c
@@ -101,9 +101,7 @@ struct mvebu_pcie {
         struct mvebu_pcie_port *ports;
         struct msi_controller *msi;
         struct resource io;
-        char io_name[30];
         struct resource realio;
-        char mem_name[30];
         struct resource mem;
         struct resource busn;
         int nports;
@@ -723,18 +721,9 @@ static int mvebu_pcie_setup(int nr, struct pci_sys_data *sys)
 {
         struct mvebu_pcie *pcie = sys_to_pcie(sys);
         int i;
-        int domain = 0;
 
-#ifdef CONFIG_PCI_DOMAINS
-        domain = sys->domain;
-#endif
-
-        snprintf(pcie->mem_name, sizeof(pcie->mem_name), "PCI MEM %04x",
-                 domain);
-        pcie->mem.name = pcie->mem_name;
-
-        snprintf(pcie->io_name, sizeof(pcie->io_name), "PCI I/O %04x", domain);
-        pcie->realio.name = pcie->io_name;
+        pcie->mem.name = "PCI MEM";
+        pcie->realio.name = "PCI I/O";
 
         if (request_resource(&iomem_resource, &pcie->mem))
                 return 0;
diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c
index df781cdf13c1..eef311115899 100644
--- a/drivers/pci/host/pcie-designware.c
+++ b/drivers/pci/host/pcie-designware.c
@@ -508,9 +508,6 @@ int __init dw_pcie_host_init(struct pcie_port *pp)
         dw_pci.private_data = (void **)&pp;
 
         pci_common_init_dev(pp->dev, &dw_pci);
-#ifdef CONFIG_PCI_DOMAINS
-        dw_pci.domain++;
-#endif
 
         return 0;
 }
diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
index 748786c402fc..ba28078b70e3 100644
--- a/drivers/pci/host/pcie-rcar.c
+++ b/drivers/pci/host/pcie-rcar.c
@@ -397,9 +397,6 @@ static void rcar_pcie_enable(struct rcar_pcie *pcie)
 #endif
 
         pci_common_init_dev(&pdev->dev, &rcar_pci);
-#ifdef CONFIG_PCI_DOMAINS
-        rcar_pci.domain++;
-#endif
 }
 
 static int phy_wait_for_ack(struct rcar_pcie *pcie)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index cab05f31223f..c419554d0b4b 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -10,6 +10,8 @@
 #include <linux/kernel.h>
 #include <linux/delay.h>
 #include <linux/init.h>
+#include <linux/of.h>
+#include <linux/of_pci.h>
 #include <linux/pci.h>
 #include <linux/pm.h>
 #include <linux/slab.h>
@@ -4439,6 +4441,53 @@ int pci_get_new_domain_nr(void)
 {
         return atomic_inc_return(&__domain_nr);
 }
+
+#ifdef CONFIG_PCI_DOMAINS_GENERIC
+void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent)
+{
+        static int use_dt_domains = -1;
+        int domain = of_get_pci_domain_nr(parent->of_node);
+
+        /*
+         * Check DT domain and use_dt_domains values.
+         *
+         * If DT domain property is valid (domain >= 0) and
+         * use_dt_domains != 0, the DT assignment is valid since this means
+         * we have not previously allocated a domain number by using
+         * pci_get_new_domain_nr(); we should also update use_dt_domains to
+         * 1, to indicate that we have just assigned a domain number from
+         * DT.
+         *
+         * If DT domain property value is not valid (ie domain < 0), and we
+         * have not previously assigned a domain number from DT
+         * (use_dt_domains != 1) we should assign a domain number by
+         * using the:
+         *
+         * pci_get_new_domain_nr()
+         *
+         * API and update the use_dt_domains value to keep track of method we
+         * are using to assign domain numbers (use_dt_domains = 0).
+         *
+         * All other combinations imply we have a platform that is trying
+         * to mix domain numbers obtained from DT and pci_get_new_domain_nr(),
+         * which is a recipe for domain mishandling and it is prevented by
+         * invalidating the domain value (domain = -1) and printing a
+         * corresponding error.
+         */
+        if (domain >= 0 && use_dt_domains) {
+                use_dt_domains = 1;
+        } else if (domain < 0 && use_dt_domains != 1) {
+                use_dt_domains = 0;
+                domain = pci_get_new_domain_nr();
+        } else {
+                dev_err(parent, "Node %s has inconsistent \"linux,pci-domain\" property in DT\n",
+                        parent->of_node->full_name);
+                domain = -1;
+        }
+
+        bus->domain_nr = domain;
+}
+#endif
 #endif
 
 /**