From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1163186AbWLGS3n (ORCPT ); Thu, 7 Dec 2006 13:29:43 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1163184AbWLGS3n (ORCPT ); Thu, 7 Dec 2006 13:29:43 -0500 Received: from dspnet.fr.eu.org ([213.186.44.138]:4991 "EHLO dspnet.fr.eu.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1163185AbWLGS3l (ORCPT ); Thu, 7 Dec 2006 13:29:41 -0500 Date: Thu, 7 Dec 2006 19:29:40 +0100 From: Olivier Galibert To: Andi Kleen , linux-pci@atrey.karlin.mff.cuni.cz, "Hack inc." , Linus Torvalds , Muli Ben-Yehuda Subject: [PATCH 2/5] PCI MMConfig: Only call unreachable_devices() when type 1 is available. Message-ID: <20061207182940.GB73583@dspnet.fr.eu.org> Mail-Followup-To: Olivier Galibert , Andi Kleen , linux-pci@atrey.karlin.mff.cuni.cz, "Hack inc." , Linus Torvalds , Muli Ben-Yehuda References: <20061207181726.GA69863@dspnet.fr.eu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20061207181726.GA69863@dspnet.fr.eu.org> User-Agent: Mutt/1.4.2.2i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org unreachable_devices compares between the results of pci configuration accesses through type1 and mmconfig, so it should be called only if type1 actually works in the first place. Signed-off-by: Olivier Galibert --- arch/i386/pci/mmconfig-shared.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/i386/pci/mmconfig-shared.c b/arch/i386/pci/mmconfig-shared.c index b3ab210..7b19639 100644 --- a/arch/i386/pci/mmconfig-shared.c +++ b/arch/i386/pci/mmconfig-shared.c @@ -80,7 +80,8 @@ void __init pci_mmcfg_init(int type) } if (pci_mmcfg_arch_init()) { - unreachable_devices(); + if (type == 1) + unreachable_devices(); pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF; } } -- 1.4.4.1.g278f