66d28b21fe
Ville reported that the sysfs "rom" file for VGA devices disappeared after527139d738("PCI/sysfs: Convert "rom" to static attribute"). Prior to527139d738, FINAL fixups, including pci_fixup_video() where we find shadow ROMs, were run before pci_create_sysfs_dev_files() created the sysfs "rom" file. After527139d738, "rom" is a static attribute and is created before FINAL fixups are run, so we didn't create "rom" files for shadow ROMs: acpi_pci_root_add ... pci_scan_single_device pci_device_add pci_fixup_video # <-- new HEADER fixup device_add ... if (grp->is_visible()) pci_dev_rom_attr_is_visible # after527139d738pci_bus_add_devices pci_bus_add_device pci_fixup_device(pci_fixup_final) pci_fixup_video # <-- previous FINAL fixup pci_create_sysfs_dev_files if (pci_resource_len(pdev, PCI_ROM_RESOURCE)) sysfs_create_bin_file("rom") # before527139d738Change pci_fixup_video() to be a HEADER fixup so it runs before sysfs static attributes are initialized. Rename the Loongson pci_fixup_radeon() to pci_fixup_video() and make its dmesg logging identical to the others since it is doing the same job. Link: https://lore.kernel.org/r/YbxqIyrkv3GhZVxx@intel.com Fixes:527139d738("PCI/sysfs: Convert "rom" to static attribute") Link: https://lore.kernel.org/r/20220126154001.16895-1-helgaas@kernel.org Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Cc: stable@vger.kernel.org # v5.13+ Cc: Huacai Chen <chenhuacai@kernel.org> Cc: Jiaxun Yang <jiaxun.yang@flygoat.com> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: Krzysztof Wilczyński <kw@linux.com>
29 lines
719 B
C
29 lines
719 B
C
// SPDX-License-Identifier: GPL-2.0+
|
|
|
|
#include <linux/pci.h>
|
|
#include <loongson.h>
|
|
|
|
static void pci_fixup_video(struct pci_dev *pdev)
|
|
{
|
|
struct resource *res = &pdev->resource[PCI_ROM_RESOURCE];
|
|
|
|
if (res->start)
|
|
return;
|
|
|
|
if (!loongson_sysconf.vgabios_addr)
|
|
return;
|
|
|
|
pci_disable_rom(pdev);
|
|
if (res->parent)
|
|
release_resource(res);
|
|
|
|
res->start = virt_to_phys((void *) loongson_sysconf.vgabios_addr);
|
|
res->end = res->start + 256*1024 - 1;
|
|
res->flags = IORESOURCE_MEM | IORESOURCE_ROM_SHADOW |
|
|
IORESOURCE_PCI_FIXED;
|
|
|
|
dev_info(&pdev->dev, "Video device with shadowed ROM at %pR\n", res);
|
|
}
|
|
DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_VENDOR_ID_ATI, 0x9615,
|
|
PCI_CLASS_DISPLAY_VGA, 8, pci_fixup_video);
|