[U-Boot] [PATCH 0/3] amlogic: add unique MAC address generatio
This patchset adds support for generating an unique MAC address per-SoC, and enables it on the q200 (VIM2) and P212 (libretech-cc, khadas-vim, libretech-ac) based boards.
Neil Armstrong (3): ARM: meson: sm: Add secure monitor calls to retrieve SoC serial number ARM: meson: add unique MAC address generation board: amlogic: Generate unique MAC address for Q200 and P212 based boards
arch/arm/include/asm/arch-meson/eth.h | 3 +++ arch/arm/include/asm/arch-meson/sm.h | 4 ++++ arch/arm/mach-meson/board-common.c | 31 +++++++++++++++++++++++++++ arch/arm/mach-meson/sm.c | 24 +++++++++++++++++++++ board/amlogic/p212/p212.c | 2 ++ board/amlogic/q200/q200.c | 2 ++ 6 files changed, 66 insertions(+)
The Secure Monitor interface permits retrieving the SoC Serial Number, add a function to retrieve it.
Signed-off-by: Neil Armstrong narmstrong@baylibre.com --- arch/arm/include/asm/arch-meson/sm.h | 1 + arch/arm/mach-meson/sm.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+)
diff --git a/arch/arm/include/asm/arch-meson/sm.h b/arch/arm/include/asm/arch-meson/sm.h index 83d6441803..a5bac5abda 100644 --- a/arch/arm/include/asm/arch-meson/sm.h +++ b/arch/arm/include/asm/arch-meson/sm.h @@ -7,5 +7,6 @@ #define __MESON_SM_H__
ssize_t meson_sm_read_efuse(uintptr_t offset, void *buffer, size_t size); +int meson_sm_get_serial(void *buffer, size_t size);
#endif /* __MESON_SM_H__ */ diff --git a/arch/arm/mach-meson/sm.c b/arch/arm/mach-meson/sm.c index a07b46895d..05b7f0bdf2 100644 --- a/arch/arm/mach-meson/sm.c +++ b/arch/arm/mach-meson/sm.c @@ -6,12 +6,14 @@ */
#include <common.h> +#include <asm/arch/sm.h> #include <linux/kernel.h>
#define FN_GET_SHARE_MEM_INPUT_BASE 0x82000020 #define FN_GET_SHARE_MEM_OUTPUT_BASE 0x82000021 #define FN_EFUSE_READ 0x82000030 #define FN_EFUSE_WRITE 0x82000031 +#define FN_CHIP_ID 0x82000044
static void *shmem_input; static void *shmem_output; @@ -53,3 +55,25 @@ ssize_t meson_sm_read_efuse(uintptr_t offset, void *buffer, size_t size)
return regs.regs[0]; } + +#define SM_CHIP_ID_LENGTH 119 +#define SM_CHIP_ID_OFFSET 4 +#define SM_CHIP_ID_SIZE 12 + +int meson_sm_get_serial(void *buffer, size_t size) +{ + struct pt_regs regs; + + meson_init_shmem(); + + regs.regs[0] = FN_CHIP_ID; + regs.regs[1] = 0; + regs.regs[2] = 0; + + smc_call(®s); + + memcpy(buffer, shmem_output + SM_CHIP_ID_OFFSET, + min_t(size_t, size, SM_CHIP_ID_SIZE)); + + return 0; +}
Add support for generating an unique MAC address using the SoC internal serial number from the Secure Monitor interface.
The algorithm generates an unicast locally administered 6bytes minus 2bits address using an crc16 of the serial for the top 16bits with the lower 2 bits masked to setup the unicast locally administered property and a crc24 for the lower 24bits.
Signed-off-by: Neil Armstrong narmstrong@baylibre.com --- arch/arm/include/asm/arch-meson/eth.h | 3 +++ arch/arm/include/asm/arch-meson/sm.h | 3 +++ arch/arm/mach-meson/board-common.c | 31 +++++++++++++++++++++++++++ 3 files changed, 37 insertions(+)
diff --git a/arch/arm/include/asm/arch-meson/eth.h b/arch/arm/include/asm/arch-meson/eth.h index 08acc5cbf7..f765cd7c4c 100644 --- a/arch/arm/include/asm/arch-meson/eth.h +++ b/arch/arm/include/asm/arch-meson/eth.h @@ -19,4 +19,7 @@ enum { */ void meson_eth_init(phy_interface_t mode, unsigned int flags);
+/* Generate an unique MAC address based on the HW serial */ +int meson_generate_serial_ethaddr(void); + #endif /* __MESON_ETH_H__ */ diff --git a/arch/arm/include/asm/arch-meson/sm.h b/arch/arm/include/asm/arch-meson/sm.h index a5bac5abda..60d04ae228 100644 --- a/arch/arm/include/asm/arch-meson/sm.h +++ b/arch/arm/include/asm/arch-meson/sm.h @@ -7,6 +7,9 @@ #define __MESON_SM_H__
ssize_t meson_sm_read_efuse(uintptr_t offset, void *buffer, size_t size); + +#define SM_SERIAL_SIZE 12 + int meson_sm_get_serial(void *buffer, size_t size);
#endif /* __MESON_SM_H__ */ diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c index 8c41301674..18383f774e 100644 --- a/arch/arm/mach-meson/board-common.c +++ b/arch/arm/mach-meson/board-common.c @@ -7,6 +7,7 @@ #include <asm/arch/boot.h> #include <linux/libfdt.h> #include <linux/err.h> +#include <environment.h> #include <asm/arch/mem.h> #include <asm/arch/sm.h> #include <asm/armv8/mmu.h> @@ -67,6 +68,36 @@ void meson_board_add_reserved_memory(void *fdt, u64 start, u64 size) } }
+int meson_generate_serial_ethaddr(void) +{ + u8 mac_addr[ARP_HLEN]; + char serial[SM_SERIAL_SIZE]; + u32 sid; + u16 sid16; + + if (!meson_sm_get_serial(serial, SM_SERIAL_SIZE)) { + sid = crc32(0, (unsigned char *)serial, SM_SERIAL_SIZE); + sid16 = crc16_ccitt(0, (unsigned char *)serial, SM_SERIAL_SIZE); + + /* Ensure the NIC specific bytes of the mac are not all 0 */ + if ((sid & 0xffffff) == 0) + sid |= 0x800000; + + /* Non OUI / registered MAC address */ + mac_addr[0] = ((sid16 >> 8) & 0xfc) | 0x02; + mac_addr[1] = (sid16 >> 0) & 0xff; + mac_addr[2] = (sid >> 24) & 0xff; + mac_addr[3] = (sid >> 16) & 0xff; + mac_addr[4] = (sid >> 8) & 0xff; + mac_addr[5] = (sid >> 0) & 0xff; + + eth_env_set_enetaddr("ethaddr", mac_addr); + } else + return -EINVAL; + + return 0; +} + static void meson_set_boot_source(void) { const char *source;
Enable unique MAC address generation for boards usins SoCs having a known functional and valid unique serial number.
Signed-off-by: Neil Armstrong narmstrong@baylibre.com --- board/amlogic/p212/p212.c | 2 ++ board/amlogic/q200/q200.c | 2 ++ 2 files changed, 4 insertions(+)
diff --git a/board/amlogic/p212/p212.c b/board/amlogic/p212/p212.c index 546c4d9c86..1159cee4ce 100644 --- a/board/amlogic/p212/p212.c +++ b/board/amlogic/p212/p212.c @@ -32,6 +32,8 @@ int misc_init_r(void) mac_addr, EFUSE_MAC_SIZE); if (len == EFUSE_MAC_SIZE && is_valid_ethaddr(mac_addr)) eth_env_set_enetaddr("ethaddr", mac_addr); + else + meson_generate_serial_ethaddr(); }
if (!env_get("serial#")) { diff --git a/board/amlogic/q200/q200.c b/board/amlogic/q200/q200.c index de97d6ad58..2ea97c362e 100644 --- a/board/amlogic/q200/q200.c +++ b/board/amlogic/q200/q200.c @@ -31,6 +31,8 @@ int misc_init_r(void) mac_addr, EFUSE_MAC_SIZE); if (len == EFUSE_MAC_SIZE && is_valid_ethaddr(mac_addr)) eth_env_set_enetaddr("ethaddr", mac_addr); + else + meson_generate_serial_ethaddr(); }
if (!env_get("serial#")) {
On 12/06/2019 11:49, Neil Armstrong wrote:
This patchset adds support for generating an unique MAC address per-SoC, and enables it on the q200 (VIM2) and P212 (libretech-cc, khadas-vim, libretech-ac) based boards.
Neil Armstrong (3): ARM: meson: sm: Add secure monitor calls to retrieve SoC serial number ARM: meson: add unique MAC address generation board: amlogic: Generate unique MAC address for Q200 and P212 based boards
arch/arm/include/asm/arch-meson/eth.h | 3 +++ arch/arm/include/asm/arch-meson/sm.h | 4 ++++ arch/arm/mach-meson/board-common.c | 31 +++++++++++++++++++++++++++ arch/arm/mach-meson/sm.c | 24 +++++++++++++++++++++ board/amlogic/p212/p212.c | 2 ++ board/amlogic/q200/q200.c | 2 ++ 6 files changed, 66 insertions(+)
Applied to u-boot-amlogic
Neil
participants (1)
-
Neil Armstrong