Merge tag 'u-boot-amlogic-20190704' of https://gitlab.denx.de/u-boot/custodians/u...

- fix khadas-vim README
- add support for unique generated MAC adresses from SoC serial,
  limited to Amlogic GXL/GXM boards for now

diff --git a/arch/arm/include/asm/arch-meson/eth.h b/arch/arm/include/asm/arch-meson/eth.h
index 08acc5c..f765cd7 100644 (file)
--- 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 83d6441..60d04ae 100644 (file)
--- a/arch/arm/include/asm/arch-meson/sm.h
+++ b/arch/arm/include/asm/arch-meson/sm.h
@@ -8,4 +8,8 @@
 
 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 8c41301..18383f7 100644 (file)
--- 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;

diff --git a/arch/arm/mach-meson/sm.c b/arch/arm/mach-meson/sm.c
index a07b468..05b7f0b 100644 (file)
--- 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(&regs);
+
+       memcpy(buffer, shmem_output + SM_CHIP_ID_OFFSET,
+              min_t(size_t, size, SM_CHIP_ID_SIZE));
+
+       return 0;
+}

diff --git a/board/amlogic/p212/README.khadas-vim b/board/amlogic/p212/README.khadas-vim
index b194236..a2c7606 100644 (file)
--- a/board/amlogic/p212/README.khadas-vim
+++ b/board/amlogic/p212/README.khadas-vim
@@ -50,7 +50,7 @@ the git tree published by the board vendor:
  > git clone https://github.com/khadas/u-boot -b Vim vim-u-boot
  > cd vim-u-boot
  > make kvim_defconfig
- > make
+ > make CROSS_COMPILE=aarch64-none-elf-
  > export FIPDIR=$PWD/fip
 
 Go back to mainline U-Boot source tree then :

diff --git a/board/amlogic/p212/p212.c b/board/amlogic/p212/p212.c
index 546c4d9..1159cee 100644 (file)
--- 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 de97d6a..2ea97c3 100644 (file)
--- 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#")) {