Skip to contentSkip to conversation

Introduce NET_PREFER_ROM_MAC_ADDR config

PATCH In review Detlev Casanova 2 participants 8 messages Apr 22, 2024 – Apr 23, 2024 Networking

lore
Share & tools
lore
#0 lore raw

v2 cover Introduce NET_PREFER_ROM_MAC_ADDR config

When there is a MAC address mismatch between ROM and environment, u-boot chooses the one from the environment. This config allows to prefer the MAC address from the ROM instead of the environment.

See the first commit message for details.

Changes since v1:
- Simplify implementation with a NET_PREFER_ROM_MAC_ADDR config

Detlev Casanova (3):
net: eth-uclass: Introduce NET_PREFER_ROM_MAC_ADDR configs/rock5b: Set NET_PREFER_ROM_MAC_ADDR to y
net: eth-uclass: Add driver source possibility

 configs/rock5b-rk3588_defconfig |  1 +
 net/Kconfig                     |  7 +++++++
 net/eth-uclass.c                | 17 +++++++++++++----
 3 files changed, 21 insertions(+), 4 deletions(-)
Signature · 1 line
2.43.2
#1 lore raw

PATCH v2 1/3 net: eth-uclass: Introduce NET_PREFER_ROM_MAC_ADDR

On some boards, a MAC address is set based on the CPU ID or other information. This is usually done in the misc_init_r() function.

This becomes a problem for net devices that are probed after the call to misc_init_r(), for example, when the ethernet is on a PCI port, which needs to be enumerated.

In this case, misc_init_r() will set the ethaddr variable, then, when the ethernet device is probed, if it has a ROM address, u-boot will warn about a MAC address mismatch and use the misc_init_r() address instead of the one in ROM.

The operating system later will most likely use the ROM MAC address, which can be confusing.

To avoid that, this commit introduces NET_PREFER_ROM_MAC_ADDR that can be set for boards that have such an interface.

---
 net/Kconfig      | 7 +++++++
 net/eth-uclass.c | 9 +++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)
net/Kconfig +7 -0
index 5dff6336293..1797c2cea35 100644
@@ -227,6 +227,13 @@ config SERVERIP
 	string "Value of the default 'serverip' value in the environment"
 	depends on USE_SERVERIP
 
+config NET_PREFER_ROM_MAC_ADDR
+	bool "Prefer using HW MAC address if environment address differs"
+	default n
+	help
+	  In case of a MAC address mismatch between the environment and the HW,
+	  prefer using the HW address.
+
 config PROT_TCP
 	bool "TCP stack"
 	help
net/eth-uclass.c +7 -2
index 3d0ec91dfa4..682de3ec7bd 100644
@@ -584,8 +584,13 @@ static int eth_post_probe(struct udevice *dev)
 			       env_enetaddr);
 		}
 
-		/* Override the ROM MAC address */
-		memcpy(pdata->enetaddr, env_enetaddr, ARP_HLEN);
+		if (!IS_ENABLED(CONFIG_NET_PREFER_ROM_MAC_ADDR)) {
+			/* Override the ROM MAC address */
+			printf("Using address in environment\n");
+			memcpy(pdata->enetaddr, env_enetaddr, ARP_HLEN);
+		} else {
+			printf("Using address in %s\n", source);
+		}
 	} else if (is_valid_ethaddr(pdata->enetaddr)) {
 		eth_env_set_enetaddr_by_index("eth", dev_seq(dev),
 					      pdata->enetaddr);
Signature · 1 line
2.43.2
#2 lore raw

Re: [PATCH v2 1/3] net: eth-uclass: Introduce NET_PREFER_ROM_MAC_ADDR

Quoted 12 lines · Detlev Casanova

On some boards, a MAC address is set based on the CPU ID or other information. This is usually done in the misc_init_r() function.

This becomes a problem for net devices that are probed after the call to misc_init_r(), for example, when the ethernet is on a PCI port, which needs to be enumerated.

In this case, misc_init_r() will set the ethaddr variable, then, when the ethernet device is probed, if it has a ROM address, u-boot will warn about a MAC address mismatch and use the misc_init_r() address instead of the one in ROM.

Quoted 7 lines

The operating system later will most likely use the ROM MAC address, which can be confusing.

To avoid that, this commit introduces NET_PREFER_ROM_MAC_ADDR that can be set for boards that have such an interface.

Won't the system pick ROM MAC if $ethaddr is not set ?

#3 lore raw

Re: [PATCH v2 1/3] net: eth-uclass: Introduce NET_PREFER_ROM_MAC_ADDR

Quoted 16 lines · On Monday, April 22, 2024 3:47:21 P.M. EDT Marek Vasut wrote:
Quoted 15 lines · Detlev Casanova

On some boards, a MAC address is set based on the CPU ID or other information. This is usually done in the misc_init_r() function.

This becomes a problem for net devices that are probed after the call to misc_init_r(), for example, when the ethernet is on a PCI port, which needs to be enumerated.

In this case, misc_init_r() will set the ethaddr variable, then, when the ethernet device is probed, if it has a ROM address, u-boot will warn about a MAC address mismatch and use the misc_init_r() address instead of the one in ROM.

The operating system later will most likely use the ROM MAC address, which can be confusing.

Quoted 6 lines
Quoted 4 lines

To avoid that, this commit introduces NET_PREFER_ROM_MAC_ADDR that can be set for boards that have such an interface.

Won't the system pick ROM MAC if $ethaddr is not set ?

Yes, and in the case of rockchip, misc_init_r() will set an $ethaddr based on the cpuid, which makes the eth driver use that instead of the ROM one.

#4 lore raw

Re: [PATCH v2 1/3] net: eth-uclass: Introduce NET_PREFER_ROM_MAC_ADDR

Quoted 20 lines · Detlev Casanova
Quoted 19 lines · On Monday, April 22, 2024 3:47:21 P.M. EDT Marek Vasut wrote:
Quoted 18 lines · Detlev Casanova

On some boards, a MAC address is set based on the CPU ID or other information. This is usually done in the misc_init_r() function.

This becomes a problem for net devices that are probed after the call to misc_init_r(), for example, when the ethernet is on a PCI port, which needs to be enumerated.

In this case, misc_init_r() will set the ethaddr variable, then, when the ethernet device is probed, if it has a ROM address, u-boot will warn about a MAC address mismatch and use the misc_init_r() address instead of the one in ROM.

The operating system later will most likely use the ROM MAC address, which can be confusing.

To avoid that, this commit introduces NET_PREFER_ROM_MAC_ADDR that can be set for boards that have such an interface.

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

Won't the system pick ROM MAC if $ethaddr is not set ?

Yes, and in the case of rockchip, misc_init_r() will set an $ethaddr based on the cpuid, which makes the eth driver use that instead of the ROM one.

Shouldn't the rockchip misc_init_r be fixed then ?

#5 lore raw

PATCH v2 2/3 configs/rock5b: Set NET_PREFER_ROM_MAC_ADDR to y

In reply to Detlev Casanova
---
 configs/rock5b-rk3588_defconfig | 1 +
 1 file changed, 1 insertion(+)
configs/rock5b-rk3588_defconfig +1 -0
index 58c7c44fb4f..4cd4d369561 100644
@@ -106,3 +106,4 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x350b
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USB_FUNCTION_ROCKUSB=y
 CONFIG_ERRNO_STR=y
+CONFIG_NET_PREFER_ROM_MAC_ADDR=y
Signature · 1 line
2.43.2
#6 lore raw

Re: [PATCH v2 2/3] configs/rock5b: Set NET_PREFER_ROM_MAC_ADDR to y

Quoted 3 lines · Detlev Casanova
---
  configs/rock5b-rk3588_defconfig | 1 +
  1 file changed, 1 insertion(+)

This patch seems to be missing commit message and SoB line

#7 lore raw

PATCH v2 3/3 net: eth-uclass: Add driver source possibility

In reply to Detlev Casanova

Some net driver, like rtl8169, can set/get the MAC address from the registers and store it in pdata->enetaddr.

When that happens, if there is a mismatch with the environment MAC address, u-boot will show that the MAC address source is DT. This patch ensures that the shown source is "driver" instead to avoid confusion.

---
 net/eth-uclass.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
net/eth-uclass.c +6 -2
index 682de3ec7bd..3caf03eaef6 100644
@@ -559,9 +559,13 @@ static int eth_post_probe(struct udevice *dev)
 	priv->state = ETH_STATE_INIT;
 	priv->running = false;
 
+	/* Check if the driver has already set a valid MAC address */
+	if (is_valid_ethaddr(pdata->enetaddr)) {
+		source = "driver";
+	}
 	/* 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)) {
+	else if (!eth_dev_get_mac_address(dev, pdata->enetaddr) ||
+		 !is_valid_ethaddr(pdata->enetaddr)) {
 		/* Check if the device has a MAC address in ROM */
 		if (eth_get_ops(dev)->read_rom_hwaddr) {
 			int ret;
Signature · 1 line
2.43.2