Merge tag 'dm-pull-29jul19' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm

[oweals/u-boot.git] / arch / arm / mach-meson / sm.c

diff --git a/arch/arm/mach-meson/sm.c b/arch/arm/mach-meson/sm.c
index 1b35a220d34a4a2a8ae7b9ba6095ef50a802d13c..05b7f0bdf2cb0ab7ce1d3159710fb38d8a513f1f 100644 (file)
--- a/arch/arm/mach-meson/sm.c
+++ b/arch/arm/mach-meson/sm.c
@@ -1,19 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2016 Beniamino Galvani <b.galvani@gmail.com>
  *
- * SPDX-License-Identifier:    GPL-2.0+
- *
  * Secure monitor calls.
  */
 
 #include <common.h>
-#include <asm/arch/gxbb.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;
@@ -55,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;
+}