On Fri, Jan 07, 2022 at 01:05:14PM -0800, Lucas De Marchi wrote:
> The flags are only used to mark a quirk to be called once and nothing
> else. Also, that logic may not be appropriate if the quirk wants to
> do additional filtering and set quirk ass applied by itself.
s/ass applied/as applied/
> So replace the uses of QFLAG_APPLY_ONCE with static local variables in
> the few quirks that use this logic and remove all the flags logic.
>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@xxxxxxxxx>
Reviewed-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
> ---
>
> v3: Keep in this patch only the mechanical change to move from
> QFLAG_APPLY_ONCE to static locals. Differently than v2, we don't try to
> set quirk_applied in nvidia_bugs() and via_bugs() only when the
> global resource is set - this patch is a mechanical move only and
> shouldn't change any behavior. For intel_graphics_quirks(), we will move
> it to the right place in a subsequent patch.
>
> arch/x86/kernel/early-quirks.c | 55 +++++++++++++++++++++-------------
> 1 file changed, 34 insertions(+), 21 deletions(-)
>
> diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
> index 391a4e2b8604..8b689c2b8cc7 100644
> --- a/arch/x86/kernel/early-quirks.c
> +++ b/arch/x86/kernel/early-quirks.c
> @@ -57,6 +57,13 @@ static void __init fix_hypertransport_config(int num, int slot, int func)
> static void __init via_bugs(int num, int slot, int func)
> {
> #ifdef CONFIG_GART_IOMMU
> + static bool quirk_applied __initdata;
> +
> + if (quirk_applied)
> + return;
> +
> + quirk_applied = true;
> +
> if ((max_pfn > MAX_DMA32_PFN || force_iommu) &&
> !gart_iommu_aperture_allowed) {
> printk(KERN_INFO
> @@ -81,6 +88,13 @@ static void __init nvidia_bugs(int num, int slot, int func)
> {
> #ifdef CONFIG_ACPI
> #ifdef CONFIG_X86_IO_APIC
> + static bool quirk_applied __initdata;
> +
> + if (quirk_applied)
> + return;
> +
> + quirk_applied = true;
> +
> /*
> * Only applies to Nvidia root ports (bus 0) and not to
> * Nvidia graphics cards with PCI ports on secondary buses.
> @@ -587,10 +601,16 @@ intel_graphics_stolen(int num, int slot, int func,
>
> static void __init intel_graphics_quirks(int num, int slot, int func)
> {
> + static bool quirk_applied __initdata;
> const struct intel_early_ops *early_ops;
> u16 device;
> int i;
>
> + if (quirk_applied)
> + return;
> +
> + quirk_applied = true;
> +
> device = read_pci_config_16(num, slot, func, PCI_DEVICE_ID);
>
> for (i = 0; i < ARRAY_SIZE(intel_early_ids); i++) {
> @@ -673,37 +693,33 @@ static void __init apple_airport_reset(int bus, int slot, int func)
> early_iounmap(mmio, BCM4331_MMIO_SIZE);
> }
>
> -#define QFLAG_APPLY_ONCE 0x1
> -#define QFLAG_APPLIED 0x2
> -#define QFLAG_DONE (QFLAG_APPLY_ONCE|QFLAG_APPLIED)
> struct chipset {
> u32 vendor;
> u32 device;
> u32 class;
> u32 class_mask;
> - u32 flags;
> void (*f)(int num, int slot, int func);
> };
>
> static struct chipset early_qrk[] __initdata = {
> { PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,
> - PCI_CLASS_BRIDGE_PCI, PCI_ANY_ID, QFLAG_APPLY_ONCE, nvidia_bugs },
> + PCI_CLASS_BRIDGE_PCI, PCI_ANY_ID, nvidia_bugs },
> { PCI_VENDOR_ID_VIA, PCI_ANY_ID,
> - PCI_CLASS_BRIDGE_PCI, PCI_ANY_ID, QFLAG_APPLY_ONCE, via_bugs },
> + PCI_CLASS_BRIDGE_PCI, PCI_ANY_ID, via_bugs },
> { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB,
> - PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, fix_hypertransport_config },
> + PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, fix_hypertransport_config },
> { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS,
> - PCI_CLASS_SERIAL_SMBUS, PCI_ANY_ID, 0, ati_bugs },
> + PCI_CLASS_SERIAL_SMBUS, PCI_ANY_ID, ati_bugs },
> { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS,
> - PCI_CLASS_SERIAL_SMBUS, PCI_ANY_ID, 0, ati_bugs_contd },
> + PCI_CLASS_SERIAL_SMBUS, PCI_ANY_ID, ati_bugs_contd },
> { PCI_VENDOR_ID_INTEL, 0x3403, PCI_CLASS_BRIDGE_HOST,
> - PCI_BASE_CLASS_BRIDGE, 0, intel_remapping_check },
> + PCI_BASE_CLASS_BRIDGE, intel_remapping_check },
> { PCI_VENDOR_ID_INTEL, 0x3405, PCI_CLASS_BRIDGE_HOST,
> - PCI_BASE_CLASS_BRIDGE, 0, intel_remapping_check },
> + PCI_BASE_CLASS_BRIDGE, intel_remapping_check },
> { PCI_VENDOR_ID_INTEL, 0x3406, PCI_CLASS_BRIDGE_HOST,
> - PCI_BASE_CLASS_BRIDGE, 0, intel_remapping_check },
> + PCI_BASE_CLASS_BRIDGE, intel_remapping_check },
> { PCI_VENDOR_ID_INTEL, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA, PCI_ANY_ID,
> - QFLAG_APPLY_ONCE, intel_graphics_quirks },
> + intel_graphics_quirks },
> /*
> * HPET on the current version of the Baytrail platform has accuracy
> * problems: it will halt in deep idle state - so we disable it.
> @@ -713,9 +729,9 @@ static struct chipset early_qrk[] __initdata = {
> * http://www.intel.com/content/dam/www/public/us/en/documents/datasheets/atom-z8000-datasheet-vol-1.pdf
> */
> { PCI_VENDOR_ID_INTEL, 0x0f00,
> - PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},
> + PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, force_disable_hpet},
> { PCI_VENDOR_ID_BROADCOM, 0x4331,
> - PCI_CLASS_NETWORK_OTHER, PCI_ANY_ID, 0, apple_airport_reset},
> + PCI_CLASS_NETWORK_OTHER, PCI_ANY_ID, apple_airport_reset},
> {}
> };
>
> @@ -756,12 +772,9 @@ static int __init check_dev_quirk(int num, int slot, int func)
> ((early_qrk[i].device == PCI_ANY_ID) ||
> (early_qrk[i].device == device)) &&
> (!((early_qrk[i].class ^ class) &
> - early_qrk[i].class_mask))) {
> - if ((early_qrk[i].flags &
> - QFLAG_DONE) != QFLAG_DONE)
> - early_qrk[i].f(num, slot, func);
> - early_qrk[i].flags |= QFLAG_APPLIED;
> - }
> + early_qrk[i].class_mask)))
> + early_qrk[i].f(num, slot, func);
> +
> }
>
> type = read_pci_config_byte(num, slot, func,
> --
> 2.34.1
>
