firmware: arm_scmi: Add new parameter to mark_txdone

Add a new xfer parameter to mark_txdone transport operation which enables
the SCMI core to optionally pass back into the transport layer a reference
to the xfer descriptor that is being handled.

Link: https://lore.kernel.org/r/[email protected]
Reviewed-by: Florian Fainelli <[email protected]>
Signed-off-by: Cristian Marussi <[email protected]>
Signed-off-by: Sudeep Holla <[email protected]>

diff --git a/drivers/firmware/arm_scmi/common.h b/drivers/firmware/arm_scmi/common.h
index 01d42c2069d4460fafcf894e48229fb8fd6848bd..4fda84bfab4233332e4325f3eeee37fe3474247b 100644 (file)
--- a/drivers/firmware/arm_scmi/common.h
+++ b/drivers/firmware/arm_scmi/common.h
@@ -378,7 +378,8 @@ struct scmi_transport_ops {
        unsigned int (*get_max_msg)(struct scmi_chan_info *base_cinfo);
        int (*send_message)(struct scmi_chan_info *cinfo,
                            struct scmi_xfer *xfer);
-       void (*mark_txdone)(struct scmi_chan_info *cinfo, int ret);
+       void (*mark_txdone)(struct scmi_chan_info *cinfo, int ret,
+                           struct scmi_xfer *xfer);
        void (*fetch_response)(struct scmi_chan_info *cinfo,
                               struct scmi_xfer *xfer);
        void (*fetch_notification)(struct scmi_chan_info *cinfo,

diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
index 78924db59290b5fe18b8930005216a10982feed5..c2e7897ff56ea2a27275b3de16870bb312eb6bd2 100644 (file)
--- a/drivers/firmware/arm_scmi/driver.c
+++ b/drivers/firmware/arm_scmi/driver.c
@@ -897,7 +897,7 @@ static int do_xfer(const struct scmi_protocol_handle *ph,
                ret = scmi_to_linux_errno(xfer->hdr.status);
 
        if (info->desc->ops->mark_txdone)
-               info->desc->ops->mark_txdone(cinfo, ret);
+               info->desc->ops->mark_txdone(cinfo, ret, xfer);
 
        trace_scmi_xfer_end(xfer->transfer_id, xfer->hdr.id,
                            xfer->hdr.protocol_id, xfer->hdr.seq, ret);

diff --git a/drivers/firmware/arm_scmi/mailbox.c b/drivers/firmware/arm_scmi/mailbox.c
index e09eb12bf4219fc5c2c8b435485b8cbb1c4bd637..08ff4d110beb493d86b816721282e095598dfd0f 100644 (file)
--- a/drivers/firmware/arm_scmi/mailbox.c
+++ b/drivers/firmware/arm_scmi/mailbox.c
@@ -140,7 +140,8 @@ static int mailbox_send_message(struct scmi_chan_info *cinfo,
        return ret;
 }
 
-static void mailbox_mark_txdone(struct scmi_chan_info *cinfo, int ret)
+static void mailbox_mark_txdone(struct scmi_chan_info *cinfo, int ret,
+                               struct scmi_xfer *__unused)
 {
        struct scmi_mailbox *smbox = cinfo->transport_info;
 

diff --git a/drivers/firmware/arm_scmi/optee.c b/drivers/firmware/arm_scmi/optee.c
index f460e12be4eacec593527cde0bb0f602337596cc..734f1eeee1617300b9f866ddf345d5f72478028b 100644 (file)
--- a/drivers/firmware/arm_scmi/optee.c
+++ b/drivers/firmware/arm_scmi/optee.c
@@ -441,7 +441,8 @@ static void scmi_optee_fetch_response(struct scmi_chan_info *cinfo,
        shmem_fetch_response(shmem, xfer);
 }
 
-static void scmi_optee_mark_txdone(struct scmi_chan_info *cinfo, int ret)
+static void scmi_optee_mark_txdone(struct scmi_chan_info *cinfo, int ret,
+                                  struct scmi_xfer *__unused)
 {
        struct scmi_optee_channel *channel = cinfo->transport_info;
 

diff --git a/drivers/firmware/arm_scmi/smc.c b/drivers/firmware/arm_scmi/smc.c
index 6c7871a4061191daf5f44c229e68ad9f97676e97..745acfdd0b3dfb2cba2668b1afeed35a9cfef2aa 100644 (file)
--- a/drivers/firmware/arm_scmi/smc.c
+++ b/drivers/firmware/arm_scmi/smc.c
@@ -209,7 +209,8 @@ static void smc_fetch_response(struct scmi_chan_info *cinfo,
        shmem_fetch_response(scmi_info->shmem, xfer);
 }
 
-static void smc_mark_txdone(struct scmi_chan_info *cinfo, int ret)
+static void smc_mark_txdone(struct scmi_chan_info *cinfo, int ret,
+                           struct scmi_xfer *__unused)
 {
        struct scmi_smc *scmi_info = cinfo->transport_info;