Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0945cd5f authored by John Rose's avatar John Rose Committed by Greg Kroah-Hartman
Browse files

[PATCH] PCI Hotplug: rpaphp: Remove rpaphp_find_pci 



The rpaphp module currently uses a fragile method to find a pci device
by its device node.  This function is unnecessary, so this patch scraps
it.

Signed-off-by: default avatarJohn Rose <johnrose@austin.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9c209c91

drivers/pci/hotplug/rpadlpar_core.c

+23 −12
Original line number Diff line number Diff line
@@ -165,6 +165,20 @@ static int pci_add_secondary_bus(struct device_node *dn, 
	return 0;

}



static struct pci_dev *dlpar_find_new_dev(struct pci_bus *parent,

					struct device_node *dev_dn)

{

	struct pci_dev *tmp = NULL;

	struct device_node *child_dn;



	list_for_each_entry(tmp, &parent->devices, bus_list) {

		child_dn = pci_device_to_OF_node(tmp);

		if (child_dn == dev_dn)

			return tmp;

	}

	return NULL;

}



static struct pci_dev *dlpar_pci_add_bus(struct device_node *dn)

{

	struct pci_controller *hose = dn->phb;
@@ -180,12 +194,8 @@ static struct pci_dev *dlpar_pci_add_bus(struct device_node *dn) 
	pci_bus_add_devices(hose->bus);



	/* Confirm new bridge dev was created */

	dev = rpaphp_find_pci_dev(dn);

	if (!dev) {

		printk(KERN_ERR "%s: failed to add pci device\n", __FUNCTION__);

		return NULL;

	}



	dev = dlpar_find_new_dev(hose->bus, dn);

	if (dev) {

		if (dev->hdr_type != PCI_HEADER_TYPE_BRIDGE) {

			printk(KERN_ERR "%s: unexpected header type %d\n",

				__FUNCTION__, dev->hdr_type);
@@ -194,6 +204,7 @@ static struct pci_dev *dlpar_pci_add_bus(struct device_node *dn) 


		if (pci_add_secondary_bus(dn, dev))

			return NULL;

	}



	return dev;

}

drivers/pci/hotplug/rpaphp.h

+0 −1
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ extern int num_slots; 
/* function prototypes */



/* rpaphp_pci.c */

extern struct pci_dev *rpaphp_find_pci_dev(struct device_node *dn);

extern int rpaphp_claim_resource(struct pci_dev *dev, int resource);

extern int rpaphp_enable_pci_slot(struct slot *slot);

extern int register_pci_slot(struct slot *slot);

drivers/pci/hotplug/rpaphp_pci.c

+24 −48
Original line number Diff line number Diff line
@@ -30,22 +30,7 @@ 


#include "rpaphp.h"



struct pci_dev *rpaphp_find_pci_dev(struct device_node *dn)

{

	struct pci_dev *dev = NULL;

	char bus_id[BUS_ID_SIZE];



	sprintf(bus_id, "%04x:%02x:%02x.%d", dn->phb->global_number,

		dn->busno, PCI_SLOT(dn->devfn), PCI_FUNC(dn->devfn));

	for_each_pci_dev(dev) {

		if (!strcmp(pci_name(dev), bus_id)) {

			break;

		}

	}

	return dev;

}



struct pci_bus *find_bus_among_children(struct pci_bus *bus,

static struct pci_bus *find_bus_among_children(struct pci_bus *bus,

					struct device_node *dn)

{

	struct pci_bus *child = NULL;
@@ -64,15 +49,14 @@ struct pci_bus *find_bus_among_children(struct pci_bus *bus, 
	return child;

}



struct pci_bus *rpaphp_find_pci_bus(struct device_node *dn)

static struct pci_bus *rpaphp_find_pci_bus(struct device_node *dn)

{

	BUG_ON(!dn->phb || !dn->phb->bus);

	if (!dn->phb || !dn->phb->bus)

		return NULL;



	return find_bus_among_children(dn->phb->bus, dn);

}



EXPORT_SYMBOL_GPL(rpaphp_find_pci_dev);



int rpaphp_claim_resource(struct pci_dev *dev, int resource)

{

	struct resource *res = &dev->resource[resource];
@@ -137,9 +121,8 @@ static int rpaphp_get_sensor_state(struct slot *slot, int *state) 
 */

int rpaphp_get_pci_adapter_status(struct slot *slot, int is_init, u8 * value)

{

	struct pci_bus *bus;

	int state, rc;

 	struct device_node *child_dn;

 	struct pci_dev *child_dev = NULL;



	*value = NOT_VALID;

	rc = rpaphp_get_sensor_state(slot, &state);
@@ -156,22 +139,13 @@ int rpaphp_get_pci_adapter_status(struct slot *slot, int is_init, u8 * value) 
			/* config/unconfig adapter */

			*value = slot->state;

		} else {

 			child_dn = slot->dn->child;

 			if (child_dn)

 				child_dev = rpaphp_find_pci_dev(child_dn);



 			if (child_dev)

			bus = rpaphp_find_pci_bus(slot->dn);

			if (bus && !list_empty(&bus->devices))

				*value = CONFIGURED;

 			else if (!child_dn)

				dbg("%s: %s is not valid OFDT node\n",

				    __FUNCTION__, slot->dn->full_name);

			else {

				err("%s: can't find pdev of adapter in slot[%s]\n", 

					__FUNCTION__, slot->dn->full_name);

			else

				*value = NOT_CONFIGURED;

		}

	}

	}

exit:

	return rc;

}
@@ -252,8 +226,9 @@ rpaphp_pci_config_slot(struct device_node *dn, struct pci_bus *bus) 
	int num;



	dbg("Enter %s: dn=%s bus=%s\n", __FUNCTION__, dn->full_name, bus->name);

	if (!dn->child)

		return NULL;



	if (dn->child) {

	slotno = PCI_SLOT(dn->child->devfn);



	/* pci_scan_slot should find all children */
@@ -262,14 +237,15 @@ rpaphp_pci_config_slot(struct device_node *dn, struct pci_bus *bus) 
		rpaphp_fixup_new_pci_devices(bus, 1);

		pci_bus_add_devices(bus);

	}

		dev = rpaphp_find_pci_dev(dn->child);

		if (!dev) {

			err("No new device found\n");

	if (list_empty(&bus->devices)) {

		err("%s: No new device found\n", __FUNCTION__);

		return NULL;

	}

	list_for_each_entry(dev, &bus->devices, bus_list) {

		if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE)

			rpaphp_pci_config_bridge(dev);

	}



	return dev;

}