[PATCH] board: amlogic: vim3: setup ethernet mac from efuse

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] board: amlogic: vim3: setup ethernet mac from efuse

Artem Lapkin
Add the board specific code for reading built-in ethernet MAC address from efuse

NOTE: MAC is stored in ASCII format, 1bytes = 2characters by 0 offset

if mac from efuse not valid we use meson_generate_serial_ethaddr

NOTE: remake odroid-n2.c variant from Neil Armstrong <[hidden email]>

Signed-off-by: Artem Lapkin <[hidden email]>
---
 board/amlogic/vim3/vim3.c | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/board/amlogic/vim3/vim3.c b/board/amlogic/vim3/vim3.c
index 09ef39ff30..c5d19cc17b 100644
--- a/board/amlogic/vim3/vim3.c
+++ b/board/amlogic/vim3/vim3.c
@@ -11,9 +11,14 @@
 #include <net.h>
 #include <asm/io.h>
 #include <asm/arch/eth.h>
+#include <asm/arch/sm.h>
 #include <i2c.h>
 #include "khadas-mcu.h"
 
+#define EFUSE_MAC_OFFSET 0
+#define EFUSE_MAC_SIZE 12
+#define MAC_ADDR_LEN 6
+
 /*
  * The VIM3 on-board  MCU can mux the PCIe/USB3.0 shared differential
  * lines using a FUSB340TMX USB 3.1 SuperSpeed Data Switch between
@@ -131,7 +136,37 @@ int meson_ft_board_setup(void *blob, struct bd_info *bd)
 
 int misc_init_r(void)
 {
+ u8 mac_addr[MAC_ADDR_LEN];
+ char efuse_mac_addr[EFUSE_MAC_SIZE], tmp[3];
+ ssize_t len;
+
  meson_eth_init(PHY_INTERFACE_MODE_RGMII, 0);
 
+ if (!eth_env_get_enetaddr("ethaddr", mac_addr)) {
+
+ len = meson_sm_read_efuse(EFUSE_MAC_OFFSET, efuse_mac_addr, EFUSE_MAC_SIZE);
+ if (len != EFUSE_MAC_SIZE)
+ return 0;
+
+ /* MAC is stored in ASCII format, 1bytes = 2characters */
+ for (int i = 0; i < 6; i++) {
+ tmp[0] = efuse_mac_addr[i * 2];
+ tmp[1] = efuse_mac_addr[i * 2 + 1];
+ tmp[2] = '\0';
+ mac_addr[i] = simple_strtoul(tmp, NULL, 16);
+ }
+
+ if (is_valid_ethaddr(mac_addr))
+ eth_env_set_enetaddr("ethaddr", mac_addr);
+ else
+ meson_generate_serial_ethaddr();
+
+ eth_env_get_enetaddr("ethaddr", mac_addr);
+ printf("[i] setup onboard mac %02X:%02X:%02X:%02X:%02X:%02X\n",
+ mac_addr[0],mac_addr[1],mac_addr[2],
+ mac_addr[3],mac_addr[4],mac_addr[5]);
+
+ }
+
  return 0;
 }
--
2.25.1

Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] board: amlogic: vim3: setup ethernet mac from efuse

Neil Armstrong
Hi Artem,

On 11/01/2021 12:19, Artem Lapkin wrote:
> Add the board specific code for reading built-in ethernet MAC address from efuse
>
> NOTE: MAC is stored in ASCII format, 1bytes = 2characters by 0 offset
>
> if mac from efuse not valid we use meson_generate_serial_ethaddr
>
> NOTE: remake odroid-n2.c variant from Neil Armstrong <[hidden email]>

So the patch from Marek (https://patchwork.ozlabs.org/project/uboot/patch/20201217072642.1319-1-m.szyprowski@.../) doesn't work ?
Are you sure the MAC is stored in ASCII like Odroid-N2 ?

Please look at my u-boot-amlogic-next tree I will push this week for the next u-boot release:
https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic/-/tree/u-boot-amlogic-next

Neil

>
> Signed-off-by: Artem Lapkin <[hidden email]>
> ---
>  board/amlogic/vim3/vim3.c | 35 +++++++++++++++++++++++++++++++++++
>  1 file changed, 35 insertions(+)
>
> diff --git a/board/amlogic/vim3/vim3.c b/board/amlogic/vim3/vim3.c
> index 09ef39ff30..c5d19cc17b 100644
> --- a/board/amlogic/vim3/vim3.c
> +++ b/board/amlogic/vim3/vim3.c
> @@ -11,9 +11,14 @@
>  #include <net.h>
>  #include <asm/io.h>
>  #include <asm/arch/eth.h>
> +#include <asm/arch/sm.h>
>  #include <i2c.h>
>  #include "khadas-mcu.h"
>  
> +#define EFUSE_MAC_OFFSET 0
> +#define EFUSE_MAC_SIZE 12
> +#define MAC_ADDR_LEN 6
> +
>  /*
>   * The VIM3 on-board  MCU can mux the PCIe/USB3.0 shared differential
>   * lines using a FUSB340TMX USB 3.1 SuperSpeed Data Switch between
> @@ -131,7 +136,37 @@ int meson_ft_board_setup(void *blob, struct bd_info *bd)
>  
>  int misc_init_r(void)
>  {
> + u8 mac_addr[MAC_ADDR_LEN];
> + char efuse_mac_addr[EFUSE_MAC_SIZE], tmp[3];
> + ssize_t len;
> +
>   meson_eth_init(PHY_INTERFACE_MODE_RGMII, 0);
>  
> + if (!eth_env_get_enetaddr("ethaddr", mac_addr)) {
> +
> + len = meson_sm_read_efuse(EFUSE_MAC_OFFSET, efuse_mac_addr, EFUSE_MAC_SIZE);
> + if (len != EFUSE_MAC_SIZE)
> + return 0;
> +
> + /* MAC is stored in ASCII format, 1bytes = 2characters */
> + for (int i = 0; i < 6; i++) {
> + tmp[0] = efuse_mac_addr[i * 2];
> + tmp[1] = efuse_mac_addr[i * 2 + 1];
> + tmp[2] = '\0';
> + mac_addr[i] = simple_strtoul(tmp, NULL, 16);
> + }
> +
> + if (is_valid_ethaddr(mac_addr))
> + eth_env_set_enetaddr("ethaddr", mac_addr);
> + else
> + meson_generate_serial_ethaddr();
> +
> + eth_env_get_enetaddr("ethaddr", mac_addr);
> + printf("[i] setup onboard mac %02X:%02X:%02X:%02X:%02X:%02X\n",
> + mac_addr[0],mac_addr[1],mac_addr[2],
> + mac_addr[3],mac_addr[4],mac_addr[5]);
> +
> + }
> +
>   return 0;
>  }
>

Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] board: amlogic: vim3: setup ethernet mac from efuse

Artem Lapkin
> So the patch from Marek (
https://patchwork.ozlabs.org/project/uboot/patch/20201217072642.1319-1-m.szyprowski@.../)
doesn't work ?
yes doesnt works properly im sure if we read as raw 6 bytes from efuse we
have

                if (is_valid_ethaddr(mac_addr)) # is always not valid
                        eth_env_set_enetaddr("ethaddr", mac_addr); else    # and always
generated from serial meson_generate_serial_ethaddr();

> Are you sure the MAC is stored in ASCII like Odroid-N2 ?
yes im check two times on my vim3 vim3l boards and our amlogic vendor uboot
have same method

On Mon, Jan 11, 2021 at 9:59 PM Neil Armstrong <[hidden email]>
wrote:

> Hi Artem,
>
> On 11/01/2021 12:19, Artem Lapkin wrote:
> > Add the board specific code for reading built-in ethernet MAC address
> from efuse
> >
> > NOTE: MAC is stored in ASCII format, 1bytes = 2characters by 0 offset
> >
> > if mac from efuse not valid we use meson_generate_serial_ethaddr
> >
> > NOTE: remake odroid-n2.c variant from Neil Armstrong <
> [hidden email]>
>
> So the patch from Marek (
> https://patchwork.ozlabs.org/project/uboot/patch/20201217072642.1319-1-m.szyprowski@.../)
> doesn't work ?
> Are you sure the MAC is stored in ASCII like Odroid-N2 ?
>
> Please look at my u-boot-amlogic-next tree I will push this week for the
> next u-boot release:
>
> https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic/-/tree/u-boot-amlogic-next
>
> Neil
>
> >
> > Signed-off-by: Artem Lapkin <[hidden email]>
> > ---
> >  board/amlogic/vim3/vim3.c | 35 +++++++++++++++++++++++++++++++++++
> >  1 file changed, 35 insertions(+)
> >
> > diff --git a/board/amlogic/vim3/vim3.c b/board/amlogic/vim3/vim3.c
> > index 09ef39ff30..c5d19cc17b 100644
> > --- a/board/amlogic/vim3/vim3.c
> > +++ b/board/amlogic/vim3/vim3.c
> > @@ -11,9 +11,14 @@
> >  #include <net.h>
> >  #include <asm/io.h>
> >  #include <asm/arch/eth.h>
> > +#include <asm/arch/sm.h>
> >  #include <i2c.h>
> >  #include "khadas-mcu.h"
> >
> > +#define EFUSE_MAC_OFFSET     0
> > +#define EFUSE_MAC_SIZE               12
> > +#define MAC_ADDR_LEN         6
> > +
> >  /*
> >   * The VIM3 on-board  MCU can mux the PCIe/USB3.0 shared differential
> >   * lines using a FUSB340TMX USB 3.1 SuperSpeed Data Switch between
> > @@ -131,7 +136,37 @@ int meson_ft_board_setup(void *blob, struct bd_info
> *bd)
> >
> >  int misc_init_r(void)
> >  {
> > +     u8 mac_addr[MAC_ADDR_LEN];
> > +     char efuse_mac_addr[EFUSE_MAC_SIZE], tmp[3];
> > +     ssize_t len;
> > +
> >       meson_eth_init(PHY_INTERFACE_MODE_RGMII, 0);
> >
> > +     if (!eth_env_get_enetaddr("ethaddr", mac_addr)) {
> > +
> > +             len = meson_sm_read_efuse(EFUSE_MAC_OFFSET,
> efuse_mac_addr, EFUSE_MAC_SIZE);
> > +             if (len != EFUSE_MAC_SIZE)
> > +                     return 0;
> > +
> > +             /* MAC is stored in ASCII format, 1bytes = 2characters */
> > +             for (int i = 0; i < 6; i++) {
> > +                     tmp[0] = efuse_mac_addr[i * 2];
> > +                     tmp[1] = efuse_mac_addr[i * 2 + 1];
> > +                     tmp[2] = '\0';
> > +                     mac_addr[i] = simple_strtoul(tmp, NULL, 16);
> > +             }
> > +
> > +             if (is_valid_ethaddr(mac_addr))
> > +                     eth_env_set_enetaddr("ethaddr", mac_addr);
> > +             else
> > +                     meson_generate_serial_ethaddr();
> > +
> > +             eth_env_get_enetaddr("ethaddr", mac_addr);
> > +             printf("[i] setup onboard mac
> %02X:%02X:%02X:%02X:%02X:%02X\n",
> > +                     mac_addr[0],mac_addr[1],mac_addr[2],
> > +                     mac_addr[3],mac_addr[4],mac_addr[5]);
> > +
> > +     }
> > +
> >       return 0;
> >  }
> >
>
>
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] board: amlogic: vim3: setup ethernet mac from efuse

Neil Armstrong
Hi,

On 11/01/2021 15:15, Art Nikpal wrote:

>> So the patch from Marek (https://patchwork.ozlabs.org/project/uboot/patch/20201217072642.1319-1-m.szyprowski@.../) doesn't work ?
> yes doesnt works properly im sure if we read as raw 6 bytes from efuse we have
>
> if (is_valid_ethaddr(mac_addr)) # is always not valid
> eth_env_set_enetaddr("ethaddr", mac_addr);
> else    # and always generated from serial
> meson_generate_serial_ethaddr();
>
>> Are you sure the MAC is stored in ASCII like Odroid-N2 ?
> yes im check two times on my vim3 vim3l boards and our amlogic vendor uboot have same method

OK, can you send a patch over the https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic/-/tree/u-boot-amlogic-next branch ?

Neil

>
> On Mon, Jan 11, 2021 at 9:59 PM Neil Armstrong <[hidden email] <mailto:[hidden email]>> wrote:
>
>     Hi Artem,
>
>     On 11/01/2021 12:19, Artem Lapkin wrote:
>     > Add the board specific code for reading built-in ethernet MAC address from efuse
>     >
>     > NOTE: MAC is stored in ASCII format, 1bytes = 2characters by 0 offset
>     >
>     > if mac from efuse not valid we use meson_generate_serial_ethaddr
>     >
>     > NOTE: remake odroid-n2.c variant from Neil Armstrong <[hidden email] <mailto:[hidden email]>>
>
>     So the patch from Marek (https://patchwork.ozlabs.org/project/uboot/patch/20201217072642.1319-1-m.szyprowski@.../) doesn't work ?
>     Are you sure the MAC is stored in ASCII like Odroid-N2 ?
>
>     Please look at my u-boot-amlogic-next tree I will push this week for the next u-boot release:
>     https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic/-/tree/u-boot-amlogic-next
>
>     Neil
>
>     >
>     > Signed-off-by: Artem Lapkin <[hidden email] <mailto:[hidden email]>>
>     > ---
>     >  board/amlogic/vim3/vim3.c | 35 +++++++++++++++++++++++++++++++++++
>     >  1 file changed, 35 insertions(+)
>     >
>     > diff --git a/board/amlogic/vim3/vim3.c b/board/amlogic/vim3/vim3.c
>     > index 09ef39ff30..c5d19cc17b 100644
>     > --- a/board/amlogic/vim3/vim3.c
>     > +++ b/board/amlogic/vim3/vim3.c
>     > @@ -11,9 +11,14 @@
>     >  #include <net.h>
>     >  #include <asm/io.h>
>     >  #include <asm/arch/eth.h>
>     > +#include <asm/arch/sm.h>
>     >  #include <i2c.h>
>     >  #include "khadas-mcu.h"
>     > 
>     > +#define EFUSE_MAC_OFFSET     0
>     > +#define EFUSE_MAC_SIZE               12
>     > +#define MAC_ADDR_LEN         6
>     > +
>     >  /*
>     >   * The VIM3 on-board  MCU can mux the PCIe/USB3.0 shared differential
>     >   * lines using a FUSB340TMX USB 3.1 SuperSpeed Data Switch between
>     > @@ -131,7 +136,37 @@ int meson_ft_board_setup(void *blob, struct bd_info *bd)
>     > 
>     >  int misc_init_r(void)
>     >  {
>     > +     u8 mac_addr[MAC_ADDR_LEN];
>     > +     char efuse_mac_addr[EFUSE_MAC_SIZE], tmp[3];
>     > +     ssize_t len;
>     > +
>     >       meson_eth_init(PHY_INTERFACE_MODE_RGMII, 0);
>     > 
>     > +     if (!eth_env_get_enetaddr("ethaddr", mac_addr)) {
>     > +
>     > +             len = meson_sm_read_efuse(EFUSE_MAC_OFFSET, efuse_mac_addr, EFUSE_MAC_SIZE);
>     > +             if (len != EFUSE_MAC_SIZE)
>     > +                     return 0;
>     > +
>     > +             /* MAC is stored in ASCII format, 1bytes = 2characters */
>     > +             for (int i = 0; i < 6; i++) {
>     > +                     tmp[0] = efuse_mac_addr[i * 2];
>     > +                     tmp[1] = efuse_mac_addr[i * 2 + 1];
>     > +                     tmp[2] = '\0';
>     > +                     mac_addr[i] = simple_strtoul(tmp, NULL, 16);
>     > +             }
>     > +
>     > +             if (is_valid_ethaddr(mac_addr))
>     > +                     eth_env_set_enetaddr("ethaddr", mac_addr);
>     > +             else
>     > +                     meson_generate_serial_ethaddr();
>     > +
>     > +             eth_env_get_enetaddr("ethaddr", mac_addr);
>     > +             printf("[i] setup onboard mac %02X:%02X:%02X:%02X:%02X:%02X\n",
>     > +                     mac_addr[0],mac_addr[1],mac_addr[2],
>     > +                     mac_addr[3],mac_addr[4],mac_addr[5]);
>     > +
>     > +     }
>     > +
>     >       return 0;
>     >  }
>     >
>