AGESA: Call get_bus_conf() just once

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 <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/6133
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>

8 files changed, 0 insertions, 28 deletions

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);
 
 	/*