From ef40ca57ebd4de746eafaa1e5a1cae035337f285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= 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/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 -- 4 files changed, 15 deletions(-) (limited to 'src/mainboard/amd/inagua') 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 */ -- cgit v1.2.3