qcacld-3.0: Add support to log fw version subid

Add support to log firmware version sub id
in the logs and iwpriv command 'version'

Change-Id: I1eaad763da55007d34e243509204acf12ec79955
CRs-Fixed: 1077115

core/hdd/inc/wlan_hdd_main.h

@@ -1417,6 +1417,7 @@ struct hdd_context_s {
 
 	/* defining the firmware version */
 	uint32_t target_fw_version;
+	uint32_t target_fw_vers_ext;
 	qdf_atomic_t dfs_radar_found;
 
 	/* defining the chip/rom version */

core/hdd/src/wlan_hdd_main.c

@@ -1448,6 +1448,7 @@ void hdd_update_tgt_cfg(void *context, void *param)
 	}
 
 	hdd_ctx->target_fw_version = cfg->target_fw_version;
+	hdd_ctx->target_fw_vers_ext = cfg->target_fw_vers_ext;
 
 	hdd_ctx->max_intf_count = cfg->max_intf_count;
 

core/hdd/src/wlan_hdd_wext.c

@@ -749,7 +749,7 @@ void hdd_wlan_get_version(hdd_context_t *hdd_ctx, union iwreq_data *wrqu,
 	tSirVersionString wcnss_sw_version;
 	const char *swversion;
 	const char *hwversion;
-	uint32_t msp_id = 0, mspid = 0, siid = 0, crmid = 0;
+	uint32_t msp_id = 0, mspid = 0, siid = 0, crmid = 0, sub_id = 0;
 
 	if (!hdd_ctx) {
 		hdd_err("Invalid context, HDD context is null");
@@ -764,19 +764,21 @@ void hdd_wlan_get_version(hdd_context_t *hdd_ctx, union iwreq_data *wrqu,
 	mspid = (hdd_ctx->target_fw_version & 0xf000000) >> 24;
 	siid = (hdd_ctx->target_fw_version & 0xf00000) >> 20;
 	crmid = hdd_ctx->target_fw_version & 0x7fff;
+	sub_id = (hdd_ctx->target_fw_vers_ext & 0xf0000000) >> 28;
 
 	hwversion = hdd_ctx->target_hw_name;
 
 	if (wrqu && extra) {
 		wrqu->data.length =
 			scnprintf(extra, WE_MAX_STR_LEN,
-				  "Host SW:%s, FW:%d.%d.%d.%d, HW:%s",
+				  "Host SW:%s, FW:%d.%d.%d.%d.%d, HW:%s",
 				  QWLAN_VERSIONSTR,
-				  msp_id, mspid, siid, crmid, hwversion);
+				  msp_id, mspid, siid, crmid,
+				  sub_id, hwversion);
 	} else {
-		pr_info("Host SW:%s, FW:%d.%d.%d.%d, HW:%s\n",
+		pr_info("Host SW:%s, FW:%d.%d.%d.%d.%d, HW:%s\n",
 			QWLAN_VERSIONSTR,
-			msp_id, mspid, siid, crmid, hwversion);
+			msp_id, mspid, siid, crmid, sub_id, hwversion);
 	}
 error:
 	return;

core/wma/inc/wma.h

@@ -1291,6 +1291,7 @@ struct extended_caps {
  * @target_abi_vers: target firmware version
  * @final_abi_vers: The final ABI version to be used for communicating
  * @target_fw_version: Target f/w build version
+ * @target_fw_vers_ext: Target f/w build version sub id
  * @lpss_support: LPSS feature is supported in target or not
  * @egap_support: Enhanced Green AP support flag
  * @wmi_ready: wmi status flag
@@ -1422,6 +1423,7 @@ typedef struct {
 	wmi_abi_version target_abi_vers;
 	wmi_abi_version final_abi_vers;
 	uint32_t target_fw_version;
+	uint32_t target_fw_vers_ext;
 #ifdef WLAN_FEATURE_LPSS
 	uint8_t lpss_support;
 #endif

core/wma/inc/wma_tgt_cfg.h

@@ -136,6 +136,7 @@ struct wma_dfs_radar_ind {
 /**
  * struct wma_tgt_cfg - target config
  * @target_fw_version: target fw version
+ * @target_fw_vers_ext: target fw extended sub version
  * @band_cap: band capability
  * @reg_domain: reg domain
  * @eeprom_rd_ext: eeprom rd ext
@@ -151,6 +152,7 @@ struct wma_dfs_radar_ind {
  */
 struct wma_tgt_cfg {
 	uint32_t target_fw_version;
+	uint32_t target_fw_vers_ext;
 	uint8_t band_cap;
 	uint32_t reg_domain;
 	uint32_t eeprom_rd_ext;

core/wma/src/wma_main.c

@@ -4189,6 +4189,7 @@ static void wma_update_hdd_cfg(tp_wma_handle wma_handle)
 	wma_update_target_ext_vht_cap(wma_handle, &tgt_cfg.vht_cap);
 
 	tgt_cfg.target_fw_version = wma_handle->target_fw_version;
+	tgt_cfg.target_fw_vers_ext = wma_handle->target_fw_vers_ext;
 #ifdef WLAN_FEATURE_LPSS
 	tgt_cfg.lpss_support = wma_handle->lpss_support;
 #endif /* WLAN_FEATURE_LPSS */
@@ -5359,7 +5360,7 @@ int wma_rx_service_ready_ext_event(void *handle, uint8_t *event,
 	wma_init_scan_fw_mode_config(wma_handle,
 				ev->default_conc_scan_config_bits,
 				ev->default_fw_config_bits);
-
+	wma_handle->target_fw_vers_ext = ev->fw_build_vers_ext;
 	return 0;
 }