From c76db37021338cbabaae8080474a529b3e7d0706 Mon Sep 17 00:00:00 2001 From: Abhishek Ambure Date: Tue, 6 Aug 2019 12:26:39 +0530 Subject: [PATCH] qcacmn: Clean up CMN_VDEV_MGR_TGT_IF_ENABLE WIN and MCL both uses common targer_if code for vdev manager. So legacy code and "CMN_VDEV_MGR_TGT_IF_ENABLE" macro is removed. Change-Id: I2984ae44f3a7cfa01b8f1455353d09deb4db5759 CRs-Fixed: 2503804 --- target_if/core/src/target_if_main.c | 11 - .../vdev_mgr/inc/target_if_vdev_mgr_tx_ops.h | 17 - .../obj_mgr/inc/wlan_objmgr_vdev_obj.h | 259 ------------ .../lmac_if/inc/wlan_lmac_if_def.h | 7 - .../lmac_if/src/wlan_lmac_if.c | 10 - umac/mlme/include/wlan_vdev_mlme.h | 2 - .../dispatcher/src/wlan_vdev_mlme_main.c | 8 +- umac/mlme/vdev_mgr/core/src/vdev_mgr_ops.h | 2 - .../inc/wlan_vdev_mgr_tgt_if_rx_api.h | 12 - .../inc/wlan_vdev_mgr_tgt_if_tx_api.h | 2 - .../inc/wlan_vdev_mgr_tgt_if_tx_defs.h | 2 - wmi/inc/wmi_unified_param.h | 382 ------------------ wmi/src/wmi_unified_tlv.c | 33 -- 13 files changed, 1 insertion(+), 746 deletions(-) diff --git a/target_if/core/src/target_if_main.c b/target_if/core/src/target_if_main.c index 64cda921e2ec..33bc190b7445 100644 --- a/target_if/core/src/target_if_main.c +++ b/target_if/core/src/target_if_main.c @@ -78,10 +78,7 @@ #ifdef CRYPTO_SET_KEY_CONVERGED #include #endif - -#ifdef CMN_VDEV_MGR_TGT_IF_ENABLE #include -#endif static struct target_if_ctx *g_target_if_ctx; @@ -381,19 +378,11 @@ target_if_cp_stats_tx_ops_register(struct wlan_lmac_if_tx_ops *tx_ops) return target_if_cp_stats_register_tx_ops(tx_ops); } -#ifdef CMN_VDEV_MGR_TGT_IF_ENABLE static QDF_STATUS target_if_vdev_mgr_tx_ops_register(struct wlan_lmac_if_tx_ops *tx_ops) { return target_if_vdev_mgr_register_tx_ops(tx_ops); } -#else -static QDF_STATUS -target_if_vdev_mgr_tx_ops_register(struct wlan_lmac_if_tx_ops *tx_ops) -{ - return QDF_STATUS_SUCCESS; -} -#endif #ifdef QCA_WIFI_FTM static diff --git a/target_if/mlme/vdev_mgr/inc/target_if_vdev_mgr_tx_ops.h b/target_if/mlme/vdev_mgr/inc/target_if_vdev_mgr_tx_ops.h index 0707c9632b2c..618c5bcdc7cd 100644 --- a/target_if/mlme/vdev_mgr/inc/target_if_vdev_mgr_tx_ops.h +++ b/target_if/mlme/vdev_mgr/inc/target_if_vdev_mgr_tx_ops.h @@ -25,7 +25,6 @@ #ifndef __TARGET_IF_VDEV_MGR_TX_OPS_H__ #define __TARGET_IF_VDEV_MGR_TX_OPS_H__ -#ifdef CMN_VDEV_MGR_TGT_IF_ENABLE #include #include #include @@ -100,20 +99,4 @@ QDF_STATUS target_if_vdev_mgr_rsp_timer_stop( struct wlan_objmgr_vdev *vdev, struct vdev_response_timer *vdev_rsp, uint8_t clear_bit); -#else -static inline QDF_STATUS -target_if_vdev_mgr_register_tx_ops(struct wlan_lmac_if_tx_ops *tx_ops) -{ - return QDF_STATUS_SUCCESS; -} - -static inline -QDF_STATUS target_if_vdev_mgr_rsp_timer_stop( - struct wlan_objmgr_vdev *vdev, - struct vdev_response_timer *vdev_rsp, - uint8_t clear_bit) -{ - return QDF_STATUS_SUCCESS; -} -#endif /* CMN_VDEV_MGR_TGT_IF_ENABLE */ #endif /* __TARGET_IF_VDEV_MGR_TX_OPS_H__ */ diff --git a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h index 3f398e3d6655..38b34650c989 100644 --- a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h +++ b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h @@ -32,11 +32,9 @@ #include "wlan_objmgr_pdev_obj.h" #include "wlan_objmgr_psoc_obj.h" #include "wlan_vdev_mlme_main.h" -#ifdef CMN_VDEV_MGR_TGT_IF_ENABLE #include "include/wlan_vdev_mlme.h" #include "wlan_vdev_mlme_api.h" #include "wlan_mlme_dbg.h" -#endif /* CONF: privacy enabled */ #define WLAN_VDEV_F_PRIVACY 0x00000001 @@ -315,17 +313,6 @@ struct wlan_objmgr_vdev_mlme { uint32_t vdev_op_flags; uint8_t mataddr[QDF_MAC_ADDR_SIZE]; uint8_t macaddr[QDF_MAC_ADDR_SIZE]; -#ifndef CMN_VDEV_MGR_TGT_IF_ENABLE - char ssid[WLAN_SSID_MAX_LEN + 1]; - uint8_t ssid_len; - uint8_t nss; - uint8_t tx_chainmask; - uint8_t rx_chainmask; - uint8_t tx_power; - uint32_t max_rate; - uint32_t tx_mgmt_rate; - uint32_t per_band_mgmt_rate[WLAN_BAND_NUM_MAX]; -#endif }; /** @@ -924,252 +911,6 @@ static inline struct wlan_channel *wlan_vdev_mlme_get_des_chan( return vdev->vdev_mlme.des_chan; } -#ifndef CMN_VDEV_MGR_TGT_IF_ENABLE - -/** - * wlan_vdev_mlme_set_ssid() - set ssid - * @vdev: VDEV object - * @ssid: SSID (input) - * @ssid_len: Length of SSID - * - * API to set the SSID of VDEV - * - * Caller need to acquire lock with wlan_vdev_obj_lock() - * - * Return: SUCCESS, if update is done - * FAILURE, if ssid length is > max ssid len - */ -static inline QDF_STATUS wlan_vdev_mlme_set_ssid( - struct wlan_objmgr_vdev *vdev, - const uint8_t *ssid, uint8_t ssid_len) -{ - /* This API is invoked with lock acquired, do not add log prints */ - if (ssid_len <= WLAN_SSID_MAX_LEN) { - qdf_mem_copy(vdev->vdev_mlme.ssid, ssid, ssid_len); - vdev->vdev_mlme.ssid_len = ssid_len; - } else { - vdev->vdev_mlme.ssid_len = 0; - return QDF_STATUS_E_FAILURE; - } - return QDF_STATUS_SUCCESS; -} - -/** - * wlan_vdev_mlme_get_ssid() - get ssid - * @vdev: VDEV object - * @ssid: SSID - * @ssid_len: Length of SSID - * - * API to get the SSID of VDEV, it updates the SSID and its length - * in @ssid, @ssid_len respectively - * - * Caller need to acquire lock with wlan_vdev_obj_lock() - * - * Return: SUCCESS, if update is done - * FAILURE, if ssid length is > max ssid len - */ -static inline QDF_STATUS wlan_vdev_mlme_get_ssid( - struct wlan_objmgr_vdev *vdev, - uint8_t *ssid, uint8_t *ssid_len) -{ - /* This API is invoked with lock acquired, do not add log prints */ - if (vdev->vdev_mlme.ssid_len > 0) { - *ssid_len = vdev->vdev_mlme.ssid_len; - qdf_mem_copy(ssid, vdev->vdev_mlme.ssid, *ssid_len); - } else { - *ssid_len = 0; - return QDF_STATUS_E_FAILURE; - } - return QDF_STATUS_SUCCESS; -} - -/** - * wlan_vdev_mlme_set_nss() - set NSS - * @vdev: VDEV object - * @nss: nss configured by user - * - * API to set the Number of Spatial streams - * - * Return: void - */ -static inline void wlan_vdev_mlme_set_nss(struct wlan_objmgr_vdev *vdev, - uint8_t nss) -{ - vdev->vdev_mlme.nss = nss; -} - -/** - * wlan_vdev_mlme_get_nss() - get NSS - * @vdev: VDEV object - * - * API to get the Number of Spatial Streams - * - * Return: - * @nss: nss value - */ -static inline uint8_t wlan_vdev_mlme_get_nss( - struct wlan_objmgr_vdev *vdev) -{ - return vdev->vdev_mlme.nss; -} - -/** - * wlan_vdev_mlme_set_txchainmask() - set Tx chainmask - * @vdev: VDEV object - * @chainmask : chainmask either configured by user or max supported - * - * API to set the Tx chainmask - * - * Return: void - */ -static inline void wlan_vdev_mlme_set_txchainmask( - struct wlan_objmgr_vdev *vdev, - uint8_t chainmask) -{ - vdev->vdev_mlme.tx_chainmask = chainmask; -} - -/** - * wlan_vdev_mlme_get_txchainmask() - get Tx chainmask - * @vdev: VDEV object - * - * API to get the Tx chainmask - * - * Return: - * @chainmask : Tx chainmask either configured by user or max supported - */ -static inline uint8_t wlan_vdev_mlme_get_txchainmask( - struct wlan_objmgr_vdev *vdev) -{ - return vdev->vdev_mlme.tx_chainmask; -} - -/** - * wlan_vdev_mlme_set_rxchainmask() - set Rx chainmask - * @vdev: VDEV object - * @chainmask : Rx chainmask either configured by user or max supported - * - * API to set the Rx chainmask - * - * Return: void - */ -static inline void wlan_vdev_mlme_set_rxchainmask( - struct wlan_objmgr_vdev *vdev, - uint8_t chainmask) -{ - vdev->vdev_mlme.rx_chainmask = chainmask; -} - -/** - * wlan_vdev_mlme_get_rxchainmask() - get Rx chainmask - * @vdev: VDEV object - * - * API to get the Rx chainmask - * - * Return: - * @chainmask : Rx chainmask either configured by user or max supported - */ -static inline uint8_t wlan_vdev_mlme_get_rxchainmask( - struct wlan_objmgr_vdev *vdev) -{ - /* This API is invoked with lock acquired, do not add log prints */ - return vdev->vdev_mlme.rx_chainmask; -} - -/** - * wlan_vdev_mlme_set_txpower() - set tx power - * @vdev: VDEV object - * @txpow: tx power either configured by used or max allowed - * - * API to set the tx power - * - * Return: void - */ -static inline void wlan_vdev_mlme_set_txpower( - struct wlan_objmgr_vdev *vdev, - uint8_t txpow) -{ - vdev->vdev_mlme.tx_power = txpow; -} - -/** - * wlan_vdev_mlme_get_txpower() - get tx power - * @vdev: VDEV object - * - * API to get the tx power - * - * Return: - * @txpow: tx power either configured by used or max allowed - */ -static inline uint8_t wlan_vdev_mlme_get_txpower( - struct wlan_objmgr_vdev *vdev) -{ - return vdev->vdev_mlme.tx_power; -} - -/** - * wlan_vdev_mlme_set_maxrate() - set max rate - * @vdev: VDEV object - * @maxrate: configured by used or based on configured mode - * - * API to set the max rate the vdev supports - * - * Return: void - */ -static inline void wlan_vdev_mlme_set_maxrate( - struct wlan_objmgr_vdev *vdev, - uint32_t maxrate) -{ - vdev->vdev_mlme.max_rate = maxrate; -} - -/** - * wlan_vdev_mlme_get_maxrate() - get max rate - * @vdev: VDEV object - * - * API to get the max rate the vdev supports - * - * Return: - * @maxrate: configured by used or based on configured mode - */ -static inline uint32_t wlan_vdev_mlme_get_maxrate( - struct wlan_objmgr_vdev *vdev) -{ - return vdev->vdev_mlme.max_rate; -} - -/** - * wlan_vdev_mlme_set_txmgmtrate() - set txmgmtrate - * @vdev: VDEV object - * @txmgmtrate: Tx Mgmt rate - * - * API to set Mgmt Tx rate - * - * Return: void - */ -static inline void wlan_vdev_mlme_set_txmgmtrate( - struct wlan_objmgr_vdev *vdev, - uint32_t txmgmtrate) -{ - vdev->vdev_mlme.tx_mgmt_rate = txmgmtrate; -} - -/** - * wlan_vdev_mlme_get_txmgmtrate() - get txmgmtrate - * @vdev: VDEV object - * - * API to get Mgmt Tx rate - * - * Return: - * @txmgmtrate: Tx Mgmt rate - */ -static inline uint32_t wlan_vdev_mlme_get_txmgmtrate( - struct wlan_objmgr_vdev *vdev) -{ - return vdev->vdev_mlme.tx_mgmt_rate; -} -#endif - /** * wlan_vdev_mlme_feat_cap_set() - set feature caps * @vdev: VDEV object diff --git a/umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h b/umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h index 4d8a42dd7382..5ed14f5cf6fa 100644 --- a/umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h +++ b/umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h @@ -80,10 +80,8 @@ struct dbr_module_config; #include #endif /* QCA_SUPPORT_CP_STATS */ -#ifdef CMN_VDEV_MGR_TGT_IF_ENABLE #include #include -#endif /* CMN_VDEV_MGR_TGT_IF_ENABLE */ #ifdef QCA_SUPPORT_CP_STATS /** @@ -221,7 +219,6 @@ struct wlan_lmac_if_mlme_tx_ops { uint32_t (*get_wifi_iface_id) (struct wlan_objmgr_pdev *pdev); QDF_STATUS (*vdev_mlme_attach)(struct wlan_objmgr_psoc *psoc); QDF_STATUS (*vdev_mlme_detach)(struct wlan_objmgr_psoc *psoc); -#ifdef CMN_VDEV_MGR_TGT_IF_ENABLE QDF_STATUS (*vdev_mgr_rsp_timer_init)( struct wlan_objmgr_vdev *vdev, qdf_timer_t *rsp_timer); @@ -275,7 +272,6 @@ struct wlan_lmac_if_mlme_tx_ops { QDF_STATUS (*peer_delete_all_send)( struct wlan_objmgr_vdev *vdev, struct peer_delete_all_params *param); -#endif }; /** @@ -1485,8 +1481,6 @@ struct wlan_lmac_if_mlme_rx_ops { int (*wlan_mlme_get_acs_in_progress)(struct wlan_objmgr_pdev *pdev, uint8_t vdev_id); void (*wlan_mlme_end_scan)(struct wlan_objmgr_pdev *pdev); - -#ifdef CMN_VDEV_MGR_TGT_IF_ENABLE struct vdev_response_timer *(*vdev_mgr_get_response_timer_info)( struct wlan_objmgr_vdev *vdev); QDF_STATUS (*vdev_mgr_start_response)( @@ -1511,7 +1505,6 @@ struct wlan_lmac_if_mlme_rx_ops { struct vdev_mlme_wakelock *(*vdev_mgr_get_wakelock_info)( struct wlan_objmgr_vdev *vdev); #endif -#endif }; #ifdef WLAN_SUPPORT_GREEN_AP diff --git a/umac/global_umac_dispatcher/lmac_if/src/wlan_lmac_if.c b/umac/global_umac_dispatcher/lmac_if/src/wlan_lmac_if.c index f8a7d70dc274..02d9fa1697dc 100644 --- a/umac/global_umac_dispatcher/lmac_if/src/wlan_lmac_if.c +++ b/umac/global_umac_dispatcher/lmac_if/src/wlan_lmac_if.c @@ -64,10 +64,7 @@ #ifdef QCA_SUPPORT_CP_STATS #include #endif /* QCA_SUPPORT_CP_STATS */ - -#ifdef CMN_VDEV_MGR_TGT_IF_ENABLE #include -#endif #ifdef WLAN_CFR_ENABLE #include "wlan_cfr_tgt_api.h" @@ -84,18 +81,11 @@ QDF_STATUS (*wlan_lmac_if_umac_tx_ops_register) (struct wlan_lmac_if_tx_ops *tx_ops); qdf_export_symbol(wlan_lmac_if_umac_tx_ops_register); -#ifdef CMN_VDEV_MGR_TGT_IF_ENABLE static void tgt_vdev_mgr_rx_ops_register(struct wlan_lmac_if_rx_ops *rx_ops) { tgt_vdev_mgr_register_rx_ops(rx_ops); } -#else -static void -tgt_vdev_mgr_rx_ops_register(struct wlan_lmac_if_rx_ops *rx_ops) -{ -} -#endif #ifdef QCA_SUPPORT_CP_STATS /** diff --git a/umac/mlme/include/wlan_vdev_mlme.h b/umac/mlme/include/wlan_vdev_mlme.h index 041ee024e1a1..4a3b2562326b 100644 --- a/umac/mlme/include/wlan_vdev_mlme.h +++ b/umac/mlme/include/wlan_vdev_mlme.h @@ -1051,7 +1051,6 @@ static inline QDF_STATUS mlme_vdev_is_newchan_no_cac( return ret; } -#ifdef CMN_VDEV_MGR_TGT_IF_ENABLE /** * wlan_vdev_mlme_set_ssid() - set ssid * @vdev: VDEV object @@ -1380,5 +1379,4 @@ static inline uint32_t wlan_vdev_mlme_get_txmgmtrate( return vdev_mlme->mgmt.rate_info.tx_mgmt_rate; } -#endif /* CMN_VDEV_MGR_TGT_IF_ENABLE */ #endif diff --git a/umac/mlme/mlme_objmgr/dispatcher/src/wlan_vdev_mlme_main.c b/umac/mlme/mlme_objmgr/dispatcher/src/wlan_vdev_mlme_main.c index e55d83c43d8b..9b85389205e3 100644 --- a/umac/mlme/mlme_objmgr/dispatcher/src/wlan_vdev_mlme_main.c +++ b/umac/mlme/mlme_objmgr/dispatcher/src/wlan_vdev_mlme_main.c @@ -105,7 +105,6 @@ init_failed: return QDF_STATUS_E_FAILURE; } -#ifdef CMN_VDEV_MGR_TGT_IF_ENABLE static void mlme_vdev_obj_timer_deinit( struct vdev_mlme_obj *vdev_mlme) { @@ -114,12 +113,7 @@ static void mlme_vdev_obj_timer_deinit( vdev_rsp = &vdev_mlme->vdev_rt; qdf_timer_free(&vdev_rsp->rsp_timer); } -#else -static void mlme_vdev_obj_timer_deinit( - struct vdev_mlme_obj *vdev_mlme) -{ -} -#endif + static QDF_STATUS mlme_vdev_obj_destroy_handler(struct wlan_objmgr_vdev *vdev, void *arg) { diff --git a/umac/mlme/vdev_mgr/core/src/vdev_mgr_ops.h b/umac/mlme/vdev_mgr/core/src/vdev_mgr_ops.h index df683dc63f05..cb42ee145180 100644 --- a/umac/mlme/vdev_mgr/core/src/vdev_mgr_ops.h +++ b/umac/mlme/vdev_mgr/core/src/vdev_mgr_ops.h @@ -26,7 +26,6 @@ #ifndef __VDEV_MGR_OPS_H__ #define __VDEV_MGR_OPS_H__ -#ifdef CMN_VDEV_MGR_TGT_IF_ENABLE #include #include #include @@ -237,5 +236,4 @@ QDF_STATUS vdev_mgr_multiple_restart_send(struct wlan_objmgr_pdev *pdev, */ QDF_STATUS vdev_mgr_peer_delete_all_send(struct vdev_mlme_obj *mlme_obj); -#endif /* CMN_VDEV_MGR_TGT_IF_ENABLE */ #endif /* __VDEV_MGR_OPS_H__ */ diff --git a/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mgr_tgt_if_rx_api.h b/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mgr_tgt_if_rx_api.h index 92669e53efcf..e11a2a8a35de 100644 --- a/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mgr_tgt_if_rx_api.h +++ b/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mgr_tgt_if_rx_api.h @@ -25,7 +25,6 @@ #ifndef __WLAN_VDEV_MGR_RX_OPS_H__ #define __WLAN_VDEV_MGR_RX_OPS_H__ -#ifdef CMN_VDEV_MGR_TGT_IF_ENABLE #include #include @@ -48,15 +47,4 @@ void tgt_vdev_mgr_register_rx_ops(struct wlan_lmac_if_rx_ops *rx_ops); QDF_STATUS tgt_vdev_mgr_ext_tbttoffset_update_handle(uint32_t num_vdevs, bool is_ext); -#else -/** - * tgt_vdev_mgr_register_rx_ops() - API to register rx ops with lmac - * @rx_ops: rx ops struct - * - * Return: none - */ -static inline void -tgt_vdev_mgr_register_rx_ops(struct wlan_lmac_if_rx_ops *rx_ops) {} -#endif /* CMN_VDEV_MGR_TGT_IF_ENABLE */ - #endif /* __WLAN_VDEV_MGR_RX_OPS_H__ */ diff --git a/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mgr_tgt_if_tx_api.h b/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mgr_tgt_if_tx_api.h index fda5343b8b86..0a2573e5c776 100644 --- a/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mgr_tgt_if_tx_api.h +++ b/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mgr_tgt_if_tx_api.h @@ -27,7 +27,6 @@ #ifndef __WLAN_VDEV_MGR_TX_OPS_API_H__ #define __WLAN_VDEV_MGR_TX_OPS_API_H__ -#ifdef CMN_VDEV_MGR_TGT_IF_ENABLE #include #include #include @@ -264,5 +263,4 @@ QDF_STATUS tgt_vdev_mgr_peer_delete_all_send( struct vdev_mlme_obj *mlme_obj, struct peer_delete_all_params *param); -#endif /* CMN_VDEV_MGR_TGT_IF_ENABLE */ #endif /* __WLAN_VDEV_MGR_TX_OPS_API_H__ */ diff --git a/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mgr_tgt_if_tx_defs.h b/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mgr_tgt_if_tx_defs.h index eaef5b8f9b19..098223746452 100644 --- a/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mgr_tgt_if_tx_defs.h +++ b/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mgr_tgt_if_tx_defs.h @@ -25,7 +25,6 @@ #ifndef __WLAN_VDEV_MGR_TX_OPS_DEFS_H__ #define __WLAN_VDEV_MGR_TX_OPS_DEFS_H__ -#ifdef CMN_VDEV_MGR_TGT_IF_ENABLE #include /** @@ -450,5 +449,4 @@ struct peer_delete_all_params { uint8_t vdev_id; }; -#endif #endif /* __WLAN_VDEV_MGR_TX_OPS_DEFS_H__ */ diff --git a/wmi/inc/wmi_unified_param.h b/wmi/inc/wmi_unified_param.h index 44803f5c6347..dcd239679ff5 100644 --- a/wmi/inc/wmi_unified_param.h +++ b/wmi/inc/wmi_unified_param.h @@ -461,16 +461,6 @@ typedef enum { WMI_HOST_MODE_MAX = 24 } WMI_HOST_WLAN_PHY_MODE; -#ifndef CMN_VDEV_MGR_TGT_IF_ENABLE -typedef enum { - WMI_HOST_VDEV_START_OK = 0, - WMI_HOST_VDEV_START_CHAN_INVALID, - WMI_HOST_VDEV_START_CHAN_BLOCKED, - WMI_HOST_VDEV_START_CHAN_DFS_VIOLATION, - WMI_HOST_VDEV_START_TIMEOUT, -} WMI_HOST_VDEV_START_STATUS; -#endif - /* * Needs to be removed and use channel_param based * on how it is processed @@ -680,148 +670,6 @@ struct mac_ssid { uint8_t mac_ssid[WMI_MAC_MAX_SSID_LENGTH]; } qdf_packed; -#ifndef CMN_VDEV_MGR_TGT_IF_ENABLE -/** - * struct vdev_create_params - vdev create cmd parameter - * @if_id: interface id - * @type: interface type - * @subtype: interface subtype - * @nss_2g: NSS for 2G - * @nss_5g: NSS for 5G - * @pdev_id: pdev id on pdev for this vdev - * @mbssid-flags: MBSS IE flags indicating vdev type - * @vdevid_trans: id of transmitting vdev for MBSS IE - */ -struct vdev_create_params { - uint8_t if_id; - uint32_t type; - uint32_t subtype; - uint8_t nss_2g; - uint8_t nss_5g; - uint32_t pdev_id; - uint32_t mbssid_flags; - uint8_t vdevid_trans; -}; - -/** - * struct vdev_delete_params - vdev delete cmd parameter - * @if_id: interface id - */ -struct vdev_delete_params { - uint8_t if_id; -}; - -/** - * struct vdev_stop_params - vdev stop cmd parameter - * @vdev_id: vdev id - */ -struct vdev_stop_params { - uint8_t vdev_id; -}; - -/** - * struct vdev_up_params - vdev up cmd parameter - * @vdev_id: vdev id - * @assoc_id: association id - * @profile_idx: profile index of the connected non-trans ap (mbssid case). - * 0 means invalid. - * @profile_num: the total profile numbers of non-trans aps (mbssid case). - * 0 means non-MBSS AP. - * @trans_bssid: bssid of transmitted AP (MBSS IE case) - */ -struct vdev_up_params { - uint8_t vdev_id; - uint16_t assoc_id; - uint32_t profile_idx; - uint32_t profile_num; - uint8_t trans_bssid[QDF_MAC_ADDR_SIZE]; -}; - -/** - * struct vdev_down_params - vdev down cmd parameter - * @vdev_id: vdev id - */ -struct vdev_down_params { - uint8_t vdev_id; -}; - -/** - * enum wmi_bcn_tx_rate_code - beacon tx rate code - */ -enum wmi_bcn_tx_rate_code { - WMI_BCN_TX_RATE_CODE_1_M = 0x43, - WMI_BCN_TX_RATE_CODE_2_M = 0x42, - WMI_BCN_TX_RATE_CODE_5_5_M = 0x41, - WMI_BCN_TX_RATE_CODE_6_M = 0x03, - WMI_BCN_TX_RATE_CODE_9_M = 0x07, - WMI_BCN_TX_RATE_CODE_11M = 0x40, - WMI_BCN_TX_RATE_CODE_12_M = 0x02, - WMI_BCN_TX_RATE_CODE_18_M = 0x06, - WMI_BCN_TX_RATE_CODE_24_M = 0x01, - WMI_BCN_TX_RATE_CODE_36_M = 0x05, - WMI_BCN_TX_RATE_CODE_48_M = 0x00, - WMI_BCN_TX_RATE_CODE_54_M = 0x04, -}; - -/** - * struct vdev_start_params - vdev start cmd parameter - * @vdev_id: vdev id - * @flags: flags to set like pmf_enabled etc. - * @beacon_intval: beacon interval - * @dtim_period: dtim period - * @is_restart: flag to check if it is vdev - * @disable_hw_ack: to update disable hw ack flag - * @hidden_ssid: hidden ssid - * @pmf_enabled: pmf enabled - * @ssid: ssid MAC - * @num_noa_descriptors: number of noa descriptors - * @preferred_tx_streams: preferred tx streams - * @preferred_rx_streams: preferred rx streams - * @cac_duration_ms: cac duration in milliseconds - * @regdomain: Regulatory domain - * @he_ops: HE ops - * @channel_param: Channel params required by target. - * @bcn_tx_rate_code: Beacon tx rate code. - * @ldpc_rx_enabled: Enable/Disable LDPC RX for this vdev - */ -struct vdev_start_params { - uint8_t vdev_id; - uint32_t flags; - uint32_t beacon_intval; - uint32_t dtim_period; - bool is_restart; - uint32_t disable_hw_ack; - uint8_t hidden_ssid; - uint8_t pmf_enabled; - struct mac_ssid ssid; - uint32_t num_noa_descriptors; - uint32_t preferred_rx_streams; - uint32_t preferred_tx_streams; - uint32_t cac_duration_ms; - uint32_t regdomain; - uint32_t he_ops; - struct channel_param channel; - enum wmi_bcn_tx_rate_code bcn_tx_rate_code; - bool ldpc_rx_enabled; -}; - -/** - * struct vdev_scan_nac_rssi_params - NAC_RSSI cmd parameter - * @vdev_id: vdev id - * @bssid_addr: BSSID address - * @client_addr: client address - * @chan_num: channel number - * @action:NAC_RSSI action, - */ -struct vdev_scan_nac_rssi_params { - uint32_t vdev_id; - uint8_t bssid_addr[QDF_MAC_ADDR_SIZE]; - uint8_t client_addr[QDF_MAC_ADDR_SIZE]; - uint32_t chan_num; - uint32_t action; /* WMI_FILTER_NAC_RSSI_ACTION */ -}; -#endif /* CMN_VDEV_MGR_TGT_IF_ENABLE */ - /** * enum nss_chains_band_info - Band info for dynamic nss, chains change feature * @NSS_CHAINS_BAND_2GHZ: 2.4Ghz band @@ -917,30 +765,6 @@ struct peer_cfr_params { #endif /* WLAN_CFR_ENABLE */ -#ifndef CMN_VDEV_MGR_TGT_IF_ENABLE -/** - * struct vdev_set_params - vdev set cmd parameter - * @if_id: vdev id - * @param_id: parameter id - * @param_value: parameter value - */ -struct vdev_set_params { - uint32_t if_id; - uint32_t param_id; - uint32_t param_value; -}; - -/** - * struct sifs_trigger_param - sifs_trigger cmd parameter - * @if_id: vdev id - * @param_value: parameter value - */ -struct sifs_trigger_param { - uint32_t if_id; - uint32_t param_value; -}; -#endif - /** * struct peer_delete_params - peer delete cmd parameter * @vdev_id: vdev id @@ -949,27 +773,6 @@ struct peer_delete_params { uint8_t vdev_id; }; -#ifndef CMN_VDEV_MGR_TGT_IF_ENABLE -/** - * struct peer_flush_params - peer flush cmd parameter - * @peer_tid_bitmap: peer tid bitmap - * @vdev_id: vdev id - */ -struct peer_flush_params { - uint32_t peer_tid_bitmap; - uint8_t vdev_id; -}; - -/** - * struct peer_delete_all_params - peer delete all request parameter - * @vdev_id: vdev id - */ -struct peer_delete_all_params { - uint8_t vdev_id; -}; - -#endif - /** * struct peer_set_params - peer set cmd parameter * @param_id: parameter id @@ -1129,54 +932,6 @@ struct pdev_params { uint32_t param_value; }; -#ifndef CMN_VDEV_MGR_TGT_IF_ENABLE -/** - * struct beacon_tmpl_params - beacon template cmd parameter - * @vdev_id: vdev id - * @tim_ie_offset: tim ie offset - * @mbssid_ie_offset: mbssid ie offset - * @tmpl_len: beacon template length - * @tmpl_len_aligned: beacon template alignment - * @csa_switch_count_offset: CSA swith count offset in beacon frame - * @ext_csa_switch_count_offset: ECSA switch count offset in beacon frame - * @esp_ie_offset: ESP IE offset in beacon frame - * @frm: beacon template parameter - */ -struct beacon_tmpl_params { - uint8_t vdev_id; - uint32_t tim_ie_offset; - uint32_t mbssid_ie_offset; - uint32_t tmpl_len; - uint32_t tmpl_len_aligned; - uint32_t csa_switch_count_offset; - uint32_t ext_csa_switch_count_offset; - uint32_t esp_ie_offset; - uint8_t *frm; -}; - -/** - * struct beacon_params - beacon cmd parameter - * @vdev_id: vdev id - * @beaconInterval: Beacon interval - * @wbuf: beacon buffer - * @frame_ctrl: frame control field - * @bcn_txant: beacon antenna - * @is_dtim_count_zero: is it dtim beacon - * @is_bitctl_reqd: is Bit control required - * @is_high_latency: Is this high latency target - */ -struct beacon_params { - uint8_t vdev_id; - uint16_t beaconInterval; - qdf_nbuf_t wbuf; - uint16_t frame_ctrl; - uint32_t bcn_txant; - bool is_dtim_count_zero; - bool is_bitctl_reqd; - bool is_high_latency; -}; -#endif - /** * struct fd_params - FD cmd parameter * @vdev_id: vdev id @@ -1360,20 +1115,6 @@ struct peer_assoc_params { struct wmi_host_ppe_threshold peer_ppet; }; -#ifndef CMN_VDEV_MGR_TGT_IF_ENABLE -/** - * struct sta_ps_params - sta ps cmd parameter - * @vdev_id: vdev id - * @param: sta ps parameter - * @value: sta ps parameter value - */ -struct sta_ps_params { - uint32_t vdev_id; - uint32_t param; - uint32_t value; -}; -#endif - /** * struct ap_ps_params - ap ps cmd parameter * @vdev_id: vdev id @@ -1408,28 +1149,6 @@ struct scan_chan_list_params { struct channel_param ch_param[1]; }; -#ifndef CMN_VDEV_MGR_TGT_IF_ENABLE -/** - * struct multiple_vdev_restart_params - Multiple vdev restart cmd parameter - * @pdev_id: Pdev identifier - * @requestor_id: Unique id identifying the module - * @disable_hw_ack: Flag to indicate disabling HW ACK during CAC - * @cac_duration_ms: CAC duration on the given channel - * @num_vdevs: No. of vdevs that need to be restarted - * @ch_param: Pointer to channel_param - * @vdev_ids: Pointer to array of vdev_ids - */ -struct multiple_vdev_restart_params { - uint32_t pdev_id; - uint32_t requestor_id; - uint32_t disable_hw_ack; - uint32_t cac_duration_ms; - uint32_t num_vdevs; - struct channel_param ch_param; - uint32_t vdev_ids[WMI_HOST_PDEV_MAX_VDEVS]; -}; -#endif - #ifdef QCA_SUPPORT_AGILE_DFS /** * struct vdev_adfs_ch_cfg_params - Agile dfs channel set request params @@ -3028,22 +2747,6 @@ typedef struct { /* add new members here */ } wmi_host_ext_resource_config; -#ifndef CMN_VDEV_MGR_TGT_IF_ENABLE -/** - * struct set_neighbour_rx_params - Neighbour RX params - * @vdev_id: vdev id - * @idx: index of param - * @action: action - * @type: Type of param - */ -struct set_neighbour_rx_params { - uint8_t vdev_id; - uint32_t idx; - uint32_t action; - uint32_t type; -}; -#endif - /** * struct set_fwtest_params - FW test params * @arg: FW param id @@ -3054,41 +2757,6 @@ struct set_fwtest_params { uint32_t value; }; -#ifndef CMN_VDEV_MGR_TGT_IF_ENABLE -/** - * struct set_custom_aggr_size_params - custom aggr size params - * @vdev_id : vdev id - * @tx_aggr_size : TX aggr size - * @rx_aggr_size : RX aggr size - * @enable_bitmap: Bitmap for aggr size check - */ -struct set_custom_aggr_size_params { - uint32_t vdev_id; - uint32_t tx_aggr_size; - uint32_t rx_aggr_size; - uint32_t ac:2, - aggr_type:1, - tx_aggr_size_disable:1, - rx_aggr_size_disable:1, - tx_ac_enable:1, - reserved:26; -}; -#endif - -#ifndef CMN_VDEV_MGR_TGT_IF_ENABLE -/** - * enum wmi_host_custom_aggr_type: custon aggregate type - * @WMI_HOST_CUSTOM_AGGR_TYPE_AMPDU: A-MPDU aggregation - * @WMI_HOST_CUSTOM_AGGR_TYPE_AMSDU: A-MSDU aggregation - * @WMI_HOST_CUSTOM_AGGR_TYPE_MAX: Max type - */ -enum wmi_host_custom_aggr_type { - WMI_HOST_CUSTOM_AGGR_TYPE_AMPDU = 0, - WMI_HOST_CUSTOM_AGGR_TYPE_AMSDU = 1, - WMI_HOST_CUSTOM_AGGR_TYPE_MAX, -}; -#endif - /* * msduq_update_params - MSDUQ update param structure * @tid_num: TID number @@ -3143,24 +2811,6 @@ struct peer_chan_width_switch_params { struct peer_chan_width_switch_info *chan_width_peer_list; }; -#ifndef CMN_VDEV_MGR_TGT_IF_ENABLE -/** - * struct config_ratemask_params - ratemask config parameters - * @vdev_id: vdev id - * @type: Type - * @lower32: Lower 32 bits in the 1st 64-bit value - * @higher32: Higher 32 bits in the 1st 64-bit value - * @lower32_2: Lower 32 bits in the 2nd 64-bit value - */ -struct config_ratemask_params { - uint8_t vdev_id; - uint8_t type; - uint32_t lower32; - uint32_t higher32; - uint32_t lower32_2; -}; -#endif - /** * struct config_fils_params - FILS config params * @vdev_id: vdev id @@ -6039,13 +5689,6 @@ typedef enum { #define WMI_HOST_FIXED_RATE_NONE (0xff) -#ifndef CMN_VDEV_MGR_TGT_IF_ENABLE -/** slot time long */ -#define WMI_HOST_VDEV_SLOT_TIME_LONG 0x1 -/** slot time short */ -#define WMI_HOST_VDEV_SLOT_TIME_SHORT 0x2 -#endif - /** preablbe long */ #define WMI_HOST_VDEV_PREAMBLE_LONG 0x1 /** preablbe short */ @@ -6376,19 +6019,6 @@ enum wmi_host_ap_ps_peer_param { #define WMI_HOST_RXERR_MIC 0x10 /* Michael MIC decrypt error */ #define WMI_HOST_RXERR_KEY_CACHE_MISS 0x20 /* No/incorrect key matter in h/w */ -#ifndef CMN_VDEV_MGR_TGT_IF_ENABLE -enum wmi_host_sta_ps_param_uapsd { - WMI_HOST_STA_PS_UAPSD_AC0_DELIVERY_EN = (1 << 0), - WMI_HOST_STA_PS_UAPSD_AC0_TRIGGER_EN = (1 << 1), - WMI_HOST_STA_PS_UAPSD_AC1_DELIVERY_EN = (1 << 2), - WMI_HOST_STA_PS_UAPSD_AC1_TRIGGER_EN = (1 << 3), - WMI_HOST_STA_PS_UAPSD_AC2_DELIVERY_EN = (1 << 4), - WMI_HOST_STA_PS_UAPSD_AC2_TRIGGER_EN = (1 << 5), - WMI_HOST_STA_PS_UAPSD_AC3_DELIVERY_EN = (1 << 6), - WMI_HOST_STA_PS_UAPSD_AC3_TRIGGER_EN = (1 << 7), -}; -#endif - enum wmi_host_sta_ps_param_rx_wake_policy { /* Wake up when ever there is an RX activity on the VDEV. In this mode * the Power save SM(state machine) will come out of sleep by either @@ -7444,18 +7074,6 @@ struct coex_config_params { #define WMI_HOST_PDEV_ID_2 2 #define WMI_HOST_PDEV_ID_INVALID 0xFFFFFFFF -#ifndef CMN_VDEV_MGR_TGT_IF_ENABLE -/** - * struct tbttoffset_params - Tbttoffset event params - * @vdev_id: Virtual AP device identifier - * @tbttoffset : Tbttoffset for the virtual AP device - */ -struct tbttoffset_params { - uint32_t vdev_id; - uint32_t tbttoffset; -}; -#endif - /** * struct wmi_host_ready_ev_param - Data revieved in ready event * @status: FW init status. Success or Failure. diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c index f2c5f42eedb9..e54621920bb3 100644 --- a/wmi/src/wmi_unified_tlv.c +++ b/wmi/src/wmi_unified_tlv.c @@ -599,11 +599,7 @@ static QDF_STATUS send_vdev_create_cmd_tlv(wmi_unified_t wmi_handle, WMITLV_TAG_STRUC_wmi_vdev_create_cmd_fixed_param, WMITLV_GET_STRUCT_TLVLEN (wmi_vdev_create_cmd_fixed_param)); -#ifdef CMN_VDEV_MGR_TGT_IF_ENABLE cmd->vdev_id = param->vdev_id; -#else - cmd->vdev_id = param->if_id; -#endif cmd->vdev_type = param->type; cmd->vdev_subtype = param->subtype; cmd->flags = param->mbssid_flags; @@ -612,11 +608,7 @@ static QDF_STATUS send_vdev_create_cmd_tlv(wmi_unified_t wmi_handle, copy_vdev_create_pdev_id(wmi_handle, cmd, param); WMI_CHAR_ARRAY_TO_MAC_ADDR(macaddr, &cmd->vdev_macaddr); WMI_LOGD("%s: ID = %d[pdev:%d] VAP Addr = %02x:%02x:%02x:%02x:%02x:%02x", -#ifdef CMN_VDEV_MGR_TGT_IF_ENABLE __func__, param->vdev_id, cmd->pdev_id, -#else - __func__, param->if_id, cmd->pdev_id, -#endif macaddr[0], macaddr[1], macaddr[2], macaddr[3], macaddr[4], macaddr[5]); buf_ptr = (uint8_t *)cmd + sizeof(*cmd); @@ -884,11 +876,7 @@ static QDF_STATUS send_vdev_start_cmd_tlv(wmi_unified_t wmi_handle, /* Fill channel info */ copy_channel_info(cmd, chan, req); -#ifdef CMN_VDEV_MGR_TGT_IF_ENABLE cmd->beacon_interval = req->beacon_interval; -#else - cmd->beacon_interval = req->beacon_intval; -#endif cmd->dtim_period = req->dtim_period; cmd->bcn_tx_rate = req->bcn_tx_rate_code; @@ -896,11 +884,7 @@ static QDF_STATUS send_vdev_start_cmd_tlv(wmi_unified_t wmi_handle, cmd->flags |= WMI_UNIFIED_VDEV_START_BCN_TX_RATE_PRESENT; if (!req->is_restart) { -#ifdef CMN_VDEV_MGR_TGT_IF_ENABLE cmd->beacon_interval = req->beacon_interval; -#else - cmd->beacon_interval = req->beacon_intval; -#endif cmd->dtim_period = req->dtim_period; /* Copy the SSID */ @@ -939,11 +923,7 @@ static QDF_STATUS send_vdev_start_cmd_tlv(wmi_unified_t wmi_handle, "Tx SS %d, Rx SS %d, ldpc_rx: %d, cac %d, regd %d, HE ops: %d" "req->dis_hw_ack: %d ", __func__, req->vdev_id, chan->mhz, req->channel.phy_mode, chan->info, -#ifdef CMN_VDEV_MGR_TGT_IF_ENABLE req->channel.dfs_set, req->beacon_interval, cmd->dtim_period, -#else - req->channel.dfs_set, req->beacon_intval, cmd->dtim_period, -#endif chan->band_center_freq1, chan->band_center_freq2, chan->reg_info_1, chan->reg_info_2, req->channel.maxregpower, req->preferred_tx_streams, req->preferred_rx_streams, @@ -1849,23 +1829,14 @@ static QDF_STATUS send_set_sta_ps_param_cmd_tlv(wmi_unified_t wmi_handle, WMITLV_GET_STRUCT_TLVLEN (wmi_sta_powersave_param_cmd_fixed_param)); cmd->vdev_id = param->vdev_id; -#ifdef CMN_VDEV_MGR_TGT_IF_ENABLE cmd->param = param->param_id; -#else - cmd->param = param->param; -#endif cmd->value = param->value; wmi_mtrace(WMI_STA_POWERSAVE_PARAM_CMDID, cmd->vdev_id, 0); if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_STA_POWERSAVE_PARAM_CMDID)) { -#ifdef CMN_VDEV_MGR_TGT_IF_ENABLE WMI_LOGE("Set Sta Ps param Failed vdevId %d Param %d val %d", param->vdev_id, param->param_id, param->value); -#else - WMI_LOGE("Set Sta Ps param Failed vdevId %d Param %d val %d", - param->vdev_id, param->param, param->value); -#endif wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -2025,11 +1996,7 @@ static QDF_STATUS send_vdev_set_param_cmd_tlv(wmi_unified_t wmi_handle, WMITLV_TAG_STRUC_wmi_vdev_set_param_cmd_fixed_param, WMITLV_GET_STRUCT_TLVLEN (wmi_vdev_set_param_cmd_fixed_param)); -#ifdef CMN_VDEV_MGR_TGT_IF_ENABLE cmd->vdev_id = param->vdev_id; -#else - cmd->vdev_id = param->if_id; -#endif cmd->param_id = vdev_param; cmd->param_value = param->param_value; WMI_LOGD("Setting vdev %d param = %x, value = %u",