path: root/arch
diff options
authorLukas Wunner <>2016-06-12 12:31:53 +0200
committerIngo Molnar <>2016-07-10 20:13:53 +0200
commit447d29d1d3aed839e74c2401ef63387780ac51ed (patch)
tree006044c59a9a3d145c98acf1fd54f638cd55b170 /arch
parent8709ed4d4b0eab04561c1ec9e6ea50fd1e3897ff (diff)
x86/quirks: Apply nvidia_bugs quirk only on root bus
Since the following commit: 8659c406ade3 ("x86: only scan the root bus in early PCI quirks") ... early quirks are only applied to devices on the root bus. The motivation was to prevent application of the nvidia_bugs quirk on secondary buses. We're about to reintroduce scanning of secondary buses for a quirk to reset the Broadcom 4331 wireless card on 2011/2012 Macs. To prevent regressions, open code the requirement to apply nvidia_bugs only on the root bus. Signed-off-by: Lukas Wunner <> Cc: Andy Lutomirski <> Cc: Bjorn Helgaas <> Cc: Borislav Petkov <> Cc: Brian Gerst <> Cc: Denys Vlasenko <> Cc: H. Peter Anvin <> Cc: Josh Poimboeuf <> Cc: Linus Torvalds <> Cc: Peter Zijlstra <> Cc: Thomas Gleixner <> Cc: Yinghai Lu <> Link: Signed-off-by: Ingo Molnar <>
Diffstat (limited to 'arch')
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index bca14c8..256976f 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -76,6 +76,13 @@ static void __init nvidia_bugs(int num, int slot, int func)
+ * Only applies to Nvidia root ports (bus 0) and not to
+ * Nvidia graphics cards with PCI ports on secondary buses.
+ */
+ if (num)
+ return;
+ /*
* All timer overrides on Nvidia are
* wrong unless HPET is enabled.
* Unfortunately that's not true on many Asus boards.