Commit 2d0953f7 authored by Oliver O'Halloran's avatar Oliver O'Halloran Committed by Michael Ellerman
Browse files

powerpc/eeh: Remove eeh_add_device_tree_late() 



On pseries and PowerNV pcibios_bus_add_device() calls eeh_add_device_late()
so there's no need to do a separate tree traversal to bind the eeh_dev and
pci_dev together setting up the PHB at boot. As a result we can remove
eeh_add_device_tree_late().

Reviewed-by: default avatarSam Bobroff <sbobroff@linux.ibm.com>
Signed-off-by: default avatarOliver O'Halloran <oohall@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200306073904.4737-2-oohall@gmail.com
parent 8645aaa8

arch/powerpc/include/asm/eeh.h

+0 −3
Original line number Diff line number Diff line
@@ -304,7 +304,6 @@ void eeh_addr_cache_init(void); 
void eeh_add_device_early(struct pci_dn *);

void eeh_add_device_tree_early(struct pci_dn *);

void eeh_add_device_late(struct pci_dev *);

void eeh_add_device_tree_late(struct pci_bus *);

void eeh_remove_device(struct pci_dev *);

int eeh_unfreeze_pe(struct eeh_pe *pe);

int eeh_pe_reset_and_recover(struct eeh_pe *pe);
@@ -365,8 +364,6 @@ static inline void eeh_add_device_tree_early(struct pci_dn *pdn) { } 


static inline void eeh_add_device_late(struct pci_dev *dev) { }



static inline void eeh_add_device_tree_late(struct pci_bus *bus) { }



static inline void eeh_remove_device(struct pci_dev *dev) { }



#define EEH_POSSIBLE_ERROR(val, type) (0)

arch/powerpc/kernel/eeh.c

+0 −25
Original line number Diff line number Diff line
@@ -1213,31 +1213,6 @@ void eeh_add_device_late(struct pci_dev *dev) 
	eeh_sysfs_add_device(dev);

}



/**

 * eeh_add_device_tree_late - Perform EEH initialization for the indicated PCI bus

 * @bus: PCI bus

 *

 * This routine must be used to perform EEH initialization for PCI

 * devices which are attached to the indicated PCI bus. The PCI bus

 * is added after system boot through hotplug or dlpar.

 */

void eeh_add_device_tree_late(struct pci_bus *bus)

{

	struct pci_dev *dev;



	if (eeh_has_flag(EEH_FORCE_DISABLED))

		return;

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

		eeh_add_device_late(dev);

		if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) {

			struct pci_bus *subbus = dev->subordinate;

			if (subbus)

				eeh_add_device_tree_late(subbus);

		}

	}

}

EXPORT_SYMBOL_GPL(eeh_add_device_tree_late);



/**

 * eeh_remove_device - Undo EEH setup for the indicated pci device

 * @dev: pci device to be removed

arch/powerpc/kernel/of_platform.c

+0 −3
Original line number Diff line number Diff line
@@ -80,9 +80,6 @@ static int of_pci_phb_probe(struct platform_device *dev) 
	 */

	pcibios_claim_one_bus(phb->bus);



	/* Finish EEH setup */

	eeh_add_device_tree_late(phb->bus);



	/* Add probed PCI devices to the device model */

	pci_bus_add_devices(phb->bus);

arch/powerpc/kernel/pci-common.c

+0 −3
Original line number Diff line number Diff line
@@ -1399,9 +1399,6 @@ void pcibios_finish_adding_to_bus(struct pci_bus *bus) 
			pci_assign_unassigned_bus_resources(bus);

	}



	/* Fixup EEH */

	eeh_add_device_tree_late(bus);



	/* Add new devices to global lists.  Register in proc, sysfs. */

	pci_bus_add_devices(bus);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE