firmware: arm_scmi: Introduce packet handling helpers

Introduce a pair of structures initialized to contain all the existing
packet handling helpers, both for transports based on shared memory
and messages.

No functional change.

Signed-off-by: Cristian Marussi <cristian.marussi@arm.com>
Tested-by: Peng Fan <peng.fan@nxp.com>  #i.MX95 19x19 EVK
Tested-by: Florian Fainelli <florian.fainelli@broadcom.com>
Message-Id: <20240812173340.3912830-4-cristian.marussi@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

diff --git a/drivers/firmware/arm_scmi/common.h b/drivers/firmware/arm_scmi/common.h
index 28c963358e01791ac67f8b4da5e9cbb1db61ae92..d5b78681b292ee0589b1cc04308caa5da53cb342 100644 (file)
--- a/drivers/firmware/arm_scmi/common.h
+++ b/drivers/firmware/arm_scmi/common.h
@@ -4,7 +4,7 @@
  * driver common header file containing some definitions, structures
  * and function prototypes used in all the different SCMI protocols.
  *
- * Copyright (C) 2018-2022 ARM Ltd.
+ * Copyright (C) 2018-2024 ARM Ltd.
  */
 #ifndef _SCMI_COMMON_H
 #define _SCMI_COMMON_H
@@ -339,20 +339,39 @@ void scmi_bad_message_trace(struct scmi_chan_info *cinfo, u32 msg_hdr,
 /* shmem related declarations */
 struct scmi_shared_mem;
 
-void shmem_tx_prepare(struct scmi_shared_mem __iomem *shmem,
-                     struct scmi_xfer *xfer, struct scmi_chan_info *cinfo);
-u32 shmem_read_header(struct scmi_shared_mem __iomem *shmem);
-void shmem_fetch_response(struct scmi_shared_mem __iomem *shmem,
+/**
+ * struct scmi_shared_mem_operations  - Transport core operations for
+ * Shared Memory
+ *
+ * @tx_prepare: Prepare the @xfer message for transmission on the chosen @shmem
+ * @read_header: Read header of the message currently hold in @shmem
+ * @fetch_response: Copy the message response from @shmem into @xfer
+ * @fetch_notification: Copy the message notification from @shmem into @xfer
+ * @clear_channel: Clear the @shmem channel busy flag
+ * @poll_done: Check if poll has completed for @xfer on @shmem
+ * @channel_free: Check if @shmem channel is marked as free
+ * @channel_intr_enabled: Check is @shmem channel has requested a completion irq
+ * @setup_iomap: Setup IO shared memory for channel @cinfo
+ */
+struct scmi_shared_mem_operations {
+       void (*tx_prepare)(struct scmi_shared_mem __iomem *shmem,
+                          struct scmi_xfer *xfer,
+                          struct scmi_chan_info *cinfo);
+       u32 (*read_header)(struct scmi_shared_mem __iomem *shmem);
+
+       void (*fetch_response)(struct scmi_shared_mem __iomem *shmem,
+                              struct scmi_xfer *xfer);
+       void (*fetch_notification)(struct scmi_shared_mem __iomem *shmem,
+                                  size_t max_len, struct scmi_xfer *xfer);
+       void (*clear_channel)(struct scmi_shared_mem __iomem *shmem);
+       bool (*poll_done)(struct scmi_shared_mem __iomem *shmem,
                          struct scmi_xfer *xfer);
-void shmem_fetch_notification(struct scmi_shared_mem __iomem *shmem,
-                             size_t max_len, struct scmi_xfer *xfer);
-void shmem_clear_channel(struct scmi_shared_mem __iomem *shmem);
-bool shmem_poll_done(struct scmi_shared_mem __iomem *shmem,
-                    struct scmi_xfer *xfer);
-bool shmem_channel_free(struct scmi_shared_mem __iomem *shmem);
-bool shmem_channel_intr_enabled(struct scmi_shared_mem __iomem *shmem);
-void __iomem *setup_shmem_iomap(struct scmi_chan_info *cinfo, struct device *dev,
-                               bool tx, struct resource *res);
+       bool (*channel_free)(struct scmi_shared_mem __iomem *shmem);
+       bool (*channel_intr_enabled)(struct scmi_shared_mem __iomem *shmem);
+       void __iomem *(*setup_iomap)(struct scmi_chan_info *cinfo,
+                                    struct device *dev,
+                                    bool tx, struct resource *res);
+};
 
 /* declarations for message passing transports */
 struct scmi_msg_payld;
@@ -360,14 +379,29 @@ struct scmi_msg_payld;
 /* Maximum overhead of message w.r.t. struct scmi_desc.max_msg_size */
 #define SCMI_MSG_MAX_PROT_OVERHEAD (2 * sizeof(__le32))
 
-size_t msg_response_size(struct scmi_xfer *xfer);
-size_t msg_command_size(struct scmi_xfer *xfer);
-void msg_tx_prepare(struct scmi_msg_payld *msg, struct scmi_xfer *xfer);
-u32 msg_read_header(struct scmi_msg_payld *msg);
-void msg_fetch_response(struct scmi_msg_payld *msg, size_t len,
-                       struct scmi_xfer *xfer);
-void msg_fetch_notification(struct scmi_msg_payld *msg, size_t len,
-                           size_t max_len, struct scmi_xfer *xfer);
+/**
+ * struct scmi_message_operations  - Transport core operations for Message
+ *
+ * @response_size: Get calculated response size for @xfer
+ * @command_size: Get calculated command size for @xfer
+ * @tx_prepare: Prepare the @xfer message for transmission on the provided @msg
+ * @read_header: Read header of the message currently hold in @msg
+ * @fetch_response: Copy the message response from @msg into @xfer
+ * @fetch_notification: Copy the message notification from @msg into @xfer
+ */
+struct scmi_message_operations {
+       size_t (*response_size)(struct scmi_xfer *xfer);
+       size_t (*command_size)(struct scmi_xfer *xfer);
+       void (*tx_prepare)(struct scmi_msg_payld *msg, struct scmi_xfer *xfer);
+       u32 (*read_header)(struct scmi_msg_payld *msg);
+       void (*fetch_response)(struct scmi_msg_payld *msg, size_t len,
+                              struct scmi_xfer *xfer);
+       void (*fetch_notification)(struct scmi_msg_payld *msg, size_t len,
+                                  size_t max_len, struct scmi_xfer *xfer);
+};
+
+extern const struct scmi_shared_mem_operations scmi_shmem_ops;
+extern const struct scmi_message_operations scmi_msg_ops;
 
 void scmi_notification_instance_data_set(const struct scmi_handle *handle,
                                         void *priv);

diff --git a/drivers/firmware/arm_scmi/mailbox.c b/drivers/firmware/arm_scmi/mailbox.c
index 886fc4eedb4a2b971dcffce61d69d9a5dc93f530..60698efe844295c55adf3bf5f5f765675eb7b1a1 100644 (file)
--- a/drivers/firmware/arm_scmi/mailbox.c
+++ b/drivers/firmware/arm_scmi/mailbox.c
@@ -40,7 +40,7 @@ static void tx_prepare(struct mbox_client *cl, void *m)
 {
        struct scmi_mailbox *smbox = client_to_scmi_mailbox(cl);
 
-       shmem_tx_prepare(smbox->shmem, m, smbox->cinfo);
+       scmi_shmem_ops.tx_prepare(smbox->shmem, m, smbox->cinfo);
 }
 
 static void rx_callback(struct mbox_client *cl, void *m)
@@ -56,15 +56,15 @@ static void rx_callback(struct mbox_client *cl, void *m)
         * a previous timed-out reply which arrived late could be wrongly
         * associated with the next pending transaction.
         */
-       if (cl->knows_txdone && !shmem_channel_free(smbox->shmem)) {
+       if (cl->knows_txdone && !scmi_shmem_ops.channel_free(smbox->shmem)) {
                dev_warn(smbox->cinfo->dev, "Ignoring spurious A2P IRQ !\n");
                scmi_bad_message_trace(smbox->cinfo,
-                                      shmem_read_header(smbox->shmem),
+                                      scmi_shmem_ops.read_header(smbox->shmem),
                                       MSG_MBOX_SPURIOUS);
                return;
        }
 
-       scmi_rx_callback(smbox->cinfo, shmem_read_header(smbox->shmem), NULL);
+       scmi_rx_callback(smbox->cinfo, scmi_shmem_ops.read_header(smbox->shmem), NULL);
 }
 
 static bool mailbox_chan_available(struct device_node *of_node, int idx)
@@ -192,7 +192,7 @@ static int mailbox_chan_setup(struct scmi_chan_info *cinfo, struct device *dev,
        if (!smbox)
                return -ENOMEM;
 
-       smbox->shmem = setup_shmem_iomap(cinfo, dev, tx, NULL);
+       smbox->shmem = scmi_shmem_ops.setup_iomap(cinfo, dev, tx, NULL);
        if (IS_ERR(smbox->shmem))
                return PTR_ERR(smbox->shmem);
 
@@ -293,7 +293,7 @@ static void mailbox_fetch_response(struct scmi_chan_info *cinfo,
 {
        struct scmi_mailbox *smbox = cinfo->transport_info;
 
-       shmem_fetch_response(smbox->shmem, xfer);
+       scmi_shmem_ops.fetch_response(smbox->shmem, xfer);
 }
 
 static void mailbox_fetch_notification(struct scmi_chan_info *cinfo,
@@ -301,7 +301,7 @@ static void mailbox_fetch_notification(struct scmi_chan_info *cinfo,
 {
        struct scmi_mailbox *smbox = cinfo->transport_info;
 
-       shmem_fetch_notification(smbox->shmem, max_len, xfer);
+       scmi_shmem_ops.fetch_notification(smbox->shmem, max_len, xfer);
 }
 
 static void mailbox_clear_channel(struct scmi_chan_info *cinfo)
@@ -310,9 +310,9 @@ static void mailbox_clear_channel(struct scmi_chan_info *cinfo)
        struct mbox_chan *intr_chan;
        int ret;
 
-       shmem_clear_channel(smbox->shmem);
+       scmi_shmem_ops.clear_channel(smbox->shmem);
 
-       if (!shmem_channel_intr_enabled(smbox->shmem))
+       if (!scmi_shmem_ops.channel_intr_enabled(smbox->shmem))
                return;
 
        if (smbox->chan_platform_receiver)
@@ -335,7 +335,7 @@ mailbox_poll_done(struct scmi_chan_info *cinfo, struct scmi_xfer *xfer)
 {
        struct scmi_mailbox *smbox = cinfo->transport_info;
 
-       return shmem_poll_done(smbox->shmem, xfer);
+       return scmi_shmem_ops.poll_done(smbox->shmem, xfer);
 }
 
 static const struct scmi_transport_ops scmi_mailbox_ops = {

diff --git a/drivers/firmware/arm_scmi/msg.c b/drivers/firmware/arm_scmi/msg.c
index d33a704e58144cd88a269b0245a5b2f51e330496..f5f6c2c55577d330ad7c6531bd4c099c54e690a6 100644 (file)
--- a/drivers/firmware/arm_scmi/msg.c
+++ b/drivers/firmware/arm_scmi/msg.c
@@ -4,7 +4,7 @@
  *
  * Derived from shm.c.
  *
- * Copyright (C) 2019-2021 ARM Ltd.
+ * Copyright (C) 2019-2024 ARM Ltd.
  * Copyright (C) 2020-2021 OpenSynergy GmbH
  */
 
@@ -30,7 +30,7 @@ struct scmi_msg_payld {
  *
  * Return: transport SDU size.
  */
-size_t msg_command_size(struct scmi_xfer *xfer)
+static size_t msg_command_size(struct scmi_xfer *xfer)
 {
        return sizeof(struct scmi_msg_payld) + xfer->tx.len;
 }
@@ -42,7 +42,7 @@ size_t msg_command_size(struct scmi_xfer *xfer)
  *
  * Return: transport SDU size.
  */
-size_t msg_response_size(struct scmi_xfer *xfer)
+static size_t msg_response_size(struct scmi_xfer *xfer)
 {
        return sizeof(struct scmi_msg_payld) + sizeof(__le32) + xfer->rx.len;
 }
@@ -53,7 +53,7 @@ size_t msg_response_size(struct scmi_xfer *xfer)
  * @msg: transport SDU for command
  * @xfer: message which is being sent
  */
-void msg_tx_prepare(struct scmi_msg_payld *msg, struct scmi_xfer *xfer)
+static void msg_tx_prepare(struct scmi_msg_payld *msg, struct scmi_xfer *xfer)
 {
        msg->msg_header = cpu_to_le32(pack_scmi_header(&xfer->hdr));
        if (xfer->tx.buf)
@@ -67,7 +67,7 @@ void msg_tx_prepare(struct scmi_msg_payld *msg, struct scmi_xfer *xfer)
  *
  * Return: SCMI header
  */
-u32 msg_read_header(struct scmi_msg_payld *msg)
+static u32 msg_read_header(struct scmi_msg_payld *msg)
 {
        return le32_to_cpu(msg->msg_header);
 }
@@ -79,8 +79,8 @@ u32 msg_read_header(struct scmi_msg_payld *msg)
  * @len: transport SDU size
  * @xfer: message being responded to
  */
-void msg_fetch_response(struct scmi_msg_payld *msg, size_t len,
-                       struct scmi_xfer *xfer)
+static void msg_fetch_response(struct scmi_msg_payld *msg,
+                              size_t len, struct scmi_xfer *xfer)
 {
        size_t prefix_len = sizeof(*msg) + sizeof(msg->msg_payload[0]);
 
@@ -100,8 +100,8 @@ void msg_fetch_response(struct scmi_msg_payld *msg, size_t len,
  * @max_len: maximum SCMI payload size to fetch
  * @xfer: notification message
  */
-void msg_fetch_notification(struct scmi_msg_payld *msg, size_t len,
-                           size_t max_len, struct scmi_xfer *xfer)
+static void msg_fetch_notification(struct scmi_msg_payld *msg, size_t len,
+                                  size_t max_len, struct scmi_xfer *xfer)
 {
        xfer->rx.len = min_t(size_t, max_len,
                             len >= sizeof(*msg) ? len - sizeof(*msg) : 0);
@@ -109,3 +109,12 @@ void msg_fetch_notification(struct scmi_msg_payld *msg, size_t len,
        /* Take a copy to the rx buffer.. */
        memcpy(xfer->rx.buf, msg->msg_payload, xfer->rx.len);
 }
+
+const struct scmi_message_operations scmi_msg_ops = {
+       .tx_prepare = msg_tx_prepare,
+       .command_size = msg_command_size,
+       .response_size = msg_response_size,
+       .read_header = msg_read_header,
+       .fetch_response = msg_fetch_response,
+       .fetch_notification = msg_fetch_notification,
+};

diff --git a/drivers/firmware/arm_scmi/optee.c b/drivers/firmware/arm_scmi/optee.c
index ee9cda1a821131dbc1301d2cf4a48714a26bf5f7..dae68adf6f9e58cc51d677842ea68a222c525c8f 100644 (file)
--- a/drivers/firmware/arm_scmi/optee.c
+++ b/drivers/firmware/arm_scmi/optee.c
@@ -343,7 +343,7 @@ static void scmi_optee_clear_channel(struct scmi_chan_info *cinfo)
        struct scmi_optee_channel *channel = cinfo->transport_info;
 
        if (!channel->tee_shm)
-               shmem_clear_channel(channel->req.shmem);
+               scmi_shmem_ops.clear_channel(channel->req.shmem);
 }
 
 static int setup_dynamic_shmem(struct device *dev, struct scmi_optee_channel *channel)
@@ -368,7 +368,7 @@ static int setup_dynamic_shmem(struct device *dev, struct scmi_optee_channel *ch
 static int setup_static_shmem(struct device *dev, struct scmi_chan_info *cinfo,
                              struct scmi_optee_channel *channel)
 {
-       channel->req.shmem = setup_shmem_iomap(cinfo, dev, true, NULL);
+       channel->req.shmem = scmi_shmem_ops.setup_iomap(cinfo, dev, true, NULL);
        if (IS_ERR(channel->req.shmem))
                return PTR_ERR(channel->req.shmem);
 
@@ -479,10 +479,10 @@ static int scmi_optee_send_message(struct scmi_chan_info *cinfo,
        mutex_lock(&channel->mu);
 
        if (channel->tee_shm) {
-               msg_tx_prepare(channel->req.msg, xfer);
-               ret = invoke_process_msg_channel(channel, msg_command_size(xfer));
+               scmi_msg_ops.tx_prepare(channel->req.msg, xfer);
+               ret = invoke_process_msg_channel(channel, scmi_msg_ops.command_size(xfer));
        } else {
-               shmem_tx_prepare(channel->req.shmem, xfer, cinfo);
+               scmi_shmem_ops.tx_prepare(channel->req.shmem, xfer, cinfo);
                ret = invoke_process_smt_channel(channel);
        }
 
@@ -498,9 +498,9 @@ static void scmi_optee_fetch_response(struct scmi_chan_info *cinfo,
        struct scmi_optee_channel *channel = cinfo->transport_info;
 
        if (channel->tee_shm)
-               msg_fetch_response(channel->req.msg, channel->rx_len, xfer);
+               scmi_msg_ops.fetch_response(channel->req.msg, channel->rx_len, xfer);
        else
-               shmem_fetch_response(channel->req.shmem, xfer);
+               scmi_shmem_ops.fetch_response(channel->req.shmem, xfer);
 }
 
 static void scmi_optee_mark_txdone(struct scmi_chan_info *cinfo, int ret,

diff --git a/drivers/firmware/arm_scmi/shmem.c b/drivers/firmware/arm_scmi/shmem.c
index a0d6f68172fc23c60eda56187686a44be65d7611..477d391968c602ea519f7ba78c098a23a5b0d45b 100644 (file)
--- a/drivers/firmware/arm_scmi/shmem.c
+++ b/drivers/firmware/arm_scmi/shmem.c
@@ -2,7 +2,7 @@
 /*
  * For transport using shared mem structure.
  *
- * Copyright (C) 2019 ARM Ltd.
+ * Copyright (C) 2019-2024 ARM Ltd.
  */
 
 #include <linux/ktime.h>
@@ -34,8 +34,9 @@ struct scmi_shared_mem {
        u8 msg_payload[];
 };
 
-void shmem_tx_prepare(struct scmi_shared_mem __iomem *shmem,
-                     struct scmi_xfer *xfer, struct scmi_chan_info *cinfo)
+static void shmem_tx_prepare(struct scmi_shared_mem __iomem *shmem,
+                            struct scmi_xfer *xfer,
+                            struct scmi_chan_info *cinfo)
 {
        ktime_t stop;
 
@@ -75,13 +76,13 @@ void shmem_tx_prepare(struct scmi_shared_mem __iomem *shmem,
                memcpy_toio(shmem->msg_payload, xfer->tx.buf, xfer->tx.len);
 }
 
-u32 shmem_read_header(struct scmi_shared_mem __iomem *shmem)
+static u32 shmem_read_header(struct scmi_shared_mem __iomem *shmem)
 {
        return ioread32(&shmem->msg_header);
 }
 
-void shmem_fetch_response(struct scmi_shared_mem __iomem *shmem,
-                         struct scmi_xfer *xfer)
+static void shmem_fetch_response(struct scmi_shared_mem __iomem *shmem,
+                                struct scmi_xfer *xfer)
 {
        size_t len = ioread32(&shmem->length);
 
@@ -93,8 +94,8 @@ void shmem_fetch_response(struct scmi_shared_mem __iomem *shmem,
        memcpy_fromio(xfer->rx.buf, shmem->msg_payload + 4, xfer->rx.len);
 }
 
-void shmem_fetch_notification(struct scmi_shared_mem __iomem *shmem,
-                             size_t max_len, struct scmi_xfer *xfer)
+static void shmem_fetch_notification(struct scmi_shared_mem __iomem *shmem,
+                                    size_t max_len, struct scmi_xfer *xfer)
 {
        size_t len = ioread32(&shmem->length);
 
@@ -105,13 +106,13 @@ void shmem_fetch_notification(struct scmi_shared_mem __iomem *shmem,
        memcpy_fromio(xfer->rx.buf, shmem->msg_payload, xfer->rx.len);
 }
 
-void shmem_clear_channel(struct scmi_shared_mem __iomem *shmem)
+static void shmem_clear_channel(struct scmi_shared_mem __iomem *shmem)
 {
        iowrite32(SCMI_SHMEM_CHAN_STAT_CHANNEL_FREE, &shmem->channel_status);
 }
 
-bool shmem_poll_done(struct scmi_shared_mem __iomem *shmem,
-                    struct scmi_xfer *xfer)
+static bool shmem_poll_done(struct scmi_shared_mem __iomem *shmem,
+                           struct scmi_xfer *xfer)
 {
        u16 xfer_id;
 
@@ -125,20 +126,20 @@ bool shmem_poll_done(struct scmi_shared_mem __iomem *shmem,
                 SCMI_SHMEM_CHAN_STAT_CHANNEL_FREE);
 }
 
-bool shmem_channel_free(struct scmi_shared_mem __iomem *shmem)
+static bool shmem_channel_free(struct scmi_shared_mem __iomem *shmem)
 {
        return (ioread32(&shmem->channel_status) &
                        SCMI_SHMEM_CHAN_STAT_CHANNEL_FREE);
 }
 
-bool shmem_channel_intr_enabled(struct scmi_shared_mem __iomem *shmem)
+static bool shmem_channel_intr_enabled(struct scmi_shared_mem __iomem *shmem)
 {
        return ioread32(&shmem->flags) & SCMI_SHMEM_FLAG_INTR_ENABLED;
 }
 
-void __iomem *setup_shmem_iomap(struct scmi_chan_info *cinfo,
-                               struct device *dev, bool tx,
-                               struct resource *res)
+static void __iomem *shmem_setup_iomap(struct scmi_chan_info *cinfo,
+                                      struct device *dev, bool tx,
+                                      struct resource *res)
 {
        struct device_node *shmem __free(device_node);
        const char *desc = tx ? "Tx" : "Rx";
@@ -174,3 +175,15 @@ void __iomem *setup_shmem_iomap(struct scmi_chan_info *cinfo,
 
        return addr;
 }
+
+const struct scmi_shared_mem_operations scmi_shmem_ops = {
+       .tx_prepare = shmem_tx_prepare,
+       .read_header = shmem_read_header,
+       .fetch_response = shmem_fetch_response,
+       .fetch_notification = shmem_fetch_notification,
+       .clear_channel = shmem_clear_channel,
+       .poll_done = shmem_poll_done,
+       .channel_free = shmem_channel_free,
+       .channel_intr_enabled = shmem_channel_intr_enabled,
+       .setup_iomap = shmem_setup_iomap,
+};

diff --git a/drivers/firmware/arm_scmi/smc.c b/drivers/firmware/arm_scmi/smc.c
index 59b6c04b52bce999a363c86df22a641006b1ac19..4cb86386c4909b8e092a053d832581008b6562f7 100644 (file)
--- a/drivers/firmware/arm_scmi/smc.c
+++ b/drivers/firmware/arm_scmi/smc.c
@@ -74,7 +74,7 @@ static irqreturn_t smc_msg_done_isr(int irq, void *data)
        struct scmi_smc *scmi_info = data;
 
        scmi_rx_callback(scmi_info->cinfo,
-                        shmem_read_header(scmi_info->shmem), NULL);
+                        scmi_shmem_ops.read_header(scmi_info->shmem), NULL);
 
        return IRQ_HANDLED;
 }
@@ -141,7 +141,7 @@ static int smc_chan_setup(struct scmi_chan_info *cinfo, struct device *dev,
        if (!scmi_info)
                return -ENOMEM;
 
-       scmi_info->shmem = setup_shmem_iomap(cinfo, dev, tx, &res);
+       scmi_info->shmem = scmi_shmem_ops.setup_iomap(cinfo, dev, tx, &res);
        if (IS_ERR(scmi_info->shmem))
                return PTR_ERR(scmi_info->shmem);
 
@@ -226,7 +226,7 @@ static int smc_send_message(struct scmi_chan_info *cinfo,
         */
        smc_channel_lock_acquire(scmi_info, xfer);
 
-       shmem_tx_prepare(scmi_info->shmem, xfer, cinfo);
+       scmi_shmem_ops.tx_prepare(scmi_info->shmem, xfer, cinfo);
 
        if (scmi_info->cap_id != ULONG_MAX)
                arm_smccc_1_1_invoke(scmi_info->func_id, scmi_info->cap_id, 0,
@@ -250,7 +250,7 @@ static void smc_fetch_response(struct scmi_chan_info *cinfo,
 {
        struct scmi_smc *scmi_info = cinfo->transport_info;
 
-       shmem_fetch_response(scmi_info->shmem, xfer);
+       scmi_shmem_ops.fetch_response(scmi_info->shmem, xfer);
 }
 
 static void smc_mark_txdone(struct scmi_chan_info *cinfo, int ret,

diff --git a/drivers/firmware/arm_scmi/virtio.c b/drivers/firmware/arm_scmi/virtio.c
index dd3459bdb9cb29bd2fa4c1ef118786264663e79e..e8d38e822c7ec4a694f3d416fb0653e68f67db41 100644 (file)
--- a/drivers/firmware/arm_scmi/virtio.c
+++ b/drivers/firmware/arm_scmi/virtio.c
@@ -295,7 +295,7 @@ static void scmi_vio_complete_cb(struct virtqueue *vqueue)
                if (msg) {
                        msg->rx_len = length;
                        scmi_rx_callback(vioch->cinfo,
-                                        msg_read_header(msg->input), msg);
+                                        scmi_msg_ops.read_header(msg->input), msg);
 
                        scmi_finalize_message(vioch, msg);
                }
@@ -340,7 +340,7 @@ static void scmi_vio_deferred_tx_worker(struct work_struct *work)
                 */
                if (msg->poll_status == VIO_MSG_NOT_POLLED)
                        scmi_rx_callback(vioch->cinfo,
-                                        msg_read_header(msg->input), msg);
+                                        scmi_msg_ops.read_header(msg->input), msg);
 
                /* Free the processed message once done */
                scmi_vio_msg_release(vioch, msg);
@@ -510,10 +510,10 @@ static int virtio_send_message(struct scmi_chan_info *cinfo,
                return -EBUSY;
        }
 
-       msg_tx_prepare(msg->request, xfer);
+       scmi_msg_ops.tx_prepare(msg->request, xfer);
 
-       sg_init_one(&sg_out, msg->request, msg_command_size(xfer));
-       sg_init_one(&sg_in, msg->input, msg_response_size(xfer));
+       sg_init_one(&sg_out, msg->request, scmi_msg_ops.command_size(xfer));
+       sg_init_one(&sg_in, msg->input, scmi_msg_ops.response_size(xfer));
 
        spin_lock_irqsave(&vioch->lock, flags);
 
@@ -560,7 +560,7 @@ static void virtio_fetch_response(struct scmi_chan_info *cinfo,
        struct scmi_vio_msg *msg = xfer->priv;
 
        if (msg)
-               msg_fetch_response(msg->input, msg->rx_len, xfer);
+               scmi_msg_ops.fetch_response(msg->input, msg->rx_len, xfer);
 }
 
 static void virtio_fetch_notification(struct scmi_chan_info *cinfo,
@@ -569,7 +569,7 @@ static void virtio_fetch_notification(struct scmi_chan_info *cinfo,
        struct scmi_vio_msg *msg = xfer->priv;
 
        if (msg)
-               msg_fetch_notification(msg->input, msg->rx_len, max_len, xfer);
+               scmi_msg_ops.fetch_notification(msg->input, msg->rx_len, max_len, xfer);
 }
 
 /**