2022-06-09 11:42:55

by Evgeniy Baskov

Subject: [PATCH] efi/x86: libstub: Fix typo in __efi64_argmap* name

The actual name of the DXE services function used
is set_memory_space_attributes(), not set_memory_space_descriptor().

Change EFI mixed mode helper macro name to match the function name.

Fixes: 31f1a0edff78 ("efi/x86: libstub: Make DXE calls mixed mode safe")
Signed-off-by: Evgeniy Baskov <[email protected]>
---
arch/x86/include/asm/efi.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
index 71943dce691e..9636742a80f2 100644
--- a/arch/x86/include/asm/efi.h
+++ b/arch/x86/include/asm/efi.h
@@ -323,7 +323,7 @@ static inline u32 efi64_convert_status(efi_status_t status)
#define __efi64_argmap_get_memory_space_descriptor(phys, desc) \
(__efi64_split(phys), (desc))

-#define __efi64_argmap_set_memory_space_descriptor(phys, size, flags) \
+#define __efi64_argmap_set_memory_space_attributes(phys, size, flags) \
(__efi64_split(phys), __efi64_split(size), __efi64_split(flags))

/*
--
2.36.1

2022-06-09 12:45:31

by Ard Biesheuvel

Subject: Re: [PATCH] efi/x86: libstub: Fix typo in __efi64_argmap* name

On Thu, 9 Jun 2022 at 13:39, Evgeniy Baskov <[email protected]> wrote:
>
> The actual name of the DXE services function used
> is set_memory_space_attributes(), not set_memory_space_descriptor().
>
> Change EFI mixed mode helper macro name to match the function name.
>
> Fixes: 31f1a0edff78 ("efi/x86: libstub: Make DXE calls mixed mode safe")
> Signed-off-by: Evgeniy Baskov <[email protected]>

Thanks for the fix! I'll queue this up in efi/urgent


> ---
> arch/x86/include/asm/efi.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
> index 71943dce691e..9636742a80f2 100644
> --- a/arch/x86/include/asm/efi.h
> +++ b/arch/x86/include/asm/efi.h
> @@ -323,7 +323,7 @@ static inline u32 efi64_convert_status(efi_status_t status)
> #define __efi64_argmap_get_memory_space_descriptor(phys, desc) \
> (__efi64_split(phys), (desc))
>
> -#define __efi64_argmap_set_memory_space_descriptor(phys, size, flags) \
> +#define __efi64_argmap_set_memory_space_attributes(phys, size, flags) \
> (__efi64_split(phys), __efi64_split(size), __efi64_split(flags))
>
> /*
> --
> 2.36.1
>