From patchwork Fri Apr 3 02:12:30 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuji Shimada X-Patchwork-Id: 16025 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n332AYpr029567 for ; Fri, 3 Apr 2009 02:12:38 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750919AbZDCCMj (ORCPT ); Thu, 2 Apr 2009 22:12:39 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751923AbZDCCMj (ORCPT ); Thu, 2 Apr 2009 22:12:39 -0400 Received: from TYO202.gate.nec.co.jp ([202.32.8.206]:55599 "EHLO tyo202.gate.nec.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750919AbZDCCMi (ORCPT ); Thu, 2 Apr 2009 22:12:38 -0400 Received: from mailgate3.nec.co.jp ([10.7.69.192]) by tyo202.gate.nec.co.jp (8.13.8/8.13.4) with ESMTP id n332CW9K014812; Fri, 3 Apr 2009 11:12:32 +0900 (JST) Received: (from root@localhost) by mailgate3.nec.co.jp (8.11.7/3.7W-MAILGATE-NEC) id n332CW605932; Fri, 3 Apr 2009 11:12:32 +0900 (JST) Received: from mail03.kamome.nec.co.jp (mail03.kamome.nec.co.jp [10.25.43.7]) by mailsv3.nec.co.jp (8.13.8/8.13.4) with ESMTP id n332CUEk021342; Fri, 3 Apr 2009 11:12:32 +0900 (JST) Received: from togyo.jp.nec.com ([10.26.220.4] [10.26.220.4]) by mail03.kamome.nec.co.jp with ESMTP id BT-MMP-318178; Fri, 3 Apr 2009 11:12:31 +0900 Received: from [10.58.63.124] ([10.58.63.124] [10.58.63.124]) by mail.jp.nec.com with ESMTP; Fri, 3 Apr 2009 11:12:30 +0900 Date: Fri, 03 Apr 2009 11:12:30 +0900 From: Yuji Shimada To: Alex Chiang , jbarnes@virtuousgeek.org, linux-pci@vger.kernel.org Subject: [PATCH v2] Setup disabled bridges even if buses are added. In-Reply-To: <20090403110718.0972.27C06F64@necst.nec.co.jp> References: <20090402215119.GK7173@ldl.fc.hp.com> <20090403110718.0972.27C06F64@necst.nec.co.jp> Message-Id: <20090403111102.0975.27C06F64@necst.nec.co.jp> MIME-Version: 1.0 X-Mailer: Becky! ver. 2.50 [ja] Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org This patch setups disabled bridges even if buses have already been added. pci_assign_unassigned_resources is called after buses are added. pci_assign_unassigned_resources calls pci_bus_assign_resources. pci_bus_assign_resources calls pci_setup_bridge to configure BARs of bridges. Currently pci_setup_bridge returns immediately if the bus have already been added. So pci_assign_unassigned_resources can't configure BARs of bridge. The patch fixes the issue. On logical hot-add, we need to prevent the kernel from re-initializing bridges that have already been initialized. To achieve this, pci_setup_bridge returns immediately if the bridge have already been enabled. We don't need to check whether the specified bus is a root bus or not. pci_setup_bridge is not called on a root bus, because a root bus does not have a bridge. Thanks, --- Yuji Shimada Signed-off-by: Yuji Shimada -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 334285a..bfc3b5e 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -144,7 +144,7 @@ static void pci_setup_bridge(struct pci_bus *bus) struct pci_bus_region region; u32 l, bu, lu, io_upper16; - if (!pci_is_root_bus(bus) && bus->is_added) + if (atomic_read(&bridge->enable_cnt) != 0) return; dev_info(&bridge->dev, "PCI bridge, secondary bus %04x:%02x\n",