qcacld-3.0: Update country code from beacon when do rrm scan

The RRM request may have different country code with DUT internal
regdb configure, use country code from beacon IE if it is present,
otherwise use internal country code to verify op class of neighbor
report channel list.

CRs-Fixed: 2997474
Change-Id: I35a62d9791f08d26dd8a892739612eb422805523

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

@@ -315,6 +315,28 @@ struct rso_config *wlan_cm_get_rso_config_fl(struct wlan_objmgr_vdev *vdev,
 void wlan_cm_set_disable_hi_rssi(struct wlan_objmgr_pdev *pdev,
 				 uint8_t vdev_id, bool value);
 
+/**
+ * wlan_cm_set_country_code - set country code to vdev rso config
+ * @pdev: pdev pointer
+ * @vdev_id: vdev id
+ * @cc: country code
+ *
+ * Return: void
+ */
+void wlan_cm_set_country_code(struct wlan_objmgr_pdev *pdev,
+			      uint8_t vdev_id, uint8_t  *cc);
+
+/**
+ * wlan_cm_get_country_code - get country code from vdev rso config
+ * @pdev: pdev pointer
+ * @vdev_id: vdev id
+ * @cc: country code
+ *
+ * Return: qdf status
+ */
+QDF_STATUS wlan_cm_get_country_code(struct wlan_objmgr_pdev *pdev,
+				    uint8_t vdev_id, uint8_t *cc);
+
 #ifdef FEATURE_WLAN_ESE
 /**
  * wlan_cm_set_ese_assoc  - set ese assoc

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

@@ -295,6 +295,7 @@ struct roam_synch_frame_ind {
  * @ctx: reassoc timer context
  * @cm_rso_lock: RSO lock
  * @rsn_cap: original rsn caps from the connect req from supplicant
+ * @country_code: country code from connected AP's beacon IE
  * @disable_hi_rssi: disable high rssi
  * @roam_control_enable: Flag used to cache the status of roam control
  *			 configuration. This will be set only if the
@@ -344,6 +345,7 @@ struct rso_config {
 #endif
 	qdf_mutex_t cm_rso_lock;
 	uint8_t rsn_cap;
+	uint8_t country_code[REG_ALPHA2_LEN + 1];
 	bool disable_hi_rssi;
 	bool roam_control_enable;
 	uint8_t rescan_rssi_delta;

components/umac/mlme/connection_mgr/dispatcher/src/wlan_cm_roam_api.c

@@ -783,6 +783,54 @@ void wlan_cm_set_disable_hi_rssi(struct wlan_objmgr_pdev *pdev,
 	wlan_objmgr_vdev_release_ref(vdev, WLAN_MLME_CM_ID);
 }
 
+void wlan_cm_set_country_code(struct wlan_objmgr_pdev *pdev,
+			      uint8_t vdev_id, uint8_t  *cc)
+{
+	static struct rso_config *rso_cfg;
+	struct wlan_objmgr_vdev *vdev;
+
+	vdev = wlan_objmgr_get_vdev_by_id_from_pdev(pdev, vdev_id,
+						    WLAN_MLME_CM_ID);
+	if (!vdev) {
+		mlme_err("vdev object is NULL");
+		return;
+	}
+	rso_cfg = wlan_cm_get_rso_config(vdev);
+	if (!rso_cfg || !cc)
+		goto release_vdev_ref;
+
+	qdf_mem_copy(rso_cfg->country_code, cc, REG_ALPHA2_LEN + 1);
+
+release_vdev_ref:
+	wlan_objmgr_vdev_release_ref(vdev, WLAN_MLME_CM_ID);
+}
+
+QDF_STATUS wlan_cm_get_country_code(struct wlan_objmgr_pdev *pdev,
+				    uint8_t vdev_id, uint8_t *cc)
+{
+	static struct rso_config *rso_cfg;
+	struct wlan_objmgr_vdev *vdev;
+	QDF_STATUS status = QDF_STATUS_SUCCESS;
+
+	vdev = wlan_objmgr_get_vdev_by_id_from_pdev(pdev, vdev_id,
+						    WLAN_MLME_CM_ID);
+	if (!vdev) {
+		mlme_err("vdev object is NULL");
+		return QDF_STATUS_E_INVAL;
+	}
+	rso_cfg = wlan_cm_get_rso_config(vdev);
+	if (!rso_cfg || !cc) {
+		status = QDF_STATUS_E_INVAL;
+		goto release_vdev_ref;
+	}
+
+	qdf_mem_copy(cc, rso_cfg->country_code, REG_ALPHA2_LEN + 1);
+
+release_vdev_ref:
+	wlan_objmgr_vdev_release_ref(vdev, WLAN_MLME_CM_ID);
+	return status;
+}
+
 #ifdef FEATURE_WLAN_ESE
 void wlan_cm_set_ese_assoc(struct wlan_objmgr_pdev *pdev,
 			   uint8_t vdev_id, bool value)

core/mac/src/pe/include/rrm_api.h

@@ -90,6 +90,18 @@ QDF_STATUS
 rrm_process_beacon_report_xmit(struct mac_context *mac_ctx,
 			       tpSirBeaconReportXmitInd beacon_xmit_ind);
 
+/**
+ * rrm_get_country_code_from_connected_profile() - get country code
+ * from connected profile
+ * @mac: Mac context
+ * @vdev_id: vdev_id or csr session id
+ * @country_code: country code
+ *
+ * Return: None
+ */
+void rrm_get_country_code_from_connected_profile(struct mac_context *mac,
+						 uint8_t vdev_id,
+						 uint8_t *country_code);
 /**
  * rrm_reject_req - Reject rrm request
  * @radiomes_report: radio measurement report

core/mac/src/pe/rrm/rrm_api.c

@@ -517,35 +517,19 @@ rrm_process_neighbor_report_req(struct mac_context *mac,
 	return status;
 }
 
-/**
- * rrm_get_country_code_from_connected_profile() - Get country code
- * from connected profile
- * @mac: Mac context
- * @pe_session: pe session
- * @country_code: country code
- *
- * Return: void
- */
-static inline void
-rrm_get_country_code_from_connected_profile(
-				struct mac_context *mac,
-				struct pe_session *pe_session,
-				uint8_t country_code[WNI_CFG_COUNTRY_CODE_LEN])
+void rrm_get_country_code_from_connected_profile(struct mac_context *mac,
+						 uint8_t vdev_id,
+						 uint8_t *country_code)
 {
-	uint8_t id;
+	QDF_STATUS status;
 
-	qdf_mem_zero(country_code, sizeof(country_code[0]) *
-					WNI_CFG_COUNTRY_CODE_LEN);
-	if (!pe_session) {
-		pe_err("pe_session is NULL");
-		return;
-	}
-	id = pe_session->smeSessionId;
-	if (!CSR_IS_SESSION_VALID(mac, id)) {
-		pe_err("smeSessionId %d is invalid", id);
-		return;
-	}
-	wlan_reg_read_current_country(mac->psoc, country_code);
+	status = wlan_cm_get_country_code(mac->pdev, vdev_id, country_code);
+
+	if (QDF_IS_STATUS_ERROR(status))
+		qdf_mem_zero(country_code, REG_ALPHA2_LEN + 1);
+
+	if (!country_code[0])
+		wlan_reg_read_current_country(mac->psoc, country_code);
 	if (!country_code[0])
 		country_code[2] = OP_CLASS_GLOBAL;
 }
@@ -722,7 +706,7 @@ rrm_process_beacon_report_req(struct mac_context *mac,
 		return eRRM_FAILURE;
 	}
 
-	rrm_get_country_code_from_connected_profile(mac, pe_session,
+	rrm_get_country_code_from_connected_profile(mac, pe_session->vdev_id,
 						    country);
 	psbrr->channel_info.chan_num =
 		pBeaconReq->measurement_request.Beacon.channel;

core/sme/src/csr/csr_api_roam.c

@@ -6228,6 +6228,7 @@ static void csr_fill_connected_profile(struct mac_context *mac_ctx,
 	sme_QosAssocInfo assoc_info;
 	struct cm_roam_values_copy src_cfg;
 	bool is_ese = false;
+	uint8_t country_code[REG_ALPHA2_LEN + 1];
 
 	session->modifyProfileFields.uapsd_mask = rsp->uapsd_mask;
 	filter = qdf_mem_malloc(sizeof(*filter));
@@ -6301,6 +6302,13 @@ static void csr_fill_connected_profile(struct mac_context *mac_ctx,
 		csr_qos_send_assoc_ind(mac_ctx, vdev_id, &assoc_info);
 	}
 
+	if (bcn_ies->Country.present)
+		qdf_mem_copy(country_code, bcn_ies->Country.country,
+			     REG_ALPHA2_LEN + 1);
+	else
+		qdf_mem_zero(country_code, REG_ALPHA2_LEN + 1);
+	wlan_cm_set_country_code(mac_ctx->pdev, vdev_id, country_code);
+
 	qdf_mem_free(bcn_ies);
 
 purge_list:

core/sme/src/rrm/sme_rrm.c

@@ -39,6 +39,7 @@
 #include <wlan_reg_services_api.h>
 #include <wlan_utility.h>
 #include <../../core/src/wlan_cm_vdev_api.h>
+#include "rrm_api.h"
 
 /* Roam score for a neighbor AP will be calculated based on the below
  * definitions. The calculated roam score will be used to select the
@@ -1102,10 +1103,7 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(struct mac_context *mac,
 		goto cleanup;
 	}
 
-	qdf_mem_zero(country, WNI_CFG_COUNTRY_CODE_LEN);
-	wlan_reg_read_current_country(mac->psoc, country);
-	if (!country[0])
-		country[2] = OP_CLASS_GLOBAL;
+	rrm_get_country_code_from_connected_profile(mac, session_id, country);
 
 	if (wlan_reg_is_6ghz_op_class(mac->pdev,
 				      beacon_req->channel_info.reg_class))