From ef40ca57ebd4de746eafaa1e5a1cae035337f285 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Thu, 19 Jun 2014 22:19:20 +0300 Subject: AGESA: Call get_bus_conf() just once MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead of calling get_bus_conf() three times from write_tables() and executing it once, just make one call before entering write_tables(). Change-Id: I818e37128cb0fb5eaded3c1e00b6b146c1267647 Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/6133 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan --- src/mainboard/amd/dinar/acpi_tables.c | 2 -- src/mainboard/amd/dinar/get_bus_conf.c | 10 ---------- src/mainboard/amd/dinar/irq_tables.c | 4 ---- src/mainboard/amd/dinar/mptable.c | 1 - src/mainboard/amd/inagua/acpi_tables.c | 2 -- src/mainboard/amd/inagua/get_bus_conf.c | 7 ------- src/mainboard/amd/inagua/irq_tables.c | 4 ---- src/mainboard/amd/inagua/mptable.c | 2 -- src/mainboard/amd/olivehill/acpi_tables.c | 2 -- src/mainboard/amd/olivehill/get_bus_conf.c | 5 ----- src/mainboard/amd/olivehill/irq_tables.c | 2 -- src/mainboard/amd/olivehill/mptable.c | 2 -- src/mainboard/amd/parmer/acpi_tables.c | 2 -- src/mainboard/amd/parmer/get_bus_conf.c | 5 ----- src/mainboard/amd/parmer/irq_tables.c | 2 -- src/mainboard/amd/parmer/mptable.c | 2 -- src/mainboard/amd/persimmon/acpi_tables.c | 2 -- src/mainboard/amd/persimmon/get_bus_conf.c | 6 ------ src/mainboard/amd/persimmon/irq_tables.c | 4 ---- src/mainboard/amd/persimmon/mptable.c | 3 --- src/mainboard/amd/south_station/acpi_tables.c | 2 -- src/mainboard/amd/south_station/get_bus_conf.c | 7 ------- src/mainboard/amd/south_station/irq_tables.c | 4 ---- src/mainboard/amd/south_station/mptable.c | 2 -- src/mainboard/amd/thatcher/acpi_tables.c | 2 -- src/mainboard/amd/thatcher/get_bus_conf.c | 7 ------- src/mainboard/amd/thatcher/irq_tables.c | 2 -- src/mainboard/amd/thatcher/mptable.c | 2 -- src/mainboard/amd/torpedo/acpi_tables.c | 2 -- src/mainboard/amd/torpedo/get_bus_conf.c | 8 -------- src/mainboard/amd/torpedo/irq_tables.c | 4 ---- src/mainboard/amd/torpedo/mptable.c | 2 -- src/mainboard/amd/union_station/acpi_tables.c | 2 -- src/mainboard/amd/union_station/get_bus_conf.c | 7 ------- src/mainboard/amd/union_station/irq_tables.c | 4 ---- src/mainboard/amd/union_station/mptable.c | 2 -- 36 files changed, 128 deletions(-) (limited to 'src/mainboard/amd') diff --git a/src/mainboard/amd/dinar/acpi_tables.c b/src/mainboard/amd/dinar/acpi_tables.c index 44b6306e23..5ec2d7461f 100644 --- a/src/mainboard/amd/dinar/acpi_tables.c +++ b/src/mainboard/amd/dinar/acpi_tables.c @@ -173,8 +173,6 @@ unsigned long write_acpi_tables(unsigned long start) acpi_header_t *alib; acpi_hest_t *hest; - get_bus_conf(); /* it will get sblk, pci1234, hcdn, and sbdn */ - /* Align ACPI tables to 16 bytes */ start = ALIGN(start, 16); current = start; diff --git a/src/mainboard/amd/dinar/get_bus_conf.c b/src/mainboard/amd/dinar/get_bus_conf.c index a4d627b8ac..e93ca84a02 100644 --- a/src/mainboard/amd/dinar/get_bus_conf.c +++ b/src/mainboard/amd/dinar/get_bus_conf.c @@ -59,21 +59,11 @@ u32 bus_type[256]; u32 sbdn_sb700; u32 sbdn_rd890; -static u32 get_bus_conf_done = 0; - - - - void get_bus_conf(void) { device_t dev; int i, j; - if (get_bus_conf_done == 1) - return; /* do it only once */ - - get_bus_conf_done = 1; - printk(BIOS_DEBUG, "Mainboard - Get_bus_conf.c - get_bus_conf - Start.\n"); sbdn_sb700 = 0; diff --git a/src/mainboard/amd/dinar/irq_tables.c b/src/mainboard/amd/dinar/irq_tables.c index 5ee4de060c..0000111068 100644 --- a/src/mainboard/amd/dinar/irq_tables.c +++ b/src/mainboard/amd/dinar/irq_tables.c @@ -58,10 +58,6 @@ unsigned long write_pirq_routing_table(unsigned long addr) u8 sum = 0; int i; - - get_bus_conf(); /* it will find out all bus num and apic that share with mptable.c and mptable.c and acpi_tables.c */ - - /* Align the table to be 16 byte aligned. */ addr += 15; addr &= ~15; diff --git a/src/mainboard/amd/dinar/mptable.c b/src/mainboard/amd/dinar/mptable.c index 5f9e83bdac..65304e132d 100644 --- a/src/mainboard/amd/dinar/mptable.c +++ b/src/mainboard/amd/dinar/mptable.c @@ -48,7 +48,6 @@ static void *smp_write_config_table(void *v) mptable_init(mc, LOCAL_APIC_ADDR); smp_write_processors(mc); - get_bus_conf(); mptable_write_buses(mc, NULL, &bus_isa); /* diff --git a/src/mainboard/amd/inagua/acpi_tables.c b/src/mainboard/amd/inagua/acpi_tables.c index 227a49bf42..588345e6eb 100644 --- a/src/mainboard/amd/inagua/acpi_tables.c +++ b/src/mainboard/amd/inagua/acpi_tables.c @@ -133,8 +133,6 @@ unsigned long write_acpi_tables(unsigned long start) acpi_header_t *alib; acpi_hest_t *hest; - get_bus_conf(); /* it will get sblk, pci1234, hcdn, and sbdn */ - /* Align ACPI tables to 16 bytes */ start = ALIGN(start, 16); current = start; diff --git a/src/mainboard/amd/inagua/get_bus_conf.c b/src/mainboard/amd/inagua/get_bus_conf.c index 8ab41d102d..ac72b48110 100644 --- a/src/mainboard/amd/inagua/get_bus_conf.c +++ b/src/mainboard/amd/inagua/get_bus_conf.c @@ -49,9 +49,6 @@ u32 pci1234x[] = { u32 bus_type[256]; u32 sbdn_sb800; -static u32 get_bus_conf_done = 0; - - void get_bus_conf(void) { u32 apicid_base; @@ -59,10 +56,6 @@ void get_bus_conf(void) device_t dev; int i, j; - if (get_bus_conf_done == 1) - return; /* do it only once */ - - get_bus_conf_done = 1; sbdn_sb800 = 0; diff --git a/src/mainboard/amd/inagua/irq_tables.c b/src/mainboard/amd/inagua/irq_tables.c index 0fc634961f..1318d4d510 100644 --- a/src/mainboard/amd/inagua/irq_tables.c +++ b/src/mainboard/amd/inagua/irq_tables.c @@ -59,10 +59,6 @@ unsigned long write_pirq_routing_table(unsigned long addr) u8 sum = 0; int i; - - get_bus_conf(); /* it will find out all bus num and apic that share with mptable.c and mptable.c and acpi_tables.c */ - - /* Align the table to be 16 byte aligned. */ addr += 15; addr &= ~15; diff --git a/src/mainboard/amd/inagua/mptable.c b/src/mainboard/amd/inagua/mptable.c index 73522050ff..d2f850665c 100644 --- a/src/mainboard/amd/inagua/mptable.c +++ b/src/mainboard/amd/inagua/mptable.c @@ -60,8 +60,6 @@ static void *smp_write_config_table(void *v) smp_write_processors(mc); - get_bus_conf(); - mptable_write_buses(mc, NULL, &bus_isa); /* I/O APICs: APIC ID Version State Address */ diff --git a/src/mainboard/amd/olivehill/acpi_tables.c b/src/mainboard/amd/olivehill/acpi_tables.c index ac5a890dcc..07fad8eb1e 100644 --- a/src/mainboard/amd/olivehill/acpi_tables.c +++ b/src/mainboard/amd/olivehill/acpi_tables.c @@ -138,8 +138,6 @@ unsigned long write_acpi_tables(unsigned long start) acpi_header_t *ivrs; acpi_hest_t *hest; - get_bus_conf(); /* it will get sblk, pci1234, hcdn, and sbdn */ - /* Align ACPI tables to 16 bytes */ start = ALIGN(start, 16); current = start; diff --git a/src/mainboard/amd/olivehill/get_bus_conf.c b/src/mainboard/amd/olivehill/get_bus_conf.c index 3addc97cf4..f1643a43a7 100644 --- a/src/mainboard/amd/olivehill/get_bus_conf.c +++ b/src/mainboard/amd/olivehill/get_bus_conf.c @@ -48,7 +48,6 @@ u32 pci1234x[] = { u32 bus_type[256]; u32 sbdn_yangtze; -static u32 get_bus_conf_done = 0; void get_bus_conf(void) { @@ -58,10 +57,6 @@ void get_bus_conf(void) device_t dev; int i, j; - if (get_bus_conf_done == 1) - return; /* do it only once */ - - get_bus_conf_done = 1; dev = dev_find_slot(0, PCI_DEVFN(0, 0)); /* clear IoapicSbFeatureEn */ pci_write_config32(dev, 0xF8, 0); diff --git a/src/mainboard/amd/olivehill/irq_tables.c b/src/mainboard/amd/olivehill/irq_tables.c index c14fd49cf0..bea6eb2ed3 100644 --- a/src/mainboard/amd/olivehill/irq_tables.c +++ b/src/mainboard/amd/olivehill/irq_tables.c @@ -57,8 +57,6 @@ unsigned long write_pirq_routing_table(unsigned long addr) u8 sum = 0; int i; - get_bus_conf(); /* it will find out all bus num and apic that share with mptable.c and mptable.c and acpi_tables.c */ - /* Align the table to be 16 byte aligned. */ addr += 15; addr &= ~15; diff --git a/src/mainboard/amd/olivehill/mptable.c b/src/mainboard/amd/olivehill/mptable.c index adf3b6cf14..3ccb9100c9 100644 --- a/src/mainboard/amd/olivehill/mptable.c +++ b/src/mainboard/amd/olivehill/mptable.c @@ -84,8 +84,6 @@ static void *smp_write_config_table(void *v) smp_write_processors(mc); - get_bus_conf(); - //mptable_write_buses(mc, NULL, &bus_isa); my_smp_write_bus(mc, 0, "PCI "); my_smp_write_bus(mc, 1, "PCI "); diff --git a/src/mainboard/amd/parmer/acpi_tables.c b/src/mainboard/amd/parmer/acpi_tables.c index eb6b419655..503ba48498 100644 --- a/src/mainboard/amd/parmer/acpi_tables.c +++ b/src/mainboard/amd/parmer/acpi_tables.c @@ -134,8 +134,6 @@ unsigned long write_acpi_tables(unsigned long start) acpi_header_t *ivrs; acpi_hest_t *hest; - get_bus_conf(); /* it will get sblk, pci1234, hcdn, and sbdn */ - /* Align ACPI tables to 16 bytes */ start = ALIGN(start, 16); current = start; diff --git a/src/mainboard/amd/parmer/get_bus_conf.c b/src/mainboard/amd/parmer/get_bus_conf.c index ce5276fb52..4c4777f0dc 100644 --- a/src/mainboard/amd/parmer/get_bus_conf.c +++ b/src/mainboard/amd/parmer/get_bus_conf.c @@ -48,7 +48,6 @@ u32 pci1234x[] = { u32 bus_type[256]; u32 sbdn_hudson; -static u32 get_bus_conf_done = 0; void get_bus_conf(void) { @@ -57,10 +56,6 @@ void get_bus_conf(void) device_t dev; int i, j; - if (get_bus_conf_done == 1) - return; /* do it only once */ - - get_bus_conf_done = 1; sbdn_hudson = 0; diff --git a/src/mainboard/amd/parmer/irq_tables.c b/src/mainboard/amd/parmer/irq_tables.c index 6f907e2ae1..20fbb5d263 100644 --- a/src/mainboard/amd/parmer/irq_tables.c +++ b/src/mainboard/amd/parmer/irq_tables.c @@ -57,8 +57,6 @@ unsigned long write_pirq_routing_table(unsigned long addr) u8 sum = 0; int i; - get_bus_conf(); /* it will find out all bus num and apic that share with mptable.c and mptable.c and acpi_tables.c */ - /* Align the table to be 16 byte aligned. */ addr += 15; addr &= ~15; diff --git a/src/mainboard/amd/parmer/mptable.c b/src/mainboard/amd/parmer/mptable.c index 3484289346..0980063727 100644 --- a/src/mainboard/amd/parmer/mptable.c +++ b/src/mainboard/amd/parmer/mptable.c @@ -84,8 +84,6 @@ static void *smp_write_config_table(void *v) smp_write_processors(mc); - get_bus_conf(); - //mptable_write_buses(mc, NULL, &bus_isa); my_smp_write_bus(mc, 0, "PCI "); my_smp_write_bus(mc, 1, "PCI "); diff --git a/src/mainboard/amd/persimmon/acpi_tables.c b/src/mainboard/amd/persimmon/acpi_tables.c index 227a49bf42..588345e6eb 100644 --- a/src/mainboard/amd/persimmon/acpi_tables.c +++ b/src/mainboard/amd/persimmon/acpi_tables.c @@ -133,8 +133,6 @@ unsigned long write_acpi_tables(unsigned long start) acpi_header_t *alib; acpi_hest_t *hest; - get_bus_conf(); /* it will get sblk, pci1234, hcdn, and sbdn */ - /* Align ACPI tables to 16 bytes */ start = ALIGN(start, 16); current = start; diff --git a/src/mainboard/amd/persimmon/get_bus_conf.c b/src/mainboard/amd/persimmon/get_bus_conf.c index 15b19896ae..c8369e1cde 100644 --- a/src/mainboard/amd/persimmon/get_bus_conf.c +++ b/src/mainboard/amd/persimmon/get_bus_conf.c @@ -51,8 +51,6 @@ u32 pci1234x[] = { u32 bus_type[256]; u32 sbdn_sb800; -static u32 get_bus_conf_done = 0; - void get_bus_conf(void) { u32 apicid_base; @@ -60,10 +58,6 @@ void get_bus_conf(void) device_t dev; int i, j; - if (get_bus_conf_done == 1) - return; /* do it only once */ - - get_bus_conf_done = 1; sbdn_sb800 = 0; diff --git a/src/mainboard/amd/persimmon/irq_tables.c b/src/mainboard/amd/persimmon/irq_tables.c index b8c211ac58..dbbb2afddf 100644 --- a/src/mainboard/amd/persimmon/irq_tables.c +++ b/src/mainboard/amd/persimmon/irq_tables.c @@ -59,10 +59,6 @@ unsigned long write_pirq_routing_table(unsigned long addr) u8 sum = 0; int i; - - get_bus_conf(); /* it will find out all bus num and apic that share with mptable.c and mptable.c and acpi_tables.c */ - - /* Align the table to be 16 byte aligned. */ addr += 15; addr &= ~15; diff --git a/src/mainboard/amd/persimmon/mptable.c b/src/mainboard/amd/persimmon/mptable.c index 2c2ec06bff..780bb2c905 100644 --- a/src/mainboard/amd/persimmon/mptable.c +++ b/src/mainboard/amd/persimmon/mptable.c @@ -56,9 +56,6 @@ static void *smp_write_config_table(void *v) */ smp_write_processors(mc); - /* Get Bus Configuration */ - get_bus_conf(); - /* * Type 1: Bus Entries: * Bus ID, Bus Type diff --git a/src/mainboard/amd/south_station/acpi_tables.c b/src/mainboard/amd/south_station/acpi_tables.c index 227a49bf42..588345e6eb 100644 --- a/src/mainboard/amd/south_station/acpi_tables.c +++ b/src/mainboard/amd/south_station/acpi_tables.c @@ -133,8 +133,6 @@ unsigned long write_acpi_tables(unsigned long start) acpi_header_t *alib; acpi_hest_t *hest; - get_bus_conf(); /* it will get sblk, pci1234, hcdn, and sbdn */ - /* Align ACPI tables to 16 bytes */ start = ALIGN(start, 16); current = start; diff --git a/src/mainboard/amd/south_station/get_bus_conf.c b/src/mainboard/amd/south_station/get_bus_conf.c index 6a3d23250c..7eedcba821 100644 --- a/src/mainboard/amd/south_station/get_bus_conf.c +++ b/src/mainboard/amd/south_station/get_bus_conf.c @@ -49,9 +49,6 @@ u32 pci1234x[] = { u32 bus_type[256]; u32 sbdn_sb800; -static u32 get_bus_conf_done = 0; - - void get_bus_conf(void) { u32 apicid_base; @@ -59,10 +56,6 @@ void get_bus_conf(void) device_t dev; int i, j; - if (get_bus_conf_done == 1) - return; /* do it only once */ - - get_bus_conf_done = 1; sbdn_sb800 = 0; diff --git a/src/mainboard/amd/south_station/irq_tables.c b/src/mainboard/amd/south_station/irq_tables.c index b8c211ac58..dbbb2afddf 100644 --- a/src/mainboard/amd/south_station/irq_tables.c +++ b/src/mainboard/amd/south_station/irq_tables.c @@ -59,10 +59,6 @@ unsigned long write_pirq_routing_table(unsigned long addr) u8 sum = 0; int i; - - get_bus_conf(); /* it will find out all bus num and apic that share with mptable.c and mptable.c and acpi_tables.c */ - - /* Align the table to be 16 byte aligned. */ addr += 15; addr &= ~15; diff --git a/src/mainboard/amd/south_station/mptable.c b/src/mainboard/amd/south_station/mptable.c index e9175d8d26..f266b4fcd7 100644 --- a/src/mainboard/amd/south_station/mptable.c +++ b/src/mainboard/amd/south_station/mptable.c @@ -56,8 +56,6 @@ static void *smp_write_config_table(void *v) smp_write_processors(mc); - get_bus_conf(); - mptable_write_buses(mc, NULL, &bus_isa); /* I/O APICs: APIC ID Version State Address */ diff --git a/src/mainboard/amd/thatcher/acpi_tables.c b/src/mainboard/amd/thatcher/acpi_tables.c index eb6b419655..503ba48498 100644 --- a/src/mainboard/amd/thatcher/acpi_tables.c +++ b/src/mainboard/amd/thatcher/acpi_tables.c @@ -134,8 +134,6 @@ unsigned long write_acpi_tables(unsigned long start) acpi_header_t *ivrs; acpi_hest_t *hest; - get_bus_conf(); /* it will get sblk, pci1234, hcdn, and sbdn */ - /* Align ACPI tables to 16 bytes */ start = ALIGN(start, 16); current = start; diff --git a/src/mainboard/amd/thatcher/get_bus_conf.c b/src/mainboard/amd/thatcher/get_bus_conf.c index ce5276fb52..d4a565480c 100644 --- a/src/mainboard/amd/thatcher/get_bus_conf.c +++ b/src/mainboard/amd/thatcher/get_bus_conf.c @@ -48,7 +48,6 @@ u32 pci1234x[] = { u32 bus_type[256]; u32 sbdn_hudson; -static u32 get_bus_conf_done = 0; void get_bus_conf(void) { @@ -57,12 +56,6 @@ void get_bus_conf(void) device_t dev; int i, j; - if (get_bus_conf_done == 1) - return; /* do it only once */ - - get_bus_conf_done = 1; - - sbdn_hudson = 0; memset(bus_hudson, 0, sizeof(bus_hudson)); diff --git a/src/mainboard/amd/thatcher/irq_tables.c b/src/mainboard/amd/thatcher/irq_tables.c index 6f907e2ae1..20fbb5d263 100644 --- a/src/mainboard/amd/thatcher/irq_tables.c +++ b/src/mainboard/amd/thatcher/irq_tables.c @@ -57,8 +57,6 @@ unsigned long write_pirq_routing_table(unsigned long addr) u8 sum = 0; int i; - get_bus_conf(); /* it will find out all bus num and apic that share with mptable.c and mptable.c and acpi_tables.c */ - /* Align the table to be 16 byte aligned. */ addr += 15; addr &= ~15; diff --git a/src/mainboard/amd/thatcher/mptable.c b/src/mainboard/amd/thatcher/mptable.c index 32133951ad..3269089edc 100644 --- a/src/mainboard/amd/thatcher/mptable.c +++ b/src/mainboard/amd/thatcher/mptable.c @@ -84,8 +84,6 @@ static void *smp_write_config_table(void *v) smp_write_processors(mc); - get_bus_conf(); - //mptable_write_buses(mc, NULL, &bus_isa); my_smp_write_bus(mc, 0, "PCI "); my_smp_write_bus(mc, 1, "PCI "); diff --git a/src/mainboard/amd/torpedo/acpi_tables.c b/src/mainboard/amd/torpedo/acpi_tables.c index c3595630c6..b916bce898 100644 --- a/src/mainboard/amd/torpedo/acpi_tables.c +++ b/src/mainboard/amd/torpedo/acpi_tables.c @@ -121,8 +121,6 @@ unsigned long write_acpi_tables(unsigned long start) acpi_header_t *ssdt; acpi_hest_t *hest; - get_bus_conf(); /* it will get sblk, pci1234, hcdn, and sbdn */ - /* Align ACPI tables to 16 bytes */ start = ALIGN(start, 16); current = start; diff --git a/src/mainboard/amd/torpedo/get_bus_conf.c b/src/mainboard/amd/torpedo/get_bus_conf.c index 5404941c10..36613f706c 100644 --- a/src/mainboard/amd/torpedo/get_bus_conf.c +++ b/src/mainboard/amd/torpedo/get_bus_conf.c @@ -54,19 +54,11 @@ u32 bus_type[256]; u32 sbdn_sb900; - -static u32 get_bus_conf_done = 0; - void get_bus_conf(void) { device_t dev; int i, j; - if (get_bus_conf_done == 1) - return; /* do it only once */ - - get_bus_conf_done = 1; - printk(BIOS_DEBUG, "Mainboard - %s - %s - Start.\n", __FILE__, __func__); sbdn_sb900 = 0; diff --git a/src/mainboard/amd/torpedo/irq_tables.c b/src/mainboard/amd/torpedo/irq_tables.c index 302780284f..53cf6fa9c0 100644 --- a/src/mainboard/amd/torpedo/irq_tables.c +++ b/src/mainboard/amd/torpedo/irq_tables.c @@ -60,10 +60,6 @@ unsigned long write_pirq_routing_table(unsigned long addr) u8 sum = 0; int i; - - get_bus_conf(); /* it will find out all bus num and apic that share with mptable.c and mptable.c and acpi_tables.c */ - - /* Align the table to be 16 byte aligned. */ addr += 15; addr &= ~15; diff --git a/src/mainboard/amd/torpedo/mptable.c b/src/mainboard/amd/torpedo/mptable.c index 24e48d119c..ae00cf76fd 100644 --- a/src/mainboard/amd/torpedo/mptable.c +++ b/src/mainboard/amd/torpedo/mptable.c @@ -104,8 +104,6 @@ static void *smp_write_config_table(void *v) cpu_flag, cpu_features, cpu_feature_flags ); - get_bus_conf(); - //mptable_write_buses(mc, NULL, &bus_isa); my_smp_write_bus(mc, 0, "PCI "); my_smp_write_bus(mc, 1, "PCI "); diff --git a/src/mainboard/amd/union_station/acpi_tables.c b/src/mainboard/amd/union_station/acpi_tables.c index 227a49bf42..588345e6eb 100644 --- a/src/mainboard/amd/union_station/acpi_tables.c +++ b/src/mainboard/amd/union_station/acpi_tables.c @@ -133,8 +133,6 @@ unsigned long write_acpi_tables(unsigned long start) acpi_header_t *alib; acpi_hest_t *hest; - get_bus_conf(); /* it will get sblk, pci1234, hcdn, and sbdn */ - /* Align ACPI tables to 16 bytes */ start = ALIGN(start, 16); current = start; diff --git a/src/mainboard/amd/union_station/get_bus_conf.c b/src/mainboard/amd/union_station/get_bus_conf.c index 6a3d23250c..7eedcba821 100644 --- a/src/mainboard/amd/union_station/get_bus_conf.c +++ b/src/mainboard/amd/union_station/get_bus_conf.c @@ -49,9 +49,6 @@ u32 pci1234x[] = { u32 bus_type[256]; u32 sbdn_sb800; -static u32 get_bus_conf_done = 0; - - void get_bus_conf(void) { u32 apicid_base; @@ -59,10 +56,6 @@ void get_bus_conf(void) device_t dev; int i, j; - if (get_bus_conf_done == 1) - return; /* do it only once */ - - get_bus_conf_done = 1; sbdn_sb800 = 0; diff --git a/src/mainboard/amd/union_station/irq_tables.c b/src/mainboard/amd/union_station/irq_tables.c index b8c211ac58..dbbb2afddf 100644 --- a/src/mainboard/amd/union_station/irq_tables.c +++ b/src/mainboard/amd/union_station/irq_tables.c @@ -59,10 +59,6 @@ unsigned long write_pirq_routing_table(unsigned long addr) u8 sum = 0; int i; - - get_bus_conf(); /* it will find out all bus num and apic that share with mptable.c and mptable.c and acpi_tables.c */ - - /* Align the table to be 16 byte aligned. */ addr += 15; addr &= ~15; diff --git a/src/mainboard/amd/union_station/mptable.c b/src/mainboard/amd/union_station/mptable.c index e9175d8d26..f266b4fcd7 100644 --- a/src/mainboard/amd/union_station/mptable.c +++ b/src/mainboard/amd/union_station/mptable.c @@ -56,8 +56,6 @@ static void *smp_write_config_table(void *v) smp_write_processors(mc); - get_bus_conf(); - mptable_write_buses(mc, NULL, &bus_isa); /* I/O APICs: APIC ID Version State Address */ -- cgit v1.2.3