[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-a557aae29cf5916295c234d4b10ba3f8f29b8a96@git.kernel.org>
Date: Mon, 4 Jan 2010 21:42:55 GMT
From: tip-bot for Yinghai Lu <yinghai@...nel.org>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
yinghai@...nel.org, tglx@...utronix.de, jens.axboe@...cle.com
Subject: [tip:x86/urgent] x86/pci: Intel ioh bus num reg accessing fix
Commit-ID: a557aae29cf5916295c234d4b10ba3f8f29b8a96
Gitweb: http://git.kernel.org/tip/a557aae29cf5916295c234d4b10ba3f8f29b8a96
Author: Yinghai Lu <yinghai@...nel.org>
AuthorDate: Tue, 22 Dec 2009 15:40:40 -0800
Committer: H. Peter Anvin <hpa@...or.com>
CommitDate: Mon, 4 Jan 2010 13:21:51 -0800
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@...cle.com>
Signed-off-by: Yinghai Lu <yinghai@...nel.org>
LKML-Reference: <1261525263-13763-3-git-send-email-yinghai@...nel.org>
Signed-off-by: H. Peter Anvin <hpa@...or.com>
---
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 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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists