From 6b547a8eca0c824e41fd5aad33885e9e81b3ccdb Mon Sep 17 00:00:00 2001 From: Adam Johnston Date: Mon, 22 Jul 2024 21:13:25 +0000 Subject: [PATCH 1/2] 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 8138390..594596b 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 From 7cc198de44dec81ba53d102d7cbb3ed8ae8cb2e3 Mon Sep 17 00:00:00 2001 From: Emekcan Aras Date: Mon, 29 Jul 2024 16:09:01 +0100 Subject: [PATCH 2/2] ci: Fix kas branch issue with version 4.3.2 With kas 4.3, yml files need to set a branch for a specific commit since kas now checks whether the target branch contains the specific commit or not. This creates an issue on meta-cassini CI since meta-cassini-bsp triggers a CI pipeline without setting the branch parameter dynamically. This commit adds the change to set the branch parameter dynamically to fix this issue. Signed-off-by: Emekcan Aras --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ccb73af..7b9d5af 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,6 +69,7 @@ trigger-meta-cassini: PARENT_PIPELINE_ID: $CI_PIPELINE_ID REPOS_BSP_URL: $CI_PROJECT_URL REPOS_BSP_REFSPEC: $CI_COMMIT_SHA + REPOS_BSP_BRANCH: $CI_COMMIT_BRANCH CODE_QUALITY_DISABLED: "true" SAST_DISABLED: "true" SECRET_DETECTION_DISABLED: "true" -- GitLab