Vladimir Serbinenko (phcoder@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7373
-gerrit
commit de6fd1c3692113a09d63e5b4e25a4f36889c9fcb Author: Vladimir Serbinenko phcoder@gmail.com Date: Sun Nov 9 13:36:18 2014 +0100
Make acpi_fill_hest into parameter
Change-Id: Ie96475babb4aa4ea8db49023af5b31bfa63b21dc Signed-off-by: Vladimir Serbinenko phcoder@gmail.com --- src/arch/x86/boot/acpi.c | 8 ++------ src/arch/x86/include/arch/acpi.h | 4 ++-- src/northbridge/amd/agesa/family12/northbridge.c | 4 ++-- src/northbridge/amd/agesa/family14/northbridge.c | 4 ++-- src/northbridge/amd/agesa/family15/northbridge.c | 4 ++-- src/northbridge/amd/agesa/family15tn/northbridge.c | 5 +++-- src/northbridge/amd/agesa/family16kb/northbridge.c | 4 ++-- src/northbridge/amd/pi/00730F01/northbridge.c | 4 ++-- 8 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/src/arch/x86/boot/acpi.c b/src/arch/x86/boot/acpi.c index e7e9b77..7ad405b 100644 --- a/src/arch/x86/boot/acpi.c +++ b/src/arch/x86/boot/acpi.c @@ -553,11 +553,6 @@ static void acpi_write_rsdp(acpi_rsdp_t *rsdp, acpi_rsdt_t *rsdt, rsdp->ext_checksum = acpi_checksum((void *)rsdp, sizeof(acpi_rsdp_t)); }
-unsigned long __attribute__((weak)) acpi_fill_hest(acpi_hest_t *hest) -{ - return (unsigned long)hest; -} - unsigned long acpi_create_hest_error_source(acpi_hest_t *hest, acpi_hest_esd_t *esd, u16 type, void *data, u16 data_len) { acpi_header_t *header = &(hest->header); @@ -617,7 +612,8 @@ unsigned long acpi_create_hest_error_source(acpi_hest_t *hest, acpi_hest_esd_t * }
/* ACPI 4.0 */ -void acpi_write_hest(acpi_hest_t *hest) +void acpi_write_hest(acpi_hest_t *hest, + unsigned long (*acpi_fill_hest)(acpi_hest_t *hest)) { acpi_header_t *header = &(hest->header);
diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h index 600d011..ce5b11c 100644 --- a/src/arch/x86/include/arch/acpi.h +++ b/src/arch/x86/include/arch/acpi.h @@ -540,10 +540,10 @@ unsigned long acpi_create_dmar_drhd(unsigned long current, u8 flags, void acpi_dmar_drhd_fixup(unsigned long base, unsigned long current); unsigned long acpi_create_dmar_drhd_ds_pci(unsigned long current, u8 segment, u8 dev, u8 fn); +void acpi_write_hest(acpi_hest_t *hest, + unsigned long (*acpi_fill_hest)(acpi_hest_t *hest));
-void acpi_write_hest(acpi_hest_t *hest); unsigned long acpi_create_hest_error_source(acpi_hest_t *hest, acpi_hest_esd_t *esd, u16 type, void *data, u16 len); -unsigned long acpi_fill_hest(acpi_hest_t *hest);
void acpi_save_gnvs(u32 gnvs_address);
diff --git a/src/northbridge/amd/agesa/family12/northbridge.c b/src/northbridge/amd/agesa/family12/northbridge.c index b411032..efd3858 100644 --- a/src/northbridge/amd/agesa/family12/northbridge.c +++ b/src/northbridge/amd/agesa/family12/northbridge.c @@ -819,7 +819,7 @@ static void cpu_bus_init(device_t dev) /* North Bridge Structures */
-unsigned long acpi_fill_hest(acpi_hest_t *hest) +static unsigned long acpi_fill_hest(acpi_hest_t *hest) { void *addr, *current;
@@ -869,7 +869,7 @@ static unsigned long agesa_write_acpi_tables(unsigned long current, /* HEST */ current = ALIGN(current, 8); hest = (acpi_hest_t *)current; - acpi_write_hest((void *)current); + acpi_write_hest((void *)current, acpi_fill_hest); acpi_add_table(rsdp, (void *)current); current += ((acpi_header_t *)current)->length;
diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c index dbaab1a..de0deb2 100644 --- a/src/northbridge/amd/agesa/family14/northbridge.c +++ b/src/northbridge/amd/agesa/family14/northbridge.c @@ -829,7 +829,7 @@ static void northbridge_fill_ssdt_generator(void) acpigen_pop_len(); }
-unsigned long acpi_fill_hest(acpi_hest_t *hest) +static unsigned long acpi_fill_hest(acpi_hest_t *hest) { void *addr, *current;
@@ -859,7 +859,7 @@ static unsigned long agesa_write_acpi_tables(unsigned long current, /* HEST */ current = ALIGN(current, 8); hest = (acpi_hest_t *)current; - acpi_write_hest((void *)current); + acpi_write_hest((void *)current, acpi_fill_hest); acpi_add_table(rsdp, (void *)current); current += ((acpi_header_t *)current)->length;
diff --git a/src/northbridge/amd/agesa/family15/northbridge.c b/src/northbridge/amd/agesa/family15/northbridge.c index f5b9ce0..6f375ac 100644 --- a/src/northbridge/amd/agesa/family15/northbridge.c +++ b/src/northbridge/amd/agesa/family15/northbridge.c @@ -488,7 +488,7 @@ static unsigned scan_chains(device_t dev, unsigned max) }
-unsigned long acpi_fill_hest(acpi_hest_t *hest) +static unsigned long acpi_fill_hest(acpi_hest_t *hest) { void *addr, *current;
@@ -539,7 +539,7 @@ static unsigned long agesa_write_acpi_tables(unsigned long current, /* HEST */ current = ALIGN(current, 8); hest = (acpi_hest_t *)current; - acpi_write_hest((void *)current); + acpi_write_hest((void *)current, acpi_fill_hest); acpi_add_table(rsdp, (void *)current); current += ((acpi_header_t *)current)->length;
diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c index f5b547b..777da61 100644 --- a/src/northbridge/amd/agesa/family15tn/northbridge.c +++ b/src/northbridge/amd/agesa/family15tn/northbridge.c @@ -463,7 +463,8 @@ static void nb_set_resources(device_t dev) } }
-unsigned long acpi_fill_hest(acpi_hest_t *hest) + +static unsigned long acpi_fill_hest(acpi_hest_t *hest) { void *addr, *current;
@@ -515,7 +516,7 @@ static unsigned long agesa_write_acpi_tables(unsigned long current, /* HEST */ current = ALIGN(current, 8); hest = (acpi_hest_t *)current; - acpi_write_hest((void *)current); + acpi_write_hest((void *)current, acpi_fill_hest); acpi_add_table(rsdp, (void *)current); current += ((acpi_header_t *)current)->length;
diff --git a/src/northbridge/amd/agesa/family16kb/northbridge.c b/src/northbridge/amd/agesa/family16kb/northbridge.c index e5f498f..102c3e5 100644 --- a/src/northbridge/amd/agesa/family16kb/northbridge.c +++ b/src/northbridge/amd/agesa/family16kb/northbridge.c @@ -489,7 +489,7 @@ static unsigned scan_chains(device_t dev, unsigned max) #endif
-unsigned long acpi_fill_hest(acpi_hest_t *hest) +static unsigned long acpi_fill_hest(acpi_hest_t *hest) { void *addr, *current;
@@ -541,7 +541,7 @@ static unsigned long agesa_write_acpi_tables(unsigned long current, /* HEST */ current = ALIGN(current, 8); hest = (acpi_hest_t *)current; - acpi_write_hest((void *)current); + acpi_write_hest((void *)current, acpi_fill_hest); acpi_add_table(rsdp, (void *)current); current += ((acpi_header_t *)current)->length;
diff --git a/src/northbridge/amd/pi/00730F01/northbridge.c b/src/northbridge/amd/pi/00730F01/northbridge.c index 395235d..2a002c2 100644 --- a/src/northbridge/amd/pi/00730F01/northbridge.c +++ b/src/northbridge/amd/pi/00730F01/northbridge.c @@ -476,7 +476,7 @@ static unsigned scan_chains(device_t dev, unsigned max) #endif
-unsigned long acpi_fill_hest(acpi_hest_t *hest) +static unsigned long acpi_fill_hest(acpi_hest_t *hest) { void *addr, *current;
@@ -528,7 +528,7 @@ static unsigned long agesa_write_acpi_tables(unsigned long current, /* HEST */ current = ALIGN(current, 8); hest = (acpi_hest_t *)current; - acpi_write_hest((void *)current); + acpi_write_hest((void *)current, acpi_fill_hest); acpi_add_table(rsdp, (void *)current); current += ((acpi_header_t *)current)->length;
-
Vladimir Serbinenko