Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69b238a7 authored by Sricharan R's avatar Sricharan R Committed by Gerrit - the friendly Code Review server
Browse files

rpmsg: glink: Use the local intents when receiving data 



So previously on request from remote side, we allocated local
intent buffers and passed the ids to the remote. Now when
we receive data buffers from remote directed to that intent
id, copy the data to the corresponding preallocated intent
buffer.

Change-Id: I741aafa9c50fe1a578a4c6e2d5e125f29b97e673
Signed-off-by: default avatarSricharan R <sricharan@codeaurora.org>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent d10233a0

drivers/rpmsg/qcom_glink_native.c

+50 −25
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ struct glink_channel { 
	spinlock_t intent_lock;

	struct idr liids;



	void *buf;

	struct glink_core_rx_intent *buf;

	int buf_offset;

	int buf_size;
@@ -614,6 +614,7 @@ static int qcom_glink_rx_defer(struct qcom_glink *glink, size_t extra) 


static int qcom_glink_rx_data(struct qcom_glink *glink, size_t avail)

{

	struct glink_core_rx_intent *intent;

	struct glink_channel *channel;

	struct {

		struct glink_msg msg;
@@ -623,6 +624,8 @@ static int qcom_glink_rx_data(struct qcom_glink *glink, size_t avail) 
	unsigned int chunk_size;

	unsigned int left_size;

	unsigned int rcid;

	unsigned int liid;

	int ret = 0;

	unsigned long flags;



	if (avail < sizeof(hdr)) {
@@ -650,56 +653,78 @@ static int qcom_glink_rx_data(struct qcom_glink *glink, size_t avail) 
		dev_dbg(glink->dev, "Data on non-existing channel\n");



		/* Drop the message */

		qcom_glink_rx_advance(glink,

				      ALIGN(sizeof(hdr) + chunk_size, 8));

		return 0;

		goto advance_rx;

	}



	if (glink->intentless) {

		/* Might have an ongoing, fragmented, message to append */

		if (!channel->buf) {

		channel->buf = kmalloc(chunk_size + left_size, GFP_ATOMIC);

		if (!channel->buf)

			intent = kzalloc(sizeof(*intent), GFP_ATOMIC);

			if (!intent)

				return -ENOMEM;



		channel->buf_size = chunk_size + left_size;

		channel->buf_offset = 0;

			intent->data = kmalloc(chunk_size + left_size,

					       GFP_ATOMIC);

			if (!intent->data) {

				kfree(intent);

				return -ENOMEM;

			}



			intent->id = 0xbabababa;

			intent->size = chunk_size + left_size;

			intent->offset = 0;



			channel->buf = intent;

		} else {

			intent = channel->buf;

		}

	} else {

		liid = le32_to_cpu(hdr.msg.param2);



	qcom_glink_rx_advance(glink, sizeof(hdr));

		spin_lock_irqsave(&channel->intent_lock, flags);

		intent = idr_find(&channel->liids, liid);

		spin_unlock_irqrestore(&channel->intent_lock, flags);



	if (channel->buf_size - channel->buf_offset < chunk_size) {

		dev_err(glink->dev, "Insufficient space in input buffer\n");

		if (!intent) {

			dev_err(glink->dev,

				"no intent found for channel %s intent %d",

				channel->name, liid);

			goto advance_rx;

		}

	}



	if (intent->size - intent->offset < chunk_size) {

		dev_err(glink->dev, "Insufficient space in intent\n");



		/* The packet header lied, drop payload */

		qcom_glink_rx_advance(glink, chunk_size);

		return -ENOMEM;

		goto advance_rx;

	}



	qcom_glink_rx_peak(glink, channel->buf + channel->buf_offset,

	qcom_glink_rx_advance(glink, ALIGN(sizeof(hdr), 8));

	qcom_glink_rx_peak(glink, intent->data + intent->offset,

			   chunk_size);

	channel->buf_offset += chunk_size;

	intent->offset += chunk_size;



	/* Handle message when no fragments remain to be received */

	if (!left_size) {

		spin_lock(&channel->recv_lock);

		if (channel->ept.cb) {

			channel->ept.cb(channel->ept.rpdev,

					channel->buf,

					channel->buf_offset,

					intent->data,

					intent->offset,

					channel->ept.priv,

					RPMSG_ADDR_ANY);

		}

		spin_unlock(&channel->recv_lock);



		kfree(channel->buf);

		intent->offset = 0;

		channel->buf = NULL;

		channel->buf_size = 0;

	}



	/* Each message starts at 8 byte aligned address */

advance_rx:

	qcom_glink_rx_advance(glink, ALIGN(chunk_size, 8));



	return 0;

	return ret;

}



static int qcom_glink_rx_open_ack(struct qcom_glink *glink, unsigned int lcid)