PCI: fix sysfs rom file creation for BIOS ROM shadows (40ee9e9f) · Commits · 戴 / test

At one time, if a BIOS ROM shadow was detected for the boot video device (stored at offset 0xc0000), we'd set a special resource flag, IORESOURCE_ROM_SHADOW, so that the sysfs ROM file code could handle it properly. That broke along the way somewhere though, so current kernels will be missing 'rom' files in sysfs if the video device doesn't have an explicit ROM BAR. This patch fixes the regression by moving the video fixup quirk to a little later in the boot cycle (to avoid having its work undone by PCI resource allocation) and checking in the PCI sysfs code whether a rom file should be created due to a shadow resource, which is also moved to a little later in the boot cycle so it will occur after the video fixup. Tested and works on my i386 test box. Signed-off-by:

Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by:

Greg Kroah-Hartman <gregkh@suse.de>

arch/i386/pci/fixup.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -354,7 +354,7 @@ static void __devinit pci_fixup_video(struct pci_dev *pdev)
		printk(KERN_DEBUG "Boot video device is %s\n", pci_name(pdev));
		}
		}
		DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_video);
		DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_video);

		/*
		* Some Toshiba laptops need extra code to enable their TI TSB43AB22/A.

drivers/pci/pci-sysfs.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -620,7 +620,8 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
		goto err_bin_file;

		/* If the device has a ROM, try to expose it in sysfs. */
		if (pci_resource_len(pdev, PCI_ROM_RESOURCE)) {
		if (pci_resource_len(pdev, PCI_ROM_RESOURCE) \|\|
		(pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW)) {
		rom_attr = kzalloc(sizeof(*rom_attr), GFP_ATOMIC);
		if (rom_attr) {
		pdev->rom_attr = rom_attr;
		@@ -695,4 +696,4 @@ static int __init pci_sysfs_init(void)
		return 0;
		}

		__initcall(pci_sysfs_init);
		late_initcall(pci_sysfs_init);

Admin message