Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26d7f65f authored by Matt Fleming's avatar Matt Fleming
Browse files

x86/efi: Preface all print statements with efi* tag 



The pr_*() calls in the x86 EFI code may or may not include a
subsystem tag, which makes it difficult to grep the kernel log for all
relevant EFI messages and leads users to miss important information.

Recently, a bug reporter provided all the EFI print messages from the
kernel log when trying to diagnose an issue but missed the following
statement because it wasn't prefixed with anything indicating it was
related to EFI,

  pr_err("Error ident-mapping new memmap (0x%lx)!\n", pa_memmap);

Cc: Borislav Petkov <bp@suse.de>
Reviewed-by: default avatarJosh Triplett <josh@joshtriplett.org>
Signed-off-by: default avatarMatt Fleming <matt@codeblueprint.co.uk>
parent 3bb9eee6

arch/x86/platform/efi/efi-bgrt.c

+3 −0
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ 
 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/acpi.h>

arch/x86/platform/efi/efi_64.c

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
 *

 */



#define pr_fmt(fmt) "efi: " fmt



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/mm.h>

arch/x86/platform/efi/quirks.c

+3 −1
Original line number Diff line number Diff line 
#define pr_fmt(fmt) "efi: " fmt



#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/string.h>
@@ -256,7 +258,7 @@ void __init efi_apply_memmap_quirks(void) 
	 * services.

	 */

	if (!efi_runtime_supported()) {

		pr_info("efi: Setup done, disabling due to 32/64-bit mismatch\n");

		pr_info("Setup done, disabling due to 32/64-bit mismatch\n");

		efi_unmap_memmap();

	}