Merge tag 'pci-v4.16-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[sfrench/cifs-2.6.git] / arch / powerpc / kernel / pci-common.c

diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 590f4d0a6cb168945c4b1da53e507283ef82afdf..446c79611d56cf0ff32f5a622348300970a59963 100644 (file)
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -249,8 +249,31 @@ resource_size_t pcibios_iov_resource_alignment(struct pci_dev *pdev, int resno)
 
        return pci_iov_resource_size(pdev, resno);
 }
+
+int pcibios_sriov_enable(struct pci_dev *pdev, u16 num_vfs)
+{
+       if (ppc_md.pcibios_sriov_enable)
+               return ppc_md.pcibios_sriov_enable(pdev, num_vfs);
+
+       return 0;
+}
+
+int pcibios_sriov_disable(struct pci_dev *pdev)
+{
+       if (ppc_md.pcibios_sriov_disable)
+               return ppc_md.pcibios_sriov_disable(pdev);
+
+       return 0;
+}
+
 #endif /* CONFIG_PCI_IOV */
 
+void pcibios_bus_add_device(struct pci_dev *pdev)
+{
+       if (ppc_md.pcibios_bus_add_device)
+               ppc_md.pcibios_bus_add_device(pdev);
+}
+
 static resource_size_t pcibios_io_size(const struct pci_controller *hose)
 {
 #ifdef CONFIG_PPC64
@@ -339,8 +362,7 @@ struct pci_controller* pci_find_hose_for_OF_device(struct device_node* node)
  */
 static int pci_read_irq_line(struct pci_dev *pci_dev)
 {
-       struct of_phandle_args oirq;
-       unsigned int virq;
+       int virq;
 
        pr_debug("PCI: Try to map irq for %s...\n", pci_name(pci_dev));
 
@@ -348,7 +370,8 @@ static int pci_read_irq_line(struct pci_dev *pci_dev)
        memset(&oirq, 0xff, sizeof(oirq));
 #endif
        /* Try to get a mapping from the device-tree */
-       if (of_irq_parse_pci(pci_dev, &oirq)) {
+       virq = of_irq_parse_and_map_pci(pci_dev, 0, 0);
+       if (virq <= 0) {
                u8 line, pin;
 
                /* If that fails, lets fallback to what is in the config
@@ -372,11 +395,6 @@ static int pci_read_irq_line(struct pci_dev *pci_dev)
                virq = irq_create_mapping(NULL, line);
                if (virq)
                        irq_set_irq_type(virq, IRQ_TYPE_LEVEL_LOW);
-       } else {
-               pr_debug(" Got one, spec %d cells (0x%08x 0x%08x...) on %pOF\n",
-                        oirq.args_count, oirq.args[0], oirq.args[1], oirq.np);
-
-               virq = irq_create_of_mapping(&oirq);
        }
 
        if (!virq) {
@@ -1276,8 +1294,8 @@ static void pcibios_allocate_bus_resources(struct pci_bus *bus)
                                                i + PCI_BRIDGE_RESOURCES) == 0)
                                continue;
                }
-               pr_warning("PCI: Cannot allocate resource region "
-                          "%d of PCI bridge %d, will remap\n", i, bus->number);
+               pr_warn("PCI: Cannot allocate resource region %d of PCI bridge %d, will remap\n",
+                       i, bus->number);
        clear_resource:
                /* The resource might be figured out when doing
                 * reassignment based on the resources required