wlan: issue fiq instead of explicit SSR
Issuing explicit SSR may not restart WCNSS if it is power
collapsed, also WCNSS will not record register debugging
information when SSR is issued using the kernel API. Issuing
an fiq mitigates these issues, so issue fiq instead of an
explicit SSR.
Change-Id: I9c0ac657148620db31afae6326106a2f85ec7dc3
CRs-Fixed: 704368
diff --git a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
index 8b31aa0..4942569 100644
--- a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
+++ b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
@@ -649,7 +649,7 @@
VOS_TRACE(VOS_MODULE_ID_HDD_SAP_DATA, VOS_TRACE_LEVEL_ERROR,
"%s: Cannot recover from Data stall Issue SSR",
__func__);
- subsystem_restart("wcnss");
+ WLANTL_FatalError();
return;
}
diff --git a/CORE/HDD/src/wlan_hdd_tx_rx.c b/CORE/HDD/src/wlan_hdd_tx_rx.c
index b074911..b5d8de6 100644
--- a/CORE/HDD/src/wlan_hdd_tx_rx.c
+++ b/CORE/HDD/src/wlan_hdd_tx_rx.c
@@ -959,7 +959,7 @@
VOS_TRACE(VOS_MODULE_ID_HDD_DATA, VOS_TRACE_LEVEL_ERROR,
"%s: Cannot recover from Data stall Issue SSR",
__func__);
- subsystem_restart("wcnss");
+ WLANTL_FatalError();
return;
}
diff --git a/CORE/TL/inc/wlan_qct_tl.h b/CORE/TL/inc/wlan_qct_tl.h
index 424cbd7..5aedc81 100644
--- a/CORE/TL/inc/wlan_qct_tl.h
+++ b/CORE/TL/inc/wlan_qct_tl.h
@@ -2951,4 +2951,29 @@
v_BOOL_t displaySnapshot
);
+/*==========================================================================
+ FUNCTION WLANTL_FatalError
+
+ DESCRIPTION
+ Fatal error reported in TX path, post an event to TX Thread for further
+ handling
+
+ DEPENDENCIES
+ The TL must be initialized before this gets called.
+
+ PARAMETERS
+
+ VOID
+
+ RETURN VALUE None
+
+ SIDE EFFECTS
+
+============================================================================*/
+v_VOID_t
+WLANTL_FatalError
+(
+ v_VOID_t
+);
+
#endif /* #ifndef WLAN_QCT_WLANTL_H */
diff --git a/CORE/TL/src/wlan_qct_tl.c b/CORE/TL/src/wlan_qct_tl.c
index 732bdcc..3058344 100644
--- a/CORE/TL/src/wlan_qct_tl.c
+++ b/CORE/TL/src/wlan_qct_tl.c
@@ -6736,6 +6736,52 @@
}
/*==========================================================================
+ FUNCTION WLANTL_FatalErrorHandler
+
+ DESCRIPTION
+ Handle Fatal errors detected on the TX path.
+ Currently issues SSR to recover from the error.
+
+ DEPENDENCIES
+ The TL must be initialized before this gets called.
+
+ PARAMETERS
+
+ IN
+ pvosGCtx: pointer to the global vos context; a handle to TL's
+ or WDA's control block can be extracted from its context
+
+ RETURN VALUE None
+
+ SIDE EFFECTS
+
+============================================================================*/
+v_VOID_t
+WLANTL_FatalErrorHandler
+(
+ v_PVOID_t *pVosContext
+)
+{
+
+ TLLOGE(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_FATAL,
+ "WLAN TL: %s Enter ", __func__));
+
+ if ( NULL == pVosContext )
+ {
+ TLLOGE(VOS_TRACE(VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
+ "%s: Global VoS Context or TL Context are NULL",
+ __func__));
+ return;
+ }
+
+ /*
+ * Issue SSR. vos_wlanRestart has tight checks to make sure that
+ * we do not send an FIQ if previous FIQ is not processed
+ */
+ vos_wlanRestart();
+}
+
+/*==========================================================================
FUNCTION WLANTL_TLDebugMessage
DESCRIPTION
@@ -6780,6 +6826,48 @@
return;
}
+/*==========================================================================
+ FUNCTION WLANTL_FatalError
+
+ DESCRIPTION
+ Fatal error reported in TX path, post an event to TX Thread for further
+ handling
+
+ DEPENDENCIES
+ The TL must be initialized before this gets called.
+
+ PARAMETERS
+
+ VOID
+
+ RETURN VALUE None
+
+ SIDE EFFECTS
+
+============================================================================*/
+
+v_VOID_t
+WLANTL_FatalError
+(
+ v_VOID_t
+)
+{
+ vos_msg_t vosMsg;
+ VOS_STATUS status;
+
+ vosMsg.reserved = 0;
+ vosMsg.bodyptr = NULL;
+ vosMsg.type = WLANTL_TX_FATAL_ERROR;
+
+ status = vos_tx_mq_serialize( VOS_MODULE_ID_TL, &vosMsg);
+ if(status != VOS_STATUS_SUCCESS)
+ {
+ TLLOGE(VOS_TRACE(VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
+ "%s: TX Msg Posting Failed with status: %d",
+ __func__,status));
+ }
+ return;
+}
/*============================================================================
TL STATE MACHINE
============================================================================*/
@@ -8856,6 +8944,10 @@
WDA_TransportChannelDebug(NULL, VOS_TRUE, VOS_FALSE);
break;
+ case WLANTL_TX_FATAL_ERROR:
+ WLANTL_FatalErrorHandler(pvosGCtx);
+ break;
+
default:
/*no processing for now*/
break;
diff --git a/CORE/TL/src/wlan_qct_tli.h b/CORE/TL/src/wlan_qct_tli.h
index 679570a..7c22514 100644
--- a/CORE/TL/src/wlan_qct_tli.h
+++ b/CORE/TL/src/wlan_qct_tli.h
@@ -271,6 +271,9 @@
/* Serialized Snapshot request indication */
WLANTL_TX_SNAPSHOT = 6,
+ /* Detected a fatal error issue SSR */
+ WLANTL_TX_FATAL_ERROR = 7,
+
WLANTL_TX_MAX
}WLANTL_TxSignalsType;