qcacmn: Converge on wmi service/ext service is enable

Converge on wmi service/ext service is enable

Change-Id: Ib246befa72cce927bee157394cd22c7d1562d341
CRs-Fixed: 2152751
This commit is contained in:
Sourav Mohapatra 2017-12-03 11:44:44 +05:30 • committed by snandini
commit 06490bebac
11 changed files with 77 additions and 79 deletions

View file

@ -6108,6 +6108,10 @@ typedef enum {
wmi_service_bcn_offload_start_stop_support,
wmi_service_offchan_data_tid_support,
wmi_service_support_dma,
wmi_service_8ss_tx_bfee,
wmi_service_fils_support,
wmi_service_mawc_support,
wmi_service_wow_wakeup_by_timer_pattern,
wmi_services_max,
} wmi_conv_service_ids;

View file

@ -1595,8 +1595,8 @@ struct wmi_unified {
#ifndef CONFIG_MCL
uint32_t *pdev_param;
uint32_t *vdev_param;
uint32_t *services;
#endif
uint32_t *services;
struct wmi_soc *soc;
};
@ -1623,8 +1623,9 @@ struct wmi_soc {
#ifndef CONFIG_MCL
uint32_t pdev_param[wmi_pdev_param_max];
uint32_t vdev_param[wmi_vdev_param_max];
uint32_t services[wmi_services_max];
#endif
uint32_t services[wmi_services_max];
};
#ifdef WMI_NON_TLV_SUPPORT

View file

@ -2034,7 +2034,6 @@ static inline void wmi_target_params_init(struct wmi_soc *soc,
{
wmi_handle->pdev_param = soc->pdev_param;
wmi_handle->vdev_param = soc->vdev_param;
wmi_handle->services = soc->services;
}
#else
static inline void wmi_target_params_init(struct wmi_soc *soc,
@ -2148,6 +2147,7 @@ void *wmi_unified_attach(void *scn_handle,
wmi_handle->ctx = soc->ctx;
wmi_handle->wmi_events = soc->wmi_events;
wmi_target_params_init(soc, wmi_handle);
wmi_handle->services = soc->services;
wmi_handle->scn_handle = scn_handle;
soc->scn_handle = scn_handle;
qdf_atomic_init(&wmi_handle->pending_cmds);

View file

@ -4649,7 +4649,6 @@ QDF_STATUS wmi_check_and_update_fw_version(void *wmi_hdl, void *evt_buf)
*
* Return: 1 enabled, 0 disabled
*/
#ifndef CONFIG_MCL
bool wmi_service_enabled(void *wmi_hdl, uint32_t service_id)
{
wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl;
@ -4663,9 +4662,9 @@ bool wmi_service_enabled(void *wmi_hdl, uint32_t service_id)
} else {
qdf_print("Support not added yet for Service %d\n", service_id);
}
return false;
}
#endif
/**
* wmi_get_target_cap_from_service_ready() - extract service ready event

View file

@ -17598,7 +17598,6 @@ QDF_STATUS save_ext_service_bitmap_tlv(wmi_unified_t wmi_handle, void *evt_buf,
*
* Return: 1 enabled, 0 disabled
*/
#ifndef CONFIG_MCL
static bool is_service_enabled_tlv(wmi_unified_t wmi_handle,
uint32_t service_id)
{
@ -17609,8 +17608,8 @@ static bool is_service_enabled_tlv(wmi_unified_t wmi_handle,
return false;
}
/* if WMI_EXTENDED_SERVICE_AVAILABLE was received with extended bitmap,
* use WMI_SERVICE_EXT_ENABLE to check the services.
/* if wmi_service_enabled was received with extended bitmap,
* use WMI_SERVICE_EXT_IS_ENABLED to check the services.
*/
if (soc->wmi_ext_service_bitmap)
return WMI_SERVICE_EXT_IS_ENABLED(soc->wmi_service_bitmap,
@ -17620,13 +17619,6 @@ static bool is_service_enabled_tlv(wmi_unified_t wmi_handle,
return WMI_SERVICE_IS_ENABLED(soc->wmi_service_bitmap,
service_id);
}
#else
static bool is_service_enabled_tlv(wmi_unified_t wmi_handle,
uint32_t service_id)
{
return false;
}
#endif
static inline void copy_ht_cap_info(uint32_t ev_target_cap,
struct wlan_psoc_target_capability_info *cap)
@ -22050,7 +22042,6 @@ static void populate_tlv_events_id(uint32_t *event_ids)
event_ids[wmi_sar_get_limits_event_id] = WMI_SAR_GET_LIMITS_EVENTID;
}
#ifndef CONFIG_MCL
/**
* populate_tlv_service() - populates wmi services
*
@ -22248,8 +22239,14 @@ static void populate_tlv_service(uint32_t *wmi_service)
WMI_SERVICE_OFFCHAN_DATA_TID_SUPPORT;
wmi_service[wmi_service_support_dma] =
WMI_SERVICE_SUPPORT_DIRECT_DMA;
wmi_service[wmi_service_8ss_tx_bfee] = WMI_SERVICE_8SS_TX_BFEE;
wmi_service[wmi_service_fils_support] = WMI_SERVICE_FILS_SUPPORT;
wmi_service[wmi_service_mawc_support] = WMI_SERVICE_MAWC_SUPPORT;
}
#ifndef CONFIG_MCL
/**
* populate_pdev_param_tlv() - populates pdev params
*
@ -22664,7 +22661,6 @@ static void populate_vdev_param_tlv(uint32_t *vdev_param)
#ifndef CONFIG_MCL
static void populate_target_defines_tlv(struct wmi_unified *wmi_handle)
{
populate_tlv_service(wmi_handle->services);
populate_pdev_param_tlv(wmi_handle->pdev_param);
populate_vdev_param_tlv(wmi_handle->vdev_param);
}
@ -22748,5 +22744,6 @@ void wmi_tlv_attach(wmi_unified_t wmi_handle)
wmi_handle->log_info.buf_offset_event = 4;
#endif
populate_tlv_events_id(wmi_handle->wmi_events);
populate_tlv_service(wmi_handle->services);
populate_target_defines_tlv(wmi_handle);
}