* [PATCH] rockchip: rk3399: add ethaddr and serial# init, enable for R4S
@ 2022-09-25 17:07 Christian Kohlschütter
2022-09-26 11:59 ` Chen-Yu Tsai
0 siblings, 1 reply; 8+ messages in thread
From: Christian Kohlschütter @ 2022-09-25 17:07 UTC (permalink / raw)
To: u-boot, Kever Yang, Simon Glass, Philipp Tomsich, Xiaobo Tian
Cc: Christian Kohlschütter
Some RK3399 boards, such as newer revisions of NanoPi R4S, do not
provide an EEPROM chip containing a globally unique MAC address.
Currently, this means that a randomly generated temporary MAC address
may be generated each time the device is rebooted, leading to ARP cache
issues and other confusing bugs.
Since RK3399 CPUs provide a built-in unique serial number, we can
reliably derive a locally MAC address from it by reading the
corresponding bits from the non-secure efuse block.
Port from uboot-rockchip 0c294d0, fix compilation issues and adjust
coding style.
rockchip: board: puma_rk3399: derive ethaddr from cpuid
rockchip: board: puma_rk3399: add support for serial# and cpuid#
rockchip: efuse: add (misc) driver for RK3399 non-secure efuse block
via efuses
Signed-off-by: Christian Kohlschütter <christian@kohlschutter.com>
---
board/rockchip/evb_rk3399/evb-rk3399.c | 120 +++++++++++++++++++++++++
configs/nanopi-r4s-rk3399_defconfig | 4 +
drivers/misc/Makefile | 2 +-
3 files changed, 125 insertions(+), 1 deletion(-)
diff --git a/board/rockchip/evb_rk3399/evb-rk3399.c b/board/rockchip/evb_rk3399/evb-rk3399.c
index abb76585cf..ab8738ccf3 100644
--- a/board/rockchip/evb_rk3399/evb-rk3399.c
+++ b/board/rockchip/evb_rk3399/evb-rk3399.c
@@ -5,11 +5,20 @@
#include <common.h>
#include <dm.h>
+#include <misc.h>
+#include <env.h>
+#include <u-boot/crc.h>
+#include <hash.h>
#include <init.h>
#include <log.h>
#include <asm/arch-rockchip/periph.h>
+#include <asm/setup.h>
+#include <u-boot/sha256.h>
#include <power/regulator.h>
+#define RK3399_CPUID_OFF 0x7
+#define RK3399_CPUID_LEN 0x10
+
#ifndef CONFIG_SPL_BUILD
int board_early_init_f(void)
{
@@ -30,3 +39,114 @@ out:
return 0;
}
#endif
+static void setup_macaddr(void)
+{
+ if (!IS_ENABLED(CONFIG_CMD_NET))
+ return;
+
+ 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);
+}
+
+static void setup_serial(void)
+{
+ if (!IS_ENABLED(CONFIG_ROCKCHIP_EFUSE))
+ return;
+
+ struct udevice *dev;
+ int ret, i;
+ u8 cpuid[RK3399_CPUID_LEN];
+ u8 low[RK3399_CPUID_LEN / 2], high[RK3399_CPUID_LEN / 2];
+ char cpuid_str[RK3399_CPUID_LEN * 2 + 1];
+ u64 serialno;
+ char serialno_str[16];
+
+ /* retrieve the device */
+ ret = uclass_get_device_by_driver(UCLASS_MISC,
+ DM_DRIVER_GET(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, RK3399_CPUID_OFF, &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), "%llx", serialno);
+
+ env_set("cpuid#", cpuid_str);
+ env_set("serial#", serialno_str);
+}
+
+int misc_init_r(void)
+{
+ setup_serial();
+ setup_macaddr();
+
+ return 0;
+}
+
+void get_board_serial(struct tag_serialnr *serialnr)
+{
+ u64 serial = 0;
+
+ if (IS_ENABLED(CONFIG_SERIAL_TAG)) {
+ char *serial_string;
+
+ serial_string = env_get("serial#");
+
+ if (serial_string)
+ serial = simple_strtoull(serial_string, NULL, 16);
+ }
+
+ serialnr->high = (u32)(serial >> 32);
+ serialnr->low = (u32)(serial & 0xffffffff);
+}
diff --git a/configs/nanopi-r4s-rk3399_defconfig b/configs/nanopi-r4s-rk3399_defconfig
index 46ba07f4d5..aa89ac5854 100644
--- a/configs/nanopi-r4s-rk3399_defconfig
+++ b/configs/nanopi-r4s-rk3399_defconfig
@@ -63,3 +63,7 @@ CONFIG_VIDEO_ROCKCHIP=y
CONFIG_DISPLAY_ROCKCHIP_HDMI=y
CONFIG_SPL_TINY_MEMSET=y
CONFIG_ERRNO_STR=y
+CONFIG_MISC=y
+CONFIG_MISC_INIT_R=y
+CONFIG_ROCKCHIP_EFUSE=y
+CONFIG_ROCKCHIP_OTP=y
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index b9c54bdd99..a2ce9e737c 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -64,7 +64,7 @@ obj-$(CONFIG_QFW_PIO) += qfw_pio.o
obj-$(CONFIG_QFW_MMIO) += qfw_mmio.o
obj-$(CONFIG_SANDBOX) += qfw_sandbox.o
endif
-obj-$(CONFIG_ROCKCHIP_EFUSE) += rockchip-efuse.o
+obj-$(CONFIG_ROCKCHIP_EFUSE) += rockchip-efuse.o misc-uclass.o
obj-$(CONFIG_ROCKCHIP_OTP) += rockchip-otp.o
obj-$(CONFIG_SANDBOX) += syscon_sandbox.o misc_sandbox.o
obj-$(CONFIG_SIFIVE_OTP) += sifive-otp.o
--
2.36.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] rockchip: rk3399: add ethaddr and serial# init, enable for R4S
2022-09-25 17:07 [PATCH] rockchip: rk3399: add ethaddr and serial# init, enable for R4S Christian Kohlschütter
@ 2022-09-26 11:59 ` Chen-Yu Tsai
2022-09-26 21:27 ` Christian Kohlschütter
0 siblings, 1 reply; 8+ messages in thread
From: Chen-Yu Tsai @ 2022-09-26 11:59 UTC (permalink / raw)
To: Christian Kohlschütter
Cc: u-boot, Kever Yang, Simon Glass, Philipp Tomsich, Xiaobo Tian
On Mon, Sep 26, 2022 at 7:53 PM Christian Kohlschütter
<christian@kohlschutter.com> wrote:
>
> Some RK3399 boards, such as newer revisions of NanoPi R4S, do not
> provide an EEPROM chip containing a globally unique MAC address.
>
> Currently, this means that a randomly generated temporary MAC address
> may be generated each time the device is rebooted, leading to ARP cache
> issues and other confusing bugs.
>
> Since RK3399 CPUs provide a built-in unique serial number, we can
> reliably derive a locally MAC address from it by reading the
> corresponding bits from the non-secure efuse block.
>
> Port from uboot-rockchip 0c294d0, fix compilation issues and adjust
> coding style.
>
> rockchip: board: puma_rk3399: derive ethaddr from cpuid
> rockchip: board: puma_rk3399: add support for serial# and cpuid#
> rockchip: efuse: add (misc) driver for RK3399 non-secure efuse block
> via efuses
>
> Signed-off-by: Christian Kohlschütter <christian@kohlschutter.com>
> ---
> board/rockchip/evb_rk3399/evb-rk3399.c | 120 +++++++++++++++++++++++++
> configs/nanopi-r4s-rk3399_defconfig | 4 +
> drivers/misc/Makefile | 2 +-
There's already code in arch/arm/mach-rockchip/misc.c that does pretty much
the same thing.
IIRC all you need to do is enable MISC_INIT_R and ROCKCHIP_EFUSE
or ROCKCHIP_OTP.
ChenYu
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] rockchip: rk3399: add ethaddr and serial# init, enable for R4S
2022-09-26 11:59 ` Chen-Yu Tsai
@ 2022-09-26 21:27 ` Christian Kohlschütter
2022-09-27 4:23 ` Chen-Yu Tsai
0 siblings, 1 reply; 8+ messages in thread
From: Christian Kohlschütter @ 2022-09-26 21:27 UTC (permalink / raw)
To: wens; +Cc: u-boot, Kever Yang, Simon Glass, Philipp Tomsich, Xiaobo Tian
> On 26. Sep 2022, at 13:59, Chen-Yu Tsai <wens@kernel.org> wrote:
>
> On Mon, Sep 26, 2022 at 7:53 PM Christian Kohlschütter
> <christian@kohlschutter.com> wrote:
>>
>> Some RK3399 boards, such as newer revisions of NanoPi R4S, do not
>> provide an EEPROM chip containing a globally unique MAC address.
>>
>> Currently, this means that a randomly generated temporary MAC address
>> may be generated each time the device is rebooted, leading to ARP cache
>> issues and other confusing bugs.
>>
>> Since RK3399 CPUs provide a built-in unique serial number, we can
>> reliably derive a locally MAC address from it by reading the
>> corresponding bits from the non-secure efuse block.
>>
>> Port from uboot-rockchip 0c294d0, fix compilation issues and adjust
>> coding style.
>>
>> rockchip: board: puma_rk3399: derive ethaddr from cpuid
>> rockchip: board: puma_rk3399: add support for serial# and cpuid#
>> rockchip: efuse: add (misc) driver for RK3399 non-secure efuse block
>> via efuses
>>
>> Signed-off-by: Christian Kohlschütter <christian@kohlschutter.com>
>> ---
>> board/rockchip/evb_rk3399/evb-rk3399.c | 120 +++++++++++++++++++++++++
>> configs/nanopi-r4s-rk3399_defconfig | 4 +
>> drivers/misc/Makefile | 2 +-
>
> There's already code in arch/arm/mach-rockchip/misc.c that does pretty much
> the same thing.
>
> IIRC all you need to do is enable MISC_INIT_R and ROCKCHIP_EFUSE
> or ROCKCHIP_OTP.
>
> ChenYu
Oh cool, thanks ChenYu!
Is there a reason to not enable these options by default (at least for the R4S)?
Following up with "[PATCH] rockchip: rk3399: add ethaddr and serial# init, enable for R4S", which enables these settings in configs/nanopi-r4s-rk3399_defconfig.
Cheers,
Christian
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] rockchip: rk3399: add ethaddr and serial# init, enable for R4S
2022-09-26 21:27 ` Christian Kohlschütter
@ 2022-09-27 4:23 ` Chen-Yu Tsai
2022-09-27 15:06 ` Christian Kohlschütter
0 siblings, 1 reply; 8+ messages in thread
From: Chen-Yu Tsai @ 2022-09-27 4:23 UTC (permalink / raw)
To: Christian Kohlschütter
Cc: u-boot, Kever Yang, Simon Glass, Philipp Tomsich, Xiaobo Tian
On Tue, Sep 27, 2022 at 5:27 AM Christian Kohlschütter
<christian@kohlschutter.com> wrote:
>
> > On 26. Sep 2022, at 13:59, Chen-Yu Tsai <wens@kernel.org> wrote:
> >
> > On Mon, Sep 26, 2022 at 7:53 PM Christian Kohlschütter
> > <christian@kohlschutter.com> wrote:
> >>
> >> Some RK3399 boards, such as newer revisions of NanoPi R4S, do not
> >> provide an EEPROM chip containing a globally unique MAC address.
> >>
> >> Currently, this means that a randomly generated temporary MAC address
> >> may be generated each time the device is rebooted, leading to ARP cache
> >> issues and other confusing bugs.
> >>
> >> Since RK3399 CPUs provide a built-in unique serial number, we can
> >> reliably derive a locally MAC address from it by reading the
> >> corresponding bits from the non-secure efuse block.
> >>
> >> Port from uboot-rockchip 0c294d0, fix compilation issues and adjust
> >> coding style.
> >>
> >> rockchip: board: puma_rk3399: derive ethaddr from cpuid
> >> rockchip: board: puma_rk3399: add support for serial# and cpuid#
> >> rockchip: efuse: add (misc) driver for RK3399 non-secure efuse block
> >> via efuses
> >>
> >> Signed-off-by: Christian Kohlschütter <christian@kohlschutter.com>
> >> ---
> >> board/rockchip/evb_rk3399/evb-rk3399.c | 120 +++++++++++++++++++++++++
> >> configs/nanopi-r4s-rk3399_defconfig | 4 +
> >> drivers/misc/Makefile | 2 +-
> >
> > There's already code in arch/arm/mach-rockchip/misc.c that does pretty much
> > the same thing.
> >
> > IIRC all you need to do is enable MISC_INIT_R and ROCKCHIP_EFUSE
> > or ROCKCHIP_OTP.
> >
> > ChenYu
>
> Oh cool, thanks ChenYu!
>
> Is there a reason to not enable these options by default (at least for the R4S)?
Personally I think they could be enabled by default for all RK3399 boards.
> Following up with "[PATCH] rockchip: rk3399: add ethaddr and serial# init, enable for R4S", which enables these settings in configs/nanopi-r4s-rk3399_defconfig.
This doesn't look any different from what you already sent.
ChenYu
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] rockchip: rk3399: add ethaddr and serial# init, enable for R4S
2022-09-27 4:23 ` Chen-Yu Tsai
@ 2022-09-27 15:06 ` Christian Kohlschütter
0 siblings, 0 replies; 8+ messages in thread
From: Christian Kohlschütter @ 2022-09-27 15:06 UTC (permalink / raw)
To: wens; +Cc: u-boot, Kever Yang, Simon Glass, Philipp Tomsich, Xiaobo Tian
> Following up with "[PATCH] rockchip: rk3399: add ethaddr and serial# init, enable for R4S", which enables these settings in configs/nanopi-r4s-rk3399_defconfig.
>
> This doesn't look any different from what you already sent.
>
> ChenYu
Following up with "[PATCH] rk3399: r4s: Derive local MAC address if EEPROM is missing".
Cheers,
Christian
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] rockchip: rk3399: add ethaddr and serial# init, enable for R4S
@ 2022-09-26 21:23 Christian Kohlschütter
2022-09-27 15:07 ` Christian Kohlschütter
2022-09-28 7:50 ` Kever Yang
0 siblings, 2 replies; 8+ messages in thread
From: Christian Kohlschütter @ 2022-09-26 21:23 UTC (permalink / raw)
To: u-boot, Chen-Yu Tsai, Kever Yang, Simon Glass, Philipp Tomsich,
Xiaobo Tian
Cc: Christian Kohlschütter
Some RK3399 boards, such as newer revisions of NanoPi R4S, do not
provide an EEPROM chip containing a globally unique MAC address.
Currently, this means that a randomly generated temporary MAC address
may be generated each time the device is rebooted, leading to ARP cache
issues and other confusing bugs.
Since RK3399 CPUs provide a built-in unique serial number, we can
reliably derive a locally MAC address from it by reading the
corresponding bits from the non-secure efuse block.
Port from uboot-rockchip 0c294d0, fix compilation issues and adjust
coding style.
rockchip: board: puma_rk3399: derive ethaddr from cpuid
rockchip: board: puma_rk3399: add support for serial# and cpuid#
rockchip: efuse: add (misc) driver for RK3399 non-secure efuse block
via efuses
Signed-off-by: Christian Kohlschütter <christian@kohlschutter.com>
---
board/rockchip/evb_rk3399/evb-rk3399.c | 120 +++++++++++++++++++++++++
configs/nanopi-r4s-rk3399_defconfig | 4 +
drivers/misc/Makefile | 2 +-
3 files changed, 125 insertions(+), 1 deletion(-)
diff --git a/board/rockchip/evb_rk3399/evb-rk3399.c b/board/rockchip/evb_rk3399/evb-rk3399.c
index abb76585cf..ab8738ccf3 100644
--- a/board/rockchip/evb_rk3399/evb-rk3399.c
+++ b/board/rockchip/evb_rk3399/evb-rk3399.c
@@ -5,11 +5,20 @@
#include <common.h>
#include <dm.h>
+#include <misc.h>
+#include <env.h>
+#include <u-boot/crc.h>
+#include <hash.h>
#include <init.h>
#include <log.h>
#include <asm/arch-rockchip/periph.h>
+#include <asm/setup.h>
+#include <u-boot/sha256.h>
#include <power/regulator.h>
+#define RK3399_CPUID_OFF 0x7
+#define RK3399_CPUID_LEN 0x10
+
#ifndef CONFIG_SPL_BUILD
int board_early_init_f(void)
{
@@ -30,3 +39,114 @@ out:
return 0;
}
#endif
+static void setup_macaddr(void)
+{
+ if (!IS_ENABLED(CONFIG_CMD_NET))
+ return;
+
+ 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);
+}
+
+static void setup_serial(void)
+{
+ if (!IS_ENABLED(CONFIG_ROCKCHIP_EFUSE))
+ return;
+
+ struct udevice *dev;
+ int ret, i;
+ u8 cpuid[RK3399_CPUID_LEN];
+ u8 low[RK3399_CPUID_LEN / 2], high[RK3399_CPUID_LEN / 2];
+ char cpuid_str[RK3399_CPUID_LEN * 2 + 1];
+ u64 serialno;
+ char serialno_str[16];
+
+ /* retrieve the device */
+ ret = uclass_get_device_by_driver(UCLASS_MISC,
+ DM_DRIVER_GET(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, RK3399_CPUID_OFF, &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), "%llx", serialno);
+
+ env_set("cpuid#", cpuid_str);
+ env_set("serial#", serialno_str);
+}
+
+int misc_init_r(void)
+{
+ setup_serial();
+ setup_macaddr();
+
+ return 0;
+}
+
+void get_board_serial(struct tag_serialnr *serialnr)
+{
+ u64 serial = 0;
+
+ if (IS_ENABLED(CONFIG_SERIAL_TAG)) {
+ char *serial_string;
+
+ serial_string = env_get("serial#");
+
+ if (serial_string)
+ serial = simple_strtoull(serial_string, NULL, 16);
+ }
+
+ serialnr->high = (u32)(serial >> 32);
+ serialnr->low = (u32)(serial & 0xffffffff);
+}
diff --git a/configs/nanopi-r4s-rk3399_defconfig b/configs/nanopi-r4s-rk3399_defconfig
index 46ba07f4d5..aa89ac5854 100644
--- a/configs/nanopi-r4s-rk3399_defconfig
+++ b/configs/nanopi-r4s-rk3399_defconfig
@@ -63,3 +63,7 @@ CONFIG_VIDEO_ROCKCHIP=y
CONFIG_DISPLAY_ROCKCHIP_HDMI=y
CONFIG_SPL_TINY_MEMSET=y
CONFIG_ERRNO_STR=y
+CONFIG_MISC=y
+CONFIG_MISC_INIT_R=y
+CONFIG_ROCKCHIP_EFUSE=y
+CONFIG_ROCKCHIP_OTP=y
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index b9c54bdd99..a2ce9e737c 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -64,7 +64,7 @@ obj-$(CONFIG_QFW_PIO) += qfw_pio.o
obj-$(CONFIG_QFW_MMIO) += qfw_mmio.o
obj-$(CONFIG_SANDBOX) += qfw_sandbox.o
endif
-obj-$(CONFIG_ROCKCHIP_EFUSE) += rockchip-efuse.o
+obj-$(CONFIG_ROCKCHIP_EFUSE) += rockchip-efuse.o misc-uclass.o
obj-$(CONFIG_ROCKCHIP_OTP) += rockchip-otp.o
obj-$(CONFIG_SANDBOX) += syscon_sandbox.o misc_sandbox.o
obj-$(CONFIG_SIFIVE_OTP) += sifive-otp.o
--
2.36.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] rockchip: rk3399: add ethaddr and serial# init, enable for R4S
2022-09-26 21:23 Christian Kohlschütter
@ 2022-09-27 15:07 ` Christian Kohlschütter
2022-09-28 7:50 ` Kever Yang
1 sibling, 0 replies; 8+ messages in thread
From: Christian Kohlschütter @ 2022-09-27 15:07 UTC (permalink / raw)
To: u-boot, Chen-Yu Tsai, Kever Yang, Simon Glass, Philipp Tomsich,
Xiaobo Tian
Please disregard (duplicate patch)
Following up with "[PATCH] rk3399: r4s: Derive local MAC address if EEPROM is missing".
Cheers,
Christian
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] rockchip: rk3399: add ethaddr and serial# init, enable for R4S
2022-09-26 21:23 Christian Kohlschütter
2022-09-27 15:07 ` Christian Kohlschütter
@ 2022-09-28 7:50 ` Kever Yang
1 sibling, 0 replies; 8+ messages in thread
From: Kever Yang @ 2022-09-28 7:50 UTC (permalink / raw)
To: Christian Kohlschütter, u-boot, Chen-Yu Tsai, Simon Glass,
Philipp Tomsich, Xiaobo Tian
Hi Christian,
On 2022/9/27 05:23, Christian Kohlschütter wrote:
> Some RK3399 boards, such as newer revisions of NanoPi R4S, do not
> provide an EEPROM chip containing a globally unique MAC address.
>
> Currently, this means that a randomly generated temporary MAC address
> may be generated each time the device is rebooted, leading to ARP cache
> issues and other confusing bugs.
>
> Since RK3399 CPUs provide a built-in unique serial number, we can
> reliably derive a locally MAC address from it by reading the
> corresponding bits from the non-secure efuse block.
>
> Port from uboot-rockchip 0c294d0, fix compilation issues and adjust
> coding style.
>
> rockchip: board: puma_rk3399: derive ethaddr from cpuid
> rockchip: board: puma_rk3399: add support for serial# and cpuid#
> rockchip: efuse: add (misc) driver for RK3399 non-secure efuse block
> via efuses
>
> Signed-off-by: Christian Kohlschütter <christian@kohlschutter.com>
> ---
> board/rockchip/evb_rk3399/evb-rk3399.c | 120 +++++++++++++++++++++++++
> configs/nanopi-r4s-rk3399_defconfig | 4 +
> drivers/misc/Makefile | 2 +-
> 3 files changed, 125 insertions(+), 1 deletion(-)
>
> diff --git a/board/rockchip/evb_rk3399/evb-rk3399.c b/board/rockchip/evb_rk3399/evb-rk3399.c
> index abb76585cf..ab8738ccf3 100644
> --- a/board/rockchip/evb_rk3399/evb-rk3399.c
> +++ b/board/rockchip/evb_rk3399/evb-rk3399.c
> @@ -5,11 +5,20 @@
>
> #include <common.h>
> #include <dm.h>
> +#include <misc.h>
> +#include <env.h>
> +#include <u-boot/crc.h>
> +#include <hash.h>
> #include <init.h>
> #include <log.h>
> #include <asm/arch-rockchip/periph.h>
> +#include <asm/setup.h>
> +#include <u-boot/sha256.h>
> #include <power/regulator.h>
>
> +#define RK3399_CPUID_OFF 0x7
> +#define RK3399_CPUID_LEN 0x10
> +
> #ifndef CONFIG_SPL_BUILD
> int board_early_init_f(void)
> {
> @@ -30,3 +39,114 @@ out:
> return 0;
> }
> #endif
> +static void setup_macaddr(void)
> +{
> + if (!IS_ENABLED(CONFIG_CMD_NET))
> + return;
> +
> + 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);
> +}
> +
> +static void setup_serial(void)
> +{
> + if (!IS_ENABLED(CONFIG_ROCKCHIP_EFUSE))
> + return;
> +
> + struct udevice *dev;
> + int ret, i;
> + u8 cpuid[RK3399_CPUID_LEN];
> + u8 low[RK3399_CPUID_LEN / 2], high[RK3399_CPUID_LEN / 2];
> + char cpuid_str[RK3399_CPUID_LEN * 2 + 1];
> + u64 serialno;
> + char serialno_str[16];
> +
> + /* retrieve the device */
> + ret = uclass_get_device_by_driver(UCLASS_MISC,
> + DM_DRIVER_GET(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, RK3399_CPUID_OFF, &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), "%llx", serialno);
> +
> + env_set("cpuid#", cpuid_str);
> + env_set("serial#", serialno_str);
> +}
> +
> +int misc_init_r(void)
> +{
> + setup_serial();
> + setup_macaddr();
> +
> + return 0;
> +}
> +
> +void get_board_serial(struct tag_serialnr *serialnr)
> +{
> + u64 serial = 0;
> +
> + if (IS_ENABLED(CONFIG_SERIAL_TAG)) {
> + char *serial_string;
> +
> + serial_string = env_get("serial#");
> +
> + if (serial_string)
> + serial = simple_strtoull(serial_string, NULL, 16);
> + }
> +
> + serialnr->high = (u32)(serial >> 32);
> + serialnr->low = (u32)(serial & 0xffffffff);
> +}
> diff --git a/configs/nanopi-r4s-rk3399_defconfig b/configs/nanopi-r4s-rk3399_defconfig
> index 46ba07f4d5..aa89ac5854 100644
> --- a/configs/nanopi-r4s-rk3399_defconfig
> +++ b/configs/nanopi-r4s-rk3399_defconfig
> @@ -63,3 +63,7 @@ CONFIG_VIDEO_ROCKCHIP=y
> CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_ERRNO_STR=y
> +CONFIG_MISC=y
> +CONFIG_MISC_INIT_R=y
> +CONFIG_ROCKCHIP_EFUSE=y
> +CONFIG_ROCKCHIP_OTP=y
> diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
> index b9c54bdd99..a2ce9e737c 100644
> --- a/drivers/misc/Makefile
> +++ b/drivers/misc/Makefile
> @@ -64,7 +64,7 @@ obj-$(CONFIG_QFW_PIO) += qfw_pio.o
> obj-$(CONFIG_QFW_MMIO) += qfw_mmio.o
> obj-$(CONFIG_SANDBOX) += qfw_sandbox.o
> endif
> -obj-$(CONFIG_ROCKCHIP_EFUSE) += rockchip-efuse.o
> +obj-$(CONFIG_ROCKCHIP_EFUSE) += rockchip-efuse.o misc-uclass.o
This is no need and not right change, because the ROCKCHIP_EFUSE option
is depends on CONFIG_MISC.
Thanks,
- Kever
> obj-$(CONFIG_ROCKCHIP_OTP) += rockchip-otp.o
> obj-$(CONFIG_SANDBOX) += syscon_sandbox.o misc_sandbox.o
> obj-$(CONFIG_SIFIVE_OTP) += sifive-otp.o
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-09-28 7:50 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-25 17:07 [PATCH] rockchip: rk3399: add ethaddr and serial# init, enable for R4S Christian Kohlschütter
2022-09-26 11:59 ` Chen-Yu Tsai
2022-09-26 21:27 ` Christian Kohlschütter
2022-09-27 4:23 ` Chen-Yu Tsai
2022-09-27 15:06 ` Christian Kohlschütter
2022-09-26 21:23 Christian Kohlschütter
2022-09-27 15:07 ` Christian Kohlschütter
2022-09-28 7:50 ` Kever Yang
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.