From 206c8a0e7a628966697cf89918955021b08980f2 Mon Sep 17 00:00:00 2001 From: Ye Li Date: Mon, 14 Oct 2019 23:08:46 -0700 Subject: [PATCH] MLK-22757-2 imx8: Change to use new SECO API commands Latest SCFW has removed old MISC SECO commands. So update the codes to use new SECO commands. Signed-off-by: Ye Li Reviewed-by: Peng Fan (cherry picked from commit 8e54efce6d2a1691605ae23983ff91f4a702adba) --- arch/arm/mach-imx/imx8/ahab.c | 6 +++--- arch/arm/mach-imx/imx8/parser.c | 6 +++--- drivers/video/imx/hdp_load.c | 2 +- drivers/video/imx/hdprx_load.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-imx/imx8/ahab.c b/arch/arm/mach-imx/imx8/ahab.c index 1433bc8..68d8cee 100644 --- a/arch/arm/mach-imx/imx8/ahab.c +++ b/arch/arm/mach-imx/imx8/ahab.c @@ -74,7 +74,7 @@ int authenticate_os_container(ulong addr) debug("container length %u\n", length); memcpy((void *)SEC_SECURE_RAM_BASE, (const void *)addr, ALIGN(length, CONFIG_SYS_CACHELINE_SIZE)); - err = sc_seco_authenticate(-1, SC_MISC_AUTH_CONTAINER, SECO_LOCAL_SEC_SEC_SECURE_RAM_BASE); + err = sc_seco_authenticate(-1, SC_SECO_AUTH_CONTAINER, SECO_LOCAL_SEC_SEC_SECURE_RAM_BASE); if (err) { printf("Error: authenticate container hdr failed, return %d\n", err); ret = -EIO; @@ -112,7 +112,7 @@ int authenticate_os_container(ulong addr) goto exit; } - err = sc_seco_authenticate(-1, SC_MISC_VERIFY_IMAGE, (1 << i)); + err = sc_seco_authenticate(-1, SC_SECO_VERIFY_IMAGE, (1 << i)); if (err) { printf("Error: authenticate img %d failed, return %d\n", i, err); ret = -EIO; @@ -129,7 +129,7 @@ int authenticate_os_container(ulong addr) } exit: - if (sc_seco_authenticate(-1, SC_MISC_REL_CONTAINER, 0) != SC_ERR_NONE) + if (sc_seco_authenticate(-1, SC_SECO_REL_CONTAINER, 0) != SC_ERR_NONE) printf("Error: release container failed!\n"); return ret; diff --git a/arch/arm/mach-imx/imx8/parser.c b/arch/arm/mach-imx/imx8/parser.c index ba6ce3b..754bdc5 100644 --- a/arch/arm/mach-imx/imx8/parser.c +++ b/arch/arm/mach-imx/imx8/parser.c @@ -128,7 +128,7 @@ static int authenticate_image(struct boot_img_t *img, int image_index) return -EPERM; } - err = sc_seco_authenticate(-1, SC_MISC_VERIFY_IMAGE, + err = sc_seco_authenticate(-1, SC_SECO_VERIFY_IMAGE, 1 << image_index); if (err) { printf("authenticate img %d failed, return %d\n", @@ -229,7 +229,7 @@ static int read_auth_container(struct spl_image_info *spl_image) memcpy((void *)SEC_SECURE_RAM_BASE, (const void *)container, ALIGN(length, CONFIG_SYS_CACHELINE_SIZE)); - ret = sc_seco_authenticate(-1, SC_MISC_AUTH_CONTAINER, + ret = sc_seco_authenticate(-1, SC_SECO_AUTH_CONTAINER, SECO_LOCAL_SEC_SEC_SECURE_RAM_BASE); if (ret) { printf("authenticate container hdr failed, return %d\n", ret); @@ -260,7 +260,7 @@ static int read_auth_container(struct spl_image_info *spl_image) end_auth: #ifdef CONFIG_AHAB_BOOT - if (sc_seco_authenticate(-1, SC_MISC_REL_CONTAINER, 0) != SC_ERR_NONE) + if (sc_seco_authenticate(-1, SC_SECO_REL_CONTAINER, 0) != SC_ERR_NONE) printf("Error: release container failed!\n"); #endif out: diff --git a/drivers/video/imx/hdp_load.c b/drivers/video/imx/hdp_load.c index c8cbdb5..c90e05a 100644 --- a/drivers/video/imx/hdp_load.c +++ b/drivers/video/imx/hdp_load.c @@ -88,7 +88,7 @@ int do_hdp(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) s = env_get("hdp_authenticate_fw"); if (s && !strcmp(s, "yes")) - SC_MISC_AUTH(-1, SC_MISC_SECO_AUTH_HDMI_TX_FW, 0); + SC_MISC_AUTH(-1, SC_SECO_AUTH_HDMI_TX_FW, 0); display_enable_clocks(OFF); printf("Loading hdp firmware Complete\n"); diff --git a/drivers/video/imx/hdprx_load.c b/drivers/video/imx/hdprx_load.c index 501bc7f..2743c8b 100644 --- a/drivers/video/imx/hdprx_load.c +++ b/drivers/video/imx/hdprx_load.c @@ -56,7 +56,7 @@ int do_hdprx(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) s = env_get("hdprx_authenticate_fw"); if (s && !strcmp(s, "yes")) - SC_MISC_AUTH(-1, SC_MISC_SECO_AUTH_HDMI_RX_FW, 0); + SC_MISC_AUTH(-1, SC_SECO_AUTH_HDMI_RX_FW, 0); printf("Loading hdp rx firmware Complete\n"); /* do not turn off hdmi power or firmware load will be lost */ } else { -- 1.9.1