Commit 887c4cf5 authored by Kees Cook's avatar Kees Cook Committed by Ard Biesheuvel
Browse files

efi: Rename efi_early_memdesc_ptr() to efi_memdesc_ptr() 



The "early" part of the helper's name isn't accurate[1]. Drop it in
preparation for adding a new (not early) usage.

Suggested-by: default avatarArd Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/lkml/CAMj1kXEyDjH0uu3Z4eBesV3PEnKGi5ArXXMp7R-hn8HdRytiPg@mail.gmail.com

 [1]
Signed-off-by: default avatarKees Cook <kees@kernel.org>
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
parent 12a01f66

drivers/firmware/efi/libstub/relocate.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ efi_status_t efi_low_alloc_above(unsigned long size, unsigned long align, 
		unsigned long m = (unsigned long)map->map;

		u64 start, end;



		desc = efi_early_memdesc_ptr(m, map->desc_size, i);

		desc = efi_memdesc_ptr(m, map->desc_size, i);



		if (desc->type != EFI_CONVENTIONAL_MEMORY)

			continue;

drivers/firmware/efi/libstub/unaccepted_memory.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ efi_status_t allocate_unaccepted_bitmap(__u32 nr_desc, 
		efi_memory_desc_t *d;

		unsigned long m = (unsigned long)map->map;



		d = efi_early_memdesc_ptr(m, map->desc_size, i);

		d = efi_memdesc_ptr(m, map->desc_size, i);

		if (d->type != EFI_UNACCEPTED_MEMORY)

			continue;

drivers/firmware/efi/libstub/x86-stub.c

+1 −1
Original line number Diff line number Diff line
@@ -614,7 +614,7 @@ setup_e820(struct boot_params *params, struct setup_data *e820ext, u32 e820ext_s 
		m |= (u64)efi->efi_memmap_hi << 32;

#endif



		d = efi_early_memdesc_ptr(m, efi->efi_memdesc_size, i);

		d = efi_memdesc_ptr(m, efi->efi_memdesc_size, i);

		switch (d->type) {

		case EFI_RESERVED_TYPE:

		case EFI_RUNTIME_SERVICES_CODE:

include/linux/efi.h

+2 −2
Original line number Diff line number Diff line
@@ -784,7 +784,7 @@ extern int efi_memattr_apply_permissions(struct mm_struct *mm, 
					 efi_memattr_perm_setter fn);



/*

 * efi_early_memdesc_ptr - get the n-th EFI memmap descriptor

 * efi_memdesc_ptr - get the n-th EFI memmap descriptor

 * @map: the start of efi memmap

 * @desc_size: the size of space for each EFI memmap descriptor

 * @n: the index of efi memmap descriptor
@@ -802,7 +802,7 @@ extern int efi_memattr_apply_permissions(struct mm_struct *mm, 
 * during bootup since for_each_efi_memory_desc_xxx() is available after the

 * kernel initializes the EFI subsystem to set up struct efi_memory_map.

 */

#define efi_early_memdesc_ptr(map, desc_size, n)			\

#define efi_memdesc_ptr(map, desc_size, n)			\

	(efi_memory_desc_t *)((void *)(map) + ((n) * (desc_size)))



/* Iterate through an efi_memory_map */