Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42f3ab42 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[PATCH] PCI: Fix dumb bug in mmconfig fix 



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: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 52f975ea

arch/i386/pci/mmconfig.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -155,7 +155,7 @@ static __init void unreachable_devices(void) 
		addr = get_base_addr(0, 0, PCI_DEVFN(i, 0));

		addr = get_base_addr(0, 0, PCI_DEVFN(i, 0));

		if (addr != 0)

		if (addr != 0)

			pci_exp_set_dev_base(addr, 0, PCI_DEVFN(i, 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);

			set_bit(i, fallback_slots);

		spin_unlock_irqrestore(&pci_config_lock, flags);

		spin_unlock_irqrestore(&pci_config_lock, flags);

	}

	}