qcacld-3.0: start sap if restriction mask is not set for unsafe channels

Currently sap is not starting if all channels configured as coex
unsafe and if restriction mask is not set.
This change is to select unsafe channel if restriction mask is
not set and start the sap.

Change-Id: I4ccf887655066da6d6b50715f631dde6edfda598
CRs-Fixed: 3260305

components/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c

@@ -1534,12 +1534,14 @@ static bool policy_mgr_is_sap_go_existed(struct wlan_objmgr_psoc *psoc)
 	return false;
 }
 
+#ifdef FEATURE_WLAN_CH_AVOID_EXT
 bool policy_mgr_is_safe_channel(struct wlan_objmgr_psoc *psoc,
 				uint32_t ch_freq)
 {
 	struct policy_mgr_psoc_priv_obj *pm_ctx;
 	bool is_safe = true;
 	uint8_t j;
+	unsigned long restriction_mask;
 
 	pm_ctx = policy_mgr_get_context(psoc);
 	if (!pm_ctx) {
@@ -1547,6 +1549,35 @@ bool policy_mgr_is_safe_channel(struct wlan_objmgr_psoc *psoc,
 		return is_safe;
 	}
 
+	if (pm_ctx->unsafe_channel_count == 0)
+		return is_safe;
+
+	restriction_mask =
+		(unsigned long)policy_mgr_get_freq_restriction_mask(pm_ctx);
+	for (j = 0; j < pm_ctx->unsafe_channel_count; j++) {
+		if ((ch_freq == pm_ctx->unsafe_channel_list[j]) &&
+		    (qdf_test_bit(QDF_SAP_MODE, &restriction_mask))) {
+			is_safe = false;
+			policy_mgr_warn("Freq %d is not safe, restriction mask %lu", ch_freq, restriction_mask);
+			break;
+		}
+	}
+
+	return is_safe;
+}
+#else
+bool policy_mgr_is_safe_channel(struct wlan_objmgr_psoc *psoc,
+				uint32_t ch_freq)
+{
+	struct policy_mgr_psoc_priv_obj *pm_ctx;
+	bool is_safe = true;
+	uint8_t j;
+
+	pm_ctx = policy_mgr_get_context(psoc);
+	if (!pm_ctx) {
+		policy_mgr_err("Invalid context");
+		return is_safe;
+	}
 
 	if (pm_ctx->unsafe_channel_count == 0)
 		return is_safe;
@@ -1561,6 +1592,7 @@ bool policy_mgr_is_safe_channel(struct wlan_objmgr_psoc *psoc,
 
 	return is_safe;
 }
+#endif
 
 bool policy_mgr_is_sap_freq_allowed(struct wlan_objmgr_psoc *psoc,
 				    uint32_t sap_freq)

components/cmn_services/policy_mgr/src/wlan_policy_mgr_i.h

@@ -403,6 +403,9 @@ struct policy_mgr_psoc_priv_obj {
 	bool set_link_in_progress;
 	qdf_event_t set_link_update_done_evt;
 #endif
+#ifdef FEATURE_WLAN_CH_AVOID_EXT
+	uint32_t restriction_mask;
+#endif
 };
 
 /**
@@ -938,4 +941,36 @@ bool policy_mgr_2_freq_same_mac_in_sbs(struct policy_mgr_psoc_priv_obj *pm_ctx,
  */
 uint32_t policy_mgr_get_connection_for_vdev_id(struct wlan_objmgr_psoc *psoc,
 					       uint32_t vdev_id);
+
+#ifdef FEATURE_WLAN_CH_AVOID_EXT
+/**
+ * policy_mgr_set_freq_restriction_mask() - fill the restriction_mask
+ * in pm_ctx
+ *
+ * @pm_ctx: policy mgr psoc priv object
+ * @freq_list: avoid freq indication carries freq/mask/freq count
+ *
+ * Return: None
+ */
+void
+policy_mgr_set_freq_restriction_mask(struct policy_mgr_psoc_priv_obj *pm_ctx,
+				     struct ch_avoid_ind_type *freq_list);
+
+/**
+ * policy_mgr_get_freq_restriction_mask() - get restriction_mask from
+ * pm_ctx
+ *
+ * @pm_ctx: policy mgr psoc priv object
+ *
+ * Return: Restriction mask
+ */
+uint32_t
+policy_mgr_get_freq_restriction_mask(struct policy_mgr_psoc_priv_obj *pm_ctx);
+#else
+static inline void
+policy_mgr_set_freq_restriction_mask(struct policy_mgr_psoc_priv_obj *pm_ctx,
+				     struct ch_avoid_ind_type *freq_list)
+{
+}
+#endif
 #endif

components/cmn_services/policy_mgr/src/wlan_policy_mgr_pcl.c

@@ -433,6 +433,21 @@ policy_mgr_update_valid_ch_freq_list(struct policy_mgr_psoc_priv_obj *pm_ctx,
 	pm_ctx->valid_ch_freq_list_count = j;
 }
 
+#ifdef FEATURE_WLAN_CH_AVOID_EXT
+void
+policy_mgr_set_freq_restriction_mask(struct policy_mgr_psoc_priv_obj *pm_ctx,
+				     struct ch_avoid_ind_type *freq_list)
+{
+	pm_ctx->restriction_mask = freq_list->restriction_mask;
+}
+
+uint32_t
+policy_mgr_get_freq_restriction_mask(struct policy_mgr_psoc_priv_obj *pm_ctx)
+{
+	return pm_ctx->restriction_mask;
+}
+#endif
+
 void
 policy_mgr_reg_chan_change_callback(struct wlan_objmgr_psoc *psoc,
 				    struct wlan_objmgr_pdev *pdev,
@@ -442,6 +457,7 @@ policy_mgr_reg_chan_change_callback(struct wlan_objmgr_psoc *psoc,
 {
 	struct policy_mgr_psoc_priv_obj *pm_ctx;
 	uint32_t i;
+	struct ch_avoid_ind_type *freq_list;
 
 	pm_ctx = policy_mgr_get_context(psoc);
 	if (!pm_ctx) {
@@ -466,6 +482,9 @@ policy_mgr_reg_chan_change_callback(struct wlan_objmgr_psoc *psoc,
 			NUM_CHANNELS ?
 			NUM_CHANNELS : avoid_freq_ind->chan_list.chan_cnt;
 
+	freq_list = &avoid_freq_ind->freq_list;
+	policy_mgr_set_freq_restriction_mask(pm_ctx, freq_list);
+
 	for (i = 0; i < pm_ctx->unsafe_channel_count; i++)
 		pm_ctx->unsafe_channel_list[i] =
 			avoid_freq_ind->chan_list.chan_freq_list[i];

core/hdd/src/wlan_hdd_avoid_freq_ext.c

@@ -128,6 +128,9 @@ __wlan_hdd_cfg80211_avoid_freq_ext(struct wiphy *wiphy,
 	if (tb[sub_id])
 		avoid_freq_list.restriction_mask = nla_get_u32(tb[sub_id]);
 
+	if (avoid_freq_list.restriction_mask & BIT(NL80211_IFTYPE_AP))
+		avoid_freq_list.restriction_mask = (1 << QDF_SAP_MODE);
+
 	nla_for_each_nested(freq_ext, tb[id], rem) {
 		if (i == CH_AVOID_MAX_RANGE) {
 			hdd_warn_rl("Ignoring excess range number");

core/hdd/src/wlan_hdd_hostapd.c

@@ -3384,33 +3384,12 @@ uint32_t wlan_hdd_get_sap_restriction_mask(struct hdd_context *hdd_ctx)
 	return hdd_ctx->coex_avoid_freq_list.restriction_mask;
 }
 
-/**
- * wlan_hdd_fetch_sap_restriction_mask() - fetch restriction mask for sap
- * before sap start.
- * @hdd_context: hdd context
- * @sap_context: sap_conext
- *
- * Return: None
- */
-static inline
-void wlan_hdd_fetch_sap_restriction_mask(struct hdd_context *hdd_ctx,
-					 struct sap_context *sap_ctx)
-{
-	sap_ctx->restriction_mask =
-		hdd_ctx->coex_avoid_freq_list.restriction_mask;
-}
 #else
 static inline
 uint32_t wlan_hdd_get_sap_restriction_mask(struct hdd_context *hdd_ctx)
 {
 	return -EINVAL;
 }
-
-static inline
-void wlan_hdd_fetch_sap_restriction_mask(struct hdd_context *hdd_ctx,
-					 struct sap_context *sap_ctx)
-{
-}
 #endif
 
 void hdd_stop_sap_set_tx_power(struct wlan_objmgr_psoc *psoc,
@@ -3450,7 +3429,7 @@ void hdd_stop_sap_set_tx_power(struct wlan_objmgr_psoc *psoc,
 		  sap_ctx->csa_reason);
 
 	if (sap_ctx->csa_reason == CSA_REASON_UNSAFE_CHANNEL) {
-		if (restriction_mask & BIT(NL80211_IFTYPE_AP)) {
+		if (restriction_mask & BIT(QDF_SAP_MODE)) {
 			schedule_work(&adapter->sap_stop_bss_work);
 		} else {
 			unsafe_chan_count = unsafe_ch_list->chan_cnt;
@@ -6498,8 +6477,6 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 		goto error;
 	}
 
-	wlan_hdd_fetch_sap_restriction_mask(hdd_ctx, sap_ctx);
-
 	status = wlansap_start_bss(sap_ctx, sap_event_callback, config,
 				   adapter->dev);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {

core/hdd/src/wlan_hdd_main.c

@@ -11427,7 +11427,7 @@ void hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctxt)
 			wlan_hdd_set_sap_csa_reason(hdd_ctxt->psoc,
 						    adapter->vdev_id,
 						    CSA_REASON_UNSAFE_CHANNEL);
-			hdd_err("Unable to find safe chan, Stop the SAP if restriction mask is set else stop SAP");
+			hdd_err("Unable to find safe chan, Stop the SAP if restriction mask is set else set txpower");
 			hdd_stop_sap_set_tx_power(hdd_ctxt->psoc, adapter);
 			hdd_adapter_dev_put_debug(adapter, dbgid);
 			continue;

core/sap/src/sap_fsm.c

@@ -1020,20 +1020,6 @@ static bool sap_process_liberal_scc_for_go(struct sap_context *sap_context)
 }
 #endif
 
-#ifdef FEATURE_WLAN_CH_AVOID_EXT
-static inline
-uint32_t sap_get_restriction_mask(struct sap_context *sap_context)
-{
-	return sap_context->restriction_mask;
-}
-#else
-static inline
-uint32_t sap_get_restriction_mask(struct sap_context *sap_context)
-{
-	return -EINVAL;
-}
-#endif
-
 QDF_STATUS
 sap_validate_chan(struct sap_context *sap_context,
 		  bool pre_start_bss,
@@ -1186,8 +1172,7 @@ validation_done:
 		  sap_context->chan_freq);
 
 	if (!policy_mgr_is_safe_channel(mac_ctx->psoc,
-					sap_context->chan_freq) &&
-	   (sap_get_restriction_mask(sap_context) & BIT(NL80211_IFTYPE_AP))) {
+					sap_context->chan_freq)) {
 		sap_warn("Abort SAP start due to unsafe channel");
 		return QDF_STATUS_E_ABORTED;
 	}