Refactor some alignment handling
Made using coccinelle: @@ expression E; @@ -(E + 7) & -8 +ALIGN(E, 8) @@ expression E; @@ -(E + 15) & -16 +ALIGN(E, 16) Change-Id: I071d2c98cd95580d7de21d256c31b6368a3dc70b Signed-off-by: Patrick Georgi <patrick@georgi-clan.de> Reviewed-on: http://review.coreboot.org/910 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com> Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
@@ -110,7 +110,7 @@ unsigned long write_acpi_tables(unsigned long start)
|
||||
get_bus_conf(); /* it will get sblk, pci1234, hcdn, and sbdn */
|
||||
|
||||
/* Align ACPI tables to 16 bytes */
|
||||
start = (start + 0x0f) & -0x10;
|
||||
start = ALIGN(start, 16);
|
||||
current = start;
|
||||
|
||||
printk(BIOS_INFO, "ACPI: Writing ACPI tables at %lx...\n", start);
|
||||
@@ -130,7 +130,7 @@ unsigned long write_acpi_tables(unsigned long start)
|
||||
/*
|
||||
* We explicitly add these tables later on:
|
||||
*/
|
||||
current = (current + 0x07) & -0x08;
|
||||
current = ALIGN(current, 8);
|
||||
printk(BIOS_DEBUG, "ACPI: * HPET at %lx\n", current);
|
||||
hpet = (acpi_hpet_t *) current;
|
||||
current += sizeof(acpi_hpet_t);
|
||||
@@ -138,7 +138,7 @@ unsigned long write_acpi_tables(unsigned long start)
|
||||
acpi_add_table(rsdp, hpet);
|
||||
|
||||
/* If we want to use HPET Timers Linux wants an MADT */
|
||||
current = (current + 0x07) & -0x08;
|
||||
current = ALIGN(current, 8);
|
||||
printk(BIOS_DEBUG, "ACPI: * MADT at %lx\n",current);
|
||||
madt = (acpi_madt_t *) current;
|
||||
acpi_create_madt(madt);
|
||||
@@ -146,7 +146,7 @@ unsigned long write_acpi_tables(unsigned long start)
|
||||
acpi_add_table(rsdp, madt);
|
||||
|
||||
/* SRAT */
|
||||
current = (current + 0x07) & -0x08;
|
||||
current = ALIGN(current, 8);
|
||||
printk(BIOS_DEBUG, "ACPI: * SRAT at %lx\n", current);
|
||||
srat = (acpi_srat_t *) current;
|
||||
acpi_create_srat(srat);
|
||||
@@ -154,7 +154,7 @@ unsigned long write_acpi_tables(unsigned long start)
|
||||
acpi_add_table(rsdp, srat);
|
||||
|
||||
/* SLIT */
|
||||
current = (current + 0x07) & -0x08;
|
||||
current = ALIGN(current, 8);
|
||||
printk(BIOS_DEBUG, "ACPI: * SLIT at %lx\n", current);
|
||||
slit = (acpi_slit_t *) current;
|
||||
acpi_create_slit(slit);
|
||||
@@ -162,7 +162,7 @@ unsigned long write_acpi_tables(unsigned long start)
|
||||
acpi_add_table(rsdp, slit);
|
||||
|
||||
/* SSDT */
|
||||
current = (current + 0x0f) & -0x10;
|
||||
current = ALIGN(current, 16);
|
||||
printk(BIOS_DEBUG, "ACPI: * SSDT at %lx\n", current);
|
||||
ssdt = (acpi_header_t *)current;
|
||||
memcpy(ssdt, &AmlCode_ssdt, sizeof(acpi_header_t));
|
||||
@@ -191,7 +191,7 @@ unsigned long write_acpi_tables(unsigned long start)
|
||||
} else {
|
||||
c = (u8) ('A' + i - 1 - 6);
|
||||
}
|
||||
current = (current + 0x07) & -0x08;
|
||||
current = ALIGN(current, 8);
|
||||
printk(BIOS_DEBUG, "ACPI: * SSDT for PCI%c at %lx\n", c, current); //pci0 and pci1 are in dsdt
|
||||
ssdtx = (acpi_header_t *)current;
|
||||
switch (sysconf.hcid[i]) {
|
||||
@@ -220,7 +220,7 @@ unsigned long write_acpi_tables(unsigned long start)
|
||||
#endif
|
||||
|
||||
/* DSDT */
|
||||
current = (current + 0x07) & -0x08;
|
||||
current = ALIGN(current, 8);
|
||||
printk(BIOS_DEBUG, "ACPI: * DSDT at %lx\n", current);
|
||||
dsdt = (acpi_header_t *)current; // it will used by fadt
|
||||
memcpy(dsdt, &AmlCode, sizeof(acpi_header_t));
|
||||
@@ -229,7 +229,7 @@ unsigned long write_acpi_tables(unsigned long start)
|
||||
printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n",dsdt,dsdt->length);
|
||||
|
||||
/* FACS */ // it needs 64 bit alignment
|
||||
current = (current + 0x07) & -0x08;
|
||||
current = ALIGN(current, 8);
|
||||
printk(BIOS_DEBUG, "ACPI: * FACS at %lx\n", current);
|
||||
facs = (acpi_facs_t *) current; // it will be used by fadt
|
||||
current += sizeof(acpi_facs_t);
|
||||
@@ -237,7 +237,7 @@ unsigned long write_acpi_tables(unsigned long start)
|
||||
|
||||
/* FDAT */
|
||||
#if CONFIG_BOARD_HAS_FADT == 1
|
||||
current = (current + 0x07) & -0x08;
|
||||
current = ALIGN(current, 8);
|
||||
printk(BIOS_DEBUG, "ACPI: * FADT at %lx\n", current);
|
||||
fadt = (acpi_fadt_t *) current;
|
||||
current += sizeof(acpi_fadt_t);
|
||||
|
Reference in New Issue
Block a user