Эх сурвалжийг харах

qca-wifi: CFR: Cleanup unused code/datastructures

1. Remove the handler that flushes all pending DBR and txrx
events, since that is not being used.
2. PPDU TLV subscribe logic is integrated with ol stats layer,
remove redundant subscriber alloc.
3. Downgrade debug level of timer prints, as error handling timer
fires every 3 secs.

Change-Id: I2a5d2ae10ebee069dd30c1ed87d6560b30f77427
Padma Raghunathan 5 жил өмнө
parent
commit
fe7f2fbf6a

+ 2 - 72
target_if/cfr/src/target_if_cfr_6018.c

@@ -170,60 +170,6 @@ void cfr_free_pending_dbr_events(struct wlan_objmgr_pdev *pdev)
 	wlan_objmgr_pdev_release_ref(pdev, WLAN_CFR_ID);
 	wlan_objmgr_pdev_release_ref(pdev, WLAN_CFR_ID);
 }
 }
 
 
-/**
- * cfr_free_all_lut_entries() - Flush all pending DBR and TXRX events.
- * @pdev: objmgr pdev
- *
- * return: none
- */
-void cfr_free_all_lut_entries(struct wlan_objmgr_pdev *pdev)
-{
-	struct pdev_cfr *pcfr;
-	struct look_up_table *lut = NULL;
-	int i = 0;
-	QDF_STATUS retval = 0;
-	qdf_dma_addr_t buf_addr = 0, buf_addr_temp = 0;
-
-	retval = wlan_objmgr_pdev_try_get_ref(pdev, WLAN_CFR_ID);
-	if (retval != QDF_STATUS_SUCCESS) {
-		cfr_err("failed to get pdev reference");
-		return;
-	}
-
-	pcfr = wlan_objmgr_pdev_get_comp_private_obj(pdev,
-						     WLAN_UMAC_COMP_CFR);
-	if (!pcfr) {
-		cfr_err("pdev object for CFR is null");
-		wlan_objmgr_pdev_release_ref(pdev, WLAN_CFR_ID);
-		return;
-	}
-
-	for (i = 0; i < NUM_LUT_ENTRIES; i++) {
-		lut = get_lut_entry(pcfr, i);
-		if (!lut)
-			continue;
-
-		if (lut->dbr_recv && !lut->tx_recv) {
-			target_if_dbr_buf_release(pdev, DBR_MODULE_CFR,
-						  lut->dbr_address,
-						  i, 0);
-			pcfr->flush_all_dbr_cnt++;
-			release_lut_entry_enh(pdev, lut);
-		} else if (lut->tx_recv && !lut->dbr_recv) {
-			buf_addr_temp = (lut->tx_address2 & 0x0f);
-			buf_addr = (lut->tx_address1
-				    | ((uint64_t)buf_addr_temp << 32));
-			target_if_dbr_buf_release(pdev,
-						  DBR_MODULE_CFR,
-						  buf_addr,
-						  i, 0);
-			pcfr->flush_all_txrx_cnt++;
-			release_lut_entry_enh(pdev, lut);
-		}
-	}
-	wlan_objmgr_pdev_release_ref(pdev, WLAN_CFR_ID);
-}
-
 /**
 /**
  * dump_freeze_tlv() - Dump freeze TLV sent in enhanced DMA header
  * dump_freeze_tlv() - Dump freeze TLV sent in enhanced DMA header
  * @freeze_tlv: Freeze TLV sent from MAC to PHY
  * @freeze_tlv: Freeze TLV sent from MAC to PHY
@@ -744,7 +690,7 @@ void target_if_cfr_rx_tlv_process(struct wlan_objmgr_pdev *pdev, void *nbuf)
 
 
 	vdev = wlan_objmgr_pdev_get_first_vdev(pdev, WLAN_CFR_ID);
 	vdev = wlan_objmgr_pdev_get_first_vdev(pdev, WLAN_CFR_ID);
 	if (qdf_unlikely(!vdev)) {
 	if (qdf_unlikely(!vdev)) {
-		cfr_err("vdev is null\n");
+		cfr_debug("vdev is null\n");
 		goto done;
 		goto done;
 	}
 	}
 
 
@@ -1449,7 +1395,7 @@ static os_timer_func(lut_ageout_timer_task)
 		if (lut->dbr_recv && !lut->tx_recv) {
 		if (lut->dbr_recv && !lut->tx_recv) {
 			diff = cur_tstamp - lut->dbr_tstamp;
 			diff = cur_tstamp - lut->dbr_tstamp;
 			if (diff > LUT_AGE_THRESHOLD) {
 			if (diff > LUT_AGE_THRESHOLD) {
-				cfr_err("<%d>TXRX event not received for "
+				cfr_debug("<%d>TXRX event not received for "
 					"%llu ms, release lut entry : "
 					"%llu ms, release lut entry : "
 					"dma_addr = 0x%pK\n", i, diff,
 					"dma_addr = 0x%pK\n", i, diff,
 					(void *)((uintptr_t)lut->dbr_address));
 					(void *)((uintptr_t)lut->dbr_address));
@@ -1572,14 +1518,6 @@ QDF_STATUS cfr_6018_init_pdev(struct wlan_objmgr_psoc *psoc,
 		pcfr->lut_timer_init = 1;
 		pcfr->lut_timer_init = 1;
 	}
 	}
 
 
-	pcfr->cfr_data_subscriber = (wdi_event_subscribe *)
-		qdf_mem_malloc(sizeof(wdi_event_subscribe));
-	if (!pcfr->cfr_data_subscriber) {
-		cfr_err("Failed to alloc cfr_data_subscriber object\n");
-		return QDF_STATUS_E_NULL_VALUE;
-	}
-
-
 	return status;
 	return status;
 }
 }
 
 
@@ -1614,8 +1552,6 @@ QDF_STATUS cfr_6018_deinit_pdev(struct wlan_objmgr_psoc *psoc,
 	pcfr->release_cnt = 0;
 	pcfr->release_cnt = 0;
 	pcfr->rx_tlv_evt_cnt = 0;
 	pcfr->rx_tlv_evt_cnt = 0;
 	pcfr->flush_dbr_cnt = 0;
 	pcfr->flush_dbr_cnt = 0;
-	pcfr->flush_all_dbr_cnt = 0;
-	pcfr->flush_all_txrx_cnt = 0;
 	pcfr->flush_timeout_dbr_cnt = 0;
 	pcfr->flush_timeout_dbr_cnt = 0;
 	pcfr->invalid_dma_length_cnt = 0;
 	pcfr->invalid_dma_length_cnt = 0;
 	pcfr->clear_txrx_event = 0;
 	pcfr->clear_txrx_event = 0;
@@ -1640,11 +1576,5 @@ QDF_STATUS cfr_6018_deinit_pdev(struct wlan_objmgr_psoc *psoc,
 	if (status != QDF_STATUS_SUCCESS)
 	if (status != QDF_STATUS_SUCCESS)
 		cfr_err("Failed to register with dbr");
 		cfr_err("Failed to register with dbr");
 
 
-	if (pcfr->cfr_data_subscriber) {
-		qdf_mem_free(pcfr->cfr_data_subscriber);
-		pcfr->cfr_data_subscriber = NULL;
-	}
-
-
 	return status;
 	return status;
 }
 }

+ 0 - 4
umac/cfr/dispatcher/inc/wlan_cfr_utils_api.h

@@ -447,7 +447,6 @@ struct cfr_rcc_param {
  * rx_tlv_evt_cnt: Number of CFR WDI events from datapath
  * rx_tlv_evt_cnt: Number of CFR WDI events from datapath
  * lut_age_timer: Timer to flush pending TXRX/DBR events in lookup table
  * lut_age_timer: Timer to flush pending TXRX/DBR events in lookup table
  * lut_timer_init: flag to determine if lut_age_timer is initialized or not
  * lut_timer_init: flag to determine if lut_age_timer is initialized or not
- * cfr_data_subscriber: CFR WDI subscriber object
  * bb_captured_channel_cnt: No. of PPDUs for which MAC sent Freeze TLV to PHY
  * bb_captured_channel_cnt: No. of PPDUs for which MAC sent Freeze TLV to PHY
  * bb_captured_timeout_cnt: No. of PPDUs for which CFR filter criteria matched
  * bb_captured_timeout_cnt: No. of PPDUs for which CFR filter criteria matched
  * but MAC did not send Freeze TLV to PHY as time exceeded freeze tlv delay
  * but MAC did not send Freeze TLV to PHY as time exceeded freeze tlv delay
@@ -498,15 +497,12 @@ struct pdev_cfr {
 	uint64_t rx_tlv_evt_cnt;
 	uint64_t rx_tlv_evt_cnt;
 	qdf_timer_t lut_age_timer;
 	qdf_timer_t lut_age_timer;
 	uint8_t lut_timer_init;
 	uint8_t lut_timer_init;
-	void *cfr_data_subscriber;
 	uint64_t bb_captured_channel_cnt;
 	uint64_t bb_captured_channel_cnt;
 	uint64_t bb_captured_timeout_cnt;
 	uint64_t bb_captured_timeout_cnt;
 	uint64_t rx_loc_info_valid_cnt;
 	uint64_t rx_loc_info_valid_cnt;
 	uint64_t chan_capture_status[CAPTURE_MAX];
 	uint64_t chan_capture_status[CAPTURE_MAX];
 	uint64_t bb_captured_reason_cnt[FREEZE_REASON_MAX];
 	uint64_t bb_captured_reason_cnt[FREEZE_REASON_MAX];
 	uint64_t flush_dbr_cnt;
 	uint64_t flush_dbr_cnt;
-	uint64_t flush_all_dbr_cnt;
-	uint64_t flush_all_txrx_cnt;
 	uint64_t invalid_dma_length_cnt;
 	uint64_t invalid_dma_length_cnt;
 	uint64_t flush_timeout_dbr_cnt;
 	uint64_t flush_timeout_dbr_cnt;
 	uint64_t clear_txrx_event;
 	uint64_t clear_txrx_event;

+ 0 - 4
umac/cfr/dispatcher/src/wlan_cfr_ucfg_api.c

@@ -818,10 +818,6 @@ QDF_STATUS ucfg_cfr_rcc_dump_dbg_counters(struct wlan_objmgr_vdev *vdev)
 		 pcfr->flush_dbr_cnt);
 		 pcfr->flush_dbr_cnt);
 	cfr_err("invalid_dma_length_cnt = %llu\n",
 	cfr_err("invalid_dma_length_cnt = %llu\n",
 		 pcfr->invalid_dma_length_cnt);
 		 pcfr->invalid_dma_length_cnt);
-	cfr_err("flush_all_dbr_cnt = %llu\n",
-		 pcfr->flush_all_dbr_cnt);
-	cfr_err("flush_all_txrx_cnt = %llu\n",
-		 pcfr->flush_all_txrx_cnt);
 	cfr_err("flush_timeout_dbr_cnt = %llu\n",
 	cfr_err("flush_timeout_dbr_cnt = %llu\n",
 		 pcfr->flush_timeout_dbr_cnt);
 		 pcfr->flush_timeout_dbr_cnt);
 	cfr_err("PPDU id mismatch for same cookie:\n");
 	cfr_err("PPDU id mismatch for same cookie:\n");