| From ac405badae16fa2704c7a7022d00cf3117f3ccc9 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 6 Aug 2020 23:25:01 -0700 |
| Subject: efi: provide empty efi_enter_virtual_mode implementation |
| |
| From: Andrey Konovalov <andreyknvl@google.com> |
| |
| [ Upstream commit 2c547f9da0539ad1f7ef7f08c8c82036d61b011a ] |
| |
| When CONFIG_EFI is not enabled, we might get an undefined reference to |
| efi_enter_virtual_mode() error, if this efi_enabled() call isn't inlined |
| into start_kernel(). This happens in particular, if start_kernel() is |
| annodated with __no_sanitize_address. |
| |
| Reported-by: kernel test robot <lkp@intel.com> |
| Signed-off-by: Andrey Konovalov <andreyknvl@google.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| Acked-by: Ard Biesheuvel <ardb@kernel.org> |
| Cc: Alexander Potapenko <glider@google.com> |
| Cc: Andrey Ryabinin <aryabinin@virtuozzo.com> |
| Cc: Catalin Marinas <catalin.marinas@arm.com> |
| Cc: Dmitry Vyukov <dvyukov@google.com> |
| Cc: Elena Petrova <lenaptr@google.com> |
| Cc: Marco Elver <elver@google.com> |
| Cc: Vincenzo Frascino <vincenzo.frascino@arm.com> |
| Cc: Walter Wu <walter-zh.wu@mediatek.com> |
| Link: http://lkml.kernel.org/r/6514652d3a32d3ed33d6eb5c91d0af63bf0d1a0c.1596544734.git.andreyknvl@google.com |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| include/linux/efi.h | 4 ++++ |
| 1 file changed, 4 insertions(+) |
| |
| diff --git a/include/linux/efi.h b/include/linux/efi.h |
| index 02c4f16685b69..69605956beb85 100644 |
| --- a/include/linux/efi.h |
| +++ b/include/linux/efi.h |
| @@ -910,7 +910,11 @@ extern void *efi_get_pal_addr (void); |
| extern void efi_map_pal_code (void); |
| extern void efi_memmap_walk (efi_freemem_callback_t callback, void *arg); |
| extern void efi_gettimeofday (struct timespec64 *ts); |
| +#ifdef CONFIG_EFI |
| extern void efi_enter_virtual_mode (void); /* switch EFI to virtual mode, if possible */ |
| +#else |
| +static inline void efi_enter_virtual_mode (void) {} |
| +#endif |
| #ifdef CONFIG_X86 |
| extern void efi_late_init(void); |
| extern void efi_free_boot_services(void); |
| -- |
| 2.25.1 |
| |
