qcacld-3.0: Covert fw_phy_id to policy_mgr mac_id

In HW mode transition event for mac_freq_mapping,
fw sends pdev id for identifying mac in following
format:
	WMI_PDEV_ID_1ST 1 /* first pdev  (pdev 0) */
	WMI_PDEV_ID_2ND 2 /* second pdev (pdev 1) */
	WMI_PDEV_ID_3RD 3 /* third pdev  (pdev 2) */
Covert these PDEV_ID to the ones used in policy manager
used for filling current mac frequencies

Change-Id: I745de0278b1ddf627062163364b684745df5e4e7
CRs-Fixed: 3083289

components/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c

@@ -71,8 +71,8 @@ void policy_mgr_hw_mode_transition_cb(uint32_t old_hw_mode_index,
 
 	if (mac_freq_range)
 		for (i = 0; i < num_mac_freq; i++)
-			policy_mgr_debug("pdev_id:%d start_freq:%d end_freq %d",
-					 mac_freq_range[i].pdev_id,
+			policy_mgr_debug("mac_id:%d start_freq:%d end_freq %d",
+					 mac_freq_range[i].mac_id,
 					 mac_freq_range[i].start_freq,
 					 mac_freq_range[i].end_freq);
 

components/cmn_services/policy_mgr/src/wlan_policy_mgr_core.c

@@ -879,24 +879,24 @@ policy_mgr_is_freq_range_2ghz(qdf_freq_t start_freq, qdf_freq_t end_freq)
 }
 
 static void
-policy_mgr_fill_curr_mac_2ghz_freq(uint32_t pdev_id,
+policy_mgr_fill_curr_mac_2ghz_freq(uint32_t mac_id,
 				   struct policy_mgr_pdev_mac_freq_map *freq,
 				   struct policy_mgr_psoc_priv_obj *pm_ctx)
 {
-	pm_ctx->hw_mode.cur_mac_freq_range[pdev_id].low_2ghz_freq =
+	pm_ctx->hw_mode.cur_mac_freq_range[mac_id].low_2ghz_freq =
 							freq->start_freq;
-	pm_ctx->hw_mode.cur_mac_freq_range[pdev_id].high_2ghz_freq =
+	pm_ctx->hw_mode.cur_mac_freq_range[mac_id].high_2ghz_freq =
 							freq->end_freq;
 }
 
 static void
-policy_mgr_fill_curr_mac_5ghz_freq(uint32_t pdev_id,
+policy_mgr_fill_curr_mac_5ghz_freq(uint32_t mac_id,
 				   struct policy_mgr_pdev_mac_freq_map *freq,
 				   struct policy_mgr_psoc_priv_obj *pm_ctx)
 {
-	pm_ctx->hw_mode.cur_mac_freq_range[pdev_id].low_5ghz_freq =
+	pm_ctx->hw_mode.cur_mac_freq_range[mac_id].low_5ghz_freq =
 							freq->start_freq;
-	pm_ctx->hw_mode.cur_mac_freq_range[pdev_id].high_5ghz_freq =
+	pm_ctx->hw_mode.cur_mac_freq_range[mac_id].high_5ghz_freq =
 							freq->end_freq;
 }
 
@@ -934,32 +934,31 @@ policy_mgr_fill_curr_freq_by_pdev_freq(int32_t num_mac_freq,
 				struct policy_mgr_psoc_priv_obj *pm_ctx,
 				struct policy_mgr_hw_mode_params hw_mode)
 {
-	uint32_t pdev_id, i;
+	uint32_t mac_id, i;
 
 	/* memzero before filling it */
 	qdf_mem_zero(pm_ctx->hw_mode.cur_mac_freq_range,
 		     sizeof(pm_ctx->hw_mode.cur_mac_freq_range));
 	for (i = 0; i < num_mac_freq; i++) {
-		pdev_id = freq[i].pdev_id;
+		mac_id = freq[i].mac_id;
 
-		if (pdev_id >= MAX_MAC) {
-			policy_mgr_debug("Invalid pdev id %d", pdev_id);
+		if (mac_id >= MAX_MAC) {
+			policy_mgr_debug("Invalid pdev id %d", mac_id);
 			return;
 		}
 
 		policy_mgr_debug("pdev_id %d start freq %d end_freq %d",
-				 pdev_id, freq[i].start_freq,
+				 mac_id, freq[i].start_freq,
 				 freq[i].end_freq);
 
 		if (policy_mgr_is_freq_range_2ghz(freq[i].start_freq,
 						  freq[i].end_freq))
-			policy_mgr_fill_curr_mac_2ghz_freq(pdev_id,
+			policy_mgr_fill_curr_mac_2ghz_freq(mac_id,
 							   &freq[i],
 							   pm_ctx);
 		else if (policy_mgr_is_freq_range_5_6ghz(freq[i].start_freq,
 							 freq[i].end_freq))
-			policy_mgr_fill_curr_mac_5ghz_freq(pdev_id,
-							   &freq[i],
+			policy_mgr_fill_curr_mac_5ghz_freq(mac_id, &freq[i],
 							   pm_ctx);
 		else
 			policy_mgr_fill_legacy_freq_range(pm_ctx, hw_mode);

components/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c

@@ -1096,7 +1096,8 @@ policy_mgr_dump_sbs_freq_range(struct policy_mgr_psoc_priv_obj *pm_ctx)
 	}
 }
 
-static bool polocy_mgr_sbs_range_present(struct policy_mgr_psoc_priv_obj *pm_ctx)
+static bool
+policy_mgr_sbs_range_present(struct policy_mgr_psoc_priv_obj *pm_ctx)
 {
 	if (policy_mgr_both_phy_range_updated(pm_ctx, MODE_SBS) ||
 	    (pm_ctx->hw_mode.sbs_lower_band_end_freq &&
@@ -1200,7 +1201,7 @@ QDF_STATUS policy_mgr_update_hw_mode_list(struct wlan_objmgr_psoc *psoc,
 			if (hw_config_type == WMI_HW_MODE_DBS ||
 			    hw_config_type == WMI_HW_MODE_DBS_OR_SBS)
 				dbs_mode = HW_MODE_DBS;
-			if (polocy_mgr_sbs_range_present(pm_ctx) &&
+			if (policy_mgr_sbs_range_present(pm_ctx) &&
 			    ((hw_config_type == WMI_HW_MODE_SBS_PASSIVE) ||
 			    (hw_config_type == WMI_HW_MODE_SBS) ||
 			    (hw_config_type == WMI_HW_MODE_DBS_OR_SBS)))

components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_public_struct.h

@@ -2323,12 +2323,12 @@ struct policy_mgr_vdev_mac_map {
 
 /**
  * struct policy_mgr_pdev_mac_freq_map - vdev id-mac id map
- * @pdev_id: Pdev id, macros starting with WMI_PDEV_ID_
+ * @mac_id: mac_id mapped to pdev id (macros starting with WMI_PDEV_ID_)
  * @start_freq: Start Frequency in Mhz
  * @end_freq: End Frequency in Mhz
  */
 struct policy_mgr_pdev_mac_freq_map {
-	uint32_t pdev_id;
+	uint32_t mac_id;
 	qdf_freq_t start_freq;
 	qdf_freq_t end_freq;
 };

core/mac/src/pe/lim/lim_process_message_queue.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2011-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -497,8 +498,8 @@ static void lim_process_hw_mode_trans_ind(struct mac_context *mac, void *body)
 
 	param->num_freq_map = ind->num_freq_map;
 	for (i = 0; i < param->num_freq_map; i++) {
-		param->mac_freq_map[i].pdev_id =
-			ind->mac_freq_map[i].pdev_id;
+		param->mac_freq_map[i].mac_id =
+			ind->mac_freq_map[i].mac_id;
 		param->mac_freq_map[i].start_freq =
 			ind->mac_freq_map[i].start_freq;
 		param->mac_freq_map[i].end_freq =

core/wma/src/wma_main.c

@@ -3881,8 +3881,8 @@ wma_process_mac_freq_mapping(struct cm_hw_mode_trans_ind *hw_mode_trans_ind,
 
 	hw_mode_trans_ind->num_freq_map = num_mac_freq;
 	for (i = 0; i < num_mac_freq; i++) {
-		hw_mode_trans_ind->mac_freq_map[i].pdev_id =
-							mac_freq[i].pdev_id;
+		hw_mode_trans_ind->mac_freq_map[i].mac_id =
+				WMA_PDEV_TO_MAC_MAP(mac_freq[i].pdev_id);
 		hw_mode_trans_ind->mac_freq_map[i].start_freq =
 							mac_freq[i].start_freq;
 		hw_mode_trans_ind->mac_freq_map[i].end_freq =