diff options
| -rw-r--r-- | src/arch/x86/lib/pci_ops_conf1.c | 56 | ||||
| -rw-r--r-- | src/arch/x86/lib/pci_ops_conf2.c | 26 |
2 files changed, 47 insertions, 35 deletions
diff --git a/src/arch/x86/lib/pci_ops_conf1.c b/src/arch/x86/lib/pci_ops_conf1.c index 36db54c21b..266a9cc9dc 100644 --- a/src/arch/x86/lib/pci_ops_conf1.c +++ b/src/arch/x86/lib/pci_ops_conf1.c @@ -9,55 +9,63 @@ */ #if CONFIG_PCI_IO_CFG_EXT == 0 -#define CONFIG_CMD(bus,devfn, where) (0x80000000 | (bus << 16) | (devfn << 8) | (where & ~3)) +#define CONFIG_CMD(bus,devfn, where) (0x80000000 | (bus << 16) | \ + (devfn << 8) | (where & ~3)) #else -#define CONFIG_CMD(bus,devfn, where) (0x80000000 | (bus << 16) | (devfn << 8) | ((where & 0xff) & ~3) | ((where & 0xf00)<<16) ) +#define CONFIG_CMD(bus,devfn, where) (0x80000000 | (bus << 16) | \ + (devfn << 8) | ((where & 0xff) & ~3) |\ + ((where & 0xf00)<<16)) #endif -static uint8_t pci_conf1_read_config8(struct bus *pbus, int bus, int devfn, int where) +static uint8_t pci_conf1_read_config8(struct bus *pbus, int bus, int devfn, + int where) { - outl(CONFIG_CMD(bus, devfn, where), 0xCF8); - return inb(0xCFC + (where & 3)); + outl(CONFIG_CMD(bus, devfn, where), 0xCF8); + return inb(0xCFC + (where & 3)); } -static uint16_t pci_conf1_read_config16(struct bus *pbus, int bus, int devfn, int where) +static uint16_t pci_conf1_read_config16(struct bus *pbus, int bus, int devfn, + int where) { - outl(CONFIG_CMD(bus, devfn, where), 0xCF8); - return inw(0xCFC + (where & 2)); + outl(CONFIG_CMD(bus, devfn, where), 0xCF8); + return inw(0xCFC + (where & 2)); } -static uint32_t pci_conf1_read_config32(struct bus *pbus, int bus, int devfn, int where) +static uint32_t pci_conf1_read_config32(struct bus *pbus, int bus, int devfn, + int where) { - outl(CONFIG_CMD(bus, devfn, where), 0xCF8); - return inl(0xCFC); + outl(CONFIG_CMD(bus, devfn, where), 0xCF8); + return inl(0xCFC); } -static void pci_conf1_write_config8(struct bus *pbus, int bus, int devfn, int where, uint8_t value) +static void pci_conf1_write_config8(struct bus *pbus, int bus, int devfn, + int where, uint8_t value) { - outl(CONFIG_CMD(bus, devfn, where), 0xCF8); - outb(value, 0xCFC + (where & 3)); + outl(CONFIG_CMD(bus, devfn, where), 0xCF8); + outb(value, 0xCFC + (where & 3)); } -static void pci_conf1_write_config16(struct bus *pbus, int bus, int devfn, int where, uint16_t value) +static void pci_conf1_write_config16(struct bus *pbus, int bus, int devfn, + int where, uint16_t value) { - outl(CONFIG_CMD(bus, devfn, where), 0xCF8); - outw(value, 0xCFC + (where & 2)); + outl(CONFIG_CMD(bus, devfn, where), 0xCF8); + outw(value, 0xCFC + (where & 2)); } -static void pci_conf1_write_config32(struct bus *pbus, int bus, int devfn, int where, uint32_t value) +static void pci_conf1_write_config32(struct bus *pbus, int bus, int devfn, + int where, uint32_t value) { - outl(CONFIG_CMD(bus, devfn, where), 0xCF8); - outl(value, 0xCFC); + outl(CONFIG_CMD(bus, devfn, where), 0xCF8); + outl(value, 0xCFC); } #undef CONFIG_CMD -const struct pci_bus_operations pci_cf8_conf1 = -{ - .read8 = pci_conf1_read_config8, +const struct pci_bus_operations pci_cf8_conf1 = { + .read8 = pci_conf1_read_config8, .read16 = pci_conf1_read_config16, .read32 = pci_conf1_read_config32, - .write8 = pci_conf1_write_config8, + .write8 = pci_conf1_write_config8, .write16 = pci_conf1_write_config16, .write32 = pci_conf1_write_config32, }; diff --git a/src/arch/x86/lib/pci_ops_conf2.c b/src/arch/x86/lib/pci_ops_conf2.c index 839f5b44c7..e89c933fc2 100644 --- a/src/arch/x86/lib/pci_ops_conf2.c +++ b/src/arch/x86/lib/pci_ops_conf2.c @@ -12,7 +12,8 @@ #define FUNC(devfn) (((devfn & 7) << 1) | 0xf0) #define SET(bus,devfn) outb(FUNC(devfn), 0xCF8); outb(bus, 0xCFA); -static uint8_t pci_conf2_read_config8(struct bus *pbus, int bus, int devfn, int where) +static uint8_t pci_conf2_read_config8(struct bus *pbus, int bus, int devfn, + int where) { uint8_t value; SET(bus, devfn); @@ -21,7 +22,8 @@ static uint8_t pci_conf2_read_config8(struct bus *pbus, int bus, int devfn, int return value; } -static uint16_t pci_conf2_read_config16(struct bus *pbus, int bus, int devfn, int where) +static uint16_t pci_conf2_read_config16(struct bus *pbus, int bus, int devfn, + int where) { uint16_t value; SET(bus, devfn); @@ -30,7 +32,8 @@ static uint16_t pci_conf2_read_config16(struct bus *pbus, int bus, int devfn, in return value; } -static uint32_t pci_conf2_read_config32(struct bus *pbus, int bus, int devfn, int where) +static uint32_t pci_conf2_read_config32(struct bus *pbus, int bus, int devfn, + int where) { uint32_t value; SET(bus, devfn); @@ -39,21 +42,24 @@ static uint32_t pci_conf2_read_config32(struct bus *pbus, int bus, int devfn, in return value; } -static void pci_conf2_write_config8(struct bus *pbus, int bus, int devfn, int where, uint8_t value) +static void pci_conf2_write_config8(struct bus *pbus, int bus, int devfn, + int where, uint8_t value) { SET(bus, devfn); outb(value, IOADDR(devfn, where)); outb(0, 0xCF8); } -static void pci_conf2_write_config16(struct bus *pbus, int bus, int devfn, int where, uint16_t value) +static void pci_conf2_write_config16(struct bus *pbus, int bus, int devfn, + int where, uint16_t value) { SET(bus, devfn); outw(value, IOADDR(devfn, where)); outb(0, 0xCF8); } -static void pci_conf2_write_config32(struct bus *pbus, int bus, int devfn, int where, uint32_t value) +static void pci_conf2_write_config32(struct bus *pbus, int bus, int devfn, + int where, uint32_t value) { SET(bus, devfn); outl(value, IOADDR(devfn, where)); @@ -64,13 +70,11 @@ static void pci_conf2_write_config32(struct bus *pbus, int bus, int devfn, int w #undef IOADDR #undef FUNC -const struct pci_bus_operations pci_cf8_conf2 = -{ - .read8 = pci_conf2_read_config8, +const struct pci_bus_operations pci_cf8_conf2 = { + .read8 = pci_conf2_read_config8, .read16 = pci_conf2_read_config16, .read32 = pci_conf2_read_config32, - .write8 = pci_conf2_write_config8, + .write8 = pci_conf2_write_config8, .write16 = pci_conf2_write_config16, .write32 = pci_conf2_write_config32, }; - |