From: George McCollister Date: Tue, 7 Jun 2016 18:40:18 +0000 (-0500) Subject: x86: acpi: Fix madt lapic generation X-Git-Tag: v2016.07-rc2~50^2~8 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8a1a7595cfbcb12d01a5c1f486ebfd50af90c34c;p=oweals%2Fu-boot.git x86: acpi: Fix madt lapic generation An accumulated length was incorrectly added to current each pass through the loop. On system with more than 2 cores this caused a corrupt MADT to be generated. Signed-off-by: George McCollister Reviewed-by: Simon Glass Reviewed-by: Bin Meng --- diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c index ffb4678e51..bb71286dba 100644 --- a/arch/x86/lib/acpi_table.c +++ b/arch/x86/lib/acpi_table.c @@ -183,20 +183,20 @@ static int acpi_create_madt_lapic(struct acpi_madt_lapic *lapic, int acpi_create_madt_lapics(u32 current) { struct udevice *dev; - int length = 0; + int total_length = 0; for (uclass_find_first_device(UCLASS_CPU, &dev); dev; uclass_find_next_device(&dev)) { struct cpu_platdata *plat = dev_get_parent_platdata(dev); - - length += acpi_create_madt_lapic( - (struct acpi_madt_lapic *)current, - plat->cpu_id, plat->cpu_id); + int length = acpi_create_madt_lapic( + (struct acpi_madt_lapic *)current, + plat->cpu_id, plat->cpu_id); current += length; + total_length += length; } - return length; + return total_length; } int acpi_create_madt_ioapic(struct acpi_madt_ioapic *ioapic, u8 id,