arch/x86/acpi: use ALIGN_UP instead of ALIGN
The ALIGN_UP macro is basically an alias of the ALIGN macro; with this change it's more obvious in which direction the alignment happens. Change-Id: I6f1b9f9bbcafeb85a6ef5c10ce4b57edc0740e72 Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Reviewed-on: https://review.coreboot.org/c/coreboot/+/33627 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr> Reviewed-by: Lance Zhao <lance.zhao@gmail.com>
This commit is contained in:
		@@ -864,7 +864,7 @@ unsigned long acpi_write_hpet(struct device *device, unsigned long current,
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	hpet = (acpi_hpet_t *) current;
 | 
						hpet = (acpi_hpet_t *) current;
 | 
				
			||||||
	current += sizeof(acpi_hpet_t);
 | 
						current += sizeof(acpi_hpet_t);
 | 
				
			||||||
	current = ALIGN(current, 16);
 | 
						current = ALIGN_UP(current, 16);
 | 
				
			||||||
	acpi_create_hpet(hpet);
 | 
						acpi_create_hpet(hpet);
 | 
				
			||||||
	acpi_add_table(rsdp, hpet);
 | 
						acpi_add_table(rsdp, hpet);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -1322,7 +1322,7 @@ unsigned long write_acpi_tables(unsigned long start)
 | 
				
			|||||||
	acpi_write_xsdt(xsdt, oem_id, oem_table_id);
 | 
						acpi_write_xsdt(xsdt, oem_id, oem_table_id);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	printk(BIOS_DEBUG, "ACPI:    * FACS\n");
 | 
						printk(BIOS_DEBUG, "ACPI:    * FACS\n");
 | 
				
			||||||
	current = (ALIGN(current, 64));
 | 
						current = ALIGN_UP(current, 64);
 | 
				
			||||||
	facs = (acpi_facs_t *) current;
 | 
						facs = (acpi_facs_t *) current;
 | 
				
			||||||
	current += sizeof(acpi_facs_t);
 | 
						current += sizeof(acpi_facs_t);
 | 
				
			||||||
	current = acpi_align_current(current);
 | 
						current = acpi_align_current(current);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1004,7 +1004,7 @@ static inline int acpi_is_wakeup_s4(void) { return 0; }
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
static inline uintptr_t acpi_align_current(uintptr_t current)
 | 
					static inline uintptr_t acpi_align_current(uintptr_t current)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	return ALIGN(current, 16);
 | 
						return ALIGN_UP(current, 16);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* ACPI table revisions should match the revision of the ACPI spec
 | 
					/* ACPI table revisions should match the revision of the ACPI spec
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user