* [PATCH v2] net: eth-uclass: Fix message if mac is coming from DT or ROM
@ 2020-03-23 12:11 Michal Simek
2020-04-06 11:05 ` Michal Simek
0 siblings, 1 reply; 2+ messages in thread
From: Michal Simek @ 2020-03-23 12:11 UTC (permalink / raw)
To: u-boot
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>
---
Changes in v2:
- Also update source when mac addresses from variable and ROM/DT failed
to make clear what u-boot used as source.
net/eth-uclass.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/net/eth-uclass.c b/net/eth-uclass.c
index ed81cbd53746..8bf2eabe9026 100644
--- a/net/eth-uclass.c
+++ b/net/eth-uclass.c
@@ -490,6 +490,7 @@ static int eth_post_probe(struct udevice *dev)
struct eth_device_priv *priv = dev->uclass_priv;
struct eth_pdata *pdata = dev->platdata;
unsigned char env_enetaddr[ARP_HLEN];
+ char *source = "DT";
#if defined(CONFIG_NEEDS_MANUAL_RELOC)
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 */
if (!eth_dev_get_mac_address(dev, pdata->enetaddr) ||
!is_valid_ethaddr(pdata->enetaddr)) {
+ source = "ROM";
/* Check if the device has a MAC address in ROM */
if (eth_get_ops(dev)->read_rom_hwaddr)
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)) {
printf("\nWarning: %s MAC addresses don't match:\n",
dev->name);
- printf("Address in ROM is %pM\n",
- pdata->enetaddr);
- printf("Address in environment is %pM\n",
+ printf("Address in %s is\t\t%pM\n",
+ source, pdata->enetaddr);
+ printf("Address in environment is\t%pM\n",
env_enetaddr);
}
@@ -543,8 +545,8 @@ static int eth_post_probe(struct udevice *dev)
memcpy(pdata->enetaddr, env_enetaddr, ARP_HLEN);
} else if (is_valid_ethaddr(pdata->enetaddr)) {
eth_env_set_enetaddr_by_index("eth", dev->seq, pdata->enetaddr);
- printf("\nWarning: %s using MAC address from ROM\n",
- dev->name);
+ printf("\nWarning: %s using MAC address from %s\n",
+ dev->name, source);
} else if (is_zero_ethaddr(pdata->enetaddr) ||
!is_valid_ethaddr(pdata->enetaddr)) {
#ifdef CONFIG_NET_RANDOM_ETHADDR
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH v2] net: eth-uclass: Fix message if mac is coming from DT or ROM
2020-03-23 12:11 [PATCH v2] net: eth-uclass: Fix message if mac is coming from DT or ROM Michal Simek
@ 2020-04-06 11:05 ` Michal Simek
0 siblings, 0 replies; 2+ messages in thread
From: Michal Simek @ 2020-04-06 11:05 UTC (permalink / raw)
To: u-boot
po 23. 3. 2020 v 13:11 odes?latel Michal Simek <michal.simek@xilinx.com> napsal:
>
> 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>
> ---
>
> Changes in v2:
> - Also update source when mac addresses from variable and ROM/DT failed
> to make clear what u-boot used as source.
>
> net/eth-uclass.c | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/net/eth-uclass.c b/net/eth-uclass.c
> index ed81cbd53746..8bf2eabe9026 100644
> --- a/net/eth-uclass.c
> +++ b/net/eth-uclass.c
> @@ -490,6 +490,7 @@ static int eth_post_probe(struct udevice *dev)
> struct eth_device_priv *priv = dev->uclass_priv;
> struct eth_pdata *pdata = dev->platdata;
> unsigned char env_enetaddr[ARP_HLEN];
> + char *source = "DT";
>
> #if defined(CONFIG_NEEDS_MANUAL_RELOC)
> 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 */
> if (!eth_dev_get_mac_address(dev, pdata->enetaddr) ||
> !is_valid_ethaddr(pdata->enetaddr)) {
> + source = "ROM";
> /* Check if the device has a MAC address in ROM */
> if (eth_get_ops(dev)->read_rom_hwaddr)
> 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)) {
> printf("\nWarning: %s MAC addresses don't match:\n",
> dev->name);
> - printf("Address in ROM is %pM\n",
> - pdata->enetaddr);
> - printf("Address in environment is %pM\n",
> + printf("Address in %s is\t\t%pM\n",
> + source, pdata->enetaddr);
> + printf("Address in environment is\t%pM\n",
> env_enetaddr);
> }
>
> @@ -543,8 +545,8 @@ static int eth_post_probe(struct udevice *dev)
> memcpy(pdata->enetaddr, env_enetaddr, ARP_HLEN);
> } else if (is_valid_ethaddr(pdata->enetaddr)) {
> eth_env_set_enetaddr_by_index("eth", dev->seq, pdata->enetaddr);
> - printf("\nWarning: %s using MAC address from ROM\n",
> - dev->name);
> + printf("\nWarning: %s using MAC address from %s\n",
> + dev->name, source);
> } else if (is_zero_ethaddr(pdata->enetaddr) ||
> !is_valid_ethaddr(pdata->enetaddr)) {
> #ifdef CONFIG_NET_RANDOM_ETHADDR
> --
> 2.25.1
>
Applied.
M
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-04-06 11:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-23 12:11 [PATCH v2] net: eth-uclass: Fix message if mac is coming from DT or ROM Michal Simek
2020-04-06 11:05 ` Michal Simek
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.