summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Goger <klaus.goger@theobroma-systems.com>2017-04-26 22:16:02 +0200
committerPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>2017-05-09 12:41:45 +0200
commit0a5e786367ce46fd7a2283c6c762454e4846d69e (patch)
tree71f0469d898dae6ab5123c2a1826bfc3e4bff7fc
parent995539edc16391750a537a8a94c5b75f7c2e1554 (diff)
rockchip: board: puma_rk3399: 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. Signed-off-by: Klaus Goger <klaus.goger@theobroma-systems.com> Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Series-changes: 2 - added derivation of ethaddr from cpuid Reviewed-by: Simon Glass <sjg@chromium.org> Series-changes: 3 - uses uclass_get_device_by_driver() to ensure we don't pick up the wrong misc-device
-rw-r--r--board/theobroma-systems/puma_rk3399/puma-rk3399.c43
1 files changed, 41 insertions, 2 deletions
diff --git a/board/theobroma-systems/puma_rk3399/puma-rk3399.c b/board/theobroma-systems/puma_rk3399/puma-rk3399.c
index 825f896325..8cdc873d84 100644
--- a/board/theobroma-systems/puma_rk3399/puma-rk3399.c
+++ b/board/theobroma-systems/puma_rk3399/puma-rk3399.c
@@ -13,6 +13,7 @@
#include <ram.h>
#include <usb.h>
#include <dwc3-uboot.h>
+#include <u-boot/sha256.h>
#define RK3399_CPUID_OFF 0x7
#define RK3399_CPUID_LEN 0x10
@@ -62,6 +63,42 @@ out:
return 0;
}
+static void setup_macaddr(void)
+{
+#if CONFIG_IS_ENABLED(CMD_NET)
+ int ret;
+ const char *cpuid = getenv("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 (getenv("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_setenv_enetaddr("ethaddr", mac_addr);
+#endif
+
+ return;
+}
+
static void setup_serial(void)
{
#if CONFIG_IS_ENABLED(ROCKCHIP_EFUSE)
@@ -73,8 +110,9 @@ static void setup_serial(void)
u64 serialno;
char serialno_str[16];
- /* the first misc device will be used */
- ret = uclass_get_device(UCLASS_MISC, 0, &dev);
+ /* 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;
@@ -117,6 +155,7 @@ static void setup_serial(void)
int misc_init_r(void)
{
setup_serial();
+ setup_macaddr();
return 0;
}