Skip to contentSkip to conversation

rockchip: derive ethaddr from cpuid

PATCH New Rohan Garg 3 participants 6 messages Jul 9, 2019 – Jul 10, 2019 Arm Rockchip

lore
Share & tools
lore

Rohan Garg

author
#0 lore raw

PATCH 1/1 rockchip: derive ethaddr from cpuid

Generate a MAC address based on the cpuid available in the efuse
block: Use the first 6 byte of the cpuid's SHA256 hash and set the locally administered bits. Also ensure that the multicast bit is cleared.

The MAC address is only generated and set if there is no ethaddr present in the saved environment.

This is based off of Klaus Goger's work in 8adc9d

---

 board/rockchip/evb_rk3399/evb-rk3399.c | 98 ++++++++++++++++++++++++++
 configs/rock-pi-4-rk3399_defconfig     |  1 +
 2 files changed, 99 insertions(+)
board/rockchip/evb_rk3399/evb-rk3399.c +98 -0
index eb1b832274..af57cd86a5 100644
@@ -6,8 +6,11 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
+#include <environment.h>
+#include <misc.h>
 #include <asm/arch-rockchip/periph.h>
 #include <power/regulator.h>
+#include <u-boot/sha256.h>
 
 int board_init(void)
 {
@@ -33,3 +36,98 @@ int board_init(void)
 out:
 	return 0;
 }
+
+static void setup_macaddr(void)
+{
+#if CONFIG_IS_ENABLED(CMD_NET)
+	int ret;
+	const char *cpuid = env_get("cpuid#");
+	u8 hash[SHA256_SUM_LEN];
+	int size = sizeof(hash);
+	u8 mac_addr[6];
+
+	/* Only generate a MAC address, if none is set in the environment */
+	if (env_get("ethaddr"))
+		return;
+
+	if (!cpuid) {
+		debug("%s: could not retrieve 'cpuid#'\n", __func__);
+		return;
+	}
+
+	ret = hash_block("sha256", (void *)cpuid, strlen(cpuid), hash, &size);
+	if (ret) {
+		debug("%s: failed to calculate SHA256\n", __func__);
+		return;
+	}
+
+	/* Copy 6 bytes of the hash to base the MAC address on */
+	memcpy(mac_addr, hash, 6);
+
+	/* Make this a valid MAC address and set it */
+	mac_addr[0] &= 0xfe;  /* clear multicast bit */
+	mac_addr[0] |= 0x02;  /* set local assignment bit (IEEE802) */
+	eth_env_set_enetaddr("ethaddr", mac_addr);
+#endif
+}
+
+static void setup_serial(void)
+{
+#if CONFIG_IS_ENABLED(ROCKCHIP_EFUSE)
+	const u32 cpuid_offset = 0x7;
+	const u32 cpuid_length = 0x10;
+
+	struct udevice *dev;
+	int ret, i;
+	u8 cpuid[cpuid_length];
+	u8 low[cpuid_length/2], high[cpuid_length/2];
+	char cpuid_str[cpuid_length * 2 + 1];
+	u64 serialno;
+	char serialno_str[17];
+
+	/* retrieve the device */
+	ret = uclass_get_device_by_driver(UCLASS_MISC,
+					  DM_GET_DRIVER(rockchip_efuse), &dev);
+	if (ret) {
+		debug("%s: could not find efuse device\n", __func__);
+		return;
+	}
+
+	/* read the cpu_id range from the efuses */
+	ret = misc_read(dev, cpuid_offset, &cpuid, sizeof(cpuid));
+	if (ret) {
+		debug("%s: reading cpuid from the efuses failed\n",
+		      __func__);
+		return;
+	}
+
+	memset(cpuid_str, 0, sizeof(cpuid_str));
+	for (i = 0; i < 16; i++)
+		sprintf(&cpuid_str[i * 2], "%02x", cpuid[i]);
+
+	debug("cpuid: %s\n", cpuid_str);
+
+	/*
+	 * Mix the cpuid bytes using the same rules as in
+	 *   ${linux}/drivers/soc/rockchip/rockchip-cpuinfo.c
+	 */
+	for (i = 0; i < 8; i++) {
+		low[i] = cpuid[1 + (i << 1)];
+		high[i] = cpuid[i << 1];
+	}
+
+	serialno = crc32_no_comp(0, low, 8);
+	serialno |= (u64)crc32_no_comp(serialno, high, 8) << 32;
+	snprintf(serialno_str, sizeof(serialno_str), "%016llx", serialno);
+
+	env_set("cpuid#", cpuid_str);
+	env_set("serial#", serialno_str);
+#endif
+}
+
+int misc_init_r(void)
+{
+	setup_serial();
+	setup_macaddr();
+	return 0;
+}
configs/rock-pi-4-rk3399_defconfig +1 -0
index be670df23f..dc84ded86c 100644
@@ -58,3 +58,4 @@ CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_USE_TINY_PRINTF=y
 CONFIG_SPL_TINY_MEMSET=y
 CONFIG_ERRNO_STR=y
+CONFIG_MISC_INIT_R=y
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 rockchip: derive ethaddr from cpuid

Hi Rohan,

    The code change looks good to me, but could you help to separate

the rock pi config update into another patch?

Thanks,

- Kever

Quoted 142 lines · Rohan Garg

Generate a MAC address based on the cpuid available in the efuse
block: Use the first 6 byte of the cpuid's SHA256 hash and set the locally administered bits. Also ensure that the multicast bit is cleared.

The MAC address is only generated and set if there is no ethaddr present in the saved environment.

This is based off of Klaus Goger's work in 8adc9d

---

  board/rockchip/evb_rk3399/evb-rk3399.c | 98 ++++++++++++++++++++++++++
  configs/rock-pi-4-rk3399_defconfig     |  1 +
  2 files changed, 99 insertions(+)
board/rockchip/evb_rk3399/evb-rk3399.c +98 -0
index eb1b832274..af57cd86a5 100644
@@ -6,8 +6,11 @@
  #include <common.h>
  #include <dm.h>
  #include <dm/pinctrl.h>
+#include <environment.h>
+#include <misc.h>
  #include <asm/arch-rockchip/periph.h>
  #include <power/regulator.h>
+#include <u-boot/sha256.h>
 
  int board_init(void)
  {
@@ -33,3 +36,98 @@ int board_init(void)
  out:
  	return 0;
  }
+
+static void setup_macaddr(void)
+{
+#if CONFIG_IS_ENABLED(CMD_NET)
+	int ret;
+	const char *cpuid = env_get("cpuid#");
+	u8 hash[SHA256_SUM_LEN];
+	int size = sizeof(hash);
+	u8 mac_addr[6];
+
+	/* Only generate a MAC address, if none is set in the environment */
+	if (env_get("ethaddr"))
+		return;
+
+	if (!cpuid) {
+		debug("%s: could not retrieve 'cpuid#'\n", __func__);
+		return;
+	}
+
+	ret = hash_block("sha256", (void *)cpuid, strlen(cpuid), hash, &size);
+	if (ret) {
+		debug("%s: failed to calculate SHA256\n", __func__);
+		return;
+	}
+
+	/* Copy 6 bytes of the hash to base the MAC address on */
+	memcpy(mac_addr, hash, 6);
+
+	/* Make this a valid MAC address and set it */
+	mac_addr[0] &= 0xfe;  /* clear multicast bit */
+	mac_addr[0] |= 0x02;  /* set local assignment bit (IEEE802) */
+	eth_env_set_enetaddr("ethaddr", mac_addr);
+#endif
+}
+
+static void setup_serial(void)
+{
+#if CONFIG_IS_ENABLED(ROCKCHIP_EFUSE)
+	const u32 cpuid_offset = 0x7;
+	const u32 cpuid_length = 0x10;
+
+	struct udevice *dev;
+	int ret, i;
+	u8 cpuid[cpuid_length];
+	u8 low[cpuid_length/2], high[cpuid_length/2];
+	char cpuid_str[cpuid_length * 2 + 1];
+	u64 serialno;
+	char serialno_str[17];
+
+	/* retrieve the device */
+	ret = uclass_get_device_by_driver(UCLASS_MISC,
+					  DM_GET_DRIVER(rockchip_efuse), &dev);
+	if (ret) {
+		debug("%s: could not find efuse device\n", __func__);
+		return;
+	}
+
+	/* read the cpu_id range from the efuses */
+	ret = misc_read(dev, cpuid_offset, &cpuid, sizeof(cpuid));
+	if (ret) {
+		debug("%s: reading cpuid from the efuses failed\n",
+		      __func__);
+		return;
+	}
+
+	memset(cpuid_str, 0, sizeof(cpuid_str));
+	for (i = 0; i < 16; i++)
+		sprintf(&cpuid_str[i * 2], "%02x", cpuid[i]);
+
+	debug("cpuid: %s\n", cpuid_str);
+
+	/*
+	 * Mix the cpuid bytes using the same rules as in
+	 *   ${linux}/drivers/soc/rockchip/rockchip-cpuinfo.c
+	 */
+	for (i = 0; i < 8; i++) {
+		low[i] = cpuid[1 + (i << 1)];
+		high[i] = cpuid[i << 1];
+	}
+
+	serialno = crc32_no_comp(0, low, 8);
+	serialno |= (u64)crc32_no_comp(serialno, high, 8) << 32;
+	snprintf(serialno_str, sizeof(serialno_str), "%016llx", serialno);
+
+	env_set("cpuid#", cpuid_str);
+	env_set("serial#", serialno_str);
+#endif
+}
+
+int misc_init_r(void)
+{
+	setup_serial();
+	setup_macaddr();
+	return 0;
+}
configs/rock-pi-4-rk3399_defconfig +1 -0
index be670df23f..dc84ded86c 100644
@@ -58,3 +58,4 @@ CONFIG_USB_ETHER_SMSC95XX=y
  CONFIG_USE_TINY_PRINTF=y
  CONFIG_SPL_TINY_MEMSET=y
  CONFIG_ERRNO_STR=y
+CONFIG_MISC_INIT_R=y
maintainer
#2 lore raw

PATCH 1/1 rockchip: derive ethaddr from cpuid

Hi Rohan, Kever,

Am Mittwoch, 10. Juli 2019, 08:37:33 CEST schrieb Kever Yang:

Quoted 4 lines

Hi Rohan,

The code change looks good to me, but could you help to separate
the rock pi config update into another patch?

Also, that code looks pretty much like the same in rk3399-puma.

So maybe it might be good to have this in a common location so more boards can access common code instead of duplicating that whole function numerous times?

Heiko

Quoted 150 lines · Rohan Garg
Quoted 138 lines

Generate a MAC address based on the cpuid available in the efuse
block: Use the first 6 byte of the cpuid's SHA256 hash and set the locally administered bits. Also ensure that the multicast bit is cleared.

The MAC address is only generated and set if there is no ethaddr present in the saved environment.

This is based off of Klaus Goger's work in 8adc9d

---

  board/rockchip/evb_rk3399/evb-rk3399.c | 98 ++++++++++++++++++++++++++
  configs/rock-pi-4-rk3399_defconfig     |  1 +
  2 files changed, 99 insertions(+)
board/rockchip/evb_rk3399/evb-rk3399.c +98 -0
index eb1b832274..af57cd86a5 100644
@@ -6,8 +6,11 @@
  #include <common.h>
  #include <dm.h>
  #include <dm/pinctrl.h>
+#include <environment.h>
+#include <misc.h>
  #include <asm/arch-rockchip/periph.h>
  #include <power/regulator.h>
+#include <u-boot/sha256.h>
 
  int board_init(void)
  {
@@ -33,3 +36,98 @@ int board_init(void)
  out:
  	return 0;
  }
+
+static void setup_macaddr(void)
+{
+#if CONFIG_IS_ENABLED(CMD_NET)
+	int ret;
+	const char *cpuid = env_get("cpuid#");
+	u8 hash[SHA256_SUM_LEN];
+	int size = sizeof(hash);
+	u8 mac_addr[6];
+
+	/* Only generate a MAC address, if none is set in the environment */
+	if (env_get("ethaddr"))
+		return;
+
+	if (!cpuid) {
+		debug("%s: could not retrieve 'cpuid#'\n", __func__);
+		return;
+	}
+
+	ret = hash_block("sha256", (void *)cpuid, strlen(cpuid), hash, &size);
+	if (ret) {
+		debug("%s: failed to calculate SHA256\n", __func__);
+		return;
+	}
+
+	/* Copy 6 bytes of the hash to base the MAC address on */
+	memcpy(mac_addr, hash, 6);
+
+	/* Make this a valid MAC address and set it */
+	mac_addr[0] &= 0xfe;  /* clear multicast bit */
+	mac_addr[0] |= 0x02;  /* set local assignment bit (IEEE802) */
+	eth_env_set_enetaddr("ethaddr", mac_addr);
+#endif
+}
+
+static void setup_serial(void)
+{
+#if CONFIG_IS_ENABLED(ROCKCHIP_EFUSE)
+	const u32 cpuid_offset = 0x7;
+	const u32 cpuid_length = 0x10;
+
+	struct udevice *dev;
+	int ret, i;
+	u8 cpuid[cpuid_length];
+	u8 low[cpuid_length/2], high[cpuid_length/2];
+	char cpuid_str[cpuid_length * 2 + 1];
+	u64 serialno;
+	char serialno_str[17];
+
+	/* retrieve the device */
+	ret = uclass_get_device_by_driver(UCLASS_MISC,
+					  DM_GET_DRIVER(rockchip_efuse), &dev);
+	if (ret) {
+		debug("%s: could not find efuse device\n", __func__);
+		return;
+	}
+
+	/* read the cpu_id range from the efuses */
+	ret = misc_read(dev, cpuid_offset, &cpuid, sizeof(cpuid));
+	if (ret) {
+		debug("%s: reading cpuid from the efuses failed\n",
+		      __func__);
+		return;
+	}
+
+	memset(cpuid_str, 0, sizeof(cpuid_str));
+	for (i = 0; i < 16; i++)
+		sprintf(&cpuid_str[i * 2], "%02x", cpuid[i]);
+
+	debug("cpuid: %s\n", cpuid_str);
+
+	/*
+	 * Mix the cpuid bytes using the same rules as in
+	 *   ${linux}/drivers/soc/rockchip/rockchip-cpuinfo.c
+	 */
+	for (i = 0; i < 8; i++) {
+		low[i] = cpuid[1 + (i << 1)];
+		high[i] = cpuid[i << 1];
+	}
+
+	serialno = crc32_no_comp(0, low, 8);
+	serialno |= (u64)crc32_no_comp(serialno, high, 8) << 32;
+	snprintf(serialno_str, sizeof(serialno_str), "%016llx", serialno);
+
+	env_set("cpuid#", cpuid_str);
+	env_set("serial#", serialno_str);
+#endif
+}
+
+int misc_init_r(void)
+{
+	setup_serial();
+	setup_macaddr();
+	return 0;
+}
configs/rock-pi-4-rk3399_defconfig +0 -0
index be670df23f..dc84ded86c 100644

configs/rock-pi-4-rk3399_defconfig CONFIG_USB_ETHER_SMSC95XX=y · line 61

Quoted 4 lines
configs/rock-pi-4-rk3399_defconfig +1 -0
@@ -58,3 +58,4 @@ CONFIG_USB_ETHER_SMSC95XX=y
  CONFIG_USE_TINY_PRINTF=y
  CONFIG_SPL_TINY_MEMSET=y
  CONFIG_ERRNO_STR=y
+CONFIG_MISC_INIT_R=y

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot

author
#3 lore raw

PATCH 1/1 rockchip: derive ethaddr from cpuid

Hey Heiko

Quoted 5 lines

Also, that code looks pretty much like the same in rk3399-puma.

So maybe it might be good to have this in a common location so more boards can access common code instead of duplicating that whole function numerous times?

Sounds good to me, do you have any recommendations where something like this would live?

Cheers
Rohan Garg
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190710/edbc6773/attachment.sig>

maintainer
#4 lore raw

PATCH 1/1 rockchip: derive ethaddr from cpuid

Hi Rohan,

Am Mittwoch, 10. Juli 2019, 14:08:31 CEST schrieb Rohan Garg:

Quoted 9 lines

Hey Heiko

Quoted 5 lines

Also, that code looks pretty much like the same in rk3399-puma.

So maybe it might be good to have this in a common location so more boards can access common code instead of duplicating that whole function numerous times?

Sounds good to me, do you have any recommendations where something like this would live?

From a cursory glance, it looks like most Rockchip socs have that cpu-id value in the efuse (I checked rk3288, rk3399, rk3328 ... rk3368 efuse looks similar but I'm not sure yet if it also has that id value).

So in any case I'd suggest somewhere in mach-rockchip, so that all Rockchip socs can profit from that if they want.

It might be good to separate the cpu-id reading from the serial-generation though, to parameterize the offset+length.

cpu_id = rockchip_cpuid_from_efuse(offset, length);
	//containing the efuse related code
rockchip_cpuid_set(cpu_id);
	//containing the calculations and env-setting

Heiko