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

firmware: arm_scmi: Make .clear_channel optional 

Make transport operation .clear_channel optional since some transports
do not need it and so avoid to have them implement dummy callbacks.

Link: https://lore.kernel.org/r/20210803131024.40280-7-cristian.marussi@arm.com


Signed-off-by: default avatarCristian Marussi <cristian.marussi@arm.com>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
parent ed7c04c1

drivers/firmware/arm_scmi/driver.c

+11 −4
Original line number Diff line number Diff line
@@ -600,6 +600,13 @@ static inline void scmi_xfer_command_release(struct scmi_info *info, 
	__scmi_xfer_put(&info->tx_minfo, xfer);

}



static inline void scmi_clear_channel(struct scmi_info *info,

				      struct scmi_chan_info *cinfo)

{

	if (info->desc->ops->clear_channel)

		info->desc->ops->clear_channel(cinfo);

}



static void scmi_handle_notification(struct scmi_chan_info *cinfo, u32 msg_hdr)

{

	struct scmi_xfer *xfer;
@@ -613,7 +620,7 @@ static void scmi_handle_notification(struct scmi_chan_info *cinfo, u32 msg_hdr) 
	if (IS_ERR(xfer)) {

		dev_err(dev, "failed to get free message slot (%ld)\n",

			PTR_ERR(xfer));

		info->desc->ops->clear_channel(cinfo);

		scmi_clear_channel(info, cinfo);

		return;

	}
@@ -629,7 +636,7 @@ static void scmi_handle_notification(struct scmi_chan_info *cinfo, u32 msg_hdr) 


	__scmi_xfer_put(minfo, xfer);



	info->desc->ops->clear_channel(cinfo);

	scmi_clear_channel(info, cinfo);

}



static void scmi_handle_response(struct scmi_chan_info *cinfo, u32 msg_hdr)
@@ -639,7 +646,7 @@ static void scmi_handle_response(struct scmi_chan_info *cinfo, u32 msg_hdr) 


	xfer = scmi_xfer_command_acquire(cinfo, msg_hdr);

	if (IS_ERR(xfer)) {

		info->desc->ops->clear_channel(cinfo);

		scmi_clear_channel(info, cinfo);

		return;

	}
@@ -654,7 +661,7 @@ static void scmi_handle_response(struct scmi_chan_info *cinfo, u32 msg_hdr) 
			   xfer->hdr.type);



	if (xfer->hdr.type == MSG_TYPE_DELAYED_RESP) {

		info->desc->ops->clear_channel(cinfo);

		scmi_clear_channel(info, cinfo);

		complete(xfer->async_done);

	} else {

		complete(&xfer->done);