diff options
| author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-05-22 14:35:21 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-06-10 10:59:51 -0700 |
| commit | e7891c733f9b26c851edde50cf886a30bd133dbd (patch) | |
| tree | 586fcf54403d2d2b04e62f1665b33abc58bb09c1 | |
| parent | 25e18499e08cb097cbbfeab5de25d094d5312ee5 (diff) | |
| download | op-kernel-dev-e7891c733f9b26c851edde50cf886a30bd133dbd.zip op-kernel-dev-e7891c733f9b26c851edde50cf886a30bd133dbd.tar.gz | |
PCI/x86: write_pci_config_byte fix offset
also add write_pci_config_16
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
| -rw-r--r-- | arch/x86/pci/early.c | 9 | ||||
| -rw-r--r-- | include/asm-x86/pci-direct.h | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/arch/x86/pci/early.c b/arch/x86/pci/early.c index 42df4b6..8e2821e 100644 --- a/arch/x86/pci/early.c +++ b/arch/x86/pci/early.c @@ -49,7 +49,14 @@ void write_pci_config_byte(u8 bus, u8 slot, u8 func, u8 offset, u8 val) { PDprintk("%x writing to %x: %x\n", slot, offset, val); outl(0x80000000 | (bus<<16) | (slot<<11) | (func<<8) | offset, 0xcf8); - outb(val, 0xcfc); + outb(val, 0xcfc + (offset&3)); +} + +void write_pci_config_16(u8 bus, u8 slot, u8 func, u8 offset, u16 val) +{ + PDprintk("%x writing to %x: %x\n", slot, offset, val); + outl(0x80000000 | (bus<<16) | (slot<<11) | (func<<8) | offset, 0xcf8); + outw(val, 0xcfc + (offset&2)); } int early_pci_allowed(void) diff --git a/include/asm-x86/pci-direct.h b/include/asm-x86/pci-direct.h index 5b21485..7bd40b4 100644 --- a/include/asm-x86/pci-direct.h +++ b/include/asm-x86/pci-direct.h @@ -11,6 +11,7 @@ extern u8 read_pci_config_byte(u8 bus, u8 slot, u8 func, u8 offset); extern u16 read_pci_config_16(u8 bus, u8 slot, u8 func, u8 offset); extern void write_pci_config(u8 bus, u8 slot, u8 func, u8 offset, u32 val); extern void write_pci_config_byte(u8 bus, u8 slot, u8 func, u8 offset, u8 val); +extern void write_pci_config_16(u8 bus, u8 slot, u8 func, u8 offset, u16 val); extern int early_pci_allowed(void); |
