Message ID | 20200203083521.16549-3-oohall@gmail.com (mailing list archive) |
---|---|
State | Changes Requested |
Headers | show |
Series | [1/6] powerpc/eeh: Add sysfs files in late probe | expand |
Context | Check | Description |
---|---|---|
snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (7e7c42aa339cb92ad758bd0b5e7a299fecf9f9ce) |
snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 64 lines checked |
snowpatch_ozlabs/needsstable | success | Patch has no Fixes tags |
On Mon, Feb 03, 2020 at 07:35:17PM +1100, Oliver O'Halloran wrote: > 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(). > > Signed-off-by: Oliver O'Halloran <oohall@gmail.com> ... with pcibios_bus_add_device() being called from pci_bus_add_devices(), in this case. Looks good. Reviewed-by: Sam Bobroff <sbobroff@linux.ibm.com> > --- > arch/powerpc/include/asm/eeh.h | 3 --- > arch/powerpc/kernel/eeh.c | 25 ------------------------- > arch/powerpc/kernel/of_platform.c | 3 --- > arch/powerpc/kernel/pci-common.c | 3 --- > 4 files changed, 34 deletions(-) > > diff --git a/arch/powerpc/include/asm/eeh.h b/arch/powerpc/include/asm/eeh.h > index 5a34907..5d10781 100644 > --- a/arch/powerpc/include/asm/eeh.h > +++ b/arch/powerpc/include/asm/eeh.h > @@ -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) > diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c > index 0878912..9cb3370 100644 > --- a/arch/powerpc/kernel/eeh.c > +++ b/arch/powerpc/kernel/eeh.c > @@ -1214,31 +1214,6 @@ void eeh_add_device_late(struct pci_dev *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 > * > diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c > index cb68800..64edac81 100644 > --- a/arch/powerpc/kernel/of_platform.c > +++ b/arch/powerpc/kernel/of_platform.c > @@ -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); > > diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c > index 3d2b1cf..8983afa 100644 > --- a/arch/powerpc/kernel/pci-common.c > +++ b/arch/powerpc/kernel/pci-common.c > @@ -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); > } > -- > 2.9.5 >
diff --git a/arch/powerpc/include/asm/eeh.h b/arch/powerpc/include/asm/eeh.h index 5a34907..5d10781 100644 --- a/arch/powerpc/include/asm/eeh.h +++ b/arch/powerpc/include/asm/eeh.h @@ -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) diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c index 0878912..9cb3370 100644 --- a/arch/powerpc/kernel/eeh.c +++ b/arch/powerpc/kernel/eeh.c @@ -1214,31 +1214,6 @@ void eeh_add_device_late(struct pci_dev *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 * diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c index cb68800..64edac81 100644 --- a/arch/powerpc/kernel/of_platform.c +++ b/arch/powerpc/kernel/of_platform.c @@ -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); diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index 3d2b1cf..8983afa 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -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); }
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(). Signed-off-by: Oliver O'Halloran <oohall@gmail.com> --- arch/powerpc/include/asm/eeh.h | 3 --- arch/powerpc/kernel/eeh.c | 25 ------------------------- arch/powerpc/kernel/of_platform.c | 3 --- arch/powerpc/kernel/pci-common.c | 3 --- 4 files changed, 34 deletions(-)