| Message ID | 20250327-imx-se-if-v14-5-2219448932e4@nxp.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | v14: firmware: imx: driver for NXP secure-enclave | expand |
On Thu, Mar 27, 2025 at 12:08:01AM +0530, Pankaj Gupta wrote: > Add priv_dev_ctx to prepare enabling misc-device context > based send-receive path, to communicate with FW. > > No functionality change. > > Signed-off-by: Pankaj Gupta <pankaj.gupta@nxp.com> > --- Reviewed-by: Frank Li <Frank.Li@nxp.com> > drivers/firmware/imx/ele_base_msg.c | 10 +++++----- > drivers/firmware/imx/ele_common.c | 3 ++- > drivers/firmware/imx/ele_common.h | 2 +- > drivers/firmware/imx/se_ctrl.c | 31 +++++++++++++++++++++++++++++++ > drivers/firmware/imx/se_ctrl.h | 8 ++++++++ > 5 files changed, 47 insertions(+), 7 deletions(-) > > diff --git a/drivers/firmware/imx/ele_base_msg.c b/drivers/firmware/imx/ele_base_msg.c > index 3839c93f8212..c07c21f1fbbd 100644 > --- a/drivers/firmware/imx/ele_base_msg.c > +++ b/drivers/firmware/imx/ele_base_msg.c > @@ -62,7 +62,7 @@ int ele_get_info(struct se_if_priv *priv, struct ele_dev_info *s_info) > tx_msg->data[0] = upper_32_bits(get_info_addr); > tx_msg->data[1] = lower_32_bits(get_info_addr); > tx_msg->data[2] = sizeof(*s_info); > - ret = ele_msg_send_rcv(priv, > + ret = ele_msg_send_rcv(priv->priv_dev_ctx, > tx_msg, > ELE_GET_INFO_REQ_MSG_SZ, > rx_msg, > @@ -122,7 +122,7 @@ int ele_ping(struct se_if_priv *priv) > return ret; > } > > - ret = ele_msg_send_rcv(priv, > + ret = ele_msg_send_rcv(priv->priv_dev_ctx, > tx_msg, > ELE_PING_REQ_SZ, > rx_msg, > @@ -174,7 +174,7 @@ int ele_service_swap(struct se_if_priv *priv, > if (!tx_msg->data[4]) > return -EINVAL; > > - ret = ele_msg_send_rcv(priv, > + ret = ele_msg_send_rcv(priv->priv_dev_ctx, > tx_msg, > ELE_SERVICE_SWAP_REQ_MSG_SZ, > rx_msg, > @@ -227,7 +227,7 @@ int ele_fw_authenticate(struct se_if_priv *priv, phys_addr_t addr) > tx_msg->data[0] = lower_32_bits(addr); > tx_msg->data[2] = addr; > > - ret = ele_msg_send_rcv(priv, > + ret = ele_msg_send_rcv(priv->priv_dev_ctx, > tx_msg, > ELE_FW_AUTH_REQ_SZ, > rx_msg, > @@ -275,7 +275,7 @@ int ele_debug_dump(struct se_if_priv *priv) > do { > memset(rx_msg, 0x0, ELE_DEBUG_DUMP_RSP_SZ); > > - ret = ele_msg_send_rcv(priv, > + ret = ele_msg_send_rcv(priv->priv_dev_ctx, > tx_msg, > ELE_DEBUG_DUMP_REQ_SZ, > rx_msg, > diff --git a/drivers/firmware/imx/ele_common.c b/drivers/firmware/imx/ele_common.c > index be4dabeeb64c..f75a8237e353 100644 > --- a/drivers/firmware/imx/ele_common.c > +++ b/drivers/firmware/imx/ele_common.c > @@ -89,12 +89,13 @@ int ele_msg_send(struct se_if_priv *priv, > } > > /* API used for send/receive blocking call. */ > -int ele_msg_send_rcv(struct se_if_priv *priv, > +int ele_msg_send_rcv(struct se_if_device_ctx *dev_ctx, > void *tx_msg, > int tx_msg_sz, > void *rx_msg, > int exp_rx_msg_sz) > { > + struct se_if_priv *priv = dev_ctx->priv; > int err; > > guard(mutex)(&priv->se_if_cmd_lock); > diff --git a/drivers/firmware/imx/ele_common.h b/drivers/firmware/imx/ele_common.h > index c95e45123b5b..a6bf93f0048f 100644 > --- a/drivers/firmware/imx/ele_common.h > +++ b/drivers/firmware/imx/ele_common.h > @@ -18,7 +18,7 @@ int ele_msg_rcv(struct se_if_priv *priv, > int ele_msg_send(struct se_if_priv *priv, > void *tx_msg, > int tx_msg_sz); > -int ele_msg_send_rcv(struct se_if_priv *priv, > +int ele_msg_send_rcv(struct se_if_device_ctx *dev_ctx, > void *tx_msg, > int tx_msg_sz, > void *rx_msg, > diff --git a/drivers/firmware/imx/se_ctrl.c b/drivers/firmware/imx/se_ctrl.c > index be381980fec0..144a727bbfe0 100644 > --- a/drivers/firmware/imx/se_ctrl.c > +++ b/drivers/firmware/imx/se_ctrl.c > @@ -191,6 +191,31 @@ static int get_se_soc_info(struct se_if_priv *priv, const struct se_soc_info *se > return 0; > } > > +static int init_misc_device_context(struct se_if_priv *priv, int ch_id, > + struct se_if_device_ctx **new_dev_ctx) > +{ > + struct se_if_device_ctx *dev_ctx; > + int ret = 0; > + > + dev_ctx = devm_kzalloc(priv->dev, sizeof(*dev_ctx), GFP_KERNEL); > + > + if (!dev_ctx) > + return -ENOMEM; > + > + dev_ctx->priv = priv; > + > + dev_ctx->devname = devm_kasprintf(priv->dev, GFP_KERNEL, "%s%d_ch%d", > + SE_TYPE_STR_HSM, > + priv->if_defs->se_instance_id, > + ch_id); > + if (!dev_ctx->devname) > + return -ENOMEM; > + > + *new_dev_ctx = dev_ctx; > + > + return ret; > +} > + > /* interface for managed res to free a mailbox channel */ > static void if_mbox_free_channel(void *mbox_chan) > { > @@ -317,6 +342,12 @@ static int se_if_probe(struct platform_device *pdev) > "Failed to init reserved memory region."); > } > > + ret = init_misc_device_context(priv, 0, &priv->priv_dev_ctx); > + if (ret) > + return dev_err_probe(dev, ret, > + "Failed[0x%x] to create device contexts.", > + ret); > + > if (if_node->if_defs.se_if_type == SE_TYPE_ID_HSM) { > ret = get_se_soc_info(priv, se_info); > if (ret) > diff --git a/drivers/firmware/imx/se_ctrl.h b/drivers/firmware/imx/se_ctrl.h > index 177623f3890e..f0893c5c9145 100644 > --- a/drivers/firmware/imx/se_ctrl.h > +++ b/drivers/firmware/imx/se_ctrl.h > @@ -35,6 +35,12 @@ struct se_imem_buf { > u32 state; > }; > > +/* Private struct for each char device instance. */ > +struct se_if_device_ctx { > + struct se_if_priv *priv; > + const char *devname; > +}; > + > /* Header of the messages exchange with the EdgeLock Enclave */ > struct se_msg_hdr { > u8 ver; > @@ -79,6 +85,8 @@ struct se_if_priv { > > struct gen_pool *mem_pool; > const struct se_if_defines *if_defs; > + > + struct se_if_device_ctx *priv_dev_ctx; > }; > > #endif > > -- > 2.43.0 >
diff --git a/drivers/firmware/imx/ele_base_msg.c b/drivers/firmware/imx/ele_base_msg.c index 3839c93f8212..c07c21f1fbbd 100644 --- a/drivers/firmware/imx/ele_base_msg.c +++ b/drivers/firmware/imx/ele_base_msg.c @@ -62,7 +62,7 @@ int ele_get_info(struct se_if_priv *priv, struct ele_dev_info *s_info) tx_msg->data[0] = upper_32_bits(get_info_addr); tx_msg->data[1] = lower_32_bits(get_info_addr); tx_msg->data[2] = sizeof(*s_info); - ret = ele_msg_send_rcv(priv, + ret = ele_msg_send_rcv(priv->priv_dev_ctx, tx_msg, ELE_GET_INFO_REQ_MSG_SZ, rx_msg, @@ -122,7 +122,7 @@ int ele_ping(struct se_if_priv *priv) return ret; } - ret = ele_msg_send_rcv(priv, + ret = ele_msg_send_rcv(priv->priv_dev_ctx, tx_msg, ELE_PING_REQ_SZ, rx_msg, @@ -174,7 +174,7 @@ int ele_service_swap(struct se_if_priv *priv, if (!tx_msg->data[4]) return -EINVAL; - ret = ele_msg_send_rcv(priv, + ret = ele_msg_send_rcv(priv->priv_dev_ctx, tx_msg, ELE_SERVICE_SWAP_REQ_MSG_SZ, rx_msg, @@ -227,7 +227,7 @@ int ele_fw_authenticate(struct se_if_priv *priv, phys_addr_t addr) tx_msg->data[0] = lower_32_bits(addr); tx_msg->data[2] = addr; - ret = ele_msg_send_rcv(priv, + ret = ele_msg_send_rcv(priv->priv_dev_ctx, tx_msg, ELE_FW_AUTH_REQ_SZ, rx_msg, @@ -275,7 +275,7 @@ int ele_debug_dump(struct se_if_priv *priv) do { memset(rx_msg, 0x0, ELE_DEBUG_DUMP_RSP_SZ); - ret = ele_msg_send_rcv(priv, + ret = ele_msg_send_rcv(priv->priv_dev_ctx, tx_msg, ELE_DEBUG_DUMP_REQ_SZ, rx_msg, diff --git a/drivers/firmware/imx/ele_common.c b/drivers/firmware/imx/ele_common.c index be4dabeeb64c..f75a8237e353 100644 --- a/drivers/firmware/imx/ele_common.c +++ b/drivers/firmware/imx/ele_common.c @@ -89,12 +89,13 @@ int ele_msg_send(struct se_if_priv *priv, } /* API used for send/receive blocking call. */ -int ele_msg_send_rcv(struct se_if_priv *priv, +int ele_msg_send_rcv(struct se_if_device_ctx *dev_ctx, void *tx_msg, int tx_msg_sz, void *rx_msg, int exp_rx_msg_sz) { + struct se_if_priv *priv = dev_ctx->priv; int err; guard(mutex)(&priv->se_if_cmd_lock); diff --git a/drivers/firmware/imx/ele_common.h b/drivers/firmware/imx/ele_common.h index c95e45123b5b..a6bf93f0048f 100644 --- a/drivers/firmware/imx/ele_common.h +++ b/drivers/firmware/imx/ele_common.h @@ -18,7 +18,7 @@ int ele_msg_rcv(struct se_if_priv *priv, int ele_msg_send(struct se_if_priv *priv, void *tx_msg, int tx_msg_sz); -int ele_msg_send_rcv(struct se_if_priv *priv, +int ele_msg_send_rcv(struct se_if_device_ctx *dev_ctx, void *tx_msg, int tx_msg_sz, void *rx_msg, diff --git a/drivers/firmware/imx/se_ctrl.c b/drivers/firmware/imx/se_ctrl.c index be381980fec0..144a727bbfe0 100644 --- a/drivers/firmware/imx/se_ctrl.c +++ b/drivers/firmware/imx/se_ctrl.c @@ -191,6 +191,31 @@ static int get_se_soc_info(struct se_if_priv *priv, const struct se_soc_info *se return 0; } +static int init_misc_device_context(struct se_if_priv *priv, int ch_id, + struct se_if_device_ctx **new_dev_ctx) +{ + struct se_if_device_ctx *dev_ctx; + int ret = 0; + + dev_ctx = devm_kzalloc(priv->dev, sizeof(*dev_ctx), GFP_KERNEL); + + if (!dev_ctx) + return -ENOMEM; + + dev_ctx->priv = priv; + + dev_ctx->devname = devm_kasprintf(priv->dev, GFP_KERNEL, "%s%d_ch%d", + SE_TYPE_STR_HSM, + priv->if_defs->se_instance_id, + ch_id); + if (!dev_ctx->devname) + return -ENOMEM; + + *new_dev_ctx = dev_ctx; + + return ret; +} + /* interface for managed res to free a mailbox channel */ static void if_mbox_free_channel(void *mbox_chan) { @@ -317,6 +342,12 @@ static int se_if_probe(struct platform_device *pdev) "Failed to init reserved memory region."); } + ret = init_misc_device_context(priv, 0, &priv->priv_dev_ctx); + if (ret) + return dev_err_probe(dev, ret, + "Failed[0x%x] to create device contexts.", + ret); + if (if_node->if_defs.se_if_type == SE_TYPE_ID_HSM) { ret = get_se_soc_info(priv, se_info); if (ret) diff --git a/drivers/firmware/imx/se_ctrl.h b/drivers/firmware/imx/se_ctrl.h index 177623f3890e..f0893c5c9145 100644 --- a/drivers/firmware/imx/se_ctrl.h +++ b/drivers/firmware/imx/se_ctrl.h @@ -35,6 +35,12 @@ struct se_imem_buf { u32 state; }; +/* Private struct for each char device instance. */ +struct se_if_device_ctx { + struct se_if_priv *priv; + const char *devname; +}; + /* Header of the messages exchange with the EdgeLock Enclave */ struct se_msg_hdr { u8 ver; @@ -79,6 +85,8 @@ struct se_if_priv { struct gen_pool *mem_pool; const struct se_if_defines *if_defs; + + struct se_if_device_ctx *priv_dev_ctx; }; #endif
Add priv_dev_ctx to prepare enabling misc-device context based send-receive path, to communicate with FW. No functionality change. Signed-off-by: Pankaj Gupta <pankaj.gupta@nxp.com> --- drivers/firmware/imx/ele_base_msg.c | 10 +++++----- drivers/firmware/imx/ele_common.c | 3 ++- drivers/firmware/imx/ele_common.h | 2 +- drivers/firmware/imx/se_ctrl.c | 31 +++++++++++++++++++++++++++++++ drivers/firmware/imx/se_ctrl.h | 8 ++++++++ 5 files changed, 47 insertions(+), 7 deletions(-)