Commit a142d0ae authored by Ard Biesheuvel's avatar Ard Biesheuvel
Browse files

memblock: Permit existing reserved regions to be marked RSRV_KERN 



Permit existing memblock reservations to be marked as RSRV_KERN. This
will be used by the EFI code on x86 to distinguish between reservations
of boot services data regions that have actual significance to the
kernel and regions that are reserved temporarily to work around buggy
firmware.

Acked-by: default avatarMike Rapoport (Microsoft) <rppt@kernel.org>
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
parent 5d0faa8e

include/linux/memblock.h

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ int memblock_mark_mirror(phys_addr_t base, phys_addr_t size); 
int memblock_mark_nomap(phys_addr_t base, phys_addr_t size);

int memblock_clear_nomap(phys_addr_t base, phys_addr_t size);

int memblock_reserved_mark_noinit(phys_addr_t base, phys_addr_t size);

int memblock_reserved_mark_kern(phys_addr_t base, phys_addr_t size);

int memblock_mark_kho_scratch(phys_addr_t base, phys_addr_t size);

int memblock_clear_kho_scratch(phys_addr_t base, phys_addr_t size);

mm/memblock.c

+15 −0
Original line number Diff line number Diff line
@@ -1115,6 +1115,21 @@ int __init_memblock memblock_reserved_mark_noinit(phys_addr_t base, phys_addr_t 
				    MEMBLOCK_RSRV_NOINIT);

}



/**

 * memblock_reserved_mark_kern - Mark a reserved memory region with flag

 * MEMBLOCK_RSRV_KERN

 *

 * @base: the base phys addr of the region

 * @size: the size of the region

 *

 * Return: 0 on success, -errno on failure.

 */

int __init_memblock memblock_reserved_mark_kern(phys_addr_t base, phys_addr_t size)

{

	return memblock_setclr_flag(&memblock.reserved, base, size, 1,

				    MEMBLOCK_RSRV_KERN);

}



/**

 * memblock_mark_kho_scratch - Mark a memory region as MEMBLOCK_KHO_SCRATCH.

 * @base: the base phys addr of the region