From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752534AbcIJSqs (ORCPT ); Sat, 10 Sep 2016 14:46:48 -0400 Received: from terminus.zytor.com ([198.137.202.10]:50774 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751066AbcIJSqr (ORCPT ); Sat, 10 Sep 2016 14:46:47 -0400 Date: Sat, 10 Sep 2016 11:34:22 -0700 From: tip-bot for Rui Wang Message-ID: Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, rui.y.wang@intel.com, torvalds@linux-foundation.org, bp@alien8.de, mingo@kernel.org, tglx@linutronix.de, bp@suse.de, peterz@infradead.org Reply-To: hpa@zytor.com, linux-kernel@vger.kernel.org, rui.y.wang@intel.com, bp@alien8.de, torvalds@linux-foundation.org, mingo@kernel.org, tglx@linutronix.de, peterz@infradead.org, bp@suse.de In-Reply-To: <1473522046-31329-1-git-send-email-rui.y.wang@intel.com> References: <1473522046-31329-1-git-send-email-rui.y.wang@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] x86/ioapic: Ignore root bridges without a companion ACPI device Git-Commit-ID: d9c149d6ce1a94de578a4e323f6881fcb6b986ab 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: d9c149d6ce1a94de578a4e323f6881fcb6b986ab Gitweb: http://git.kernel.org/tip/d9c149d6ce1a94de578a4e323f6881fcb6b986ab Author: Rui Wang AuthorDate: Sat, 10 Sep 2016 23:40:45 +0800 Committer: Ingo Molnar CommitDate: Sat, 10 Sep 2016 20:30:31 +0200 x86/ioapic: Ignore root bridges without a companion ACPI device Some PCI root bridges don't have a corresponding ACPI device. This can be the case on some old platforms. Don't call acpi_ioapic_add() on these bridges because they can't support ioapic hotplug. Reported-and-tested-by: Borislav Petkov Signed-off-by: Rui Wang Reviewed-by: Borislav Petkov Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: bhelgaas@google.com Cc: helgaas@kernel.org Cc: linux-acpi@vger.kernel.org Cc: linux-pci@vger.kernel.org Cc: rjw@rjwysocki.net Cc: tony.luck@intel.com Link: http://lkml.kernel.org/r/1473522046-31329-1-git-send-email-rui.y.wang@intel.com Signed-off-by: Ingo Molnar --- drivers/pci/setup-bus.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index ec538d3..f30ca75 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -1855,7 +1855,10 @@ void __init pci_assign_unassigned_resources(void) list_for_each_entry(root_bus, &pci_root_buses, node) { pci_assign_unassigned_root_bus_resources(root_bus); - acpi_ioapic_add(ACPI_HANDLE(root_bus->bridge)); + + /* Make sure the root bridge has a companion ACPI device: */ + if (ACPI_HANDLE(root_bus->bridge)) + acpi_ioapic_add(ACPI_HANDLE(root_bus->bridge)); } }