diff mbox series

[styhead] arm-bsp/trusted-firmware-m: corstone1000: Fix Secure Debug connection due to token version mismatch

Message ID 20241202100215.945453-1-hugues.kambampiana@arm.com
State New
Headers show
Series [styhead] arm-bsp/trusted-firmware-m: corstone1000: Fix Secure Debug connection due to token version mismatch | expand

Commit Message

Hugues KAMBA MPIANA Dec. 2, 2024, 10:02 a.m. UTC 
From: Bence Balogh <bence.balogh@arm.com>

Due to a mismatch between the ADAC dummy token major version and the version
in the secure-debug-manager repository [1]'s submodule [2], the secure debug connection was denied.
Update the ADAC token major and minor versions in TF-M to align with the expected
dummy token.

[1] https://github.com/ARM-software/secure-debug-manager/
[2] https://git.trustedfirmware.org/plugins/gitiles/shared/psa-adac.git/+/refs/heads/master/psa-adac/core/include/psa_adac.h

Fixes: 7e9466 ("arm-bsp/trusted-firmware-m: corstone1000: add Secure Debug")
Signed-off-by: Bence Balogh <bence.balogh@arm.com>
---
 .../0001-PSA-revert-header-versions.patch     | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

Comments

Jon Mason Dec. 6, 2024, 3:35 p.m. UTC | #1 
On Mon, 02 Dec 2024 10:02:15 +0000, Hugues KAMBA MPIANA wrote:
> Due to a mismatch between the ADAC dummy token major version and the version
> in the secure-debug-manager repository [1]'s submodule [2], the secure debug connection was denied.
> Update the ADAC token major and minor versions in TF-M to align with the expected
> dummy token.
> 
> [1] https://github.com/ARM-software/secure-debug-manager/
> [2] https://git.trustedfirmware.org/plugins/gitiles/shared/psa-adac.git/+/refs/heads/master/psa-adac/core/include/psa_adac.h
> 
> [...]

Applied, thanks!

[1/1] arm-bsp/trusted-firmware-m: corstone1000: Fix Secure Debug connection due to token version mismatch
      commit: 30519676ab506deddc5f378741f4a7acc3b02cc5

Best regards,
diff mbox series

Patch

diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/psa-adac/0001-PSA-revert-header-versions.patch b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/psa-adac/0001-PSA-revert-header-versions.patch
index 5bc65c40..47db1866 100644
--- a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/psa-adac/0001-PSA-revert-header-versions.patch
+++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/psa-adac/0001-PSA-revert-header-versions.patch
@@ -14,28 +14,25 @@  certificate/token versions.
 Signed-off-by: Emekcan Aras <emekcan.aras@arm.com>
 Upstream-Status: Inappropriate [Add newer dummy token and cert]
 ---
- psa-adac/core/include/psa_adac.h | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ psa-adac/core/include/psa_adac.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/psa-adac/core/include/psa_adac.h b/psa-adac/core/include/psa_adac.h
-index b190992..b026607 100644
+index b190992..6c3feb2 100644
 --- a/psa-adac/core/include/psa_adac.h
 +++ b/psa-adac/core/include/psa_adac.h
-@@ -30,10 +30,10 @@ extern "C" {
+@@ -30,8 +30,8 @@ extern "C" {
   *
   * Current version numbers for certificate and token format.
   */
 -#define ADAC_CERT_MAJOR 1u
 -#define ADAC_CERT_MINOR 0u
--#define ADAC_TOKEN_MAJOR 1u
--#define ADAC_TOKEN_MINOR 0u
 +#define ADAC_CERT_MAJOR 0u
 +#define ADAC_CERT_MINOR 1u
-+#define ADAC_TOKEN_MAJOR 0u
-+#define ADAC_TOKEN_MINOR 1u
+ #define ADAC_TOKEN_MAJOR 1u
+ #define ADAC_TOKEN_MINOR 0u
  
- /** \brief Key options
-  *
 -- 
-2.17.1
+2.25.1
+