From 8d70e94ae1fc1d511cf60148861df936c72607e3 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sun, 9 Nov 2014 13:22:27 +0100 Subject: Make acpi_fill_dmar into parameter Change-Id: I5e237cb7acbf47b2c8a4cd725ee8e16e422e3b17 Signed-off-by: Vladimir Serbinenko Reviewed-on: http://review.coreboot.org/7371 Tested-by: build bot (Jenkins) Reviewed-by: Nicolas Reinecke Reviewed-by: Edward O'Callaghan --- src/arch/x86/boot/acpi.c | 8 ++------ src/arch/x86/include/arch/acpi.h | 5 ++--- 2 files changed, 4 insertions(+), 9 deletions(-) (limited to 'src/arch/x86') diff --git a/src/arch/x86/boot/acpi.c b/src/arch/x86/boot/acpi.c index 4c63fc3af2..cbe9095ef9 100644 --- a/src/arch/x86/boot/acpi.c +++ b/src/arch/x86/boot/acpi.c @@ -349,12 +349,8 @@ void acpi_create_srat(acpi_srat_t *srat) header->checksum = acpi_checksum((void *)srat, header->length); } -unsigned long __attribute__((weak)) acpi_fill_dmar(unsigned long current) -{ - return current; -} - -void acpi_create_dmar(acpi_dmar_t *dmar) +void acpi_create_dmar(acpi_dmar_t *dmar, + unsigned long (*acpi_fill_dmar) (unsigned long)) { acpi_header_t *header = &(dmar->header); unsigned long current = (unsigned long)dmar + sizeof(acpi_dmar_t); diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h index 313bdf11a3..9934d0b972 100644 --- a/src/arch/x86/include/arch/acpi.h +++ b/src/arch/x86/include/arch/acpi.h @@ -535,15 +535,14 @@ void acpi_create_mcfg(acpi_mcfg_t *mcfg); void acpi_create_facs(acpi_facs_t *facs); -void acpi_create_dmar(acpi_dmar_t *dmar); +void acpi_create_dmar(acpi_dmar_t *dmar, + unsigned long (*acpi_fill_dmar) (unsigned long)); unsigned long acpi_create_dmar_drhd(unsigned long current, u8 flags, u16 segment, u32 bar); 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); -unsigned long acpi_fill_dmar(unsigned long); - #if CONFIG_HAVE_ACPI_SLIC unsigned long acpi_create_slic(unsigned long current); #endif -- cgit v1.2.3