board: amlogic: vim3: fix setup ethernet mac from efuse
PATCH 1/1 board: amlogic: vim3: fix setup ethernet mac from efuse
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 variant from Neil Armstrong <[email protected]>
Signed-off-by Artem Lapkin <[email protected]>
--- board/amlogic/vim3/vim3.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)
board/amlogic/vim3/vim3.c +19 -3
@@ -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 6int misc_init_r (void ) { -uint8_t mac_addr[EFUSE_MAC_SIZE ]; +uint8_t 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 ; } +
Signature · 1 line
2.25.1
Hi Artem,
Quoted 5 lines · 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
Could you resend patch after adding u-boot mailing list?
Best Regards,
Jaehoon Chung
Quoted 59 lines
NOTE: remake
odroid-n2.cvariant from Neil Armstrong <[email protected]>Signed-off-by Artem Lapkin <[email protected]>--- board/amlogic/vim3/vim3.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)board/amlogic/vim3/vim3.c +19
-3@@ -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 6int misc_init_r (void ) { -uint8_t mac_addr[EFUSE_MAC_SIZE ]; +uint8_t 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 ; } +