qcacld-3.0: Update ciphers in RSO command from crypto component

Currently driver fills unicast, multicast & auth mode values from
csr session which is not updated after roaming to AP with different
security profile. This causes incorrect values in AP profile command.
Send correct authmode/unicast and multicast ciphers in AP profile
command to firmware.

Also modify the below 2 ini default values as:
candidate_min_rssi_for_beacon_miss=-75
candidate_min_rssi_for_disconnect=-75

Change-Id: I33cc9f516447071e977768f01738eea7a2ecd99c
CRs-Fixed: 2879943

components/mlme/dispatcher/inc/cfg_mlme_roam_scoring.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2021, The Linux Foundation. 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 above
@@ -177,7 +177,7 @@
  * idle roam trigger(in dBm).
  * @Min: -120
  * @Max: 0
- * @Default: -70
+ * @Default: -75
  *
  * Minimum RSSI value of the candidate AP to consider it as candidate for
  * roaming when roam trigger is Deauthentication/Disconnection from current
@@ -196,7 +196,7 @@
 		"candidate_min_rssi_for_disconnect", \
 		-120, \
 		0, \
-		-70, \
+		-75, \
 		CFG_VALUE_OR_DEFAULT, \
 		"Minimum RSSI of candidate AP for Disconnect roam trigger")
 
@@ -206,7 +206,7 @@
  * miss roam trigger (in dBm)
  * @Min: -120
  * @Max: 0
- * @Default: -70
+ * @Default: -75
  *
  * Minimum RSSI value of the candidate AP to consider it as candidate for
  * roaming when roam trigger is disconnection from current AP due to beacon
@@ -225,7 +225,7 @@
 	"candidate_min_rssi_for_beacon_miss", \
 	-120, \
 	0, \
-	-70, \
+	-75, \
 	CFG_VALUE_OR_DEFAULT, \
 	"Minimum RSSI of candidate AP for Bmiss roam trigger")
 

components/umac/mlme/connection_mgr/core/src/wlan_cm_roam_offload.c

@@ -483,7 +483,7 @@ cm_roam_scan_offload_fill_lfr3_config(struct wlan_objmgr_vdev *vdev,
 	akm = wlan_crypto_get_param(vdev, WLAN_CRYPTO_PARAM_KEY_MGMT);
 
 	rso_config->akm =
-		cm_crpto_authmode_to_wmi_authmode(authmode, akm, uccipher);
+		cm_crypto_authmode_to_wmi_authmode(authmode, akm, uccipher);
 
 	return QDF_STATUS_SUCCESS;
 }
@@ -1066,8 +1066,8 @@ static uint32_t cm_get_wapi_wmi_auth_type(int32_t akm)
 		return WMI_AUTH_NONE;
 }
 
-uint32_t cm_crpto_authmode_to_wmi_authmode(int32_t authmodeset,
-					   int32_t akm, int32_t ucastcipherset)
+uint32_t cm_crypto_authmode_to_wmi_authmode(int32_t authmodeset,
+					    int32_t akm, int32_t ucastcipherset)
 {
 	if (!authmodeset || authmodeset < 0)
 		return WMI_AUTH_OPEN;
@@ -1157,7 +1157,7 @@ cm_roam_scan_offload_ap_profile(struct wlan_objmgr_psoc *psoc,
 	authmode = wlan_crypto_get_param(vdev, WLAN_CRYPTO_PARAM_AUTH_MODE);
 	akm = wlan_crypto_get_param(vdev, WLAN_CRYPTO_PARAM_KEY_MGMT);
 	profile->rsn_authmode =
-		cm_crpto_authmode_to_wmi_authmode(authmode, akm, uccipher);
+		cm_crypto_authmode_to_wmi_authmode(authmode, akm, uccipher);
 
 	profile->rssi_threshold = rso_cfg->cfg_param.roam_rssi_diff;
 	profile->bg_rssi_threshold = rso_cfg->cfg_param.bg_rssi_threshold;

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

@@ -443,8 +443,9 @@ void wlan_cm_init_occupied_ch_freq_list(struct wlan_objmgr_pdev *pdev,
 					struct wlan_objmgr_psoc *psoc,
 					uint8_t vdev_id);
 
-uint32_t cm_crpto_authmode_to_wmi_authmode(int32_t authmodeset,
-					   int32_t akm, int32_t ucastcipherset);
+uint32_t cm_crypto_authmode_to_wmi_authmode(int32_t authmodeset,
+					    int32_t akm,
+					    int32_t ucastcipherset);
 uint8_t *wlan_cm_get_rrm_cap_ie_data(void);
 
 /**

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

@@ -51,6 +51,7 @@
 #include "lim_session.h"
 #include "wma_types.h"
 #include "wlan_crypto_global_api.h"
+#include "wlan_crypto_def_i.h"
 
 #include "rrm_api.h"
 
@@ -1746,6 +1747,7 @@ static void pe_set_rmf_caps(struct mac_context *mac_ctx,
 	tDot11fReAssocRequest *assoc_req;
 	uint32_t status;
 	tSirMacRsnInfo rsn_ie;
+	uint32_t value = WPA_TYPE_OUI;
 
 	assoc_body = (uint8_t *)roam_synch + roam_synch->reassoc_req_offset +
 			sizeof(tSirMacMgmtHdr);
@@ -1770,16 +1772,31 @@ static void pe_set_rmf_caps(struct mac_context *mac_ctx,
 			 status, len);
 	}
 	ft_session->limRmfEnabled = false;
-	if (!assoc_req->RSNOpaque.present) {
+	if (!assoc_req->RSNOpaque.present && !assoc_req->WPAOpaque.present) {
 		qdf_mem_free(assoc_req);
 		return;
 	}
-	rsn_ie.info[0] = WLAN_ELEMID_RSN;
-	rsn_ie.info[1] = assoc_req->RSNOpaque.num_data;
 
-	rsn_ie.length = assoc_req->RSNOpaque.num_data + 2;
-	qdf_mem_copy(&rsn_ie.info[2], assoc_req->RSNOpaque.data,
-		     assoc_req->RSNOpaque.num_data);
+	if (assoc_req->RSNOpaque.present) {
+		rsn_ie.info[0] = WLAN_ELEMID_RSN;
+		rsn_ie.info[1] = assoc_req->RSNOpaque.num_data;
+
+		rsn_ie.length = assoc_req->RSNOpaque.num_data + 2;
+		qdf_mem_copy(&rsn_ie.info[2], assoc_req->RSNOpaque.data,
+			     assoc_req->RSNOpaque.num_data);
+	} else if (assoc_req->WPAOpaque.present) {
+		rsn_ie.info[0] = WLAN_ELEMID_VENDOR;
+		rsn_ie.info[1] = WLAN_OUI_SIZE + assoc_req->WPAOpaque.num_data;
+
+		rsn_ie.length = WLAN_OUI_SIZE +
+				assoc_req->WPAOpaque.num_data + 2;
+
+		qdf_mem_copy(&rsn_ie.info[2], (uint8_t *)&value, WLAN_OUI_SIZE);
+		qdf_mem_copy(&rsn_ie.info[WLAN_OUI_SIZE + 2],
+			     assoc_req->WPAOpaque.data,
+			     assoc_req->WPAOpaque.num_data);
+	}
+
 	qdf_mem_free(assoc_req);
 	wlan_set_vdev_crypto_prarams_from_ie(ft_session->vdev, rsn_ie.info,
 					     rsn_ie.length);

core/wma/inc/wma_internal.h

@@ -779,8 +779,6 @@ int wma_vdev_install_key_complete_event_handler(void *handle,
 void wma_objmgr_set_peer_mlme_phymode(tp_wma_handle wma, uint8_t *mac_addr,
 				      enum wlan_phymode phymode);
 
-uint32_t wma_convert_crypto_akm_to_wmi_akm(uint32_t keymgmt);
-
 QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma,
 					   tSirNwType nw_type,
 					   tpAddStaParams params);

core/wma/src/wma_mgmt.c

@@ -1257,49 +1257,6 @@ static void wma_objmgr_set_peer_mlme_type(tp_wma_handle wma,
 	wlan_objmgr_peer_release_ref(peer, WLAN_LEGACY_WMA_ID);
 }
 
-uint32_t wma_convert_crypto_akm_to_wmi_akm(uint32_t keymgmt)
-{
-	if (keymgmt & (1 << WLAN_CRYPTO_KEY_MGMT_IEEE8021X))
-		return WMI_AUTH_RSNA;
-
-	if (keymgmt & (1 << WLAN_CRYPTO_KEY_MGMT_PSK))
-		return WMI_AUTH_RSNA_PSK;
-
-	if (keymgmt & (1 << WLAN_CRYPTO_KEY_MGMT_FT_IEEE8021X))
-		return WMI_AUTH_FT_RSNA;
-
-	if (keymgmt & (1 << WLAN_CRYPTO_KEY_MGMT_FT_PSK))
-		return WMI_AUTH_FT_RSNA_PSK;
-
-	if (keymgmt & (1 << WLAN_CRYPTO_KEY_MGMT_IEEE8021X_SHA256))
-		return WMI_AUTH_RSNA_8021X_SHA256;
-
-	if (keymgmt & (1 << WLAN_CRYPTO_KEY_MGMT_FT_IEEE8021X_SHA384))
-		return WMI_AUTH_FT_RSNA_SUITE_B_8021X_SHA384;
-
-	if (keymgmt & (1 << WLAN_CRYPTO_KEY_MGMT_FT_SAE))
-		return WMI_AUTH_FT_RSNA_SAE;
-
-	if (keymgmt & (1 << WLAN_CRYPTO_KEY_MGMT_IEEE8021X_SUITE_B))
-		return WMI_AUTH_RSNA_SUITE_B_8021X_SHA256;
-
-	if (keymgmt & (1 << WLAN_CRYPTO_KEY_MGMT_IEEE8021X_SUITE_B_192))
-		return WMI_AUTH_RSNA_SUITE_B_8021X_SHA384;
-
-	if (keymgmt & (1 << WLAN_CRYPTO_KEY_MGMT_FILS_SHA256))
-		return WMI_AUTH_RSNA_FILS_SHA256;
-
-	if (keymgmt & (1 << WLAN_CRYPTO_KEY_MGMT_FILS_SHA384))
-		return WMI_AUTH_RSNA_FILS_SHA384;
-
-	if (keymgmt & (1 << WLAN_CRYPTO_KEY_MGMT_FT_FILS_SHA256))
-		return WMI_AUTH_FT_RSNA_FILS_SHA256;
-
-	if (keymgmt & (1 << WLAN_CRYPTO_KEY_MGMT_FT_FILS_SHA384))
-		return WMI_AUTH_FT_RSNA_FILS_SHA384;
-
-	return WMI_AUTH_NONE;
-}
 /**
  * wmi_unified_send_peer_assoc() - send peer assoc command to fw
  * @wma: wma handle
@@ -1328,7 +1285,7 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma,
 	QDF_STATUS status;
 	struct mac_context *mac = wma->mac_context;
 	struct wlan_channel *des_chan;
-	int32_t keymgmt;
+	int32_t keymgmt, uccipher, authmode;
 
 	cmd = qdf_mem_malloc(sizeof(struct peer_assoc_params));
 	if (!cmd) {
@@ -1656,10 +1613,14 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma,
 	cmd->peer_phymode = wma_host_to_fw_phymode(phymode);
 
 	keymgmt = wlan_crypto_get_param(intr->vdev, WLAN_CRYPTO_PARAM_KEY_MGMT);
-	if (keymgmt < 0)
-		cmd->akm = WMI_AUTH_NONE;
-	else
-		cmd->akm = wma_convert_crypto_akm_to_wmi_akm(keymgmt);
+	authmode = wlan_crypto_get_param(intr->vdev,
+					 WLAN_CRYPTO_PARAM_AUTH_MODE);
+	uccipher = wlan_crypto_get_param(intr->vdev,
+					 WLAN_CRYPTO_PARAM_UCAST_CIPHER);
+
+	cmd->akm = cm_crypto_authmode_to_wmi_authmode(authmode,
+						      keymgmt,
+						      uccipher);
 
 	status = wmi_unified_peer_assoc_send(wma->wmi_handle,
 					 cmd);