diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2009-12-23 00:40:40 +0100 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-01-04 22:21:51 +0100 |
| commit | a557aae29cf5916295c234d4b10ba3f8f29b8a96 (patch) | |
| tree | 157bc14fd71d335130973d3e0a2a0980df67a8cb /arch/x86/pci | |
| parent | x86: Fix size for ex trampoline with 32bit (diff) | |
| download | linux-a557aae29cf5916295c234d4b10ba3f8f29b8a96.tar.xz linux-a557aae29cf5916295c234d4b10ba3f8f29b8a96.zip | |
x86/pci: Intel ioh bus num reg accessing fix
It is above 0x100 (PCI-Express extended register space), so if mmconf
is not enable, we can't access it.
[ hpa: changed the bound from 0x200 to 0x120, which is the tight
bound. ]
Reported-by: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <1261525263-13763-3-git-send-email-yinghai@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/pci')
| -rw-r--r-- | arch/x86/pci/intel_bus.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/pci/intel_bus.c b/arch/x86/pci/intel_bus.c index b7a55dc55d13..f81a2fa8fe25 100644 --- a/arch/x86/pci/intel_bus.c +++ b/arch/x86/pci/intel_bus.c @@ -49,6 +49,10 @@ static void __devinit pci_root_bus_res(struct pci_dev *dev) u64 mmioh_base, mmioh_end; int bus_base, bus_end; + /* some sys doesn't get mmconf enabled */ + if (dev->cfg_size < 0x120) + return; + if (pci_root_num >= PCI_ROOT_NR) { printk(KERN_DEBUG "intel_bus.c: PCI_ROOT_NR is too small\n"); return; |