A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-13 00:00:00 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Fix to clear pending scan id when scan is aborted

Browse source 
In case of scan abort FW does not send WMI_SCAN_EVENT_COMPLETED
event and directly sends WMI_SCAN_EVENT_DEQUEUED or
WMI_SCAN_EVENT_START_FAILED. In this case the scan id does not
get clear and hence block Host from power collapsing.

Include WMI_SCAN_EVENT_DEQUEUED and WMI_SCAN_EVENT_START_FAILED when
accounting for completed scans, and change to tracking pending scans
with a counter instead of individual Ids.

Change-Id: Iaa2977dd5899d214251cbf4f1f8caf768725f538
CRs-Fixed: 1077518
This commit is contained in:
Nitesh Shah 2016-10-13 22:01:41 +05:30 • committed by qcabuildsw
commit 0f3fce5816
4 changed files with 34 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/wma/inc/wma.h
View file

@ -477,6 +477,10 @@ enum ds_mode {
WMA_HW_MODE_SBS_MODE_BITPOS)
#define WMA_SCAN_END_EVENT (WMI_SCAN_EVENT_COMPLETED | \
WMI_SCAN_EVENT_DEQUEUED | \
WMI_SCAN_EVENT_START_FAILED)
/**
* struct probeTime_dwellTime - probe time, dwell time map
* @dwell_time: dwell time
@ -1010,7 +1014,6 @@ struct wma_txrx_node {
vdev_restart_params_t vdev_restart_params;
vdev_cli_config_t config;
struct scan_param scan_info;
struct p2p_scan_param p2p_scan_info;
uint32_t type;
uint32_t sub_type;
#ifdef FEATURE_WLAN_SCAN_PNO
@ -1536,6 +1539,7 @@ typedef struct {
uint32_t new_hw_mode_index;
struct extended_caps phy_caps;
qdf_atomic_t scan_id_counter;
qdf_atomic_t num_pending_scans;
wma_peer_authorized_fp peer_authorized_cb;
uint32_t wow_pno_match_wake_up_count;
uint32_t wow_pno_complete_wake_up_count;

1
core/wma/src/wma_main.c
View file

@ -2116,6 +2116,7 @@ QDF_STATUS wma_open(void *cds_context,
qdf_spinlock_create(&wma_handle->wma_hold_req_q_lock);
qdf_atomic_init(&wma_handle->is_wow_bus_suspended);
qdf_atomic_init(&wma_handle->scan_id_counter);
qdf_atomic_init(&wma_handle->num_pending_scans);
/* Register vdev start response event handler */
wmi_unified_register_event_handler(wma_handle->wmi_handle,

103
core/wma/src/wma_scan_roam.c
View file

@ -100,65 +100,34 @@ enum extscan_report_events_type {
#endif
/**
* wma_set_scan_info() - set scan info in wma handle
* @wma_handle: wma handle
* @scan_id: scan id
* @vdev_id: vdev id
* wma_dec_pending_scans() - Decrements the number of pending scans
* @wma: The WMA handle to operate on
*
* Return: none
*/
static inline void wma_set_scan_info(tp_wma_handle wma_handle,
uint32_t scan_id,
uint32_t vdev_id)
static void wma_dec_pending_scans(tp_wma_handle wma)
{
wma_handle->interfaces[vdev_id].scan_info.scan_id = scan_id;
int32_t scan_cnt = qdf_atomic_read(&wma->num_pending_scans);
if (scan_cnt <= 0) {
WMA_LOGE("Stopping pending scan, but no scans were pending!");
return;
}
qdf_atomic_dec(&wma->num_pending_scans);
WMA_LOGI("Ending pending scan: %d <- %d", scan_cnt, scan_cnt - 1);
}
/**
* wma_reset_scan_info() - reset scan info from wma handle
* @wma_handle: wma handle
* @vdev_id: vdev id
* wma_inc_pending_scans() - Increments the number of pending scans
* @wma: The WMA handle to operate on
*
* Return: none
*/
static inline void wma_reset_scan_info(tp_wma_handle wma_handle,
uint8_t vdev_id)
static void wma_inc_pending_scans(tp_wma_handle wma)
{
qdf_mem_zero((void *)&(wma_handle->interfaces[vdev_id].scan_info),
sizeof(wma_handle->interfaces[vdev_id].scan_info));
}
/**
* wma_set_p2p_scan_info() - set p2p scan info in wma handle
* @wma_handle: wma handle
* @scan_id: scan id
* @vdev_id: vdev id
* @p2p_scan_type: p2p scan type
*
* Return: none
*/
static inline void wma_set_p2p_scan_info(tp_wma_handle wma_handle,
uint32_t scan_id,
uint32_t vdev_id,
tSirP2pScanType p2p_scan_type)
{
wma_handle->interfaces[vdev_id].p2p_scan_info.scan_id = scan_id;
wma_handle->interfaces[vdev_id].p2p_scan_info.p2p_scan_type =
p2p_scan_type;
}
/**
* wma_reset_p2p_scan_info() - reset scan info from wma handle
* @wma_handle: wma handle
* @vdev_id: vdev id
*
* Return: none
*/
static inline void wma_reset_p2p_scan_info(tp_wma_handle wma_handle,
uint8_t vdev_id)
{
qdf_mem_zero((void *)&(wma_handle->interfaces[vdev_id].p2p_scan_info),
sizeof(struct p2p_scan_param));
int32_t scan_cnt = qdf_atomic_inc_return(&wma->num_pending_scans);
WMA_LOGI("Starting pending scan: %d -> %d", scan_cnt - 1, scan_cnt);
}
/**
@ -559,11 +528,8 @@ QDF_STATUS wma_start_scan(tp_wma_handle wma_handle,
goto error1;
}
wma_set_scan_info(wma_handle, cmd.scan_id, cmd.vdev_id);
wma_inc_pending_scans(wma_handle);
if (scan_req->p2pScanType == P2P_SCAN_TYPE_LISTEN)
wma_set_p2p_scan_info(wma_handle, cmd.scan_id,
cmd.vdev_id, P2P_SCAN_TYPE_LISTEN);
WMA_LOGI("scan_id 0x%x, vdev_id %d, p2pScanType %d, msg_type 0x%x",
cmd.scan_id, cmd.vdev_id, scan_req->p2pScanType, msg_type);
@ -585,7 +551,7 @@ QDF_STATUS wma_start_scan(tp_wma_handle wma_handle,
&cmd);
if (QDF_IS_STATUS_ERROR(qdf_status)) {
WMA_LOGE("wmi_unified_cmd_send returned Error %d", qdf_status);
goto error1;
goto dec_scans;
}
if (NULL != cmd.chan_list)
@ -595,6 +561,9 @@ QDF_STATUS wma_start_scan(tp_wma_handle wma_handle,
return QDF_STATUS_SUCCESS;
dec_scans:
wma_dec_pending_scans(wma_handle);
error1:
if (NULL != cmd.chan_list)
qdf_mem_free(cmd.chan_list);
@ -5671,35 +5640,16 @@ int wma_scan_event_callback(WMA_HANDLE handle, uint8_t *data,
return -ENOMEM;
}
scan_event->event = wmi_event->event;
WMA_LOGI("scan event %u, id 0x%x, requestor 0x%x, freq %u, reason %u",
wmi_event->event, wmi_event->scan_id, wmi_event->requestor,
wmi_event->channel_freq, wmi_event->reason);
scan_event->event = wmi_event->event;
scan_event->scanId = wmi_event->scan_id;
scan_event->requestor = wmi_event->requestor;
scan_event->chanFreq = wmi_event->channel_freq;
if (scan_event->scanId ==
wma_handle->interfaces[vdev_id].scan_info.scan_id) {
if (scan_event->event == SIR_SCAN_EVENT_COMPLETED)
wma_reset_scan_info(wma_handle, vdev_id);
}
if (scan_event->scanId ==
wma_handle->interfaces[vdev_id].p2p_scan_info.scan_id) {
scan_event->p2pScanType = P2P_SCAN_TYPE_LISTEN;
if (scan_event->event == SIR_SCAN_EVENT_COMPLETED)
wma_reset_p2p_scan_info(wma_handle, vdev_id);
}
scan_event->sessionId = vdev_id;
if (wmi_event->reason == WMI_SCAN_REASON_COMPLETED ||
wmi_event->reason == WMI_SCAN_REASON_TIMEDOUT)
scan_event->reasonCode = eSIR_SME_SUCCESS;
else
scan_event->reasonCode = eSIR_SME_SCAN_FAILED;
scan_event->reasonCode = eSIR_SME_SCAN_FAILED;
switch (wmi_event->event) {
case WMI_SCAN_EVENT_COMPLETED:
@ -5734,10 +5684,13 @@ int wma_scan_event_callback(WMA_HANDLE handle, uint8_t *data,
}
wma_send_msg(wma_handle, WMA_RX_SCAN_EVENT, (void *)scan_event, 0);
if ((wmi_event->event & WMA_SCAN_END_EVENT) > 0)
wma_dec_pending_scans(wma_handle);
return 0;
}
/**
* wma_roam_better_ap_handler() - better ap event handler
* @wma: wma handle

15
core/wma/src/wma_utils.c
View file

@ -1640,19 +1640,8 @@ int wma_unified_debug_print_event_handler(void *handle, uint8_t *datap,
*/
bool wma_check_scan_in_progress(WMA_HANDLE handle)
{
tp_wma_handle wma_handle = handle;
int i;
for (i = 0; i < wma_handle->max_bssid; i++) {
if (wma_handle->interfaces[i].scan_info.scan_id) {
WMA_LOGE("%s: scan in progress on interface[%d],scanid = %d",
__func__, i,
wma_handle->interfaces[i].scan_info.scan_id);
return true;
}
}
return false;
tp_wma_handle wma = handle;
return qdf_atomic_read(&wma->num_pending_scans) > 0;
}
/**