From: Bartosz Szczepanek <bsz@amazon.de>
To: Rob Herring <robh@kernel.org>, Saravana Kannan <saravanak@google.com>
Cc: <nh-open-source@amazon.com>, Bartosz Szczepanek <bsz@amazon.de>,
<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: [PATCH] fdt: Extend warnings on error paths
Date: Wed, 23 Apr 2025 09:10:17 +0000 [thread overview]
Message-ID: <20250423091018.51831-1-bsz@amazon.de> (raw)
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.
Signed-off-by: Bartosz Szczepanek <bsz@amazon.de>
---
drivers/of/fdt.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index aedd0e2dcd89..c9b5e056b713 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -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();
--
2.47.1
next reply other threads:[~2025-04-23 9:10 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-23 9:10 Bartosz Szczepanek [this message]
2025-04-23 20:23 ` Rob Herring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250423091018.51831-1-bsz@amazon.de \
--to=bsz@amazon.de \
--cc=devicetree@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nh-open-source@amazon.com \
--cc=robh@kernel.org \
--cc=saravanak@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®