Merge "diag: Update Peripheral boot logging mask based on tool status" (1f0ff175) · Commits · e / devices / android_kernel_xiaomi_sm6125

drivers/char/diag/diag_masks.c

+11 −3

Original line number	Diff line number	Diff line
		@@ -2191,9 +2191,12 @@ void diag_send_updates_peripheral(uint8_t peripheral)
		if (driver->time_sync_enabled)
		diag_send_time_sync_update(peripheral);
		mutex_lock(&driver->md_session_lock);
		diag_send_msg_mask_update(peripheral, ALL_SSID, ALL_SSID);
		if (driver->set_mask_cmd) {
		diag_send_msg_mask_update(peripheral,
		ALL_SSID, ALL_SSID);
		diag_send_log_mask_update(peripheral, ALL_EQUIP_ID);
		diag_send_event_mask_update(peripheral);
		}
		mutex_unlock(&driver->md_session_lock);
		diag_send_real_time_update(peripheral,
		driver->real_time_mode[DIAG_LOCAL_PROC]);
		@@ -2230,6 +2233,7 @@ int diag_process_apps_masks(unsigned char *buf, int len, int pid)
		break;
		case DIAG_CMD_OP_SET_LOG_MASK:
		hdlr = diag_cmd_set_log_mask;
		driver->set_mask_cmd = 1;
		break;
		case DIAG_CMD_OP_GET_LOG_MASK:
		hdlr = diag_cmd_get_log_mask;
		@@ -2249,17 +2253,21 @@ int diag_process_apps_masks(unsigned char *buf, int len, int pid)
		break;
		case DIAG_CMD_OP_SET_MSG_MASK:
		hdlr = diag_cmd_set_msg_mask;
		driver->set_mask_cmd = 1;
		break;
		case DIAG_CMD_OP_SET_ALL_MSG_MASK:
		hdlr = diag_cmd_set_all_msg_mask;
		driver->set_mask_cmd = 1;
		break;
		}
		} else if (*buf == DIAG_CMD_GET_EVENT_MASK) {
		hdlr = diag_cmd_get_event_mask;
		} else if (*buf == DIAG_CMD_SET_EVENT_MASK) {
		hdlr = diag_cmd_update_event_mask;
		driver->set_mask_cmd = 1;
		} else if (*buf == DIAG_CMD_EVENT_TOGGLE) {
		hdlr = diag_cmd_toggle_events;
		driver->set_mask_cmd = 1;
		}

		if (hdlr)

+1 −0

Original line number	Diff line number	Diff line
		@@ -668,6 +668,7 @@ struct diagchar_dev {
		struct diag_mask_info *log_mask;
		struct diag_mask_info *event_mask;
		struct diag_mask_info *build_time_mask;
		uint8_t set_mask_cmd;
		uint8_t msg_mask_tbl_count;
		uint8_t bt_msg_mask_tbl_count;
		uint16_t event_mask_size;