commit 164bed1a15b8662128b2654baafd988d16deceaa
author Hanumantha Reddy Pothula <c_hpothu@qti.qualcomm.com> Mon Nov 09 09:48:21 2015 +0530
committer Anjaneedevi Kapparapu <akappa@codeaurora.org> Thu Nov 12 18:22:31 2015 +0530
tree 3f337aadadf1cfa2a342a07fb9125075454dee4c
parent f4883a71878eae13738e3e61ee40d61cce88b81a

wlan: Protect processing of sending FATAL event

Hold ssr_protect_entry_count while processing of sending  FATAL event
request to FW, so that there will be no invalid data access during SSR.

Change-Id: I3c888f2d528d7f8160b4e66b08051013231eff13
CRs-Fixed: 936164

CORE/VOSS/src/vos_api.c

diff --git a/CORE/VOSS/src/vos_api.c b/CORE/VOSS/src/vos_api.c
index a74fdee..b7d4fae 100644
--- a/CORE/VOSS/src/vos_api.c
+++ b/CORE/VOSS/src/vos_api.c
@@ -1765,11 +1765,9 @@
     return pHddCtx->cfg_ini->enableFatalEvent;
 }
 
-
-
 /**---------------------------------------------------------------------------
 
-  \brief vos_fatal_event_logs_req() - used to send flush command to FW
+  \brief __vos_fatal_event_logs_req() - used to send flush command to FW
 
   This API is wrapper to SME flush API.
 
@@ -1780,7 +1778,7 @@
   \return VOS_STATUS_SUCCESS - if command is sent successfully.
           VOS_STATUS_E_FAILURE - if command is not sent successfully.
   --------------------------------------------------------------------------*/
-VOS_STATUS vos_fatal_event_logs_req( uint32_t is_fatal,
+VOS_STATUS __vos_fatal_event_logs_req( uint32_t is_fatal,
                         uint32_t indicator,
                         uint32_t reason_code,
                         bool wait_required,
@@ -1838,7 +1836,13 @@
         "%s: Triggering fatal Event: type:%d, indicator=%d reason_code=%d",
         __func__, is_fatal, indicator, reason_code);
 
-    vos_event_reset(&gpVosContext->fwLogsComplete);
+    status = vos_event_reset(&gpVosContext->fwLogsComplete);
+    if(!HAL_STATUS_SUCCESS(status))
+    {
+        VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
+                    FL("fwLogsComplete reset failed:%d"),status);
+        return VOS_STATUS_E_FAILURE;
+    }
     status = sme_fatal_event_logs_req(vos_context->pMACContext,
                                       is_fatal, indicator,
                                       reason_code, dump_vos_trace);
@@ -1872,6 +1876,22 @@
         return VOS_STATUS_E_FAILURE;
 }
 
+VOS_STATUS vos_fatal_event_logs_req( uint32_t is_fatal,
+                        uint32_t indicator,
+                        uint32_t reason_code,
+                        bool wait_required,
+                        bool dump_vos_trace)
+{
+    VOS_STATUS status;
+
+    vos_ssr_protect(__func__);
+    status = __vos_fatal_event_logs_req(is_fatal, indicator, reason_code,
+                                        wait_required, dump_vos_trace);
+    vos_ssr_unprotect(__func__);
+
+    return status;
+}
+
 /**---------------------------------------------------------------------------
 
   \brief vos_process_done_indication() - Process the done indication for fatal event,