From: Stephen Boyd <sboyd@kernel.org> To: Rob Herring <robh+dt@kernel.org> Cc: linux-kernel@vger.kernel.org, patches@lists.linux.dev, linux-um@lists.infradead.org, linux-arm-kernel@lists.infradead.org, kunit-dev@googlegroups.com, linux-kselftest@vger.kernel.org, devicetree@vger.kernel.org, Frank Rowand <frowand.list@gmail.com>, Richard Weinberger <richard@nod.at>, Anton Ivanov <anton.ivanov@cambridgegreys.com>, Johannes Berg <johannes@sipsolutions.net> Subject: [PATCH v4 3/7] um: Unconditionally call unflatten_device_tree() Date: Fri, 16 Feb 2024 17:05:52 -0800 [thread overview] Message-ID: <20240217010557.2381548-4-sboyd@kernel.org> (raw) In-Reply-To: <20240217010557.2381548-1-sboyd@kernel.org> Call this function unconditionally so that we can populate an empty DTB on platforms that don't boot with a command line provided DTB. There's no harm in calling unflatten_device_tree() unconditionally. If there isn't a valid initial_boot_params dtb then unflatten_device_tree() returns early. Cc: Rob Herring <robh+dt@kernel.org> Cc: Frank Rowand <frowand.list@gmail.com> Cc: Richard Weinberger <richard@nod.at> Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com> Cc: Johannes Berg <johannes@sipsolutions.net> Cc: <linux-um@lists.infradead.org> Signed-off-by: Stephen Boyd <sboyd@kernel.org> --- arch/um/kernel/dtb.c | 14 +++++++------- drivers/of/unittest.c | 4 ---- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/arch/um/kernel/dtb.c b/arch/um/kernel/dtb.c index 484141b06938..4954188a6a09 100644 --- a/arch/um/kernel/dtb.c +++ b/arch/um/kernel/dtb.c @@ -16,16 +16,16 @@ void uml_dtb_init(void) void *area; area = uml_load_file(dtb, &size); - if (!area) - return; + if (area) { + if (!early_init_dt_scan(area)) { + pr_err("invalid DTB %s\n", dtb); + memblock_free(area, size); + return; + } - if (!early_init_dt_scan(area)) { - pr_err("invalid DTB %s\n", dtb); - memblock_free(area, size); - return; + early_init_fdt_scan_reserved_mem(); } - early_init_fdt_scan_reserved_mem(); unflatten_device_tree(); } diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index cfd60e35a899..891752a20a5f 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -4087,10 +4087,6 @@ static int __init of_unittest(void) add_taint(TAINT_TEST, LOCKDEP_STILL_OK); /* adding data for unittest */ - - if (IS_ENABLED(CONFIG_UML)) - unittest_unflatten_overlay_base(); - res = unittest_data_add(); if (res) return res; -- https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/ https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Boyd <sboyd@kernel.org> To: Rob Herring <robh+dt@kernel.org> Cc: linux-kernel@vger.kernel.org, patches@lists.linux.dev, linux-um@lists.infradead.org, linux-arm-kernel@lists.infradead.org, kunit-dev@googlegroups.com, linux-kselftest@vger.kernel.org, devicetree@vger.kernel.org, Frank Rowand <frowand.list@gmail.com>, Richard Weinberger <richard@nod.at>, Anton Ivanov <anton.ivanov@cambridgegreys.com>, Johannes Berg <johannes@sipsolutions.net> Subject: [PATCH v4 3/7] um: Unconditionally call unflatten_device_tree() Date: Fri, 16 Feb 2024 17:05:52 -0800 [thread overview] Message-ID: <20240217010557.2381548-4-sboyd@kernel.org> (raw) In-Reply-To: <20240217010557.2381548-1-sboyd@kernel.org> Call this function unconditionally so that we can populate an empty DTB on platforms that don't boot with a command line provided DTB. There's no harm in calling unflatten_device_tree() unconditionally. If there isn't a valid initial_boot_params dtb then unflatten_device_tree() returns early. Cc: Rob Herring <robh+dt@kernel.org> Cc: Frank Rowand <frowand.list@gmail.com> Cc: Richard Weinberger <richard@nod.at> Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com> Cc: Johannes Berg <johannes@sipsolutions.net> Cc: <linux-um@lists.infradead.org> Signed-off-by: Stephen Boyd <sboyd@kernel.org> --- arch/um/kernel/dtb.c | 14 +++++++------- drivers/of/unittest.c | 4 ---- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/arch/um/kernel/dtb.c b/arch/um/kernel/dtb.c index 484141b06938..4954188a6a09 100644 --- a/arch/um/kernel/dtb.c +++ b/arch/um/kernel/dtb.c @@ -16,16 +16,16 @@ void uml_dtb_init(void) void *area; area = uml_load_file(dtb, &size); - if (!area) - return; + if (area) { + if (!early_init_dt_scan(area)) { + pr_err("invalid DTB %s\n", dtb); + memblock_free(area, size); + return; + } - if (!early_init_dt_scan(area)) { - pr_err("invalid DTB %s\n", dtb); - memblock_free(area, size); - return; + early_init_fdt_scan_reserved_mem(); } - early_init_fdt_scan_reserved_mem(); unflatten_device_tree(); } diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index cfd60e35a899..891752a20a5f 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -4087,10 +4087,6 @@ static int __init of_unittest(void) add_taint(TAINT_TEST, LOCKDEP_STILL_OK); /* adding data for unittest */ - - if (IS_ENABLED(CONFIG_UML)) - unittest_unflatten_overlay_base(); - res = unittest_data_add(); if (res) return res; -- https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/ https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git
next prev parent reply other threads:[~2024-02-17 1:06 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-02-17 1:05 [PATCH v4 0/7] of: populate of_root node if bootloader doesn't Stephen Boyd 2024-02-17 1:05 ` Stephen Boyd 2024-02-17 1:05 ` [PATCH v4 1/7] of: Always unflatten in unflatten_and_copy_device_tree() Stephen Boyd 2024-02-17 1:05 ` Stephen Boyd 2024-02-17 1:05 ` [PATCH v4 2/7] of: Create of_root if no dtb provided by firmware Stephen Boyd 2024-02-17 1:05 ` Stephen Boyd 2024-02-17 1:05 ` Stephen Boyd [this message] 2024-02-17 1:05 ` [PATCH v4 3/7] um: Unconditionally call unflatten_device_tree() Stephen Boyd 2024-02-17 1:05 ` [PATCH v4 4/7] x86/of: Unconditionally call unflatten_and_copy_device_tree() Stephen Boyd 2024-02-17 1:05 ` Stephen Boyd 2024-02-17 1:05 ` [PATCH v4 5/7] arm64: Unconditionally call unflatten_device_tree() Stephen Boyd 2024-02-17 1:05 ` Stephen Boyd 2024-02-23 0:03 ` Rob Herring 2024-02-23 0:03 ` Rob Herring 2024-02-23 10:23 ` Will Deacon 2024-02-23 10:23 ` Will Deacon 2024-02-23 18:17 ` Rob Herring 2024-02-23 18:17 ` Rob Herring 2024-02-27 17:34 ` Mark Rutland 2024-02-27 17:34 ` Mark Rutland 2024-02-28 16:26 ` Rob Herring 2024-02-28 16:26 ` Rob Herring 2024-03-07 15:09 ` Herve Codina 2024-03-07 15:09 ` Herve Codina 2024-02-27 17:22 ` Oreoluwa Babatunde 2024-02-27 17:22 ` Oreoluwa Babatunde 2024-02-17 1:05 ` [PATCH v4 6/7] of: unittest: treat missing of_root as error instead of fixing up Stephen Boyd 2024-02-17 1:05 ` Stephen Boyd 2024-02-17 1:05 ` [PATCH v4 7/7] of: Add KUnit test to confirm DTB is loaded Stephen Boyd 2024-02-17 1:05 ` Stephen Boyd 2024-03-08 19:57 ` [PATCH v4 0/7] of: populate of_root node if bootloader doesn't Rob Herring 2024-03-08 19:57 ` 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=20240217010557.2381548-4-sboyd@kernel.org \ --to=sboyd@kernel.org \ --cc=anton.ivanov@cambridgegreys.com \ --cc=devicetree@vger.kernel.org \ --cc=frowand.list@gmail.com \ --cc=johannes@sipsolutions.net \ --cc=kunit-dev@googlegroups.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-kselftest@vger.kernel.org \ --cc=linux-um@lists.infradead.org \ --cc=patches@lists.linux.dev \ --cc=richard@nod.at \ --cc=robh+dt@kernel.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.