From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sun, 12 Aug 2007 09:23:16 +0000 (-0700)
Subject: i386: Fix broken mmiocfg accesses
X-Git-Tag: v2.6.23-rc3~6
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1502e28346fd3b9955ce654c96212c4748d900d;p=linux-2.6

i386: Fix broken mmiocfg accesses

Commit 3320ad994afb2c44ad34b3b34c3c5cf0da297331 broke mmio config space
accesses totally on i386 - it dropped the "reg" offset to the address.

Cc: dean gaudet <dean@arctic.org>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/arch/i386/pci/mmconfig.c b/arch/i386/pci/mmconfig.c
index 0d46b7a88b..1bf5816d34 100644
--- a/arch/i386/pci/mmconfig.c
+++ b/arch/i386/pci/mmconfig.c
@@ -115,13 +115,13 @@ static int pci_mmcfg_write(unsigned int seg, unsigned int bus,
 
 	switch (len) {
 	case 1:
-		mmio_config_writeb(mmcfg_virt_addr, value);
+		mmio_config_writeb(mmcfg_virt_addr + reg, value);
 		break;
 	case 2:
-		mmio_config_writew(mmcfg_virt_addr, value);
+		mmio_config_writew(mmcfg_virt_addr + reg, value);
 		break;
 	case 4:
-		mmio_config_writel(mmcfg_virt_addr, value);
+		mmio_config_writel(mmcfg_virt_addr + reg, value);
 		break;
 	}
 	spin_unlock_irqrestore(&pci_config_lock, flags);