diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-12 05:23:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-12 05:23:16 -0400 |
| commit | c1502e28346fd3b9955ce654c96212c4748d900d (patch) | |
| tree | da0b2232b79343eacb243e3287bc4daed9a1726c /arch/i386/pci/mmconfig.c | |
| parent | b8d3f2448b8f4ba24f301e23585547ba1acc1f04 (diff) | |
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>
Diffstat (limited to 'arch/i386/pci/mmconfig.c')
| -rw-r--r-- | arch/i386/pci/mmconfig.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/i386/pci/mmconfig.c b/arch/i386/pci/mmconfig.c index 0d46b7a88b3b..1bf5816d34c8 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, | |||
| 115 | 115 | ||
| 116 | switch (len) { | 116 | switch (len) { |
| 117 | case 1: | 117 | case 1: |
| 118 | mmio_config_writeb(mmcfg_virt_addr, value); | 118 | mmio_config_writeb(mmcfg_virt_addr + reg, value); |
| 119 | break; | 119 | break; |
| 120 | case 2: | 120 | case 2: |
| 121 | mmio_config_writew(mmcfg_virt_addr, value); | 121 | mmio_config_writew(mmcfg_virt_addr + reg, value); |
| 122 | break; | 122 | break; |
| 123 | case 4: | 123 | case 4: |
| 124 | mmio_config_writel(mmcfg_virt_addr, value); | 124 | mmio_config_writel(mmcfg_virt_addr + reg, value); |
| 125 | break; | 125 | break; |
| 126 | } | 126 | } |
| 127 | spin_unlock_irqrestore(&pci_config_lock, flags); | 127 | spin_unlock_irqrestore(&pci_config_lock, flags); |