From: Lukas Wunner <lukas@wunner.de>
To: x86@kernel.org, linux-kernel@vger.kernel.org
Cc: Bjorn Helgaas <bhelgaas@google.com>, Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH v2 1/3] x86/quirks: Apply nvidia_bugs quirk only on root bus
Date: Sun, 12 Jun 2016 12:31:53 +0200 [thread overview]
Message-ID: <4d5477c1d76b2f0387a780f2142bbcdd9fee869b.1465690253.git.lukas@wunner.de> (raw)
In-Reply-To: <cover.1465690253.git.lukas@wunner.de>
Since 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.
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
---
v2:
- Move amendment of nvidia_bugs quirk to separate patch to allow for
easier reviewing, bisecting and reverting (Bjorn Helgaas)
arch/x86/kernel/early-quirks.c | 7 +++++++
1 file changed, 7 insertions(+)
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)
#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.
--
2.8.1
next prev parent reply other threads:[~2016-06-12 10:31 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-12 10:31 [PATCH v2 0/3] Reset Apple AirPort card Lukas Wunner
2016-06-12 10:31 ` [PATCH v2 3/3] x86/quirks: Add early quirk to reset " Lukas Wunner
2016-06-12 11:49 ` Ingo Molnar
2016-06-12 12:37 ` Lukas Wunner
2016-06-13 14:44 ` Matt Fleming
2016-06-14 7:36 ` Ingo Molnar
2016-06-28 13:21 ` Lukas Wunner
2016-07-10 19:01 ` [tip:x86/urgent] " tip-bot for Lukas Wunner
2016-06-12 10:31 ` [PATCH v2 2/3] x86/quirks: Reintroduce scanning of secondary buses Lukas Wunner
2016-07-10 19:01 ` [tip:x86/urgent] " tip-bot for Lukas Wunner
2016-06-12 10:31 ` Lukas Wunner [this message]
2016-07-10 19:00 ` [tip:x86/urgent] x86/quirks: Apply nvidia_bugs quirk only on root bus tip-bot for Lukas Wunner
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=4d5477c1d76b2f0387a780f2142bbcdd9fee869b.1465690253.git.lukas@wunner.de \
--to=lukas@wunner.de \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=x86@kernel.org \
--cc=yinghai@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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).