misc: imx: S400_API: Move S400 MU and API to a common place

Since iMX9 uses S401 which shares the API with iMX8ULP. So move S400
MU driver and API to a common place and selected by CONFIG_IMX_SENTINEL

Signed-off-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>

4 files changed, 1 insertions, 584 deletions

diff --git a/drivers/misc/imx8ulp/Makefile b/drivers/misc/imx8ulp/Makefile
index 927cc55216..450e615e64 100644
--- a/drivers/misc/imx8ulp/Makefile
+++ b/drivers/misc/imx8ulp/Makefile
@@ -1,4 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0+
 
-obj-y += s400_api.o imx8ulp_mu.o
 obj-$(CONFIG_CMD_FUSE) += fuse.o
diff --git a/drivers/misc/imx8ulp/fuse.c b/drivers/misc/imx8ulp/fuse.c
index 090e702d9f..83d2c25731 100644
--- a/drivers/misc/imx8ulp/fuse.c
+++ b/drivers/misc/imx8ulp/fuse.c
@@ -10,7 +10,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/imx-regs.h>
 #include <env.h>
-#include <asm/arch/s400_api.h>
+#include <asm/mach-imx/s400_api.h>
 #include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/misc/imx8ulp/imx8ulp_mu.c b/drivers/misc/imx8ulp/imx8ulp_mu.c
deleted file mode 100644
index 333ebdf576..0000000000
--- a/drivers/misc/imx8ulp/imx8ulp_mu.c
+++ /dev/null
@@ -1,234 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright 2020 NXP
- */
-
-#include <common.h>
-#include <asm/io.h>
-#include <dm.h>
-#include <dm/lists.h>
-#include <dm/root.h>
-#include <dm/device-internal.h>
-#include <asm/arch/s400_api.h>
-#include <asm/arch/imx-regs.h>
-#include <linux/iopoll.h>
-#include <misc.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-struct imx8ulp_mu {
-	struct mu_type *base;
-};
-
-#define MU_SR_TE0_MASK		BIT(0)
-#define MU_SR_RF0_MASK		BIT(0)
-#define MU_TR_COUNT		4
-#define MU_RR_COUNT		4
-
-void mu_hal_init(ulong base)
-{
-	struct mu_type *mu_base = (struct mu_type *)base;
-
-	writel(0, &mu_base->tcr);
-	writel(0, &mu_base->rcr);
-}
-
-int mu_hal_sendmsg(ulong base, u32 reg_index, u32 msg)
-{
-	struct mu_type *mu_base = (struct mu_type *)base;
-	u32 mask = MU_SR_TE0_MASK << reg_index;
-	u32 val;
-	int ret;
-
-	assert(reg_index < MU_TR_COUNT);
-
-	debug("sendmsg sr 0x%x\n", readl(&mu_base->sr));
-
-	/* Wait TX register to be empty. */
-	ret = readl_poll_timeout(&mu_base->tsr, val, val & mask, 10000);
-	if (ret < 0) {
-		debug("%s timeout\n", __func__);
-		return -ETIMEDOUT;
-	}
-
-	debug("tr[%d] 0x%x\n", reg_index, msg);
-
-	writel(msg, &mu_base->tr[reg_index]);
-
-	return 0;
-}
-
-int mu_hal_receivemsg(ulong base, u32 reg_index, u32 *msg)
-{
-	struct mu_type *mu_base = (struct mu_type *)base;
-	u32 mask = MU_SR_RF0_MASK << reg_index;
-	u32 val;
-	int ret;
-
-	assert(reg_index < MU_TR_COUNT);
-
-	debug("receivemsg sr 0x%x\n", readl(&mu_base->sr));
-
-	/* Wait RX register to be full. */
-	ret = readl_poll_timeout(&mu_base->rsr, val, val & mask, 10000);
-	if (ret < 0) {
-		debug("%s timeout\n", __func__);
-		return -ETIMEDOUT;
-	}
-
-	*msg = readl(&mu_base->rr[reg_index]);
-
-	debug("rr[%d] 0x%x\n", reg_index, *msg);
-
-	return 0;
-}
-
-static int imx8ulp_mu_read(struct mu_type *base, void *data)
-{
-	struct imx8ulp_s400_msg *msg = (struct imx8ulp_s400_msg *)data;
-	int ret;
-	u8 count = 0;
-
-	if (!msg)
-		return -EINVAL;
-
-	/* Read first word */
-	ret = mu_hal_receivemsg((ulong)base, 0, (u32 *)msg);
-	if (ret)
-		return ret;
-	count++;
-
-	/* Check size */
-	if (msg->size > S400_MAX_MSG) {
-		*((u32 *)msg) = 0;
-		return -EINVAL;
-	}
-
-	/* Read remaining words */
-	while (count < msg->size) {
-		ret = mu_hal_receivemsg((ulong)base, count % MU_RR_COUNT,
-					&msg->data[count - 1]);
-		if (ret)
-			return ret;
-		count++;
-	}
-
-	return 0;
-}
-
-static int imx8ulp_mu_write(struct mu_type *base, void *data)
-{
-	struct imx8ulp_s400_msg *msg = (struct imx8ulp_s400_msg *)data;
-	int ret;
-	u8 count = 0;
-
-	if (!msg)
-		return -EINVAL;
-
-	/* Check size */
-	if (msg->size > S400_MAX_MSG)
-		return -EINVAL;
-
-	/* Write first word */
-	ret = mu_hal_sendmsg((ulong)base, 0, *((u32 *)msg));
-	if (ret)
-		return ret;
-	count++;
-
-	/* Write remaining words */
-	while (count < msg->size) {
-		ret = mu_hal_sendmsg((ulong)base, count % MU_TR_COUNT,
-				     msg->data[count - 1]);
-		if (ret)
-			return ret;
-		count++;
-	}
-
-	return 0;
-}
-
-/*
- * Note the function prototype use msgid as the 2nd parameter, here
- * we take it as no_resp.
- */
-static int imx8ulp_mu_call(struct udevice *dev, int no_resp, void *tx_msg,
-			   int tx_size, void *rx_msg, int rx_size)
-{
-	struct imx8ulp_mu *priv = dev_get_priv(dev);
-	u32 result;
-	int ret;
-
-	/* Expect tx_msg, rx_msg are the same value */
-	if (rx_msg && tx_msg != rx_msg)
-		printf("tx_msg %p, rx_msg %p\n", tx_msg, rx_msg);
-
-	ret = imx8ulp_mu_write(priv->base, tx_msg);
-	if (ret)
-		return ret;
-	if (!no_resp) {
-		ret = imx8ulp_mu_read(priv->base, rx_msg);
-		if (ret)
-			return ret;
-	}
-
-	result = ((struct imx8ulp_s400_msg *)rx_msg)->data[0];
-	if ((result & 0xff) == 0xd6)
-		return 0;
-
-	return -EIO;
-}
-
-static int imx8ulp_mu_probe(struct udevice *dev)
-{
-	struct imx8ulp_mu *priv = dev_get_priv(dev);
-	fdt_addr_t addr;
-
-	debug("%s(dev=%p) (priv=%p)\n", __func__, dev, priv);
-
-	addr = devfdt_get_addr(dev);
-	if (addr == FDT_ADDR_T_NONE)
-		return -EINVAL;
-
-	priv->base = (struct mu_type *)addr;
-
-	debug("mu base 0x%lx\n", (ulong)priv->base);
-
-	/* U-Boot not enable interrupts, so need to enable RX interrupts */
-	mu_hal_init((ulong)priv->base);
-
-	gd->arch.s400_dev = dev;
-
-	return 0;
-}
-
-static int imx8ulp_mu_remove(struct udevice *dev)
-{
-	return 0;
-}
-
-static int imx8ulp_mu_bind(struct udevice *dev)
-{
-	debug("%s(dev=%p)\n", __func__, dev);
-
-	return 0;
-}
-
-static struct misc_ops imx8ulp_mu_ops = {
-	.call = imx8ulp_mu_call,
-};
-
-static const struct udevice_id imx8ulp_mu_ids[] = {
-	{ .compatible = "fsl,imx8ulp-mu" },
-	{ }
-};
-
-U_BOOT_DRIVER(imx8ulp_mu) = {
-	.name		= "imx8ulp_mu",
-	.id		= UCLASS_MISC,
-	.of_match	= imx8ulp_mu_ids,
-	.probe		= imx8ulp_mu_probe,
-	.bind		= imx8ulp_mu_bind,
-	.remove		= imx8ulp_mu_remove,
-	.ops		= &imx8ulp_mu_ops,
-	.priv_auto	= sizeof(struct imx8ulp_mu),
-};
diff --git a/drivers/misc/imx8ulp/s400_api.c b/drivers/misc/imx8ulp/s400_api.c
deleted file mode 100644
index 87f5880ccb..0000000000
--- a/drivers/misc/imx8ulp/s400_api.c
+++ /dev/null
@@ -1,348 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright 2020 NXP
- *
- */
-
-#include <common.h>
-#include <hang.h>
-#include <malloc.h>
-#include <asm/io.h>
-#include <dm.h>
-#include <asm/arch/s400_api.h>
-#include <misc.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-int ahab_release_rdc(u8 core_id, bool xrdc, u32 *response)
-{
-	struct udevice *dev = gd->arch.s400_dev;
-	int size = sizeof(struct imx8ulp_s400_msg);
-	struct imx8ulp_s400_msg msg;
-	int ret;
-
-	if (!dev) {
-		printf("s400 dev is not initialized\n");
-		return -ENODEV;
-	}
-
-	msg.version = AHAB_VERSION;
-	msg.tag = AHAB_CMD_TAG;
-	msg.size = 2;
-	msg.command = AHAB_RELEASE_RDC_REQ_CID;
-	if (xrdc)
-		msg.data[0] = (0x78 << 8) | core_id;
-	else
-		msg.data[0] = (0x74 << 8) | core_id;
-
-	ret = misc_call(dev, false, &msg, size, &msg, size);
-	if (ret)
-		printf("Error: %s: ret %d, core id %u, response 0x%x\n",
-		       __func__, ret, core_id, msg.data[0]);
-
-	if (response)
-		*response = msg.data[0];
-
-	return ret;
-}
-
-int ahab_auth_oem_ctnr(ulong ctnr_addr, u32 *response)
-{
-	struct udevice *dev = gd->arch.s400_dev;
-	int size = sizeof(struct imx8ulp_s400_msg);
-	struct imx8ulp_s400_msg msg;
-	int ret;
-
-	if (!dev) {
-		printf("s400 dev is not initialized\n");
-		return -ENODEV;
-	}
-
-	msg.version = AHAB_VERSION;
-	msg.tag = AHAB_CMD_TAG;
-	msg.size = 3;
-	msg.command = AHAB_AUTH_OEM_CTNR_CID;
-	msg.data[0] = upper_32_bits(ctnr_addr);
-	msg.data[1] = lower_32_bits(ctnr_addr);
-
-	ret = misc_call(dev, false, &msg, size, &msg, size);
-	if (ret)
-		printf("Error: %s: ret %d, cntr_addr 0x%lx, response 0x%x\n",
-		       __func__, ret, ctnr_addr, msg.data[0]);
-
-	if (response)
-		*response = msg.data[0];
-
-	return ret;
-}
-
-int ahab_release_container(u32 *response)
-{
-	struct udevice *dev = gd->arch.s400_dev;
-	int size = sizeof(struct imx8ulp_s400_msg);
-	struct imx8ulp_s400_msg msg;
-	int ret;
-
-	if (!dev) {
-		printf("s400 dev is not initialized\n");
-		return -ENODEV;
-	}
-
-	msg.version = AHAB_VERSION;
-	msg.tag = AHAB_CMD_TAG;
-	msg.size = 1;
-	msg.command = AHAB_RELEASE_CTNR_CID;
-
-	ret = misc_call(dev, false, &msg, size, &msg, size);
-	if (ret)
-		printf("Error: %s: ret %d, response 0x%x\n",
-		       __func__, ret, msg.data[0]);
-
-	if (response)
-		*response = msg.data[0];
-
-	return ret;
-}
-
-int ahab_verify_image(u32 img_id, u32 *response)
-{
-	struct udevice *dev = gd->arch.s400_dev;
-	int size = sizeof(struct imx8ulp_s400_msg);
-	struct imx8ulp_s400_msg msg;
-	int ret;
-
-	if (!dev) {
-		printf("s400 dev is not initialized\n");
-		return -ENODEV;
-	}
-
-	msg.version = AHAB_VERSION;
-	msg.tag = AHAB_CMD_TAG;
-	msg.size = 2;
-	msg.command = AHAB_VERIFY_IMG_CID;
-	msg.data[0] = 1 << img_id;
-
-	ret = misc_call(dev, false, &msg, size, &msg, size);
-	if (ret)
-		printf("Error: %s: ret %d, img_id %u, response 0x%x\n",
-		       __func__, ret, img_id, msg.data[0]);
-
-	if (response)
-		*response = msg.data[0];
-
-	return ret;
-}
-
-int ahab_forward_lifecycle(u16 life_cycle, u32 *response)
-{
-	struct udevice *dev = gd->arch.s400_dev;
-	int size = sizeof(struct imx8ulp_s400_msg);
-	struct imx8ulp_s400_msg msg;
-	int ret;
-
-	if (!dev) {
-		printf("s400 dev is not initialized\n");
-		return -ENODEV;
-	}
-
-	msg.version = AHAB_VERSION;
-	msg.tag = AHAB_CMD_TAG;
-	msg.size = 2;
-	msg.command = AHAB_FWD_LIFECYCLE_UP_REQ_CID;
-	msg.data[0] = life_cycle;
-
-	ret = misc_call(dev, false, &msg, size, &msg, size);
-	if (ret)
-		printf("Error: %s: ret %d, life_cycle 0x%x, response 0x%x\n",
-		       __func__, ret, life_cycle, msg.data[0]);
-
-	if (response)
-		*response = msg.data[0];
-
-	return ret;
-}
-
-int ahab_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 imx8ulp_s400_msg);
-	struct imx8ulp_s400_msg msg;
-	int ret;
-
-	if (!dev) {
-		printf("s400 dev is not initialized\n");
-		return -ENODEV;
-	}
-
-	if (!fuse_words) {
-		printf("Invalid parameters for fuse read\n");
-		return -EINVAL;
-	}
-
-	if ((fuse_id != 1 && fuse_num != 1) ||
-	    (fuse_id == 1 && fuse_num != 4)) {
-		printf("Invalid fuse number parameter\n");
-		return -EINVAL;
-	}
-
-	msg.version = AHAB_VERSION;
-	msg.tag = AHAB_CMD_TAG;
-	msg.size = 2;
-	msg.command = AHAB_READ_FUSE_REQ_CID;
-	msg.data[0] = fuse_id;
-
-	ret = misc_call(dev, false, &msg, size, &msg, size);
-	if (ret)
-		printf("Error: %s: ret %d, fuse_id 0x%x, response 0x%x\n",
-		       __func__, ret, fuse_id, msg.data[0]);
-
-	if (response)
-		*response = msg.data[0];
-
-	fuse_words[0] = msg.data[1];
-	if (fuse_id == 1) {
-		/* OTP_UNIQ_ID */
-		fuse_words[1] = msg.data[2];
-		fuse_words[2] = msg.data[3];
-		fuse_words[3] = msg.data[4];
-	}
-
-	return ret;
-}
-
-int ahab_write_fuse(u16 fuse_id, u32 fuse_val, bool lock, u32 *response)
-{
-	struct udevice *dev = gd->arch.s400_dev;
-	int size = sizeof(struct imx8ulp_s400_msg);
-	struct imx8ulp_s400_msg msg;
-	int ret;
-
-	if (!dev) {
-		printf("s400 dev is not initialized\n");
-		return -ENODEV;
-	}
-
-	msg.version = AHAB_VERSION;
-	msg.tag = AHAB_CMD_TAG;
-	msg.size = 3;
-	msg.command = AHAB_WRITE_FUSE_REQ_CID;
-	msg.data[0] = (32 << 16) | (fuse_id << 5);
-	if (lock)
-		msg.data[0] |= (1 << 31);
-
-	msg.data[1] = fuse_val;
-
-	ret = misc_call(dev, false, &msg, size, &msg, size);
-	if (ret)
-		printf("Error: %s: ret %d, fuse_id 0x%x, response 0x%x\n",
-		       __func__, ret, fuse_id, msg.data[0]);
-
-	if (response)
-		*response = msg.data[0];
-
-	return ret;
-}
-
-int ahab_release_caam(u32 core_did, u32 *response)
-{
-	struct udevice *dev = gd->arch.s400_dev;
-	int size = sizeof(struct imx8ulp_s400_msg);
-	struct imx8ulp_s400_msg msg;
-	int ret;
-
-	if (!dev) {
-		printf("s400 dev is not initialized\n");
-		return -ENODEV;
-	}
-
-	msg.version = AHAB_VERSION;
-	msg.tag = AHAB_CMD_TAG;
-	msg.size = 2;
-	msg.command = AHAB_CAAM_RELEASE_CID;
-	msg.data[0] = core_did;
-
-	ret = misc_call(dev, false, &msg, size, &msg, size);
-	if (ret)
-		printf("Error: %s: ret %d, response 0x%x\n",
-		       __func__, ret, msg.data[0]);
-
-	if (response)
-		*response = msg.data[0];
-
-	return ret;
-}
-
-int ahab_get_fw_version(u32 *fw_version, u32 *sha1, u32 *response)
-{
-	struct udevice *dev = gd->arch.s400_dev;
-	int size = sizeof(struct imx8ulp_s400_msg);
-	struct imx8ulp_s400_msg msg;
-	int ret;
-
-	if (!dev) {
-		printf("s400 dev is not initialized\n");
-		return -ENODEV;
-	}
-
-	if (!fw_version) {
-		printf("Invalid parameters for f/w version read\n");
-		return -EINVAL;
-	}
-
-	if (!sha1) {
-		printf("Invalid parameters for commit sha1\n");
-		return -EINVAL;
-	}
-
-	msg.version = AHAB_VERSION;
-	msg.tag = AHAB_CMD_TAG;
-	msg.size = 1;
-	msg.command = AHAB_GET_FW_VERSION_CID;
-
-	ret = misc_call(dev, false, &msg, size, &msg, size);
-	if (ret)
-		printf("Error: %s: ret %d, response 0x%x\n",
-		       __func__, ret, msg.data[0]);
-
-	if (response)
-		*response = msg.data[0];
-
-	*fw_version = msg.data[1];
-	*sha1 = msg.data[2];
-
-	return ret;
-}
-
-int ahab_dump_buffer(u32 *buffer, u32 buffer_length)
-{
-	struct udevice *dev = gd->arch.s400_dev;
-	int size = sizeof(struct imx8ulp_s400_msg);
-	struct imx8ulp_s400_msg msg;
-	int ret, i = 0;
-
-	if (!dev) {
-		printf("s400 dev is not initialized\n");
-		return -ENODEV;
-	}
-
-	msg.version = AHAB_VERSION;
-	msg.tag = AHAB_CMD_TAG;
-	msg.size = 1;
-	msg.command = AHAB_LOG_CID;
-
-	ret = misc_call(dev, false, &msg, size, &msg, size);
-	if (ret) {
-		printf("Error: %s: ret %d, response 0x%x\n",
-		       __func__, ret, msg.data[0]);
-
-		return ret;
-	}
-
-	if (buffer) {
-		buffer[i++] = *(u32 *)&msg; /* Need dump the response header */
-		for (; i < buffer_length && i < msg.size; i++)
-			buffer[i] = msg.data[i - 1];
-	}
-
-	return i;
-}