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

firmware: arm_scmi: Rename .clear_notification() transport_ops 

SCMI transport operation .clear_notification() is indeed a generic method
to clear the channel in a transport dependent way, as such it could be a
useful helper also in other contexts.

Rename such method as .clear_channel(), renaming accordingly also its
already existent call-sites.

No functional change.

Link: https://lore.kernel.org/r/20200420152315.21008-2-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 4d09852b

drivers/firmware/arm_scmi/common.h

+3 −3
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ struct scmi_chan_info { 
 * @mark_txdone: Callback to mark tx as done

 * @fetch_response: Callback to fetch response

 * @fetch_notification: Callback to fetch notification

 * @clear_notification: Callback to clear a pending notification

 * @clear_channel: Callback to clear a channel

 * @poll_done: Callback to poll transfer status

 */

struct scmi_transport_ops {
@@ -194,7 +194,7 @@ struct scmi_transport_ops { 
			       struct scmi_xfer *xfer);

	void (*fetch_notification)(struct scmi_chan_info *cinfo,

				   size_t max_len, struct scmi_xfer *xfer);

	void (*clear_notification)(struct scmi_chan_info *cinfo);

	void (*clear_channel)(struct scmi_chan_info *cinfo);

	bool (*poll_done)(struct scmi_chan_info *cinfo, struct scmi_xfer *xfer);

};
@@ -232,6 +232,6 @@ void shmem_fetch_response(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_notification(struct scmi_shared_mem __iomem *shmem);

void shmem_clear_channel(struct scmi_shared_mem __iomem *shmem);

bool shmem_poll_done(struct scmi_shared_mem __iomem *shmem,

		     struct scmi_xfer *xfer);

drivers/firmware/arm_scmi/driver.c

+2 −2
Original line number Diff line number Diff line
@@ -213,7 +213,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_notification(cinfo);

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

		return;

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


	__scmi_xfer_put(minfo, xfer);



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

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

}



static void scmi_handle_response(struct scmi_chan_info *cinfo,

drivers/firmware/arm_scmi/mailbox.c

+3 −3
Original line number Diff line number Diff line
@@ -166,11 +166,11 @@ static void mailbox_fetch_notification(struct scmi_chan_info *cinfo, 
	shmem_fetch_notification(smbox->shmem, max_len, xfer);

}



static void mailbox_clear_notification(struct scmi_chan_info *cinfo)

static void mailbox_clear_channel(struct scmi_chan_info *cinfo)

{

	struct scmi_mailbox *smbox = cinfo->transport_info;



	shmem_clear_notification(smbox->shmem);

	shmem_clear_channel(smbox->shmem);

}



static bool
@@ -189,7 +189,7 @@ static struct scmi_transport_ops scmi_mailbox_ops = { 
	.mark_txdone = mailbox_mark_txdone,

	.fetch_response = mailbox_fetch_response,

	.fetch_notification = mailbox_fetch_notification,

	.clear_notification = mailbox_clear_notification,

	.clear_channel = mailbox_clear_channel,

	.poll_done = mailbox_poll_done,

};

drivers/firmware/arm_scmi/shmem.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ void shmem_fetch_notification(struct scmi_shared_mem __iomem *shmem, 
	memcpy_fromio(xfer->rx.buf, shmem->msg_payload, xfer->rx.len);

}



void shmem_clear_notification(struct scmi_shared_mem __iomem *shmem)

void shmem_clear_channel(struct scmi_shared_mem __iomem *shmem)

{

	iowrite32(SCMI_SHMEM_CHAN_STAT_CHANNEL_FREE, &shmem->channel_status);

}