From 9092bc0c99914d939423f4b8614e6aab94eddc1d Mon Sep 17 00:00:00 2001 From: Adam Johnston Date: Mon, 22 Jul 2024 21:13:25 +0000 Subject: [PATCH] bsp: Initialize protobuf interface after capsule update provider Initializing protobuf interface before capsule update provider changes the capsule update provider ID that is hard-coded by u-boot and breaks the capsule update mechanism in corstone1000. This moves the initialization of protobuf interface at end of se-proxy setup phase, and fixes capsule update mechanism without any change required in u-boot. Changelog: bug Signed-off-by: Emekcan Aras Signed-off-by: Adam Johnston --- .dictionary | 1 + .../corstone1000/0019-se-proxy-protobuf-change.patch | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.dictionary b/.dictionary index 94cd492..6cdf094 100644 --- a/.dictionary +++ b/.dictionary @@ -23,6 +23,7 @@ CONFIG_AUTOFS4_FS CONFIG_AUTOFS_FS configfile corstone +corstone1000 cpio crypto dialout diff --git a/meta-arm/meta-arm-bsp/recipes-security/trusted-services/corstone1000/0019-se-proxy-protobuf-change.patch b/meta-arm/meta-arm-bsp/recipes-security/trusted-services/corstone1000/0019-se-proxy-protobuf-change.patch index e4d0b97..cfe0e69 100644 --- a/meta-arm/meta-arm-bsp/recipes-security/trusted-services/corstone1000/0019-se-proxy-protobuf-change.patch +++ b/meta-arm/meta-arm-bsp/recipes-security/trusted-services/corstone1000/0019-se-proxy-protobuf-change.patch @@ -30,7 +30,7 @@ index a0eb03b6f..e2774c135 100644 if (rpc_status != RPC_SUCCESS) { EMSG("Failed to initialize RPC endpoint: %d", rpc_status); goto fatal_error; -@@ -82,6 +83,28 @@ void __noreturn sp_main(union ffa_boot_info *boot_info) +@@ -129,6 +130,28 @@ void __noreturn sp_main(union ffa_boot_info *boot_info) goto fatal_error; } @@ -56,9 +56,9 @@ index a0eb03b6f..e2774c135 100644 + goto fatal_error; + } + - rpc_iface = attest_proxy_create(); - if (!rpc_iface) { - EMSG("Failed to create Attestation proxy"); + while (1) { + ts_rpc_endpoint_sp_receive(&rpc_endpoint, &req_msg, &resp_msg); + -- 2.25.1 -- GitLab