From: Rob Herring <robh@kernel.org> To: Vincent Whitchurch <vincent.whitchurch@axis.com> Cc: jdike@addtoit.com, richard@nod.at, anton.ivanov@cambridgegreys.com, kernel@axis.com, linux-kernel@vger.kernel.org, linux-um@lists.infradead.org, devicetree@vger.kernel.org Subject: Re: [PATCH 2/2] um: Add devicetree support Date: Fri, 14 Jan 2022 07:49:09 -0600 [thread overview] Message-ID: <YeF/Vbxo6fAt0WLp@robh.at.kernel.org> (raw) In-Reply-To: <20211208151123.29313-3-vincent.whitchurch@axis.com> On Wed, Dec 08, 2021 at 04:11:23PM +0100, Vincent Whitchurch wrote: > Add a dtb=<filename> option to boot UML with a devicetree blob. This > can be used for testing driver code using UML. Neat! > Signed-off-by: Vincent Whitchurch <vincent.whitchurch@axis.com> > --- > arch/um/Kconfig | 1 + > arch/um/kernel/Makefile | 1 + > arch/um/kernel/dtb.c | 41 ++++++++++++++++++++++++++++++++++++++++ > arch/um/kernel/um_arch.c | 3 +++ > arch/um/kernel/um_arch.h | 6 ++++++ > 5 files changed, 52 insertions(+) > create mode 100644 arch/um/kernel/dtb.c > > diff --git a/arch/um/Kconfig b/arch/um/Kconfig > index c18b45f75d41..1cf7ef3a2b81 100644 > --- a/arch/um/Kconfig > +++ b/arch/um/Kconfig > @@ -18,6 +18,7 @@ config UML > select HAVE_DEBUG_KMEMLEAK > select HAVE_DEBUG_BUGVERBOSE > select NO_DMA if !UML_DMA_EMULATION > + select OF_EARLY_FLATTREE > select GENERIC_IRQ_SHOW > select GENERIC_CPU_DEVICES > select HAVE_GCC_PLUGINS > diff --git a/arch/um/kernel/Makefile b/arch/um/kernel/Makefile > index 92692bfef7ae..ebd0cca3ff26 100644 > --- a/arch/um/kernel/Makefile > +++ b/arch/um/kernel/Makefile > @@ -22,6 +22,7 @@ obj-y += load_file.o > > obj-$(CONFIG_BLK_DEV_INITRD) += initrd.o > obj-$(CONFIG_GPROF) += gprof_syms.o > +obj-$(CONFIG_OF) += dtb.o > obj-$(CONFIG_EARLY_PRINTK) += early_printk.o > obj-$(CONFIG_STACKTRACE) += stacktrace.o > obj-$(CONFIG_GENERIC_PCI_IOMAP) += ioport.o > diff --git a/arch/um/kernel/dtb.c b/arch/um/kernel/dtb.c > new file mode 100644 > index 000000000000..ca69d72025f3 > --- /dev/null > +++ b/arch/um/kernel/dtb.c > @@ -0,0 +1,41 @@ > +// SPDX-License-Identifier: GPL-2.0-only > + > +#include <linux/init.h> > +#include <linux/of_fdt.h> > +#include <linux/printk.h> > +#include <linux/memblock.h> > +#include <init.h> > + > +#include "um_arch.h" > + > +static char *dtb __initdata; > + > +void uml_dtb_init(void) > +{ > + long long size; > + void *area; > + > + area = uml_load_file(dtb, &size); > + if (!area) > + return; > + > + if (!early_init_dt_scan(area)) { > + pr_err("invalid DTB %s\n", dtb); > + memblock_free(area, size); > + return; > + } > + > + unflatten_device_tree(); > + early_init_fdt_scan_reserved_mem(); These should be reversed. early_init_fdt_scan_reserved_mem() works on the flat tree. Reserved memory needs to be reserved before unflatten_device_tree() starts allocating memory. Though I imagine that doesn't really matter for UML. Also, does the dtb end up in permanently allocated memory (i.e. not init)? It needs to be if not. Rob
WARNING: multiple messages have this Message-ID (diff)
From: Rob Herring <robh@kernel.org> To: Vincent Whitchurch <vincent.whitchurch@axis.com> Cc: jdike@addtoit.com, richard@nod.at, anton.ivanov@cambridgegreys.com, kernel@axis.com, linux-kernel@vger.kernel.org, linux-um@lists.infradead.org, devicetree@vger.kernel.org Subject: Re: [PATCH 2/2] um: Add devicetree support Date: Fri, 14 Jan 2022 07:49:09 -0600 [thread overview] Message-ID: <YeF/Vbxo6fAt0WLp@robh.at.kernel.org> (raw) In-Reply-To: <20211208151123.29313-3-vincent.whitchurch@axis.com> On Wed, Dec 08, 2021 at 04:11:23PM +0100, Vincent Whitchurch wrote: > Add a dtb=<filename> option to boot UML with a devicetree blob. This > can be used for testing driver code using UML. Neat! > Signed-off-by: Vincent Whitchurch <vincent.whitchurch@axis.com> > --- > arch/um/Kconfig | 1 + > arch/um/kernel/Makefile | 1 + > arch/um/kernel/dtb.c | 41 ++++++++++++++++++++++++++++++++++++++++ > arch/um/kernel/um_arch.c | 3 +++ > arch/um/kernel/um_arch.h | 6 ++++++ > 5 files changed, 52 insertions(+) > create mode 100644 arch/um/kernel/dtb.c > > diff --git a/arch/um/Kconfig b/arch/um/Kconfig > index c18b45f75d41..1cf7ef3a2b81 100644 > --- a/arch/um/Kconfig > +++ b/arch/um/Kconfig > @@ -18,6 +18,7 @@ config UML > select HAVE_DEBUG_KMEMLEAK > select HAVE_DEBUG_BUGVERBOSE > select NO_DMA if !UML_DMA_EMULATION > + select OF_EARLY_FLATTREE > select GENERIC_IRQ_SHOW > select GENERIC_CPU_DEVICES > select HAVE_GCC_PLUGINS > diff --git a/arch/um/kernel/Makefile b/arch/um/kernel/Makefile > index 92692bfef7ae..ebd0cca3ff26 100644 > --- a/arch/um/kernel/Makefile > +++ b/arch/um/kernel/Makefile > @@ -22,6 +22,7 @@ obj-y += load_file.o > > obj-$(CONFIG_BLK_DEV_INITRD) += initrd.o > obj-$(CONFIG_GPROF) += gprof_syms.o > +obj-$(CONFIG_OF) += dtb.o > obj-$(CONFIG_EARLY_PRINTK) += early_printk.o > obj-$(CONFIG_STACKTRACE) += stacktrace.o > obj-$(CONFIG_GENERIC_PCI_IOMAP) += ioport.o > diff --git a/arch/um/kernel/dtb.c b/arch/um/kernel/dtb.c > new file mode 100644 > index 000000000000..ca69d72025f3 > --- /dev/null > +++ b/arch/um/kernel/dtb.c > @@ -0,0 +1,41 @@ > +// SPDX-License-Identifier: GPL-2.0-only > + > +#include <linux/init.h> > +#include <linux/of_fdt.h> > +#include <linux/printk.h> > +#include <linux/memblock.h> > +#include <init.h> > + > +#include "um_arch.h" > + > +static char *dtb __initdata; > + > +void uml_dtb_init(void) > +{ > + long long size; > + void *area; > + > + area = uml_load_file(dtb, &size); > + if (!area) > + return; > + > + if (!early_init_dt_scan(area)) { > + pr_err("invalid DTB %s\n", dtb); > + memblock_free(area, size); > + return; > + } > + > + unflatten_device_tree(); > + early_init_fdt_scan_reserved_mem(); These should be reversed. early_init_fdt_scan_reserved_mem() works on the flat tree. Reserved memory needs to be reserved before unflatten_device_tree() starts allocating memory. Though I imagine that doesn't really matter for UML. Also, does the dtb end up in permanently allocated memory (i.e. not init)? It needs to be if not. Rob _______________________________________________ linux-um mailing list linux-um@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-um
next prev parent reply other threads:[~2022-01-14 13:49 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-12-08 15:11 [PATCH 0/2] Devicetree support for UML Vincent Whitchurch 2021-12-08 15:11 ` Vincent Whitchurch 2021-12-08 15:11 ` [PATCH 1/2] um: Extract load file helper from initrd.c Vincent Whitchurch 2021-12-08 15:11 ` Vincent Whitchurch 2021-12-08 15:11 ` [PATCH 2/2] um: Add devicetree support Vincent Whitchurch 2021-12-08 15:11 ` Vincent Whitchurch 2022-01-14 13:49 ` Rob Herring [this message] 2022-01-14 13:49 ` Rob Herring 2022-01-18 14:20 ` Vincent Whitchurch 2022-01-18 14:20 ` Vincent Whitchurch 2021-12-21 20:55 ` [PATCH 0/2] Devicetree support for UML Richard Weinberger 2021-12-21 20:55 ` Richard Weinberger 2021-12-21 20:56 ` Johannes Berg 2021-12-21 20:56 ` Johannes Berg 2021-12-21 21:13 ` Richard Weinberger 2021-12-21 21:13 ` Richard Weinberger 2021-12-22 10:23 ` Vincent Whitchurch 2021-12-22 10:23 ` Vincent Whitchurch 2021-12-22 19:31 ` Richard Weinberger 2021-12-22 19:31 ` Richard Weinberger
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=YeF/Vbxo6fAt0WLp@robh.at.kernel.org \ --to=robh@kernel.org \ --cc=anton.ivanov@cambridgegreys.com \ --cc=devicetree@vger.kernel.org \ --cc=jdike@addtoit.com \ --cc=kernel@axis.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-um@lists.infradead.org \ --cc=richard@nod.at \ --cc=vincent.whitchurch@axis.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: 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.