aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2009-12-22 15:40:40 -0800
committerH. Peter Anvin <hpa@zytor.com>2010-01-04 13:21:51 -0800
commita557aae29cf5916295c234d4b10ba3f8f29b8a96 (patch)
tree157bc14fd71d335130973d3e0a2a0980df67a8cb /arch/x86
parent9dad0fd5a73d4048dff18069733c0b515f68df74 (diff)
downloadkernel_samsung_smdk4412-a557aae29cf5916295c234d4b10ba3f8f29b8a96.zip
kernel_samsung_smdk4412-a557aae29cf5916295c234d4b10ba3f8f29b8a96.tar.gz
kernel_samsung_smdk4412-a557aae29cf5916295c234d4b10ba3f8f29b8a96.tar.bz2
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')
-rw-r--r--arch/x86/pci/intel_bus.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/pci/intel_bus.c b/arch/x86/pci/intel_bus.c
index b7a55dc..f81a2fa 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;