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

Commit 8e30524d authored by Thomas Renninger's avatar Thomas Renninger Committed by H. Peter Anvin
Browse files

x86, acpi: Introduce x86 arch specific arch_reserve_mem_area() for e820 handling 



This is needed for ACPI table overriding via initrd. Beside reserving
memblocks, X86 also requires to flag the memory area to E820_RESERVED or
E820_ACPI in the e820 mappings to be able to io(re)map it later.

Signed-off-by: default avatarThomas Renninger <trenn@suse.de>
Link: http://lkml.kernel.org/r/1349043837-22659-3-git-send-email-trenn@suse.de


Cc: Len Brown <lenb@kernel.org>
Cc: Robert Moore <robert.moore@intel.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Eric Piel <eric.piel@tremplin-utc.net>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent e6459606

arch/x86/kernel/acpi/boot.c

+6 −0
Original line number Diff line number Diff line
@@ -1700,3 +1700,9 @@ int __acpi_release_global_lock(unsigned int *lock) 
	} while (unlikely (val != old));

	return old & 0x1;

}



void __init arch_reserve_mem_area(acpi_physical_address addr, size_t size)

{

	e820_add_region(addr, size, E820_ACPI);

	update_e820();

}

include/linux/acpi.h

+8 −0
Original line number Diff line number Diff line
@@ -426,6 +426,14 @@ void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state, 


acpi_status acpi_os_prepare_sleep(u8 sleep_state,

				  u32 pm1a_control, u32 pm1b_control);

#if CONFIG_X86

void arch_reserve_mem_area(acpi_physical_address addr, size_t size);

#else

static inline void arch_reserve_mem_area(acpi_physical_address addr,

					  size_t size)

{

}

#endif /* CONFIG_X86 */

#else

#define acpi_os_set_prepare_sleep(func, pm1a_ctrl, pm1b_ctrl) do { } while (0)

#endif