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

Commit 6b4a181c authored by Manoj Prabhu B's avatar Manoj Prabhu B Committed by Gerrit - the friendly Code Review server
Browse files

diag: Add IOCTL support to query ODL session PID 



Add IOCTL support to respond with pid of an active ODL session when
queried by ODL application.

Change-Id: I20216c7e3f98455f1d871b7a88ad99505a98db78
Signed-off-by: default avatarManoj Prabhu B <bmanoj@codeaurora.org>
parent 3b3e314b

drivers/char/diag/diagchar.h

+6 −0
Original line number Diff line number Diff line
@@ -465,6 +465,12 @@ struct diag_logging_mode_param_t { 
	int peripheral;

} __packed;



struct diag_query_pid_t {

	uint32_t peripheral_mask;

	uint32_t pd_mask;

	int pid;

};



struct diag_con_all_param_t {

	uint32_t diag_con_all;

	uint32_t num_peripherals;

drivers/char/diag/diagchar_core.c

+122 −0
Original line number Diff line number Diff line
@@ -2342,6 +2342,93 @@ static int diag_ioctl_query_pd_logging(struct diag_logging_mode_param_t *param) 
	return ret;

}



static void diag_ioctl_query_session_pid(struct diag_query_pid_t *param)

{

	int prev_pid = 0, test_pid = 0, i = 0, count = 0;

	uint32_t pd_mask = 0, peripheral_mask = 0;

	struct diag_md_session_t *info = NULL;



	param->pid = 0;



	if (param->pd_mask && param->peripheral_mask) {

		param->pid = -EINVAL;

		return;

	} else if (param->peripheral_mask) {

		if (param->peripheral_mask == DIAG_CON_ALL) {

			for (i = 0; i <= NUM_PERIPHERALS; i++) {

				if (driver->md_session_map[i]) {

					test_pid =

					driver->md_session_map[i]->pid;

					count++;

					if (!prev_pid)

						prev_pid = test_pid;

					if (test_pid != prev_pid) {

						DIAG_LOG(DIAG_DEBUG_USERSPACE,

						"diag: One of the peripherals is being logged already\n");

						param->pid = -EINVAL;

					}

				}

			}

			if (i == count && prev_pid)

				param->pid = prev_pid;

		} else {

			peripheral_mask =

				diag_translate_mask(param->peripheral_mask);

			for (i = 0; i <= NUM_PERIPHERALS; i++) {

				if (driver->md_session_map[i] &&

					(peripheral_mask &

					MD_PERIPHERAL_MASK(i))) {

					info = driver->md_session_map[i];

					if (peripheral_mask !=

						info->peripheral_mask) {

						DIAG_LOG(DIAG_DEBUG_USERSPACE,

						"diag: Invalid Peripheral mask given as input\n");

						param->pid = -EINVAL;

						return;

					}

					test_pid = info->pid;

					if (!prev_pid)

						prev_pid = test_pid;

					if (test_pid != prev_pid) {

						DIAG_LOG(DIAG_DEBUG_USERSPACE,

						"diag: One of the peripherals is logged in different session\n");

						param->pid = -EINVAL;

						return;

					}

				}

			}

			param->pid = prev_pid;

		}

	} else if (param->pd_mask) {

		pd_mask =

			diag_translate_mask(param->pd_mask);

		for (i = UPD_WLAN; i < NUM_MD_SESSIONS; i++) {

			if (driver->md_session_map[i] &&

				(pd_mask & MD_PERIPHERAL_MASK(i))) {

				info = driver->md_session_map[i];

				if (pd_mask != info->peripheral_mask) {

					DIAG_LOG(DIAG_DEBUG_USERSPACE,

					"diag: Invalid PD mask given as input\n");

					param->pid = -EINVAL;

					return;

				}

				test_pid = info->pid;

				if (!prev_pid)

					prev_pid = test_pid;

				if (test_pid != prev_pid) {

					DIAG_LOG(DIAG_DEBUG_USERSPACE,

					"diag: One of the PDs is being logged already\n");

					param->pid = -EINVAL;

					return;

				}

			}

		}

		param->pid = prev_pid;

	}

	DIAG_LOG(DIAG_DEBUG_USERSPACE,

	"diag: Pid for the active ODL session: %d\n", param->pid);

}



static int diag_ioctl_register_callback(unsigned long ioarg)

{

	int err = 0;
@@ -2469,6 +2556,7 @@ long diagchar_compat_ioctl(struct file *filp, 
	struct diag_dci_client_tbl *dci_client = NULL;

	struct diag_logging_mode_param_t mode_param;

	struct diag_con_all_param_t con_param;

	struct diag_query_pid_t pid_query;



	switch (iocmd) {

	case DIAG_IOCTL_COMMAND_REG:
@@ -2596,6 +2684,22 @@ long diagchar_compat_ioctl(struct file *filp, 
		else

			result = 0;

		break;

	case DIAG_IOCTL_QUERY_MD_PID:

		if (copy_from_user((void *)&pid_query, (void __user *)ioarg,

				   sizeof(pid_query))) {

			result = -EFAULT;

			break;

		}

		mutex_lock(&driver->md_session_lock);

		diag_ioctl_query_session_pid(&pid_query);

		mutex_unlock(&driver->md_session_lock);



		if (copy_to_user((void __user *)ioarg, &pid_query,

				sizeof(pid_query)))

			result = -EFAULT;

		else

			result = 0;

		break;

	}

	return result;

}
@@ -2611,6 +2715,7 @@ long diagchar_ioctl(struct file *filp, 
	struct diag_dci_client_tbl *dci_client = NULL;

	struct diag_logging_mode_param_t mode_param;

	struct diag_con_all_param_t con_param;

	struct diag_query_pid_t pid_query;



	switch (iocmd) {

	case DIAG_IOCTL_COMMAND_REG:
@@ -2738,6 +2843,23 @@ long diagchar_ioctl(struct file *filp, 
		else

			result = 0;

		break;

	case DIAG_IOCTL_QUERY_MD_PID:

		if (copy_from_user((void *)&pid_query, (void __user *)ioarg,

				   sizeof(pid_query))) {

			result = -EFAULT;

			break;

		}



		mutex_lock(&driver->md_session_lock);

		diag_ioctl_query_session_pid(&pid_query);

		mutex_unlock(&driver->md_session_lock);



		if (copy_to_user((void __user *)ioarg, &pid_query,

				sizeof(pid_query)))

			result = -EFAULT;

		else

			result = 0;

		break;

	}

	return result;

}

include/linux/diagchar.h

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
#define DIAG_IOCTL_HDLC_TOGGLE	38

#define DIAG_IOCTL_QUERY_PD_LOGGING	39

#define DIAG_IOCTL_QUERY_CON_ALL	40

#define DIAG_IOCTL_QUERY_MD_PID	41



/* PC Tools IDs */

#define APQ8060_TOOLS_ID	4062