Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-26 07:17:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: eth-uclass: Fix message if mac is coming from DT or ROM

Browse source 
When local-mac-address DT property is specified it is reported the same way
as address read from eeprom/ROM. Show properly if mac address is coming
from DT or ROM.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Michal Simek 2020-03-16 11:36:17 +01:00
parent 001ad66324
commit d4172c9406
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
net/eth-uclass.c
View file

@ -490,6 +490,7 @@ static int eth_post_probe(struct udevice *dev)
struct eth_device_priv *priv = dev->uclass_priv; struct eth_device_priv *priv = dev->uclass_priv;
struct eth_pdata *pdata = dev->platdata; struct eth_pdata *pdata = dev->platdata;
unsigned char env_enetaddr[ARP_HLEN]; unsigned char env_enetaddr[ARP_HLEN];
char *source = "DT";
#if defined(CONFIG_NEEDS_MANUAL_RELOC) #if defined(CONFIG_NEEDS_MANUAL_RELOC)
struct eth_ops *ops = eth_get_ops(dev); struct eth_ops *ops = eth_get_ops(dev);
@ -522,6 +523,7 @@ static int eth_post_probe(struct udevice *dev)
/* Check if the device has a valid MAC address in device tree */ /* Check if the device has a valid MAC address in device tree */
if (!eth_dev_get_mac_address(dev, pdata->enetaddr) || if (!eth_dev_get_mac_address(dev, pdata->enetaddr) ||
!is_valid_ethaddr(pdata->enetaddr)) { !is_valid_ethaddr(pdata->enetaddr)) {
source = "ROM";
/* Check if the device has a MAC address in ROM */ /* Check if the device has a MAC address in ROM */
if (eth_get_ops(dev)->read_rom_hwaddr) if (eth_get_ops(dev)->read_rom_hwaddr)
eth_get_ops(dev)->read_rom_hwaddr(dev); eth_get_ops(dev)->read_rom_hwaddr(dev);
@ -533,9 +535,9 @@ static int eth_post_probe(struct udevice *dev)
memcmp(pdata->enetaddr, env_enetaddr, ARP_HLEN)) { memcmp(pdata->enetaddr, env_enetaddr, ARP_HLEN)) {
printf("\nWarning: %s MAC addresses don't match:\n", printf("\nWarning: %s MAC addresses don't match:\n",
dev->name); dev->name);
printf("Address in ROM is %pM\n", printf("Address in %s is\t\t%pM\n",
pdata->enetaddr); source, pdata->enetaddr);
printf("Address in environment is %pM\n", printf("Address in environment is\t%pM\n",
env_enetaddr); env_enetaddr);
} }
@ -543,8 +545,8 @@ static int eth_post_probe(struct udevice *dev)
memcpy(pdata->enetaddr, env_enetaddr, ARP_HLEN); memcpy(pdata->enetaddr, env_enetaddr, ARP_HLEN);
} else if (is_valid_ethaddr(pdata->enetaddr)) { } else if (is_valid_ethaddr(pdata->enetaddr)) {
eth_env_set_enetaddr_by_index("eth", dev->seq, pdata->enetaddr); eth_env_set_enetaddr_by_index("eth", dev->seq, pdata->enetaddr);
printf("\nWarning: %s using MAC address from ROM\n", printf("\nWarning: %s using MAC address from %s\n",
dev->name); dev->name, source);
} else if (is_zero_ethaddr(pdata->enetaddr) || } else if (is_zero_ethaddr(pdata->enetaddr) ||
!is_valid_ethaddr(pdata->enetaddr)) { !is_valid_ethaddr(pdata->enetaddr)) {
#ifdef CONFIG_NET_RANDOM_ETHADDR #ifdef CONFIG_NET_RANDOM_ETHADDR