summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Serbinenko <phcoder@gmail.com>2014-11-09 13:22:27 +0100
committerVladimir Serbinenko <phcoder@gmail.com>2014-11-27 20:37:58 +0100
commit8d70e94ae1fc1d511cf60148861df936c72607e3 (patch)
tree41c0aeb042cce73fefd3436889e370dd3810812c
parent8be82e1017970e0b86e44b2838ee77d1f100b0c5 (diff)
downloadcoreboot-8d70e94ae1fc1d511cf60148861df936c72607e3.tar.xz
Make acpi_fill_dmar into parameter
Change-Id: I5e237cb7acbf47b2c8a4cd725ee8e16e422e3b17 Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com> Reviewed-on: http://review.coreboot.org/7371 Tested-by: build bot (Jenkins) Reviewed-by: Nicolas Reinecke <nr@das-labor.org> Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
-rw-r--r--src/arch/x86/boot/acpi.c8
-rw-r--r--src/arch/x86/include/arch/acpi.h5
-rw-r--r--src/northbridge/intel/gm45/acpi.c4
3 files changed, 6 insertions, 11 deletions
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
diff --git a/src/northbridge/intel/gm45/acpi.c b/src/northbridge/intel/gm45/acpi.c
index 445995a91b..58498edb85 100644
--- a/src/northbridge/intel/gm45/acpi.c
+++ b/src/northbridge/intel/gm45/acpi.c
@@ -75,7 +75,7 @@ unsigned long acpi_fill_mcfg(unsigned long current)
return current;
}
-unsigned long acpi_fill_dmar(unsigned long current)
+static unsigned long acpi_fill_dmar(unsigned long current)
{
int me_active = (dev_find_slot(0, PCI_DEVFN(3, 0)) != NULL);
int stepping = pci_read_config8(dev_find_slot(0, PCI_DEVFN(0, 0)), PCI_CLASS_REVISION);
@@ -122,7 +122,7 @@ unsigned long northbridge_write_acpi_tables(unsigned long start, struct acpi_rsd
#if CONFIG_IOMMU
printk(BIOS_DEBUG, "ACPI: * DMAR\n");
dmar = (acpi_dmar_t *) current;
- acpi_create_dmar(dmar);
+ acpi_create_dmar(dmar, acpi_fill_dmar);
current += dmar->header.length;
ALIGN_CURRENT;
acpi_add_table(rsdp, dmar);