2021-07-02 01:50:50

by Bin Meng

[permalink] [raw]
Subject: [PATCH 1/2] riscv: dts: microchip: Use 'local-mac-address' for emac1

From: Bin Meng <[email protected]>

Per the DT spec, 'local-mac-address' is used to specify MAC address
that was assigned to the network device, while 'mac-address' is used
to specify the MAC address that was last used by the boot program,
and shall be used only if the value differs from 'local-mac-address'
property value.

Signed-off-by: Bin Meng <[email protected]>
---

arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
index 0659068b62f7..a9c558366d61 100644
--- a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
+++ b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
@@ -317,7 +317,7 @@ emac1: ethernet@20112000 {
reg = <0x0 0x20112000 0x0 0x2000>;
interrupt-parent = <&plic>;
interrupts = <70 71 72 73>;
- mac-address = [00 00 00 00 00 00];
+ local-mac-address = [00 00 00 00 00 00];
clocks = <&clkcfg 5>, <&clkcfg 2>;
status = "disabled";
clock-names = "pclk", "hclk";
--
2.25.1


2021-07-02 01:53:03

by Bin Meng

[permalink] [raw]
Subject: [PATCH 2/2] riscv: dts: microchip: Add ethernet0 to the aliases node

From: Bin Meng <[email protected]>

U-Boot expects this alias to be in place in order to fix up the mac
address of the ethernet node.

Note on the Icicle Kit board, currently only emac1 is enabled so it
becomes the 'ethernet0'.

Signed-off-by: Bin Meng <[email protected]>
---

arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
index a9c558366d61..16cc6573107b 100644
--- a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
+++ b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
@@ -9,6 +9,10 @@ / {
model = "Microchip MPFS Icicle Kit";
compatible = "microchip,mpfs-icicle-kit";

+ aliases {
+ ethernet0 = &emac1;
+ };
+
chosen {
};

--
2.25.1

2021-07-08 13:43:11

by Bin Meng

[permalink] [raw]
Subject: Re: [PATCH 1/2] riscv: dts: microchip: Use 'local-mac-address' for emac1

On Fri, Jul 2, 2021 at 9:42 AM Bin Meng <[email protected]> wrote:
>
> From: Bin Meng <[email protected]>
>
> Per the DT spec, 'local-mac-address' is used to specify MAC address
> that was assigned to the network device, while 'mac-address' is used
> to specify the MAC address that was last used by the boot program,
> and shall be used only if the value differs from 'local-mac-address'
> property value.
>
> Signed-off-by: Bin Meng <[email protected]>
> ---
>
> arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>

Ping?

2021-07-16 09:25:56

by Geert Uytterhoeven

[permalink] [raw]
Subject: Re: [PATCH 2/2] riscv: dts: microchip: Add ethernet0 to the aliases node

Hi Bing,

On Fri, Jul 2, 2021 at 3:44 AM Bin Meng <[email protected]> wrote:
> From: Bin Meng <[email protected]>
>
> U-Boot expects this alias to be in place in order to fix up the mac
> address of the ethernet node.
>
> Note on the Icicle Kit board, currently only emac1 is enabled so it
> becomes the 'ethernet0'.
>
> Signed-off-by: Bin Meng <[email protected]>

Thanks for your patch!

> --- a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
> +++ b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
> @@ -9,6 +9,10 @@ / {
> model = "Microchip MPFS Icicle Kit";
> compatible = "microchip,mpfs-icicle-kit";
>
> + aliases {
> + ethernet0 = &emac1;
> + };
> +
> chosen {
> };

This should be added to the board DTS (microchip-mpfs-icicle-kit.dts)
instead.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

2021-07-16 10:16:37

by Bin Meng

[permalink] [raw]
Subject: Re: [PATCH 2/2] riscv: dts: microchip: Add ethernet0 to the aliases node

Hi Geert,

On Fri, Jul 16, 2021 at 5:23 PM Geert Uytterhoeven <[email protected]> wrote:
>
> Hi Bing,
>
> On Fri, Jul 2, 2021 at 3:44 AM Bin Meng <[email protected]> wrote:
> > From: Bin Meng <[email protected]>
> >
> > U-Boot expects this alias to be in place in order to fix up the mac
> > address of the ethernet node.
> >
> > Note on the Icicle Kit board, currently only emac1 is enabled so it
> > becomes the 'ethernet0'.
> >
> > Signed-off-by: Bin Meng <[email protected]>
>
> Thanks for your patch!

Thanks for the review!

>
> > --- a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
> > +++ b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
> > @@ -9,6 +9,10 @@ / {
> > model = "Microchip MPFS Icicle Kit";
> > compatible = "microchip,mpfs-icicle-kit";
> >
> > + aliases {
> > + ethernet0 = &emac1;
> > + };
> > +
> > chosen {
> > };
>
> This should be added to the board DTS (microchip-mpfs-icicle-kit.dts)
> instead.

I was wondering the same thing before doing this, but when I checked
all other DTS in arch/riscv/boot I found the aliases node is put in
the SoC dtsi file instead of the board on so I think that's the
convention.

Regards,
Bin

2021-07-16 11:35:52

by Geert Uytterhoeven

[permalink] [raw]
Subject: Re: [PATCH 2/2] riscv: dts: microchip: Add ethernet0 to the aliases node

Hi Bin,

On Fri, Jul 16, 2021 at 12:14 PM Bin Meng <[email protected]> wrote:
> On Fri, Jul 16, 2021 at 5:23 PM Geert Uytterhoeven <[email protected]> wrote:
> > On Fri, Jul 2, 2021 at 3:44 AM Bin Meng <[email protected]> wrote:
> > > --- a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
> > > +++ b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
> > > @@ -9,6 +9,10 @@ / {
> > > model = "Microchip MPFS Icicle Kit";
> > > compatible = "microchip,mpfs-icicle-kit";
> > >
> > > + aliases {
> > > + ethernet0 = &emac1;
> > > + };
> > > +
> > > chosen {
> > > };
> >
> > This should be added to the board DTS (microchip-mpfs-icicle-kit.dts)
> > instead.
>
> I was wondering the same thing before doing this, but when I checked
> all other DTS in arch/riscv/boot I found the aliases node is put in
> the SoC dtsi file instead of the board on so I think that's the
> convention.

The numbering of the aliases is supposed to match the labels on the
board, hence it is board-specific, not SoC-specific.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

2021-08-04 04:09:46

by Bin Meng

[permalink] [raw]
Subject: Re: [PATCH 2/2] riscv: dts: microchip: Add ethernet0 to the aliases node

On Wed, Aug 4, 2021 at 11:55 AM Palmer Dabbelt <[email protected]> wrote:
>
> On Fri, 16 Jul 2021 04:34:02 PDT (-0700), [email protected] wrote:
> > Hi Bin,
> >
> > On Fri, Jul 16, 2021 at 12:14 PM Bin Meng <[email protected]> wrote:
> >> On Fri, Jul 16, 2021 at 5:23 PM Geert Uytterhoeven <[email protected]> wrote:
> >> > On Fri, Jul 2, 2021 at 3:44 AM Bin Meng <[email protected]> wrote:
> >> > > --- a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
> >> > > +++ b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
> >> > > @@ -9,6 +9,10 @@ / {
> >> > > model = "Microchip MPFS Icicle Kit";
> >> > > compatible = "microchip,mpfs-icicle-kit";
> >> > >
> >> > > + aliases {
> >> > > + ethernet0 = &emac1;
> >> > > + };
> >> > > +
> >> > > chosen {
> >> > > };
> >> >
> >> > This should be added to the board DTS (microchip-mpfs-icicle-kit.dts)
> >> > instead.
> >>
> >> I was wondering the same thing before doing this, but when I checked
> >> all other DTS in arch/riscv/boot I found the aliases node is put in
> >> the SoC dtsi file instead of the board on so I think that's the
> >> convention.
> >
> > The numbering of the aliases is supposed to match the labels on the
> > board, hence it is board-specific, not SoC-specific.
> >
> > Gr{oetje,eeting}s,
> >
> > Geert
>
> I don't see a v2 of this.

Will send v2 soon.

Regards,
Bin

2021-08-04 04:34:01

by Palmer Dabbelt

[permalink] [raw]
Subject: Re: [PATCH 2/2] riscv: dts: microchip: Add ethernet0 to the aliases node

On Fri, 16 Jul 2021 04:34:02 PDT (-0700), [email protected] wrote:
> Hi Bin,
>
> On Fri, Jul 16, 2021 at 12:14 PM Bin Meng <[email protected]> wrote:
>> On Fri, Jul 16, 2021 at 5:23 PM Geert Uytterhoeven <[email protected]> wrote:
>> > On Fri, Jul 2, 2021 at 3:44 AM Bin Meng <[email protected]> wrote:
>> > > --- a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
>> > > +++ b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
>> > > @@ -9,6 +9,10 @@ / {
>> > > model = "Microchip MPFS Icicle Kit";
>> > > compatible = "microchip,mpfs-icicle-kit";
>> > >
>> > > + aliases {
>> > > + ethernet0 = &emac1;
>> > > + };
>> > > +
>> > > chosen {
>> > > };
>> >
>> > This should be added to the board DTS (microchip-mpfs-icicle-kit.dts)
>> > instead.
>>
>> I was wondering the same thing before doing this, but when I checked
>> all other DTS in arch/riscv/boot I found the aliases node is put in
>> the SoC dtsi file instead of the board on so I think that's the
>> convention.
>
> The numbering of the aliases is supposed to match the labels on the
> board, hence it is board-specific, not SoC-specific.
>
> Gr{oetje,eeting}s,
>
> Geert

I don't see a v2 of this.

2021-08-04 04:34:27

by Palmer Dabbelt

[permalink] [raw]
Subject: Re: [PATCH 2/2] riscv: dts: microchip: Add ethernet0 to the aliases node

On Tue, 03 Aug 2021 20:55:56 PDT (-0700), [email protected] wrote:
> On Wed, Aug 4, 2021 at 11:55 AM Palmer Dabbelt <[email protected]> wrote:
>>
>> On Fri, 16 Jul 2021 04:34:02 PDT (-0700), [email protected] wrote:
>> > Hi Bin,
>> >
>> > On Fri, Jul 16, 2021 at 12:14 PM Bin Meng <[email protected]> wrote:
>> >> On Fri, Jul 16, 2021 at 5:23 PM Geert Uytterhoeven <[email protected]> wrote:
>> >> > On Fri, Jul 2, 2021 at 3:44 AM Bin Meng <[email protected]> wrote:
>> >> > > --- a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
>> >> > > +++ b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
>> >> > > @@ -9,6 +9,10 @@ / {
>> >> > > model = "Microchip MPFS Icicle Kit";
>> >> > > compatible = "microchip,mpfs-icicle-kit";
>> >> > >
>> >> > > + aliases {
>> >> > > + ethernet0 = &emac1;
>> >> > > + };
>> >> > > +
>> >> > > chosen {
>> >> > > };
>> >> >
>> >> > This should be added to the board DTS (microchip-mpfs-icicle-kit.dts)
>> >> > instead.
>> >>
>> >> I was wondering the same thing before doing this, but when I checked
>> >> all other DTS in arch/riscv/boot I found the aliases node is put in
>> >> the SoC dtsi file instead of the board on so I think that's the
>> >> convention.
>> >
>> > The numbering of the aliases is supposed to match the labels on the
>> > board, hence it is board-specific, not SoC-specific.
>> >
>> > Gr{oetje,eeting}s,
>> >
>> > Geert
>>
>> I don't see a v2 of this.
>
> Will send v2 soon.

Thanks. I'm assuming you're going to send both patches.