Commit 9a5ba778 authored Apr 13, 2021 by Rafael J. Wysocki Committed by Greg Kroah-Hartman May 07, 2021

ACPI: x86: Call acpi_boot_table_init() after acpi_table_upgrade()



commit 6998a8800d73116187aad542391ce3b2dd0f9e30 upstream.

Commit 1a1c130ab757 ("ACPI: tables: x86: Reserve memory occupied by
ACPI tables") attempted to address an issue with reserving the memory
occupied by ACPI tables, but it broke the initrd-based table override
mechanism relied on by multiple users.

To restore the initrd-based ACPI table override functionality, move
the acpi_boot_table_init() invocation in setup_arch() on x86 after
the acpi_table_upgrade() one.

Fixes: 1a1c130ab757 ("ACPI: tables: x86: Reserve memory occupied by ACPI tables")
Reported-by: Hans de Goede <hdegoede@redhat.com>
Tested-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: George Kennedy <george.kennedy@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 7d329dd0

arch/x86/kernel/setup.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -1097,9 +1097,6 @@ void __init setup_arch(char **cmdline_p)

		cleanup_highmap();

		/* Look for ACPI tables and reserve memory occupied by them. */
		acpi_boot_table_init();

		memblock_set_current_limit(ISA_END_ADDRESS);
		e820__memblock_setup();

		@@ -1179,6 +1176,8 @@ void __init setup_arch(char **cmdline_p)
		reserve_initrd();

		acpi_table_upgrade();
		/* Look for ACPI tables and reserve memory occupied by them. */
		acpi_boot_table_init();

		vsmp_init();