diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-12-16 12:42:23 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-12-16 12:42:23 -0800 |
commit | a905c063d2bfc02a8edbac918302f8ac9f1bf6c9 (patch) | |
tree | 47a885b347a11a8584ee6276bed8b9e03a745367 /pci | |
parent | ed9af8201a5fda2a87e80b84f43ecb2467611ccb (diff) | |
download | patches-a905c063d2bfc02a8edbac918302f8ac9f1bf6c9.tar.gz |
moved pci fix patch
Diffstat (limited to 'pci')
-rw-r--r-- | pci/fix-dumb-bug-in-mmconfig-fix.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/pci/fix-dumb-bug-in-mmconfig-fix.patch b/pci/fix-dumb-bug-in-mmconfig-fix.patch new file mode 100644 index 0000000000000..2e00c5e4292da --- /dev/null +++ b/pci/fix-dumb-bug-in-mmconfig-fix.patch @@ -0,0 +1,34 @@ +From ak@suse.de Thu Dec 15 19:19:29 2005 +Date: Fri, 16 Dec 2005 01:04:45 +0100 +From: Andi Kleen <ak@suse.de> +To: gregkh@suse.de +Cc: linux-kernel@vger.kernel.org +Subject: PCI: Fix dumb bug in mmconfig fix +Message-ID: <20051216000445.GN15804@wotan.suse.de> +Content-Disposition: inline + + +Use correct address when referencing mmconfig aperture while checking +for broken MCFG. This was a typo when porting the code from 64bit to +32bit. It caused oopses at boot on some ThinkPads. + +Should definitely go into 2.6.15. + +Signed-off-by: Andi Kleen <ak@suse.de> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + arch/i386/pci/mmconfig.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- gregkh-2.6.orig/arch/i386/pci/mmconfig.c ++++ gregkh-2.6/arch/i386/pci/mmconfig.c +@@ -155,7 +155,7 @@ static __init void unreachable_devices(v + addr = get_base_addr(0, 0, PCI_DEVFN(i, 0)); + if (addr != 0) + pci_exp_set_dev_base(addr, 0, PCI_DEVFN(i, 0)); +- if (addr == 0 || readl((u32 __iomem *)addr) != val1) ++ if (addr == 0 || readl((u32 __iomem *)mmcfg_virt_addr) != val1) + set_bit(i, fallback_slots); + spin_unlock_irqrestore(&pci_config_lock, flags); + } |