qcacmn: Add target_if changes for dynamic hw-mode config

This feature enables a user to change HW mode dynamically
from DBS to DBS_SBS mode and vice-versa. Currently, HW
mode configuration is only possible through INI setting
requiring a subsequent reboot.

Primary target_if changes are:

1. Add structure definition wlan_psoc_host_hal_reg_cap_ext
to parse and store the new extended regulatory capability
info in WMI_MAC_PHY_CAPABILITIES tlv sent in EXT service
ready WMI event
2. Add API target_psoc_get_num_radios_for_mode to retrieve
the number of radios corresponding to a hw-mode
3. Add API target_psoc_get_mac_phy_cap_for_mode to retrieve
the pointer to the mac_phy_cap info of the first radio
corresponding to the input hw-mode.

Change-Id: Ia10f0fd5e50c0ce0cbe99f9281147266aedce4e9
CRs-fixed: 2490212

qdf/inc/qdf_types.h

@@ -367,6 +367,7 @@ typedef bool (*qdf_irqlocked_func_t)(void *);
  * @QDF_MODULE_ID_INTEROP_ISSUES_AP: interop issues ap module ID
  * @QDF_MODULE_ID_BLACKLIST_MGR: Blacklist Manager module
  * @QDF_MODULE_ID_QLD: QCA Live Debug module ID
+ * @QDF_MODULE_ID_DYNAMIC_MODE_CHG: Dynamic mode change module ID
  * @QDF_MODULE_ID_ANY: anything
  * @QDF_MODULE_ID_MAX: Max place holder module ID
  */
@@ -484,6 +485,7 @@ typedef enum {
 	QDF_MODULE_ID_INTEROP_ISSUES_AP,
 	QDF_MODULE_ID_BLACKLIST_MGR,
 	QDF_MODULE_ID_QLD,
+	QDF_MODULE_ID_DYNAMIC_MODE_CHG,
 	QDF_MODULE_ID_ANY,
 	QDF_MODULE_ID_MAX,
 } QDF_MODULE_ID;

qdf/linux/src/qdf_trace.c

@@ -2712,6 +2712,7 @@ struct category_name_info g_qdf_category_name[MAX_SUPPORTED_CATEGORY] = {
 	[QDF_MODULE_ID_INTEROP_ISSUES_AP] = {"INTEROP_ISSUES_AP"},
 	[QDF_MODULE_ID_BLACKLIST_MGR] = {"blm"},
 	[QDF_MODULE_ID_QLD] = {"QLD"},
+	[QDF_MODULE_ID_DYNAMIC_MODE_CHG] = {"Dynamic Mode Change"},
 	[QDF_MODULE_ID_ANY] = {"ANY"},
 };
 qdf_export_symbol(g_qdf_category_name);
@@ -3171,6 +3172,7 @@ static void set_default_trace_levels(struct category_info *cinfo)
 		[QDF_MODULE_ID_INTEROP_ISSUES_AP] = QDF_TRACE_LEVEL_NONE,
 		[QDF_MODULE_ID_BLACKLIST_MGR] = QDF_TRACE_LEVEL_NONE,
 		[QDF_MODULE_ID_QLD] = QDF_TRACE_LEVEL_ERROR,
+		[QDF_MODULE_ID_DYNAMIC_MODE_CHG] = QDF_TRACE_LEVEL_INFO,
 		[QDF_MODULE_ID_ANY] = QDF_TRACE_LEVEL_INFO,
 	};
 

target_if/core/inc/target_if.h

@@ -800,6 +800,35 @@ static inline uint8_t target_psoc_get_num_radios
 	return psoc_info->info.num_radios;
 }
 
+/**
+ * target_psoc_get_num_radios_for_mode() - get number of radios for a hw-mode
+ * @psoc_info:  pointer to structure target_psoc_info
+ *
+ * API to get number_of_radios for a HW mode
+ *
+ * Return: number of radios
+ */
+
+static inline uint8_t target_psoc_get_num_radios_for_mode
+		(struct target_psoc_info *psoc_info, uint8_t mode)
+{
+	uint8_t mac_phy_count;
+	uint8_t num_radios = 0;
+	struct tgt_info *info = &psoc_info->info;
+
+	if (!psoc_info)
+		return 0;
+
+	for (mac_phy_count = 0;
+		mac_phy_count < target_psoc_get_total_mac_phy_cnt(psoc_info);
+		mac_phy_count++) {
+		num_radios +=
+		(info->mac_phy_cap[mac_phy_count].hw_mode_id == mode);
+	}
+
+	return num_radios;
+}
+
 /**
  * target_psoc_set_service_bitmap() - set service_bitmap
  * @psoc_info:  pointer to structure target_psoc_info
@@ -1242,6 +1271,36 @@ static inline struct wlan_psoc_host_service_ext_param
 	return &psoc_info->info.service_ext_param;
 }
 
+/**
+ * target_psoc_get_mac_phy_cap_for_mode() - get mac_phy_cap for a hw-mode
+ * @psoc_info:  pointer to structure target_psoc_info
+ *
+ * API to get mac_phy_cap for a specified hw-mode
+ *
+ * Return: structure pointer to wlan_psoc_host_mac_phy_caps
+ */
+
+static inline struct wlan_psoc_host_mac_phy_caps
+		*target_psoc_get_mac_phy_cap_for_mode
+		(struct target_psoc_info *psoc_info, uint8_t mode)
+{
+	uint8_t mac_phy_idx;
+	struct tgt_info *info = &psoc_info->info;
+
+	if (!psoc_info)
+		return NULL;
+
+	for (mac_phy_idx = 0;
+		mac_phy_idx < PSOC_MAX_MAC_PHY_CAP;
+			mac_phy_idx++)
+		if (info->mac_phy_cap[mac_phy_idx].hw_mode_id == mode)
+			break;
+
+	if (mac_phy_idx == PSOC_MAX_MAC_PHY_CAP)
+		return NULL;
+
+	return &info->mac_phy_cap[mac_phy_idx];
+}
 
 /**
  * target_psoc_get_mac_phy_cap() - get mac_phy_cap
@@ -1254,10 +1313,24 @@ static inline struct wlan_psoc_host_service_ext_param
 static inline struct wlan_psoc_host_mac_phy_caps *target_psoc_get_mac_phy_cap
 		(struct target_psoc_info *psoc_info)
 {
+	uint32_t preferred_hw_mode;
+	struct wlan_psoc_host_mac_phy_caps *mac_phy_cap;
+
 	if (!psoc_info)
 		return NULL;
 
-	return psoc_info->info.mac_phy_cap;
+	preferred_hw_mode =
+		target_psoc_get_preferred_hw_mode(psoc_info);
+
+	if (preferred_hw_mode < WMI_HOST_HW_MODE_MAX) {
+		mac_phy_cap =
+			target_psoc_get_mac_phy_cap_for_mode
+			(psoc_info, preferred_hw_mode);
+	} else {
+		mac_phy_cap = psoc_info->info.mac_phy_cap;
+	}
+
+	return mac_phy_cap;
 }
 
 /**

target_if/init_deinit/inc/service_ready_param.h

@@ -109,6 +109,23 @@ struct wlan_psoc_host_ppe_threshold {
 	uint32_t ppet16_ppet8_ru3_ru0[PSOC_HOST_MAX_NUM_SS];
 };
 
+/**
+ * struct wlan_psoc_host_hal_reg_cap_ext - extended regulatory capabilities
+ * recvd in EXT service
+ * @wireless_modes: REGDMN MODE
+ * @low_2ghz_chan: lower 2.4GHz channels
+ * @high_2ghz_chan: higher 2.4 GHz channels
+ * @low_5ghz_chan: lower 5 GHz channels
+ * @high_5ghz_chan: higher 5 GHz channels
+ */
+struct wlan_psoc_host_hal_reg_cap_ext {
+	uint32_t wireless_modes;
+	uint32_t low_2ghz_chan;
+	uint32_t high_2ghz_chan;
+	uint32_t low_5ghz_chan;
+	uint32_t high_5ghz_chan;
+};
+
 /**
  * struct wlan_psoc_host_mac_phy_caps - Phy caps recvd in EXT service
  *  @hw_mode_id: identify a particular set of HW characteristics,
@@ -161,6 +178,7 @@ struct wlan_psoc_host_ppe_threshold {
  * @he_ppet5G: 5G HE PPET info
  * @chainmask_table_id: chain mask table id
  * @lmac_id: hw mac id
+ * @reg_cap_ext: extended regulatory capabilities
  */
 struct wlan_psoc_host_mac_phy_caps {
 	uint32_t hw_mode_id;
@@ -198,6 +216,7 @@ struct wlan_psoc_host_mac_phy_caps {
 	struct wlan_psoc_host_ppe_threshold he_ppet5G;
 	uint32_t chainmask_table_id;
 	uint32_t lmac_id;
+	struct wlan_psoc_host_hal_reg_cap_ext reg_cap_ext;
 };
 
 /**

target_if/init_deinit/src/init_cmd_api.c

@@ -384,8 +384,12 @@ void init_deinit_derive_band_to_mac_param(
 		return;
 	}
 
+	mac_phy_cap = target_psoc_get_mac_phy_cap(tgt_hdl);
+	if (!mac_phy_cap) {
+		target_if_err("mac_phy_cap is NULL");
+		return;
+	}
 	for (i = 0; i < target_psoc_get_num_radios(tgt_hdl); i++) {
-		mac_phy_cap = &info->mac_phy_cap[i];
 		if (mac_phy_cap->supported_bands ==
 			(WMI_HOST_WLAN_5G_CAPABILITY |
 					WMI_HOST_WLAN_2G_CAPABILITY)) {
@@ -409,9 +413,9 @@ void init_deinit_derive_band_to_mac_param(
 			reg_cap[mac_phy_cap->phy_id].high_5ghz_chan = 0;
 
 			target_if_debug("2G radio - pdev_id = %d start_freq = %d end_freq= %d",
-					band_to_mac[i].pdev_id,
-					band_to_mac[i].start_freq,
-					band_to_mac[i].end_freq);
+				       band_to_mac[i].pdev_id,
+				       band_to_mac[i].start_freq,
+				       band_to_mac[i].end_freq);
 
 		} else if (mac_phy_cap->supported_bands ==
 					WMI_HOST_WLAN_5G_CAPABILITY) {
@@ -425,10 +429,11 @@ void init_deinit_derive_band_to_mac_param(
 			reg_cap[mac_phy_cap->phy_id].high_2ghz_chan = 0;
 
 			target_if_debug("5G radio -pdev_id = %d start_freq = %d end_freq =%d\n",
-					band_to_mac[i].pdev_id,
-					band_to_mac[i].start_freq,
-					band_to_mac[i].end_freq);
+				       band_to_mac[i].pdev_id,
+				       band_to_mac[i].start_freq,
+				       band_to_mac[i].end_freq);
 		}
+		mac_phy_cap++;
 	}
 }
 

target_if/init_deinit/src/init_event_handler.c

@@ -115,6 +115,9 @@ static int init_deinit_service_ready_event_handler(ol_scn_t scn_handle,
 	if (wmi_service_enabled(wmi_handle, wmi_service_infra_mbssid))
 		wlan_psoc_nif_fw_ext_cap_set(psoc, WLAN_SOC_CEXT_MBSS_IE);
 
+	if (wmi_service_enabled(wmi_handle, wmi_service_dynamic_hw_mode))
+		wlan_psoc_nif_fw_ext_cap_set(psoc, WLAN_SOC_CEXT_DYNAMIC_HW_MODE);
+
 	target_if_debug(" TT support %d, Wide BW Scan %d, SW cal %d",
 		wlan_psoc_nif_fw_ext_cap_get(psoc, WLAN_SOC_CEXT_TT_SUPPORT),
 		wlan_psoc_nif_fw_ext_cap_get(psoc, WLAN_SOC_CEXT_WIDEBAND_SCAN),
@@ -194,6 +197,7 @@ static int init_deinit_service_ext_ready_event_handler(ol_scn_t scn_handle,
 						uint32_t data_len)
 {
 	int err_code;
+	uint8_t num_radios;
 	struct wlan_objmgr_psoc *psoc;
 	struct target_psoc_info *tgt_hdl;
 	struct wmi_unified *wmi_handle;
@@ -238,20 +242,11 @@ static int init_deinit_service_ext_ready_event_handler(ol_scn_t scn_handle,
 		return -EINVAL;
 	}
 
-	if (info->preferred_hw_mode != WMI_HOST_HW_MODE_MAX) {
-		struct wlan_psoc_host_hw_mode_caps *hw_cap = &info->hw_mode_cap;
-		/* prune info mac_phy cap to preferred/selected mode caps */
-		info->total_mac_phy_cnt = 0;
-		err_code = init_deinit_populate_mac_phy_capability(wmi_handle,
-								   event,
-								   hw_cap,
-								   info);
-		if (err_code)
-			goto exit;
+	num_radios = target_psoc_get_num_radios_for_mode(tgt_hdl,
+							 info->preferred_hw_mode);
 
-		info->num_radios = info->total_mac_phy_cnt;
-		target_if_debug("num radios is %d\n", info->num_radios);
-	}
+	/* set number of radios based on current mode */
+	target_psoc_set_num_radios(tgt_hdl, num_radios);
 
 	target_if_print_service_ready_ext_param(psoc, tgt_hdl);
 

target_if/init_deinit/src/service_ready_util.c

@@ -767,6 +767,15 @@ bool init_deinit_is_preferred_hw_mode_supported(
 	if (info->preferred_hw_mode == WMI_HOST_HW_MODE_MAX)
 		return TRUE;
 
+	if (wlan_psoc_nif_feat_cap_get(psoc, WLAN_SOC_F_DYNAMIC_HW_MODE)) {
+		if (!wlan_psoc_nif_fw_ext_cap_get(psoc,
+					WLAN_SOC_CEXT_DYNAMIC_HW_MODE)) {
+			target_if_err(
+			"WMI service bit for DYNAMIC HW mode is not set!");
+			return FALSE;
+		}
+	}
+
 	for (i = 0; i < target_psoc_get_total_mac_phy_cnt(tgt_hdl); i++) {
 		if (info->mac_phy_cap[i].hw_mode_id == info->preferred_hw_mode)
 			return TRUE;

umac/cmn_services/obj_mgr/inc/wlan_objmgr_psoc_obj.h

@@ -134,6 +134,8 @@
 #define WLAN_SOC_CEXT_MBSS_IE          0x00020000
 	/* RXOLE Flow Search Support */
 #define WLAN_SOC_CEXT_RX_FSE_SUPPORT   0x00040000
+	/* Dynamic HW Mode Switch Support */
+#define WLAN_SOC_CEXT_DYNAMIC_HW_MODE  0x00080000
 
 /* feature_flags */
 	/* CONF: ATH FF enabled */
@@ -190,6 +192,8 @@
 #define WLAN_SOC_F_SPECTRAL_DISABLE    0x00800000
 	/* FTM testmode enable */
 #define WLAN_SOC_F_TESTMODE_ENABLE     0x01000000
+	/* Dynamic HW mode swithch enable */
+#define WLAN_SOC_F_DYNAMIC_HW_MODE     0x02000000
 
 /* PSOC op flags */