qcacld-3.0: Enable 5.9 ghz channels for US

Add new channel 177 to wiphy struct ieee80211_channel
hdd_etsi13_srd_ch and rename the struct to
hdd_5dot9_ghz_ch.
Add a new ini fcc_5dot9_ghz_chan_in_master_mode to
enable/disable new 5.9 GHz channels 169, 173 and 177
in master mode.

Change-Id: I68dc3be18277ca0e416a579327f406279458899e
CRs-Fixed: 2693707

components/mlme/core/src/wlan_mlme_main.c

@@ -2187,6 +2187,8 @@ static void mlme_init_reg_cfg(struct wlan_objmgr_psoc *psoc,
 	reg->self_gen_frm_pwr = cfg_get(psoc, CFG_SELF_GEN_FRM_PWR);
 	reg->etsi13_srd_chan_in_master_mode =
 			cfg_get(psoc, CFG_ETSI13_SRD_CHAN_IN_MASTER_MODE);
+	reg->fcc_5dot9_ghz_chan_in_master_mode =
+			cfg_get(psoc, CFG_FCC_5DOT9_GHZ_CHAN_IN_MASTER_MODE);
 	reg->restart_beaconing_on_ch_avoid =
 			cfg_get(psoc, CFG_RESTART_BEACONING_ON_CH_AVOID);
 	reg->indoor_channel_support = cfg_get(psoc, CFG_INDOOR_CHANNEL_SUPPORT);

components/mlme/dispatcher/inc/cfg_mlme_reg.h

@@ -95,6 +95,30 @@
 	0, \
 	"enable/disable ETSI SRD channels in master mode")
 
+/*
+ * <ini>
+ * fcc_5dot9_ghz_chan_in_master_mode - Enable/disable 5.9 GHz channels in
+ * master mode for US
+ * @Min: 0
+ * @Max: 1
+ * @Default: 0
+ *
+ * fcc_5dot9_ghz_chan_in_master_mode is to enable/disable 5.9 GHz channels
+ * in master mode for FCC reg domain
+ *
+ * Related: None
+ *
+ * Supported Feature: SAP/P2P-GO
+ *
+ * Usage: Internal/External
+ *
+ * </ini>
+ */
+#define CFG_FCC_5DOT9_GHZ_CHAN_IN_MASTER_MODE CFG_INI_BOOL( \
+	"fcc_5dot9_ghz_chan_in_master_mode", \
+	0, \
+	"enable/disable FCC 5.9 GHz channels in master mode")
+
 #ifdef SAP_AVOID_ACS_FREQ_LIST
 #define SAP_AVOID_ACS_FREQ_LIST_DEFAULT ""
 
@@ -277,6 +301,7 @@
 	CFG(CFG_ENABLE_PENDING_CHAN_LIST_REQ) \
 	CFG(CFG_ENABLE_11D_IN_WORLD_MODE) \
 	CFG(CFG_ETSI13_SRD_CHAN_IN_MASTER_MODE) \
+	CFG(CFG_FCC_5DOT9_GHZ_CHAN_IN_MASTER_MODE) \
 	CFG(CFG_RESTART_BEACONING_ON_CH_AVOID) \
 	CFG(CFG_INDOOR_CHANNEL_SUPPORT) \
 	CFG(CFG_SCAN_11D_INTERVAL) \

components/mlme/dispatcher/inc/wlan_mlme_public_struct.h

@@ -2138,6 +2138,7 @@ struct wlan_mlme_mwc {
  * @self_gen_frm_pwr: self-generated frame power in tx chain mask
  * for CCK rates
  * @etsi13_srd_chan_in_master_mode: etsi13 srd chan in master mode
+ * @fcc_5dot9_ghz_chan_in_master_mode: fcc 5.9 GHz chan in master mode
  * @restart_beaconing_on_ch_avoid: restart beaconing on ch avoid
  * @indoor_channel_support: indoor channel support
  * @scan_11d_interval: scan 11d interval
@@ -2154,6 +2155,7 @@ struct wlan_mlme_mwc {
 struct wlan_mlme_reg {
 	uint32_t self_gen_frm_pwr;
 	bool etsi13_srd_chan_in_master_mode;
+	bool fcc_5dot9_ghz_chan_in_master_mode;
 	enum restart_beaconing_on_ch_avoid_rule
 		restart_beaconing_on_ch_avoid;
 	bool indoor_channel_support;

components/mlme/dispatcher/inc/wlan_mlme_ucfg_api.h

@@ -3773,6 +3773,18 @@ QDF_STATUS
 ucfg_mlme_get_etsi13_srd_chan_in_master_mode(struct wlan_objmgr_psoc *psoc,
 					     bool *value);
 
+/**
+ * ucfg_mlme_get_5dot9_ghz_chan_in_master_mode  - get fcc 5.9 GHz chan
+ * in master mode
+ * @psoc:   pointer to psoc object
+ * @value:  pointer to the value which will be filled for the caller
+ *
+ * Return: QDF Status
+ */
+QDF_STATUS
+ucfg_mlme_get_5dot9_ghz_chan_in_master_mode(struct wlan_objmgr_psoc *psoc,
+					    bool *value);
+
 #ifdef SAP_AVOID_ACS_FREQ_LIST
 /**
  * ucfg_mlme_get_acs_avoid_freq_list  - get acs avoid frequency list

components/mlme/dispatcher/src/wlan_mlme_ucfg_api.c

@@ -1502,6 +1502,24 @@ ucfg_mlme_get_etsi13_srd_chan_in_master_mode(struct wlan_objmgr_psoc *psoc,
 	return QDF_STATUS_SUCCESS;
 }
 
+QDF_STATUS
+ucfg_mlme_get_5dot9_ghz_chan_in_master_mode(struct wlan_objmgr_psoc *psoc,
+					    bool *value)
+{
+	struct wlan_mlme_psoc_ext_obj *mlme_obj;
+
+	mlme_obj = mlme_get_psoc_ext_obj(psoc);
+	if (!mlme_obj) {
+		*value = cfg_default(CFG_FCC_5DOT9_GHZ_CHAN_IN_MASTER_MODE);
+		mlme_legacy_err("Failed to get MLME Obj");
+		return QDF_STATUS_E_INVAL;
+	}
+
+	*value = mlme_obj->cfg.reg.fcc_5dot9_ghz_chan_in_master_mode;
+
+	return QDF_STATUS_SUCCESS;
+}
+
 #ifdef SAP_AVOID_ACS_FREQ_LIST
 QDF_STATUS
 ucfg_mlme_get_acs_avoid_freq_list(struct wlan_objmgr_psoc *psoc,

core/hdd/src/wlan_hdd_cfg80211.c

@@ -306,9 +306,10 @@ static const struct ieee80211_channel hdd_channels_dot11p[] = {
 	HDD5GHZCHAN(5920, 184, 0),
 };
 #else
-static const struct ieee80211_channel hdd_etsi13_srd_ch[] = {
+static const struct ieee80211_channel hdd_5dot9_ghz_ch[] = {
 	HDD5GHZCHAN(5845, 169, 0),
 	HDD5GHZCHAN(5865, 173, 0),
+	HDD5GHZCHAN(5885, 177, 0),
 };
 #endif
 
@@ -319,7 +320,7 @@ static const struct ieee80211_channel hdd_etsi13_srd_ch[] = {
 	sizeof(hdd_channels_dot11p))
 #else
 #define band_5_ghz_chanenls_size (sizeof(hdd_channels_5_ghz) + \
-	sizeof(hdd_etsi13_srd_ch))
+	sizeof(hdd_5dot9_ghz_ch))
 #endif
 
 static struct ieee80211_rate g_mode_rates[] = {
@@ -15572,14 +15573,15 @@ static void wlan_hdd_copy_srd_ch(char *ch_ptr, int ch_arr_len)
 }
 
 /**
- * wlan_hdd_populate_srd_chan_info() - Populate SRD chan info in hdd context
+ * wlan_hdd_populate_5dot9_chan_info() - Populate 5.9 GHz chan info in hdd
+ * context
  * @hdd_ctx: pointer to hdd context
- * @index: SRD channel beginning index in chan_info of @hdd_ctx
+ * @index: 5.9 GHz channel beginning index in chan_info of @hdd_ctx
  *
- * Return: Number of SRD channels populated
+ * Return: Number of 5.9 GHz channels populated
  */
 static uint32_t
-wlan_hdd_populate_srd_chan_info(struct hdd_context *hdd_ctx, uint32_t index)
+wlan_hdd_populate_5dot9_chan_info(struct hdd_context *hdd_ctx, uint32_t index)
 {
 	return 0;
 }
@@ -15600,37 +15602,38 @@ static void wlan_hdd_copy_dsrc_ch(char *ch_ptr, int ch_arr_len)
 static void wlan_hdd_get_num_srd_ch_and_len(struct hdd_config *hdd_cfg,
 					    int *num_ch, int *ch_len)
 {
-	*num_ch = QDF_ARRAY_SIZE(hdd_etsi13_srd_ch);
-	*ch_len = sizeof(hdd_etsi13_srd_ch);
+	*num_ch = QDF_ARRAY_SIZE(hdd_5dot9_ghz_ch);
+	*ch_len = sizeof(hdd_5dot9_ghz_ch);
 }
 
 static void wlan_hdd_copy_srd_ch(char *ch_ptr, int ch_arr_len)
 {
 	if (!ch_arr_len)
 		return;
-	qdf_mem_copy(ch_ptr, &hdd_etsi13_srd_ch[0], ch_arr_len);
+	qdf_mem_copy(ch_ptr, &hdd_5dot9_ghz_ch[0], ch_arr_len);
 }
 
 /**
- * wlan_hdd_populate_srd_chan_info() - Populate SRD chan info in hdd context
+ * wlan_hdd_populate_5dot9_chan_info() - Populate 5.9 GHz chan info in hdd
+ * context
  * @hdd_ctx: pointer to hdd context
- * @index: SRD channel beginning index in chan_info of @hdd_ctx
+ * @index: 5.9 GHz channel beginning index in chan_info of @hdd_ctx
  *
- * Return: Number of SRD channels populated
+ * Return: Number of 5.9 GHz channels populated
  */
 static uint32_t
-wlan_hdd_populate_srd_chan_info(struct hdd_context *hdd_ctx, uint32_t index)
+wlan_hdd_populate_5dot9_chan_info(struct hdd_context *hdd_ctx, uint32_t index)
 {
-	uint32_t num_srd_ch, i;
+	uint32_t num_5dot9_ch, i;
 	struct scan_chan_info *chan_info;
 
-	num_srd_ch = QDF_ARRAY_SIZE(hdd_etsi13_srd_ch);
+	num_5dot9_ch = QDF_ARRAY_SIZE(hdd_5dot9_ghz_ch);
 	chan_info = hdd_ctx->chan_info;
 
-	for (i = 0; i < num_srd_ch; i++)
-		chan_info[index + i].freq = hdd_etsi13_srd_ch[i].center_freq;
+	for (i = 0; i < num_5dot9_ch; i++)
+		chan_info[index + i].freq = hdd_5dot9_ghz_ch[i].center_freq;
 
-	return num_srd_ch;
+	return num_5dot9_ch;
 }
 
 #endif
@@ -23619,7 +23622,7 @@ void wlan_hdd_init_chan_info(struct hdd_context *hdd_ctx)
 	}
 
 	index = num_2g + num_5g;
-	index = wlan_hdd_populate_srd_chan_info(hdd_ctx, index);
+	index = wlan_hdd_populate_5dot9_chan_info(hdd_ctx, index);
 
 	mac_handle = hdd_ctx->mac_handle;
 	sme_set_chan_info_callback(mac_handle,

core/hdd/src/wlan_hdd_regulatory.c

@@ -216,6 +216,7 @@ static void reg_program_config_vars(struct hdd_context *hdd_ctx,
 	bool indoor_chan_enabled = false;
 	uint32_t restart_beaconing = 0;
 	bool enable_srd_chan = false;
+	bool enable_5dot9_ghz_chan;
 	QDF_STATUS status;
 	bool country_priority = 0;
 	bool value = false;
@@ -264,6 +265,11 @@ static void reg_program_config_vars(struct hdd_context *hdd_ctx,
 
 	ucfg_mlme_get_11d_in_world_mode(hdd_ctx->psoc,
 					&config_vars->enable_11d_in_world_mode);
+
+	ucfg_mlme_get_5dot9_ghz_chan_in_master_mode(hdd_ctx->psoc,
+						    &enable_5dot9_ghz_chan);
+	config_vars->enable_5dot9_ghz_chan_in_master_mode =
+						enable_5dot9_ghz_chan;
 }
 
 /**