Commit 0bcff59e authored by Andrew Bresticker's avatar Andrew Bresticker Committed by Ard Biesheuvel
Browse files

efi: Don't add memblocks for soft-reserved memory 



Adding memblocks for soft-reserved regions prevents them from later being
hotplugged in by dax_kmem.

Signed-off-by: default avatarAndrew Bresticker <abrestic@rivosinc.com>
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
parent de1034b3

drivers/firmware/efi/efi-init.c

+10 −9
Original line number Diff line number Diff line
@@ -143,15 +143,6 @@ static __init int is_usable_memory(efi_memory_desc_t *md) 
	case EFI_BOOT_SERVICES_DATA:

	case EFI_CONVENTIONAL_MEMORY:

	case EFI_PERSISTENT_MEMORY:

		/*

		 * Special purpose memory is 'soft reserved', which means it

		 * is set aside initially, but can be hotplugged back in or

		 * be assigned to the dax driver after boot.

		 */

		if (efi_soft_reserve_enabled() &&

		    (md->attribute & EFI_MEMORY_SP))

			return false;



		/*

		 * According to the spec, these regions are no longer reserved

		 * after calling ExitBootServices(). However, we can only use
@@ -196,6 +187,16 @@ static __init void reserve_regions(void) 
		size = npages << PAGE_SHIFT;



		if (is_memory(md)) {

			/*

			 * Special purpose memory is 'soft reserved', which

			 * means it is set aside initially. Don't add a memblock

			 * for it now so that it can be hotplugged back in or

			 * be assigned to the dax driver after boot.

			 */

			if (efi_soft_reserve_enabled() &&

			    (md->attribute & EFI_MEMORY_SP))

				continue;



			early_init_dt_add_memory_arch(paddr, size);



			if (!is_usable_memory(md))