diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-01-03 11:38:59 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-01-04 17:23:17 +0000 |
| commit | b30e2bfe34836261d2e807c301f6b5542df8c360 (patch) | |
| tree | 1d7bccf68e142c6c6a95dd9370a68efb93906c6b /src/mainboard/asus/kcma-d8 | |
| parent | 21c60fa2b2907776e2faee5bf39e6c8a8d4c4f65 (diff) | |
amdfam10 boards: Drop array bus_sp5100
Only bus_sp5100[0] is evaluated.
Change-Id: I42a5040ea70a84fb674f2c616c6eba7b23dcdc29
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/30645
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'src/mainboard/asus/kcma-d8')
| -rw-r--r-- | src/mainboard/asus/kcma-d8/get_bus_conf.c | 14 | ||||
| -rw-r--r-- | src/mainboard/asus/kcma-d8/irq_tables.c | 5 | ||||
| -rw-r--r-- | src/mainboard/asus/kcma-d8/mptable.c | 2 |
3 files changed, 3 insertions, 18 deletions
diff --git a/src/mainboard/asus/kcma-d8/get_bus_conf.c b/src/mainboard/asus/kcma-d8/get_bus_conf.c index af893914f8..03a8415cfc 100644 --- a/src/mainboard/asus/kcma-d8/get_bus_conf.c +++ b/src/mainboard/asus/kcma-d8/get_bus_conf.c @@ -25,7 +25,6 @@ /* Global variables for MB layouts and these will be shared by irqtable mptable * and acpi_tables busnum is default. */ -u8 bus_sp5100[2]; u32 apicid_sp5100; /* @@ -50,7 +49,6 @@ u32 hcdnx[] = { void get_bus_conf(void) { u32 apicid_base; - struct device *dev; int i; sysconf.hc_possible_num = ARRAY_SIZE(pci1234x); @@ -63,17 +61,7 @@ void get_bus_conf(void) sysconf.sbdn = (sysconf.hcdn[0] & 0xff); - for (i = 0; i < 2; i++) { - bus_sp5100[i] = 0; - } - - bus_sp5100[0] = (sysconf.pci1234[0] >> 16) & 0xff; - - /* sp5100 */ - dev = dev_find_slot(bus_sp5100[0], PCI_DEVFN(0x14, 4)); - if (dev) { - bus_sp5100[1] = pci_read_config8(dev, PCI_SECONDARY_BUS); - } + pirq_router_bus = (sysconf.pci1234[0] >> 16) & 0xff; /* I/O APICs: APIC ID Version State Address */ if (IS_ENABLED(CONFIG_LOGICAL_CPUS)) diff --git a/src/mainboard/asus/kcma-d8/irq_tables.c b/src/mainboard/asus/kcma-d8/irq_tables.c index df6dae06cc..06e842a09b 100644 --- a/src/mainboard/asus/kcma-d8/irq_tables.c +++ b/src/mainboard/asus/kcma-d8/irq_tables.c @@ -60,7 +60,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn, pirq_info->rfu = rfu; } -extern u8 bus_sp5100[2]; unsigned long write_pirq_routing_table(unsigned long addr) { @@ -86,7 +85,7 @@ unsigned long write_pirq_routing_table(unsigned long addr) pirq->version = PIRQ_VERSION; /* Where the interrupt router resides */ - pirq->rtr_bus = bus_sp5100[0]; + pirq->rtr_bus = pirq_router_bus; pirq->rtr_devfn = PCI_DEVFN(0x14, 4); pirq->exclusive_irqs = 0; @@ -102,7 +101,7 @@ unsigned long write_pirq_routing_table(unsigned long addr) slot_num = 0; /* pci bridge */ - write_pirq_info(pirq_info, bus_sp5100[0], + write_pirq_info(pirq_info, pirq_router_bus, PCI_DEVFN(0x14, 4), LNKA, IRQBM, LNKB, IRQBM, LNKC, IRQBM, LNKD, IRQBM, 0, 0); pirq_info++; diff --git a/src/mainboard/asus/kcma-d8/mptable.c b/src/mainboard/asus/kcma-d8/mptable.c index 68b90b0877..44ba1567ae 100644 --- a/src/mainboard/asus/kcma-d8/mptable.c +++ b/src/mainboard/asus/kcma-d8/mptable.c @@ -21,8 +21,6 @@ #include <stdint.h> #include <cpu/amd/amdfam10_sysconf.h> -extern u8 bus_sp5100[2]; - extern u32 apicid_sp5100; |