From: Bartosz Szczepanek <bsz@amazon.de>
Date: Wed, 23 Apr 2025 09:05:16 +0000 (+0000)
Subject: efi: Improve logging around memmap init
X-Git-Tag: v6.16-rc1~107^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1288f1db68b30b1efd9a40ef966490631ae6a46;p=thirdparty%2Flinux.git

efi: Improve logging around memmap init

Be more informative if memremap fails, and print out physical address
together with size. This change intends to make investigations of such
early failures slightly easier.

Signed-off-by: Bartosz Szczepanek <bsz@amazon.de>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---

diff --git a/drivers/firmware/efi/memmap.c b/drivers/firmware/efi/memmap.c
index 34109fd86c55d..f1c04d7cfd712 100644
--- a/drivers/firmware/efi/memmap.c
+++ b/drivers/firmware/efi/memmap.c
@@ -43,7 +43,8 @@ int __init __efi_memmap_init(struct efi_memory_map_data *data)
 		map.map = early_memremap(phys_map, data->size);
 
 	if (!map.map) {
-		pr_err("Could not map the memory map!\n");
+		pr_err("Could not map the memory map! phys_map=%pa, size=0x%lx\n",
+			&phys_map, data->size);
 		return -ENOMEM;
 	}