From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757262AbcGJTBc (ORCPT ); Sun, 10 Jul 2016 15:01:32 -0400 Received: from terminus.zytor.com ([198.137.202.10]:54878 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756506AbcGJTBa (ORCPT ); Sun, 10 Jul 2016 15:01:30 -0400 Date: Sun, 10 Jul 2016 12:00:39 -0700 From: tip-bot for Lukas Wunner Message-ID: Cc: bp@alien8.de, luto@kernel.org, mingo@kernel.org, jpoimboe@redhat.com, torvalds@linux-foundation.org, bhelgaas@google.com, hpa@zytor.com, yinghai@kernel.org, tglx@linutronix.de, dvlasenk@redhat.com, brgerst@gmail.com, linux-kernel@vger.kernel.org, lukas@wunner.de, peterz@infradead.org Reply-To: peterz@infradead.org, lukas@wunner.de, linux-kernel@vger.kernel.org, dvlasenk@redhat.com, brgerst@gmail.com, tglx@linutronix.de, yinghai@kernel.org, hpa@zytor.com, bhelgaas@google.com, torvalds@linux-foundation.org, jpoimboe@redhat.com, mingo@kernel.org, luto@kernel.org, bp@alien8.de In-Reply-To: <4d5477c1d76b2f0387a780f2142bbcdd9fee869b.1465690253.git.lukas@wunner.de> References: <4d5477c1d76b2f0387a780f2142bbcdd9fee869b.1465690253.git.lukas@wunner.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/quirks: Apply nvidia_bugs quirk only on root bus Git-Commit-ID: 447d29d1d3aed839e74c2401ef63387780ac51ed X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 447d29d1d3aed839e74c2401ef63387780ac51ed Gitweb: http://git.kernel.org/tip/447d29d1d3aed839e74c2401ef63387780ac51ed Author: Lukas Wunner AuthorDate: Sun, 12 Jun 2016 12:31:53 +0200 Committer: Ingo Molnar CommitDate: Sun, 10 Jul 2016 20:13:53 +0200 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: http://lkml.kernel.org/r/4d5477c1d76b2f0387a780f2142bbcdd9fee869b.1465690253.git.lukas@wunner.de Signed-off-by: Ingo Molnar --- 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.