qcacmn: Use wmi_service_enabled to check for service

Add change to use wmi_service_enabled for
wmi_service_sync_delete_cmds instead of using
chipset specific name in target_if

Change QDG_BUG to QDF_DEBUG_PANIC in target_if
vdev response expiry handler.

Change-Id: Ie0f3de2a043198e5aaf5a11add3b8e13b6a47812
CRs-Fixed: 2407877
Цей коміт міститься в:
Naga
2019-02-28 17:58:49 +05:30
зафіксовано nshrivas
джерело 203cf9052f
коміт 0891ef366c
4 змінених файлів з 5 додано та 32 видалено

Переглянути файл

@@ -105,9 +105,8 @@ void target_if_vdev_mgr_rsp_timer_mgmt_cb(void *arg)
}
if (target_if_vdev_mgr_is_panic_on_bug()) {
mlme_err("VDEV_%d: Panic on bug enabled, rsp status:%d",
vdev_id, vdev_rsp->rsp_status);
QDF_BUG(0);
QDF_DEBUG_PANIC("VDEV_%d: Panic on bug enabled, rsp status:%d",
vdev_id, vdev_rsp->rsp_status);
} else {
mlme_err("VDEV_%d: Trigger Self recovery, rsp status%d",
vdev_id, vdev_rsp->rsp_status);

Переглянути файл

@@ -174,15 +174,6 @@ struct wmi_unified
return wmi_handle;
}
static bool target_if_check_is_pre_lithium(
struct wlan_objmgr_psoc *psoc)
{
if (lmac_get_tgt_type(psoc) < TARGET_TYPE_QCA8074)
return true;
else
return false;
}
static inline uint32_t
target_if_vdev_mlme_id_2_wmi(uint32_t cfg_id)
{
@@ -427,10 +418,10 @@ static QDF_STATUS target_if_vdev_mgr_delete_send(
status = wmi_unified_vdev_delete_send(wmi_handle, param->vdev_id);
if (QDF_IS_STATUS_SUCCESS(status)) {
/*
* pre lithium chipsets doesn't have a delete response
* hence fake response is sent
* Simulate delete response if target doesn't support
*/
if (target_if_check_is_pre_lithium(psoc) ||
if (!wmi_service_enabled(wmi_handle,
wmi_service_sync_delete_cmds) ||
wlan_psoc_nif_feat_cap_get(psoc,
WLAN_SOC_F_TESTMODE_ENABLE))
target_if_vdev_mgr_delete_response_send(vdev, rx_ops);
@@ -901,8 +892,6 @@ target_if_vdev_mgr_register_tx_ops(struct wlan_lmac_if_tx_ops *tx_ops)
target_if_vdev_mgr_set_param_send;
mlme_tx_ops->vdev_sta_ps_param_send =
target_if_vdev_mgr_sta_ps_param_send;
mlme_tx_ops->target_is_pre_lithium =
target_if_check_is_pre_lithium;
mlme_tx_ops->vdev_mgr_rsp_timer_init =
target_if_vdev_mgr_rsp_timer_init;
mlme_tx_ops->vdev_mgr_rsp_timer_deinit =

Переглянути файл

@@ -279,7 +279,6 @@ struct wlan_lmac_if_mlme_tx_ops {
QDF_STATUS (*vdev_bcn_miss_offload_send)(struct wlan_objmgr_vdev *vdev);
QDF_STATUS (*vdev_sta_ps_param_send)(struct wlan_objmgr_vdev *vdev,
struct sta_ps_params *param);
bool (*target_is_pre_lithium)(struct wlan_objmgr_psoc *psoc);
#endif
};

Переглянути файл

@@ -422,20 +422,6 @@ enum vdev_start_resp_type {
RESTART_RESPONSE,
};
/**
* enum vdev_rsp_type - Response type
* @START_RSP: Start Response
* @RESTART_RSP: Restart Response
* @STOP_RSP: STOP Response
* @DELETE_RSP: DELETE Response
*/
enum vdev_rsp_type {
START_RSP = 0,
RESTART_RSP,
STOP_RSP,
DELETE_RSP,
};
/**
* struct vdev_mlme_ops - VDEV MLME operation callbacks structure
* @mlme_vdev_validate_basic_params: callback to validate VDEV basic params