From: Lucas De Marchi <lucas.demarchi@intel.com> To: x86@kernel.org Cc: "Dave Hansen" <dave.hansen@linux.intel.com>, "Ingo Molnar" <mingo@redhat.com>, "Thomas Gleixner" <tglx@linutronix.de>, "Bjorn Helgaas" <bhelgaas@google.com>, linux-pci@vger.kernel.org, intel-gfx@lists.freedesktop.org, "Ville Syrjälä" <ville.syrjala@linux.intel.com>, "Matt Roper" <matthew.d.roper@intel.com>, "Rodrigo Vivi" <rodrigo.vivi@intel.com> Subject: [PATCH v5 3/5] x86/quirks: Stop using QFLAG_APPLY_ONCE in nvidia_bugs() Date: Thu, 13 Jan 2022 16:28:41 -0800 [thread overview] Message-ID: <20220114002843.2083382-3-lucas.demarchi@intel.com> (raw) In-Reply-To: <20220114002843.2083382-1-lucas.demarchi@intel.com> Adopt the same approach as in intel_graphics_quirks(), with a static local variable, to control when the quirk has already been applied. However, contrary to intel_graphics_quirks(), here we always set it as applied as soon as it's called to avoid changing the current behavior that is not failing. This is the last user of the flags, so we can cleanup the early-quirks, removing all the flags logic later. Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> --- arch/x86/kernel/early-quirks.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c index 59cc67aace93..7c70977737de 100644 --- a/arch/x86/kernel/early-quirks.c +++ b/arch/x86/kernel/early-quirks.c @@ -88,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. @@ -702,7 +709,7 @@ struct chipset { 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, 0, nvidia_bugs }, { PCI_VENDOR_ID_VIA, PCI_ANY_ID, PCI_CLASS_BRIDGE_PCI, PCI_ANY_ID, 0, via_bugs }, { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB, -- 2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Lucas De Marchi <lucas.demarchi@intel.com> To: x86@kernel.org Cc: linux-pci@vger.kernel.org, intel-gfx@lists.freedesktop.org, Dave Hansen <dave.hansen@linux.intel.com>, Ingo Molnar <mingo@redhat.com>, Bjorn Helgaas <bhelgaas@google.com>, Thomas Gleixner <tglx@linutronix.de> Subject: [Intel-gfx] [PATCH v5 3/5] x86/quirks: Stop using QFLAG_APPLY_ONCE in nvidia_bugs() Date: Thu, 13 Jan 2022 16:28:41 -0800 [thread overview] Message-ID: <20220114002843.2083382-3-lucas.demarchi@intel.com> (raw) In-Reply-To: <20220114002843.2083382-1-lucas.demarchi@intel.com> Adopt the same approach as in intel_graphics_quirks(), with a static local variable, to control when the quirk has already been applied. However, contrary to intel_graphics_quirks(), here we always set it as applied as soon as it's called to avoid changing the current behavior that is not failing. This is the last user of the flags, so we can cleanup the early-quirks, removing all the flags logic later. Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> --- arch/x86/kernel/early-quirks.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c index 59cc67aace93..7c70977737de 100644 --- a/arch/x86/kernel/early-quirks.c +++ b/arch/x86/kernel/early-quirks.c @@ -88,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. @@ -702,7 +709,7 @@ struct chipset { 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, 0, nvidia_bugs }, { PCI_VENDOR_ID_VIA, PCI_ANY_ID, PCI_CLASS_BRIDGE_PCI, PCI_ANY_ID, 0, via_bugs }, { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB, -- 2.34.1
next prev parent reply other threads:[~2022-01-14 0:28 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-14 0:28 [PATCH v5 1/5] x86/quirks: Fix stolen detection with integrated + discrete GPU Lucas De Marchi 2022-01-14 0:28 ` [Intel-gfx] " Lucas De Marchi 2022-01-14 0:28 ` [PATCH v5 2/5] x86/quirks: Stop using QFLAG_APPLY_ONCE in via_bugs() Lucas De Marchi 2022-01-14 0:28 ` [Intel-gfx] " Lucas De Marchi 2022-01-14 0:28 ` Lucas De Marchi [this message] 2022-01-14 0:28 ` [Intel-gfx] [PATCH v5 3/5] x86/quirks: Stop using QFLAG_APPLY_ONCE in nvidia_bugs() Lucas De Marchi 2022-01-14 0:28 ` [PATCH v5 4/5] x86/quirks: Remove unused logic for flags Lucas De Marchi 2022-01-14 0:28 ` [Intel-gfx] " Lucas De Marchi 2022-01-14 0:28 ` [PATCH v5 5/5] x86/quirks: Improve line wrap on quirk conditions Lucas De Marchi 2022-01-14 0:28 ` [Intel-gfx] " Lucas De Marchi 2022-01-14 1:25 ` [Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [v5,1/5] x86/quirks: Fix stolen detection with integrated + discrete GPU Patchwork 2022-01-14 2:30 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork 2022-01-18 9:40 ` [PATCH v5 1/5] " Borislav Petkov 2022-01-18 9:40 ` [Intel-gfx] " Borislav Petkov 2022-01-18 16:36 ` Lucas De Marchi 2022-01-18 16:36 ` [Intel-gfx] " Lucas De Marchi 2022-01-18 17:26 ` Borislav Petkov 2022-01-18 17:26 ` [Intel-gfx] " Borislav Petkov 2022-01-18 17:58 ` Bjorn Helgaas 2022-01-18 17:58 ` Bjorn Helgaas 2022-01-18 18:37 ` Borislav Petkov 2022-01-18 18:37 ` Borislav Petkov 2022-01-18 20:01 ` Bjorn Helgaas 2022-01-18 20:01 ` Bjorn Helgaas 2022-01-18 20:31 ` Borislav Petkov 2022-01-18 20:31 ` Borislav Petkov 2022-01-19 20:30 ` Lucas De Marchi 2022-01-19 20:30 ` Lucas De Marchi 2022-01-19 20:58 ` Bjorn Helgaas 2022-01-19 20:58 ` Bjorn Helgaas 2022-01-18 19:05 ` Lucas De Marchi 2022-01-18 19:05 ` [Intel-gfx] " Lucas De Marchi 2022-01-18 19:14 ` Borislav Petkov 2022-01-18 19:14 ` [Intel-gfx] " Borislav Petkov 2022-01-18 19:15 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [v5,1/5] x86/quirks: Fix stolen detection with integrated + discrete GPU (rev2) Patchwork 2022-01-18 20:16 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [v5,1/5] x86/quirks: Fix stolen detection with integrated + discrete GPU (rev3) Patchwork 2022-01-18 20:51 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2022-01-18 23:01 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220114002843.2083382-3-lucas.demarchi@intel.com \ --to=lucas.demarchi@intel.com \ --cc=bhelgaas@google.com \ --cc=dave.hansen@linux.intel.com \ --cc=intel-gfx@lists.freedesktop.org \ --cc=linux-pci@vger.kernel.org \ --cc=matthew.d.roper@intel.com \ --cc=mingo@redhat.com \ --cc=rodrigo.vivi@intel.com \ --cc=tglx@linutronix.de \ --cc=ville.syrjala@linux.intel.com \ --cc=x86@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.