One additional x86 fix for 2.6.34
H. Peter Anvin
reviewerHi Linus,
One additional fix for the 2.6.34 tree. It missed my push from earlier today because I was waiting for confirmation from the original reporter that it indeed solves the problem.
The following changes since commit 7f284d3cc96e02468a42e045f77af11e5ff8b095:
Frank Arnold (1):
x86, cacheinfo: Turn off L3 cache index disable feature in virtualized environments
are available in the git repository at:
ssh://master.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-fixes-for-linus
H. Peter Anvin (1):
x86, mrst: Don't blindly access extended config space
arch/x86/pci/mrst.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
commit e9b1d5d0ff4d3ae86050dc4c91b3147361c7af9e
Author: H. Peter Anvin <[email protected]> Date: Fri May 14 13:55:57 2010 -0700
x86, mrst: Don't blindly access extended config space
Do not blindly access extended configuration space unless we actively know we're on a Moorestown platform. The fixed-size BAR capability lives in the extended configuration space, and thus is not applicable if the configuration space isn't appropriately sized.
This fixes booting certain VMware configurations with CONFIG_MRST=y.
Moorestown will add a fake PCI-X 266 capability to advertise the presence of extended configuration space.
LKML-Reference: <[email protected]>
arch/x86/pci/mrst.c +4 -0
@@ -247,6 +247,10 @@ static void __devinit pci_fixed_bar_fixup(struct pci_dev *dev)u32 size;int i; +/* Must have extended configuration space */ +if (dev->cfg_size <PCIE_CAP_OFFSET +4 ) +return ; +/* Fixup the BAR sizes for fixed BAR devices and make them unmoveable */ offset =fixed_bar_cap (dev->bus, dev->devfn); if (!offset || PCI_DEVFN(2, 0) == dev->devfn ||