wlan: Generate bug report if scan rejected by driver
Currently SSR got triggered if scan rejected by driver due to
connection states.
Add driver changes to generate bug report before SSR triggers
if current session id, rejected reason matches with last rejected
sesssion id, reason and time delta between current time and
rejected timestamp is greater than 5 mins.
Change-Id: Ic64a6fd443104b291b5b7f6cda3bfbe8273c671a
CRs-Fixed: 1081489
diff --git a/CORE/HDD/inc/wlan_hdd_assoc.h b/CORE/HDD/inc/wlan_hdd_assoc.h
index 652f1ab..8194730 100644
--- a/CORE/HDD/inc/wlan_hdd_assoc.h
+++ b/CORE/HDD/inc/wlan_hdd_assoc.h
@@ -47,7 +47,6 @@
/* Timeout in ms for peer info request commpletion */
#define IBSS_PEER_INFO_REQ_TIMOEUT 1000
#endif
-#define SCAN_ABORT_THRESHOLD 35
typedef enum
{
/** Not associated in Infra or participating in an IBSS / Ad-hoc network.*/
diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index 9f77318..57b4345 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -236,6 +236,7 @@
#define MIN(a, b) (a > b ? b : a)
#endif
+#define SCAN_REJECT_THRESHOLD_TIME 300000 /* Time is in msec, equal to 5 mins */
#define WLAN_WAIT_TIME_EXTSCAN 1000
@@ -954,6 +955,22 @@
#endif
+/*
+ * @eHDD_SCAN_REJECT_DEFAULT: default value
+ * @eHDD_CONNECTION_IN_PROGRESS: connection is in progress
+ * @eHDD_REASSOC_IN_PROGRESS: reassociation is in progress
+ * @eHDD_EAPOL_IN_PROGRESS: STA/P2P-CLI is in middle of EAPOL/WPS exchange
+ * @eHDD_SAP_EAPOL_IN_PROGRESS: SAP/P2P-GO is in middle of EAPOL/WPS exchange
+ */
+typedef enum
+{
+ eHDD_SCAN_REJECT_DEFAULT = 0,
+ eHDD_CONNECTION_IN_PROGRESS,
+ eHDD_REASSOC_IN_PROGRESS,
+ eHDD_EAPOL_IN_PROGRESS,
+ eHDD_SAP_EAPOL_IN_PROGRESS,
+} scan_reject_states;
+
typedef struct
{
struct completion completion;
@@ -1605,7 +1622,9 @@
vos_timer_t tdls_source_timer;
v_U64_t extscan_start_time_since_boot;
- v_U8_t con_scan_abort_cnt;
+ v_U8_t last_scan_reject_session_id;
+ scan_reject_states last_scan_reject_reason;
+ v_TIME_t last_scan_reject_timestamp;
};
typedef enum {
@@ -1766,7 +1785,8 @@
VOS_STATUS hdd_issta_p2p_clientconnected(hdd_context_t *pHddCtx);
VOS_STATUS hdd_is_any_session_connected(hdd_context_t *pHddCtx);
void hdd_ipv4_notifier_work_queue(struct work_struct *work);
-v_BOOL_t hdd_isConnectionInProgress( hdd_context_t *pHddCtx);
+v_BOOL_t hdd_isConnectionInProgress(hdd_context_t *pHddCtx, v_U8_t *session_id,
+ scan_reject_states *reason);
void hdd_set_ibss_ops(hdd_adapter_t *pAdapter);
#ifdef WLAN_FEATURE_PACKET_FILTERING
int wlan_hdd_setIPv6Filter(hdd_context_t *pHddCtx, tANI_U8 filterType, tANI_U8 sessionId);
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 0a53e43..7efa19d 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -12879,7 +12879,8 @@
* Go through each adapter and check if Connection is in progress
*
*/
-v_BOOL_t hdd_isConnectionInProgress( hdd_context_t *pHddCtx)
+v_BOOL_t hdd_isConnectionInProgress(hdd_context_t *pHddCtx, v_U8_t *session_id,
+ scan_reject_states *reason)
{
hdd_adapter_list_node_t *pAdapterNode = NULL, *pNext = NULL;
hdd_station_ctx_t *pHddStaCtx = NULL;
@@ -12909,6 +12910,11 @@
hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: %p(%d) Connection is in progress", __func__,
WLAN_HDD_GET_STATION_CTX_PTR(pAdapter), pAdapter->sessionId);
+ if (session_id && reason)
+ {
+ *session_id = pAdapter->sessionId;
+ *reason = eHDD_CONNECTION_IN_PROGRESS;
+ }
return VOS_TRUE;
}
if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) &&
@@ -12917,6 +12923,11 @@
hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: %p(%d) Reassociation is in progress", __func__,
WLAN_HDD_GET_STATION_CTX_PTR(pAdapter), pAdapter->sessionId);
+ if (session_id && reason)
+ {
+ *session_id = pAdapter->sessionId;
+ *reason = eHDD_REASSOC_IN_PROGRESS;
+ }
return VOS_TRUE;
}
if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) ||
@@ -12932,6 +12943,11 @@
"%s: client " MAC_ADDRESS_STR
" is in the middle of WPS/EAPOL exchange.", __func__,
MAC_ADDR_ARRAY(staMac));
+ if (session_id && reason)
+ {
+ *session_id = pAdapter->sessionId;
+ *reason = eHDD_EAPOL_IN_PROGRESS;
+ }
return VOS_TRUE;
}
}
@@ -12957,6 +12973,11 @@
"%s: client " MAC_ADDRESS_STR " of SoftAP/P2P-GO is in the "
"middle of WPS/EAPOL exchange.", __func__,
MAC_ADDR_ARRAY(staMac));
+ if (session_id && reason)
+ {
+ *session_id = pAdapter->sessionId;
+ *reason = eHDD_SAP_EAPOL_IN_PROGRESS;
+ }
return VOS_TRUE;
}
}
@@ -13013,6 +13034,8 @@
int ret = 0;
v_U8_t *pWpsIe=NULL;
bool is_p2p_scan = false;
+ v_U8_t curr_session_id;
+ scan_reject_states curr_reason;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0))
struct net_device *dev = NULL;
@@ -13119,20 +13142,40 @@
FL("BTCoex Mode operation in progress"));
return -EBUSY;
}
- if (hdd_isConnectionInProgress(pHddCtx))
+ if (hdd_isConnectionInProgress(pHddCtx, &curr_session_id, &curr_reason))
{
hddLog(VOS_TRACE_LEVEL_ERROR, FL("Scan not allowed"));
- if (SCAN_ABORT_THRESHOLD < pHddCtx->con_scan_abort_cnt) {
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- FL("Triggering SSR, SSR status = %d"), status);
- vos_wlanRestart();
+ if (pHddCtx->last_scan_reject_session_id != curr_session_id ||
+ pHddCtx->last_scan_reject_reason != curr_reason ||
+ !pHddCtx->last_scan_reject_timestamp)
+ {
+ pHddCtx->last_scan_reject_session_id = curr_session_id;
+ pHddCtx->last_scan_reject_reason = curr_reason;
+ pHddCtx->last_scan_reject_timestamp = vos_timer_get_system_time();
}
- else
- pHddCtx->con_scan_abort_cnt++;
-
+ else {
+ if ((vos_timer_get_system_time() -
+ pHddCtx->last_scan_reject_timestamp) >=
+ SCAN_REJECT_THRESHOLD_TIME)
+ {
+ pHddCtx->last_scan_reject_timestamp = 0;
+ if (pHddCtx->cfg_ini->enableFatalEvent)
+ vos_fatal_event_logs_req(WLAN_LOG_TYPE_FATAL,
+ WLAN_LOG_INDICATOR_HOST_DRIVER,
+ WLAN_LOG_REASON_SCAN_NOT_ALLOWED,
+ FALSE, FALSE);
+ else
+ {
+ hddLog(LOGE, FL("Triggering SSR"));
+ vos_wlanRestart();
+ }
+ }
+ }
return -EBUSY;
}
- pHddCtx->con_scan_abort_cnt = 0;
+ pHddCtx->last_scan_reject_timestamp = 0;
+ pHddCtx->last_scan_reject_session_id = 0xFF;
+ pHddCtx->last_scan_reject_reason = 0;
vos_mem_zero( &scanRequest, sizeof(scanRequest));
diff --git a/CORE/HDD/src/wlan_hdd_early_suspend.c b/CORE/HDD/src/wlan_hdd_early_suspend.c
index 202a559..1607774 100644
--- a/CORE/HDD/src/wlan_hdd_early_suspend.c
+++ b/CORE/HDD/src/wlan_hdd_early_suspend.c
@@ -2307,7 +2307,9 @@
/* Restart all adapters */
hdd_start_all_adapters(pHddCtx);
- pHddCtx->con_scan_abort_cnt = 0;
+ pHddCtx->last_scan_reject_session_id = 0;
+ pHddCtx->last_scan_reject_reason = 0xFF;
+ pHddCtx->last_scan_reject_timestamp = 0;
pHddCtx->hdd_mcastbcast_filter_set = FALSE;
pHddCtx->btCoexModeSet = FALSE;
hdd_register_mcast_bcast_filter(pHddCtx);
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 01c017a..08481e7 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -11520,7 +11520,9 @@
((VosContextType*)(pVosContext))->pHDDContext = (v_VOID_t*)pHddCtx;
pHddCtx->parent_dev = dev;
- pHddCtx->con_scan_abort_cnt = 0;
+ pHddCtx->last_scan_reject_session_id = 0;
+ pHddCtx->last_scan_reject_reason = 0xFF;
+ pHddCtx->last_scan_reject_timestamp = 0;
init_completion(&pHddCtx->full_pwr_comp_var);
init_completion(&pHddCtx->standby_comp_var);
diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c
index 90f5d73..2e4852c 100644
--- a/CORE/HDD/src/wlan_hdd_p2p.c
+++ b/CORE/HDD/src/wlan_hdd_p2p.c
@@ -778,7 +778,8 @@
return -EBUSY;
}
- if(hdd_isConnectionInProgress((hdd_context_t *)pAdapter->pHddCtx))
+ if(hdd_isConnectionInProgress((hdd_context_t *)pAdapter->pHddCtx, NULL,
+ NULL))
{
hddLog( LOGE,
"%s: Connection is in progress", __func__);