Re: [PATCH 4/4] hw/riscv: use qemu_fdt_setprop_strings() in sifive_u.c
On Tue, Jun 21, 2022 at 8:54 PM Ben Dooks wrote: > > On Mon, Jun 20, 2022 at 04:47:44PM +1000, Alistair Francis wrote: > > On Sun, Jun 19, 2022 at 6:14 AM Ben Dooks wrote: > > > > > > Use the qemu_fdt_setprop_strings() in sifve_u.c to simplify > > > the code. > > > > > > Signed-off-by: Ben Dooks > > > > Do you mind updating the other machines as well? > > I can do, I was wondering if anyone had a good guide how to use cocci > to do it automatiically as I have been finding it really difficult to > work out how to automate API changes. I don't have any tips unfortunately Alistair > > -- > Ben Dooks, b...@fluff.org, http://www.fluff.org/ben/ > > Large Hadron Colada: A large Pina Colada that makes the universe disappear. >
Re: [PATCH 4/4] hw/riscv: use qemu_fdt_setprop_strings() in sifive_u.c
On Mon, Jun 20, 2022 at 04:47:44PM +1000, Alistair Francis wrote: > On Sun, Jun 19, 2022 at 6:14 AM Ben Dooks wrote: > > > > Use the qemu_fdt_setprop_strings() in sifve_u.c to simplify > > the code. > > > > Signed-off-by: Ben Dooks > > Do you mind updating the other machines as well? I can do, I was wondering if anyone had a good guide how to use cocci to do it automatiically as I have been finding it really difficult to work out how to automate API changes. -- Ben Dooks, b...@fluff.org, http://www.fluff.org/ben/ Large Hadron Colada: A large Pina Colada that makes the universe disappear.
Re: [PATCH 4/4] hw/riscv: use qemu_fdt_setprop_strings() in sifive_u.c
On Sun, Jun 19, 2022 at 6:14 AM Ben Dooks wrote:
>
> Use the qemu_fdt_setprop_strings() in sifve_u.c to simplify
> the code.
>
> Signed-off-by: Ben Dooks
Do you mind updating the other machines as well?
Reviewed-by: Alistair Francis
Alistair
> ---
> hw/riscv/sifive_u.c | 18 +-
> 1 file changed, 5 insertions(+), 13 deletions(-)
>
> diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c
> index 89d7aa2a52..16b18d90bd 100644
> --- a/hw/riscv/sifive_u.c
> +++ b/hw/riscv/sifive_u.c
> @@ -103,13 +103,6 @@ static void create_fdt(SiFiveUState *s, const
> MemMapEntry *memmap,
> char *nodename;
> uint32_t plic_phandle, prci_phandle, gpio_phandle, phandle = 1;
> uint32_t hfclk_phandle, rtcclk_phandle, phy_phandle;
> -static const char * const ethclk_names[2] = { "pclk", "hclk" };
> -static const char * const clint_compat[2] = {
> -"sifive,clint0", "riscv,clint0"
> -};
> -static const char * const plic_compat[2] = {
> -"sifive,plic-1.0.0", "riscv,plic0"
> -};
>
> if (ms->dtb) {
> fdt = s->fdt = load_device_tree(ms->dtb, >fdt_size);
> @@ -221,8 +214,8 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry
> *memmap,
> nodename = g_strdup_printf("/soc/clint@%lx",
> (long)memmap[SIFIVE_U_DEV_CLINT].base);
> qemu_fdt_add_subnode(fdt, nodename);
> -qemu_fdt_setprop_string_array(fdt, nodename, "compatible",
> -(char **)_compat, ARRAY_SIZE(clint_compat));
> +qemu_fdt_setprop_strings(fdt, nodename, "compatible",
> + "sifive,clint0", "riscv,clint0");
> qemu_fdt_setprop_reg64_map(fdt, nodename, [SIFIVE_U_DEV_CLINT]);
> qemu_fdt_setprop(fdt, nodename, "interrupts-extended",
> cells, ms->smp.cpus * sizeof(uint32_t) * 4);
> @@ -273,8 +266,8 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry
> *memmap,
> (long)memmap[SIFIVE_U_DEV_PLIC].base);
> qemu_fdt_add_subnode(fdt, nodename);
> qemu_fdt_setprop_cell(fdt, nodename, "#interrupt-cells", 1);
> -qemu_fdt_setprop_string_array(fdt, nodename, "compatible",
> -(char **)_compat, ARRAY_SIZE(plic_compat));
> +qemu_fdt_setprop_strings(fdt, nodename, "compatbile",
> + "sifive,plic-1.0.0", "riscv,plic0");
> qemu_fdt_setprop(fdt, nodename, "interrupt-controller", NULL, 0);
> qemu_fdt_setprop(fdt, nodename, "interrupts-extended",
> cells, (ms->smp.cpus * 4 - 2) * sizeof(uint32_t));
> @@ -410,8 +403,7 @@ 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_string_array(fdt, nodename, "clock-names",
> -(char **)_names, ARRAY_SIZE(ethclk_names));
> +qemu_fdt_setprop_strings(fdt, nodename, "clock-names", "pclk", "hclk");
> 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.35.1
>
>
Re: [PATCH 4/4] hw/riscv: use qemu_fdt_setprop_strings() in sifive_u.c
On Fri, Apr 22, 2022 at 10:19:34AM +0800, Bin Meng wrote: > On Mon, Apr 18, 2022 at 5:13 AM Ben Dooks wrote: > > > > Use the qemu_fdt_setprop_strings() in sifve_u.c to simplify > > the code. > > > > Signed-off-by; Ben Dooks > > ; should be replaced to : > > Not sure how you did that, but you can do with "git commit -s" and git > will take care of the SoB tag. I'm used to adding them manually to git commit messages. -- Ben Dooks, b...@fluff.org, http://www.fluff.org/ben/ Large Hadron Colada: A large Pina Colada that makes the universe disappear.
Re: [PATCH 4/4] hw/riscv: use qemu_fdt_setprop_strings() in sifive_u.c
On Mon, Apr 18, 2022 at 5:13 AM Ben Dooks wrote: > > Use the qemu_fdt_setprop_strings() in sifve_u.c to simplify > the code. > > Signed-off-by; Ben Dooks ; should be replaced to : Not sure how you did that, but you can do with "git commit -s" and git will take care of the SoB tag. > --- > hw/riscv/sifive_u.c | 20 +++- > 1 file changed, 7 insertions(+), 13 deletions(-) > Regards, Bin
Re: [PATCH 4/4] hw/riscv: use qemu_fdt_setprop_strings() in sifive_u.c
On Sat, Apr 16, 2022 at 08:30:34PM +0100, Ben Dooks wrote:
> Use the qemu_fdt_setprop_strings() in sifve_u.c to simplify
> the code.
>
> Signed-off-by; Ben Dooks
> ---
> hw/riscv/sifive_u.c | 20 +++-
> 1 file changed, 7 insertions(+), 13 deletions(-)
>
> diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c
> index 1fe364cbb0..b00086d86e 100644
> --- a/hw/riscv/sifive_u.c
> +++ b/hw/riscv/sifive_u.c
> @@ -103,13 +103,6 @@ static void create_fdt(SiFiveUState *s, const
> MemMapEntry *memmap,
> char *nodename;
> uint32_t plic_phandle, prci_phandle, gpio_phandle, phandle = 1;
> uint32_t hfclk_phandle, rtcclk_phandle, phy_phandle;
> -static const char * const ethclk_names[2] = { "pclk", "hclk" };
> -static const char * const clint_compat[2] = {
> -"sifive,clint0", "riscv,clint0"
> -};
> -static const char * const plic_compat[2] = {
> -"sifive,plic-1.0.0", "riscv,plic0"
> -};
>
> if (ms->dtb) {
> fdt = s->fdt = load_device_tree(ms->dtb, >fdt_size);
> @@ -221,8 +214,8 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry
> *memmap,
> nodename = g_strdup_printf("/soc/clint@%lx",
> (long)memmap[SIFIVE_U_DEV_CLINT].base);
> qemu_fdt_add_subnode(fdt, nodename);
> -qemu_fdt_setprop_string_array(fdt, nodename, "compatible",
> -(char **)_compat, ARRAY_SIZE(clint_compat));
> +qemu_fdt_setprop_strings(fdt, nodename, "compatible",
> + "sifive,clint0", "riscv,clint0");
> qemu_fdt_setprop_reg64(fdt, nodename, [SIFIVE_U_DEV_CLINT]);
> qemu_fdt_setprop(fdt, nodename, "interrupts-extended",
> cells, ms->smp.cpus * sizeof(uint32_t) * 4);
> @@ -273,8 +266,10 @@ static void create_fdt(SiFiveUState *s, const
> MemMapEntry *memmap,
> (long)memmap[SIFIVE_U_DEV_PLIC].base);
> qemu_fdt_add_subnode(fdt, nodename);
> qemu_fdt_setprop_cell(fdt, nodename, "#interrupt-cells", 1);
> -qemu_fdt_setprop_string_array(fdt, nodename, "compatible",
> -(char **)_compat, ARRAY_SIZE(plic_compat));
> +//qemu_fdt_setprop_string_array(fdt, nodename, "compatible",
> +//(char **)_compat, ARRAY_SIZE(plic_compat));
Whoops, will fix this conversion, should have removed the original
instead of commenting it out.
--
Ben Dooks, b...@fluff.org, http://www.fluff.org/ben/
Large Hadron Colada: A large Pina Colada that makes the universe disappear.
