From 8f57245a44f628a26a376aeffaefda6e92f862b7 Mon Sep 17 00:00:00 2001 From: Edayilliam Jayadev Date: Thu, 17 Dec 2020 08:55:58 +0530 Subject: [PATCH] qcacmn: Add Spectral feature capabilities Add the following Spectral scan capabilities at the pdev level. a) Normal Spectral scan capability b) Agile Spectral scan capability for 20/40/80 MHz c) Agile Spectral scan capability for 160 MHz d) Agile Spectral scan capability for 80+80 MHz Also change the definition of existing Spectral scan capability at psoc level. CRs-Fixed: 2840144 Change-Id: I18be48ec4095fa29b62800a9df58b72295747547 --- spectral/core/spectral_common.c | 3 ++- spectral/dispatcher/src/wlan_spectral_utils_api.c | 2 +- umac/cmn_services/obj_mgr/inc/wlan_objmgr_pdev_obj.h | 8 ++++++++ umac/cmn_services/obj_mgr/inc/wlan_objmgr_psoc_obj.h | 4 ++-- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/spectral/core/spectral_common.c b/spectral/core/spectral_common.c index bcef82f85f..de30217aac 100644 --- a/spectral/core/spectral_common.c +++ b/spectral/core/spectral_common.c @@ -503,7 +503,8 @@ wlan_spectral_psoc_obj_create_handler(struct wlan_objmgr_psoc *psoc, void *arg) } if (cfg_get(psoc, CFG_SPECTRAL_DISABLE)) { - wlan_psoc_nif_feat_cap_set(psoc, WLAN_SOC_F_SPECTRAL_DISABLE); + wlan_psoc_nif_feat_cap_set(psoc, + WLAN_SOC_F_SPECTRAL_INI_DISABLE); spectral_info("Spectral is disabled"); return QDF_STATUS_COMP_DISABLED; } diff --git a/spectral/dispatcher/src/wlan_spectral_utils_api.c b/spectral/dispatcher/src/wlan_spectral_utils_api.c index 837cfce566..fd9a5c1fe9 100644 --- a/spectral/dispatcher/src/wlan_spectral_utils_api.c +++ b/spectral/dispatcher/src/wlan_spectral_utils_api.c @@ -30,7 +30,7 @@ bool wlan_spectral_is_feature_disabled(struct wlan_objmgr_psoc *psoc) return true; } - if (wlan_psoc_nif_feat_cap_get(psoc, WLAN_SOC_F_SPECTRAL_DISABLE)) + if (wlan_psoc_nif_feat_cap_get(psoc, WLAN_SOC_F_SPECTRAL_INI_DISABLE)) return true; return false; diff --git a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_pdev_obj.h b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_pdev_obj.h index b03783e0a8..caf778ba93 100644 --- a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_pdev_obj.h +++ b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_pdev_obj.h @@ -101,6 +101,14 @@ #define WLAN_PDEV_FEXT_SCAN_RADIO 0x00000004 /* DFS disable, valid only for scan radio supported pdevs */ #define WLAN_PDEV_FEXT_SCAN_RADIO_DFS_DIS 0x00000008 +/* normal Spectral scan support disable */ +#define WLAN_PDEV_FEXT_NORMAL_SPECTRAL_SCAN_DIS 0x00000010 +/* agile Spectral scan support disable for 20/40/80 MHz */ +#define WLAN_PDEV_FEXT_AGILE_SPECTRAL_SCAN_DIS 0x00000020 +/* agile Spectral scan support disable for 160 MHz */ +#define WLAN_PDEV_FEXT_AGILE_SPECTRAL_SCAN_160_DIS 0x00000040 +/* agile Spectral scan support disable for 80+80 MHz */ +#define WLAN_PDEV_FEXT_AGILE_SPECTRAL_SCAN_80P80_DIS 0x00000080 /* PDEV op flags */ /* Enable htrate for wep and tkip */ diff --git a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_psoc_obj.h b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_psoc_obj.h index ace94f484f..375f77e57e 100644 --- a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_psoc_obj.h +++ b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_psoc_obj.h @@ -198,8 +198,8 @@ #define WLAN_SOC_F_BTCOEX_SUPPORT 0x00200000 /* HOST 80211 enable*/ #define WLAN_SOC_F_HOST_80211_ENABLE 0x00400000 - /* Spectral disable */ -#define WLAN_SOC_F_SPECTRAL_DISABLE 0x00800000 + /* Spectral disable from INI */ +#define WLAN_SOC_F_SPECTRAL_INI_DISABLE 0x00800000 /* FTM testmode enable */ #define WLAN_SOC_F_TESTMODE_ENABLE 0x01000000 /* Dynamic HW mode swithch enable */