fdt: Extend warnings on error paths
PATCH 1/1 fdt: Extend warnings on error paths
Print out adress and size if elfcorehdr is overlapped. Be more verbose about what went wrong in case early_init_dt_verify fails. Other than improving logging, no functional change is intended in this commit.
--- drivers/of/fdt.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/of/fdt.c +11 -3
@@ -469,21 +469,22 @@ static u32 of_fdt_crc32;* described in the device tree. This region contains all the * information about primary kernel's core image and is used by a dump * capture kernel to access the system memory on primary kernel. */ static void __init fdt_reserve_elfcorehdr (void ) {if (!IS_ENABLED (CONFIG_CRASH_DUMP ) || !elfcorehdr_size)return ;if (memblock_is_region_reserved (elfcorehdr_addr, elfcorehdr_size)) { -pr_warn ("elfcorehdr is overlapped\n" ); +pr_warn ("elfcorehdr is overlapped (addr=0x%llx, size=%llu)\n" , + elfcorehdr_addr, elfcorehdr_size);return ; }memblock_reserve (elfcorehdr_addr, elfcorehdr_size);pr_info ("Reserving %llu KiB of memory at 0x%llx for elfcorehdr\n" , elfcorehdr_size >>10 , elfcorehdr_addr); }/**
@@ -1128,26 +1129,33 @@ void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size)memblock_add (base, size); }static void *__init early_init_dt_alloc_memory_arch (u64 size,u64 align) {return memblock_alloc_or_panic (size, align); }bool __init early_init_dt_verify (void *dt_virt,phys_addr_t dt_phys) { -if (!dt_virt) +int rc; + +if (!dt_virt) { +pr_warn ("FDT wasn't correctly mapped" );return false; + }/* check device tree validity */ -if (fdt_check_header (dt_virt)) + rc =fdt_check_header (dt_virt); +if (rc) { +pr_warn ("FDT header is invalid: status=%d" , rc);return false; + }/* Setup flat device-tree pointer */ initial_boot_params = dt_virt; initial_boot_params_pa = dt_phys; of_fdt_crc32 =crc32_be (~0 , initial_boot_params,fdt_totalsize (initial_boot_params));/* Initialize {size,address}-cells info */ early_init_dt_scan_root ();
Signature · 1 line
2.47.1
Rob Herring
maintainerQuoted 43 lines · Bartosz Szczepanek
Print out adress and size if elfcorehdr is overlapped. Be more verbose about what went wrong in case
early_init_dt_verifyfails. Other than improving logging, no functional change is intended in this commit.Signed-off-by Bartosz Szczepanek <[email protected]>--- drivers/of/fdt.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)drivers/of/fdt.c +2
-1@@ -469,21 +469,22 @@ static u32 of_fdt_crc32;* described in the device tree. This region contains all the * information about primary kernel's core image and is used by a dump * capture kernel to access the system memory on primary kernel. */ static void __init fdt_reserve_elfcorehdr (void ) {if (!IS_ENABLED (CONFIG_CRASH_DUMP ) || !elfcorehdr_size)return ;if (memblock_is_region_reserved (elfcorehdr_addr, elfcorehdr_size)) { -pr_warn ("elfcorehdr is overlapped\n" ); +pr_warn ("elfcorehdr is overlapped (addr=0x%llx, size=%llu)\n" , + elfcorehdr_addr, elfcorehdr_size);return ; }memblock_reserve (elfcorehdr_addr, elfcorehdr_size);pr_info ("Reserving %llu KiB of memory at 0x%llx for elfcorehdr\n" , elfcorehdr_size >>10 , elfcorehdr_addr); }/** @@ -1128,26 +1129,33 @@ void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size)memblock_add (base, size); }static void *__init early_init_dt_alloc_memory_arch (u64 size,u64 align) {
drivers/of/fdt.c void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size) · line 1142
Quoted 10 lines
drivers/of/fdt.c +4
-1return memblock_alloc_or_panic (size, align); }bool __init early_init_dt_verify (void *dt_virt,phys_addr_t dt_phys) { -if (!dt_virt) +int rc; + +if (!dt_virt) { +pr_warn ("FDT wasn't correctly mapped" );
You need a '\n' here. Technically, it doesn't, but IIRC it won't get flushed out immediately without. Of course, this runs too early to see the message typically.
It's possible some arch has a fallback if this function fails and doesn't want the warning, but we can apply and see.
Quoted 9 lines
drivers/of/fdt.c +4
-1return false; + }/* check device tree validity */ -if (fdt_check_header (dt_virt)) + rc =fdt_check_header (dt_virt); +if (rc) { +pr_warn ("FDT header is invalid: status=%d" , rc);return false;
drivers/of/fdt.c void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size) · line 1160
Quoted 10 lines
drivers/of/fdt.c +1
-0+ }/* Setup flat device-tree pointer */ initial_boot_params = dt_virt; initial_boot_params_pa = dt_phys; of_fdt_crc32 =crc32_be (~0 , initial_boot_params,fdt_totalsize (initial_boot_params));/* Initialize {size,address}-cells info */ early_init_dt_scan_root ();
Normal context is 3 lines. Please send patches that way.
Rob