[walnascar,1/1] arm-bsp/trusted-services: corstone1000: Align PSA crypto structs with TF-M

From: Ali Can Ozaslan <ali.oezaslan@arm.com>

The TF-M was upgraded to v2.1.1 for the Corstone-1000. The TS had to be
aligned with it, to keep the Secure Enclave Proxy Secure Partition
compatible with TF-M.

Signed-off-by: Ali Can Ozaslan <ali.oezaslan@arm.com>
---
 ...n-PSA-Crypto-structs-with-TF-Mv2.1.1.patch | 29 +++++++++++++++++++
 .../trusted-services/ts-arm-platforms.inc     |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 meta-arm-bsp/recipes-security/trusted-services/corstone1000/0021-Align-PSA-Crypto-structs-with-TF-Mv2.1.1.patch

Hello Ali,
I have a couple of issues with this patch.  Firstly, this is for the
walnascar branch, but it hasn't been pushed to master first.  It needs
to be in master first.  See
https://git.yoctoproject.org/meta-arm/tree/documentation/releases.md#n12

Secondly, the patch status is "Pending", and there is no follow-on
(e.g., no "[comment]" following the Pending).  Pending has been abused
in the past and we're trying very hard to only allow Pending in
extreme circumstances, and then it should include a pointer to an open
issue on the relevant project's github/gitlab/mailing list.  See
https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#patch-upstream-status
for more information on the upstream status.

Thanks,
Jon


On Wed, May 7, 2025 at 1:39 PM ali.oezaslan via lists.yoctoproject.org
<ali.oezaslan=arm.com@lists.yoctoproject.org> wrote:
>
> From: Ali Can Ozaslan <ali.oezaslan@arm.com>
>
> The TF-M was upgraded to v2.1.1 for the Corstone-1000. The TS had to be
> aligned with it, to keep the Secure Enclave Proxy Secure Partition
> compatible with TF-M.
>
> Signed-off-by: Ali Can Ozaslan <ali.oezaslan@arm.com>
> ---
>  ...n-PSA-Crypto-structs-with-TF-Mv2.1.1.patch | 29 +++++++++++++++++++
>  .../trusted-services/ts-arm-platforms.inc     |  1 +
>  2 files changed, 30 insertions(+)
>  create mode 100644 meta-arm-bsp/recipes-security/trusted-services/corstone1000/0021-Align-PSA-Crypto-structs-with-TF-Mv2.1.1.patch
>
> diff --git a/meta-arm-bsp/recipes-security/trusted-services/corstone1000/0021-Align-PSA-Crypto-structs-with-TF-Mv2.1.1.patch b/meta-arm-bsp/recipes-security/trusted-services/corstone1000/0021-Align-PSA-Crypto-structs-with-TF-Mv2.1.1.patch
> new file mode 100644
> index 00000000..352fe9ea
> --- /dev/null
> +++ b/meta-arm-bsp/recipes-security/trusted-services/corstone1000/0021-Align-PSA-Crypto-structs-with-TF-Mv2.1.1.patch
> @@ -0,0 +1,29 @@
> +From 71da6c0384fb241cadf052968e8dce9c357e4a33 Mon Sep 17 00:00:00 2001
> +From: Ali Can Ozaslan <ali.oezaslan@arm.com>
> +Date: Tue, 29 Apr 2025 07:52:14 +0000
> +Subject: [PATCH] Align PSA Crypto structs with TF-Mv2.1.1
> +
> +The psa_client_key_attributes_s struct had to be aligned with the
> +psa_key_attributes_s struct in TF-M.
> +
> +Signed-off-by: Ali Can Ozaslan <ali.oezaslan@arm.com>
> +Upstream-Status: Pending
> +---
> + components/service/crypto/include/psa/crypto_client_struct.h | 1 -
> + 1 file changed, 1 deletion(-)
> +
> +diff --git a/components/service/crypto/include/psa/crypto_client_struct.h b/components/service/crypto/include/psa/crypto_client_struct.h
> +index ebc4008..f0c8cad 100644
> +--- a/components/service/crypto/include/psa/crypto_client_struct.h
> ++++ b/components/service/crypto/include/psa/crypto_client_struct.h
> +@@ -38,7 +38,6 @@ struct psa_client_key_attributes_s
> +     uint32_t alg;
> +     uint32_t alg2;
> +     uint32_t id;
> +-    int32_t owner_id;
> + };
> +
> + #define PSA_CLIENT_KEY_ATTRIBUTES_INIT {0, 0, 0, 0, 0, 0}
> +--
> +2.34.1
> +
> diff --git a/meta-arm-bsp/recipes-security/trusted-services/ts-arm-platforms.inc b/meta-arm-bsp/recipes-security/trusted-services/ts-arm-platforms.inc
> index 770c47ab..84f4c07f 100644
> --- a/meta-arm-bsp/recipes-security/trusted-services/ts-arm-platforms.inc
> +++ b/meta-arm-bsp/recipes-security/trusted-services/ts-arm-platforms.inc
> @@ -22,6 +22,7 @@ SRC_URI:append:corstone1000  = " \
>      file://0018-Make-RSS-and-MHU-sizes-compile-time-definitions-user.patch \
>      file://0019-Align-PSA-Crypto-with-TF-Mv2.1.patch \
>      file://0020-se-proxy-protobuf-change.patch \
> +    file://0021-Align-PSA-Crypto-structs-with-TF-Mv2.1.1.patch \
>      "
>
>  # The patches above introduce errors with GCC 14.1, silence them for now
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#6495): https://lists.yoctoproject.org/g/meta-arm/message/6495
> Mute This Topic: https://lists.yoctoproject.org/mt/112672802/3616920
> Group Owner: meta-arm+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [jdmason@kudzu.us]
> -=-=-=-=-=-=-=-=-=-=-=-
>