Skip to contentSkip to conversation

rockchip: misc: don't fail if eth_addr already set

PATCH New Heiko Stuebner 2 participants 4 messages Nov 29, 2019 – Dec 1, 2019

Subsystems (3)
lore
Share & tools
lore

Heiko Stuebner

author maintainer
#0 lore raw

PATCH 1/2 rockchip: misc: don't fail if eth_addr already set

From: Heiko Stuebner <[email protected]>

rockchip_setup_macaddr() runs from an initcall, so returning an error code will make that initcall fail thus breaking the boot process.

And if an ethernet address is already set this is definitly not a cause for that, so just return success in that case.

Fixes 04825384999f ("rockchip: rk3399: derive ethaddr from cpuid");
---
 arch/arm/mach-rockchip/misc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-rockchip/misc.c +1 -1
index bed4317f7e..d0fb3d07a7 100644
@@ -29,7 +29,7 @@ int rockchip_setup_macaddr(void)
 
 	/* Only generate a MAC address, if none is set in the environment */
 	if (env_get("ethaddr"))
-		return -1;
+		return 0;
 
 	if (!cpuid) {
 		debug("%s: could not retrieve 'cpuid#'\n", __func__);
Signature · 1 line
2.24.0
author maintainer
#1 lore raw

PATCH 2/2 rockchip: misc: protect serial# from getting overwritten

From: Heiko Stuebner <[email protected]>

serial# is one of the vendor properties and thus protected from being overwritten if already set. If env_set is called anyway this result in some nasty warnings, so check for presence before trying that.

In the same direction check for the presence of cpuid# and compare it to the actual hardware and emit a warning if they don't match.

---
 arch/arm/mach-rockchip/misc.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
arch/arm/mach-rockchip/misc.c +10 -1
index d0fb3d07a7..545b98baad 100644
@@ -91,6 +91,7 @@ int rockchip_cpuid_set(const u8 *cpuid, const u32 cpuid_length)
 	char cpuid_str[cpuid_length * 2 + 1];
 	u64 serialno;
 	char serialno_str[17];
+	const char *oldid;
 	int i;
 
 	memset(cpuid_str, 0, sizeof(cpuid_str));
@@ -112,8 +113,16 @@ int rockchip_cpuid_set(const u8 *cpuid, const u32 cpuid_length)
 	serialno |= (u64)crc32_no_comp(serialno, high, 8) << 32;
 	snprintf(serialno_str, sizeof(serialno_str), "%016llx", serialno);
 
+	oldid = env_get("cpuid#");
+	if (oldid && strcmp(oldid, cpuid_str) != 0)
+		printf("cpuid: value %s present in env does not match hardware %s\n",
+		       oldid, cpuid_str);
+
 	env_set("cpuid#", cpuid_str);
-	env_set("serial#", serialno_str);
+
+	/* Only generate serial# when none is set yet */
+	if (!env_get("serial#"))
+		env_set("serial#", serialno_str);
 
 	return 0;
 }
Signature · 1 line
2.24.0
#2 lore raw

PATCH 2/2 rockchip: misc: protect serial# from getting overwritten

Quoted 10 lines · Heiko Stuebner

From: Heiko Stuebner <[email protected]>

serial# is one of the vendor properties and thus protected from being overwritten if already set. If env_set is called anyway this result in some nasty warnings, so check for presence before trying that.

In the same direction check for the presence of cpuid# and compare it to the actual hardware and emit a warning if they don't match.

Thanks,
- Kever

Quoted 34 lines
---
  arch/arm/mach-rockchip/misc.c | 11 ++++++++++-
  1 file changed, 10 insertions(+), 1 deletion(-)
arch/arm/mach-rockchip/misc.c +10 -1
index d0fb3d07a7..545b98baad 100644
@@ -91,6 +91,7 @@ int rockchip_cpuid_set(const u8 *cpuid, const u32 cpuid_length)
  	char cpuid_str[cpuid_length * 2 + 1];
  	u64 serialno;
  	char serialno_str[17];
+	const char *oldid;
  	int i;
 
  	memset(cpuid_str, 0, sizeof(cpuid_str));
@@ -112,8 +113,16 @@ int rockchip_cpuid_set(const u8 *cpuid, const u32 cpuid_length)
  	serialno |= (u64)crc32_no_comp(serialno, high, 8) << 32;
  	snprintf(serialno_str, sizeof(serialno_str), "%016llx", serialno);
 
+	oldid = env_get("cpuid#");
+	if (oldid && strcmp(oldid, cpuid_str) != 0)
+		printf("cpuid: value %s present in env does not match hardware %s\n",
+		       oldid, cpuid_str);
+
  	env_set("cpuid#", cpuid_str);
-	env_set("serial#", serialno_str);
+
+	/* Only generate serial# when none is set yet */
+	if (!env_get("serial#"))
+		env_set("serial#", serialno_str);
 
  	return 0;
  }
#3 lore raw

PATCH 1/2 rockchip: misc: don't fail if eth_addr already set

In reply to Heiko Stuebner
Quoted 10 lines · Heiko Stuebner

From: Heiko Stuebner <[email protected]>

rockchip_setup_macaddr() runs from an initcall, so returning an error code will make that initcall fail thus breaking the boot process.

And if an ethernet address is already set this is definitly not a cause for that, so just return success in that case.

Fixes 04825384999f ("rockchip: rk3399: derive ethaddr from cpuid");

Thanks,
- Kever

Quoted 17 lines
---
  arch/arm/mach-rockchip/misc.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-rockchip/misc.c +1 -1
index bed4317f7e..d0fb3d07a7 100644
@@ -29,7 +29,7 @@ int rockchip_setup_macaddr(void)
 
  	/* Only generate a MAC address, if none is set in the environment */
  	if (env_get("ethaddr"))
-		return -1;
+		return 0;
 
  	if (!cpuid) {
  		debug("%s: could not retrieve 'cpuid#'\n", __func__);