diff options
| author | Andre Przywara <andre.przywara@arm.com> | 2019-02-01 12:37:13 +0000 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2019-02-08 16:12:30 +0000 |
| commit | 56e45ea44fbed5136a339f6da582c37bdb7fd607 (patch) | |
| tree | 91d9893ded1a5a826e54b26fc44c7c6f2c15a9cd | |
| parent | 04d604b65f1f7061c252d41b65b474aae418d025 (diff) | |
| download | kvmtool-56e45ea44fbed5136a339f6da582c37bdb7fd607.tar.gz | |
arm: fdt: add stdout-path to /chosen node
The DT spec describes the stdout-path property in the /chosen node to
contain the DT path for a default device usable for outputting characters.
The Linux kernel uses this for earlycon (without further parameters),
other DT users might rely on this as well.
Add a stdout-path property pointing to the "serial0" alias, then add an
aliases node at the end of the FDT, containing the actual path. This
allows the FDT generation code in hw/serial.c to set this string.
Even when we use the virtio console, the serial console is still there
and works, so we can expose this unconditionally. Putting the virtio
console path in there will not work anyway.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
| -rw-r--r-- | arm/fdt.c | 10 | ||||
| -rw-r--r-- | hw/serial.c | 9 | ||||
| -rw-r--r-- | include/kvm/fdt.h | 2 |
3 files changed, 21 insertions, 0 deletions
@@ -142,6 +142,7 @@ static int setup_fdt(struct kvm *kvm) kvm->cfg.real_cmdline)); _FDT(fdt_property_u64(fdt, "kaslr-seed", kvm->cfg.arch.kaslr_seed)); + _FDT(fdt_property_string(fdt, "stdout-path", "serial0")); /* Initrd */ if (kvm->arch.initrd_size != 0) { @@ -207,6 +208,15 @@ static int setup_fdt(struct kvm *kvm) _FDT(fdt_property_cell(fdt, "migrate", fns->migrate)); _FDT(fdt_end_node(fdt)); + if (fdt_stdout_path) { + _FDT(fdt_begin_node(fdt, "aliases")); + _FDT(fdt_property_string(fdt, "serial0", fdt_stdout_path)); + _FDT(fdt_end_node(fdt)); + + free(fdt_stdout_path); + fdt_stdout_path = NULL; + } + /* Finalise. */ _FDT(fdt_end_node(fdt)); _FDT(fdt_finish(fdt)); diff --git a/hw/serial.c b/hw/serial.c index 2f19ba80..13c4663e 100644 --- a/hw/serial.c +++ b/hw/serial.c @@ -366,6 +366,9 @@ static bool serial8250_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, } #ifdef CONFIG_HAS_LIBFDT + +char *fdt_stdout_path = NULL; + #define DEVICE_NAME_MAX_LEN 32 static void serial8250_generate_fdt_node(struct ioport *ioport, void *fdt, @@ -383,6 +386,12 @@ void serial8250_generate_fdt_node(struct ioport *ioport, void *fdt, snprintf(dev_name, DEVICE_NAME_MAX_LEN, "U6_16550A@%llx", addr); + if (!fdt_stdout_path) { + fdt_stdout_path = malloc(strlen(dev_name) + 2); + /* Assumes that this node is a child of the root node. */ + sprintf(fdt_stdout_path, "/%s", dev_name); + } + _FDT(fdt_begin_node(fdt, dev_name)); _FDT(fdt_property_string(fdt, "compatible", "ns16550a")); _FDT(fdt_property(fdt, "reg", reg_prop, sizeof(reg_prop))); diff --git a/include/kvm/fdt.h b/include/kvm/fdt.h index beadc7f3..4e615725 100644 --- a/include/kvm/fdt.h +++ b/include/kvm/fdt.h @@ -25,6 +25,8 @@ enum irq_type { IRQ_TYPE_LEVEL_MASK = (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH), }; +extern char *fdt_stdout_path; + /* Helper for the various bits of code that generate FDT nodes */ #define _FDT(exp) \ do { \ |