diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2015-12-10 17:07:38 -0600 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2015-12-15 20:12:01 +0100 |
| commit | 07a1b281a864e8c2a17e29767a7abf495587b325 (patch) | |
| tree | 6856167e67eeb9c56503efc7ed07204d6846eda9 /src/soc | |
| parent | ecd4cfcb8695988d82069df4509b56e39794379e (diff) | |
| download | coreboot-07a1b281a864e8c2a17e29767a7abf495587b325.tar.xz | |
x86 acpi: remove ALIGN_CURRENT macro
The ALIGN_CURRENT macro relied on a local variable name
as well as being defined in numerous compilation units.
Replace those instances with an acpi_align_current()
inline function.
Change-Id: Iab453f2eda1addefad8a1c37d265f917bd803202
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/12707
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/soc')
| -rw-r--r-- | src/soc/intel/braswell/acpi.c | 8 | ||||
| -rw-r--r-- | src/soc/intel/fsp_baytrail/acpi.c | 6 | ||||
| -rw-r--r-- | src/soc/intel/skylake/acpi.c | 3 | ||||
| -rw-r--r-- | src/soc/intel/skylake/igd.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/skylake/include/soc/acpi.h | 2 |
5 files changed, 7 insertions, 14 deletions
diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c index 505b52cac3..f7c37481d8 100644 --- a/src/soc/intel/braswell/acpi.c +++ b/src/soc/intel/braswell/acpi.c @@ -472,8 +472,6 @@ unsigned long acpi_madt_irq_overrides(unsigned long current) return current; } -#define ALIGN_CURRENT current = (ALIGN(current, 16)) - unsigned long southcluster_write_acpi_tables(device_t device, unsigned long current, struct acpi_rsdp *rsdp) @@ -481,7 +479,7 @@ unsigned long southcluster_write_acpi_tables(device_t device, acpi_header_t *ssdt2; current = acpi_write_hpet(device, current, rsdp); - ALIGN_CURRENT; + current = acpi_align_current(current); #if CONFIG_GOP_SUPPORT igd_opregion_t *opregion; @@ -490,7 +488,7 @@ unsigned long southcluster_write_acpi_tables(device_t device, opregion = (igd_opregion_t *)current; init_igd_opregion(opregion); current += sizeof(igd_opregion_t); - ALIGN_CURRENT; + current = acpi_align_current(current); #endif ssdt2 = (acpi_header_t *)current; @@ -501,7 +499,7 @@ unsigned long southcluster_write_acpi_tables(device_t device, acpi_add_table(rsdp, ssdt2); printk(BIOS_DEBUG, "ACPI: * SSDT2 @ %p Length %x\n",ssdt2, ssdt2->length); - ALIGN_CURRENT; + current = acpi_align_current(current); } else { ssdt2 = NULL; printk(BIOS_DEBUG, "ACPI: * SSDT2 not generated.\n"); diff --git a/src/soc/intel/fsp_baytrail/acpi.c b/src/soc/intel/fsp_baytrail/acpi.c index b9258729a8..2aa8c00c8c 100644 --- a/src/soc/intel/fsp_baytrail/acpi.c +++ b/src/soc/intel/fsp_baytrail/acpi.c @@ -556,8 +556,6 @@ unsigned long acpi_madt_irq_overrides(unsigned long current) return current; } -#define ALIGN_CURRENT current = (ALIGN(current, 16)) - unsigned long southcluster_write_acpi_tables(device_t device, unsigned long current, struct acpi_rsdp *rsdp) @@ -565,7 +563,7 @@ unsigned long southcluster_write_acpi_tables(device_t device, acpi_header_t *ssdt2; current = acpi_write_hpet(device, current, rsdp); - ALIGN_CURRENT; + current = acpi_align_current(current); ssdt2 = (acpi_header_t *)current; memset(ssdt2, 0, sizeof(acpi_header_t)); @@ -575,7 +573,7 @@ unsigned long southcluster_write_acpi_tables(device_t device, acpi_add_table(rsdp, ssdt2); printk(BIOS_DEBUG, "ACPI: * SSDT2 @ %p Length %x\n",ssdt2, ssdt2->length); - ALIGN_CURRENT; + current = acpi_align_current(current); } else { ssdt2 = NULL; printk(BIOS_DEBUG, "ACPI: * SSDT2 not generated.\n"); diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c index 36b5bb4017..4892656b89 100644 --- a/src/soc/intel/skylake/acpi.c +++ b/src/soc/intel/skylake/acpi.c @@ -542,8 +542,7 @@ unsigned long southcluster_write_acpi_tables(device_t device, struct acpi_rsdp *rsdp) { current = acpi_write_hpet(device, current, rsdp); - ALIGN_CURRENT; - return current; + return acpi_align_current(current); } void southcluster_inject_dsdt(device_t device) diff --git a/src/soc/intel/skylake/igd.c b/src/soc/intel/skylake/igd.c index f92917690e..9268c095f5 100644 --- a/src/soc/intel/skylake/igd.c +++ b/src/soc/intel/skylake/igd.c @@ -177,7 +177,7 @@ static unsigned long write_acpi_igd_opregion(device_t device, opregion = (igd_opregion_t *)current; init_igd_opregion(opregion); current += sizeof(igd_opregion_t); - ALIGN_CURRENT; + current = acpi_align_current(current); printk(BIOS_DEBUG, "current = %lx\n", current); return current; diff --git a/src/soc/intel/skylake/include/soc/acpi.h b/src/soc/intel/skylake/include/soc/acpi.h index 08408f9d2c..77e87267f1 100644 --- a/src/soc/intel/skylake/include/soc/acpi.h +++ b/src/soc/intel/skylake/include/soc/acpi.h @@ -26,8 +26,6 @@ #define PSS_LATENCY_TRANSITION 10 #define PSS_LATENCY_BUSMASTER 10 -#define ALIGN_CURRENT current = (ALIGN(current, 16)) - void acpi_fill_in_fadt(acpi_fadt_t *fadt); unsigned long acpi_madt_irq_overrides(unsigned long current); void acpi_mainboard_gnvs(global_nvs_t *gnvs); |