[PATCH 20/41] imx: rename s400 api to ele

23 Jan 2023

From: Peng Fan peng.fan@nxp.com
The NXP Public API Name is ele, not AHAB, AHAB is for secure boot or
ELE AHAB for ELE secure boot. So update code to reflect that.
Signed-off-by: Peng Fan peng.fan@nxp.com
---
 arch/arm/include/asm/mach-imx/ele_api.h       |  60 +++++++
 arch/arm/include/asm/mach-imx/s400_api.h      |  60 -------
 arch/arm/mach-imx/imx8ulp/rdc.c               |  10 +-
 arch/arm/mach-imx/imx8ulp/soc.c               |   6 +-
 arch/arm/mach-imx/imx9/soc.c                  |  10 +-
 arch/arm/mach-imx/imx9/trdc.c                 |  10 +-
 board/freescale/imx8ulp_evk/spl.c             |  10 +-
 board/freescale/imx93_evk/spl.c               |   1 -
 drivers/misc/sentinel/Makefile                |   2 +-
 .../misc/sentinel/{s400_api.c => ele_api.c}   | 158 +++++++++---------
 drivers/misc/sentinel/{s4mu.c => ele_mu.c}    |   8 +-
 drivers/misc/sentinel/fuse.c                  |   8 +-
 12 files changed, 171 insertions(+), 172 deletions(-)
 create mode 100644 arch/arm/include/asm/mach-imx/ele_api.h
 delete mode 100644 arch/arm/include/asm/mach-imx/s400_api.h
 rename drivers/misc/sentinel/{s400_api.c => ele_api.c} (69%)
 rename drivers/misc/sentinel/{s4mu.c => ele_mu.c} (95%)

diff --git a/arch/arm/include/asm/mach-imx/ele_api.h b/arch/arm/include/asm/mach-imx/ele_api.h
new file mode 100644
index 00000000000..158e21971ea
--- /dev/null
+++ b/arch/arm/include/asm/mach-imx/ele_api.h
@@ -0,0 +1,60 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2021 NXP
+ */
+
+#ifndef __S400_API_H__
+#define __S400_API_H__
+
+#define ELE_VERSION    0x6
+#define ELE_CMD_TAG    0x17
+#define ELE_RESP_TAG   0xe1
+
+#define ELE_LOG_CID            0x21
+#define ELE_AUTH_OEM_CTNR_CID  0x87
+#define ELE_VERIFY_IMG_CID     0x88
+#define ELE_RELEASE_CTNR_CID   0x89
+#define ELE_WRITE_SECURE_FUSE_REQ_CID	0x91
+#define ELE_FWD_LIFECYCLE_UP_REQ_CID   0x95
+#define ELE_READ_FUSE_REQ_CID	0x97
+#define ELE_GET_FW_VERSION_CID	0x9D
+#define ELE_RELEASE_RDC_REQ_CID   0xC4
+#define ELE_GET_FW_STATUS_CID   0xC5
+#define ELE_WRITE_FUSE_REQ_CID	0xD6
+#define ELE_CAAM_RELEASE_CID 0xD7
+#define ELE_GET_INFO_CID 0xDA
+
+#define S400_MAX_MSG          255U
+
+struct ele_msg {
+	u8 version;
+	u8 size;
+	u8 command;
+	u8 tag;
+	u32 data[(S400_MAX_MSG - 1U)];
+};
+
+struct ele_get_info_data {
+	u32 hdr;
+	u32 soc;
+	u32 lc;
+	u32 uid[4];
+	u32 sha256_rom_patch[8];
+	u32 sha_fw[8];
+};
+
+int ele_release_rdc(u8 core_id, u8 xrdc, u32 *response);
+int ele_auth_oem_ctnr(ulong ctnr_addr, u32 *response);
+int ele_release_container(u32 *response);
+int ele_verify_image(u32 img_id, u32 *response);
+int ele_forward_lifecycle(u16 life_cycle, u32 *response);
+int ele_write_fuse(u16 fuse_id, u32 fuse_val, bool lock, u32 *response);
+int ele_read_common_fuse(u16 fuse_id, u32 *fuse_words, u32 fuse_num, u32 *response);
+int ele_release_caam(u32 core_did, u32 *response);
+int ele_get_fw_version(u32 *fw_version, u32 *sha1, u32 *response);
+int ele_dump_buffer(u32 *buffer, u32 buffer_length);
+int ele_get_info(struct ele_get_info_data *info, u32 *response);
+int ele_get_fw_status(u32 *status, u32 *response);
+int ele_release_m33_trout(void);
+
+#endif
diff --git a/arch/arm/include/asm/mach-imx/s400_api.h b/arch/arm/include/asm/mach-imx/s400_api.h
deleted file mode 100644
index 89fa373d06f..00000000000
--- a/arch/arm/include/asm/mach-imx/s400_api.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright 2021 NXP
- */
-
-#ifndef __S400_API_H__
-#define __S400_API_H__
-
-#define AHAB_VERSION    0x6
-#define AHAB_CMD_TAG    0x17
-#define AHAB_RESP_TAG   0xe1
-
-#define AHAB_LOG_CID            0x21
-#define AHAB_AUTH_OEM_CTNR_CID  0x87
-#define AHAB_VERIFY_IMG_CID     0x88
-#define AHAB_RELEASE_CTNR_CID   0x89
-#define AHAB_WRITE_SECURE_FUSE_REQ_CID	0x91
-#define AHAB_FWD_LIFECYCLE_UP_REQ_CID   0x95
-#define AHAB_READ_FUSE_REQ_CID	0x97
-#define AHAB_GET_FW_VERSION_CID	0x9D
-#define AHAB_RELEASE_RDC_REQ_CID   0xC4
-#define AHAB_GET_FW_STATUS_CID   0xC5
-#define AHAB_WRITE_FUSE_REQ_CID	0xD6
-#define AHAB_CAAM_RELEASE_CID 0xD7
-#define AHAB_GET_INFO_CID 0xDA
-
-#define S400_MAX_MSG          255U
-
-struct sentinel_msg {
-	u8 version;
-	u8 size;
-	u8 command;
-	u8 tag;
-	u32 data[(S400_MAX_MSG - 1U)];
-};
-
-struct sentinel_get_info_data {
-	u32 hdr;
-	u32 soc;
-	u32 lc;
-	u32 uid[4];
-	u32 sha256_rom_patch[8];
-	u32 sha_fw[8];
-};
-
-int ahab_release_rdc(u8 core_id, u8 xrdc, u32 *response);
-int ahab_auth_oem_ctnr(ulong ctnr_addr, u32 *response);
-int ahab_release_container(u32 *response);
-int ahab_verify_image(u32 img_id, u32 *response);
-int ahab_forward_lifecycle(u16 life_cycle, u32 *response);
-int ahab_write_fuse(u16 fuse_id, u32 fuse_val, bool lock, u32 *response);
-int ahab_read_common_fuse(u16 fuse_id, u32 *fuse_words, u32 fuse_num, u32 *response);
-int ahab_release_caam(u32 core_did, u32 *response);
-int ahab_get_fw_version(u32 *fw_version, u32 *sha1, u32 *response);
-int ahab_dump_buffer(u32 *buffer, u32 buffer_length);
-int ahab_get_info(struct sentinel_get_info_data *info, u32 *response);
-int ahab_get_fw_status(u32 *status, u32 *response);
-int ahab_release_m33_trout(void);
-
-#endif
diff --git a/arch/arm/mach-imx/imx8ulp/rdc.c b/arch/arm/mach-imx/imx8ulp/rdc.c
index e24eeff8a20..954a2d08ec6 100644
--- a/arch/arm/mach-imx/imx8ulp/rdc.c
+++ b/arch/arm/mach-imx/imx8ulp/rdc.c
@@ -9,7 +9,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/mu_hal.h>
-#include <asm/mach-imx/s400_api.h>
+#include <asm/mach-imx/ele_api.h>
 #include <asm/arch/rdc.h>
 #include <div64.h>
@@ -184,14 +184,14 @@ int xrdc_config_pdac(u32 bridge, u32 index, u32 dom, u32 perm)
 int release_rdc(enum rdc_type type)
 {
    ulong s_mu_base = 0x27020000UL;
-	struct sentinel_msg msg;
+	struct ele_msg msg;
    int ret;
    u32 rdc_id = (type == RDC_XRDC) ? 0x78 : 0x74;
-	msg.version = AHAB_VERSION;
-	msg.tag = AHAB_CMD_TAG;
+	msg.version = ELE_VERSION;
+	msg.tag = ELE_CMD_TAG;
    msg.size = 2;
-	msg.command = AHAB_RELEASE_RDC_REQ_CID;
+	msg.command = ELE_RELEASE_RDC_REQ_CID;
    msg.data[0] = (rdc_id << 8) | 0x2; /* A35 XRDC */
mu_hal_init(s_mu_base);
diff --git a/arch/arm/mach-imx/imx8ulp/soc.c b/arch/arm/mach-imx/imx8ulp/soc.c
index 5d95fb89a61..7d01bfcd8a8 100644
--- a/arch/arm/mach-imx/imx8ulp/soc.c
+++ b/arch/arm/mach-imx/imx8ulp/soc.c
@@ -14,7 +14,7 @@
 #include <event.h>
 #include <spl.h>
 #include <asm/arch/rdc.h>
-#include <asm/mach-imx/s400_api.h>
+#include <asm/mach-imx/ele_api.h>
 #include <asm/mach-imx/mu_hal.h>
 #include <cpu_func.h>
 #include <asm/setup.h>
@@ -517,9 +517,9 @@ void get_board_serial(struct tag_serialnr *serialnr)
    u32 res;
    int ret;
-	ret = ahab_read_common_fuse(1, uid, 4, &res);
+	ret = ele_read_common_fuse(1, uid, 4, &res);
    if (ret)
-		printf("ahab read fuse failed %d, 0x%x\n", ret, res);
+		printf("ele read fuse failed %d, 0x%x\n", ret, res);
    else
    	printf("UID 0x%x,0x%x,0x%x,0x%x\n", uid[0], uid[1], uid[2], uid[3]);
diff --git a/arch/arm/mach-imx/imx9/soc.c b/arch/arm/mach-imx/imx9/soc.c
index e857a3dc663..30361ccecd1 100644
--- a/arch/arm/mach-imx/imx9/soc.c
+++ b/arch/arm/mach-imx/imx9/soc.c
@@ -32,7 +32,7 @@
 #include <asm/setup.h>
 #include <asm/bootm.h>
 #include <asm/arch-imx/cpu.h>
-#include <asm/mach-imx/s400_api.h>
+#include <asm/mach-imx/ele_api.h>
 #include <fuse.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -151,7 +151,7 @@ u32 get_cpu_temp_grade(int *minc, int *maxc)
    return val;
 }
-static void set_cpu_info(struct sentinel_get_info_data *info)
+static void set_cpu_info(struct ele_get_info_data *info)
 {
    gd->arch.soc_rev = info->soc;
    gd->arch.lifecycle = info->lc;
@@ -642,7 +642,7 @@ int imx9_probe_mu(void *ctx, struct event *event)
    struct udevice *devp;
    int node, ret;
    u32 res;
-	struct sentinel_get_info_data info;
+	struct ele_get_info_data info;
node = fdt_node_offset_by_compatible(gd->fdt_blob, -1, "fsl,imx93-mu-s4");
@@ -653,7 +653,7 @@ int imx9_probe_mu(void *ctx, struct event *event)
    if (gd->flags & GD_FLG_RELOC)
    	return 0;
-	ret = ahab_get_info(&info, &res);
+	ret = ele_get_info(&info, &res);
    if (ret)
    	return ret;
@@ -849,7 +849,7 @@ int m33_prepare(void)
    	val = readl(&mix_regs->func_stat);
/* Release Sentinel TROUT */
-	ahab_release_m33_trout();
+	ele_release_m33_trout();
/* Mask WDOG1 IRQ from A55, we use it for M33 reset */
    setbits_le32(&s_regs->ca55_irq_mask[1], BIT(6));
diff --git a/arch/arm/mach-imx/imx9/trdc.c b/arch/arm/mach-imx/imx9/trdc.c
index 3f37ce712c0..938fe78eec6 100644
--- a/arch/arm/mach-imx/imx9/trdc.c
+++ b/arch/arm/mach-imx/imx9/trdc.c
@@ -10,7 +10,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <div64.h>
-#include <asm/mach-imx/s400_api.h>
+#include <asm/mach-imx/ele_api.h>
 #include <asm/mach-imx/mu_hal.h>
#define DID_NUM 16
@@ -315,7 +315,7 @@ bool trdc_mbc_enabled(ulong trdc_base)
 int release_rdc(u8 xrdc)
 {
    ulong s_mu_base = 0x47520000UL;
-	struct sentinel_msg msg;
+	struct ele_msg msg;
    int ret;
    u32 rdc_id;
@@ -336,10 +336,10 @@ int release_rdc(u8 xrdc)
    	return -EINVAL;
    }
-	msg.version = AHAB_VERSION;
-	msg.tag = AHAB_CMD_TAG;
+	msg.version = ELE_VERSION;
+	msg.tag = ELE_CMD_TAG;
    msg.size = 2;
-	msg.command = AHAB_RELEASE_RDC_REQ_CID;
+	msg.command = ELE_RELEASE_RDC_REQ_CID;
    msg.data[0] = (rdc_id << 8) | 0x2; /* A55 */
mu_hal_init(s_mu_base);
diff --git a/board/freescale/imx8ulp_evk/spl.c b/board/freescale/imx8ulp_evk/spl.c
index e672f6ee6cb..12e530c1ee2 100644
--- a/board/freescale/imx8ulp_evk/spl.c
+++ b/board/freescale/imx8ulp_evk/spl.c
@@ -19,7 +19,7 @@
 #include <asm/arch/ddr.h>
 #include <asm/arch/rdc.h>
 #include <asm/arch/upower.h>
-#include <asm/mach-imx/s400_api.h>
+#include <asm/mach-imx/ele_api.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -63,9 +63,9 @@ void display_ele_fw_version(void)
    u32 fw_version, sha1, res;
    int ret;
-	ret = ahab_get_fw_version(&fw_version, &sha1, &res);
+	ret = ele_get_fw_version(&fw_version, &sha1, &res);
    if (ret) {
-		printf("ahab get firmware version failed %d, 0x%x\n", ret, res);
+		printf("ele get firmware version failed %d, 0x%x\n", ret, res);
    } else {
    	printf("ELE firmware version %u.%u.%u-%x",
    	       (fw_version & (0x00ff0000)) >> 16,
@@ -122,9 +122,9 @@ void spl_board_init(void)
    set_lpav_qos();
/* Enable A35 access to the CAAM */
-	ret = ahab_release_caam(0x7, &res);
+	ret = ele_release_caam(0x7, &res);
    if (ret)
-		printf("ahab release caam failed %d, 0x%x\n", ret, res);
+		printf("ele release caam failed %d, 0x%x\n", ret, res);
 }
void board_init_f(ulong dummy)
diff --git a/board/freescale/imx93_evk/spl.c b/board/freescale/imx93_evk/spl.c
index 34debb62d73..c44dadcb5f0 100644
--- a/board/freescale/imx93_evk/spl.c
+++ b/board/freescale/imx93_evk/spl.c
@@ -20,7 +20,6 @@
 #include <asm/mach-imx/mxc_i2c.h>
 #include <asm/arch-mx7ulp/gpio.h>
 #include <asm/mach-imx/syscounter.h>
-#include <asm/mach-imx/s400_api.h>
 #include <dm/uclass.h>
 #include <dm/device.h>
 #include <dm/uclass-internal.h>
diff --git a/drivers/misc/sentinel/Makefile b/drivers/misc/sentinel/Makefile
index 446154cb201..f8d8c55f983 100644
--- a/drivers/misc/sentinel/Makefile
+++ b/drivers/misc/sentinel/Makefile
@@ -1,4 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0+
-obj-y += s400_api.o s4mu.o
+obj-y += ele_api.o ele_mu.o
 obj-$(CONFIG_CMD_FUSE) += fuse.o
diff --git a/drivers/misc/sentinel/s400_api.c b/drivers/misc/sentinel/ele_api.c
similarity index 69%
rename from drivers/misc/sentinel/s400_api.c
rename to drivers/misc/sentinel/ele_api.c
index 65032f77362..d9d37b7ea48 100644
--- a/drivers/misc/sentinel/s400_api.c
+++ b/drivers/misc/sentinel/ele_api.c
@@ -9,16 +9,16 @@
 #include <malloc.h>
 #include <asm/io.h>
 #include <dm.h>
-#include <asm/mach-imx/s400_api.h>
+#include <asm/mach-imx/ele_api.h>
 #include <misc.h>
DECLARE_GLOBAL_DATA_PTR;
-int ahab_release_rdc(u8 core_id, u8 xrdc, u32 *response)
+int ele_release_rdc(u8 core_id, u8 xrdc, u32 *response)
 {
    struct udevice *dev = gd->arch.s400_dev;
-	int size = sizeof(struct sentinel_msg);
-	struct sentinel_msg msg;
+	int size = sizeof(struct ele_msg);
+	struct ele_msg msg;
    int ret;
if (!dev) {
@@ -26,10 +26,10 @@ int ahab_release_rdc(u8 core_id, u8 xrdc, u32 *response)
    	return -ENODEV;
    }
-	msg.version = AHAB_VERSION;
-	msg.tag = AHAB_CMD_TAG;
+	msg.version = ELE_VERSION;
+	msg.tag = ELE_CMD_TAG;
    msg.size = 2;
-	msg.command = AHAB_RELEASE_RDC_REQ_CID;
+	msg.command = ELE_RELEASE_RDC_REQ_CID;
    switch (xrdc) {
    case 0:
    	msg.data[0] = (0x74 << 8) | core_id;
@@ -59,11 +59,11 @@ int ahab_release_rdc(u8 core_id, u8 xrdc, u32 *response)
    return ret;
 }
-int ahab_auth_oem_ctnr(ulong ctnr_addr, u32 *response)
+int ele_auth_oem_ctnr(ulong ctnr_addr, u32 *response)
 {
    struct udevice *dev = gd->arch.s400_dev;
-	int size = sizeof(struct sentinel_msg);
-	struct sentinel_msg msg;
+	int size = sizeof(struct ele_msg);
+	struct ele_msg msg;
    int ret;
if (!dev) {
@@ -71,10 +71,10 @@ int ahab_auth_oem_ctnr(ulong ctnr_addr, u32 *response)
    	return -ENODEV;
    }
-	msg.version = AHAB_VERSION;
-	msg.tag = AHAB_CMD_TAG;
+	msg.version = ELE_VERSION;
+	msg.tag = ELE_CMD_TAG;
    msg.size = 3;
-	msg.command = AHAB_AUTH_OEM_CTNR_CID;
+	msg.command = ELE_AUTH_OEM_CTNR_CID;
    msg.data[0] = upper_32_bits(ctnr_addr);
    msg.data[1] = lower_32_bits(ctnr_addr);
@@ -89,11 +89,11 @@ int ahab_auth_oem_ctnr(ulong ctnr_addr, u32 *response)
    return ret;
 }
-int ahab_release_container(u32 *response)
+int ele_release_container(u32 *response)
 {
    struct udevice *dev = gd->arch.s400_dev;
-	int size = sizeof(struct sentinel_msg);
-	struct sentinel_msg msg;
+	int size = sizeof(struct ele_msg);
+	struct ele_msg msg;
    int ret;
if (!dev) {
@@ -101,10 +101,10 @@ int ahab_release_container(u32 *response)
    	return -ENODEV;
    }
-	msg.version = AHAB_VERSION;
-	msg.tag = AHAB_CMD_TAG;
+	msg.version = ELE_VERSION;
+	msg.tag = ELE_CMD_TAG;
    msg.size = 1;
-	msg.command = AHAB_RELEASE_CTNR_CID;
+	msg.command = ELE_RELEASE_CTNR_CID;
ret = misc_call(dev, false, &msg, size, &msg, size);
    if (ret)
@@ -117,11 +117,11 @@ int ahab_release_container(u32 *response)
    return ret;
 }
-int ahab_verify_image(u32 img_id, u32 *response)
+int ele_verify_image(u32 img_id, u32 *response)
 {
    struct udevice *dev = gd->arch.s400_dev;
-	int size = sizeof(struct sentinel_msg);
-	struct sentinel_msg msg;
+	int size = sizeof(struct ele_msg);
+	struct ele_msg msg;
    int ret;
if (!dev) {
@@ -129,10 +129,10 @@ int ahab_verify_image(u32 img_id, u32 *response)
    	return -ENODEV;
    }
-	msg.version = AHAB_VERSION;
-	msg.tag = AHAB_CMD_TAG;
+	msg.version = ELE_VERSION;
+	msg.tag = ELE_CMD_TAG;
    msg.size = 2;
-	msg.command = AHAB_VERIFY_IMG_CID;
+	msg.command = ELE_VERIFY_IMG_CID;
    msg.data[0] = 1 << img_id;
ret = misc_call(dev, false, &msg, size, &msg, size);
@@ -146,11 +146,11 @@ int ahab_verify_image(u32 img_id, u32 *response)
    return ret;
 }
-int ahab_forward_lifecycle(u16 life_cycle, u32 *response)
+int ele_forward_lifecycle(u16 life_cycle, u32 *response)
 {
    struct udevice *dev = gd->arch.s400_dev;
-	int size = sizeof(struct sentinel_msg);
-	struct sentinel_msg msg;
+	int size = sizeof(struct ele_msg);
+	struct ele_msg msg;
    int ret;
if (!dev) {
@@ -158,10 +158,10 @@ int ahab_forward_lifecycle(u16 life_cycle, u32 *response)
    	return -ENODEV;
    }
-	msg.version = AHAB_VERSION;
-	msg.tag = AHAB_CMD_TAG;
+	msg.version = ELE_VERSION;
+	msg.tag = ELE_CMD_TAG;
    msg.size = 2;
-	msg.command = AHAB_FWD_LIFECYCLE_UP_REQ_CID;
+	msg.command = ELE_FWD_LIFECYCLE_UP_REQ_CID;
    msg.data[0] = life_cycle;
ret = misc_call(dev, false, &msg, size, &msg, size);
@@ -175,11 +175,11 @@ int ahab_forward_lifecycle(u16 life_cycle, u32 *response)
    return ret;
 }
-int ahab_read_common_fuse(u16 fuse_id, u32 *fuse_words, u32 fuse_num, u32 *response)
+int ele_read_common_fuse(u16 fuse_id, u32 *fuse_words, u32 fuse_num, u32 *response)
 {
    struct udevice *dev = gd->arch.s400_dev;
-	int size = sizeof(struct sentinel_msg);
-	struct sentinel_msg msg;
+	int size = sizeof(struct ele_msg);
+	struct ele_msg msg;
    int ret;
if (!dev) {
@@ -198,10 +198,10 @@ int ahab_read_common_fuse(u16 fuse_id, u32 *fuse_words, u32 fuse_num, u32 *respo
    	return -EINVAL;
    }
-	msg.version = AHAB_VERSION;
-	msg.tag = AHAB_CMD_TAG;
+	msg.version = ELE_VERSION;
+	msg.tag = ELE_CMD_TAG;
    msg.size = 2;
-	msg.command = AHAB_READ_FUSE_REQ_CID;
+	msg.command = ELE_READ_FUSE_REQ_CID;
    msg.data[0] = fuse_id;
ret = misc_call(dev, false, &msg, size, &msg, size);
@@ -223,11 +223,11 @@ int ahab_read_common_fuse(u16 fuse_id, u32 *fuse_words, u32 fuse_num, u32 *respo
    return ret;
 }
-int ahab_write_fuse(u16 fuse_id, u32 fuse_val, bool lock, u32 *response)
+int ele_write_fuse(u16 fuse_id, u32 fuse_val, bool lock, u32 *response)
 {
    struct udevice *dev = gd->arch.s400_dev;
-	int size = sizeof(struct sentinel_msg);
-	struct sentinel_msg msg;
+	int size = sizeof(struct ele_msg);
+	struct ele_msg msg;
    int ret;
if (!dev) {
@@ -235,10 +235,10 @@ int ahab_write_fuse(u16 fuse_id, u32 fuse_val, bool lock, u32 *response)
    	return -ENODEV;
    }
-	msg.version = AHAB_VERSION;
-	msg.tag = AHAB_CMD_TAG;
+	msg.version = ELE_VERSION;
+	msg.tag = ELE_CMD_TAG;
    msg.size = 3;
-	msg.command = AHAB_WRITE_FUSE_REQ_CID;
+	msg.command = ELE_WRITE_FUSE_REQ_CID;
    msg.data[0] = (32 << 16) | (fuse_id << 5);
    if (lock)
    	msg.data[0] |= (1 << 31);
@@ -256,11 +256,11 @@ int ahab_write_fuse(u16 fuse_id, u32 fuse_val, bool lock, u32 *response)
    return ret;
 }
-int ahab_release_caam(u32 core_did, u32 *response)
+int ele_release_caam(u32 core_did, u32 *response)
 {
    struct udevice *dev = gd->arch.s400_dev;
-	int size = sizeof(struct sentinel_msg);
-	struct sentinel_msg msg;
+	int size = sizeof(struct ele_msg);
+	struct ele_msg msg;
    int ret;
if (!dev) {
@@ -268,10 +268,10 @@ int ahab_release_caam(u32 core_did, u32 *response)
    	return -ENODEV;
    }
-	msg.version = AHAB_VERSION;
-	msg.tag = AHAB_CMD_TAG;
+	msg.version = ELE_VERSION;
+	msg.tag = ELE_CMD_TAG;
    msg.size = 2;
-	msg.command = AHAB_CAAM_RELEASE_CID;
+	msg.command = ELE_CAAM_RELEASE_CID;
    msg.data[0] = core_did;
ret = misc_call(dev, false, &msg, size, &msg, size);
@@ -285,11 +285,11 @@ int ahab_release_caam(u32 core_did, u32 *response)
    return ret;
 }
-int ahab_get_fw_version(u32 *fw_version, u32 *sha1, u32 *response)
+int ele_get_fw_version(u32 *fw_version, u32 *sha1, u32 *response)
 {
    struct udevice *dev = gd->arch.s400_dev;
-	int size = sizeof(struct sentinel_msg);
-	struct sentinel_msg msg;
+	int size = sizeof(struct ele_msg);
+	struct ele_msg msg;
    int ret;
if (!dev) {
@@ -307,10 +307,10 @@ int ahab_get_fw_version(u32 *fw_version, u32 *sha1, u32 *response)
    	return -EINVAL;
    }
-	msg.version = AHAB_VERSION;
-	msg.tag = AHAB_CMD_TAG;
+	msg.version = ELE_VERSION;
+	msg.tag = ELE_CMD_TAG;
    msg.size = 1;
-	msg.command = AHAB_GET_FW_VERSION_CID;
+	msg.command = ELE_GET_FW_VERSION_CID;
ret = misc_call(dev, false, &msg, size, &msg, size);
    if (ret)
@@ -326,11 +326,11 @@ int ahab_get_fw_version(u32 *fw_version, u32 *sha1, u32 *response)
    return ret;
 }
-int ahab_dump_buffer(u32 *buffer, u32 buffer_length)
+int ele_dump_buffer(u32 *buffer, u32 buffer_length)
 {
    struct udevice *dev = gd->arch.s400_dev;
-	int size = sizeof(struct sentinel_msg);
-	struct sentinel_msg msg;
+	int size = sizeof(struct ele_msg);
+	struct ele_msg msg;
    int ret, i = 0;
if (!dev) {
@@ -338,10 +338,10 @@ int ahab_dump_buffer(u32 *buffer, u32 buffer_length)
    	return -ENODEV;
    }
-	msg.version = AHAB_VERSION;
-	msg.tag = AHAB_CMD_TAG;
+	msg.version = ELE_VERSION;
+	msg.tag = ELE_CMD_TAG;
    msg.size = 1;
-	msg.command = AHAB_LOG_CID;
+	msg.command = ELE_LOG_CID;
ret = misc_call(dev, false, &msg, size, &msg, size);
    if (ret) {
@@ -360,11 +360,11 @@ int ahab_dump_buffer(u32 *buffer, u32 buffer_length)
    return i;
 }
-int ahab_get_info(struct sentinel_get_info_data *info, u32 *response)
+int ele_get_info(struct ele_get_info_data *info, u32 *response)
 {
    struct udevice *dev = gd->arch.s400_dev;
-	int size = sizeof(struct sentinel_msg);
-	struct sentinel_msg msg;
+	int size = sizeof(struct ele_msg);
+	struct ele_msg msg;
    int ret;
if (!dev) {
@@ -372,13 +372,13 @@ int ahab_get_info(struct sentinel_get_info_data *info, u32 *response)
    	return -ENODEV;
    }
-	msg.version = AHAB_VERSION;
-	msg.tag = AHAB_CMD_TAG;
+	msg.version = ELE_VERSION;
+	msg.tag = ELE_CMD_TAG;
    msg.size = 4;
-	msg.command = AHAB_GET_INFO_CID;
+	msg.command = ELE_GET_INFO_CID;
    msg.data[0] = upper_32_bits((ulong)info);
    msg.data[1] = lower_32_bits((ulong)info);
-	msg.data[2] = sizeof(struct sentinel_get_info_data);
+	msg.data[2] = sizeof(struct ele_get_info_data);
ret = misc_call(dev, false, &msg, size, &msg, size);
    if (ret)
@@ -391,11 +391,11 @@ int ahab_get_info(struct sentinel_get_info_data *info, u32 *response)
    return ret;
 }
-int ahab_get_fw_status(u32 *status, u32 *response)
+int ele_get_fw_status(u32 *status, u32 *response)
 {
    struct udevice *dev = gd->arch.s400_dev;
-	int size = sizeof(struct sentinel_msg);
-	struct sentinel_msg msg;
+	int size = sizeof(struct ele_msg);
+	struct ele_msg msg;
    int ret;
if (!dev) {
@@ -403,10 +403,10 @@ int ahab_get_fw_status(u32 *status, u32 *response)
    	return -ENODEV;
    }
-	msg.version = AHAB_VERSION;
-	msg.tag = AHAB_CMD_TAG;
+	msg.version = ELE_VERSION;
+	msg.tag = ELE_CMD_TAG;
    msg.size = 1;
-	msg.command = AHAB_GET_FW_STATUS_CID;
+	msg.command = ELE_GET_FW_STATUS_CID;
ret = misc_call(dev, false, &msg, size, &msg, size);
    if (ret)
@@ -421,11 +421,11 @@ int ahab_get_fw_status(u32 *status, u32 *response)
    return ret;
 }
-int ahab_release_m33_trout(void)
+int ele_release_m33_trout(void)
 {
    struct udevice *dev = gd->arch.s400_dev;
-	int size = sizeof(struct sentinel_msg);
-	struct sentinel_msg msg;
+	int size = sizeof(struct ele_msg);
+	struct ele_msg msg;
    int ret;
if (!dev) {
@@ -433,8 +433,8 @@ int ahab_release_m33_trout(void)
    	return -ENODEV;
    }
-	msg.version = AHAB_VERSION;
-	msg.tag = AHAB_CMD_TAG;
+	msg.version = ELE_VERSION;
+	msg.tag = ELE_CMD_TAG;
    msg.size = 1;
    msg.command = 0xd3;
diff --git a/drivers/misc/sentinel/s4mu.c b/drivers/misc/sentinel/ele_mu.c
similarity index 95%
rename from drivers/misc/sentinel/s4mu.c
rename to drivers/misc/sentinel/ele_mu.c
index 794fc40c620..63373ea614f 100644
--- a/drivers/misc/sentinel/s4mu.c
+++ b/drivers/misc/sentinel/ele_mu.c
@@ -9,7 +9,7 @@
 #include <dm/lists.h>
 #include <dm/root.h>
 #include <dm/device-internal.h>
-#include <asm/mach-imx/s400_api.h>
+#include <asm/mach-imx/ele_api.h>
 #include <asm/arch/imx-regs.h>
 #include <linux/iopoll.h>
 #include <misc.h>
@@ -85,7 +85,7 @@ int mu_hal_receivemsg(ulong base, u32 reg_index, u32 *msg)
static int imx8ulp_mu_read(struct mu_type *base, void *data)
 {
-	struct sentinel_msg *msg = (struct sentinel_msg *)data;
+	struct ele_msg *msg = (struct ele_msg *)data;
    int ret;
    u8 count = 0;
@@ -118,7 +118,7 @@ static int imx8ulp_mu_read(struct mu_type *base, void *data)
static int imx8ulp_mu_write(struct mu_type *base, void *data)
 {
-	struct sentinel_msg *msg = (struct sentinel_msg *)data;
+	struct ele_msg *msg = (struct ele_msg *)data;
    int ret;
    u8 count = 0;
@@ -171,7 +171,7 @@ static int imx8ulp_mu_call(struct udevice *dev, int no_resp, void *tx_msg,
    		return ret;
    }
-	result = ((struct sentinel_msg *)rx_msg)->data[0];
+	result = ((struct ele_msg *)rx_msg)->data[0];
    if ((result & 0xff) == 0xd6)
    	return 0;
diff --git a/drivers/misc/sentinel/fuse.c b/drivers/misc/sentinel/fuse.c
index e2b68757664..4185a524a5f 100644
--- a/drivers/misc/sentinel/fuse.c
+++ b/drivers/misc/sentinel/fuse.c
@@ -10,7 +10,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/imx-regs.h>
 #include <env.h>
-#include <asm/mach-imx/s400_api.h>
+#include <asm/mach-imx/ele_api.h>
 #include <asm/global_data.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -197,7 +197,7 @@ int fuse_sense(u32 bank, u32 word, u32 *val)
    	if (word_index != 1)
    		size = 1;
-		ret = ahab_read_common_fuse(word_index, data, size, &res);
+		ret = ele_read_common_fuse(word_index, data, size, &res);
    	if (ret) {
    		printf("ahab read fuse failed %d, 0x%x\n", ret, res);
    		return ret;
@@ -246,7 +246,7 @@ int fuse_sense(u32 bank, u32 word, u32 *val)
    	u32 res, size = 1;
    	int ret;
-		ret = ahab_read_common_fuse(word_index, &data, size, &res);
+		ret = ele_read_common_fuse(word_index, &data, size, &res);
    	if (ret) {
    		printf("ahab read fuse failed %d, 0x%x\n", ret, res);
    		return ret;
@@ -274,7 +274,7 @@ int fuse_prog(u32 bank, u32 word, u32 val)
    if (bank >= FUSE_BANKS || word >= WORDS_PER_BANKS || !val)
    	return -EINVAL;
-	ret = ahab_write_fuse((bank * 8 + word), val, false, &res);
+	ret = ele_write_fuse((bank * 8 + word), val, false, &res);
    if (ret) {
    	printf("ahab write fuse failed %d, 0x%x\n", ret, res);
    	return ret;
-- 
2.36.0


    

[PATCH 20/41] imx: rename s400 api to ele

Peng Fan (OSS)