Commit 94d0cd1d authored by Cristian Marussi's avatar Cristian Marussi Committed by Sudeep Holla
Browse files

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/20211220195646.44498-9-cristian.marussi@arm.com


Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarCristian Marussi <cristian.marussi@arm.com>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
parent 0bfdca8a

drivers/firmware/arm_scmi/common.h

+2 −1
Original line number Diff line number Diff line
@@ -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,

drivers/firmware/arm_scmi/driver.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/firmware/arm_scmi/mailbox.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

drivers/firmware/arm_scmi/optee.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

drivers/firmware/arm_scmi/smc.c

+2 −1
Original line number Diff line number Diff line
@@ -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;