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: Ard Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/lkml/CAMj1kXEyDjH0uu3Z4eBesV3PEnKGi5ArXXMp7R-hn8HdRytiPg@mail.gmail.com
Signed-off-by: Kees Cook <kees@kernel.org>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>

diff --git a/drivers/firmware/efi/libstub/relocate.c b/drivers/firmware/efi/libstub/relocate.c
index bf6fbd5d22a1a53af196be2a15f5593468f78da4..d694bcfa1074e93a99e6f47883f812de382033fe 100644 (file)
--- a/drivers/firmware/efi/libstub/relocate.c
+++ b/drivers/firmware/efi/libstub/relocate.c
@@ -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;

diff --git a/drivers/firmware/efi/libstub/unaccepted_memory.c b/drivers/firmware/efi/libstub/unaccepted_memory.c
index 9a655f30ba47db013c03f2f73da88d6405507c7f..c295ea3a6efc3703cba84de858c033dbaa0e549c 100644 (file)
--- a/drivers/firmware/efi/libstub/unaccepted_memory.c
+++ b/drivers/firmware/efi/libstub/unaccepted_memory.c
@@ -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;
 

diff --git a/drivers/firmware/efi/libstub/x86-stub.c b/drivers/firmware/efi/libstub/x86-stub.c
index 1ed94b251c58b2520a4ad69cb56ec7c6f0d9f529..078055b054e3395892cc1f4ae7069c65a0e1ac75 100644 (file)
--- a/drivers/firmware/efi/libstub/x86-stub.c
+++ b/drivers/firmware/efi/libstub/x86-stub.c
@@ -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:

diff --git a/include/linux/efi.h b/include/linux/efi.h
index 3a6c04a9f9aadce1178376b53bbda2a90799c5fa..67b2fa80c8b95262eafb5c6de55840c75b9b4309 100644 (file)
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -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 */