Commit 8645aaa8 authored by Oliver O'Halloran's avatar Oliver O'Halloran Committed by Michael Ellerman
Browse files

powerpc/eeh: Add sysfs files in late probe 



Move creating the EEH specific sysfs files into eeh_add_device_late()
rather than being open-coded all over the place. Calling the function is
generally done immediately after calling eeh_add_device_late() anyway. This
is also a correctness fix since currently the sysfs files will be added
even if the EEH probe happens to fail.

Similarly, on pseries we currently add the sysfs files before calling
eeh_add_device_late(). This is flat-out broken since the sysfs files
require the pci_dev->dev.archdata.edev pointer to be set, and that is done
in eeh_add_device_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-1-oohall@gmail.com
parent 7053f80d

arch/powerpc/include/asm/eeh.h

+0 −3
Original line number Diff line number Diff line
@@ -305,7 +305,6 @@ 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_add_sysfs_files(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);
@@ -368,8 +367,6 @@ 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_add_sysfs_files(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

+1 −23
Original line number Diff line number Diff line
@@ -1210,6 +1210,7 @@ void eeh_add_device_late(struct pci_dev *dev) 
	dev->dev.archdata.edev = edev;



	eeh_addr_cache_insert_dev(dev);

	eeh_sysfs_add_device(dev);

}



/**
@@ -1237,29 +1238,6 @@ void eeh_add_device_tree_late(struct pci_bus *bus) 
}

EXPORT_SYMBOL_GPL(eeh_add_device_tree_late);



/**

 * eeh_add_sysfs_files - Add EEH sysfs files for the indicated PCI bus

 * @bus: PCI bus

 *

 * This routine must be used to add EEH sysfs files 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_sysfs_files(struct pci_bus *bus)

{

	struct pci_dev *dev;



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

		eeh_sysfs_add_device(dev);

		if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) {

			struct pci_bus *subbus = dev->subordinate;

			if (subbus)

				eeh_add_sysfs_files(subbus);

		}

	}

}

EXPORT_SYMBOL_GPL(eeh_add_sysfs_files);



/**

 * 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
@@ -86,9 +86,6 @@ static int of_pci_phb_probe(struct platform_device *dev) 
	/* Add probed PCI devices to the device model */

	pci_bus_add_devices(phb->bus);



	/* sysfs files should only be added after devices are added */

	eeh_add_sysfs_files(phb->bus);



	return 0;

}

arch/powerpc/kernel/pci-common.c

+0 −3
Original line number Diff line number Diff line
@@ -1404,9 +1404,6 @@ 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);



	/* sysfs files should only be added after devices are added */

	eeh_add_sysfs_files(bus);

}

EXPORT_SYMBOL_GPL(pcibios_finish_adding_to_bus);

arch/powerpc/platforms/powernv/eeh-powernv.c

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ void pnv_pcibios_bus_add_device(struct pci_dev *pdev) 
	dev_dbg(&pdev->dev, "EEH: Setting up device\n");

	eeh_add_device_early(pdn);

	eeh_add_device_late(pdev);

	eeh_sysfs_add_device(pdev);

}



static int pnv_eeh_init(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE