[PATCH] x86/efi: Remove the always true EFI_DEBUG symbol

[PATCH] x86/efi: Remove the always true EFI_DEBUG symbol

[Matt Fleming]

This symbol is always set which makes it useless. Additionally we have
a kernel command-line switch, efi=debug, which actually controls the
printing of the memory map.

Reported-by: Robert Elliott <elliott@hpe.com>
Cc: Borislav Petkov <bp@alien8.de>
Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk>
---
 arch/x86/platform/efi/efi.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index dde46cd78b8f..f93545e7dc54 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -54,8 +54,6 @@
 #include <asm/rtc.h>
 #include <asm/uv/uv.h>
 
-#define EFI_DEBUG
-
 static struct efi efi_phys __initdata;
 static efi_system_table_t efi_systab __initdata;
 
@@ -222,7 +220,6 @@ int __init efi_memblock_x86_reserve_range(void)
 
 void __init efi_print_memmap(void)
 {
-#ifdef EFI_DEBUG
 	efi_memory_desc_t *md;
 	int i = 0;
 
@@ -235,7 +232,6 @@ void __init efi_print_memmap(void)
 			md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT) - 1,
 			(md->num_pages >> (20 - EFI_PAGE_SHIFT)));
 	}
-#endif  /*  EFI_DEBUG  */
 }
 
 void __init efi_unmap_memmap(void)
-- 
2.7.3

Re: [PATCH] x86/efi: Remove the always true EFI_DEBUG symbol

[Borislav Petkov]

On Thu, Apr 21, 2016 at 12:09:30PM +0100, Matt Fleming wrote:
> This symbol is always set which makes it useless. Additionally we have
> a kernel command-line switch, efi=debug, which actually controls the
> printing of the memory map.
> 
> Reported-by: Robert Elliott <elliott-ZPxbGqLxI0U@public.gmane.org>
> Cc: Borislav Petkov <bp-Gina5bIWoIWzQB+pC5nmwQ@public.gmane.org>
> Signed-off-by: Matt Fleming <matt-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org>
> ---
>  arch/x86/platform/efi/efi.c | 4 ----
>  1 file changed, 4 deletions(-)

Acked-by: Borislav Petkov <bp-l3A5Bk7waGM@public.gmane.org>

Btw, there's also

arch/ia64/kernel/efi.c:45:#define EFI_DEBUG     0
arch/ia64/kernel/efi.c:399:#if EFI_DEBUG
arch/ia64/kernel/efi.c:559:#if EFI_DEBUG

I'm assuming you want to put that behind "if (efi_enabled(EFI_DBG))" too...

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.

Re: [PATCH] x86/efi: Remove the always true EFI_DEBUG symbol

[Matt Fleming]

On Thu, 21 Apr, at 02:45:42PM, Borislav Petkov wrote:
> On Thu, Apr 21, 2016 at 12:09:30PM +0100, Matt Fleming wrote:
> > This symbol is always set which makes it useless. Additionally we have
> > a kernel command-line switch, efi=debug, which actually controls the
> > printing of the memory map.
> > 
> > Reported-by: Robert Elliott <elliott-ZPxbGqLxI0U@public.gmane.org>
> > Cc: Borislav Petkov <bp-Gina5bIWoIWzQB+pC5nmwQ@public.gmane.org>
> > Signed-off-by: Matt Fleming <matt-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org>
> > ---
> >  arch/x86/platform/efi/efi.c | 4 ----
> >  1 file changed, 4 deletions(-)
> 
> Acked-by: Borislav Petkov <bp-l3A5Bk7waGM@public.gmane.org>
> 
> Btw, there's also
> 
> arch/ia64/kernel/efi.c:45:#define EFI_DEBUG     0
> arch/ia64/kernel/efi.c:399:#if EFI_DEBUG
> arch/ia64/kernel/efi.c:559:#if EFI_DEBUG
> 
> I'm assuming you want to put that behind "if (efi_enabled(EFI_DBG))" too...

Hmm.. Yes, that'd be a good idea. I am in the process of setting up an
Itanium box or two for runtime EFI testing, so I'll make a note of
this task.