Skip to contentSkip to conversation

Patch "x86/quirks: Apply nvidia_bugs quirk only on root bus" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Aug 2, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

x86/quirks: Apply nvidia_bugs quirk only on root bus

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
x86-quirks-apply-nvidia_bugs-quirk-only-on-root-bus.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 447d29d1d3aed839e74c2401ef63387780ac51ed Mon Sep 17 00:00:00 2001

From: Lukas Wunner <[email protected]>
Date: Sun, 12 Jun 2016 12:31:53 +0200
Subject: x86/quirks: Apply nvidia_bugs quirk only on root bus

From: Lukas Wunner <[email protected]>

commit 447d29d1d3aed839e74c2401ef63387780ac51ed upstream.

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.

---
 arch/x86/kernel/early-quirks.c |    7 +++++++
 1 file changed, 7 insertions(+)
arch/x86/kernel/early-quirks.c +7 -0
@@ -76,6 +76,13 @@ static void __init nvidia_bugs(int num,
 #ifdef CONFIG_ACPI
 #ifdef CONFIG_X86_IO_APIC
 	/*
+	 * 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.

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/x86-quirks-apply-nvidia_bugs-quirk-only-on-root-bus.patch queue-4.4/x86-quirks-add-early-quirk-to-reset-apple-airport-card.patch queue-4.4/x86-quirks-reintroduce-scanning-of-secondary-buses.patch