From patchwork series 489847

https://patchwork.ozlabs.org//project/linuxppc-dev/list/?series=489847

Author: Fox Snowpatch

arch/powerpc/include/asm/pci.h

@@ -86,9 +86,9 @@ extern void pci_adjust_legacy_attr(struct pci_bus *bus,
 				   enum pci_mmap_state mmap_type);
 #define HAVE_PCI_LEGACY	1
 
-extern void pcibios_claim_one_bus(struct pci_bus *b);
+extern int pcibios_claim_one_bus(struct pci_bus *b);
 
-extern void pcibios_finish_adding_to_bus(struct pci_bus *bus);
+extern int pcibios_finish_adding_to_bus(struct pci_bus *bus);
 
 extern void pcibios_resource_survey(void);
 

arch/powerpc/kernel/pci-common.c

@@ -1446,10 +1446,11 @@ void __init pcibios_resource_survey(void)
  * rest of the code later, for now, keep it as-is as our main
  * resource allocation function doesn't deal with sub-trees yet.
  */
-void pcibios_claim_one_bus(struct pci_bus *bus)
+int pcibios_claim_one_bus(struct pci_bus *bus)
 {
 	struct pci_dev *dev;
 	struct pci_bus *child_bus;
+	int ret = 0;
 
 	list_for_each_entry(dev, &bus->devices, bus_list) {
 		struct resource *r;
@@ -1462,15 +1463,20 @@ void pcibios_claim_one_bus(struct pci_bus *bus)
 			pr_debug("PCI: Claiming %s: Resource %d: %pR\n",
 				 pci_name(dev), i, r);
 
-			if (pci_claim_resource(dev, i) == 0)
+			ret = pci_claim_resource(dev, i);
+			if (ret == 0)
 				continue;
+			else
+				return ret;
 
 			pci_claim_bridge_resource(dev, i);
 		}
 	}
 
 	list_for_each_entry(child_bus, &bus->children, node)
-		pcibios_claim_one_bus(child_bus);
+		ret = pcibios_claim_one_bus(child_bus);
+
+	return ret;
 }
 EXPORT_SYMBOL_GPL(pcibios_claim_one_bus);
 
@@ -1481,14 +1487,19 @@ EXPORT_SYMBOL_GPL(pcibios_claim_one_bus);
  * added to a bus, this include calling it for a PHB that is just
  * being added
  */
-void pcibios_finish_adding_to_bus(struct pci_bus *bus)
+int pcibios_finish_adding_to_bus(struct pci_bus *bus)
 {
+	int ret = 0;
+
 	pr_debug("PCI: Finishing adding to hotplug bus %04x:%02x\n",
 		 pci_domain_nr(bus), bus->number);
 
 	/* Allocate bus and devices resources */
 	pcibios_allocate_bus_resources(bus);
-	pcibios_claim_one_bus(bus);
+	ret = pcibios_claim_one_bus(bus);
+	if (ret)
+		return ret;
+
 	if (!pci_has_flag(PCI_PROBE_ONLY)) {
 		if (bus->self)
 			pci_assign_unassigned_bridge_resources(bus->self);
@@ -1498,6 +1509,8 @@ void pcibios_finish_adding_to_bus(struct pci_bus *bus)
 
 	/* Add new devices to global lists.  Register in proc, sysfs. */
 	pci_bus_add_devices(bus);
+
+	return ret;
 }
 EXPORT_SYMBOL_GPL(pcibios_finish_adding_to_bus);
 

arch/powerpc/kernel/pci-hotplug.c

@@ -140,6 +140,7 @@ void pci_hp_add_devices(struct pci_bus *bus)
 	struct pci_dev *dev;
 	struct pci_controller *phb;
 	struct device_node *dn = pci_bus_to_OF_node(bus);
+	int ret = 0;
 
 	if (!dn)
 		return;
@@ -176,6 +177,8 @@ void pci_hp_add_devices(struct pci_bus *bus)
 		for_each_pci_bridge(dev, bus)
 			max = pci_scan_bridge(bus, dev, max, 1);
 	}
-	pcibios_finish_adding_to_bus(bus);
+	ret = pcibios_finish_adding_to_bus(bus);
+	if (ret)
+		pr_err("%s: unable to add hotplug pci device!\n");
 }
 EXPORT_SYMBOL_GPL(pci_hp_add_devices);

arch/powerpc/platforms/pseries/pci_dlpar.c

@@ -58,7 +58,8 @@ struct pci_controller *init_phb_dynamic(struct device_node *dn)
 		pseries_eeh_init_edev_recursive(PCI_DN(dn));
 
 	pcibios_scan_phb(phb);
-	pcibios_finish_adding_to_bus(phb->bus);
+	if (pcibios_finish_adding_to_bus(phb->bus))
+		return NULL;
 
 	return phb;
 }

drivers/pci/hotplug/rpadlpar_core.c

@@ -240,8 +240,10 @@ static int dlpar_add_phb(char *drc_name, struct device_node *dn)
 	}
 
 	phb = init_phb_dynamic(dn);
-	if (!phb)
+	if (!phb) {
+		pr_err("%s: unable to add hotplug slot %s\n", drc_name);
 		return -EIO;
+	}
 
 	if (rpaphp_add_slot(dn)) {
 		printk(KERN_ERR "%s: unable to add hotplug slot %s\n",
@@ -311,6 +313,9 @@ int dlpar_add_slot(char *drc_name)
 	}
 	of_node_put(dn);
 
+	if (rc)
+		goto exit;
+
 	printk(KERN_INFO "%s: slot %s added\n", DLPAR_MODULE_NAME, drc_name);
 exit:
 	mutex_unlock(&rpadlpar_mutex);