qcacmn: Add support for SET KEY convergence

Make changes to the cmn driver to support SET KEY
convergence feature

Change-Id: I17b5f368a1f735eb394ea70f9b61cc033c3eb20a
CRs-Fixed: 2358796

wmi/src/wmi_unified_api.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2019 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
@@ -19,6 +19,7 @@
 #include "wmi_unified_priv.h"
 #include "wmi_unified_param.h"
 #include "qdf_module.h"
+#include "cdp_txrx_cmn_struct.h"
 
 static const wmi_host_channel_width mode_to_width[WMI_HOST_MODE_MAX] = {
 	[WMI_HOST_MODE_11A]           = WMI_HOST_CHAN_WIDTH_20,
@@ -4466,6 +4467,63 @@ wmi_unified_send_roam_scan_stats_cmd(void *wmi_hdl,
 	return QDF_STATUS_E_FAILURE;
 }
 
+#ifdef CRYPTO_SET_KEY_CONVERGED
+uint8_t wlan_crypto_cipher_to_wmi_cipher(
+		enum wlan_crypto_cipher_type crypto_cipher)
+{
+	switch (crypto_cipher) {
+	case WLAN_CRYPTO_CIPHER_NONE:
+		return WMI_CIPHER_NONE;
+	case WLAN_CRYPTO_CIPHER_WEP:
+		return WMI_CIPHER_WEP;
+	case WLAN_CRYPTO_CIPHER_TKIP:
+		return WMI_CIPHER_TKIP;
+	case WLAN_CRYPTO_CIPHER_WAPI_SMS4:
+	case WLAN_CRYPTO_CIPHER_WAPI_GCM4:
+		return WMI_CIPHER_WAPI;
+	case WLAN_CRYPTO_CIPHER_AES_CCM:
+	case WLAN_CRYPTO_CIPHER_AES_CCM_256:
+		return WMI_CIPHER_AES_CCM;
+	case WLAN_CRYPTO_CIPHER_AES_CMAC:
+		return WMI_CIPHER_AES_CMAC;
+	case WLAN_CRYPTO_CIPHER_AES_GMAC:
+	case WLAN_CRYPTO_CIPHER_AES_GMAC_256:
+		return WMI_CIPHER_AES_GMAC;
+	case WLAN_CRYPTO_CIPHER_AES_GCM:
+	case WLAN_CRYPTO_CIPHER_AES_GCM_256:
+		return WMI_CIPHER_AES_GCM;
+	default:
+		return 0;
+	}
+}
+
+enum cdp_sec_type wlan_crypto_cipher_to_cdp_sec_type(
+		enum wlan_crypto_cipher_type crypto_cipher)
+{
+	switch (crypto_cipher) {
+	case WLAN_CRYPTO_CIPHER_NONE:
+		return cdp_sec_type_none;
+	case WLAN_CRYPTO_CIPHER_WEP:
+		return cdp_sec_type_wep104;
+	case WLAN_CRYPTO_CIPHER_TKIP:
+		return cdp_sec_type_tkip;
+	case WLAN_CRYPTO_CIPHER_WAPI_SMS4:
+	case WLAN_CRYPTO_CIPHER_WAPI_GCM4:
+		return cdp_sec_type_wapi;
+	case WLAN_CRYPTO_CIPHER_AES_CCM:
+		return cdp_sec_type_aes_ccmp;
+	case WLAN_CRYPTO_CIPHER_AES_CCM_256:
+		return cdp_sec_type_aes_ccmp_256;
+	case WLAN_CRYPTO_CIPHER_AES_GCM:
+		return cdp_sec_type_aes_gcmp;
+	case WLAN_CRYPTO_CIPHER_AES_GCM_256:
+		return cdp_sec_type_aes_gcmp_256;
+	default:
+		return cdp_sec_type_none;
+	}
+}
+#endif /* CRYPTO_SET_KEY_CONVERGED */
+
 QDF_STATUS
 wmi_extract_roam_scan_stats_res_evt(wmi_unified_t wmi, void *evt_buf,
 				    uint32_t *vdev_id,

wmi/src/wmi_unified_tlv.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2019 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
@@ -3996,9 +3996,8 @@ static QDF_STATUS send_setup_install_key_cmd_tlv(wmi_unified_t wmi_handle,
 	key_data = (uint8_t *) (buf_ptr + WMI_TLV_HDR_SIZE);
 	qdf_mem_copy((void *)key_data,
 		     (const void *)key_params->key_data, key_params->key_len);
-	if (key_params->key_rsc_counter)
-	    qdf_mem_copy(&cmd->key_rsc_counter, key_params->key_rsc_counter,
-			 sizeof(wmi_key_seq_counter));
+	qdf_mem_copy(&cmd->key_rsc_counter, &key_params->key_rsc_ctr,
+		     sizeof(wmi_key_seq_counter));
 	cmd->key_len = key_params->key_len;
 
 	wmi_mtrace(WMI_VDEV_INSTALL_KEY_CMDID, cmd->vdev_id, 0);
@@ -4646,7 +4645,6 @@ static QDF_STATUS send_process_ll_stats_clear_cmd_tlv(wmi_unified_t wmi_handle,
 	WMI_LOGD("Clear Stat Mask : %d", cmd->stats_clear_req_mask);
 	/* WMI_LOGD("Peer MAC Addr   : %pM",
 		 cmd->peer_macaddr); */
-
 	wmi_mtrace(WMI_CLEAR_LINK_STATS_CMDID, cmd->vdev_id, 0);
 	ret = wmi_unified_cmd_send(wmi_handle, buf, len,
 				   WMI_CLEAR_LINK_STATS_CMDID);