Write MAC address whenever ethernet subsystem is initialized

PATCH New Ingo van Lil 3 participants 4 messages Aug 26, 2011 Networking

Share & tools

Ingo van Lil

author

2011-08-26 09:24 UTC #0 lore raw

PATCH 1/1 Write MAC address whenever ethernet subsystem is initialized

Currently the ethernet MAC address is read from the 'ethaddr' environment variable into the dev->enetaddr field each time the network hardware is initialized, but it is written to the actual hardware only once at board startup. When 'ethaddr' is set or changed after startup the device can no longer receive packets because the hardware filter is still programmed to the old MAC.

This patch moves the writing of the hardware address from eth_initialize (board startup) to eth_init (just before actually using the network).

---
 net/eth.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

net/eth.c +7 -6

index 6082c90..2b43ae7 100644
@@ -261,11 +261,6 @@ int eth_initialize(bd_t *bis)
 
 				memcpy(dev->enetaddr, env_enetaddr, 6);
 			}
-			if (dev->write_hwaddr &&
-				!eth_mac_skip(eth_number) &&
-				is_valid_ether_addr(dev->enetaddr)) {
-				dev->write_hwaddr(dev);
-			}
 
 			eth_number++;
 			dev = dev->next;

@@ -347,8 +342,14 @@ int eth_init(bd_t *bis)
 	do {
 		uchar env_enetaddr[6];
 
-		if (eth_getenv_enetaddr_by_index(eth_number, env_enetaddr))
+		if (eth_getenv_enetaddr_by_index(eth_number, env_enetaddr)) {
 			memcpy(dev->enetaddr, env_enetaddr, 6);
+			if (dev->write_hwaddr &&
+				!eth_mac_skip(eth_number) &&
+				is_valid_ether_addr(dev->enetaddr)) {
+				dev->write_hwaddr(dev);
+			}
+		}
 
 		++eth_number;
 		dev = dev->next;

Signature · 1 line

1.7.6

Sergei Shtylyov

2011-08-26 12:37 UTC #1 lore raw

PATCH 1/1 Write MAC address whenever ethernet subsystem is initialized

Hello.

Quoted 9 lines · Ingo van Lil

Currently the ethernet MAC address is read from the 'ethaddr' environment variable into the dev->enetaddr field each time the network hardware is initialized, but it is written to the actual hardware only once at board startup. When 'ethaddr' is set or changed after startup the device can no longer receive packets because the hardware filter is still programmed to the old MAC.
This patch moves the writing of the hardware address from eth_initialize (board startup) to eth_init (just before actually using the network).

You didn't sign off the patch...

WBR, Sergei

Ingo van Lil

author

2011-08-26 12:43 UTC #2 lore raw

PATCH 1/1 Write MAC address whenever ethernet subsystem is initialized

This patch moves the writing of the hardware address from eth_initialize (board startup) to eth_init (just before actually using the network).

Signed-off-by Ingo van Lil <[email protected]>

---
 net/eth.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

net/eth.c +7 -6

index 6082c90..2b43ae7 100644
@@ -261,11 +261,6 @@ int eth_initialize(bd_t *bis)
 
 				memcpy(dev->enetaddr, env_enetaddr, 6);
 			}
-			if (dev->write_hwaddr &&
-				!eth_mac_skip(eth_number) &&
-				is_valid_ether_addr(dev->enetaddr)) {
-				dev->write_hwaddr(dev);
-			}
 
 			eth_number++;
 			dev = dev->next;

@@ -347,8 +342,14 @@ int eth_init(bd_t *bis)
 	do {
 		uchar env_enetaddr[6];
 
-		if (eth_getenv_enetaddr_by_index(eth_number, env_enetaddr))
+		if (eth_getenv_enetaddr_by_index(eth_number, env_enetaddr)) {
 			memcpy(dev->enetaddr, env_enetaddr, 6);
+			if (dev->write_hwaddr &&
+				!eth_mac_skip(eth_number) &&
+				is_valid_ether_addr(dev->enetaddr)) {
+				dev->write_hwaddr(dev);
+			}
+		}
 
 		++eth_number;
 		dev = dev->next;

Signature · 1 line

1.7.6

Mike Frysinger

2011-08-26 19:20 UTC #3 lore raw

PATCH 1/1 Write MAC address whenever ethernet subsystem is initialized

net/eth.c int eth_initialize(bd_t *bis) · line 268

Quoted 9 lines · On Friday, August 26, 2011 08:43:34 Ingo van Lil wrote:

net/eth.c +0 -5

@@ -261,11 +261,6 @@ int eth_initialize(bd_t *bis)
 
 				memcpy(dev->enetaddr, env_enetaddr, 6);
 			}
-			if (dev->write_hwaddr &&
-				!eth_mac_skip(eth_number) &&
-				is_valid_ether_addr(dev->enetaddr)) {
-				dev->write_hwaddr(dev);
-			}

removing this breaks the original reason write_hwaddr was added in the first
place: people want the MAC programmed into the hardware even if they dont use the network.

we should probably add an explicit comment above this block so people dont try and "fix it" in the future.

net/eth.c int eth_init(bd_t *bis) · line 352

Quoted 13 lines

net/eth.c +7 -1

@@ -347,8 +342,14 @@ int eth_init(bd_t *bis)
 	do {
 		uchar env_enetaddr[6];
 
-		if (eth_getenv_enetaddr_by_index(eth_number, env_enetaddr))
+		if (eth_getenv_enetaddr_by_index(eth_number, env_enetaddr)) {
 			memcpy(dev->enetaddr, env_enetaddr, 6);
+			if (dev->write_hwaddr &&
+				!eth_mac_skip(eth_number) &&
+				is_valid_ether_addr(dev->enetaddr)) {
+				dev->write_hwaddr(dev);
+			}
+		}

this changes the current API between the common layer and the drivers. i'm not saying that's a bad thing, just that we need to:
(1) update the documentation (see doc/README.{drivers.eth,enetaddr})
(2) update the drivers which manually call their write_hwaddr() in their
init() func to no longer do that
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20110826/227c79ac/attachment.pgp