Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7891c73 authored by Yinghai Lu's avatar Yinghai Lu Committed by Jesse Barnes
Browse files

PCI/x86: write_pci_config_byte fix offset 



also add write_pci_config_16

Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 25e18499

arch/x86/pci/early.c

+8 −1
Original line number Diff line number Diff line
@@ -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)

include/asm-x86/pci-direct.h

+1 −0
Original line number Diff line number Diff line
@@ -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);