Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38b04a74 authored by Jon Masters's avatar Jon Masters Committed by Rafael J. Wysocki
Browse files

ACPI: ARM64: support for ACPI_TABLE_UPGRADE 



This patch adds support for ACPI_TABLE_UPGRADE for ARM64

To access initrd image we need to move initialization
of linear mapping a bit earlier.

The implementation of the feature acpi_table_upgrade()
(drivers/acpi/tables.c) works with initrd data represented as an array
in virtual memory.  It uses some library utility to find the redefined
tables in that array and iterates over it to copy the data to new
allocated memory.  So to access the initrd data via fixmap
we need to rewrite it considerably.

In x86 arch, kernel memory is already mapped by the time when
acpi_table_upgrade() and acpi_boot_table_init() are called so I
think that we can just move this mapping one function earlier too.

Signed-off-by: default avatarJon Masters <jcm@redhat.com>
Signed-off-by: default avatarAleksey Makarov <aleksey.makarov@linaro.org>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 91dda51a

arch/arm64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ config ARM64 
	select ACPI_GENERIC_GSI if ACPI

	select ACPI_REDUCED_HARDWARE_ONLY if ACPI

	select ARCH_HAS_DEVMEM_IS_ALLOWED

	select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI

	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

	select ARCH_HAS_ELF_RANDOMIZE

	select ARCH_HAS_GCOV_PROFILE_ALL

arch/arm64/include/asm/acpi.h

+2 −0
Original line number Diff line number Diff line
@@ -113,4 +113,6 @@ static inline const char *acpi_get_enable_method(int cpu) 
pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr);

#endif



#define ACPI_TABLE_UPGRADE_MAX_PHYS MEMBLOCK_ALLOC_ACCESSIBLE



#endif /*_ASM_ACPI_H*/

arch/arm64/kernel/setup.c

+4 −2
Original line number Diff line number Diff line
@@ -260,11 +260,13 @@ void __init setup_arch(char **cmdline_p) 
	efi_init();

	arm64_memblock_init();



	paging_init();



	acpi_table_upgrade();



	/* Parse the ACPI tables for possible boot-time configuration */

	acpi_boot_table_init();



	paging_init();



	if (acpi_disabled)

		unflatten_device_tree();