ソースを参照

qcacmn: Fix serialization log to use proper module ID

Fix serialization log to use proper module ID.
Replace QDF_MODULE_ID_HDD with QDF_MODULE_ID_SERIALIZATION.

Fix logging levels as per logging guidelines.
INFO_HIGH is not supposed to be used anymore.

Change-Id: I349254abc36565e5ba520d46588e5c3e27178ad9
CRs-Fixed: 2090993
Varun Reddy Yeturu 7 年 前
コミット
2576425ab6

+ 2 - 0
qdf/linux/src/qdf_trace.c

@@ -2055,6 +2055,7 @@ struct category_name_info g_qdf_category_name[MAX_SUPPORTED_CATEGORY] = {
 	[QDF_MODULE_ID_OFFCHAN_TXRX] = {"OFFCHAN"},
 	[QDF_MODULE_ID_REGULATORY] = {"REGULATORY"},
 	[QDF_MODULE_ID_OBJ_MGR] = {"OBJMGR"},
+	[QDF_MODULE_ID_SERIALIZATION] = {"SER"},
 	[QDF_MODULE_ID_ANY] = {"ANY"},
 };
 EXPORT_SYMBOL(g_qdf_category_name);
@@ -2519,6 +2520,7 @@ static void set_default_trace_levels(struct category_info *cinfo)
 		[QDF_MODULE_ID_P2P] = QDF_TRACE_LEVEL_NONE,
 		[QDF_MODULE_ID_OFFCHAN_TXRX] = QDF_TRACE_LEVEL_NONE,
 		[QDF_MODULE_ID_OBJ_MGR] = QDF_TRACE_LEVEL_INFO,
+		[QDF_MODULE_ID_SERIALIZATION] = QDF_TRACE_LEVEL_NONE,
 		[QDF_MODULE_ID_ANY] = QDF_TRACE_LEVEL_NONE,
 	};
 

+ 5 - 5
umac/cmn_services/serialization/src/wlan_serialization_api.c

@@ -151,7 +151,7 @@ enum wlan_serialization_cmd_status
 wlan_serialization_non_scan_cmd_status(struct wlan_objmgr_pdev *pdev,
 		enum wlan_serialization_cmd_type cmd_id)
 {
-	serialization_info("pdev non cmd status entry");
+	serialization_enter();
 
 	return WLAN_SER_CMD_NOT_FOUND;
 }
@@ -162,7 +162,7 @@ wlan_serialization_cancel_request(
 {
 	QDF_STATUS status;
 
-	serialization_info("serialization cancel request entry");
+	serialization_enter();
 	if (!req) {
 		serialization_err("given request is empty");
 		return WLAN_SER_CMD_NOT_FOUND;
@@ -181,7 +181,7 @@ void wlan_serialization_remove_cmd(
 {
 	QDF_STATUS status;
 
-	serialization_info("serialization remove request entry");
+	serialization_enter();
 	if (!cmd) {
 		serialization_err("given request is empty");
 		QDF_ASSERT(0);
@@ -207,7 +207,7 @@ wlan_serialization_request(struct wlan_serialization_command *cmd)
 	struct wlan_serialization_psoc_priv_obj *ser_soc_obj;
 	union wlan_serialization_rules_info info;
 
-	serialization_info("serialization queue cmd entry");
+	serialization_enter();
 	if (!cmd) {
 		serialization_err("serialization cmd is null");
 		return WLAN_SER_CMD_DENIED_UNSPECIFIED;
@@ -262,7 +262,7 @@ wlan_serialization_vdev_scan_status(struct wlan_objmgr_vdev *vdev)
 void wlan_serialization_flush_cmd(
 		struct wlan_serialization_queued_cmd_info *cmd)
 {
-	serialization_info("serialization cmd flushed");
+	serialization_enter();
 	if (!cmd) {
 		serialization_err("cmd is null, can't flush");
 		return;

+ 5 - 5
umac/cmn_services/serialization/src/wlan_serialization_dequeue.c

@@ -48,13 +48,13 @@ void wlan_serialization_move_pending_to_active(
 		pending_queue = &ser_pdev_obj->pending_list;
 
 	if (qdf_list_empty(pending_queue)) {
-		serialization_info("nothing to move from pend to active queue");
-		serialization_info("cmd_type - %d", cmd_type);
+		serialization_debug("nothing to move from pend to active que");
+		serialization_debug("cmd_type - %d", cmd_type);
 		return;
 	}
 	if (QDF_STATUS_SUCCESS != qdf_list_peek_front(pending_queue, &nnode)) {
 		serialization_err("can't read from pending queue");
-		serialization_info("cmd_type - %d", cmd_type);
+		serialization_debug("cmd_type - %d", cmd_type);
 		return;
 	}
 	cmd_list = qdf_container_of(nnode,
@@ -411,7 +411,7 @@ wlan_serialization_dequeue_cmd(struct wlan_serialization_command *cmd,
 		serialization_err("ser_pdev_obj is empty");
 		return status;
 	}
-	serialization_info("command high_priority[%d] cmd_type[%d] cmd_id[%d]",
+	serialization_debug("command high_priority[%d] cmd_type[%d] cmd_id[%d]",
 			cmd->is_high_priority, cmd->cmd_type, cmd->cmd_id);
 	/*
 	 *  Pass the copy of command, instead of actual command because
@@ -450,7 +450,7 @@ wlan_serialization_dequeue_cmd(struct wlan_serialization_command *cmd,
 			QDF_ASSERT(0);
 			status = WLAN_SER_CMD_NOT_FOUND;
 		}
-		serialization_info("Request to remove only from active queue");
+		serialization_debug("Request to remove only from active queue");
 		return status;
 	}
 	qdf_mem_copy(&cmd_backup, cmd,

+ 1 - 1
umac/cmn_services/serialization/src/wlan_serialization_enqueue.c

@@ -173,7 +173,7 @@ wlan_serialization_enqueue_cmd(struct wlan_serialization_command *cmd,
 		return status;
 	}
 
-	serialization_info("command high_priority[%d] cmd_type[%d] cmd_id[%d]",
+	serialization_debug("command high_priority[%d] cmd_type[%d] cmd_id[%d]",
 			cmd->is_high_priority, cmd->cmd_type, cmd->cmd_id);
 	if (cmd->cmd_type < WLAN_SER_CMD_NONSCAN) {
 		if (is_cmd_for_active_queue)

+ 4 - 4
umac/cmn_services/serialization/src/wlan_serialization_legacy_api.c

@@ -152,7 +152,7 @@ wlan_serialization_peek_head_active_cmd_using_psoc(
 
 	cmd_list = qdf_container_of(nnode,
 			struct wlan_serialization_command_list, node);
-	serialization_info("cmd_type[%d]", cmd_list->cmd.cmd_type);
+	serialization_debug("cmd_type[%d]", cmd_list->cmd.cmd_type);
 	cmd = &cmd_list->cmd;
 
 	return cmd;
@@ -191,7 +191,7 @@ wlan_serialization_peek_head_pending_cmd_using_psoc(
 	}
 	cmd_list = qdf_container_of(nnode,
 			struct wlan_serialization_command_list, node);
-	serialization_info("cmd_type[%d] matched", cmd_list->cmd.cmd_type);
+	serialization_debug("cmd_type[%d] matched", cmd_list->cmd.cmd_type);
 	cmd = &cmd_list->cmd;
 
 	return cmd;
@@ -239,7 +239,7 @@ wlan_serialization_get_list_next_node(qdf_list_t *queue,
 		serialization_err("Can't locate next command");
 		return NULL;
 	} else {
-		serialization_info("next node is empty, so fine");
+		serialization_debug("next node is empty, so fine");
 		return NULL;
 	}
 }
@@ -364,7 +364,7 @@ wlan_serialization_get_scan_cmd_using_scan_id(
 				struct wlan_serialization_command_list, node);
 		if ((cmd_list->cmd.cmd_id == scan_id) &&
 				(cmd_list->cmd.vdev == vdev)) {
-			serialization_info("cmd_id[%d] matched", scan_id);
+			serialization_debug("cmd_id[%d] matched", scan_id);
 			cmd = &cmd_list->cmd;
 			break;
 		}

+ 6 - 6
umac/cmn_services/serialization/src/wlan_serialization_main.c

@@ -106,7 +106,7 @@ static QDF_STATUS wlan_serialization_psoc_obj_create_notification(
 	wlan_objmgr_psoc_component_obj_attach(psoc,
 			WLAN_UMAC_COMP_SERIALIZATION, soc_ser_obj,
 			QDF_STATUS_SUCCESS);
-	serialization_info("ser psoc obj created");
+	serialization_debug("ser psoc obj created");
 
 	return QDF_STATUS_SUCCESS;
 }
@@ -128,7 +128,7 @@ static void wlan_serialization_destroy_cmd_pool(
 		qdf_list_remove_front(&ser_pdev_obj->global_cmd_pool_list,
 				&node);
 		cmd_list = (struct wlan_serialization_command_list *)node;
-		serialization_info("Node being freed from global pool %pK",
+		serialization_debug("Node being freed from global pool %pK",
 				cmd_list);
 		qdf_mem_free(cmd_list);
 
@@ -168,7 +168,7 @@ wlan_serialization_create_cmd_pool(struct wlan_objmgr_pdev *pdev,
 		qdf_list_insert_back(
 				&ser_pdev_obj->global_cmd_pool_list,
 				&cmd_list_ptr->node);
-		serialization_info("Created node at %pK and inserted to pool",
+		serialization_debug("Created node at %pK and inserted to pool",
 				cmd_list_ptr);
 	}
 
@@ -254,7 +254,7 @@ static QDF_STATUS wlan_serialization_psoc_obj_destroy_notification(
 			ser_soc_obj);
 	if (status != QDF_STATUS_SUCCESS)
 		serialization_err("ser psoc private obj detach failed");
-	serialization_info("ser psoc obj deleted with status %d", status);
+	serialization_debug("ser psoc obj deleted with status %d", status);
 	qdf_mem_free(ser_soc_obj);
 
 	return status;
@@ -290,7 +290,7 @@ static QDF_STATUS wlan_serialization_pdev_obj_destroy_notification(
 	wlan_serialization_destroy_list(ser_pdev_obj,
 					&ser_pdev_obj->pending_scan_list);
 	wlan_serialization_destroy_cmd_pool(ser_pdev_obj);
-	serialization_info("ser pdev obj deleted with status %d", status);
+	serialization_debug("ser pdev obj deleted with status %d", status);
 	qdf_mem_free(ser_pdev_obj);
 
 	return status;
@@ -393,7 +393,7 @@ QDF_STATUS wlan_serialization_init(void)
 		serialization_err("Failed to reg vdev ser obj delete handler");
 		goto err_vdev_delete;
 	}
-	serialization_info("serialization handlers registered with obj mgr");
+	serialization_debug("serialization handlers registered with obj mgr");
 	/*
 	 * Initialize the structure so all callbacks are registered
 	 * initially as NULL.

+ 5 - 4
umac/cmn_services/serialization/src/wlan_serialization_main_i.h

@@ -33,7 +33,7 @@
 #define WLAN_SERIALIZATION_MAX_ACTIVE_SCAN_CMDS 8
 
 #define serialization_log(level, args...) \
-	QDF_TRACE(QDF_MODULE_ID_HDD, level, ## args)
+	QDF_TRACE(QDF_MODULE_ID_SERIALIZATION, level, ## args)
 #define serialization_logfl(level, format, args...) \
 	serialization_log(level, FL(format), ## args)
 
@@ -43,12 +43,13 @@
 	serialization_logfl(QDF_TRACE_LEVEL_ERROR, format, ## args)
 #define serialization_warn(format, args...) \
 	serialization_logfl(QDF_TRACE_LEVEL_WARN, format, ## args)
-#define serialization_notice(format, args...) \
-	serialization_logfl(QDF_TRACE_LEVEL_INFO, format, ## args)
 #define serialization_info(format, args...) \
-	serialization_logfl(QDF_TRACE_LEVEL_INFO_HIGH, format, ## args)
+	serialization_logfl(QDF_TRACE_LEVEL_INFO, format, ## args)
 #define serialization_debug(format, args...) \
 	serialization_logfl(QDF_TRACE_LEVEL_DEBUG, format, ## args)
+#define serialization_enter() \
+	serialization_logfl(QDF_TRACE_LEVEL_DEBUG, "enter")
+#define serialization_exit() serialization_logfl(QDF_TRACE_LEVEL_DEBUG, "exit")
 
 /**
  * struct serialization_legacy_callback - to handle legacy serialization cb

+ 4 - 4
umac/cmn_services/serialization/src/wlan_serialization_utils.c

@@ -46,7 +46,7 @@ wlan_serialization_put_back_to_global_list(qdf_list_t *queue,
 		QDF_ASSERT(0);
 		return status;
 	}
-	serialization_info("cmd_id-%d, cmd_type-%d", cmd_list->cmd.cmd_id,
+	serialization_debug("cmd_id-%d, cmd_type-%d", cmd_list->cmd.cmd_id,
 				cmd_list->cmd.cmd_type);
 	qdf_mem_zero(&cmd_list->cmd, sizeof(struct wlan_serialization_command));
 	status = qdf_list_insert_back(&ser_pdev_obj->global_cmd_pool_list,
@@ -402,7 +402,7 @@ wlan_serialization_is_active_scan_cmd_allowed(struct wlan_objmgr_pdev *pdev)
 			wlan_serialization_active_scan_cmd_count_handler,
 			&count, 1, WLAN_SERIALIZATION_ID);
 	if (count < ucfg_scan_get_max_active_scans(psoc)) {
-		serialization_notice("count is [%d]", count);
+		serialization_debug("count is [%d]", count);
 		return true;
 	}
 
@@ -461,7 +461,7 @@ wlan_serialization_is_active_cmd_allowed(struct wlan_serialization_command *cmd)
 QDF_STATUS wlan_serialization_validate_cmdtype(
 		 enum wlan_serialization_cmd_type cmd_type)
 {
-	serialization_info("validate cmd_type:%d", cmd_type);
+	serialization_debug("validate cmd_type:%d", cmd_type);
 
 	if (cmd_type < 0 || cmd_type >= WLAN_SER_CMD_MAX) {
 		serialization_err("Invalid cmd or comp passed");
@@ -475,7 +475,7 @@ QDF_STATUS wlan_serialization_validate_cmd(
 		 enum wlan_umac_comp_id comp_id,
 		 enum wlan_serialization_cmd_type cmd_type)
 {
-	serialization_info("validate cmd_type:%d, comp_id:%d",
+	serialization_debug("validate cmd_type:%d, comp_id:%d",
 			cmd_type, comp_id);
 	if (cmd_type < 0 || comp_id < 0 ||
 			cmd_type >= WLAN_SER_CMD_MAX ||