Merge branch 'ARM-software:main' into main

ARM-software · Oct 28, 2024 · 2e7f078 · 2e7f078
2 parents 9f9b87b + 076d073
commit 2e7f078
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 4 deletions.
diff --git a/secure-debug/platform/common/include/adac_util.h b/secure-debug/platform/common/include/adac_util.h
@@ -1,5 +1,5 @@
 /** @file
- * Copyright (c) 2021-2023, Arm Limited or its affiliates. All rights reserved.
+ * Copyright (c) 2021-2024, Arm Limited or its affiliates. All rights reserved.
  * SPDX-License-Identifier : Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -106,4 +106,11 @@ int request_packet_send(request_packet_t *packet);
 **/
 response_packet_t *response_packet_receive();
 
+/**
+ *   @brief    - Reset the connection between pyocd and target.
+ *   @param    - None
+ *   @return   - None
+**/
+void psa_adac_reset_debugger_target_session();
+
 #endif /* _PSA_ADAC_UTIL_H_ */
diff --git a/secure-debug/platform/common/src/adac_command_util.c b/secure-debug/platform/common/src/adac_command_util.c
@@ -1,5 +1,5 @@
 /** @file
- * Copyright (c) 2021-2023, Arm Limited or its affiliates. All rights reserved.
+ * Copyright (c) 2021-2024, Arm Limited or its affiliates. All rights reserved.
  * SPDX-License-Identifier : Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -336,3 +336,18 @@ psa_status_t psa_adac_check_cryptosystem_support(response_packet_t *packet, uint
     }
     return r;
 }
+
+
+/**
+ *   @brief    - Reset the connection between pyocd and target.
+ *   @param    - None
+ *   @return   - None
+**/
+void psa_adac_reset_debugger_target_session()
+{
+    uint8_t reset[] = {0x12,0x34,0x56,0x78};
+    request_packet_t packet = {0,};
+    memcpy(packet.data,&reset,4);
+    packet.data_count = 1;
+    request_packet_send(&packet);
+}
diff --git a/secure-debug/platform/hosts/musca_b1/memw_pyocd/host_connect.py b/secure-debug/platform/hosts/musca_b1/memw_pyocd/host_connect.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #/** @file
-# * Copyright (c) 2022 Arm Limited or its affiliates. All rights reserved.
+# * Copyright (c) 2022-2024, Arm Limited or its affiliates. All rights reserved.
 # * SPDX-License-Identifier : Apache-2.0
 # *
 # * Licensed under the Apache License, Version 2.0 (the "License");
@@ -129,7 +129,10 @@ def send(self, data):
                 try:
                     data_received, address = adac_acs.server_socket.recvfrom(4096)
                     length = len(data_received)
-                    print("Data received from adac acs : length : %d, data : %s"%(length, str(data_received.hex())))
+                    received_string = str(data_received.hex())
+                    print("Data received from adac acs : length : %d, data : %s"%(length, received_string))
+                    if received_string[len(received_string)-8:] == '12345678':
+                        break
                     adac_acs.send(data_received)
                     head, data = adac_acs.receive()
                     adac_acs.server_socket.sendto(head, address)

diff --git a/secure-debug/tests/adac/test_a002/test_a002.c b/secure-debug/tests/adac/test_a002/test_a002.c
@@ -192,6 +192,8 @@ void test_entry(val_api_t *val_api)
         goto test_end;
     }
     response_packet_release(response);
+    //reset session
+    psa_adac_reset_debugger_target_session();
 
     // Set device in locked state.
     ret = psa_adac_issue_command(ADAC_LOCK_DEBUG_CMD, request, NULL, 0);