Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-03 02:03:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ARM: imx: stm32: Test whether ethernet node is enabled before reading MAC EEPROM on DHSOM

Browse source 
Check whether the ethernet interface is enabled at all before reading
MAC EEPROM. As a cost saving measure, it can happen that the MAC EEPROM
is not populated on SoMs which do not use ethernet.

Signed-off-by: Marek Vasut <marex@denx.de>
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>
This commit is contained in:
Marek Vasut 2024-03-12 22:15:58 +01:00 • committed by Fabio Estevam
parent 26ff863fc0
commit 786af90de8
5 changed files with 39 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
board/dhelectronics/common/dh_common.c
View file

@ -18,6 +18,19 @@ bool dh_mac_is_in_env(const char *env)
return eth_env_get_enetaddr(env, enetaddr); return eth_env_get_enetaddr(env, enetaddr);
} }
int dh_get_mac_is_enabled(const char *alias)
{
ofnode node = ofnode_path(alias);
if (!ofnode_valid(node))
return -EINVAL;
if (!ofnode_is_enabled(node))
return -ENODEV;
return 0;
}
int dh_get_mac_from_eeprom(unsigned char *enetaddr, const char *alias) int dh_get_mac_from_eeprom(unsigned char *enetaddr, const char *alias)
{ {
struct udevice *dev; struct udevice *dev;
@ -57,6 +70,9 @@ __weak int dh_setup_mac_address(void)
if (dh_mac_is_in_env("ethaddr")) if (dh_mac_is_in_env("ethaddr"))
return 0; return 0;
if (dh_get_mac_is_enabled("ethernet0"))
return 0;
if (!dh_get_mac_from_eeprom(enetaddr, "eeprom0")) if (!dh_get_mac_from_eeprom(enetaddr, "eeprom0"))
return eth_env_set_enetaddr("ethaddr", enetaddr); return eth_env_set_enetaddr("ethaddr", enetaddr);

8
board/dhelectronics/common/dh_common.h
View file

@ -11,6 +11,14 @@
*/ */
bool dh_mac_is_in_env(const char *env); bool dh_mac_is_in_env(const char *env);
/*
* dh_get_mac_is_enabled - Test if ethernet MAC is enabled in DT
*
* @alias: alias for ethernet MAC device tree node
* Return: 0 if OK, other value on error
*/
int dh_get_mac_is_enabled(const char *alias);
/* /*
* dh_get_mac_from_eeprom - Get MAC address from eeprom and write it to enetaddr * dh_get_mac_from_eeprom - Get MAC address from eeprom and write it to enetaddr
* *

3
board/dhelectronics/dh_imx6/dh_imx6.c
View file

@ -92,6 +92,9 @@ int dh_setup_mac_address(void)
if (dh_mac_is_in_env("ethaddr")) if (dh_mac_is_in_env("ethaddr"))
return 0; return 0;
if (dh_get_mac_is_enabled("ethernet0"))
return 0;
if (!dh_imx_get_mac_from_fuse(enetaddr)) if (!dh_imx_get_mac_from_fuse(enetaddr))
goto out; goto out;

6
board/dhelectronics/dh_imx8mp/imx8mp_dhcom_pdk2.c
View file

@ -47,6 +47,9 @@ static int dh_imx8_setup_ethaddr(void)
if (dh_mac_is_in_env("ethaddr")) if (dh_mac_is_in_env("ethaddr"))
return 0; return 0;
if (dh_get_mac_is_enabled("ethernet0"))
return 0;
if (!dh_imx_get_mac_from_fuse(enetaddr)) if (!dh_imx_get_mac_from_fuse(enetaddr))
goto out; goto out;
@ -66,6 +69,9 @@ static int dh_imx8_setup_eth1addr(void)
if (dh_mac_is_in_env("eth1addr")) if (dh_mac_is_in_env("eth1addr"))
return 0; return 0;
if (dh_get_mac_is_enabled("ethernet1"))
return 0;
if (!dh_imx_get_mac_from_fuse(enetaddr)) if (!dh_imx_get_mac_from_fuse(enetaddr))
goto increment_out; goto increment_out;

6
board/dhelectronics/dh_stm32mp1/board.c
View file

@ -128,6 +128,9 @@ static int dh_stm32_setup_ethaddr(void)
if (dh_mac_is_in_env("ethaddr")) if (dh_mac_is_in_env("ethaddr"))
return 0; return 0;
if (dh_get_mac_is_enabled("ethernet0"))
return 0;
if (!dh_get_mac_from_eeprom(enetaddr, "eeprom0")) if (!dh_get_mac_from_eeprom(enetaddr, "eeprom0"))
return eth_env_set_enetaddr("ethaddr", enetaddr); return eth_env_set_enetaddr("ethaddr", enetaddr);
@ -141,6 +144,9 @@ static int dh_stm32_setup_eth1addr(void)
if (dh_mac_is_in_env("eth1addr")) if (dh_mac_is_in_env("eth1addr"))
return 0; return 0;
if (dh_get_mac_is_enabled("ethernet1"))
return 0;
if (dh_stm32_mac_is_in_ks8851()) if (dh_stm32_mac_is_in_ks8851())
return 0; return 0;