correct libspdm_start_watchdog enablement.

Signed-off-by: Qi Zhang <[email protected]>
LeeTroy · Feb 11, 2022 · c7c4aaa · c7c4aaa
1 parent 1224ab3
commit c7c4aaa
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 22 deletions.
diff --git a/library/spdm_responder_lib/libspdm_rsp_finish.c b/library/spdm_responder_lib/libspdm_rsp_finish.c
@@ -5,6 +5,7 @@
  **/
 
 #include "internal/libspdm_responder_lib.h"
+#include "hal/library/platform_lib.h"
 
 #if LIBSPDM_ENABLE_CAPABILITY_KEY_EX_CAP
 
@@ -287,6 +288,12 @@ return_status spdm_get_response_finish(IN void *context, IN uintn request_size,
                                                response_size, response);
     }
 
+    result = libspdm_start_watchdog(session_id,
+                                    spdm_context->local_context.heartbeat_period);
+    if (!result) {
+        return RETURN_DEVICE_ERROR;
+    }
+
     return RETURN_SUCCESS;
 }
 

diff --git a/library/spdm_responder_lib/libspdm_rsp_psk_exchange.c b/library/spdm_responder_lib/libspdm_rsp_psk_exchange.c
@@ -5,7 +5,6 @@
  **/
 
 #include "internal/libspdm_responder_lib.h"
-#include "hal/library/platform_lib.h"
 
 #if LIBSPDM_ENABLE_CAPABILITY_PSK_EX_CAP
 
@@ -360,11 +359,6 @@ return_status spdm_get_response_psk_exchange(IN void *context,
 
         spdm_set_session_state(spdm_context, session_id,
                                LIBSPDM_SESSION_STATE_ESTABLISHED);
-        result = libspdm_start_watchdog(session_id,
-                                        spdm_context->local_context.heartbeat_period);
-        if (!result) {
-            return RETURN_DEVICE_ERROR;
-        }
     }
 
     return RETURN_SUCCESS;

diff --git a/library/spdm_responder_lib/libspdm_rsp_psk_finish.c b/library/spdm_responder_lib/libspdm_rsp_psk_finish.c
@@ -5,6 +5,7 @@
  **/
 
 #include "internal/libspdm_responder_lib.h"
+#include "hal/library/platform_lib.h"
 
 /**
  * Process the SPDM PSK_FINISH request and return the response.
@@ -173,5 +174,11 @@ return_status spdm_get_response_psk_finish(IN void *context,
                                                response_size, response);
     }
 
+    result = libspdm_start_watchdog(session_id,
+                                    spdm_context->local_context.heartbeat_period);
+    if (!result) {
+        return RETURN_DEVICE_ERROR;
+    }
+
     return RETURN_SUCCESS;
 }
diff --git a/library/spdm_responder_lib/libspdm_rsp_receive_send.c b/library/spdm_responder_lib/libspdm_rsp_receive_send.c
@@ -317,13 +317,10 @@ return_status libspdm_build_response(IN void *context, IN uint32_t *session_id,
     spdm_session_info_t *session_info;
     spdm_message_header_t *spdm_request;
     spdm_message_header_t *spdm_response;
-    bool session_state_established;
     bool result;
-    uint32_t watchdog_session_id;
 
     spdm_context = context;
     status = RETURN_UNSUPPORTED;
-    session_state_established = false;
 
     if (spdm_context->last_spdm_error.error_code != 0) {
 
@@ -478,15 +475,11 @@ return_status libspdm_build_response(IN void *context, IN uint32_t *session_id,
                 spdm_set_session_state(
                     spdm_context, *session_id,
                     LIBSPDM_SESSION_STATE_ESTABLISHED);
-                watchdog_session_id = *session_id;
-                session_state_established = true;
             }
             break;
         case SPDM_PSK_FINISH_RSP:
             spdm_set_session_state(spdm_context, *session_id,
                                    LIBSPDM_SESSION_STATE_ESTABLISHED);
-            watchdog_session_id = *session_id;
-            session_state_established = true;
             break;
         case SPDM_END_SESSION_ACK:
             spdm_set_session_state(spdm_context, *session_id,
@@ -512,8 +505,6 @@ return_status libspdm_build_response(IN void *context, IN uint32_t *session_id,
                     spdm_context,
                     spdm_context->latest_session_id,
                     LIBSPDM_SESSION_STATE_ESTABLISHED);
-                watchdog_session_id = spdm_context->latest_session_id;
-                session_state_established = true;
             }
             break;
         default:
@@ -522,13 +513,6 @@ return_status libspdm_build_response(IN void *context, IN uint32_t *session_id,
         }
     }
 
-    if (session_state_established) {
-        result = libspdm_start_watchdog(watchdog_session_id,
-                                        spdm_context->local_context.heartbeat_period);
-        if (!result) {
-            return RETURN_DEVICE_ERROR;
-        }
-    }
     return RETURN_SUCCESS;
 }