Skip to contentSkip to conversation

: Fix PCI sysfs file deletion

PATCH New David Miller 1 participant 1 message Nov 7, 2006 PCI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 : Fix PCI sysfs file deletion

The PCI sysfs attributes are created after the initial PCI bus scan. With the addition of more return value checking and assertions in the device and sysfs layers we now can get dumps like this on sparc64:

[   20.135032] Call Trace:
[   20.135042]  [0000000000537f88] pci_remove_bus_device+0x30/0xc0
[   20.135076]  [000000000078f890] pci_fill_in_pbm_cookies+0x98/0x440
[   20.135109]  [000000000042e828] sabre_scan_bus+0x230/0x400
[   20.135139]  [000000000078c710] pcibios_init+0x58/0xa0
[   20.135159]  [0000000000416f14] init+0x9c/0x2e0
[   20.135190]  [0000000000417a50] kernel_thread+0x38/0x60
[   20.135211]  [0000000000417170] rest_init+0x18/0x40
[   20.135514] PCI0(PBMB): Bus running at 33MHz

It's triggering because removal of the "config" PCI sysfs file for the device fails.

On sparc64, after probing the device, we'll delete the PCI device via pci_remove_bus_device() if we cannot find the firmware device tree node corresponding to it.

This is fine, but at this point the sysfs files for the PCI device won't be setup yet.

So we should not try to do anything in pci_remove_sysfs_dev_files() if pci_sysfs_init() has not run yet.

Greg, please apply and push to Linus. Thanks a lot!

[PCI]: Don't try to remove sysfs files before they are setup.

drivers/pci/pci-sysfs.c +3 -0
index a1d2e97..f952bfe 100644
@@ -642,6 +642,9 @@ err:
  */
 void pci_remove_sysfs_dev_files(struct pci_dev *pdev)
 {
+	if (!sysfs_initialized)
+		return;
+
 	if (pdev->cfg_size < 4096)
 		sysfs_remove_bin_file(&pdev->dev.kobj, &pci_config_attr);
 	else