diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-01-03 11:39:03 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-01-04 17:23:44 +0000 |
| commit | ee7e1300f44a635c12abcdfae46453ca253d6499 (patch) | |
| tree | f031187fa86646de466207c878a3cf3345f376de /src/mainboard/asus | |
| parent | bf2d227135307a329ba137f6245fbeac5cf34f4e (diff) | |
| download | coreboot-ee7e1300f44a635c12abcdfae46453ca253d6499.tar.xz | |
amdfam10 boards: Drop array bus_sb700
Only bus_sb700[0] is evaluated.
Change-Id: Ie2cbbdebed3ae03da916d02919cd6a5d36f53562
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/30647
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')
| -rw-r--r-- | src/mainboard/asus/m4a78-em/get_bus_conf.c | 14 | ||||
| -rw-r--r-- | src/mainboard/asus/m4a78-em/mptable.c | 3 | ||||
| -rw-r--r-- | src/mainboard/asus/m4a785-m/get_bus_conf.c | 14 | ||||
| -rw-r--r-- | src/mainboard/asus/m4a785-m/mptable.c | 3 |
4 files changed, 4 insertions, 30 deletions
diff --git a/src/mainboard/asus/m4a78-em/get_bus_conf.c b/src/mainboard/asus/m4a78-em/get_bus_conf.c index b97556c4b3..88b7bf115e 100644 --- a/src/mainboard/asus/m4a78-em/get_bus_conf.c +++ b/src/mainboard/asus/m4a78-em/get_bus_conf.c @@ -24,7 +24,6 @@ /* Global variables for MB layouts and these will be shared by irqtable mptable * and acpi_tables busnum is default. */ -u8 bus_sb700[2]; u32 apicid_sb700; /* @@ -48,7 +47,6 @@ u32 hcdnx[] = { void get_bus_conf(void) { u32 apicid_base; - struct device *dev; int i; sysconf.hc_possible_num = ARRAY_SIZE(pci1234x); @@ -61,17 +59,7 @@ void get_bus_conf(void) sysconf.sbdn = (sysconf.hcdn[0] & 0xff); - for (i = 0; i < 2; i++) { - bus_sb700[i] = 0; - } - - bus_sb700[0] = (sysconf.pci1234[0] >> 16) & 0xff; - - /* sb700 */ - dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(0x14, 4)); - if (dev) { - bus_sb700[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/m4a78-em/mptable.c b/src/mainboard/asus/m4a78-em/mptable.c index 1fd89cc2de..895b747f2e 100644 --- a/src/mainboard/asus/m4a78-em/mptable.c +++ b/src/mainboard/asus/m4a78-em/mptable.c @@ -20,7 +20,6 @@ #include <stdint.h> #include <cpu/amd/amdfam10_sysconf.h> -extern u8 bus_sb700[2]; extern u32 apicid_sb700; @@ -45,7 +44,7 @@ static void *smp_write_config_table(void *v) u8 byte; dev = - dev_find_slot(bus_sb700[0], + dev_find_slot(pirq_router_bus, PCI_DEVFN(0x14, 0)); if (dev) { dword = pci_read_config32(dev, 0x74) & 0xfffffff0; diff --git a/src/mainboard/asus/m4a785-m/get_bus_conf.c b/src/mainboard/asus/m4a785-m/get_bus_conf.c index b97556c4b3..88b7bf115e 100644 --- a/src/mainboard/asus/m4a785-m/get_bus_conf.c +++ b/src/mainboard/asus/m4a785-m/get_bus_conf.c @@ -24,7 +24,6 @@ /* Global variables for MB layouts and these will be shared by irqtable mptable * and acpi_tables busnum is default. */ -u8 bus_sb700[2]; u32 apicid_sb700; /* @@ -48,7 +47,6 @@ u32 hcdnx[] = { void get_bus_conf(void) { u32 apicid_base; - struct device *dev; int i; sysconf.hc_possible_num = ARRAY_SIZE(pci1234x); @@ -61,17 +59,7 @@ void get_bus_conf(void) sysconf.sbdn = (sysconf.hcdn[0] & 0xff); - for (i = 0; i < 2; i++) { - bus_sb700[i] = 0; - } - - bus_sb700[0] = (sysconf.pci1234[0] >> 16) & 0xff; - - /* sb700 */ - dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(0x14, 4)); - if (dev) { - bus_sb700[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/m4a785-m/mptable.c b/src/mainboard/asus/m4a785-m/mptable.c index 1fd89cc2de..895b747f2e 100644 --- a/src/mainboard/asus/m4a785-m/mptable.c +++ b/src/mainboard/asus/m4a785-m/mptable.c @@ -20,7 +20,6 @@ #include <stdint.h> #include <cpu/amd/amdfam10_sysconf.h> -extern u8 bus_sb700[2]; extern u32 apicid_sb700; @@ -45,7 +44,7 @@ static void *smp_write_config_table(void *v) u8 byte; dev = - dev_find_slot(bus_sb700[0], + dev_find_slot(pirq_router_bus, PCI_DEVFN(0x14, 0)); if (dev) { dword = pci_read_config32(dev, 0x74) & 0xfffffff0; |