summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFelix Held <felix-coreboot@felixheld.de>2019-06-20 14:14:51 +0200
committerFelix Held <felix-coreboot@felixheld.de>2019-06-21 12:49:20 +0000
commit84b5aa3f50bf0874be9554be432ed91bed64802b (patch)
treef8c5fc4c3a8bfcb71c2f66c6c24ebfd8eacc346d /src
parent0f6b51b2de5e53166a7a1e21e5d3f73724219b86 (diff)
arch/x86: use ALIGN_UP instead of ALIGN for better readability
This patch contains the rest of the fixes for this subtree; having one change for every area would create an unnecessary amouint of patches. Change-Id: Id92c11d58693292d58cba323c8468db858becfb5 Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Reviewed-on: https://review.coreboot.org/c/coreboot/+/33630 Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src')
-rw-r--r--src/arch/x86/gdt.c2
-rw-r--r--src/arch/x86/include/arch/early_variables.h2
-rw-r--r--src/arch/x86/pirq_routing.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/arch/x86/gdt.c b/src/arch/x86/gdt.c
index c9aec6d111..d3ad01e1df 100644
--- a/src/arch/x86/gdt.c
+++ b/src/arch/x86/gdt.c
@@ -46,7 +46,7 @@ static void move_gdt(int is_recovery)
newgdt = cbmem_find(CBMEM_ID_GDT);
num_gdt_bytes = (uintptr_t)&gdt_end - (uintptr_t)&gdt;
if (!newgdt) {
- newgdt = cbmem_add(CBMEM_ID_GDT, ALIGN(num_gdt_bytes, 512));
+ newgdt = cbmem_add(CBMEM_ID_GDT, ALIGN_UP(num_gdt_bytes, 512));
if (!newgdt) {
printk(BIOS_ERR, "Error: Could not relocate GDT.\n");
return;
diff --git a/src/arch/x86/include/arch/early_variables.h b/src/arch/x86/include/arch/early_variables.h
index 9ea1537d81..b3042c34d2 100644
--- a/src/arch/x86/include/arch/early_variables.h
+++ b/src/arch/x86/include/arch/early_variables.h
@@ -69,7 +69,7 @@ int car_active(void);
static inline size_t car_data_size(void)
{
size_t car_size = _car_relocatable_data_size;
- return ALIGN(car_size, 64);
+ return ALIGN_UP(car_size, 64);
}
static inline size_t car_object_offset(void *ptr)
diff --git a/src/arch/x86/pirq_routing.c b/src/arch/x86/pirq_routing.c
index 194efb4ad2..70df201c99 100644
--- a/src/arch/x86/pirq_routing.c
+++ b/src/arch/x86/pirq_routing.c
@@ -191,7 +191,7 @@ unsigned long copy_pirq_routing_table(unsigned long addr,
const struct irq_routing_table *routing_table)
{
/* Align the table to be 16 byte aligned. */
- addr = ALIGN(addr, 16);
+ addr = ALIGN_UP(addr, 16);
/* This table must be between 0xf0000 & 0x100000 */
printk(BIOS_INFO, "Copying Interrupt Routing Table to 0x%08lx... ",