Build: Regenerate tests_psa_arch fetch_repo patches
Regenerate patches using git format-patch -5 and at the
same time provide a 0005 patch in which formatting has
been fixed so that it applies without errors or warnings.
Signed-off-by: Antonio de Angelis <antonio.deangelis@arm.com>
Change-Id: I5427122be7e303c7805088d84fe45ad4120cb43a
diff --git a/tests_psa_arch/fetch_repo/0001-Place-crypto-test-16-at-the-beginning-of-the-test.patch b/tests_psa_arch/fetch_repo/0001-Place-crypto-test-16-at-the-beginning-of-the-test.patch
index 0237399..74d6db7 100644
--- a/tests_psa_arch/fetch_repo/0001-Place-crypto-test-16-at-the-beginning-of-the-test.patch
+++ b/tests_psa_arch/fetch_repo/0001-Place-crypto-test-16-at-the-beginning-of-the-test.patch
@@ -1,7 +1,7 @@
-From 317ecb73e2a8c7b4dd43c484ab6c2f0c3c0f1e8b Mon Sep 17 00:00:00 2001
+From f3c0155e85eec20236308d90c4bc21264023dbb6 Mon Sep 17 00:00:00 2001
From: Summer Qin <summer.qin@arm.com>
Date: Tue, 29 Aug 2023 17:08:19 +0800
-Subject: [PATCH 1/4] Place crypto test 16 at the beginning of the test
+Subject: [PATCH 1/5] Place crypto test 16 at the beginning of the test
HMAC_DRBG random generator is slower than CTR_DRBG, and this
will influence the time spending for test 16 RSA 2048. Placing
@@ -33,5 +33,5 @@
test_c018
test_c019
--
-2.25.1
+2.47.0
diff --git a/tests_psa_arch/fetch_repo/0002-Crypto-Add-psa-crypto-config-link-for-crypto-tests.patch b/tests_psa_arch/fetch_repo/0002-Crypto-Add-psa-crypto-config-link-for-crypto-tests.patch
index 01236a0..c273c46 100644
--- a/tests_psa_arch/fetch_repo/0002-Crypto-Add-psa-crypto-config-link-for-crypto-tests.patch
+++ b/tests_psa_arch/fetch_repo/0002-Crypto-Add-psa-crypto-config-link-for-crypto-tests.patch
@@ -1,7 +1,7 @@
-From ddbc21ecb46b742536d33e869672b03929e24e6b Mon Sep 17 00:00:00 2001
+From 02602c5d43fdd7a9bddfcfca2cceda750198f760 Mon Sep 17 00:00:00 2001
From: Summer Qin <summer.qin@arm.com>
Date: Sun, 8 Oct 2023 16:44:42 +0800
-Subject: [PATCH 2/4] Crypto: Add psa crypto config link for crypto tests
+Subject: [PATCH 2/5] Crypto: Add psa crypto config link for crypto tests
Test 16 uses macro PSA_EXPORT_KEY_PAIR_MAX_SIZE which is
related with PSA_WANT_KEY_TYPE_xxx_KEY_PAIR_BASIC defines
@@ -26,5 +26,5 @@
+ psa_crypto_config
+)
--
-2.25.1
+2.47.0
diff --git a/tests_psa_arch/fetch_repo/0003-Build-Add-manifest-tool-dependencies.patch b/tests_psa_arch/fetch_repo/0003-Build-Add-manifest-tool-dependencies.patch
index a1078b1..5fcbcb0 100644
--- a/tests_psa_arch/fetch_repo/0003-Build-Add-manifest-tool-dependencies.patch
+++ b/tests_psa_arch/fetch_repo/0003-Build-Add-manifest-tool-dependencies.patch
@@ -1,7 +1,7 @@
-From 25cdea2d26a604383d41feab2981f488ed08f7b6 Mon Sep 17 00:00:00 2001
+From e8150b5c013d01a3ee268e50cd4f83ea86ff7c5b Mon Sep 17 00:00:00 2001
From: Kevin Peng <kevin.peng@arm.com>
Date: Thu, 9 Nov 2023 14:40:48 +0800
-Subject: [PATCH 3/4] Build: Add manifest tool dependencies
+Subject: [PATCH 3/5] Build: Add manifest tool dependencies
Signed-off-by: Kevin Peng <kevin.peng@arm.com>
---
@@ -41,5 +41,5 @@
${CMAKE_CURRENT_BINARY_DIR}
${PSA_ROOT_DIR}/val/common
--
-2.25.1
+2.47.0
diff --git a/tests_psa_arch/fetch_repo/0004-Attest-Use-designated-initializers.patch b/tests_psa_arch/fetch_repo/0004-Attest-Use-designated-initializers.patch
index a4e33a5..3091e48 100644
--- a/tests_psa_arch/fetch_repo/0004-Attest-Use-designated-initializers.patch
+++ b/tests_psa_arch/fetch_repo/0004-Attest-Use-designated-initializers.patch
@@ -1,7 +1,7 @@
-From da03a9320646374d911df2945fdbf2093e72944c Mon Sep 17 00:00:00 2001
+From a7e440e35d42f488adc94fa053dd54bac8c50397 Mon Sep 17 00:00:00 2001
From: Summer Qin <summer.qin@arm.com>
Date: Thu, 9 Nov 2023 14:28:04 +0800
-Subject: [PATCH 4/4] Attest: Use designated initializers.
+Subject: [PATCH 4/5] Attest: Use designated initializers.
Armclang 6.21 reports missing-field-initializers warning for missing
designated initializers. This will be fixed in armclang 6.22.
@@ -210,5 +210,5 @@
0xDF, 0x93, 0x8D, 0xA3, 0xBB, 0x0B, 0xD1, 0x7D,
0x00, 0x36, 0xED, 0x49, 0xA2, 0xD0, 0xFC, 0x3F,
--
-2.25.1
+2.47.0
diff --git a/tests_psa_arch/fetch_repo/0005-Add-rp2350-platform.patch b/tests_psa_arch/fetch_repo/0005-Add-rp2350-platform.patch
index 48aa069..295943e 100644
--- a/tests_psa_arch/fetch_repo/0005-Add-rp2350-platform.patch
+++ b/tests_psa_arch/fetch_repo/0005-Add-rp2350-platform.patch
@@ -1,12 +1,12 @@
-From c847b6f8e482b7785a243bd2560405266201197a Mon Sep 17 00:00:00 2001
+From fb40e180945f17b78cc4c1d95eeb030efc05dcd3 Mon Sep 17 00:00:00 2001
From: Gabor Abonyi <gabor.abonyi@arm.com>
Date: Thu, 8 Aug 2024 15:44:55 +0200
-Subject: [PATCH] Add rp2350 platform
+Subject: [PATCH 5/5] Add rp2350 platform
Change-Id: I50777e655dfecdac7e4cacecbff8459efa4d7a77
Signed-off-by: Gabor Abonyi <gabor.abonyi@arm.com>
---
- .../drivers/watchdog/rpi/pal_wd_rpi.c | 104 +++++
+ .../drivers/watchdog/rpi/pal_wd_rpi.c | 103 +++++
.../drivers/watchdog/rpi/pal_wd_rpi.h | 35 ++
.../nspe/pal_attestation_config.h | 108 +++++
.../tgt_dev_apis_tfm_rp2350/nspe/pal_config.h | 97 +++++
@@ -21,7 +21,7 @@
.../tgt_ff_tfm_rp2350/spe/pal_driver_intf.h | 35 ++
.../targets/tgt_ff_tfm_rp2350/target.cfg | 64 +++
.../targets/tgt_ff_tfm_rp2350/target.cmake | 74 ++++
- 15 files changed, 1767 insertions(+)
+ 15 files changed, 1766 insertions(+)
create mode 100644 api-tests/platform/drivers/watchdog/rpi/pal_wd_rpi.c
create mode 100644 api-tests/platform/drivers/watchdog/rpi/pal_wd_rpi.h
create mode 100644 api-tests/platform/targets/tgt_dev_apis_tfm_rp2350/nspe/pal_attestation_config.h
@@ -40,10 +40,10 @@
diff --git a/api-tests/platform/drivers/watchdog/rpi/pal_wd_rpi.c b/api-tests/platform/drivers/watchdog/rpi/pal_wd_rpi.c
new file mode 100644
-index 0000000..a6bea07
+index 0000000..444480c
--- /dev/null
+++ b/api-tests/platform/drivers/watchdog/rpi/pal_wd_rpi.c
-@@ -0,0 +1,104 @@
+@@ -0,0 +1,103 @@
+/** @file
+ * Copyright (c) 2024, Arm Limited or its affiliates. All rights reserved.
+ * SPDX-License-Identifier : Apache-2.0
@@ -147,7 +147,6 @@
+{
+ return (((wd_timer_t *)base_addr)->CTRL & WATCHDOG_CTRL_ENABLE_BITS ? 1 : 0);
+}
-+
diff --git a/api-tests/platform/drivers/watchdog/rpi/pal_wd_rpi.h b/api-tests/platform/drivers/watchdog/rpi/pal_wd_rpi.h
new file mode 100644
index 0000000..da2f0b8
@@ -1224,7 +1223,7 @@
+#endif /* _PAL_CONFIG_H_ */
diff --git a/api-tests/platform/targets/tgt_ff_tfm_rp2350/nspe/pal_driver_ipc_intf.c b/api-tests/platform/targets/tgt_ff_tfm_rp2350/nspe/pal_driver_ipc_intf.c
new file mode 100644
-index 0000000..dbc87a9
+index 0000000..f2d819f
--- /dev/null
+++ b/api-tests/platform/targets/tgt_ff_tfm_rp2350/nspe/pal_driver_ipc_intf.c
@@ -0,0 +1,338 @@
@@ -1264,7 +1263,7 @@
+#if STATELESS_ROT == 1
+ status_of_call = psa_call(DRIVER_UART_HANDLE, 0, data, 3, NULL, 0);
+ if (status_of_call != PSA_SUCCESS)
-+ return PAL_STATUS_ERROR;
++ return PAL_STATUS_ERROR;
+
+ return PAL_STATUS_SUCCESS;
+#else
@@ -1272,10 +1271,10 @@
+ print_handle = psa_connect(DRIVER_UART_SID, DRIVER_UART_VERSION);
+ if (PSA_HANDLE_IS_VALID(print_handle))
+ {
-+ status_of_call = psa_call(print_handle, 0, data, 3, NULL, 0);
-+ psa_close(print_handle);
-+ if (status_of_call != PSA_SUCCESS)
-+ return PAL_STATUS_ERROR;
++ status_of_call = psa_call(print_handle, 0, data, 3, NULL, 0);
++ psa_close(print_handle);
++ if (status_of_call != PSA_SUCCESS)
++ return PAL_STATUS_ERROR;
+
+ return PAL_STATUS_SUCCESS;
+ }
@@ -1312,7 +1311,7 @@
+#if STATELESS_ROT == 1
+ status_of_call = psa_call(DRIVER_UART_HANDLE, 0, data1, 3, NULL, 0);
+ if (status_of_call != PSA_SUCCESS)
-+ return PAL_STATUS_ERROR;
++ return PAL_STATUS_ERROR;
+
+ return PAL_STATUS_SUCCESS;
+#else
@@ -1355,7 +1354,7 @@
+#if STATELESS_ROT == 1
+ status_of_call = psa_call(DRIVER_WATCHDOG_HANDLE, 0, invec, 1, NULL, 0);
+ if (status_of_call != PSA_SUCCESS)
-+ return PAL_STATUS_ERROR;
++ return PAL_STATUS_ERROR;
+
+ return PAL_STATUS_SUCCESS;
+#else
@@ -1398,7 +1397,7 @@
+#if STATELESS_ROT == 1
+ status_of_call = psa_call(DRIVER_WATCHDOG_HANDLE, 0, invec, 1, NULL, 0);
+ if (status_of_call != PSA_SUCCESS)
-+ return PAL_STATUS_ERROR;
++ return PAL_STATUS_ERROR;
+
+ return PAL_STATUS_SUCCESS;
+#else
@@ -1438,7 +1437,7 @@
+#if STATELESS_ROT == 1
+ status_of_call = psa_call(DRIVER_WATCHDOG_HANDLE, 0, invec, 1, NULL, 0);
+ if (status_of_call != PSA_SUCCESS)
-+ return PAL_STATUS_ERROR;
++ return PAL_STATUS_ERROR;
+
+ return PAL_STATUS_SUCCESS;
+#else
@@ -1484,7 +1483,7 @@
+#if STATELESS_ROT == 1
+ status_of_call = psa_call(DRIVER_NVMEM_HANDLE, 0, invec, 1, outvec, 1);
+ if (status_of_call != PSA_SUCCESS)
-+ return PAL_STATUS_ERROR;
++ return PAL_STATUS_ERROR;
+
+ return PAL_STATUS_SUCCESS;
+#else
@@ -1529,7 +1528,7 @@
+#if STATELESS_ROT == 1
+ status_of_call = psa_call(DRIVER_NVMEM_HANDLE, 0, invec, 2, NULL, 0);
+ if (status_of_call != PSA_SUCCESS)
-+ return PAL_STATUS_ERROR;
++ return PAL_STATUS_ERROR;
+
+ return PAL_STATUS_SUCCESS;
+#else
@@ -1896,5 +1895,5 @@
+ ${PSA_ROOT_DIR}/platform/targets/${TARGET}/nspe
+)
--
-2.40.1
+2.47.0