lkml.org 
[lkml]   [2022]   [Jan]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 090/200] PCI/sysfs: Find shadow ROM before static attribute initialization
    Date
    From: Bjorn Helgaas <bhelgaas@google.com>

    commit 66d28b21fe6b3da8d1e9f0a7ba38bc61b6c547e1 upstream.

    Ville reported that the sysfs "rom" file for VGA devices disappeared after
    527139d738d7 ("PCI/sysfs: Convert "rom" to static attribute").

    Prior to 527139d738d7, FINAL fixups, including pci_fixup_video() where we
    find shadow ROMs, were run before pci_create_sysfs_dev_files() created the
    sysfs "rom" file.

    After 527139d738d7, "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 # after 527139d738d7
    pci_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") # before 527139d738d7

    Change 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: 527139d738d7 ("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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/ia64/pci/fixup.c | 4 ++--
    arch/mips/loongson64/vbios_quirk.c | 9 ++++-----
    arch/x86/pci/fixup.c | 4 ++--
    3 files changed, 8 insertions(+), 9 deletions(-)

    --- a/arch/ia64/pci/fixup.c
    +++ b/arch/ia64/pci/fixup.c
    @@ -76,5 +76,5 @@ static void pci_fixup_video(struct pci_d
    }
    }
    }
    -DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
    - PCI_CLASS_DISPLAY_VGA, 8, pci_fixup_video);
    +DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_ANY_ID, PCI_ANY_ID,
    + PCI_CLASS_DISPLAY_VGA, 8, pci_fixup_video);
    --- a/arch/mips/loongson64/vbios_quirk.c
    +++ b/arch/mips/loongson64/vbios_quirk.c
    @@ -3,7 +3,7 @@
    #include <linux/pci.h>
    #include <loongson.h>

    -static void pci_fixup_radeon(struct pci_dev *pdev)
    +static void pci_fixup_video(struct pci_dev *pdev)
    {
    struct resource *res = &pdev->resource[PCI_ROM_RESOURCE];

    @@ -22,8 +22,7 @@ static void pci_fixup_radeon(struct pci_
    res->flags = IORESOURCE_MEM | IORESOURCE_ROM_SHADOW |
    IORESOURCE_PCI_FIXED;

    - dev_info(&pdev->dev, "BAR %d: assigned %pR for Radeon ROM\n",
    - PCI_ROM_RESOURCE, res);
    + dev_info(&pdev->dev, "Video device with shadowed ROM at %pR\n", res);
    }
    -DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_VENDOR_ID_ATI, 0x9615,
    - PCI_CLASS_DISPLAY_VGA, 8, pci_fixup_radeon);
    +DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_VENDOR_ID_ATI, 0x9615,
    + PCI_CLASS_DISPLAY_VGA, 8, pci_fixup_video);
    --- a/arch/x86/pci/fixup.c
    +++ b/arch/x86/pci/fixup.c
    @@ -353,8 +353,8 @@ static void pci_fixup_video(struct pci_d
    }
    }
    }
    -DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
    - PCI_CLASS_DISPLAY_VGA, 8, pci_fixup_video);
    +DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_ANY_ID, PCI_ANY_ID,
    + PCI_CLASS_DISPLAY_VGA, 8, pci_fixup_video);


    static const struct dmi_system_id msi_k8t_dmi_table[] = {

    \
     
     \ /
      Last update: 2022-01-31 13:09    [W:2.352 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site