* [PATCH v2] riscv: Generate devicetree only after machine initialization is complete
@ 2023-07-06 3:59 Guenter Roeck
2023-07-06 8:54 ` Philippe Mathieu-Daudé
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Guenter Roeck @ 2023-07-06 3:59 UTC (permalink / raw)
To: Palmer Dabbelt
Cc: Alistair Francis, Weiwei Li, Liu Zhiwei, qemu-riscv, qemu-devel,
Guenter Roeck, Daniel Henrique Barboza, Alistair Francis,
Daniel Henrique Barboza
If the devicetree is created before machine initialization is complete,
it misses dynamic devices. Specifically, the tpm device is not added
to the devicetree file and is therefore not instantiated in Linux.
Load/create devicetree in virt_machine_done() to solve the problem.
Cc: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Cc: Alistair Francis <alistair23@gmail.com>
Cc: Daniel Henrique Barboza <dbarboza@ventanamicro.c>
Fixes: 325b7c4e75 hw/riscv: Enable TPM backends
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
v2: Handle devicetree (load & create) entirely in machine_done function.
hw/riscv/virt.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
index ed4c27487e..1c4bd823df 100644
--- a/hw/riscv/virt.c
+++ b/hw/riscv/virt.c
@@ -1248,6 +1248,17 @@ static void virt_machine_done(Notifier *notifier, void *data)
uint64_t kernel_entry = 0;
BlockBackend *pflash_blk0;
+ /* load/create device tree */
+ if (machine->dtb) {
+ machine->fdt = load_device_tree(machine->dtb, &s->fdt_size);
+ if (!machine->fdt) {
+ error_report("load_device_tree() failed");
+ exit(1);
+ }
+ } else {
+ create_fdt(s, memmap);
+ }
+
/*
* Only direct boot kernel is currently supported for KVM VM,
* so the "-bios" parameter is not supported when KVM is enabled.
@@ -1508,17 +1519,6 @@ static void virt_machine_init(MachineState *machine)
}
virt_flash_map(s, system_memory);
- /* load/create device tree */
- if (machine->dtb) {
- machine->fdt = load_device_tree(machine->dtb, &s->fdt_size);
- if (!machine->fdt) {
- error_report("load_device_tree() failed");
- exit(1);
- }
- } else {
- create_fdt(s, memmap);
- }
-
s->machine_done.notify = virt_machine_done;
qemu_add_machine_init_done_notifier(&s->machine_done);
}
--
2.39.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v2] riscv: Generate devicetree only after machine initialization is complete
2023-07-06 3:59 [PATCH v2] riscv: Generate devicetree only after machine initialization is complete Guenter Roeck
@ 2023-07-06 8:54 ` Philippe Mathieu-Daudé
2023-07-10 1:00 ` Alistair Francis
2023-07-10 1:02 ` Alistair Francis
2 siblings, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2023-07-06 8:54 UTC (permalink / raw)
To: Guenter Roeck, Palmer Dabbelt
Cc: Alistair Francis, Weiwei Li, Liu Zhiwei, qemu-riscv, qemu-devel,
Daniel Henrique Barboza, Alistair Francis,
Daniel Henrique Barboza
On 6/7/23 05:59, Guenter Roeck wrote:
> If the devicetree is created before machine initialization is complete,
> it misses dynamic devices. Specifically, the tpm device is not added
> to the devicetree file and is therefore not instantiated in Linux.
> Load/create devicetree in virt_machine_done() to solve the problem.
>
> Cc: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
> Cc: Alistair Francis <alistair23@gmail.com>
> Cc: Daniel Henrique Barboza <dbarboza@ventanamicro.c>
> Fixes: 325b7c4e75 hw/riscv: Enable TPM backends
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> ---
> v2: Handle devicetree (load & create) entirely in machine_done function.
>
> hw/riscv/virt.c | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] riscv: Generate devicetree only after machine initialization is complete
2023-07-06 3:59 [PATCH v2] riscv: Generate devicetree only after machine initialization is complete Guenter Roeck
2023-07-06 8:54 ` Philippe Mathieu-Daudé
@ 2023-07-10 1:00 ` Alistair Francis
2023-07-10 1:02 ` Alistair Francis
2 siblings, 0 replies; 4+ messages in thread
From: Alistair Francis @ 2023-07-10 1:00 UTC (permalink / raw)
To: Guenter Roeck
Cc: Palmer Dabbelt, Alistair Francis, Weiwei Li, Liu Zhiwei,
qemu-riscv, qemu-devel, Daniel Henrique Barboza
On Thu, Jul 6, 2023 at 1:59 PM Guenter Roeck <linux@roeck-us.net> wrote:
>
> If the devicetree is created before machine initialization is complete,
> it misses dynamic devices. Specifically, the tpm device is not added
> to the devicetree file and is therefore not instantiated in Linux.
> Load/create devicetree in virt_machine_done() to solve the problem.
>
> Cc: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
> Cc: Alistair Francis <alistair23@gmail.com>
> Cc: Daniel Henrique Barboza <dbarboza@ventanamicro.c>
> Fixes: 325b7c4e75 hw/riscv: Enable TPM backends
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> v2: Handle devicetree (load & create) entirely in machine_done function.
>
> hw/riscv/virt.c | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
> index ed4c27487e..1c4bd823df 100644
> --- a/hw/riscv/virt.c
> +++ b/hw/riscv/virt.c
> @@ -1248,6 +1248,17 @@ static void virt_machine_done(Notifier *notifier, void *data)
> uint64_t kernel_entry = 0;
> BlockBackend *pflash_blk0;
>
> + /* load/create device tree */
> + if (machine->dtb) {
> + machine->fdt = load_device_tree(machine->dtb, &s->fdt_size);
> + if (!machine->fdt) {
> + error_report("load_device_tree() failed");
> + exit(1);
> + }
> + } else {
> + create_fdt(s, memmap);
> + }
> +
> /*
> * Only direct boot kernel is currently supported for KVM VM,
> * so the "-bios" parameter is not supported when KVM is enabled.
> @@ -1508,17 +1519,6 @@ static void virt_machine_init(MachineState *machine)
> }
> virt_flash_map(s, system_memory);
>
> - /* load/create device tree */
> - if (machine->dtb) {
> - machine->fdt = load_device_tree(machine->dtb, &s->fdt_size);
> - if (!machine->fdt) {
> - error_report("load_device_tree() failed");
> - exit(1);
> - }
> - } else {
> - create_fdt(s, memmap);
> - }
> -
> s->machine_done.notify = virt_machine_done;
> qemu_add_machine_init_done_notifier(&s->machine_done);
> }
> --
> 2.39.2
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2] riscv: Generate devicetree only after machine initialization is complete
2023-07-06 3:59 [PATCH v2] riscv: Generate devicetree only after machine initialization is complete Guenter Roeck
2023-07-06 8:54 ` Philippe Mathieu-Daudé
2023-07-10 1:00 ` Alistair Francis
@ 2023-07-10 1:02 ` Alistair Francis
2 siblings, 0 replies; 4+ messages in thread
From: Alistair Francis @ 2023-07-10 1:02 UTC (permalink / raw)
To: Guenter Roeck
Cc: Palmer Dabbelt, Alistair Francis, Weiwei Li, Liu Zhiwei,
qemu-riscv, qemu-devel, Daniel Henrique Barboza
On Thu, Jul 6, 2023 at 1:59 PM Guenter Roeck <linux@roeck-us.net> wrote:
>
> If the devicetree is created before machine initialization is complete,
> it misses dynamic devices. Specifically, the tpm device is not added
> to the devicetree file and is therefore not instantiated in Linux.
> Load/create devicetree in virt_machine_done() to solve the problem.
>
> Cc: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
> Cc: Alistair Francis <alistair23@gmail.com>
> Cc: Daniel Henrique Barboza <dbarboza@ventanamicro.c>
> Fixes: 325b7c4e75 hw/riscv: Enable TPM backends
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Thanks!
Applied to riscv-to-apply.next
Alistair
> ---
> v2: Handle devicetree (load & create) entirely in machine_done function.
>
> hw/riscv/virt.c | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
> index ed4c27487e..1c4bd823df 100644
> --- a/hw/riscv/virt.c
> +++ b/hw/riscv/virt.c
> @@ -1248,6 +1248,17 @@ static void virt_machine_done(Notifier *notifier, void *data)
> uint64_t kernel_entry = 0;
> BlockBackend *pflash_blk0;
>
> + /* load/create device tree */
> + if (machine->dtb) {
> + machine->fdt = load_device_tree(machine->dtb, &s->fdt_size);
> + if (!machine->fdt) {
> + error_report("load_device_tree() failed");
> + exit(1);
> + }
> + } else {
> + create_fdt(s, memmap);
> + }
> +
> /*
> * Only direct boot kernel is currently supported for KVM VM,
> * so the "-bios" parameter is not supported when KVM is enabled.
> @@ -1508,17 +1519,6 @@ static void virt_machine_init(MachineState *machine)
> }
> virt_flash_map(s, system_memory);
>
> - /* load/create device tree */
> - if (machine->dtb) {
> - machine->fdt = load_device_tree(machine->dtb, &s->fdt_size);
> - if (!machine->fdt) {
> - error_report("load_device_tree() failed");
> - exit(1);
> - }
> - } else {
> - create_fdt(s, memmap);
> - }
> -
> s->machine_done.notify = virt_machine_done;
> qemu_add_machine_init_done_notifier(&s->machine_done);
> }
> --
> 2.39.2
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-07-10 1:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-06 3:59 [PATCH v2] riscv: Generate devicetree only after machine initialization is complete Guenter Roeck
2023-07-06 8:54 ` Philippe Mathieu-Daudé
2023-07-10 1:00 ` Alistair Francis
2023-07-10 1:02 ` Alistair Francis
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).