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>, stable@vger.kernel.org Subject: [PATCH v5 1/5] x86/quirks: Fix stolen detection with integrated + discrete GPU Date: Thu, 13 Jan 2022 16:28:39 -0800 [thread overview] Message-ID: <20220114002843.2083382-1-lucas.demarchi@intel.com> (raw) early_pci_scan_bus() does a depth-first traversal, possibly calling the quirk functions for each device based on vendor, device and class from early_qrk table. intel_graphics_quirks() however uses PCI_ANY_ID and does additional filtering in the quirk. If there is an Intel integrated + discrete GPU the quirk may be called first for the discrete GPU based on the PCI topology. Then we will fail to reserve the system stolen memory for the integrated GPU, because we will already have marked the quirk as "applied". This was reproduced in a setup with Alderlake-P (integrated) + DG2 (discrete), with the following PCI topology: - 00:01.0 Bridge `- 03:00.0 DG2 - 00:02.0 Integrated GPU So, stop using the QFLAG_APPLY_ONCE flag, replacing it with a static local variable. We can set this variable in the right place, inside intel_graphics_quirks(), only when the quirk was actually applied, i.e. when we find the integrated GPU based on the intel_early_ids table. Cc: stable@vger.kernel.org Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> --- v5: apply fix before the refactor arch/x86/kernel/early-quirks.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c index 1ca3a56fdc2d..de9a76eb544e 100644 --- a/arch/x86/kernel/early-quirks.c +++ b/arch/x86/kernel/early-quirks.c @@ -589,10 +589,14 @@ 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; + device = read_pci_config_16(num, slot, func, PCI_DEVICE_ID); for (i = 0; i < ARRAY_SIZE(intel_early_ids); i++) { @@ -605,6 +609,8 @@ static void __init intel_graphics_quirks(int num, int slot, int func) intel_graphics_stolen(num, slot, func, early_ops); + quirk_applied = true; + return; } } @@ -705,7 +711,7 @@ static struct chipset early_qrk[] __initdata = { { PCI_VENDOR_ID_INTEL, 0x3406, PCI_CLASS_BRIDGE_HOST, PCI_BASE_CLASS_BRIDGE, 0, intel_remapping_check }, { PCI_VENDOR_ID_INTEL, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA, PCI_ANY_ID, - QFLAG_APPLY_ONCE, intel_graphics_quirks }, + 0, 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. -- 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>, stable@vger.kernel.org, Ingo Molnar <mingo@redhat.com>, Bjorn Helgaas <bhelgaas@google.com>, Thomas Gleixner <tglx@linutronix.de> Subject: [Intel-gfx] [PATCH v5 1/5] x86/quirks: Fix stolen detection with integrated + discrete GPU Date: Thu, 13 Jan 2022 16:28:39 -0800 [thread overview] Message-ID: <20220114002843.2083382-1-lucas.demarchi@intel.com> (raw) early_pci_scan_bus() does a depth-first traversal, possibly calling the quirk functions for each device based on vendor, device and class from early_qrk table. intel_graphics_quirks() however uses PCI_ANY_ID and does additional filtering in the quirk. If there is an Intel integrated + discrete GPU the quirk may be called first for the discrete GPU based on the PCI topology. Then we will fail to reserve the system stolen memory for the integrated GPU, because we will already have marked the quirk as "applied". This was reproduced in a setup with Alderlake-P (integrated) + DG2 (discrete), with the following PCI topology: - 00:01.0 Bridge `- 03:00.0 DG2 - 00:02.0 Integrated GPU So, stop using the QFLAG_APPLY_ONCE flag, replacing it with a static local variable. We can set this variable in the right place, inside intel_graphics_quirks(), only when the quirk was actually applied, i.e. when we find the integrated GPU based on the intel_early_ids table. Cc: stable@vger.kernel.org Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> --- v5: apply fix before the refactor arch/x86/kernel/early-quirks.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c index 1ca3a56fdc2d..de9a76eb544e 100644 --- a/arch/x86/kernel/early-quirks.c +++ b/arch/x86/kernel/early-quirks.c @@ -589,10 +589,14 @@ 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; + device = read_pci_config_16(num, slot, func, PCI_DEVICE_ID); for (i = 0; i < ARRAY_SIZE(intel_early_ids); i++) { @@ -605,6 +609,8 @@ static void __init intel_graphics_quirks(int num, int slot, int func) intel_graphics_stolen(num, slot, func, early_ops); + quirk_applied = true; + return; } } @@ -705,7 +711,7 @@ static struct chipset early_qrk[] __initdata = { { PCI_VENDOR_ID_INTEL, 0x3406, PCI_CLASS_BRIDGE_HOST, PCI_BASE_CLASS_BRIDGE, 0, intel_remapping_check }, { PCI_VENDOR_ID_INTEL, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA, PCI_ANY_ID, - QFLAG_APPLY_ONCE, intel_graphics_quirks }, + 0, 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. -- 2.34.1
next 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 Lucas De Marchi [this message] 2022-01-14 0:28 ` [Intel-gfx] [PATCH v5 1/5] x86/quirks: Fix stolen detection with integrated + discrete GPU 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 ` [PATCH v5 3/5] x86/quirks: Stop using QFLAG_APPLY_ONCE in nvidia_bugs() Lucas De Marchi 2022-01-14 0:28 ` [Intel-gfx] " 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-1-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=stable@vger.kernel.org \ --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.