lkml.org 
[lkml]   [2016]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCHv2 2/6] arm64/efi: move to generic {__,}efi_call_virt
    Date
    Now there's a common template for {__,}efi_call_virt, remove the
    duplicate logic from the arm64 efi code.

    Signed-off-by: Mark Rutland <mark.rutland@arm.com>
    Acked-by: Will Deacon <will.deacon@arm.com>
    Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
    Cc: Catalin Marinas <catalin.marinas@arm.com>
    Cc: Leif Lindholm <leif.lindholm@linaro.org>
    Cc: Matt Fleming <matt@codeblueprint.co.uk>
    Cc: linux-arm-kernel@lists.infradead.org
    Cc: linux-efi@vger.kernel.org
    Cc: linux-kernel@vger.kernel.org
    ---
    arch/arm64/include/asm/efi.h | 21 +++++++--------------
    1 file changed, 7 insertions(+), 14 deletions(-)

    diff --git a/arch/arm64/include/asm/efi.h b/arch/arm64/include/asm/efi.h
    index 8e88a69..f4f71224 100644
    --- a/arch/arm64/include/asm/efi.h
    +++ b/arch/arm64/include/asm/efi.h
    @@ -14,28 +14,21 @@ extern void efi_init(void);

    int efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md);

    -#define efi_call_virt(f, ...) \
    +#define arch_efi_call_virt_setup() \
    ({ \
    - efi_##f##_t *__f; \
    - efi_status_t __s; \
    - \
    kernel_neon_begin(); \
    efi_virtmap_load(); \
    - __f = efi.systab->runtime->f; \
    - __s = __f(__VA_ARGS__); \
    - efi_virtmap_unload(); \
    - kernel_neon_end(); \
    - __s; \
    })

    -#define __efi_call_virt(f, ...) \
    +#define arch_efi_call_virt(f, args...) \
    ({ \
    efi_##f##_t *__f; \
    - \
    - kernel_neon_begin(); \
    - efi_virtmap_load(); \
    __f = efi.systab->runtime->f; \
    - __f(__VA_ARGS__); \
    + __f(args); \
    +})
    +
    +#define arch_efi_call_virt_teardown() \
    +({ \
    efi_virtmap_unload(); \
    kernel_neon_end(); \
    })
    --
    1.9.1
    \
     
     \ /
      Last update: 2016-04-22 16:21    [W:2.509 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site