From 88ae85340c638ac5d152ccf6f4beacc4ee2d1796 Mon Sep 17 00:00:00 2001 From: Nachiket Kukade Date: Fri, 15 Dec 2017 12:36:58 +0530 Subject: [PATCH] qcacmn: Add Objmgr related definitions to support DISA component Add Objmgr ID and related definitions to support the newly defined DISA component in CLD. Change-Id: Ibbe5db39c01dae94cad5af5f4dccd2611c5b06d4 CRs-Fixed: 2159599 --- qdf/inc/qdf_types.h | 6 +++++- qdf/linux/src/qdf_trace.c | 3 ++- umac/cmn_services/inc/wlan_cmn.h | 2 ++ umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h | 10 +++++++--- wmi/inc/wmi_unified_api.h | 3 +++ wmi/inc/wmi_unified_priv.h | 2 ++ wmi/src/wmi_unified_api.c | 2 ++ wmi/src/wmi_unified_tlv.c | 3 ++- 8 files changed, 25 insertions(+), 6 deletions(-) diff --git a/qdf/inc/qdf_types.h b/qdf/inc/qdf_types.h index e479caf30abe..5df1568651cf 100644 --- a/qdf/inc/qdf_types.h +++ b/qdf/inc/qdf_types.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2018 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -321,6 +321,9 @@ typedef void (*qdf_timer_func_t)(void *); * @QDF_MODULE_ID_NAN: NAN module ID * @QDF_MODULE_ID_SPECTRAL: Spectral module ID * @QDF_MODULE_ID_ROAM_DEBUG: Roam Debug logging + * @QDF_MODULE_ID_CDP: Converged Data Path module ID + * @QDF_MODULE_ID_DIRECT_BUF_RX: Direct Buffer Receive module ID + * @QDF_MODULE_ID_DISA: DISA (encryption test) module ID * @QDF_MODULE_ID_ANY: anything * @QDF_MODULE_ID_MAX: Max place holder module ID */ @@ -416,6 +419,7 @@ typedef enum { QDF_MODULE_ID_ROAM_DEBUG, QDF_MODULE_ID_CDP, QDF_MODULE_ID_DIRECT_BUF_RX, + QDF_MODULE_ID_DISA, QDF_MODULE_ID_ANY, QDF_MODULE_ID_MAX, } QDF_MODULE_ID; diff --git a/qdf/linux/src/qdf_trace.c b/qdf/linux/src/qdf_trace.c index 05126018ae20..63acaeaec3a6 100644 --- a/qdf/linux/src/qdf_trace.c +++ b/qdf/linux/src/qdf_trace.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2018 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -2117,6 +2117,7 @@ struct category_name_info g_qdf_category_name[MAX_SUPPORTED_CATEGORY] = { [QDF_MODULE_ID_NSS] = {"NSS"}, [QDF_MODULE_ID_ROAM_DEBUG] = {"roam debug"}, [QDF_MODULE_ID_DIRECT_BUF_RX] = {"DIRECT_BUF_RX"}, + [QDF_MODULE_ID_DISA] = {"disa"}, [QDF_MODULE_ID_ANY] = {"ANY"}, }; EXPORT_SYMBOL(g_qdf_category_name); diff --git a/umac/cmn_services/inc/wlan_cmn.h b/umac/cmn_services/inc/wlan_cmn.h index 447108463cd2..99afb7cacfb6 100644 --- a/umac/cmn_services/inc/wlan_cmn.h +++ b/umac/cmn_services/inc/wlan_cmn.h @@ -121,6 +121,7 @@ * @WLAN_UMAC_COMP_ID_MAX: Maximum components in UMAC * @WLAN_UMAC_COMP_OFFCHAN_TXRX: Offchan TxRx * @WLAN_UMAC_COMP_SPLITMAC: SplitMAC + * @WLAN_UMAC_COMP_DISA: DISA encryption test * * This id is static. * On Adding new component, new id has to be assigned @@ -147,6 +148,7 @@ enum wlan_umac_comp_id { WLAN_UMAC_COMP_SON, WLAN_UMAC_COMP_SPECTRAL, WLAN_UMAC_COMP_SPLITMAC, + WLAN_UMAC_COMP_DISA, WLAN_UMAC_COMP_ID_MAX, }; diff --git a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h index 85b63ab444d5..1fb88b56a173 100644 --- a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h +++ b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2018 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 @@ -199,8 +199,10 @@ typedef void (*wlan_objmgr_peer_status_handler)( * @WLAN_REGULATORY_NB_ID: NB regulatory operations * @WLAN_POLICY_MGR_ID: Policy Manager operations * @WLAN_SPECTRAL_ID: Spectral operations - * @WLAN_SPLITMAC_ID SplitMac - * @WLAN_DEBUG_ID Debug operations + * @WLAN_SPLITMAC_ID: SplitMac + * @WLAN_DEBUG_ID: Debug operations + * @WLAN_DIRECT_BUF_RX_ID: Direct Buffer Receive operations + * @WLAN_DISA_ID: DISA (encryption test) operations * @WLAN_REF_ID_MAX: Max id used to generate ref count tracking array */ /* New value added to the enum must also be reflected in function @@ -238,6 +240,7 @@ typedef enum { WLAN_SPLITMAC_ID = 28, WLAN_DEBUG_ID = 29, WLAN_DIRECT_BUF_RX_ID = 30, + WLAN_DISA_ID = 31, WLAN_REF_ID_MAX, } wlan_objmgr_ref_dbgid; @@ -282,6 +285,7 @@ static inline char *string_from_dbgid(wlan_objmgr_ref_dbgid id) "WLAN_SPLITMAC_ID", "WLAN_DEBUG_ID", "WLAN_DIRECT_BUF_RX_ID", + "WLAN_DISA_ID", "WLAN_REF_ID_MAX" }; return (char *)strings[id]; diff --git a/wmi/inc/wmi_unified_api.h b/wmi/inc/wmi_unified_api.h index da3aace5ab90..e3711df57237 100644 --- a/wmi/inc/wmi_unified_api.h +++ b/wmi/inc/wmi_unified_api.h @@ -48,6 +48,9 @@ #include "wlan_p2p_public_struct.h" #endif #include "wlan_scan_public_structs.h" +#ifdef WLAN_FEATURE_DISA +#include "wlan_disa_public_struct.h" +#endif #ifdef WLAN_FEATURE_NAN_CONVERGENCE #include "nan_public_structs.h" diff --git a/wmi/inc/wmi_unified_priv.h b/wmi/inc/wmi_unified_priv.h index 012bbfa7357a..dea8f59dc43e 100644 --- a/wmi/inc/wmi_unified_priv.h +++ b/wmi/inc/wmi_unified_priv.h @@ -1331,8 +1331,10 @@ QDF_STATUS (*send_dbs_scan_sel_params_cmd)(wmi_unified_t wmi_handle, QDF_STATUS (*send_fw_test_cmd)(wmi_unified_t wmi_handle, struct set_fwtest_params *wmi_fwtest); +#ifdef WLAN_FEATURE_DISA QDF_STATUS (*send_encrypt_decrypt_send_cmd)(wmi_unified_t wmi_handle, struct encrypt_decrypt_req_params *params); +#endif QDF_STATUS (*send_sar_limit_cmd)(wmi_unified_t wmi_handle, struct sar_limit_cmd_params *params); diff --git a/wmi/src/wmi_unified_api.c b/wmi/src/wmi_unified_api.c index bf6e8a992110..5adb93f1bed4 100644 --- a/wmi/src/wmi_unified_api.c +++ b/wmi/src/wmi_unified_api.c @@ -6608,6 +6608,7 @@ QDF_STATUS wmi_unified_send_sar_limit_cmd(void *wmi_hdl, return QDF_STATUS_E_FAILURE; } +#ifdef WLAN_FEATURE_DISA /** * wmi_unified_encrypt_decrypt_send_cmd() - send encryptdecrypt cmd to fw * @wmi_hdl: wmi handle @@ -6626,6 +6627,7 @@ QDF_STATUS wmi_unified_encrypt_decrypt_send_cmd(void *wmi_hdl, params); return QDF_STATUS_E_FAILURE; } +#endif /* * wmi_unified_send_btcoex_wlan_priority_cmd() - send btcoex priority commands diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c index 3cfa4c31b247..c9eabde23586 100644 --- a/wmi/src/wmi_unified_tlv.c +++ b/wmi/src/wmi_unified_tlv.c @@ -5145,6 +5145,7 @@ end: return qdf_status; } +#ifdef WLAN_FEATURE_DISA /** * send_encrypt_decrypt_send_cmd() - send encrypt/decrypt cmd to fw * @wmi_handle: wmi handle @@ -5226,7 +5227,7 @@ QDF_STATUS send_encrypt_decrypt_send_cmd_tlv(wmi_unified_t wmi_handle, return ret; } - +#endif /**