Merge "diag: Update log and msg mask code ranges" (1ddb833d) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/char/diag/diag_masks.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,8 @@ static const struct diag_ssid_range_t msg_mask_tbl[] = {
		{ .ssid_first = MSG_SSID_22, .ssid_last = MSG_SSID_22_LAST },
		{ .ssid_first = MSG_SSID_23, .ssid_last = MSG_SSID_23_LAST },
		{ .ssid_first = MSG_SSID_24, .ssid_last = MSG_SSID_24_LAST },
		{ .ssid_first = MSG_SSID_25, .ssid_last = MSG_SSID_25_LAST }
		{ .ssid_first = MSG_SSID_25, .ssid_last = MSG_SSID_25_LAST },
		{ .ssid_first = MSG_SSID_26, .ssid_last = MSG_SSID_26_LAST }
		};

		static int diag_save_user_msg_mask(struct diag_md_session_t *info);

+32 −4

Original line number	Diff line number	Diff line
		@@ -142,7 +142,7 @@
		/* This needs to be modified manually now, when we add
		* a new RANGE of SSIDs to the msg_mask_tbl.
		*/
		#define MSG_MASK_TBL_CNT 26
		#define MSG_MASK_TBL_CNT 27
		#define APPS_EVENT_LAST_ID 0xCED

		#define MSG_SSID_0 0
		@@ -195,8 +195,10 @@
		#define MSG_SSID_23_LAST 10416
		#define MSG_SSID_24 10500
		#define MSG_SSID_24_LAST 10505
		#define MSG_SSID_25 0xC000
		#define MSG_SSID_25_LAST 0xC063
		#define MSG_SSID_25 10600
		#define MSG_SSID_25_LAST 10620
		#define MSG_SSID_26 0xC000
		#define MSG_SSID_26_LAST 0xC063

		static const uint32_t msg_bld_masks_0[] = {
		MSG_LVL_LOW,
		@@ -916,13 +918,39 @@ static const uint32_t msg_bld_masks_24[] = {
		};

		static const uint32_t msg_bld_masks_25[] = {
		MSG_LVL_LOW,
		MSG_LVL_LOW,
		MSG_LVL_LOW,
		MSG_LVL_LOW,
		MSG_LVL_LOW,
		MSG_LVL_LOW,
		MSG_LVL_LOW,
		MSG_LVL_LOW,
		MSG_LVL_LOW,
		MSG_LVL_LOW,
		MSG_LVL_LOW,
		MSG_LVL_LOW \| MSG_MASK_5 \| MSG_MASK_6 \| MSG_MASK_7 \|
		MSG_MASK_8 \| MSG_MASK_9 \| MSG_MASK_10 \| MSG_MASK_11,
		MSG_LVL_LOW \| MSG_MASK_5 \| MSG_MASK_6 \| MSG_MASK_7 \|
		MSG_MASK_8 \| MSG_MASK_9 \| MSG_MASK_10,
		MSG_LVL_LOW,
		MSG_LVL_LOW,
		MSG_LVL_LOW,
		MSG_LVL_LOW,
		MSG_LVL_LOW,
		MSG_LVL_LOW,
		MSG_LVL_LOW,
		MSG_LVL_LOW
		};

		static const uint32_t msg_bld_masks_26[] = {
		MSG_LVL_LOW
		};

		/* LOG CODES */
		static const uint32_t log_code_last_tbl[] = {
		0x0, /* EQUIP ID 0 */
		0x1D29, /* EQUIP ID 1 */
		0x1D2E, /* EQUIP ID 1 */
		0x0, /* EQUIP ID 2 */
		0x0, /* EQUIP ID 3 */
		0x4910, /* EQUIP ID 4 */