From patchwork Sun Sep 2 21:56:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 1397661 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id D9F05E00AD for ; Sun, 2 Sep 2012 21:57:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932070Ab2IBV4p (ORCPT ); Sun, 2 Sep 2012 17:56:45 -0400 Received: from acsinet15.oracle.com ([141.146.126.227]:23303 "EHLO acsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756183Ab2IBV43 (ORCPT ); Sun, 2 Sep 2012 17:56:29 -0400 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by acsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id q82LuJkI006494 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 2 Sep 2012 21:56:20 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id q82LuIXi013299 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 2 Sep 2012 21:56:18 GMT Received: from abhmt107.oracle.com (abhmt107.oracle.com [141.146.116.59]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id q82LuIwK030590; Sun, 2 Sep 2012 16:56:18 -0500 Received: from linux-siqj.site (/75.55.221.75) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Sun, 02 Sep 2012 14:56:17 -0700 From: Yinghai Lu To: Bjorn Helgaas , Taku Izumi , Jiang Liu , x86 Cc: Andrew Morton , Linus Torvalds , Greg Kroah-Hartman , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Yinghai Lu Subject: [PATCH part5 7/7] ACPI, PCI: Skip extra pci_enable_bridges for non hot-add root Date: Sun, 2 Sep 2012 14:56:05 -0700 Message-Id: <1346622965-30937-8-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1346622965-30937-1-git-send-email-yinghai@kernel.org> References: <1346622965-30937-1-git-send-email-yinghai@kernel.org> X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Pre-installed will be handled later, need to skip the one only for hot-added roots. Otherwise will get anonying failing message about can not reserve, irq ... Signed-off-by: Yinghai Lu --- drivers/acpi/pci_root.c | 3 ++- drivers/acpi/pci_root_hp.c | 1 + include/acpi/acpi_bus.h | 1 + 3 files changed, 4 insertions(+), 1 deletions(-) diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 80adbbb..576fe9a 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -647,7 +647,8 @@ static int acpi_pci_root_start(struct acpi_device *device) driver->add(device->handle); /* need to after hot-added ioapic is registered */ - pci_enable_bridges(root->bus); + if (root->hot_added) + pci_enable_bridges(root->bus); pci_bus_add_devices(root->bus); mutex_unlock(&acpi_pci_root_lock); diff --git a/drivers/acpi/pci_root_hp.c b/drivers/acpi/pci_root_hp.c index d2ace81..2800fb4 100644 --- a/drivers/acpi/pci_root_hp.c +++ b/drivers/acpi/pci_root_hp.c @@ -86,6 +86,7 @@ static void acpi_root_configure_bridge(acpi_handle handle) pcibios_resource_survey_bus(root->bus); pci_assign_unassigned_bus_resources(root->bus); + root->hot_added = true; } static void handle_root_bridge_insertion(acpi_handle handle) diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index bde976e..47de196 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -406,6 +406,7 @@ struct acpi_pci_root { u32 osc_support_set; /* _OSC state of support bits */ u32 osc_control_set; /* _OSC state of control bits */ + bool hot_added; phys_addr_t mcfg_addr; };