diff options
Diffstat (limited to 'src')
81 files changed, 3 insertions, 287 deletions
diff --git a/src/cpu/amd/agesa/amd_late_init.c b/src/cpu/amd/agesa/amd_late_init.c index e08b159d2f..8bce364328 100644 --- a/src/cpu/amd/agesa/amd_late_init.c +++ b/src/cpu/amd/agesa/amd_late_init.c @@ -36,6 +36,9 @@ static void agesawrapper_post_device(void *unused) printk(BIOS_DEBUG, "agesawrapper_amdinitlate failed: %x \n", status); } + /* Preparation for write_tables(). */ + get_bus_conf(); + if (!acpi_s3_resume_allowed()) return; 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 */ diff --git a/src/mainboard/asrock/e350m1/acpi_tables.c b/src/mainboard/asrock/e350m1/acpi_tables.c index 56cfc46f72..65cb796d85 100644 --- a/src/mainboard/asrock/e350m1/acpi_tables.c +++ b/src/mainboard/asrock/e350m1/acpi_tables.c @@ -132,8 +132,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/asrock/e350m1/get_bus_conf.c b/src/mainboard/asrock/e350m1/get_bus_conf.c index 6a3d23250c..7eedcba821 100644 --- a/src/mainboard/asrock/e350m1/get_bus_conf.c +++ b/src/mainboard/asrock/e350m1/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/asrock/e350m1/irq_tables.c b/src/mainboard/asrock/e350m1/irq_tables.c index b8c211ac58..dbbb2afddf 100644 --- a/src/mainboard/asrock/e350m1/irq_tables.c +++ b/src/mainboard/asrock/e350m1/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/asrock/e350m1/mptable.c b/src/mainboard/asrock/e350m1/mptable.c index 6444be5112..3402da1b15 100644 --- a/src/mainboard/asrock/e350m1/mptable.c +++ b/src/mainboard/asrock/e350m1/mptable.c @@ -57,8 +57,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/asrock/imb-a180/acpi_tables.c b/src/mainboard/asrock/imb-a180/acpi_tables.c index 117579274c..41354fb27a 100644 --- a/src/mainboard/asrock/imb-a180/acpi_tables.c +++ b/src/mainboard/asrock/imb-a180/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/asrock/imb-a180/get_bus_conf.c b/src/mainboard/asrock/imb-a180/get_bus_conf.c index 226d57de91..eecffb59c7 100644 --- a/src/mainboard/asrock/imb-a180/get_bus_conf.c +++ b/src/mainboard/asrock/imb-a180/get_bus_conf.c @@ -45,8 +45,6 @@ u32 pci1234x[] = { u32 bus_type[256]; u32 sbdn_yangtze; -static u32 get_bus_conf_done = 0; - void get_bus_conf(void) { u32 apicid_base; @@ -55,11 +53,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); pci_write_config32(dev, 0xFC, 5); /* TODO: move it to dsdt.asl */ diff --git a/src/mainboard/asrock/imb-a180/irq_tables.c b/src/mainboard/asrock/imb-a180/irq_tables.c index 845400724a..2b4422e8f0 100644 --- a/src/mainboard/asrock/imb-a180/irq_tables.c +++ b/src/mainboard/asrock/imb-a180/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/asrock/imb-a180/mptable.c b/src/mainboard/asrock/imb-a180/mptable.c index 3e2b076133..bfad50d631 100644 --- a/src/mainboard/asrock/imb-a180/mptable.c +++ b/src/mainboard/asrock/imb-a180/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/asus/f2a85-m/acpi_tables.c b/src/mainboard/asus/f2a85-m/acpi_tables.c index 1f95b1d60d..428721e173 100644 --- a/src/mainboard/asus/f2a85-m/acpi_tables.c +++ b/src/mainboard/asus/f2a85-m/acpi_tables.c @@ -131,8 +131,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/asus/f2a85-m/get_bus_conf.c b/src/mainboard/asus/f2a85-m/get_bus_conf.c index 5d5922ba86..08e5795a0c 100644 --- a/src/mainboard/asus/f2a85-m/get_bus_conf.c +++ b/src/mainboard/asus/f2a85-m/get_bus_conf.c @@ -46,8 +46,6 @@ u32 pci1234x[] = { u32 bus_type[256]; u32 sbdn_hudson; -static u32 get_bus_conf_done = 0; - void get_bus_conf(void) { u32 apicid_base; @@ -55,12 +53,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/asus/f2a85-m/irq_tables.c b/src/mainboard/asus/f2a85-m/irq_tables.c index 3f70d160da..40dd6e9488 100644 --- a/src/mainboard/asus/f2a85-m/irq_tables.c +++ b/src/mainboard/asus/f2a85-m/irq_tables.c @@ -56,8 +56,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/asus/f2a85-m/mptable.c b/src/mainboard/asus/f2a85-m/mptable.c index 5056b080f2..25778ca72a 100644 --- a/src/mainboard/asus/f2a85-m/mptable.c +++ b/src/mainboard/asus/f2a85-m/mptable.c @@ -83,8 +83,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/gizmosphere/gizmo/acpi_tables.c b/src/mainboard/gizmosphere/gizmo/acpi_tables.c index 805837ddd9..a9174c0f35 100755 --- a/src/mainboard/gizmosphere/gizmo/acpi_tables.c +++ b/src/mainboard/gizmosphere/gizmo/acpi_tables.c @@ -134,8 +134,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/gizmosphere/gizmo/get_bus_conf.c b/src/mainboard/gizmosphere/gizmo/get_bus_conf.c index 3b43d9d427..ca20a0c509 100755 --- a/src/mainboard/gizmosphere/gizmo/get_bus_conf.c +++ b/src/mainboard/gizmosphere/gizmo/get_bus_conf.c @@ -50,7 +50,6 @@ u32 pci1234x[] = { u32 bus_type[256]; u32 sbdn_sb800; -static u32 get_bus_conf_done = 0; void get_bus_conf(void) { @@ -59,11 +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; memset(bus_sb800, 0, sizeof(bus_sb800)); diff --git a/src/mainboard/gizmosphere/gizmo/irq_tables.c b/src/mainboard/gizmosphere/gizmo/irq_tables.c index dd62ed85bf..09fb4e23c7 100755 --- a/src/mainboard/gizmosphere/gizmo/irq_tables.c +++ b/src/mainboard/gizmosphere/gizmo/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/gizmosphere/gizmo/mptable.c b/src/mainboard/gizmosphere/gizmo/mptable.c index 6dfd11dba5..c56060e5fd 100755 --- a/src/mainboard/gizmosphere/gizmo/mptable.c +++ b/src/mainboard/gizmosphere/gizmo/mptable.c @@ -57,8 +57,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/hp/pavilion_m6_1035dx/acpi_tables.c b/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c index 01281ea2de..dbe550c634 100644 --- a/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c +++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c @@ -131,8 +131,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/hp/pavilion_m6_1035dx/get_bus_conf.c b/src/mainboard/hp/pavilion_m6_1035dx/get_bus_conf.c index 34afc171cc..78193ebede 100644 --- a/src/mainboard/hp/pavilion_m6_1035dx/get_bus_conf.c +++ b/src/mainboard/hp/pavilion_m6_1035dx/get_bus_conf.c @@ -47,7 +47,6 @@ u32 pci1234x[] = { u32 bus_type[256]; u32 sbdn_hudson; -static u32 get_bus_conf_done = 0; void get_bus_conf(void) { @@ -56,12 +55,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/hp/pavilion_m6_1035dx/irq_tables.c b/src/mainboard/hp/pavilion_m6_1035dx/irq_tables.c index 076edc58ff..1d99b4c0db 100644 --- a/src/mainboard/hp/pavilion_m6_1035dx/irq_tables.c +++ b/src/mainboard/hp/pavilion_m6_1035dx/irq_tables.c @@ -56,8 +56,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/hp/pavilion_m6_1035dx/mptable.c b/src/mainboard/hp/pavilion_m6_1035dx/mptable.c index 2d7646a5fd..d90a453f1c 100644 --- a/src/mainboard/hp/pavilion_m6_1035dx/mptable.c +++ b/src/mainboard/hp/pavilion_m6_1035dx/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/jetway/nf81-t56n-lf/acpi_tables.c b/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c index c24627074a..95f2a0e4a4 100644 --- a/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c +++ b/src/mainboard/jetway/nf81-t56n-lf/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/jetway/nf81-t56n-lf/get_bus_conf.c b/src/mainboard/jetway/nf81-t56n-lf/get_bus_conf.c index 69a86ab0e8..43aa984358 100644 --- a/src/mainboard/jetway/nf81-t56n-lf/get_bus_conf.c +++ b/src/mainboard/jetway/nf81-t56n-lf/get_bus_conf.c @@ -52,7 +52,6 @@ u32 pci1234x[] = { u32 bus_type[256]; u32 sbdn_sb800; -static u32 get_bus_conf_done = 0; void get_bus_conf(void) { @@ -61,14 +60,6 @@ void get_bus_conf(void) device_t dev; int i, j; - /* Be sure func is called exactly once */ - if (get_bus_conf_done == 1) - return; - - get_bus_conf_done = 1; - - - sbdn_sb800 = 0; memset(bus_sb800, 0, sizeof(bus_sb800)); diff --git a/src/mainboard/jetway/nf81-t56n-lf/irq_tables.c b/src/mainboard/jetway/nf81-t56n-lf/irq_tables.c index 259034b524..36d104d786 100644 --- a/src/mainboard/jetway/nf81-t56n-lf/irq_tables.c +++ b/src/mainboard/jetway/nf81-t56n-lf/irq_tables.c @@ -58,12 +58,6 @@ unsigned long write_pirq_routing_table(unsigned long addr) u8 sum = 0; int i; - /* Find all Bus num and APIC's that are share with - * mptable.c and acpi_tables.c - */ - get_bus_conf(); - - /* Align table on 16 byte boundary. */ addr += 15; addr &= ~15; diff --git a/src/mainboard/jetway/nf81-t56n-lf/mptable.c b/src/mainboard/jetway/nf81-t56n-lf/mptable.c index 12cb9d1049..92fc3b07a5 100644 --- a/src/mainboard/jetway/nf81-t56n-lf/mptable.c +++ b/src/mainboard/jetway/nf81-t56n-lf/mptable.c @@ -58,9 +58,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/lippert/frontrunner-af/acpi_tables.c b/src/mainboard/lippert/frontrunner-af/acpi_tables.c index 227a49bf42..588345e6eb 100644 --- a/src/mainboard/lippert/frontrunner-af/acpi_tables.c +++ b/src/mainboard/lippert/frontrunner-af/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/lippert/frontrunner-af/get_bus_conf.c b/src/mainboard/lippert/frontrunner-af/get_bus_conf.c index 1e7fca4e5d..bddcee1aef 100644 --- a/src/mainboard/lippert/frontrunner-af/get_bus_conf.c +++ b/src/mainboard/lippert/frontrunner-af/get_bus_conf.c @@ -49,7 +49,6 @@ u32 pci1234x[] = { u32 bus_type[256]; u32 sbdn_sb800; -static u32 get_bus_conf_done = 0; void get_bus_conf(void) { @@ -58,11 +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; - sbdn_sb800 = 0; memset(bus_sb800, 0, sizeof(bus_sb800)); diff --git a/src/mainboard/lippert/frontrunner-af/irq_tables.c b/src/mainboard/lippert/frontrunner-af/irq_tables.c index b8c211ac58..dbbb2afddf 100644 --- a/src/mainboard/lippert/frontrunner-af/irq_tables.c +++ b/src/mainboard/lippert/frontrunner-af/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/lippert/frontrunner-af/mptable.c b/src/mainboard/lippert/frontrunner-af/mptable.c index 6b8aaa6593..498ae58230 100644 --- a/src/mainboard/lippert/frontrunner-af/mptable.c +++ b/src/mainboard/lippert/frontrunner-af/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/lippert/toucan-af/acpi_tables.c b/src/mainboard/lippert/toucan-af/acpi_tables.c index 227a49bf42..588345e6eb 100644 --- a/src/mainboard/lippert/toucan-af/acpi_tables.c +++ b/src/mainboard/lippert/toucan-af/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/lippert/toucan-af/get_bus_conf.c b/src/mainboard/lippert/toucan-af/get_bus_conf.c index 1e7fca4e5d..f0de0e5e6a 100644 --- a/src/mainboard/lippert/toucan-af/get_bus_conf.c +++ b/src/mainboard/lippert/toucan-af/get_bus_conf.c @@ -49,8 +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; @@ -58,11 +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; memset(bus_sb800, 0, sizeof(bus_sb800)); diff --git a/src/mainboard/lippert/toucan-af/irq_tables.c b/src/mainboard/lippert/toucan-af/irq_tables.c index b8c211ac58..dbbb2afddf 100644 --- a/src/mainboard/lippert/toucan-af/irq_tables.c +++ b/src/mainboard/lippert/toucan-af/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/lippert/toucan-af/mptable.c b/src/mainboard/lippert/toucan-af/mptable.c index 6b8aaa6593..498ae58230 100644 --- a/src/mainboard/lippert/toucan-af/mptable.c +++ b/src/mainboard/lippert/toucan-af/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/supermicro/h8qgi/acpi_tables.c b/src/mainboard/supermicro/h8qgi/acpi_tables.c index 1e1b323094..335c5ecc4c 100644 --- a/src/mainboard/supermicro/h8qgi/acpi_tables.c +++ b/src/mainboard/supermicro/h8qgi/acpi_tables.c @@ -172,8 +172,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/supermicro/h8qgi/get_bus_conf.c b/src/mainboard/supermicro/h8qgi/get_bus_conf.c index 345c75dae8..7a69a7c90b 100644 --- a/src/mainboard/supermicro/h8qgi/get_bus_conf.c +++ b/src/mainboard/supermicro/h8qgi/get_bus_conf.c @@ -43,19 +43,11 @@ u32 bus_type[256]; u32 sbdn_sr5650; u32 sbdn_sp5100; -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; - sbdn_sp5100 = 0; for (i = 0; i < ARRAY_SIZE(bus_sp5100); i++) { diff --git a/src/mainboard/supermicro/h8qgi/irq_tables.c b/src/mainboard/supermicro/h8qgi/irq_tables.c index 44c7753804..3c2caa2ba7 100644 --- a/src/mainboard/supermicro/h8qgi/irq_tables.c +++ b/src/mainboard/supermicro/h8qgi/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/supermicro/h8qgi/mptable.c b/src/mainboard/supermicro/h8qgi/mptable.c index 0365ae6611..2206b584d8 100644 --- a/src/mainboard/supermicro/h8qgi/mptable.c +++ b/src/mainboard/supermicro/h8qgi/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/supermicro/h8scm/acpi_tables.c b/src/mainboard/supermicro/h8scm/acpi_tables.c index 975dcbe102..d051cef0ff 100644 --- a/src/mainboard/supermicro/h8scm/acpi_tables.c +++ b/src/mainboard/supermicro/h8scm/acpi_tables.c @@ -153,8 +153,6 @@ unsigned long write_acpi_tables(unsigned long start) acpi_header_t *ssdt2; acpi_header_t *alib; - 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/supermicro/h8scm/get_bus_conf.c b/src/mainboard/supermicro/h8scm/get_bus_conf.c index 4b51f2aed2..932e2dedbe 100644 --- a/src/mainboard/supermicro/h8scm/get_bus_conf.c +++ b/src/mainboard/supermicro/h8scm/get_bus_conf.c @@ -43,19 +43,11 @@ u32 bus_type[256]; u32 sbdn_sr5650; u32 sbdn_sp5100; -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; - sbdn_sp5100 = 0; for (i = 0; i < 0; i++) { diff --git a/src/mainboard/supermicro/h8scm/irq_tables.c b/src/mainboard/supermicro/h8scm/irq_tables.c index fc079d6d5a..53ce5c72e6 100644 --- a/src/mainboard/supermicro/h8scm/irq_tables.c +++ b/src/mainboard/supermicro/h8scm/irq_tables.c @@ -59,8 +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/supermicro/h8scm/mptable.c b/src/mainboard/supermicro/h8scm/mptable.c index 0365ae6611..2206b584d8 100644 --- a/src/mainboard/supermicro/h8scm/mptable.c +++ b/src/mainboard/supermicro/h8scm/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/tyan/s8226/acpi_tables.c b/src/mainboard/tyan/s8226/acpi_tables.c index 2273b9ea00..a49b11257e 100644 --- a/src/mainboard/tyan/s8226/acpi_tables.c +++ b/src/mainboard/tyan/s8226/acpi_tables.c @@ -153,8 +153,6 @@ unsigned long write_acpi_tables(unsigned long start) acpi_header_t *ssdt2; acpi_header_t *alib; - 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/tyan/s8226/get_bus_conf.c b/src/mainboard/tyan/s8226/get_bus_conf.c index 5c416c5538..508f379862 100644 --- a/src/mainboard/tyan/s8226/get_bus_conf.c +++ b/src/mainboard/tyan/s8226/get_bus_conf.c @@ -43,18 +43,12 @@ u32 sbdn_sr5650; u32 sbdn_sp5100; void get_bus_conf(void); -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; - sbdn_sp5100 = 0; for (i = 0; i < 0; i++) { diff --git a/src/mainboard/tyan/s8226/irq_tables.c b/src/mainboard/tyan/s8226/irq_tables.c index 44c7753804..3c2caa2ba7 100644 --- a/src/mainboard/tyan/s8226/irq_tables.c +++ b/src/mainboard/tyan/s8226/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/tyan/s8226/mptable.c b/src/mainboard/tyan/s8226/mptable.c index 0365ae6611..2206b584d8 100644 --- a/src/mainboard/tyan/s8226/mptable.c +++ b/src/mainboard/tyan/s8226/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); /* |