[Qemu-devel] hw/arm/virt: linux,stdout-path -> stdout-path

[Qemu-devel] hw/arm/virt: linux,stdout-path -> stdout-path

[Leif Lindholm]

As of Linux 3.15, the generic "stdout-path" property described by 
ePAPR 1.1 is supported by the upstream kernel:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/of/base.c?id=676e1b2fcd9dbb47a59baac13d089621d22c68b8

ARM virt still sets the legacy linux,stdout-path.
Given that this step was added to ARM virt ~ 3 months after 3.15 was
released, could we simply replace it (patch below)?
Failing that, could we set both for now?

/
    Leif

>From 25a51745c6243ff279684a3990c8c6aad25ed7b5 Mon Sep 17 00:00:00 2001
From: Leif Lindholm <leif.lindholm@linaro.org>
Date: Wed, 19 Nov 2014 11:02:42 +0000
Subject: [RFC] hw/arm/virt: set stdout-path instead of linux,stdout-path

ePAPR 1.1 defines the stdout-path property, making the os-specific
linux,stdout-path property redundant. Change the DT setup  for ARM virt
to use the generic property - supported by Linux since 3.15.

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
---
 hw/arm/virt.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 78f618d..314e55b 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -389,7 +389,7 @@ static void create_uart(const VirtBoardInfo *vbi, qemu_irq *pic)
     qemu_fdt_setprop(vbi->fdt, nodename, "clock-names",
                          clocknames, sizeof(clocknames));
 
-    qemu_fdt_setprop_string(vbi->fdt, "/chosen", "linux,stdout-path", nodename);
+    qemu_fdt_setprop_string(vbi->fdt, "/chosen", "stdout-path", nodename);
     g_free(nodename);
 }
 
-- 
1.7.10.4

Re: [Qemu-devel] hw/arm/virt: linux,stdout-path -> stdout-path

[Ard Biesheuvel]

On 19 November 2014 12:08, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> As of Linux 3.15, the generic "stdout-path" property described by
> ePAPR 1.1 is supported by the upstream kernel:
> https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/of/base.c?id=676e1b2fcd9dbb47a59baac13d089621d22c68b8
>
> ARM virt still sets the legacy linux,stdout-path.
> Given that this step was added to ARM virt ~ 3 months after 3.15 was
> released, could we simply replace it (patch below)?
> Failing that, could we set both for now?
>
> /
>     Leif
>
> From 25a51745c6243ff279684a3990c8c6aad25ed7b5 Mon Sep 17 00:00:00 2001
> From: Leif Lindholm <leif.lindholm@linaro.org>
> Date: Wed, 19 Nov 2014 11:02:42 +0000
> Subject: [RFC] hw/arm/virt: set stdout-path instead of linux,stdout-path
>
> ePAPR 1.1 defines the stdout-path property, making the os-specific
> linux,stdout-path property redundant. Change the DT setup  for ARM virt
> to use the generic property - supported by Linux since 3.15.
>
> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Note that for the original patch

$ git log --oneline f022b8e95379b
f022b8e95379 hw/arm/virt: add linux, stdout-path to /chosen DT node

$ git tag --contains f022b8e95379b
v2.2.0-rc0
v2.2.0-rc1

so it makes sense to take it for 2.2 imo

-- 
Ard.


> ---
>  hw/arm/virt.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index 78f618d..314e55b 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -389,7 +389,7 @@ static void create_uart(const VirtBoardInfo *vbi, qemu_irq *pic)
>      qemu_fdt_setprop(vbi->fdt, nodename, "clock-names",
>                           clocknames, sizeof(clocknames));
>
> -    qemu_fdt_setprop_string(vbi->fdt, "/chosen", "linux,stdout-path", nodename);
> +    qemu_fdt_setprop_string(vbi->fdt, "/chosen", "stdout-path", nodename);
>      g_free(nodename);
>  }
>
> --
> 1.7.10.4
>

Re: [Qemu-devel] hw/arm/virt: linux,stdout-path -> stdout-path

[Peter Maydell]

On 19 November 2014 at 11:08, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> As of Linux 3.15, the generic "stdout-path" property described by
> ePAPR 1.1 is supported by the upstream kernel:
> https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/of/base.c?id=676e1b2fcd9dbb47a59baac13d089621d22c68b8
>
> ARM virt still sets the legacy linux,stdout-path.
> Given that this step was added to ARM virt ~ 3 months after 3.15 was
> released, could we simply replace it (patch below)?
> Failing that, could we set both for now?

Forgot to mention, but I applied this to master for 2.2 a little
while back; thanks.

-- PMM