| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <Z/Qmyn8BcSJNdYtW@lizhi-Precision-Tower-5810>
Date: Mon, 7 Apr 2025 15:26:02 -0400
From: Frank Li <Frank.li@....com>
To: Pankaj Gupta <pankaj.gupta@....com>
Cc: Jonathan Corbet <corbet@....net>, Rob Herring <robh@...nel.org>,
Krzysztof Kozlowski <krzk+dt@...nel.org>,
Conor Dooley <conor+dt@...nel.org>, Shawn Guo <shawnguo@...nel.org>,
Sascha Hauer <s.hauer@...gutronix.de>,
Pengutronix Kernel Team <kernel@...gutronix.de>,
Fabio Estevam <festevam@...il.com>, linux-doc@...r.kernel.org,
linux-kernel@...r.kernel.org, devicetree@...r.kernel.org,
imx@...ts.linux.dev, linux-arm-kernel@...ts.infradead.org
Subject: Re: [PATCH v15 6/7] firmware: imx: device context dedicated to priv
On Mon, Apr 07, 2025 at 09:50:22PM +0530, Pankaj Gupta wrote:
> Add priv_dev_ctx to prepare enabling misc-device context
> based send-receive path, to communicate with FW.
Nit: please wrap at 75 char.
>
> No functionality change.
>
> Signed-off-by: Pankaj Gupta <pankaj.gupta@....com>
> Reviewed-by: Frank Li <Frank.Li@....com>
>
> ---
> Changes from v14 to v15:
> - removed the se_intance_id structure member variable.
> - Added dev_ctx to the structure se_clbk_handle, too.
> - Collected Frank's R-b tag.
>
> Note: copied the change logs for v13 to v14, to cover letter.
> ---
> drivers/firmware/imx/ele_base_msg.c | 10 ++++-----
> drivers/firmware/imx/ele_common.c | 43 +++++++++++++++++++++++--------------
> drivers/firmware/imx/ele_common.h | 6 +++---
> drivers/firmware/imx/se_ctrl.c | 29 +++++++++++++++++++++++++
> drivers/firmware/imx/se_ctrl.h | 9 ++++++++
> 5 files changed, 73 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/firmware/imx/ele_base_msg.c b/drivers/firmware/imx/ele_base_msg.c
> index c843a5508a9e..9227d083abbb 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 7573603cdbec..baf83f03c1a0 100644
> --- a/drivers/firmware/imx/ele_common.c
> +++ b/drivers/firmware/imx/ele_common.c
> @@ -42,7 +42,7 @@ u32 se_get_msg_chksum(u32 *msg, u32 msg_len)
> return chksum;
> }
>
> -int ele_msg_rcv(struct se_if_priv *priv, struct se_clbk_handle *se_clbk_hdl)
> +int ele_msg_rcv(struct se_if_device_ctx *dev_ctx, struct se_clbk_handle *se_clbk_hdl)
> {
> unsigned long timeout;
> int ret;
> @@ -52,8 +52,8 @@ int ele_msg_rcv(struct se_if_priv *priv, struct se_clbk_handle *se_clbk_hdl)
>
> ret = wait_for_completion_interruptible_timeout(&se_clbk_hdl->done, timeout);
> if (ret == -ERESTARTSYS) {
> - if (priv->waiting_rsp_clbk_hdl.rx_msg) {
> - priv->waiting_rsp_clbk_hdl.signal_rcvd = true;
> + if (dev_ctx->priv->waiting_rsp_clbk_hdl.dev_ctx) {
> + dev_ctx->priv->waiting_rsp_clbk_hdl.signal_rcvd = true;
> continue;
> }
> ret = -EINTR;
> @@ -66,7 +66,7 @@ int ele_msg_rcv(struct se_if_priv *priv, struct se_clbk_handle *se_clbk_hdl)
> return ret;
> }
>
> -int ele_msg_send(struct se_if_priv *priv,
> +int ele_msg_send(struct se_if_device_ctx *dev_ctx,
> void *tx_msg,
> int tx_msg_sz)
> {
> @@ -78,16 +78,19 @@ int ele_msg_send(struct se_if_priv *priv,
> * carried in the message.
> */
> if (header->size << 2 != tx_msg_sz) {
> - dev_err(priv->dev,
> - "User buf hdr: 0x%x, sz mismatced with input-sz (%d != %d).",
> + dev_err(dev_ctx->priv->dev,
> + "%s: User buf hdr: 0x%x, sz mismatced with input-sz (%d != %d).",
> + dev_ctx->devname,
> *(u32 *)header,
> header->size << 2, tx_msg_sz);
> return -EINVAL;
> }
>
> - err = mbox_send_message(priv->tx_chan, tx_msg);
> + err = mbox_send_message(dev_ctx->priv->tx_chan, tx_msg);
> if (err < 0) {
> - dev_err(priv->dev, "Error: mbox_send_message failure.\n");
> + dev_err(dev_ctx->priv->dev,
> + "%s: Error: mbox_send_message failure.",
> + dev_ctx->devname);
> return err;
> }
>
> @@ -95,31 +98,35 @@ 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);
>
> + priv->waiting_rsp_clbk_hdl.dev_ctx = dev_ctx;
> priv->waiting_rsp_clbk_hdl.rx_msg_sz = exp_rx_msg_sz;
> priv->waiting_rsp_clbk_hdl.rx_msg = rx_msg;
>
> - err = ele_msg_send(priv, tx_msg, tx_msg_sz);
> + err = ele_msg_send(dev_ctx, tx_msg, tx_msg_sz);
> if (err < 0)
> return err;
>
> - err = ele_msg_rcv(priv, &priv->waiting_rsp_clbk_hdl);
> + err = ele_msg_rcv(dev_ctx, &priv->waiting_rsp_clbk_hdl);
>
> if (priv->waiting_rsp_clbk_hdl.signal_rcvd) {
> err = -EINTR;
> priv->waiting_rsp_clbk_hdl.signal_rcvd = false;
> dev_err(priv->dev,
> - "Err[0x%x]:Interrupted by signal.\n", err);
> + "%s: Err[0x%x]:Interrupted by signal.\n",
> + dev_ctx->devname, err);
> }
> + priv->waiting_rsp_clbk_hdl.dev_ctx = NULL;
>
> return err;
> }
> @@ -166,7 +173,8 @@ void se_if_rx_callback(struct mbox_client *mbox_cl, void *msg)
> if (header->tag == priv->if_defs->cmd_tag) {
> se_clbk_hdl = &priv->cmd_receiver_clbk_hdl;
> dev_dbg(dev,
> - "Selecting cmd receiver for mesg header:0x%x.",
> + "Selecting cmd receiver:%s for mesg header:0x%x.",
> + se_clbk_hdl->dev_ctx->devname,
> *(u32 *)header);
>
> /*
> @@ -176,7 +184,8 @@ void se_if_rx_callback(struct mbox_client *mbox_cl, void *msg)
> */
> if (rx_msg_sz > MAX_NVM_MSG_LEN) {
> dev_err(dev,
> - "CMD-RCVER NVM: hdr(0x%x) with different sz(%d != %d).\n",
> + "%s: CMD-RCVER NVM: hdr(0x%x) with different sz(%d != %d).\n",
> + se_clbk_hdl->dev_ctx->devname,
> *(u32 *)header,
> rx_msg_sz, se_clbk_hdl->rx_msg_sz);
>
> @@ -187,13 +196,15 @@ void se_if_rx_callback(struct mbox_client *mbox_cl, void *msg)
> } else if (header->tag == priv->if_defs->rsp_tag) {
> se_clbk_hdl = &priv->waiting_rsp_clbk_hdl;
> dev_dbg(dev,
> - "Selecting resp waiter for mesg header:0x%x.",
> + "Selecting resp waiter:%s for mesg header:0x%x.",
> + se_clbk_hdl->dev_ctx->devname,
> *(u32 *)header);
>
> if (rx_msg_sz != se_clbk_hdl->rx_msg_sz &&
> check_hdr_exception_for_sz(priv, header)) {
> dev_err(dev,
> - "Rsp to CMD: hdr(0x%x) with different sz(%d != %d).\n",
> + "%s: Rsp to CMD: hdr(0x%x) with different sz(%d != %d).\n",
> + se_clbk_hdl->dev_ctx->devname,
> *(u32 *)header,
> rx_msg_sz, se_clbk_hdl->rx_msg_sz);
>
> diff --git a/drivers/firmware/imx/ele_common.h b/drivers/firmware/imx/ele_common.h
> index cba2c7854455..62c75e149d95 100644
> --- a/drivers/firmware/imx/ele_common.h
> +++ b/drivers/firmware/imx/ele_common.h
> @@ -13,12 +13,12 @@
> #define IMX_ELE_FW_DIR "imx/ele/"
>
> u32 se_get_msg_chksum(u32 *msg, u32 msg_len);
> -int ele_msg_rcv(struct se_if_priv *priv,
> +int ele_msg_rcv(struct se_if_device_ctx *dev_ctx,
> struct se_clbk_handle *se_clbk_hdl);
> -int ele_msg_send(struct se_if_priv *priv,
> +int ele_msg_send(struct se_if_device_ctx *dev_ctx,
> 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 2d885c03a450..a326e07ae547 100644
> --- a/drivers/firmware/imx/se_ctrl.c
> +++ b/drivers/firmware/imx/se_ctrl.c
> @@ -204,6 +204,29 @@ 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->devname = devm_kasprintf(priv->dev, GFP_KERNEL, "%s0_ch%d",
> + get_se_if_name(priv->if_defs->se_if_type),
> + ch_id);
> + if (!dev_ctx->devname)
> + return -ENOMEM;
> +
> + dev_ctx->priv = priv;
> + *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)
> {
> @@ -333,6 +356,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 b15c4022a46c..b5e7705e2f26 100644
> --- a/drivers/firmware/imx/se_ctrl.h
> +++ b/drivers/firmware/imx/se_ctrl.h
> @@ -19,6 +19,7 @@
> #define MESSAGING_VERSION_7 0x7
>
> struct se_clbk_handle {
> + struct se_if_device_ctx *dev_ctx;
> struct completion done;
> bool signal_rcvd;
> u32 rx_msg_sz;
> @@ -36,6 +37,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;
> @@ -80,6 +87,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;
> };
>
> char *get_se_if_name(u8 se_if_id);
>
> --
> 2.43.0
>
Powered by blists - more mailing lists