Felix Held submitted this change.
soc/amd/common/fsp: use expected types for add_agesa_fsp_acpi_table
add_agesa_fsp_acpi_table should use the same type for the 'current'
parameter and return value as the calling soc_acpi_write_tables does.
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: Ie9f770b1d847ea28e4dbd96298a723d794b91a02
Reviewed-on: https://review.coreboot.org/c/coreboot/+/80219
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
---
M src/soc/amd/common/block/include/amdblocks/acpi.h
M src/soc/amd/common/fsp/fsp-acpi.c
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/soc/amd/common/block/include/amdblocks/acpi.h b/src/soc/amd/common/block/include/amdblocks/acpi.h
index a195371..84e3e0c 100644
--- a/src/soc/amd/common/block/include/amdblocks/acpi.h
+++ b/src/soc/amd/common/block/include/amdblocks/acpi.h
@@ -52,8 +52,8 @@
unsigned long southbridge_write_acpi_tables(const struct device *device, unsigned long current,
struct acpi_rsdp *rsdp);
-uintptr_t add_agesa_fsp_acpi_table(guid_t guid, const char *name, acpi_rsdp_t *rsdp,
- uintptr_t current);
+unsigned long add_agesa_fsp_acpi_table(guid_t guid, const char *name, acpi_rsdp_t *rsdp,
+ unsigned long current);
void acpi_log_events(const struct chipset_power_state *ps);
unsigned long acpi_add_ivrs_table(unsigned long current, acpi_rsdp_t *rsdp);
diff --git a/src/soc/amd/common/fsp/fsp-acpi.c b/src/soc/amd/common/fsp/fsp-acpi.c
index 8ddf7d4..6c65b3e 100644
--- a/src/soc/amd/common/fsp/fsp-acpi.c
+++ b/src/soc/amd/common/fsp/fsp-acpi.c
@@ -15,8 +15,8 @@
uint16_t hob_payload[0xffc8]; /* maximum payload size */
} __packed;
-uintptr_t add_agesa_fsp_acpi_table(guid_t guid, const char *name, acpi_rsdp_t *rsdp,
- uintptr_t current)
+unsigned long add_agesa_fsp_acpi_table(guid_t guid, const char *name, acpi_rsdp_t *rsdp,
+ unsigned long current)
{
const struct amd_fsp_acpi_hob_info *data;
void *table = (void *)current;
To view, visit change 80219. To unsubscribe, or for help writing mail filters, visit settings.