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

Commit 595f7d9f authored by Mohammed Javid's avatar Mohammed Javid Committed by Gerrit - the friendly Code Review server
Browse files

msm: ipa4: Adding poll file operation support to ipa_odl_ctl pipe 



User application observing the issue when ipa_odl_ctl pipe fd adding to
select function, it was contineously on blocking state. To reslove this
adding poll file operation support to ipa_odl_ctl pipe.

Change-Id: I0e09b4cfec2ab38cf66416c9e8839c53f69b34fa
Acked-by: default avatarAshok Vuyyuru <avuyyuru@qti.qualcomm.com>
Signed-off-by: default avatarMohammed Javid <mjavid@codeaurora.org>
parent 4f5a0984

drivers/platform/msm/ipa/ipa_v3/ipa_odl.c

+48 −41
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include "ipa_odl.h"

#include <linux/msm_ipa.h>

#include <linux/sched/signal.h>

#include <linux/poll.h>



struct ipa_odl_context *ipa3_odl_ctx;
@@ -96,21 +97,23 @@ static ssize_t ipa_odl_ctl_fops_read(struct file *filp, char __user *buf, 
	bool new_state = false;



	start = buf;

	while (1) {

		wait_event_interruptible(odl_ctl_msg_wq,

			ipa3_odl_ctx->odl_ctl_msg_wq_flag == true);

	ipa3_odl_ctx->odl_ctl_msg_wq_flag = false;



	if (!ipa3_odl_ctx->odl_state.adpl_open &&

			!ipa3_odl_ctx->odl_state.odl_disconnected)

			break;

			!ipa3_odl_ctx->odl_state.odl_disconnected) {

		IPADBG("Failed to send data odl pipe already disconnected\n");

		ret = -EFAULT;

		goto send_failed;

	}



	if (ipa3_odl_ctx->odl_state.odl_ep_setup)

		new_state = true;

	else if (ipa3_odl_ctx->odl_state.odl_disconnected)

		new_state = false;

	else {

			ret = -EAGAIN;

			break;

		IPADBG("Failed to send data odl already running\n");

		ret = -EFAULT;

		goto send_failed;

	}



	if (old_state != new_state) {
@@ -123,8 +126,9 @@ static ssize_t ipa_odl_ctl_fops_read(struct file *filp, char __user *buf, 


		if (copy_to_user(buf, &data,

					sizeof(data))) {

			IPADBG("Cpoying data to user failed\n");

			ret = -EFAULT;

				break;

			goto send_failed;

		}



		buf += sizeof(data);
@@ -134,24 +138,26 @@ static ssize_t ipa_odl_ctl_fops_read(struct file *filp, char __user *buf, 
				true;

	}



		ret = -EAGAIN;

		if (filp->f_flags & O_NONBLOCK)

			break;



		ret = -EINTR;

		if (signal_pending(current))

			break;



		if (start != buf)

			break;

	}



	if (start != buf && ret != -EFAULT)

		ret = buf - start;



send_failed:

	return ret;

}



static unsigned int ipa_odl_ctl_fops_poll(struct file *file, poll_table *wait)

{

	unsigned int mask = 0;



	poll_wait(file, &odl_ctl_msg_wq, wait);



	if (ipa3_odl_ctx->odl_ctl_msg_wq_flag == true) {

		IPADBG("Sending read mask to odl control pipe\n");

		mask |= POLLIN | POLLRDNORM;

	}

	return mask;

}



static long ipa_odl_ctl_fops_ioctl(struct file *filp, unsigned int cmd,

							unsigned long arg)

{
@@ -565,6 +571,7 @@ static const struct file_operations ipa_odl_ctl_fops = { 
	.release = ipa_odl_ctl_fops_release,

	.read = ipa_odl_ctl_fops_read,

	.unlocked_ioctl = ipa_odl_ctl_fops_ioctl,

	.poll = ipa_odl_ctl_fops_poll,

};



static const struct file_operations ipa_adpl_fops = {