efi/esrt: Cleanup bad memory map log messages

dsd · Ard Biesheuvel · commit 822f5845f710 · 2017-03-17T18:53:12.000Z
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 &lt;drake@endlessm.com&gt;
Cc: Matt Fleming &lt;matt@codeblueprint.co.uk&gt;
Acked-by: Peter Jones &lt;pjones@redhat.com&gt;
Signed-off-by: Ard Biesheuvel &lt;ard.biesheuvel@linaro.org&gt;
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
@@ -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;
 }
 
diff --git a/drivers/firmware/efi/esrt.c b/drivers/firmware/efi/esrt.c
@@ -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;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -389,7 +389,6 @@ int __init efi_mem_desc_lookup(u64 phys_addr, efi_memory_desc_t *out_md)`
`389`	`389`	`return 0;`
`390`	`390`	`}`
`391`	`391`	`}`
`392`		`- pr_err_once("requested map not found.\n");`
`393`	`392`	`return -ENOENT;`
`394`	`393`	`}`
`395`	`394`
Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ void __init efi_esrt_init(void)`
`254`	`254`
`255`	`255`	`rc = efi_mem_desc_lookup(efi.esrt, &md);`
`256`	`256`	`if (rc < 0) {`
`257`		`- pr_err("ESRT header is not in the memory map.\n");`
	`257`	`+ pr_warn("ESRT header is not in the memory map.\n");`
`258`	`258`	`return;`
`259`	`259`	`}`
`260`	`260`