MA-23233-2 Load SRM before loading kernel

Because if device support hdcp, hdcp will be enabled
when display initialize successfully, so the srm need
to be loaded before Android UI ready.

Change-Id: I629afa7ec2d5f7f165289fed4939f3f8f232f974
Signed-off-by: He Zhai <[email protected]>

Author: zhaihe

arch/arm/mach-imx/Kconfig

@@ -451,6 +451,12 @@ config VPU_SECURE_HEAP
 	  to linux. It is only used by imx8qm.
 	default n
 
+config IMX_SUPPORT_SRM
+	bool "Support SRM feature"
+	help
+	  Let trusty to load srm before loading kernel.
+	default n
+
 endmenu
 
 config APPEND_BOOTARGS

configs/imx8mq_evk_android_trusty_defconfig

@@ -212,3 +212,4 @@ CONFIG_ATTESTATION_ID_MODEL="EVK_8MQ"
 CONFIG_CMD_ERASEENV=y
 CONFIG_DM_RNG=y
 CONFIG_KASLR=y
+CONFIG_IMX_SUPPORT_SRM=y

configs/imx8mq_evk_android_trusty_dual_defconfig

@@ -211,3 +211,4 @@ CONFIG_DUAL_BOOTLOADER=y
 CONFIG_CMD_ERASEENV=y
 CONFIG_DM_RNG=y
 CONFIG_KASLR=y
+CONFIG_IMX_SUPPORT_SRM=y

configs/imx8mq_evk_android_trusty_secure_unlock_dual_defconfig

@@ -217,3 +217,4 @@ CONFIG_CMD_DEKBLOB=y
 CONFIG_CMD_PRIBLOB=y
 CONFIG_DM_RNG=y
 CONFIG_KASLR=y
+CONFIG_IMX_SUPPORT_SRM=y

drivers/fastboot/fb_fsl/fb_fsl_boot.c

@@ -1116,6 +1116,10 @@ int do_boota(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]) {
 
 	/* populate secretkeeper public key */
 	trusty_populate_sk_key((void *)(ulong)fdt_addr);
+
+#ifdef CONFIG_IMX_SUPPORT_SRM
+	hwcrypto_load_srm();
+#endif
 #endif
 
 	/* Dump image info */

include/interface/hwcrypto/hwcrypto.h

@@ -54,6 +54,7 @@ enum hwcrypto_command {
     HWCRYPTO_GET_BOOTLOADER_DEK_BLOB         = (16 << HWCRYPTO_REQ_SHIFT),
     HWCRYPTO_GET_BOOTLOADER_DEK_BLOB_SIZE    = (17 << HWCRYPTO_REQ_SHIFT),
     HWCRYPTO_PROVISION_SRM        = (18 << HWCRYPTO_REQ_SHIFT),
+    HWCRYPTO_LOAD_SRM        = (19 << HWCRYPTO_REQ_SHIFT),
 };
 
 /**

include/trusty/hwcrypto.h

@@ -121,4 +121,7 @@ int hwcrypto_get_dek_blob(char *data, uint32_t *data_size, enum dek_blob_part);
 /* Send request to secure side to provision srm
  * */
 int hwcrypto_provision_srm(const char *data, uint32_t data_size);
+/* Send request to secure side to load SRM
+ * */
+int hwcrypto_load_srm(void);
 #endif /* TRUSTY_HWCRYPTO_H_ */

lib/trusty/ql-tipc/hwcrypto.c

@@ -541,6 +541,12 @@ int hwcrypto_provision_srm(const char *data, uint32_t data_size)
     return rc;
 }
 
+int hwcrypto_load_srm(void)
+{
+    int rc = hwcrypto_do_tipc(HWCRYPTO_LOAD_SRM, NULL, 0, NULL, 0);
+    return rc;
+}
+
 int hwcrypto_get_dek_blob(char *data, uint32_t *data_size, enum dek_blob_part part)
 {
     uint32_t dek_blob_size = 0, tmp = 0;