Commit 822f5845 authored Feb 07, 2017 by Daniel Drake Committed by Ard Biesheuvel Mar 17, 2017

efi/esrt: Cleanup bad memory map log messages



The Intel Compute Stick STCK1A8LFC and Weibu F3C platforms both
log 2 error messages during boot:

   efi: requested map not found.
   esrt: ESRT header is not in the memory map.

Searching the web, this seems to affect many other platforms too.
Since these messages are logged as errors, they appear on-screen during
the boot process even when using the "quiet" boot parameter used by
distros.

Demote the ESRT error to a warning so that it does not appear on-screen,
and delete the error logging from efi_mem_desc_lookup; both callsites
of that function log more specific messages upon failure.

Out of curiosity I looked closer at the Weibu F3C. There is no entry in
the UEFI-provided memory map which corresponds to the ESRT pointer, but
hacking the code to map it anyway, the ESRT does appear to be valid with
2 entries.

Signed-off-by: Daniel Drake <drake@endlessm.com>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Acked-by: Peter Jones <pjones@redhat.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

parent 4495c08e

drivers/firmware/efi/efi.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -389,7 +389,6 @@ int __init efi_mem_desc_lookup(u64 phys_addr, efi_memory_desc_t *out_md)
		return 0;
		}
		}
		pr_err_once("requested map not found.\n");
		return -ENOENT;
		}

drivers/firmware/efi/esrt.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -254,7 +254,7 @@ void __init efi_esrt_init(void)

		rc = efi_mem_desc_lookup(efi.esrt, &md);
		if (rc < 0) {
		pr_err("ESRT header is not in the memory map.\n");
		pr_warn("ESRT header is not in the memory map.\n");
		return;
		}