9 files changed, 57 insertions, 40 deletions

diff --git a/drivers/pci/host/pci-keystone.c b/drivers/pci/host/pci-keystone.c
index 78f79e31ac5c..75333b0c4f0a 100644
--- a/drivers/pci/host/pci-keystone.c
+++ b/drivers/pci/host/pci-keystone.c
@@ -119,7 +119,7 @@ static void ks_pcie_msi_irq_handler(unsigned int irq, struct irq_desc *desc)
         struct pcie_port *pp = &ks_pcie->pp;
         struct irq_chip *chip = irq_desc_get_chip(desc);
 
-        dev_dbg(pp->dev, "ks_pci_msi_irq_handler, irq %d\n", irq);
+        dev_dbg(pp->dev, "%s, irq %d\n", __func__, irq);
 
         /*
          * The chained irq handler installation would have replaced normal
@@ -197,7 +197,7 @@ static int ks_pcie_get_irq_controller_info(struct keystone_pcie *ks_pcie,
          */
         for (temp = 0; temp < max_host_irqs; temp++) {
                 host_irqs[temp] = irq_of_parse_and_map(*np_temp, temp);
-                if (host_irqs[temp] < 0)
+                if (!host_irqs[temp])
                         break;
         }
         if (temp) {
diff --git a/drivers/pci/host/pci-layerscape.c b/drivers/pci/host/pci-layerscape.c
index 6697b1a4d4fa..68c9e5e9b0a8 100644
--- a/drivers/pci/host/pci-layerscape.c
+++ b/drivers/pci/host/pci-layerscape.c
@@ -167,7 +167,6 @@ MODULE_DEVICE_TABLE(of, ls_pcie_of_match);
 static struct platform_driver ls_pcie_driver = {
         .driver = {
                 .name = "layerscape-pcie",
-                .owner = THIS_MODULE,
                 .of_match_table = ls_pcie_of_match,
         },
 };
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/pci-tegra.c b/drivers/pci/host/pci-tegra.c
index a800ae916394..6f9c29fa70e7 100644
--- a/drivers/pci/host/pci-tegra.c
+++ b/drivers/pci/host/pci-tegra.c
@@ -625,19 +625,6 @@ static void tegra_pcie_port_free(struct tegra_pcie_port *port)
         devm_kfree(pcie->dev, port);
 }
 
-static void tegra_pcie_fixup_bridge(struct pci_dev *dev)
-{
-        u16 reg;
-
-        if ((dev->class >> 16) == PCI_BASE_CLASS_BRIDGE) {
-                pci_read_config_word(dev, PCI_COMMAND, &reg);
-                reg |= (PCI_COMMAND_IO | PCI_COMMAND_MEMORY |
-                        PCI_COMMAND_MASTER | PCI_COMMAND_SERR);
-                pci_write_config_word(dev, PCI_COMMAND, reg);
-        }
-}
-DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, tegra_pcie_fixup_bridge);
-
 /* Tegra PCIE root complex wrongly reports device class */
 static void tegra_pcie_fixup_class(struct pci_dev *dev)
 {
diff --git a/drivers/pci/host/pci-xgene.c b/drivers/pci/host/pci-xgene.c
index b1d0596457c5..fdb348d3ccd3 100644
--- a/drivers/pci/host/pci-xgene.c
+++ b/drivers/pci/host/pci-xgene.c
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  */
-#include <linux/clk-private.h>
+#include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/jiffies.h>
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..c57bd0ac39a0 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)
@@ -757,7 +754,7 @@ static int rcar_pcie_get_resources(struct platform_device *pdev,
                 goto err_map_reg;
 
         i = irq_of_parse_and_map(pdev->dev.of_node, 0);
-        if (i < 0) {
+        if (!i) {
                 dev_err(pcie->dev, "cannot get platform resources for msi interrupt\n");
                 err = -ENOENT;
                 goto err_map_reg;
@@ -765,7 +762,7 @@ static int rcar_pcie_get_resources(struct platform_device *pdev,
         pcie->msi.irq1 = i;
 
         i = irq_of_parse_and_map(pdev->dev.of_node, 1);
-        if (i < 0) {
+        if (!i) {
                 dev_err(pcie->dev, "cannot get platform resources for msi interrupt\n");
                 err = -ENOENT;
                 goto err_map_reg;
diff --git a/drivers/pci/hotplug/cpci_hotplug_core.c b/drivers/pci/hotplug/cpci_hotplug_core.c
index a5a7fd8332ac..46db29395a62 100644
--- a/drivers/pci/hotplug/cpci_hotplug_core.c
+++ b/drivers/pci/hotplug/cpci_hotplug_core.c
@@ -214,8 +214,7 @@ static void release_slot(struct hotplug_slot *hotplug_slot)
 
         kfree(slot->hotplug_slot->info);
         kfree(slot->hotplug_slot);
-        if (slot->dev)
-                pci_dev_put(slot->dev);
+        pci_dev_put(slot->dev);
         kfree(slot);
 }
 
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
 
 /**