From patchwork Wed Feb 23 10:08:10 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 583781 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1NA8Gmk022656 for ; Wed, 23 Feb 2011 10:08:17 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752881Ab1BWKIP (ORCPT ); Wed, 23 Feb 2011 05:08:15 -0500 Received: from vpn.id2.novell.com ([195.33.99.129]:55243 "EHLO vpn.id2.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752875Ab1BWKIP convert rfc822-to-8bit (ORCPT ); Wed, 23 Feb 2011 05:08:15 -0500 Received: from EMEA1-MTA by vpn.id2.novell.com with Novell_GroupWise; Wed, 23 Feb 2011 10:18:32 +0000 Message-Id: <4D64EA9A0200007800033430@vpn.id2.novell.com> X-Mailer: Novell GroupWise Internet Agent 8.0.1 Date: Wed, 23 Feb 2011 10:08:10 +0000 From: "Jan Beulich" To: "Jesse Barnes" Cc: , , , , Subject: [PATCH] x86/pci: derive pcibios_last_bus from ACPI MCFG Mime-Version: 1.0 Content-Disposition: inline Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 23 Feb 2011 10:08:17 +0000 (UTC) --- 2.6.38-rc6/arch/x86/pci/mmconfig-shared.c +++ 2.6.38-rc6-x86-mmconfig-last-bus/arch/x86/pci/mmconfig-shared.c @@ -606,6 +606,16 @@ static void __init __pci_mmcfg_init(int if (list_empty(&pci_mmcfg_list)) return; + if (pcibios_last_bus < 0) { + const struct pci_mmcfg_region *cfg; + + list_for_each_entry(cfg, &pci_mmcfg_list, list) { + if (cfg->segment) + break; + pcibios_last_bus = cfg->end_bus; + } + } + if (pci_mmcfg_arch_init()) pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF; else {