qcacld-3.0: cdp: Convergence of cdp_throttle_ops

Currently the cdp apis are given pdev/vdev/peer
handle as its arguments, which is directly
accessed in those APIs. This can cause a
race-condition in access of the respective
handles if it has been deleted in parallel.

Hence as a part of cdp convergence, pass only
the pdev/vdev id or peer mac address, which will be
used to get the respective handles, and hence
avoiding the unwanted access of the handles if
it has been deleted.

Converged throttle_ops
- throttle_init_period
- throttle_set_level

CRs-Fixed: 2539744
Change-Id: I0e1339ead92d66463d3b58ed9268c7194fd2bd27

core/dp/txrx/ol_tx_queue.h

@@ -436,8 +436,10 @@ ol_tx_queues_display(struct ol_txrx_pdev_t *pdev)
 #define ol_tx_queue_decs_reinit(peer, peer_id)  /* no-op */
 
 #ifdef QCA_SUPPORT_TX_THROTTLE
-void ol_tx_throttle_set_level(struct cdp_pdev *ppdev, int level);
-void ol_tx_throttle_init_period(struct cdp_pdev *ppdev, int period,
+void ol_tx_throttle_set_level(struct cdp_soc_t *soc_hdl,
+			      uint8_t pdev_id, int level);
+void ol_tx_throttle_init_period(struct cdp_soc_t *soc_hdl,
+				uint8_t pdev_id, int period,
 				uint8_t *dutycycle_level);
 
 /**
@@ -448,12 +450,13 @@ void ol_tx_throttle_init(struct ol_txrx_pdev_t *pdev);
 #else
 static inline void ol_tx_throttle_init(struct ol_txrx_pdev_t *pdev) {}
 
-static inline void ol_tx_throttle_set_level(struct cdp_pdev *ppdev, int level)
+static inline void ol_tx_throttle_set_level(struct cdp_soc_t *soc_hdl,
+					    uint8_t pdev_id, int level)
 {}
 
-static inline void ol_tx_throttle_init_period(struct cdp_pdev *ppdev,
-					      int period,
-					      uint8_t *dutycycle_level)
+static inline void
+ol_tx_throttle_init_period(struct cdp_soc_t *soc_hdl, uint8_t pdev_id,
+			   int period, uint8_t *dutycycle_level)
 {}
 #endif
 

core/dp/txrx/ol_tx_throttle.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -196,9 +196,11 @@ ol_tx_set_throttle_phase_time(struct ol_txrx_pdev_t *pdev, int level, int *ms)
 }
 #endif
 
-void ol_tx_throttle_set_level(struct cdp_pdev *ppdev, int level)
+void ol_tx_throttle_set_level(struct cdp_soc_t *soc_hdl,
+			      uint8_t pdev_id, int level)
 {
-	struct ol_txrx_pdev_t *pdev = (struct ol_txrx_pdev_t *)ppdev;
+	struct ol_txrx_soc_t *soc = cdp_soc_t_to_ol_txrx_soc_t(soc_hdl);
+	ol_txrx_pdev_handle pdev = ol_txrx_get_pdev_from_pdev_id(soc, pdev_id);
 	int ms = 0;
 
 	if (level >= THROTTLE_LEVEL_MAX) {
@@ -206,6 +208,11 @@ void ol_tx_throttle_set_level(struct cdp_pdev *ppdev, int level)
 		return;
 	}
 
+	if (qdf_unlikely(!pdev)) {
+		ol_txrx_err("pdev is NULL");
+		return;
+	}
+
 	ol_txrx_info("Setting throttle level %d\n", level);
 
 	/* Set the current throttle level */
@@ -217,12 +224,25 @@ void ol_tx_throttle_set_level(struct cdp_pdev *ppdev, int level)
 		qdf_timer_start(&pdev->tx_throttle.phase_timer, ms);
 }
 
-void ol_tx_throttle_init_period(struct cdp_pdev *ppdev, int period,
+void ol_tx_throttle_init_period(struct cdp_soc_t *soc_hdl,
+				uint8_t pdev_id, int period,
 				uint8_t *dutycycle_level)
 {
-	struct ol_txrx_pdev_t *pdev = (struct ol_txrx_pdev_t *)ppdev;
+	struct ol_txrx_soc_t *soc = cdp_soc_t_to_ol_txrx_soc_t(soc_hdl);
+	ol_txrx_pdev_handle pdev;
 	int i;
 
+	if (qdf_unlikely(!soc)) {
+		ol_txrx_err("soc is NULL");
+		return;
+	}
+
+	pdev = ol_txrx_get_pdev_from_pdev_id(soc, pdev_id);
+	if (qdf_unlikely(!pdev)) {
+		ol_txrx_err("pdev is NULL");
+		return;
+	}
+
 	/* Set the current throttle level */
 	pdev->tx_throttle.throttle_period_ms = period;
 
@@ -260,7 +280,7 @@ void ol_tx_throttle_init(struct ol_txrx_pdev_t *pdev)
 		dutycycle_level[i] =
 			ol_cfg_throttle_duty_cycle_level(pdev->ctrl_pdev, i);
 
-	ol_tx_throttle_init_period((struct cdp_pdev *)pdev,
+	ol_tx_throttle_init_period(cds_get_context(QDF_MODULE_ID_SOC), pdev->id,
 				   throttle_period, &dutycycle_level[0]);
 
 	qdf_timer_init(pdev->osdev, &pdev->tx_throttle.phase_timer,

core/wma/src/wma_data.c

@@ -1772,7 +1772,6 @@ static QDF_STATUS wma_update_thermal_cfg_to_fw(tp_wma_handle wma)
 QDF_STATUS wma_process_init_thermal_info(tp_wma_handle wma,
 					 t_thermal_mgmt *pThermalParams)
 {
-	struct cdp_pdev *curr_pdev;
 	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
 #ifdef FW_THERMAL_THROTTLE_SUPPORT
 	int i = 0;
@@ -1783,10 +1782,6 @@ QDF_STATUS wma_process_init_thermal_info(tp_wma_handle wma,
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	curr_pdev = cds_get_context(QDF_MODULE_ID_TXRX);
-	if (!curr_pdev)
-		return QDF_STATUS_E_FAILURE;
-
 	WMA_LOGD("TM enable %d period %d", pThermalParams->thermalMgmtEnabled,
 		 pThermalParams->throttlePeriod);
 
@@ -1844,7 +1839,7 @@ QDF_STATUS wma_process_init_thermal_info(tp_wma_handle wma,
 		if (!wma->fw_therm_throt_support) {
 			cdp_throttle_init_period(
 				cds_get_context(QDF_MODULE_ID_SOC),
-				curr_pdev, pThermalParams->throttlePeriod,
+				WMI_PDEV_ID_SOC, pThermalParams->throttlePeriod,
 				&pThermalParams->throttle_duty_cycle_tbl[0]);
 		} else {
 			qdf_status = wma_update_thermal_mitigation_to_fw(
@@ -1898,17 +1893,11 @@ static void wma_set_thermal_level_ind(u_int8_t level)
 QDF_STATUS wma_process_set_thermal_level(tp_wma_handle wma,
 					 uint8_t thermal_level)
 {
-	struct cdp_pdev *curr_pdev;
-
 	if (!wma) {
 		WMA_LOGE("TM Invalid input");
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	curr_pdev = cds_get_context(QDF_MODULE_ID_TXRX);
-	if (!curr_pdev)
-		return QDF_STATUS_E_FAILURE;
-
 	WMA_LOGE("TM set level %d", thermal_level);
 
 	/* Check if thermal mitigation is enabled */
@@ -1931,7 +1920,7 @@ QDF_STATUS wma_process_set_thermal_level(tp_wma_handle wma,
 	wma->thermal_mgmt_info.thermalCurrLevel = thermal_level;
 
 	cdp_throttle_set_level(cds_get_context(QDF_MODULE_ID_SOC),
-			       curr_pdev, thermal_level);
+			       WMI_PDEV_ID_SOC, thermal_level);
 
 	/* Send SME SET_THERMAL_LEVEL_IND message */
 	wma_set_thermal_level_ind(thermal_level);
@@ -2022,7 +2011,6 @@ int wma_thermal_mgmt_evt_handler(void *handle, uint8_t *event, uint32_t len)
 	uint8_t thermal_level;
 	t_thermal_cmd_params thermal_params;
 	WMI_THERMAL_MGMT_EVENTID_param_tlvs *param_buf;
-	struct cdp_pdev *curr_pdev;
 
 	if (!event || !handle) {
 		WMA_LOGE("Invalid thermal mitigation event buffer");
@@ -2038,10 +2026,6 @@ int wma_thermal_mgmt_evt_handler(void *handle, uint8_t *event, uint32_t len)
 
 	param_buf = (WMI_THERMAL_MGMT_EVENTID_param_tlvs *) event;
 
-	curr_pdev = cds_get_context(QDF_MODULE_ID_TXRX);
-	if (!curr_pdev)
-		return -EINVAL;
-
 	/* Check if thermal mitigation is enabled */
 	if (!wma->thermal_mgmt_info.thermalMgmtEnabled) {
 		WMA_LOGE("Thermal mgmt is not enabled, ignoring event");
@@ -2068,7 +2052,7 @@ int wma_thermal_mgmt_evt_handler(void *handle, uint8_t *event, uint32_t len)
 	if (!wma->fw_therm_throt_support) {
 		/* Inform txrx */
 		cdp_throttle_set_level(cds_get_context(QDF_MODULE_ID_SOC),
-				       curr_pdev, thermal_level);
+				       WMI_PDEV_ID_SOC, thermal_level);
 	}
 
 	/* Send SME SET_THERMAL_LEVEL_IND message */