All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alistair Francis <alistair23@gmail.com>
To: Bin Meng <bmeng.cn@gmail.com>
Cc: "open list:RISC-V" <qemu-riscv@nongnu.org>,
	Bin Meng <bin.meng@windriver.com>,
	Alistair Francis <Alistair.Francis@wdc.com>,
	"qemu-devel@nongnu.org Developers" <qemu-devel@nongnu.org>
Subject: Re: [PATCH 1/8] hw/riscv: sifive_u: Switch to use qemu_fdt_setprop_string_array() helper
Date: Wed, 31 Mar 2021 11:40:51 -0400	[thread overview]
Message-ID: <CAKmqyKNG5KKMXmyuz5dYdkQ0mLqzWTLF1eacBoYzYHRA8T4tMw@mail.gmail.com> (raw)
In-Reply-To: <20210329170818.23139-1-bmeng.cn@gmail.com>

On Mon, Mar 29, 2021 at 1:08 PM Bin Meng <bmeng.cn@gmail.com> wrote:
>
> From: Bin Meng <bin.meng@windriver.com>
>
> Since commit 78da6a1bca22 ("device_tree: add qemu_fdt_setprop_string_array helper"),
> we can use the new helper to set the clock name for the ethernet
> controller node.
>
> Signed-off-by: Bin Meng <bin.meng@windriver.com>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>
>  hw/riscv/sifive_u.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c
> index 7b59942369..f06b3b2e64 100644
> --- a/hw/riscv/sifive_u.c
> +++ b/hw/riscv/sifive_u.c
> @@ -96,7 +96,7 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry *memmap,
>      int cpu;
>      uint32_t *cells;
>      char *nodename;
> -    char ethclk_names[] = "pclk\0hclk";
> +    const char *ethclk_names[2] = { "pclk", "hclk" };
>      uint32_t plic_phandle, prci_phandle, gpio_phandle, phandle = 1;
>      uint32_t hfclk_phandle, rtcclk_phandle, phy_phandle;
>
> @@ -413,8 +413,8 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry *memmap,
>      qemu_fdt_setprop_cell(fdt, nodename, "interrupts", SIFIVE_U_GEM_IRQ);
>      qemu_fdt_setprop_cells(fdt, nodename, "clocks",
>          prci_phandle, PRCI_CLK_GEMGXLPLL, prci_phandle, PRCI_CLK_GEMGXLPLL);
> -    qemu_fdt_setprop(fdt, nodename, "clock-names", ethclk_names,
> -        sizeof(ethclk_names));
> +    qemu_fdt_setprop_string_array(fdt, nodename, "clock-names",
> +        (char **)&ethclk_names, ARRAY_SIZE(ethclk_names));
>      qemu_fdt_setprop(fdt, nodename, "local-mac-address",
>          s->soc.gem.conf.macaddr.a, ETH_ALEN);
>      qemu_fdt_setprop_cell(fdt, nodename, "#address-cells", 1);
> --
> 2.25.1
>
>


WARNING: multiple messages have this Message-ID (diff)
From: Alistair Francis <alistair23@gmail.com>
To: Bin Meng <bmeng.cn@gmail.com>
Cc: Alistair Francis <Alistair.Francis@wdc.com>,
	 "qemu-devel@nongnu.org Developers" <qemu-devel@nongnu.org>,
	"open list:RISC-V" <qemu-riscv@nongnu.org>,
	 Bin Meng <bin.meng@windriver.com>
Subject: Re: [PATCH 1/8] hw/riscv: sifive_u: Switch to use qemu_fdt_setprop_string_array() helper
Date: Wed, 31 Mar 2021 11:40:51 -0400	[thread overview]
Message-ID: <CAKmqyKNG5KKMXmyuz5dYdkQ0mLqzWTLF1eacBoYzYHRA8T4tMw@mail.gmail.com> (raw)
In-Reply-To: <20210329170818.23139-1-bmeng.cn@gmail.com>

On Mon, Mar 29, 2021 at 1:08 PM Bin Meng <bmeng.cn@gmail.com> wrote:
>
> From: Bin Meng <bin.meng@windriver.com>
>
> Since commit 78da6a1bca22 ("device_tree: add qemu_fdt_setprop_string_array helper"),
> we can use the new helper to set the clock name for the ethernet
> controller node.
>
> Signed-off-by: Bin Meng <bin.meng@windriver.com>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>
>  hw/riscv/sifive_u.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c
> index 7b59942369..f06b3b2e64 100644
> --- a/hw/riscv/sifive_u.c
> +++ b/hw/riscv/sifive_u.c
> @@ -96,7 +96,7 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry *memmap,
>      int cpu;
>      uint32_t *cells;
>      char *nodename;
> -    char ethclk_names[] = "pclk\0hclk";
> +    const char *ethclk_names[2] = { "pclk", "hclk" };
>      uint32_t plic_phandle, prci_phandle, gpio_phandle, phandle = 1;
>      uint32_t hfclk_phandle, rtcclk_phandle, phy_phandle;
>
> @@ -413,8 +413,8 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry *memmap,
>      qemu_fdt_setprop_cell(fdt, nodename, "interrupts", SIFIVE_U_GEM_IRQ);
>      qemu_fdt_setprop_cells(fdt, nodename, "clocks",
>          prci_phandle, PRCI_CLK_GEMGXLPLL, prci_phandle, PRCI_CLK_GEMGXLPLL);
> -    qemu_fdt_setprop(fdt, nodename, "clock-names", ethclk_names,
> -        sizeof(ethclk_names));
> +    qemu_fdt_setprop_string_array(fdt, nodename, "clock-names",
> +        (char **)&ethclk_names, ARRAY_SIZE(ethclk_names));
>      qemu_fdt_setprop(fdt, nodename, "local-mac-address",
>          s->soc.gem.conf.macaddr.a, ETH_ALEN);
>      qemu_fdt_setprop_cell(fdt, nodename, "#address-cells", 1);
> --
> 2.25.1
>
>


  parent reply	other threads:[~2021-03-31 15:44 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-29 17:08 [PATCH 1/8] hw/riscv: sifive_u: Switch to use qemu_fdt_setprop_string_array() helper Bin Meng
2021-03-29 17:08 ` [PATCH 2/8] hw/riscv: virt: " Bin Meng
2021-03-31 15:41   ` Alistair Francis
2021-03-31 15:41     ` Alistair Francis
2021-03-29 17:08 ` [PATCH 3/8] hw/riscv: Support the official CLINT DT bindings Bin Meng
2021-03-31 15:42   ` Alistair Francis
2021-03-31 15:42     ` Alistair Francis
2021-03-29 17:08 ` [PATCH 4/8] hw/riscv: Support the official PLIC " Bin Meng
2021-03-31 15:43   ` Alistair Francis
2021-03-31 15:43     ` Alistair Francis
2021-03-29 17:08 ` [PATCH 5/8] docs/system/riscv: Correct the indentation level of supported devices Bin Meng
2021-03-31 15:44   ` Alistair Francis
2021-03-31 15:44     ` Alistair Francis
2021-03-29 17:08 ` [PATCH 6/8] docs/system/riscv: sifive_u: Document '-dtb' usage Bin Meng
2021-03-31 15:46   ` Alistair Francis
2021-03-31 15:46     ` Alistair Francis
2021-03-29 17:08 ` [PATCH 7/8] hw/riscv: Use macros for BIOS image names Bin Meng
2021-03-31 15:44   ` Alistair Francis
2021-03-31 15:44     ` Alistair Francis
2021-03-29 17:08 ` [PATCH 8/8] hw/riscv: microchip_pfsoc: Support direct kernel boot Bin Meng
2021-03-31 15:50   ` Alistair Francis
2021-03-31 15:50     ` Alistair Francis
2021-03-31 15:40 ` Alistair Francis [this message]
2021-03-31 15:40   ` [PATCH 1/8] hw/riscv: sifive_u: Switch to use qemu_fdt_setprop_string_array() helper Alistair Francis
2021-03-31 16:07 ` Richard Henderson

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=CAKmqyKNG5KKMXmyuz5dYdkQ0mLqzWTLF1eacBoYzYHRA8T4tMw@mail.gmail.com \
    --to=alistair23@gmail.com \
    --cc=Alistair.Francis@wdc.com \
    --cc=bin.meng@windriver.com \
    --cc=bmeng.cn@gmail.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-riscv@nongnu.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: link
Be 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.