qcacld-3.0: Fix no CAC on SAP disable and enable

Driver uses global value cac_state in mac_ctx->sap.SapDfsInfo
to record the CAC state of first SAP on DFS channel. If
first SAP CAC is completed, the second SAP can skip CAC
on the channel.
The problem is single SAP stop and restart the cac_state is
not updated and keep value of eSAP_DFS_SKIP_CAC. Then driver
skips the CAC for the SAP start.
Remove the global value cac_state in mac_ctx->sap.SapDfsInfo
and use API sap_plus_sap_cac_skip to check the other SAP's CAC
state dynamically.

Change-Id: Id486a6e605d08845f03b38450a2c021f76ae23f6
CRs-Fixed: 3426671

core/hdd/src/wlan_hdd_hostapd.c

@@ -1896,7 +1896,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 	struct hdd_context *hdd_ctx;
 	struct iw_michaelmicfailure msg;
 	uint8_t ignoreCAC = 0;
-	eSapDfsCACState_t cac_state = eSAP_DFS_DO_NOT_SKIP_CAC;
+	bool cac_state = false;
 	struct hdd_config *cfg = NULL;
 	struct wlan_dfs_info dfs_info;
 	struct hdd_adapter *con_sap_adapter;
@@ -1998,7 +1998,9 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 				hdd_ctx->psoc, adapter->vdev_id))
 			ignoreCAC = true;
 
-		wlansap_get_dfs_cac_state(mac_handle, &cac_state);
+		wlansap_get_dfs_cac_state(mac_handle,
+					  WLAN_HDD_GET_SAP_CTX_PTR(adapter),
+					  &cac_state);
 
 		/* DFS requirement: DO NOT transmit during CAC. */
 
@@ -2010,7 +2012,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 					      ap_ctx->operating_chan_freq) ||
 		    ignoreCAC ||
 		    hdd_ctx->dev_dfs_cac_status == DFS_CAC_ALREADY_DONE ||
-		    eSAP_DFS_SKIP_CAC == cac_state)
+		    !cac_state)
 			ap_ctx->dfs_cac_block_tx = false;
 		else
 			ap_ctx->dfs_cac_block_tx = true;

core/sap/inc/sap_api.h

@@ -591,7 +591,6 @@ typedef struct sSapDfsInfo {
 	 */
 	uint32_t target_chan_freq;
 	uint8_t ignore_cac;
-	eSapDfsCACState_t cac_state;
 	uint32_t user_provided_target_chan_freq;
 
 	/*
@@ -1145,14 +1144,16 @@ QDF_STATUS wlansap_set_dfs_ignore_cac(mac_handle_t mac_handle,
 /**
  * wlansap_get_dfs_cac_state() - Get cac_state value
  * @mac_handle: Opaque handle to the global MAC context
+ * @sap_context: sap adapter context
  * @cac_state: Location to store cac_state value
  *
- * This API is used to Get the value of ignore_cac value
+ * This API is used to Get the value of current cac state
  *
  * Return: The QDF_STATUS code associated with performing the operation
  */
 QDF_STATUS wlansap_get_dfs_cac_state(mac_handle_t mac_handle,
-				     eSapDfsCACState_t *cac_state);
+				     struct sap_context *sap_context,
+				     bool *cac_state);
 
 /**
  * wlansap_get_csa_chanwidth_from_phymode() - function to populate

core/sap/src/sap_api_link_cntl.c

@@ -452,6 +452,8 @@ wlansap_roam_process_ch_change_success(struct mac_context *mac_ctx,
 	QDF_STATUS qdf_status;
 	bool is_ch_dfs = false;
 	uint32_t target_chan_freq;
+	eSapDfsCACState_t cac_state = eSAP_DFS_DO_NOT_SKIP_CAC;
+
 	/*
 	 * Channel change is successful. If the new channel is a DFS channel,
 	 * then we will to perform channel availability check for 60 seconds
@@ -513,9 +515,11 @@ wlansap_roam_process_ch_change_success(struct mac_context *mac_ctx,
 		sap_event.u1 = eCSR_ROAM_INFRA_IND;
 		sap_event.u2 = eCSR_ROAM_RESULT_INFRA_STARTED;
 	} else if (is_ch_dfs) {
-		if ((false == mac_ctx->sap.SapDfsInfo.ignore_cac)
-		    && (eSAP_DFS_DO_NOT_SKIP_CAC ==
-			mac_ctx->sap.SapDfsInfo.cac_state) &&
+		if (sap_plus_sap_cac_skip(mac_ctx, sap_ctx,
+					  sap_ctx->chan_freq))
+			cac_state = eSAP_DFS_SKIP_CAC;
+		if ((false == mac_ctx->sap.SapDfsInfo.ignore_cac) &&
+		    (cac_state == eSAP_DFS_DO_NOT_SKIP_CAC) &&
 		    policy_mgr_get_dfs_master_dynamic_enabled(
 					mac_ctx->psoc,
 					sap_ctx->sessionId)) {
@@ -866,8 +870,6 @@ static void wlansap_update_vendor_acs_chan(struct mac_context *mac_ctx,
 				sap_ctx->dfs_vendor_chan_bw;
 
 	if (mac_ctx->sap.SapDfsInfo.target_chan_freq != 0) {
-		mac_ctx->sap.SapDfsInfo.cac_state =
-			eSAP_DFS_DO_NOT_SKIP_CAC;
 		sap_cac_reset_notify(MAC_HANDLE(mac_ctx));
 		return;
 	}
@@ -1175,8 +1177,6 @@ QDF_STATUS wlansap_roam_callback(void *ctx,
 			goto EXIT;
 		}
 		if (mac_ctx->sap.SapDfsInfo.target_chan_freq != 0) {
-			mac_ctx->sap.SapDfsInfo.cac_state =
-				eSAP_DFS_DO_NOT_SKIP_CAC;
 			sap_cac_reset_notify(mac_handle);
 			break;
 		}

core/sap/src/sap_fsm.c

@@ -541,6 +541,33 @@ bool sap_operating_on_dfs(struct mac_context *mac_ctx,
 	return false;
 }
 
+bool sap_plus_sap_cac_skip(struct mac_context *mac,
+			   struct sap_context *sap_ctx,
+			   qdf_freq_t chan_freq)
+{
+	uint8_t intf;
+
+	for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) {
+		struct sap_context *sap_context =
+			mac->sap.sapCtxList[intf].sap_context;
+
+		if (!sap_context || sap_context == sap_ctx)
+			continue;
+		if (mac->sap.sapCtxList[intf].sapPersona != QDF_SAP_MODE &&
+		    mac->sap.sapCtxList[intf].sapPersona != QDF_P2P_GO_MODE)
+			continue;
+		if (sap_context->isCacEndNotified &&
+		    sap_context->chan_freq == chan_freq &&
+		    sap_operating_on_dfs(mac, sap_context)) {
+			sap_debug("SAP vid %d CAC can skip due to CAC completed on other SAP vid %d",
+				  sap_ctx->sessionId, sap_context->sessionId);
+			return true;
+		}
+	}
+
+	return false;
+}
+
 /**
  * is_wlansap_cac_required_for_chan() - Is cac required for given channel
  * @mac_ctx: mac ctx
@@ -561,6 +588,7 @@ is_wlansap_cac_required_for_chan(struct mac_context *mac_ctx,
 	uint8_t vdev_id_list[MAX_NUMBER_OF_CONC_CONNECTIONS];
 	uint32_t freq_list[MAX_NUMBER_OF_CONC_CONNECTIONS];
 	uint8_t sta_cnt, i;
+	eSapDfsCACState_t cac_state = eSAP_DFS_DO_NOT_SKIP_CAC;
 
 	if (ch_params->ch_width == CH_WIDTH_160MHZ) {
 		wlan_reg_set_create_punc_bitmap(ch_params, true);
@@ -592,16 +620,17 @@ is_wlansap_cac_required_for_chan(struct mac_context *mac_ctx,
 	}
 	if (WLAN_REG_IS_6GHZ_CHAN_FREQ(chan_freq))
 		is_ch_dfs = false;
-
+	if (is_ch_dfs && sap_plus_sap_cac_skip(mac_ctx, sap_ctx, chan_freq))
+		cac_state = eSAP_DFS_SKIP_CAC;
 	sap_debug("vdev id %d chan %d is_ch_dfs %d pre_cac_complete %d ignore_cac %d cac_state %d",
 		  sap_ctx->sessionId, chan_freq, is_ch_dfs,
 		  wlan_pre_cac_complete_get(sap_ctx->vdev),
 		  mac_ctx->sap.SapDfsInfo.ignore_cac,
-		  mac_ctx->sap.SapDfsInfo.cac_state);
+		  cac_state);
 
 	if (!is_ch_dfs || wlan_pre_cac_complete_get(sap_ctx->vdev) ||
 	    mac_ctx->sap.SapDfsInfo.ignore_cac ||
-	    mac_ctx->sap.SapDfsInfo.cac_state == eSAP_DFS_SKIP_CAC)
+	    cac_state == eSAP_DFS_SKIP_CAC)
 		cac_required = false;
 	else
 		cac_required = true;
@@ -1591,7 +1620,6 @@ sap_find_valid_concurrent_session(mac_handle_t mac_handle)
 QDF_STATUS sap_clear_global_dfs_param(mac_handle_t mac_handle,
 				      struct sap_context *sap_ctx)
 {
-	struct mac_context *mac_ctx = MAC_CONTEXT(mac_handle);
 	struct sap_context *con_sap_ctx;
 
 	con_sap_ctx = sap_find_valid_concurrent_session(mac_handle);
@@ -1606,7 +1634,6 @@ QDF_STATUS sap_clear_global_dfs_param(mac_handle_t mac_handle,
 	 * as per design CAC timer should be destroyed after stop
 	 */
 	wlansap_cleanup_cac_timer(sap_ctx);
-	mac_ctx->sap.SapDfsInfo.cac_state = eSAP_DFS_DO_NOT_SKIP_CAC;
 	sap_cac_reset_notify(mac_handle);
 
 	return QDF_STATUS_SUCCESS;
@@ -3025,15 +3052,7 @@ QDF_STATUS sap_cac_end_notify(mac_handle_t mac_handle,
 			}
 		}
 	}
-	/*
-	 * All APs are done with CAC timer, all APs should start beaconing.
-	 * Lets assume AP1 and AP2 started beaconing on DFS channel, Now lets
-	 * say AP1 goes down and comes back on same DFS channel. In this case
-	 * AP1 shouldn't start CAC timer and start beacon immediately because
-	 * AP2 is already beaconing on this channel. This case will be handled
-	 * by checking against eSAP_DFS_SKIP_CAC while starting the timer.
-	 */
-	mac->sap.SapDfsInfo.cac_state = eSAP_DFS_SKIP_CAC;
+
 	return qdf_status;
 }
 
@@ -3753,6 +3772,7 @@ static QDF_STATUS sap_fsm_state_starting(struct sap_context *sap_ctx,
 	uint32_t sap_chan_freq;
 	uint32_t ch_cfreq1 = 0;
 	enum reg_wifi_band band;
+	eSapDfsCACState_t cac_state = eSAP_DFS_DO_NOT_SKIP_CAC;
 
 	if (msg == eSAP_MAC_START_BSS_SUCCESS) {
 		/*
@@ -3833,9 +3853,11 @@ static QDF_STATUS sap_fsm_state_starting(struct sap_context *sap_ctx,
 		sap_debug("is_dfs %d", is_dfs);
 		if (is_dfs) {
 			sap_dfs_info = &mac_ctx->sap.SapDfsInfo;
+			if (sap_plus_sap_cac_skip(mac_ctx, sap_ctx,
+						  sap_chan_freq))
+				cac_state = eSAP_DFS_SKIP_CAC;
 			if ((false == sap_dfs_info->ignore_cac) &&
-			    (eSAP_DFS_DO_NOT_SKIP_CAC ==
-			    sap_dfs_info->cac_state) &&
+			    (cac_state == eSAP_DFS_DO_NOT_SKIP_CAC) &&
 			    !wlan_pre_cac_complete_get(sap_ctx->vdev) &&
 			    policy_mgr_get_dfs_master_dynamic_enabled(
 					mac_ctx->psoc,

core/sap/src/sap_internal.h

@@ -504,6 +504,26 @@ sap_chan_bond_dfs_sub_chan(struct sap_context *sap_context,
 			   qdf_freq_t channel_freq,
 			   ePhyChanBondState bond_state);
 
+/**
+ * sap_plus_sap_cac_skip() - Check current sap can skip CAC or not
+ *  in SAP+SAP concurrency
+ * @mac: mac ctx
+ * @sap_ctx: SAP context
+ * @chan_freq: SAP channel frequency
+ *
+ * All APs are done with CAC timer, all APs should start beaconing.
+ * Lets assume AP1 and AP2 started beaconing on DFS channel, Now lets
+ * say AP1 goes down and comes back on same DFS channel. In this case
+ * AP1 shouldn't start CAC timer and start beacon immediately because
+ * AP2 is already beaconing on this channel. This case will be handled
+ * by checking CAC completion on AP2.
+ *
+ * Return: true if current SAP can skip CAC
+ */
+bool sap_plus_sap_cac_skip(struct mac_context *mac,
+			   struct sap_context *sap_ctx,
+			   qdf_freq_t chan_freq);
+
 void
 sap_build_start_bss_config(struct start_bss_config *sap_bss_cfg,
 			   struct sap_config *config);

core/sap/src/sap_module.c

@@ -840,6 +840,7 @@ QDF_STATUS wlansap_start_bss(struct sap_context *sap_ctx,
 	sap_ctx->acs_cfg = &config->acs_cfg;
 	sap_ctx->sec_ch_freq = config->sec_ch_freq;
 	sap_ctx->dfs_cac_offload = config->dfs_cac_offload;
+	sap_ctx->isCacStartNotified = false;
 	sap_ctx->isCacEndNotified = false;
 	sap_ctx->is_chan_change_inprogress = false;
 	sap_ctx->disabled_mcs13 = false;
@@ -1749,8 +1750,6 @@ QDF_STATUS wlansap_set_channel_change_with_csa(struct sap_context *sap_ctx,
 			 * request was issued.
 			 */
 			sap_ctx->sap_radar_found_status = true;
-			mac->sap.SapDfsInfo.cac_state =
-					eSAP_DFS_DO_NOT_SKIP_CAC;
 			sap_cac_reset_notify(mac_handle);
 
 			/*
@@ -2159,7 +2158,8 @@ QDF_STATUS wlansap_set_dfs_ignore_cac(mac_handle_t mac_handle,
 }
 
 QDF_STATUS wlansap_get_dfs_cac_state(mac_handle_t mac_handle,
-				     eSapDfsCACState_t *cac_state)
+				     struct sap_context *sapcontext,
+				     bool *cac_state)
 {
 	struct mac_context *mac = NULL;
 
@@ -2169,8 +2169,13 @@ QDF_STATUS wlansap_get_dfs_cac_state(mac_handle_t mac_handle,
 		sap_err("Invalid mac_handle pointer");
 		return QDF_STATUS_E_FAULT;
 	}
+	if (!sapcontext) {
+		sap_err("Invalid sapcontext pointer");
+		return QDF_STATUS_E_FAULT;
+	}
+
+	*cac_state = sap_is_dfs_cac_wait_state(sapcontext);
 
-	*cac_state = mac->sap.SapDfsInfo.cac_state;
 	return QDF_STATUS_SUCCESS;
 }