[coreboot-gerrit] Patch set updated for coreboot: cf19a09 Make acpi_fill_hest into parameter
Vladimir Serbinenko (phcoder@gmail.com)
gerrit at coreboot.org
Sun Nov 9 18:07:48 CET 2014
Vladimir Serbinenko (phcoder at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7373
-gerrit
commit cf19a09308b94752011bbee8fc6bc58f2938dfad
Author: Vladimir Serbinenko <phcoder at 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 at gmail.com>
---
src/arch/x86/boot/acpi.c | 8 ++------
src/arch/x86/include/arch/acpi.h | 4 ++--
src/northbridge/amd/agesa/00730F01/northbridge.c | 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 | 4 ++--
src/northbridge/amd/agesa/family16kb/northbridge.c | 4 ++--
8 files changed, 16 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/00730F01/northbridge.c b/src/northbridge/amd/agesa/00730F01/northbridge.c
index 3a04b95..6bdc7f9 100644
--- a/src/northbridge/amd/agesa/00730F01/northbridge.c
+++ b/src/northbridge/amd/agesa/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;
diff --git a/src/northbridge/amd/agesa/family12/northbridge.c b/src/northbridge/amd/agesa/family12/northbridge.c
index 314b2bc..e7d8a7d 100644
--- a/src/northbridge/amd/agesa/family12/northbridge.c
+++ b/src/northbridge/amd/agesa/family12/northbridge.c
@@ -822,7 +822,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;
@@ -872,7 +872,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 bae64a2..98b6203 100644
--- a/src/northbridge/amd/agesa/family14/northbridge.c
+++ b/src/northbridge/amd/agesa/family14/northbridge.c
@@ -831,7 +831,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;
@@ -861,7 +861,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 1fe373a..6c09a9c 100644
--- a/src/northbridge/amd/agesa/family15/northbridge.c
+++ b/src/northbridge/amd/agesa/family15/northbridge.c
@@ -502,7 +502,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;
@@ -553,7 +553,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 bba78ee..dc4e5d9 100644
--- a/src/northbridge/amd/agesa/family15tn/northbridge.c
+++ b/src/northbridge/amd/agesa/family15tn/northbridge.c
@@ -469,7 +469,7 @@ static void northbridge_init(struct device *dev)
{
}
-unsigned long acpi_fill_hest(acpi_hest_t *hest)
+static unsigned long acpi_fill_hest(acpi_hest_t *hest)
{
void *addr, *current;
@@ -521,7 +521,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 91477c8..d9e9a93 100644
--- a/src/northbridge/amd/agesa/family16kb/northbridge.c
+++ b/src/northbridge/amd/agesa/family16kb/northbridge.c
@@ -475,7 +475,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;
@@ -527,7 +527,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;
More information about the coreboot-gerrit
mailing list