| Message ID | 20210923075521.553577-1-francesco.dolcini@toradex.com |
|---|---|
| State | Accepted |
| Commit | 182887735c16aaa2139517b60c1b8dbc62cedef1 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | ARM: dts: colibri-imx6ull: fix mac address passing | expand |
On Thu, Sep 23, 2021 at 09:55:21AM +0200, Francesco Dolcini wrote: > colibri-imx6ull ethernet device is fec2, while the optional secondary > ethernet is fec1, update the ethernet aliases in the .dts file so that > ethaddr is set to fec2 and eth1addr to fec1. > > Without this change the ethernet interfaces have a different > mac address between Linux and U-Boot. > > Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com> > > --- > > arch/arm/dts/imx6ull-colibri.dtsi | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/arch/arm/dts/imx6ull-colibri.dtsi b/arch/arm/dts/imx6ull-colibri.dtsi > index b7bf79f28c..104207be97 100644 > --- a/arch/arm/dts/imx6ull-colibri.dtsi > +++ b/arch/arm/dts/imx6ull-colibri.dtsi > @@ -8,6 +8,12 @@ > #include "imx6ull.dtsi" > > / { > + /* Ethernet aliases to ensure correct MAC addresses */ > + aliases { > + ethernet0 = &fec2; > + ethernet1 = &fec1; > + }; > + > chosen { > stdout-path = &uart1; > }; The main dts* files aren't supposed to change between U-Boot and Linux. Is this re-syncing the file with current upstream then? Thanks.
On Thu, Sep 23, 2021 at 07:36:34AM -0400, Tom Rini wrote: > On Thu, Sep 23, 2021 at 09:55:21AM +0200, Francesco Dolcini wrote: > > > colibri-imx6ull ethernet device is fec2, while the optional secondary > > ethernet is fec1, update the ethernet aliases in the .dts file so that > > ethaddr is set to fec2 and eth1addr to fec1. > > > > Without this change the ethernet interfaces have a different > > mac address between Linux and U-Boot. > > > > Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com> > > > > --- > > > > arch/arm/dts/imx6ull-colibri.dtsi | 6 ++++++ > > 1 file changed, 6 insertions(+) > > > > diff --git a/arch/arm/dts/imx6ull-colibri.dtsi b/arch/arm/dts/imx6ull-colibri.dtsi > > index b7bf79f28c..104207be97 100644 > > --- a/arch/arm/dts/imx6ull-colibri.dtsi > > +++ b/arch/arm/dts/imx6ull-colibri.dtsi > > @@ -8,6 +8,12 @@ > > #include "imx6ull.dtsi" > > > > / { > > + /* Ethernet aliases to ensure correct MAC addresses */ > > + aliases { > > + ethernet0 = &fec2; > > + ethernet1 = &fec1; > > + }; > > + > > chosen { > > stdout-path = &uart1; > > }; > > The main dts* files aren't supposed to change between U-Boot and Linux. > Is this re-syncing the file with current upstream then? Thanks. Currently they are out of sync, correct, and because of this difference on the ethernet aliases we have the situation in which the MAC address assigned to the ethernet interfaces is different between Linux an U-Boot. There are other differences that this patchset is not trying to address and that are not causing any known issues. Francesco
On Thu, Sep 23, 2021 at 01:50:41PM +0200, Francesco Dolcini wrote: > On Thu, Sep 23, 2021 at 07:36:34AM -0400, Tom Rini wrote: > > On Thu, Sep 23, 2021 at 09:55:21AM +0200, Francesco Dolcini wrote: > > > > > colibri-imx6ull ethernet device is fec2, while the optional secondary > > > ethernet is fec1, update the ethernet aliases in the .dts file so that > > > ethaddr is set to fec2 and eth1addr to fec1. > > > > > > Without this change the ethernet interfaces have a different > > > mac address between Linux and U-Boot. > > > > > > Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com> > > > > > > --- > > > > > > arch/arm/dts/imx6ull-colibri.dtsi | 6 ++++++ > > > 1 file changed, 6 insertions(+) > > > > > > diff --git a/arch/arm/dts/imx6ull-colibri.dtsi b/arch/arm/dts/imx6ull-colibri.dtsi > > > index b7bf79f28c..104207be97 100644 > > > --- a/arch/arm/dts/imx6ull-colibri.dtsi > > > +++ b/arch/arm/dts/imx6ull-colibri.dtsi > > > @@ -8,6 +8,12 @@ > > > #include "imx6ull.dtsi" > > > > > > / { > > > + /* Ethernet aliases to ensure correct MAC addresses */ > > > + aliases { > > > + ethernet0 = &fec2; > > > + ethernet1 = &fec1; > > > + }; > > > + > > > chosen { > > > stdout-path = &uart1; > > > }; > > > > The main dts* files aren't supposed to change between U-Boot and Linux. > > Is this re-syncing the file with current upstream then? Thanks. > > Currently they are out of sync, correct, and because of this difference on the > ethernet aliases we have the situation in which the MAC address assigned to the > ethernet interfaces is different between Linux an U-Boot. OK, we can take this now as an important bugfix. > There are other differences that this patchset is not trying to address and > that are not causing any known issues. Please plan to sync the trees up for the next merge window, they are not supposed to stay out of sync. Thanks.
Hi guys On Thu, 2021-09-23 at 07:57 -0400, Tom Rini wrote: > On Thu, Sep 23, 2021 at 01:50:41PM +0200, Francesco Dolcini wrote: > > On Thu, Sep 23, 2021 at 07:36:34AM -0400, Tom Rini wrote: > > > On Thu, Sep 23, 2021 at 09:55:21AM +0200, Francesco Dolcini wrote: > > > > > > > colibri-imx6ull ethernet device is fec2, while the optional secondary > > > > ethernet is fec1, update the ethernet aliases in the .dts file so that > > > > ethaddr is set to fec2 and eth1addr to fec1. > > > > > > > > Without this change the ethernet interfaces have a different > > > > mac address between Linux and U-Boot. > > > > > > > > Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com> > > > > > > > > --- > > > > > > > > arch/arm/dts/imx6ull-colibri.dtsi | 6 ++++++ > > > > 1 file changed, 6 insertions(+) > > > > > > > > diff --git a/arch/arm/dts/imx6ull-colibri.dtsi b/arch/arm/dts/imx6ull-colibri.dtsi > > > > index b7bf79f28c..104207be97 100644 > > > > --- a/arch/arm/dts/imx6ull-colibri.dtsi > > > > +++ b/arch/arm/dts/imx6ull-colibri.dtsi > > > > @@ -8,6 +8,12 @@ > > > > #include "imx6ull.dtsi" > > > > > > > > / { > > > > + /* Ethernet aliases to ensure correct MAC addresses */ > > > > + aliases { > > > > + ethernet0 = &fec2; > > > > + ethernet1 = &fec1; > > > > + }; > > > > + > > > > chosen { > > > > stdout-path = &uart1; > > > > }; > > > > > > The main dts* files aren't supposed to change between U-Boot and Linux. > > > Is this re-syncing the file with current upstream then? Thanks. > > > > Currently they are out of sync, correct, and because of this difference on the > > ethernet aliases we have the situation in which the MAC address assigned to the > > ethernet interfaces is different between Linux an U-Boot. > > OK, we can take this now as an important bugfix. Any progress in applying this patch? I just applied it again on today's master and it still cleanly applies. > > There are other differences that this patchset is not trying to address and > > that are not causing any known issues. > > Please plan to sync the trees up for the next merge window, they are not > supposed to stay out of sync. Thanks. Yes, we are in the process of doing that. Thanks! Cheers Marcel
On Thu, Sep 23, 2021 at 4:55 AM Francesco Dolcini <francesco.dolcini@toradex.com> wrote: > > colibri-imx6ull ethernet device is fec2, while the optional secondary > ethernet is fec1, update the ethernet aliases in the .dts file so that > ethaddr is set to fec2 and eth1addr to fec1. > > Without this change the ethernet interfaces have a different > mac address between Linux and U-Boot. > > Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com> Reviewed-by: Fabio Estevam <festevam@gmail.com>
May I inquire about the status of this one? Thanks! On Fri, 2022-02-04 at 14:55 -0300, Fabio Estevam wrote: > On Thu, Sep 23, 2021 at 4:55 AM Francesco Dolcini > <francesco.dolcini@toradex.com> wrote: > > > > colibri-imx6ull ethernet device is fec2, while the optional secondary > > ethernet is fec1, update the ethernet aliases in the .dts file so that > > ethaddr is set to fec2 and eth1addr to fec1. > > > > Without this change the ethernet interfaces have a different > > mac address between Linux and U-Boot. > > > > Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com> > > Reviewed-by: Fabio Estevam <festevam@gmail.com>
On Fri, Apr 01, 2022 at 12:57:40PM +0000, Marcel Ziswiler wrote: > May I inquire about the status of this one? Thanks! Should I take it for this release? > > On Fri, 2022-02-04 at 14:55 -0300, Fabio Estevam wrote: > > On Thu, Sep 23, 2021 at 4:55 AM Francesco Dolcini > > <francesco.dolcini@toradex.com> wrote: > > > > > > colibri-imx6ull ethernet device is fec2, while the optional secondary > > > ethernet is fec1, update the ethernet aliases in the .dts file so that > > > ethaddr is set to fec2 and eth1addr to fec1. > > > > > > Without this change the ethernet interfaces have a different > > > mac address between Linux and U-Boot. > > > > > > Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com> > > > > Reviewed-by: Fabio Estevam <festevam@gmail.com>
On Fri, 2022-04-01 at 09:43 -0400, Tom Rini wrote: > On Fri, Apr 01, 2022 at 12:57:40PM +0000, Marcel Ziswiler wrote: > > > May I inquire about the status of this one? Thanks! > > Should I take it for this release? Yes, please. Thanks! > > On Fri, 2022-02-04 at 14:55 -0300, Fabio Estevam wrote: > > > On Thu, Sep 23, 2021 at 4:55 AM Francesco Dolcini > > > <francesco.dolcini@toradex.com> wrote: > > > > > > > > colibri-imx6ull ethernet device is fec2, while the optional secondary > > > > ethernet is fec1, update the ethernet aliases in the .dts file so that > > > > ethaddr is set to fec2 and eth1addr to fec1. > > > > > > > > Without this change the ethernet interfaces have a different > > > > mac address between Linux and U-Boot. > > > > > > > > Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com> > > > > > > Reviewed-by: Fabio Estevam <festevam@gmail.com>
On Fri, Apr 01, 2022 at 02:01:25PM +0000, Marcel Ziswiler wrote: > On Fri, 2022-04-01 at 09:43 -0400, Tom Rini wrote: > > On Fri, Apr 01, 2022 at 12:57:40PM +0000, Marcel Ziswiler wrote: > > > > > May I inquire about the status of this one? Thanks! > > > > Should I take it for this release? > > Yes, please. Thanks! Will do. Any other toradex platform fixes? > > > > On Fri, 2022-02-04 at 14:55 -0300, Fabio Estevam wrote: > > > > On Thu, Sep 23, 2021 at 4:55 AM Francesco Dolcini > > > > <francesco.dolcini@toradex.com> wrote: > > > > > > > > > > colibri-imx6ull ethernet device is fec2, while the optional secondary > > > > > ethernet is fec1, update the ethernet aliases in the .dts file so that > > > > > ethaddr is set to fec2 and eth1addr to fec1. > > > > > > > > > > Without this change the ethernet interfaces have a different > > > > > mac address between Linux and U-Boot. > > > > > > > > > > Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com> > > > > > > > > Reviewed-by: Fabio Estevam <festevam@gmail.com>
On Fri, Apr 01, 2022 at 02:01:25PM +0000, Marcel Ziswiler wrote: > On Fri, 2022-04-01 at 09:43 -0400, Tom Rini wrote: > > On Fri, Apr 01, 2022 at 12:57:40PM +0000, Marcel Ziswiler wrote: > > > > > May I inquire about the status of this one? Thanks! > > > > Should I take it for this release? > > Yes, please. Thanks! And, re-reading the whole thread in patchwork, I'm going to assume / hope for a full dts resync for the next merge window.
On Fri, Apr 01, 2022 at 10:04:04AM -0400, Tom Rini wrote: > On Fri, Apr 01, 2022 at 02:01:25PM +0000, Marcel Ziswiler wrote: > > On Fri, 2022-04-01 at 09:43 -0400, Tom Rini wrote: > > > On Fri, Apr 01, 2022 at 12:57:40PM +0000, Marcel Ziswiler wrote: > > > > > > > May I inquire about the status of this one? Thanks! > > > > > > Should I take it for this release? > > > > Yes, please. Thanks! > > And, re-reading the whole thread in patchwork, I'm going to assume / > hope for a full dts resync for the next merge window. We are in process to update the Linux kernel DTS files now, as soon as this is done we will do the sync. Doing it now would not make sense. Francesco
On Thu, Sep 23, 2021 at 09:55:21AM +0200, Francesco Dolcini wrote: > colibri-imx6ull ethernet device is fec2, while the optional secondary > ethernet is fec1, update the ethernet aliases in the .dts file so that > ethaddr is set to fec2 and eth1addr to fec1. > > Without this change the ethernet interfaces have a different > mac address between Linux and U-Boot. > > Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com> > Reviewed-by: Fabio Estevam <festevam@gmail.com> Applied to u-boot/master, thanks!
diff --git a/arch/arm/dts/imx6ull-colibri.dtsi b/arch/arm/dts/imx6ull-colibri.dtsi index b7bf79f28c..104207be97 100644 --- a/arch/arm/dts/imx6ull-colibri.dtsi +++ b/arch/arm/dts/imx6ull-colibri.dtsi @@ -8,6 +8,12 @@ #include "imx6ull.dtsi" / { + /* Ethernet aliases to ensure correct MAC addresses */ + aliases { + ethernet0 = &fec2; + ethernet1 = &fec1; + }; + chosen { stdout-path = &uart1; };
colibri-imx6ull ethernet device is fec2, while the optional secondary ethernet is fec1, update the ethernet aliases in the .dts file so that ethaddr is set to fec2 and eth1addr to fec1. Without this change the ethernet interfaces have a different mac address between Linux and U-Boot. Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com> --- arch/arm/dts/imx6ull-colibri.dtsi | 6 ++++++ 1 file changed, 6 insertions(+)