So we can pass pci_dev *dev to reuse some generic pci functions. The original patch was written by Yinghai Lu. Signed-off-by: Takao Indoh <indou.takao@xxxxxxxxxxxxxx> --- arch/x86/include/asm/pci-direct.h | 2 + arch/x86/pci/early.c | 74 +++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 0 deletions(-) diff --git a/arch/x86/include/asm/pci-direct.h b/arch/x86/include/asm/pci-direct.h index b1e7a45..b6360d3 100644 --- a/arch/x86/include/asm/pci-direct.h +++ b/arch/x86/include/asm/pci-direct.h @@ -18,4 +18,6 @@ extern int early_pci_allowed(void); extern unsigned int pci_early_dump_regs; extern void early_dump_pci_device(u8 bus, u8 slot, u8 func); extern void early_dump_pci_devices(void); + +struct pci_dev *get_early_pci_dev(int num, int slot, int func); #endif /* _ASM_X86_PCI_DIRECT_H */ diff --git a/arch/x86/pci/early.c b/arch/x86/pci/early.c index d1067d5..024def7 100644 --- a/arch/x86/pci/early.c +++ b/arch/x86/pci/early.c @@ -109,3 +109,77 @@ void early_dump_pci_devices(void) } } } + +static __init int +early_pci_read(struct pci_bus *bus, unsigned int devfn, int where, + int size, u32 *value) +{ + int num, slot, func; + + num = bus->number; + slot = PCI_SLOT(devfn); + func = PCI_FUNC(devfn); + switch (size) { + case 1: + *value = read_pci_config_byte(num, slot, func, where); + break; + case 2: + *value = read_pci_config_16(num, slot, func, where); + break; + case 4: + *value = read_pci_config(num, slot, func, where); + break; + } + + return 0; +} + +static __init int +early_pci_write(struct pci_bus *bus, unsigned int devfn, int where, + int size, u32 value) +{ + int num, slot, func; + + num = bus->number; + slot = PCI_SLOT(devfn); + func = PCI_FUNC(devfn); + switch (size) { + case 1: + write_pci_config_byte(num, slot, func, where, (u8)value); + break; + case 2: + write_pci_config_16(num, slot, func, where, (u16)value); + break; + case 4: + write_pci_config(num, slot, func, where, (u32)value); + break; + } + + return 0; +} + +static __initdata struct pci_ops pci_early_ops = { + .read = early_pci_read, + .write = early_pci_write, +}; +static __initdata struct pci_bus pci_early_bus = { + .ops = &pci_early_ops, +}; +static __initdata char pci_early_init_name[8]; +static __initdata struct pci_dev pci_early_dev; + +__init struct pci_dev *get_early_pci_dev(int num, int slot, int func) +{ + struct pci_dev *pdev; + + pdev = &pci_early_dev; + memset(pdev, 0, sizeof(*pdev)); + + pdev->bus = &pci_early_bus, + pdev->dev.init_name = pci_early_init_name; + pdev->bus->number = num; + pdev->devfn = PCI_DEVFN(slot, func); + sprintf((char *)pdev->dev.init_name, "%02x:%02x.%01x", num, slot, func); + + return pdev; +} -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html