* [PATCH 1/2] riscv: sifive_u: Drop "clock-frequency" property of cpu nodes @ 2019-09-20 9:19 Bin Meng 2019-09-20 9:19 ` [PATCH 2/2] riscv: sifive_u: Add ethernet0 to the aliases node Bin Meng 2019-09-20 18:46 ` [PATCH 1/2] riscv: sifive_u: Drop "clock-frequency" property of cpu nodes Alistair Francis 0 siblings, 2 replies; 5+ messages in thread From: Bin Meng @ 2019-09-20 9:19 UTC (permalink / raw) To: Alistair Francis, Palmer Dabbelt, qemu-devel, qemu-riscv The "clock-frequency" property of cpu nodes isn't required. Drop it. This is to keep in sync with Linux kernel commit below: https://patchwork.kernel.org/patch/11133031/ Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- hw/riscv/sifive_u.c | 2 -- include/hw/riscv/sifive_u.h | 1 - 2 files changed, 3 deletions(-) diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 9f8e84b..02dd761 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -151,8 +151,6 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap, char *intc = g_strdup_printf("/cpus/cpu@%d/interrupt-controller", cpu); char *isa; qemu_fdt_add_subnode(fdt, nodename); - qemu_fdt_setprop_cell(fdt, nodename, "clock-frequency", - SIFIVE_U_CLOCK_FREQ); /* cpu 0 is the management hart that does not have mmu */ if (cpu != 0) { qemu_fdt_setprop_string(fdt, nodename, "mmu-type", "riscv,sv48"); diff --git a/include/hw/riscv/sifive_u.h b/include/hw/riscv/sifive_u.h index e4df298..4850805 100644 --- a/include/hw/riscv/sifive_u.h +++ b/include/hw/riscv/sifive_u.h @@ -75,7 +75,6 @@ enum { }; enum { - SIFIVE_U_CLOCK_FREQ = 1000000000, SIFIVE_U_HFCLK_FREQ = 33333333, SIFIVE_U_RTCCLK_FREQ = 1000000 }; -- 2.7.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] riscv: sifive_u: Add ethernet0 to the aliases node 2019-09-20 9:19 [PATCH 1/2] riscv: sifive_u: Drop "clock-frequency" property of cpu nodes Bin Meng @ 2019-09-20 9:19 ` Bin Meng 2019-09-20 18:47 ` Alistair Francis 2019-10-08 20:26 ` Palmer Dabbelt 2019-09-20 18:46 ` [PATCH 1/2] riscv: sifive_u: Drop "clock-frequency" property of cpu nodes Alistair Francis 1 sibling, 2 replies; 5+ messages in thread From: Bin Meng @ 2019-09-20 9:19 UTC (permalink / raw) To: Alistair Francis, Palmer Dabbelt, qemu-devel, qemu-riscv U-Boot expects this alias to be in place in order to fix up the mac address of the ethernet node. This is to keep in sync with Linux kernel commit below: https://patchwork.kernel.org/patch/11133033/ Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- hw/riscv/sifive_u.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 02dd761..1ac51e3 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -270,6 +270,10 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap, s->soc.gem.conf.macaddr.a, ETH_ALEN); qemu_fdt_setprop_cell(fdt, nodename, "#address-cells", 1); qemu_fdt_setprop_cell(fdt, nodename, "#size-cells", 0); + + qemu_fdt_add_subnode(fdt, "/aliases"); + qemu_fdt_setprop_string(fdt, "/aliases", "ethernet0", nodename); + g_free(nodename); nodename = g_strdup_printf("/soc/ethernet@%lx/ethernet-phy@0", @@ -297,7 +301,6 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap, qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", cmdline); } - qemu_fdt_add_subnode(fdt, "/aliases"); qemu_fdt_setprop_string(fdt, "/aliases", "serial0", nodename); g_free(nodename); -- 2.7.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] riscv: sifive_u: Add ethernet0 to the aliases node 2019-09-20 9:19 ` [PATCH 2/2] riscv: sifive_u: Add ethernet0 to the aliases node Bin Meng @ 2019-09-20 18:47 ` Alistair Francis 2019-10-08 20:26 ` Palmer Dabbelt 1 sibling, 0 replies; 5+ messages in thread From: Alistair Francis @ 2019-09-20 18:47 UTC (permalink / raw) To: Bin Meng Cc: open list:RISC-V, Palmer Dabbelt, Alistair Francis, qemu-devel@nongnu.org Developers On Fri, Sep 20, 2019 at 2:26 AM Bin Meng <bmeng.cn@gmail.com> wrote: > > U-Boot expects this alias to be in place in order to fix up the mac > address of the ethernet node. > > This is to keep in sync with Linux kernel commit below: > https://patchwork.kernel.org/patch/11133033/ > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > > hw/riscv/sifive_u.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c > index 02dd761..1ac51e3 100644 > --- a/hw/riscv/sifive_u.c > +++ b/hw/riscv/sifive_u.c > @@ -270,6 +270,10 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap, > s->soc.gem.conf.macaddr.a, ETH_ALEN); > qemu_fdt_setprop_cell(fdt, nodename, "#address-cells", 1); > qemu_fdt_setprop_cell(fdt, nodename, "#size-cells", 0); > + > + qemu_fdt_add_subnode(fdt, "/aliases"); > + qemu_fdt_setprop_string(fdt, "/aliases", "ethernet0", nodename); > + > g_free(nodename); > > nodename = g_strdup_printf("/soc/ethernet@%lx/ethernet-phy@0", > @@ -297,7 +301,6 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap, > qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", cmdline); > } > > - qemu_fdt_add_subnode(fdt, "/aliases"); > qemu_fdt_setprop_string(fdt, "/aliases", "serial0", nodename); > > g_free(nodename); > -- > 2.7.4 > > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] riscv: sifive_u: Add ethernet0 to the aliases node 2019-09-20 9:19 ` [PATCH 2/2] riscv: sifive_u: Add ethernet0 to the aliases node Bin Meng 2019-09-20 18:47 ` Alistair Francis @ 2019-10-08 20:26 ` Palmer Dabbelt 1 sibling, 0 replies; 5+ messages in thread From: Palmer Dabbelt @ 2019-10-08 20:26 UTC (permalink / raw) To: bmeng.cn; +Cc: qemu-riscv, Alistair Francis, qemu-devel On Fri, 20 Sep 2019 02:19:02 PDT (-0700), bmeng.cn@gmail.com wrote: > U-Boot expects this alias to be in place in order to fix up the mac > address of the ethernet node. > > This is to keep in sync with Linux kernel commit below: > https://patchwork.kernel.org/patch/11133033/ > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > --- > > hw/riscv/sifive_u.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c > index 02dd761..1ac51e3 100644 > --- a/hw/riscv/sifive_u.c > +++ b/hw/riscv/sifive_u.c > @@ -270,6 +270,10 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap, > s->soc.gem.conf.macaddr.a, ETH_ALEN); > qemu_fdt_setprop_cell(fdt, nodename, "#address-cells", 1); > qemu_fdt_setprop_cell(fdt, nodename, "#size-cells", 0); > + > + qemu_fdt_add_subnode(fdt, "/aliases"); > + qemu_fdt_setprop_string(fdt, "/aliases", "ethernet0", nodename); > + > g_free(nodename); > > nodename = g_strdup_printf("/soc/ethernet@%lx/ethernet-phy@0", > @@ -297,7 +301,6 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap, > qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", cmdline); > } > > - qemu_fdt_add_subnode(fdt, "/aliases"); > qemu_fdt_setprop_string(fdt, "/aliases", "serial0", nodename); > > g_free(nodename); Thanks. These two are in the patch queue. ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] riscv: sifive_u: Drop "clock-frequency" property of cpu nodes 2019-09-20 9:19 [PATCH 1/2] riscv: sifive_u: Drop "clock-frequency" property of cpu nodes Bin Meng 2019-09-20 9:19 ` [PATCH 2/2] riscv: sifive_u: Add ethernet0 to the aliases node Bin Meng @ 2019-09-20 18:46 ` Alistair Francis 1 sibling, 0 replies; 5+ messages in thread From: Alistair Francis @ 2019-09-20 18:46 UTC (permalink / raw) To: Bin Meng Cc: open list:RISC-V, Palmer Dabbelt, Alistair Francis, qemu-devel@nongnu.org Developers On Fri, Sep 20, 2019 at 2:26 AM Bin Meng <bmeng.cn@gmail.com> wrote: > > The "clock-frequency" property of cpu nodes isn't required. Drop it. > > This is to keep in sync with Linux kernel commit below: > https://patchwork.kernel.org/patch/11133031/ > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > > hw/riscv/sifive_u.c | 2 -- > include/hw/riscv/sifive_u.h | 1 - > 2 files changed, 3 deletions(-) > > diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c > index 9f8e84b..02dd761 100644 > --- a/hw/riscv/sifive_u.c > +++ b/hw/riscv/sifive_u.c > @@ -151,8 +151,6 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap, > char *intc = g_strdup_printf("/cpus/cpu@%d/interrupt-controller", cpu); > char *isa; > qemu_fdt_add_subnode(fdt, nodename); > - qemu_fdt_setprop_cell(fdt, nodename, "clock-frequency", > - SIFIVE_U_CLOCK_FREQ); > /* cpu 0 is the management hart that does not have mmu */ > if (cpu != 0) { > qemu_fdt_setprop_string(fdt, nodename, "mmu-type", "riscv,sv48"); > diff --git a/include/hw/riscv/sifive_u.h b/include/hw/riscv/sifive_u.h > index e4df298..4850805 100644 > --- a/include/hw/riscv/sifive_u.h > +++ b/include/hw/riscv/sifive_u.h > @@ -75,7 +75,6 @@ enum { > }; > > enum { > - SIFIVE_U_CLOCK_FREQ = 1000000000, > SIFIVE_U_HFCLK_FREQ = 33333333, > SIFIVE_U_RTCCLK_FREQ = 1000000 > }; > -- > 2.7.4 > > ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-10-08 20:27 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-09-20 9:19 [PATCH 1/2] riscv: sifive_u: Drop "clock-frequency" property of cpu nodes Bin Meng 2019-09-20 9:19 ` [PATCH 2/2] riscv: sifive_u: Add ethernet0 to the aliases node Bin Meng 2019-09-20 18:47 ` Alistair Francis 2019-10-08 20:26 ` Palmer Dabbelt 2019-09-20 18:46 ` [PATCH 1/2] riscv: sifive_u: Drop "clock-frequency" property of cpu nodes 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).