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

Commit e0d7e56c authored by Ravi Aravamudhan's avatar Ravi Aravamudhan Committed by Matt Wagantall
Browse files

diag: Generalize peripherals and channel types 



Macros referring to different peripherals have the type of channel
in their name and the macros for channel types have the underlying
transport in their name. This patch renames the macros used in
Diag driver.

Change-Id: I0c98e7e4fde68716bf3491e143603618d1740dac
Signed-off-by: default avatarRavi Aravamudhan <aravamud@codeaurora.org>
parent 42f4db37

drivers/char/diag/diag_dci.c

+28 −28
Original line number Diff line number Diff line
@@ -826,16 +826,16 @@ static void dci_process_ctrl_status(unsigned char *buf, int len, int token) 
		}



		switch (*(uint8_t *)temp) {

		case MODEM_DATA:

		case PERIPHERAL_MODEM:

			peripheral_mask = DIAG_CON_MPSS;

			break;

		case LPASS_DATA:

		case PERIPHERAL_LPASS:

			peripheral_mask = DIAG_CON_LPASS;

			break;

		case WCNSS_DATA:

		case PERIPHERAL_WCNSS:

			peripheral_mask = DIAG_CON_WCNSS;

			break;

		case SENSORS_DATA:

		case PERIPHERAL_SENSORS:

			peripheral_mask = DIAG_CON_SENSORS;

			break;

		default:
@@ -1028,9 +1028,9 @@ void extract_dci_pkt_rsp(unsigned char *buf, int len, int data_source, 
	rsp_buf->data_len += rsp_len;

	rsp_buf->data_source = data_source;



	if (token == DCI_LOCAL_PROC && data_source < NUM_SMD_DCI_CHANNELS) {

	if (token == DCI_LOCAL_PROC && data_source < NUM_PERIPHERALS) {

		if (driver->feature[data_source].separate_cmd_rsp &&

					data_source < NUM_SMD_DCI_CMD_CHANNELS)

					data_source < NUM_PERIPHERALS)

			driver->smd_dci_cmd[data_source].in_busy_1 = 1;

		else

			driver->smd_dci[data_source].in_busy_1 = 1;
@@ -1428,7 +1428,7 @@ static int diag_send_dci_pkt(struct diag_cmd_reg_t *entry, 
		return DIAG_DCI_NO_ERROR;

	}



	for (i = 0; i < NUM_SMD_DCI_CHANNELS; i++)

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

		if (entry->proc == i) {

			status = 1;

			break;
@@ -2231,7 +2231,7 @@ int diag_send_dci_event_mask(int token) 
	}

	memcpy(buf, &header, header_size);

	memcpy(buf+header_size, event_mask_ptr, DCI_EVENT_MASK_SIZE);

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

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

		/*

		 * Don't send to peripheral if its regular channel

		 * is down. It may also mean that the peripheral doesn't
@@ -2395,7 +2395,7 @@ int diag_send_dci_log_mask(int token) 
			continue;

		}

		write_len = dci_fill_log_mask(buf, log_mask_ptr);

		for (j = 0; j < NUM_SMD_DCI_CHANNELS && write_len; j++) {

		for (j = 0; j < NUM_PERIPHERALS && write_len; j++) {

			/*

			 * Don't send to peripheral if its regular channel

			 * is down. It may also mean that the peripheral
@@ -2426,16 +2426,16 @@ static int diag_dci_probe(struct platform_device *pdev) 


	switch (pdev->id) {

	case SMD_APPS_MODEM:

		index = MODEM_DATA;

		index = PERIPHERAL_MODEM;

		break;

	case SMD_APPS_QDSP:

		index = LPASS_DATA;

		index = PERIPHERAL_LPASS;

		break;

	case SMD_APPS_WCNSS:

		index = WCNSS_DATA;

		index = PERIPHERAL_WCNSS;

		break;

	case SMD_APPS_DSPS:

		index = SENSORS_DATA;

		index = PERIPHERAL_SENSORS;

		break;

	default:

		pr_debug("diag: In %s Received probe for invalid index %d",
@@ -2464,16 +2464,16 @@ static int diag_dci_cmd_probe(struct platform_device *pdev) 


	switch (pdev->id) {

	case SMD_APPS_MODEM:

		index = MODEM_DATA;

		index = PERIPHERAL_MODEM;

		break;

	case SMD_APPS_QDSP:

		index = LPASS_DATA;

		index = PERIPHERAL_LPASS;

		break;

	case SMD_APPS_WCNSS:

		index = WCNSS_DATA;

		index = PERIPHERAL_WCNSS;

		break;

	case SMD_APPS_DSPS:

		index = SENSORS_DATA;

		index = PERIPHERAL_SENSORS;

		break;

	default:

		pr_debug("diag: In %s Received probe for invalid index %d",
@@ -2626,17 +2626,17 @@ int diag_dci_init(void) 
	if (ret)

		goto err;



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

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

		ret = diag_smd_constructor(&driver->smd_dci[i], i,

							SMD_DCI_TYPE);

							TYPE_DCI);

		if (ret)

			goto err;

	}



	if (driver->supports_separate_cmdrsp) {

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

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

			ret = diag_smd_constructor(&driver->smd_dci_cmd[i],

							i, SMD_DCI_CMD_TYPE);

							i, TYPE_DCI_CMD);

			if (ret)

				goto err;

		}
@@ -2672,11 +2672,11 @@ int diag_dci_init(void) 
err:

	pr_err("diag: Could not initialize diag DCI buffers");

	kfree(driver->apps_dci_buf);

	for (i = 0; i < NUM_SMD_DCI_CHANNELS; i++)

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

		diag_smd_destructor(&driver->smd_dci[i]);



	if (driver->supports_separate_cmdrsp)

		for (i = 0; i < NUM_SMD_DCI_CMD_CHANNELS; i++)

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

			diag_smd_destructor(&driver->smd_dci_cmd[i]);



	if (driver->diag_dci_wq)
@@ -2692,13 +2692,13 @@ void diag_dci_exit(void) 
{

	int i;



	for (i = 0; i < NUM_SMD_DCI_CHANNELS; i++)

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

		diag_smd_destructor(&driver->smd_dci[i]);



	platform_driver_unregister(&msm_diag_dci_driver);



	if (driver->supports_separate_cmdrsp) {

		for (i = 0; i < NUM_SMD_DCI_CMD_CHANNELS; i++)

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

			diag_smd_destructor(&driver->smd_dci_cmd[i]);



		platform_driver_unregister(&msm_diag_dci_cmd_driver);
@@ -2822,10 +2822,10 @@ int diag_dci_register_client(struct diag_dci_reg_tbl_t *reg_entry) 


	mutex_lock(&driver->dci_mutex);

	if (!(driver->num_dci_client)) {

		for (i = 0; i < NUM_SMD_DCI_CHANNELS; i++)

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

			driver->smd_dci[i].in_busy_1 = 0;

		if (driver->supports_separate_cmdrsp)

			for (i = 0; i < NUM_SMD_DCI_CMD_CHANNELS; i++)

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

				driver->smd_dci_cmd[i].in_busy_1 = 0;

	}
@@ -3080,7 +3080,7 @@ int diag_dci_write_proc(int peripheral, int pkt_type, char *buf, int len) 
	struct diag_smd_info *smd_info = NULL;

	int err = 0;



	if (!buf || (peripheral < 0 || peripheral >= NUM_SMD_DCI_CHANNELS)

	if (!buf || (peripheral < 0 || peripheral >= NUM_PERIPHERALS)

		|| !driver->feature[peripheral].rcvd_feature_mask || len < 0) {

		pr_err("diag: In %s, invalid data 0x%p, peripheral: %d, len: %d\n",

				__func__, buf, peripheral, len);

drivers/char/diag/diag_debugfs.c

+173 −142
Original line number Diff line number Diff line
@@ -181,26 +181,26 @@ static ssize_t diag_dbgfs_read_status(struct file *file, char __user *ubuf, 
		"logging_mode: %d\n"

		"rsp_in_busy: %d\n"

		"hdlc disabled: %d\n",

		driver->smd_data[MODEM_DATA].ch,

		driver->smd_data[LPASS_DATA].ch,

		driver->smd_data[WCNSS_DATA].ch,

		driver->smd_data[SENSORS_DATA].ch,

		driver->smd_dci[MODEM_DATA].ch,

		driver->smd_dci[LPASS_DATA].ch,

		driver->smd_dci[WCNSS_DATA].ch,

		driver->smd_dci[SENSORS_DATA].ch,

		driver->smd_cntl[MODEM_DATA].ch,

		driver->smd_cntl[LPASS_DATA].ch,

		driver->smd_cntl[WCNSS_DATA].ch,

		driver->smd_cntl[SENSORS_DATA].ch,

		driver->smd_cmd[MODEM_DATA].ch,

		driver->smd_cmd[LPASS_DATA].ch,

		driver->smd_cmd[WCNSS_DATA].ch,

		driver->smd_cmd[SENSORS_DATA].ch,

		driver->smd_dci_cmd[MODEM_DATA].ch,

		driver->smd_dci_cmd[LPASS_DATA].ch,

		driver->smd_dci_cmd[WCNSS_DATA].ch,

		driver->smd_dci_cmd[SENSORS_DATA].ch,

		driver->smd_data[PERIPHERAL_MODEM].ch,

		driver->smd_data[PERIPHERAL_LPASS].ch,

		driver->smd_data[PERIPHERAL_WCNSS].ch,

		driver->smd_data[PERIPHERAL_SENSORS].ch,

		driver->smd_dci[PERIPHERAL_MODEM].ch,

		driver->smd_dci[PERIPHERAL_LPASS].ch,

		driver->smd_dci[PERIPHERAL_WCNSS].ch,

		driver->smd_dci[PERIPHERAL_SENSORS].ch,

		driver->smd_cntl[PERIPHERAL_MODEM].ch,

		driver->smd_cntl[PERIPHERAL_LPASS].ch,

		driver->smd_cntl[PERIPHERAL_WCNSS].ch,

		driver->smd_cntl[PERIPHERAL_SENSORS].ch,

		driver->smd_cmd[PERIPHERAL_MODEM].ch,

		driver->smd_cmd[PERIPHERAL_LPASS].ch,

		driver->smd_cmd[PERIPHERAL_WCNSS].ch,

		driver->smd_cmd[PERIPHERAL_SENSORS].ch,

		driver->smd_dci_cmd[PERIPHERAL_MODEM].ch,

		driver->smd_dci_cmd[PERIPHERAL_LPASS].ch,

		driver->smd_dci_cmd[PERIPHERAL_WCNSS].ch,

		driver->smd_dci_cmd[PERIPHERAL_SENSORS].ch,

		chk_config_get_id(),

		chk_apps_only(),

		chk_apps_master(),
@@ -208,105 +208,135 @@ static ssize_t diag_dbgfs_read_status(struct file *file, char __user *ubuf, 
		driver->polling_reg_flag,

		driver->use_device_tree,

		driver->supports_separate_cmdrsp,

		driver->feature[MODEM_DATA].separate_cmd_rsp,

		driver->feature[LPASS_DATA].separate_cmd_rsp,

		driver->feature[WCNSS_DATA].separate_cmd_rsp,

		driver->feature[SENSORS_DATA].separate_cmd_rsp,

		driver->smd_data[MODEM_DATA].in_busy_1,

		driver->smd_data[MODEM_DATA].in_busy_2,

		driver->smd_data[LPASS_DATA].in_busy_1,

		driver->smd_data[LPASS_DATA].in_busy_2,

		driver->smd_data[WCNSS_DATA].in_busy_1,

		driver->smd_data[WCNSS_DATA].in_busy_2,

		driver->smd_data[SENSORS_DATA].in_busy_1,

		driver->smd_data[SENSORS_DATA].in_busy_2,

		driver->smd_dci[MODEM_DATA].in_busy_1,

		driver->smd_dci[LPASS_DATA].in_busy_1,

		driver->smd_dci[WCNSS_DATA].in_busy_1,

		driver->smd_dci[SENSORS_DATA].in_busy_1,

		driver->smd_cmd[MODEM_DATA].in_busy_1,

		driver->smd_cmd[MODEM_DATA].in_busy_2,

		driver->smd_cmd[LPASS_DATA].in_busy_1,

		driver->smd_cmd[LPASS_DATA].in_busy_2,

		driver->smd_cmd[WCNSS_DATA].in_busy_1,

		driver->smd_cmd[WCNSS_DATA].in_busy_2,

		driver->smd_cmd[SENSORS_DATA].in_busy_1,

		driver->smd_cmd[SENSORS_DATA].in_busy_2,

		driver->smd_dci_cmd[MODEM_DATA].in_busy_1,

		driver->smd_dci_cmd[LPASS_DATA].in_busy_1,

		driver->smd_dci_cmd[WCNSS_DATA].in_busy_1,

		driver->smd_dci_cmd[SENSORS_DATA].in_busy_1,

		driver->feature[MODEM_DATA].stm_support,

		driver->feature[LPASS_DATA].stm_support,

		driver->feature[WCNSS_DATA].stm_support,

		driver->feature[SENSORS_DATA].stm_support,

		driver->stm_state[MODEM_DATA],

		driver->stm_state[LPASS_DATA],

		driver->stm_state[WCNSS_DATA],

		driver->stm_state[SENSORS_DATA],

		driver->feature[PERIPHERAL_MODEM].separate_cmd_rsp,

		driver->feature[PERIPHERAL_LPASS].separate_cmd_rsp,

		driver->feature[PERIPHERAL_WCNSS].separate_cmd_rsp,

		driver->feature[PERIPHERAL_SENSORS].separate_cmd_rsp,

		driver->smd_data[PERIPHERAL_MODEM].in_busy_1,

		driver->smd_data[PERIPHERAL_MODEM].in_busy_2,

		driver->smd_data[PERIPHERAL_LPASS].in_busy_1,

		driver->smd_data[PERIPHERAL_LPASS].in_busy_2,

		driver->smd_data[PERIPHERAL_WCNSS].in_busy_1,

		driver->smd_data[PERIPHERAL_WCNSS].in_busy_2,

		driver->smd_data[PERIPHERAL_SENSORS].in_busy_1,

		driver->smd_data[PERIPHERAL_SENSORS].in_busy_2,

		driver->smd_dci[PERIPHERAL_MODEM].in_busy_1,

		driver->smd_dci[PERIPHERAL_LPASS].in_busy_1,

		driver->smd_dci[PERIPHERAL_WCNSS].in_busy_1,

		driver->smd_dci[PERIPHERAL_SENSORS].in_busy_1,

		driver->smd_cmd[PERIPHERAL_MODEM].in_busy_1,

		driver->smd_cmd[PERIPHERAL_MODEM].in_busy_2,

		driver->smd_cmd[PERIPHERAL_LPASS].in_busy_1,

		driver->smd_cmd[PERIPHERAL_LPASS].in_busy_2,

		driver->smd_cmd[PERIPHERAL_WCNSS].in_busy_1,

		driver->smd_cmd[PERIPHERAL_WCNSS].in_busy_2,

		driver->smd_cmd[PERIPHERAL_SENSORS].in_busy_1,

		driver->smd_cmd[PERIPHERAL_SENSORS].in_busy_2,

		driver->smd_dci_cmd[PERIPHERAL_MODEM].in_busy_1,

		driver->smd_dci_cmd[PERIPHERAL_LPASS].in_busy_1,

		driver->smd_dci_cmd[PERIPHERAL_WCNSS].in_busy_1,

		driver->smd_dci_cmd[PERIPHERAL_SENSORS].in_busy_1,

		driver->feature[PERIPHERAL_MODEM].stm_support,

		driver->feature[PERIPHERAL_LPASS].stm_support,

		driver->feature[PERIPHERAL_WCNSS].stm_support,

		driver->feature[PERIPHERAL_SENSORS].stm_support,

		driver->stm_state[PERIPHERAL_MODEM],

		driver->stm_state[PERIPHERAL_LPASS],

		driver->stm_state[PERIPHERAL_WCNSS],

		driver->stm_state[PERIPHERAL_SENSORS],

		driver->stm_state[APPS_DATA],

		driver->stm_state_requested[MODEM_DATA],

		driver->stm_state_requested[LPASS_DATA],

		driver->stm_state_requested[WCNSS_DATA],

		driver->stm_state_requested[SENSORS_DATA],

		driver->stm_state_requested[PERIPHERAL_MODEM],

		driver->stm_state_requested[PERIPHERAL_LPASS],

		driver->stm_state_requested[PERIPHERAL_WCNSS],

		driver->stm_state_requested[PERIPHERAL_SENSORS],

		driver->stm_state_requested[APPS_DATA],

		driver->supports_apps_hdlc_encoding,

		driver->feature[MODEM_DATA].encode_hdlc,

		driver->feature[LPASS_DATA].encode_hdlc,

		driver->feature[WCNSS_DATA].encode_hdlc,

		driver->feature[SENSORS_DATA].encode_hdlc,

		(unsigned int)driver->smd_data[MODEM_DATA].buf_in_1_size,

		(unsigned int)driver->smd_data[MODEM_DATA].buf_in_2_size,

		(unsigned int)driver->smd_data[LPASS_DATA].buf_in_1_size,

		(unsigned int)driver->smd_data[LPASS_DATA].buf_in_2_size,

		(unsigned int)driver->smd_data[WCNSS_DATA].buf_in_1_size,

		(unsigned int)driver->smd_data[WCNSS_DATA].buf_in_2_size,

		(unsigned int)driver->smd_data[SENSORS_DATA].buf_in_1_size,

		(unsigned int)driver->smd_data[SENSORS_DATA].buf_in_2_size,

		(unsigned int)driver->smd_data[MODEM_DATA].buf_in_1_raw_size,

		(unsigned int)driver->smd_data[MODEM_DATA].buf_in_2_raw_size,

		(unsigned int)driver->smd_data[LPASS_DATA].buf_in_1_raw_size,

		(unsigned int)driver->smd_data[LPASS_DATA].buf_in_2_raw_size,

		(unsigned int)driver->smd_data[WCNSS_DATA].buf_in_1_raw_size,

		(unsigned int)driver->smd_data[WCNSS_DATA].buf_in_2_raw_size,

		(unsigned int)driver->smd_data[SENSORS_DATA].buf_in_1_raw_size,

		(unsigned int)driver->smd_data[SENSORS_DATA].buf_in_2_raw_size,

		(unsigned int)driver->smd_cmd[MODEM_DATA].buf_in_1_size,

		(unsigned int)driver->smd_cmd[MODEM_DATA].buf_in_1_raw_size,

		(unsigned int)driver->smd_cmd[LPASS_DATA].buf_in_1_size,

		(unsigned int)driver->smd_cmd[LPASS_DATA].buf_in_1_raw_size,

		(unsigned int)driver->smd_cmd[WCNSS_DATA].buf_in_1_size,

		(unsigned int)driver->smd_cmd[WCNSS_DATA].buf_in_1_raw_size,

		(unsigned int)driver->smd_cmd[SENSORS_DATA].buf_in_1_size,

		(unsigned int)driver->smd_cmd[SENSORS_DATA].buf_in_1_raw_size,

		(unsigned int)driver->smd_cntl[MODEM_DATA].buf_in_1_size,

		(unsigned int)driver->smd_cntl[LPASS_DATA].buf_in_1_size,

		(unsigned int)driver->smd_cntl[WCNSS_DATA].buf_in_1_size,

		(unsigned int)driver->smd_cntl[SENSORS_DATA].buf_in_1_size,

		(unsigned int)driver->smd_dci[MODEM_DATA].buf_in_1_size,

		(unsigned int)driver->smd_dci_cmd[MODEM_DATA].buf_in_1_size,

		(unsigned int)driver->smd_dci[LPASS_DATA].buf_in_1_size,

		(unsigned int)driver->smd_dci_cmd[LPASS_DATA].buf_in_1_size,

		(unsigned int)driver->smd_dci[WCNSS_DATA].buf_in_1_size,

		(unsigned int)driver->smd_dci_cmd[WCNSS_DATA].buf_in_1_size,

		(unsigned int)driver->smd_dci[SENSORS_DATA].buf_in_1_size,

		(unsigned int)driver->smd_dci_cmd[SENSORS_DATA].buf_in_1_size,

		driver->feature[MODEM_DATA].rcvd_feature_mask,

		driver->feature[LPASS_DATA].rcvd_feature_mask,

		driver->feature[WCNSS_DATA].rcvd_feature_mask,

		driver->feature[SENSORS_DATA].rcvd_feature_mask,

		driver->feature[MODEM_DATA].mask_centralization,

		driver->feature[LPASS_DATA].mask_centralization,

		driver->feature[WCNSS_DATA].mask_centralization,

		driver->feature[SENSORS_DATA].mask_centralization,

		driver->feature[MODEM_DATA].peripheral_buffering,

		driver->feature[LPASS_DATA].peripheral_buffering,

		driver->feature[WCNSS_DATA].peripheral_buffering,

		driver->feature[SENSORS_DATA].peripheral_buffering,

		driver->buffering_mode[MODEM_DATA].mode,

		driver->buffering_mode[LPASS_DATA].mode,

		driver->buffering_mode[WCNSS_DATA].mode,

		driver->buffering_mode[SENSORS_DATA].mode,

		driver->feature[PERIPHERAL_MODEM].encode_hdlc,

		driver->feature[PERIPHERAL_LPASS].encode_hdlc,

		driver->feature[PERIPHERAL_WCNSS].encode_hdlc,

		driver->feature[PERIPHERAL_SENSORS].encode_hdlc,

		(unsigned int)driver->smd_data[PERIPHERAL_MODEM].buf_in_1_size,

		(unsigned int)driver->smd_data[PERIPHERAL_MODEM].buf_in_2_size,

		(unsigned int)driver->smd_data[PERIPHERAL_LPASS].buf_in_1_size,

		(unsigned int)driver->smd_data[PERIPHERAL_LPASS].buf_in_2_size,

		(unsigned int)driver->smd_data[PERIPHERAL_WCNSS].buf_in_1_size,

		(unsigned int)driver->smd_data[PERIPHERAL_WCNSS].buf_in_2_size,

		(unsigned int)

		driver->smd_data[PERIPHERAL_SENSORS].buf_in_1_size,

		(unsigned int)

		driver->smd_data[PERIPHERAL_SENSORS].buf_in_2_size,

		(unsigned int)

		driver->smd_data[PERIPHERAL_MODEM].buf_in_1_raw_size,

		(unsigned int)

		driver->smd_data[PERIPHERAL_MODEM].buf_in_2_raw_size,

		(unsigned int)

		driver->smd_data[PERIPHERAL_LPASS].buf_in_1_raw_size,

		(unsigned int)

		driver->smd_data[PERIPHERAL_LPASS].buf_in_2_raw_size,

		(unsigned int)

		driver->smd_data[PERIPHERAL_WCNSS].buf_in_1_raw_size,

		(unsigned int)

		driver->smd_data[PERIPHERAL_WCNSS].buf_in_2_raw_size,

		(unsigned int)

		driver->smd_data[PERIPHERAL_SENSORS].buf_in_1_raw_size,

		(unsigned int)

		driver->smd_data[PERIPHERAL_SENSORS].buf_in_2_raw_size,

		(unsigned int)

		driver->smd_cmd[PERIPHERAL_MODEM].buf_in_1_size,

		(unsigned int)

		driver->smd_cmd[PERIPHERAL_MODEM].buf_in_1_raw_size,

		(unsigned int)

		driver->smd_cmd[PERIPHERAL_LPASS].buf_in_1_size,

		(unsigned int)

		driver->smd_cmd[PERIPHERAL_LPASS].buf_in_1_raw_size,

		(unsigned int)

		driver->smd_cmd[PERIPHERAL_WCNSS].buf_in_1_size,

		(unsigned int)

		driver->smd_cmd[PERIPHERAL_WCNSS].buf_in_1_raw_size,

		(unsigned int)

		driver->smd_cmd[PERIPHERAL_SENSORS].buf_in_1_size,

		(unsigned int)

		driver->smd_cmd[PERIPHERAL_SENSORS].buf_in_1_raw_size,

		(unsigned int)

		driver->smd_cntl[PERIPHERAL_MODEM].buf_in_1_size,

		(unsigned int)

		driver->smd_cntl[PERIPHERAL_LPASS].buf_in_1_size,

		(unsigned int)

		driver->smd_cntl[PERIPHERAL_WCNSS].buf_in_1_size,

		(unsigned int)

		driver->smd_cntl[PERIPHERAL_SENSORS].buf_in_1_size,

		(unsigned int)

		driver->smd_dci[PERIPHERAL_MODEM].buf_in_1_size,

		(unsigned int)

		driver->smd_dci_cmd[PERIPHERAL_MODEM].buf_in_1_size,

		(unsigned int)

		driver->smd_dci[PERIPHERAL_LPASS].buf_in_1_size,

		(unsigned int)

		driver->smd_dci_cmd[PERIPHERAL_LPASS].buf_in_1_size,

		(unsigned int)

		driver->smd_dci[PERIPHERAL_WCNSS].buf_in_1_size,

		(unsigned int)

		driver->smd_dci_cmd[PERIPHERAL_WCNSS].buf_in_1_size,

		(unsigned int)

		driver->smd_dci[PERIPHERAL_SENSORS].buf_in_1_size,

		(unsigned int)

		driver->smd_dci_cmd[PERIPHERAL_SENSORS].buf_in_1_size,

		driver->feature[PERIPHERAL_MODEM].rcvd_feature_mask,

		driver->feature[PERIPHERAL_LPASS].rcvd_feature_mask,

		driver->feature[PERIPHERAL_WCNSS].rcvd_feature_mask,

		driver->feature[PERIPHERAL_SENSORS].rcvd_feature_mask,

		driver->feature[PERIPHERAL_MODEM].mask_centralization,

		driver->feature[PERIPHERAL_LPASS].mask_centralization,

		driver->feature[PERIPHERAL_WCNSS].mask_centralization,

		driver->feature[PERIPHERAL_SENSORS].mask_centralization,

		driver->feature[PERIPHERAL_MODEM].peripheral_buffering,

		driver->feature[PERIPHERAL_LPASS].peripheral_buffering,

		driver->feature[PERIPHERAL_WCNSS].peripheral_buffering,

		driver->feature[PERIPHERAL_SENSORS].peripheral_buffering,

		driver->buffering_mode[PERIPHERAL_MODEM].mode,

		driver->buffering_mode[PERIPHERAL_LPASS].mode,

		driver->buffering_mode[PERIPHERAL_WCNSS].mode,

		driver->buffering_mode[PERIPHERAL_SENSORS].mode,

		driver->logging_mode,

		driver->rsp_buf_busy,

		driver->hdlc_disabled);
@@ -497,53 +527,53 @@ static ssize_t diag_dbgfs_read_workpending(struct file *file, 
		"WCNSS dci diag_notify_update_smd_work: %d\n"

		"SENSORS dci diag_notify_update_smd_work: %d\n",

		work_pending(&(driver->diag_drain_work)),

		work_pending(&(driver->smd_data[MODEM_DATA].

		work_pending(&(driver->smd_data[PERIPHERAL_MODEM].

							diag_read_smd_work)),

		work_pending(&(driver->smd_data[LPASS_DATA].

		work_pending(&(driver->smd_data[PERIPHERAL_LPASS].

							diag_read_smd_work)),

		work_pending(&(driver->smd_data[WCNSS_DATA].

		work_pending(&(driver->smd_data[PERIPHERAL_WCNSS].

							diag_read_smd_work)),

		work_pending(&(driver->smd_data[SENSORS_DATA].

		work_pending(&(driver->smd_data[PERIPHERAL_SENSORS].

							diag_read_smd_work)),

		work_pending(&(driver->smd_cntl[MODEM_DATA].

		work_pending(&(driver->smd_cntl[PERIPHERAL_MODEM].

							diag_read_smd_work)),

		work_pending(&(driver->smd_cntl[LPASS_DATA].

		work_pending(&(driver->smd_cntl[PERIPHERAL_LPASS].

							diag_read_smd_work)),

		work_pending(&(driver->smd_cntl[WCNSS_DATA].

		work_pending(&(driver->smd_cntl[PERIPHERAL_WCNSS].

							diag_read_smd_work)),

		work_pending(&(driver->smd_cntl[SENSORS_DATA].

		work_pending(&(driver->smd_cntl[PERIPHERAL_SENSORS].

							diag_read_smd_work)),

		work_pending(&(driver->smd_dci[MODEM_DATA].

		work_pending(&(driver->smd_dci[PERIPHERAL_MODEM].

							diag_read_smd_work)),

		work_pending(&(driver->smd_dci[LPASS_DATA].

		work_pending(&(driver->smd_dci[PERIPHERAL_LPASS].

							diag_read_smd_work)),

		work_pending(&(driver->smd_dci[WCNSS_DATA].

		work_pending(&(driver->smd_dci[PERIPHERAL_WCNSS].

							diag_read_smd_work)),

		work_pending(&(driver->smd_dci[SENSORS_DATA].

		work_pending(&(driver->smd_dci[PERIPHERAL_SENSORS].

							diag_read_smd_work)),

		work_pending(&(driver->smd_data[MODEM_DATA].

		work_pending(&(driver->smd_data[PERIPHERAL_MODEM].

						diag_notify_update_smd_work)),

		work_pending(&(driver->smd_data[LPASS_DATA].

		work_pending(&(driver->smd_data[PERIPHERAL_LPASS].

						diag_notify_update_smd_work)),

		work_pending(&(driver->smd_data[WCNSS_DATA].

		work_pending(&(driver->smd_data[PERIPHERAL_WCNSS].

						diag_notify_update_smd_work)),

		work_pending(&(driver->smd_data[SENSORS_DATA].

		work_pending(&(driver->smd_data[PERIPHERAL_SENSORS].

						diag_notify_update_smd_work)),

		work_pending(&(driver->smd_cntl[MODEM_DATA].

		work_pending(&(driver->smd_cntl[PERIPHERAL_MODEM].

						diag_notify_update_smd_work)),

		work_pending(&(driver->smd_cntl[LPASS_DATA].

		work_pending(&(driver->smd_cntl[PERIPHERAL_LPASS].

						diag_notify_update_smd_work)),

		work_pending(&(driver->smd_cntl[WCNSS_DATA].

		work_pending(&(driver->smd_cntl[PERIPHERAL_WCNSS].

						diag_notify_update_smd_work)),

		work_pending(&(driver->smd_cntl[SENSORS_DATA].

		work_pending(&(driver->smd_cntl[PERIPHERAL_SENSORS].

						diag_notify_update_smd_work)),

		work_pending(&(driver->smd_dci[MODEM_DATA].

		work_pending(&(driver->smd_dci[PERIPHERAL_MODEM].

						diag_notify_update_smd_work)),

		work_pending(&(driver->smd_dci[LPASS_DATA].

		work_pending(&(driver->smd_dci[PERIPHERAL_LPASS].

						diag_notify_update_smd_work)),

		work_pending(&(driver->smd_dci[WCNSS_DATA].

		work_pending(&(driver->smd_dci[PERIPHERAL_WCNSS].

						diag_notify_update_smd_work)),

		work_pending(&(driver->smd_dci[SENSORS_DATA].

		work_pending(&(driver->smd_dci[PERIPHERAL_SENSORS].

						diag_notify_update_smd_work)));

	ret = simple_read_from_buffer(ubuf, count, ppos, buf, ret);
@@ -584,8 +614,9 @@ static ssize_t diag_dbgfs_read_table(struct file *file, char __user *ubuf, 
	if (diag_dbgfs_table_index == 0) {

		bytes_written = scnprintf(buf+bytes_in_buffer, bytes_remaining,

					  "Client ids: Modem: %d, LPASS: %d, WCNSS: %d, SLPI: %d, APPS: %d\n",

					  MODEM_DATA, LPASS_DATA, WCNSS_DATA,

					  SENSORS_DATA, APPS_DATA);

					  PERIPHERAL_MODEM, PERIPHERAL_LPASS,

					  PERIPHERAL_WCNSS, PERIPHERAL_SENSORS,

					  APPS_DATA);

		bytes_in_buffer += bytes_written;

		bytes_remaining -= bytes_written;

	}

drivers/char/diag/diag_masks.c

+18 −18
Original line number Diff line number Diff line
@@ -65,17 +65,17 @@ static int diag_apps_responds(void) 
	 * Modem channel is up, the feature mask is received from Modem

	 * and if Modem supports Mask Centralization.

	 */

	if (chk_apps_only()) {

		if (driver->smd_data[MODEM_DATA].ch &&

			driver->feature[MODEM_DATA].rcvd_feature_mask) {

			if (driver->feature[MODEM_DATA].mask_centralization)

	if (!chk_apps_only())

		return 0;



	if (driver->smd_data[PERIPHERAL_MODEM].ch &&

	    driver->feature[PERIPHERAL_MODEM].rcvd_feature_mask) {

		if (driver->feature[PERIPHERAL_MODEM].mask_centralization)

			return 1;

		return 0;

	}

	return 1;

}

	return 0;

}



static void diag_send_log_mask_update(struct diag_smd_info *smd_info,

				      int equip_id)
@@ -595,7 +595,7 @@ static int diag_cmd_set_msg_mask(unsigned char *src_buf, int src_len, 
		mask_size = dest_len - write_len;

	memcpy(dest_buf + write_len, src_buf + header_len, mask_size);

	write_len += mask_size;

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

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

		diag_send_msg_mask_update(&driver->smd_cntl[i],

					  req->ssid_first, req->ssid_last);

	}
@@ -644,7 +644,7 @@ static int diag_cmd_set_all_msg_mask(unsigned char *src_buf, int src_len, 
	memcpy(dest_buf, &rsp, header_len);

	write_len += header_len;



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

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

		diag_send_msg_mask_update(&driver->smd_cntl[i], ALL_SSID,

					  ALL_SSID);

	}
@@ -730,7 +730,7 @@ static int diag_cmd_update_event_mask(unsigned char *src_buf, int src_len, 
	memcpy(dest_buf + write_len, event_mask.ptr, mask_len);

	write_len += mask_len;



	for (i = 0; i < NUM_SMD_CONTROL_CHANNELS; i++)

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

		diag_send_event_mask_update(&driver->smd_cntl[i]);



	return write_len;
@@ -768,7 +768,7 @@ static int diag_cmd_toggle_events(unsigned char *src_buf, int src_len, 
	 */

	header.cmd_code = DIAG_CMD_EVENT_TOGGLE;

	header.padding = 0;

	for (i = 0; i < NUM_SMD_CONTROL_CHANNELS; i++)

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

		diag_send_event_mask_update(&driver->smd_cntl[i]);

	memcpy(dest_buf, &header, sizeof(header));

	write_len += sizeof(header);
@@ -963,7 +963,7 @@ static int diag_cmd_set_log_mask(unsigned char *src_buf, int src_len, 
	memcpy(dest_buf + write_len, src_buf + read_len, payload_len);

	write_len += payload_len;



	for (i = 0; i < NUM_SMD_CONTROL_CHANNELS; i++)

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

		diag_send_log_mask_update(&driver->smd_cntl[i], req->equip_id);

end:

	return write_len;
@@ -1002,7 +1002,7 @@ static int diag_cmd_disable_log_mask(unsigned char *src_buf, int src_len, 
	header.status = LOG_STATUS_SUCCESS;

	memcpy(dest_buf, &header, sizeof(struct diag_log_config_rsp_t));

	write_len += sizeof(struct diag_log_config_rsp_t);

	for (i = 0; i < NUM_SMD_CONTROL_CHANNELS; i++)

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

		diag_send_log_mask_update(&driver->smd_cntl[i], ALL_EQUIP_ID);



	return write_len;
@@ -1244,7 +1244,7 @@ static int diag_msg_mask_init(void) 
	}

	driver->msg_mask = &msg_mask;



	for (i = 0; i < NUM_SMD_CONTROL_CHANNELS; i++)

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

		driver->max_ssid_count[i] = 0;



	return 0;
@@ -1309,7 +1309,7 @@ static int diag_log_mask_init(void) 
		return err;

	driver->log_mask = &log_mask;



	for (i = 0; i < NUM_SMD_CONTROL_CHANNELS; i++)

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

		driver->num_equip_id[i] = 0;



	return 0;
@@ -1342,7 +1342,7 @@ static int diag_event_mask_init(void) 
	driver->last_event_id = APPS_EVENT_LAST_ID;

	driver->event_mask = &event_mask;



	for (i = 0; i < NUM_SMD_CONTROL_CHANNELS; i++)

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

		driver->num_event_id[i] = 0;



	return 0;

drivers/char/diag/diagchar.h

+27 −29

File changed.

Preview size limit exceeded, changes collapsed.

drivers/char/diag/diagchar_core.c

+9 −9

File changed.

Preview size limit exceeded, changes collapsed.