Przeglądaj źródła

qcacld-3.0: Remove obsolete CDS mq APIs reference from MAC module

After control path scheduler componentization CDS message queue
APIs are no longer used hence replace CDS mq APIs in MAC module
by scheduler mq APIs.

Change-Id: Ic977fc81ac3902e1fdc7eeca10ed8000fc1b8bc6
CRs-Fixed: 1114373
Rajeev Kumar 8 lat temu
rodzic
commit
f7d844213d

+ 3 - 3
core/mac/src/pe/lim/lim_api.c

@@ -924,7 +924,7 @@ void pe_free_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg)
 
 uint32_t lim_post_msg_api(tpAniSirGlobal pMac, tSirMsgQ *pMsg)
 {
-	return cds_mq_post_message(QDF_MODULE_ID_PE, (cds_msg_t *) pMsg);
+	return scheduler_post_msg(QDF_MODULE_ID_PE, (struct scheduler_msg *) pMsg);
 
 } /*** end lim_post_msg_api() ***/
 
@@ -939,8 +939,8 @@ uint32_t lim_post_msg_api(tpAniSirGlobal pMac, tSirMsgQ *pMsg)
  */
 uint32_t lim_post_msg_high_priority(tpAniSirGlobal mac, tSirMsgQ *msg)
 {
-	return cds_mq_post_message_by_priority(QDF_MODULE_ID_PE,
-					       (cds_msg_t *)msg, HIGH_PRIORITY);
+	return scheduler_post_msg_by_priority(QDF_MODULE_ID_PE,
+					       (struct scheduler_msg *)msg, HIGH_PRIORITY);
 }
 
 /*--------------------------------------------------------------------------

+ 2 - 2
core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c

@@ -3260,7 +3260,7 @@ void lim_send_beacon_ind(tpAniSirGlobal pMac, tpPESession psessionEntry)
  */
 static void lim_send_sme_scan_cache_updated_ind(uint8_t sessionId)
 {
-	cds_msg_t msg;
+	struct scheduler_msg msg;
 
 	msg.type = WMA_SME_SCAN_CACHE_UPDATED;
 	msg.reserved = 0;
@@ -3268,7 +3268,7 @@ static void lim_send_sme_scan_cache_updated_ind(uint8_t sessionId)
 	msg.bodyval = sessionId;
 
 	if (!QDF_IS_STATUS_SUCCESS
-		    (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)))
+		    (scheduler_post_msg(QDF_MODULE_ID_WMA, &msg)))
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Not able to post WMA_SME_SCAN_CACHE_UPDATED message to WMA",
 			  __func__);

+ 17 - 17
core/mac/src/pe/lim/lim_process_sme_req_messages.c

@@ -132,7 +132,7 @@ static void lim_process_ext_change_channel(tpAniSirGlobal mac_ctx,
 static QDF_STATUS lim_process_set_hw_mode(tpAniSirGlobal mac, uint32_t *msg)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
-	cds_msg_t cds_message;
+	struct scheduler_msg message;
 	struct sir_hw_mode *req_msg;
 	uint32_t len;
 	struct s_sir_set_hw_mode *buf;
@@ -161,14 +161,14 @@ static QDF_STATUS lim_process_set_hw_mode(tpAniSirGlobal mac, uint32_t *msg)
 	req_msg->reason = buf->set_hw.reason;
 	/* Other parameters are not needed for WMA */
 
-	cds_message.bodyptr = req_msg;
-	cds_message.type    = SIR_HAL_PDEV_SET_HW_MODE;
+	message.bodyptr = req_msg;
+	message.type    = SIR_HAL_PDEV_SET_HW_MODE;
 
 	lim_log(mac, LOG1, FL("Posting SIR_HAL_SOC_SET_HW_MOD to WMA"));
-	status = cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_message);
+	status = scheduler_post_msg(QDF_MODULE_ID_WMA, &message);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		lim_log(mac, LOGE,
-			FL("cds_mq_post_message failed!(err=%d)"),
+			FL("scheduler_post_msg failed!(err=%d)"),
 			status);
 		qdf_mem_free(req_msg);
 		goto fail;
@@ -203,7 +203,7 @@ static QDF_STATUS lim_process_set_dual_mac_cfg_req(tpAniSirGlobal mac,
 		uint32_t *msg)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
-	cds_msg_t cds_message;
+	struct scheduler_msg message;
 	struct sir_dual_mac_config *req_msg;
 	uint32_t len;
 	struct sir_set_dual_mac_cfg *buf;
@@ -232,16 +232,16 @@ static QDF_STATUS lim_process_set_dual_mac_cfg_req(tpAniSirGlobal mac,
 	req_msg->fw_mode_config = buf->set_dual_mac.fw_mode_config;
 	/* Other parameters are not needed for WMA */
 
-	cds_message.bodyptr = req_msg;
-	cds_message.type    = SIR_HAL_PDEV_DUAL_MAC_CFG_REQ;
+	message.bodyptr = req_msg;
+	message.type    = SIR_HAL_PDEV_DUAL_MAC_CFG_REQ;
 
 	lim_log(mac, LOG1,
 		FL("Post SIR_HAL_PDEV_DUAL_MAC_CFG_REQ to WMA: %x %x"),
 		req_msg->scan_config, req_msg->fw_mode_config);
-	status = cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_message);
+	status = scheduler_post_msg(QDF_MODULE_ID_WMA, &message);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		lim_log(mac, LOGE,
-				FL("cds_mq_post_message failed!(err=%d)"),
+				FL("scheduler_post_msg failed!(err=%d)"),
 				status);
 		qdf_mem_free(req_msg);
 		goto fail;
@@ -275,7 +275,7 @@ static QDF_STATUS lim_process_set_antenna_mode_req(tpAniSirGlobal mac,
 		uint32_t *msg)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
-	cds_msg_t cds_message;
+	struct scheduler_msg message;
 	struct sir_antenna_mode_param *req_msg;
 	struct sir_set_antenna_mode *buf;
 	tSirMsgQ resp_msg;
@@ -297,17 +297,17 @@ static QDF_STATUS lim_process_set_antenna_mode_req(tpAniSirGlobal mac,
 	req_msg->num_rx_chains = buf->set_antenna_mode.num_rx_chains;
 	req_msg->num_tx_chains = buf->set_antenna_mode.num_tx_chains;
 
-	cds_message.bodyptr = req_msg;
-	cds_message.type    = SIR_HAL_SOC_ANTENNA_MODE_REQ;
+	message.bodyptr = req_msg;
+	message.type    = SIR_HAL_SOC_ANTENNA_MODE_REQ;
 
 	lim_log(mac, LOG1,
 		FL("Post SIR_HAL_SOC_ANTENNA_MODE_REQ to WMA: %d %d"),
 		req_msg->num_rx_chains,
 		req_msg->num_tx_chains);
-	status = cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_message);
+	status = scheduler_post_msg(QDF_MODULE_ID_WMA, &message);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		lim_log(mac, LOGE,
-				FL("cds_mq_post_message failed!(err=%d)"),
+				FL("scheduler_post_msg failed!(err=%d)"),
 				status);
 		qdf_mem_free(req_msg);
 		goto fail;
@@ -4356,7 +4356,7 @@ static void __lim_process_sme_set_ht2040_mode(tpAniSirGlobal pMac,
 	tpSirSetHT2040Mode pSetHT2040Mode;
 	tpPESession psessionEntry;
 	uint8_t sessionId = 0;
-	cds_msg_t msg;
+	struct scheduler_msg msg;
 	tUpdateVHTOpMode *pHtOpMode = NULL;
 	uint16_t staId = 0;
 	tpDphHashNode pStaDs = NULL;
@@ -4442,7 +4442,7 @@ static void __lim_process_sme_set_ht2040_mode(tpAniSirGlobal pMac,
 			msg.reserved = 0;
 			msg.bodyptr = pHtOpMode;
 			if (!QDF_IS_STATUS_SUCCESS(
-					cds_mq_post_message(QDF_MODULE_ID_WMA,
+					scheduler_post_msg(QDF_MODULE_ID_WMA,
 							    &msg))) {
 				lim_log(pMac, LOGE,
 					FL

+ 4 - 4
core/mac/src/pe/lim/lim_utils.c

@@ -6469,7 +6469,7 @@ static QDF_STATUS lim_send_ie(tpAniSirGlobal mac_ctx, uint32_t sme_session_id,
 			      uint8_t *buf, uint32_t len)
 {
 	struct vdev_ie_info *ie_msg;
-	cds_msg_t msg = {0};
+	struct scheduler_msg msg = {0};
 	QDF_STATUS status;
 
 	/* Allocate memory for the WMI request */
@@ -6491,7 +6491,7 @@ static QDF_STATUS lim_send_ie(tpAniSirGlobal mac_ctx, uint32_t sme_session_id,
 	msg.bodyptr = ie_msg;
 	msg.reserved = 0;
 
-	status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg);
+	status = scheduler_post_msg(QDF_MODULE_ID_WMA, &msg);
 	if (QDF_STATUS_SUCCESS != status) {
 		lim_log(mac_ctx, LOGE,
 		       FL("Not able to post WMA_SET_IE_INFO to WMA"));
@@ -6623,7 +6623,7 @@ QDF_STATUS lim_send_ext_cap_ie(tpAniSirGlobal mac_ctx,
 	uint32_t dot11mode, num_bytes;
 	bool vht_enabled = false;
 	struct vdev_ie_info *vdev_ie;
-	cds_msg_t msg = {0};
+	struct scheduler_msg msg = {0};
 	tSirRetStatus status;
 	uint8_t *temp, i;
 
@@ -6672,7 +6672,7 @@ QDF_STATUS lim_send_ext_cap_ie(tpAniSirGlobal mac_ctx,
 	msg.reserved = 0;
 
 	if (QDF_STATUS_SUCCESS !=
-		cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) {
+		scheduler_post_msg(QDF_MODULE_ID_WMA, &msg)) {
 		lim_log(mac_ctx, LOGE,
 		       FL("Not able to post WMA_SET_IE_INFO to WDA"));
 		qdf_mem_free(vdev_ie);

+ 1 - 1
core/mac/src/sys/common/inc/wlan_qct_sys.h

@@ -180,7 +180,7 @@ QDF_STATUS sys_stop(v_CONTEXT_t p_cds_context);
    \sa
 
    --------------------------------------------------------------------------*/
-QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg);
+QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, struct scheduler_msg *pMsg);
 QDF_STATUS sys_mc_process_handler(struct scheduler_msg *msg);
 
 void wlan_sys_probe(void);

+ 11 - 11
core/mac/src/sys/common/src/wlan_qct_sys.c

@@ -110,7 +110,7 @@ QDF_STATUS sys_stop(v_CONTEXT_t p_cds_context)
 	sysMsg.bodyptr = (void *)&g_stop_evt;
 
 	/* post the message.. */
-	qdf_status = cds_mq_post_message(QDF_MODULE_ID_SYS, &sysMsg);
+	qdf_status = scheduler_post_msg(QDF_MODULE_ID_SYS, &sysMsg);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status))
 		qdf_status = QDF_STATUS_E_BADMSG;
 
@@ -132,7 +132,7 @@ QDF_STATUS sys_stop(v_CONTEXT_t p_cds_context)
  *
  * Return: QDF_STATUS
  */
-QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg)
+QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, struct scheduler_msg *pMsg)
 {
 	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
 	tpAniSirGlobal mac_ctx;
@@ -140,7 +140,7 @@ QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg)
 
 	if (NULL == pMsg) {
 		QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR,
-			  "%s: NULL pointer to cds_msg_t", __func__);
+			  "%s: NULL pointer to struct scheduler_msg", __func__);
 		QDF_ASSERT(0);
 		return QDF_STATUS_E_INVAL;
 	}
@@ -260,7 +260,7 @@ QDF_STATUS sys_mc_process_handler(struct scheduler_msg *msg)
 			"CDS context is NULL");
 		return QDF_STATUS_E_FAILURE;
 	}
-	return sys_mc_process_msg(cds_ctx, (cds_msg_t *)msg);
+	return sys_mc_process_msg(cds_ctx, (struct scheduler_msg *)msg);
 }
 
 /**
@@ -345,8 +345,8 @@ void sys_process_mmh_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg)
 	/*
 	 * Post now the message to the appropriate module for handling
 	 */
-	if (QDF_STATUS_SUCCESS != cds_mq_post_message(targetMQ,
-					(cds_msg_t *) pMsg)) {
+	if (QDF_STATUS_SUCCESS != scheduler_post_msg(targetMQ,
+					(struct scheduler_msg *) pMsg)) {
 		/*
 		 * Caller doesn't allocate memory for the pMsg.
 		 * It allocate memory for bodyptr free the mem and return
@@ -366,10 +366,10 @@ void sys_process_mmh_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg)
  */
 void wlan_sys_probe(void)
 {
-	cds_msg_t cds_message;
+	struct scheduler_msg message;
 
-	cds_message.reserved = SYS_MSG_COOKIE;
-	cds_message.type = SYS_MSG_ID_MC_THR_PROBE;
-	cds_message.bodyptr = NULL;
-	cds_mq_post_message(QDF_MODULE_ID_SYS, &cds_message);
+	message.reserved = SYS_MSG_COOKIE;
+	message.type = SYS_MSG_ID_MC_THR_PROBE;
+	message.bodyptr = NULL;
+	scheduler_post_msg(QDF_MODULE_ID_SYS, &message);
 }