commit 55b8ced6737234c726c1bbf8d4dadc485eb60e96
author qctecmdr <qctecmdr@localhost> Fri Jul 03 00:38:12 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Jul 03 00:38:12 2020 -0700
tree 438654dc0b06f74733bbaccdc422866e5eec15d3
parent 31afd393aa4f2e0dab360714ea27e0f2c50010d6
parent a15c5ff9d03f6bcba90559b68f7607106395b2e6

Merge "st-hal: Fixes for PDK5 SSR"

st_session.c

diff --git a/st_session.c b/st_session.c
index f5b7672..9533721 100644
--- a/st_session.c
+++ b/st_session.c
@@ -1663,8 +1663,9 @@
                     if (c_ses->sm_info.model_id ==
                         result_info->detected_model_id) {
                         if (c_ses->state == ST_STATE_ACTIVE) {
-                            ALOGV("%s: detected c%d", __func__,
-                                c_ses->sm_handle);
+                            ALOGD("%s: detected c%d, 1st stage conf level = %d",
+                                __func__, c_ses->sm_handle,
+                                result_info->best_confidence_level);
                             return c_ses;
                         } else {
                             ALOGE("%s: detected c%d is not active", __func__,
@@ -4458,6 +4459,13 @@
     struct st_hw_ses_config *sthw_cfg = NULL;
     int status;
 
+    sthw_cfg = get_sthw_cfg_for_model_id(hw_ses, model_id);
+    if (sthw_cfg) {
+        ALOGD("%s: Already initialized sthw_cfg with m_id[%d]",
+            __func__, model_id);
+        return 0;
+    }
+
     sthw_cfg = calloc(1, sizeof(struct st_hw_ses_config));
     if (!sthw_cfg) {
         ALOGE("%s: Failed to allocate struct st_hw_ses_config, exiting",
@@ -4782,8 +4790,12 @@
          * state.
          */
         for (int i = 0; i < REG_SM_RETRY_CNT; i++) {
-            status = ret = hw_ses->fptrs->reg_sm(hw_ses, p_info->sm_info.sm_data,
-                p_info->sm_info.sm_size, p_info->sm_info.model_id);
+            if (stc_ses->pending_load)
+                status = ret = reg_all_sm(st_ses, hw_ses);
+            else
+                status = ret = hw_ses->fptrs->reg_sm(hw_ses, p_info->sm_info.sm_data,
+                    p_info->sm_info.sm_size, p_info->sm_info.model_id);
+
             if (ret) {
                 if (st_ses->stdev->ssr_offline_received) {
                     STATE_TRANSITION(st_ses, ssr_state_fn);
@@ -6023,8 +6035,6 @@
         if (is_any_client_not_pending_load(st_ses))
             break;
 
-        reset_clients_pending_load(st_ses);
-
         STATE_TRANSITION(st_ses, idle_state_fn);
 
         if ((stc_ses->ssr_transit_exec_mode == ST_EXEC_MODE_CPE) ||
@@ -6032,22 +6042,27 @@
             exec_mode_ev.stc_ses = stc_ses;
             exec_mode_ev.payload.exec_mode = stc_ses->ssr_transit_exec_mode;
             DISPATCH_EVENT(st_ses, exec_mode_ev, status);
-            if (status)
+            if (status) {
+                reset_clients_pending_load(st_ses);
                 break;
+            }
             stc_ses->ssr_transit_exec_mode = ST_EXEC_MODE_NONE;
         }
         active = is_any_client_in_state(st_ses, ST_STATE_ACTIVE);
         if (active || is_any_client_in_state(st_ses, ST_STATE_LOADED)) {
             load_ev.stc_ses = stc_ses;
             DISPATCH_EVENT(st_ses, load_ev, status);
-            if (status)
+            if (status) {
+                reset_clients_pending_load(st_ses);
                 break;
+            }
         }
         if (active) {
             start_ev.stc_ses = stc_ses;
             DISPATCH_EVENT(st_ses, start_ev, status);
         }
 
+        reset_clients_pending_load(st_ses);
         break;
 
     case ST_SES_EV_LOAD_SM: