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

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

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

Artem Lapkin
Fix 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 from Neil Armstrong <[hidden email]>

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

diff --git a/board/amlogic/vim3/vim3.c b/board/amlogic/vim3/vim3.c
index 824fff8262..87d9fe1f02 100644
--- a/board/amlogic/vim3/vim3.c
+++ b/board/amlogic/vim3/vim3.c
@@ -139,26 +139,42 @@ int meson_ft_board_setup(void *blob, struct bd_info *bd)
 }
 
 #define EFUSE_MAC_OFFSET 0
-#define EFUSE_MAC_SIZE 6
+#define EFUSE_MAC_SIZE 12
+#define MAC_ADDR_LEN 6
 
 int misc_init_r(void)
 {
- uint8_t mac_addr[EFUSE_MAC_SIZE];
+ 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,
-  mac_addr, EFUSE_MAC_SIZE);
+  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: fix setup ethernet mac from efuse

Neil Armstrong
Hi Artem,

On 12/01/2021 12:42, Artem Lapkin wrote:

> Fix 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 from Neil Armstrong <[hidden email]>
>
> Signed-off-by: Artem Lapkin <[hidden email]>
> ---
>  board/amlogic/vim3/vim3.c | 22 +++++++++++++++++++---
>  1 file changed, 19 insertions(+), 3 deletions(-)
>
> diff --git a/board/amlogic/vim3/vim3.c b/board/amlogic/vim3/vim3.c
> index 824fff8262..87d9fe1f02 100644
> --- a/board/amlogic/vim3/vim3.c
> +++ b/board/amlogic/vim3/vim3.c
> @@ -139,26 +139,42 @@ int meson_ft_board_setup(void *blob, struct bd_info *bd)
>  }
>  
>  #define EFUSE_MAC_OFFSET 0
> -#define EFUSE_MAC_SIZE 6
> +#define EFUSE_MAC_SIZE 12
> +#define MAC_ADDR_LEN 6
>  
>  int misc_init_r(void)
>  {
> - uint8_t mac_addr[EFUSE_MAC_SIZE];
> + 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,
> -  mac_addr, EFUSE_MAC_SIZE);
> +  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]);


Yes, it's not necessary to print the MAC, I'll drop while applying.

>   }
>  
>   return 0;
>  }
> +
>

Applying to u-boot-amlogic

Neil