corstone1000: upgrade TF-A 2.12.1
cover corstone1000: upgrade TF-A 2.12.1
Upgrade Corstone-1000 to TF-A 2.12.1
Remove TF-A 2.11.0 recipes
Clement Faure (3):
arm/tf-a-tests: fix header guard compilation warning arm-bsp/trusted-firmware-a: corstone1000: Upgrade TF-A to 2.12.1 arm-bsp/trusted-firmware-a: corstone1000: remove TF-A 2.11.0 recipe
.../conf/machine/include/corstone1000.inc | 4 +- ...stone1000-pass-spsr-value-explicitly.patch | 32 -- ...0-remove-unused-NS_SHARED_RAM-region.patch | 92 --- ...-clean-the-cache-and-disable-interru.patch | 46 -- ...0-Add-multicore-support-for-FVP-plat.patch | 161 ------ ...one1000-include-platform-header-file.patch | 28 - .../trusted-firmware-a-corstone1000.inc | 11 +- .../trusted-firmware-a_2.11.0.bb | 20 - ...-make-PCIe-tests-default-for-testing.patch | 531 ++++++++++++++++++ .../trusted-firmware-a/tf-a-tests_2.12.0.bb | 1 + 10 files changed, 540 insertions(+), 386 deletions(-) delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0002-fix-corstone1000-pass-spsr-value-explicitly.patch delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0003-fix-corstone1000-remove-unused-NS_SHARED_RAM-region.patch delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0004-fix-corstone1000-clean-the-cache-and-disable-interru.patch delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0005-feat-corstone1000-Add-multicore-support-for-FVP-plat.patch delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0006-feat-corstone1000-include-platform-header-file.patch delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.11.0.bb create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/files/0001-fix-realm-make-PCIe-tests-default-for-testing.patch
PATCH 1/3 arm/tf-a-tests: fix header guard compilation warning
From: Clément Faure <[email protected]>
Backport patch to fix the following compilation issue:
| In file included from tftf/tests/runtime_services/realm_payload/host_realm_payload_simd_tests.c:21: | tftf/tests/runtime_services/realm_payload/host_realm_simd_common.h:6: error: header guard 'HOST_REALM_COMMON_H' followed by '#define' of a different macro [-Werror=header-guard] | 6 | #ifndef HOST_REALM_COMMON_H | tftf/tests/runtime_services/realm_payload/host_realm_simd_common.h:7: note: 'HOST_REALM_COMMON_h' is defined here; did you mean 'HOST_REALM_COMMON_H'? | 7 | #define HOST_REALM_COMMON_h | In file included from tftf/tests/runtime_services/realm_payload/host_realm_simd_common.c:13: | tftf/tests/runtime_services/realm_payload/host_realm_simd_common.h:6: error: header guard 'HOST_REALM_COMMON_H' followed by '#define' of a different macro [-Werror=header-guard] | 6 | #ifndef HOST_REALM_COMMON_H | tftf/tests/runtime_services/realm_payload/host_realm_simd_common.h:7: note: 'HOST_REALM_COMMON_h' is defined here; did you mean 'HOST_REALM_COMMON_H'? | 7 | #define HOST_REALM_COMMON_h | CC tftf/tests/runtime_services/secure_service/spm_test_helpers.c | In file included from tftf/tests/runtime_services/realm_payload/host_realm_spm.c:20: | tftf/tests/runtime_services/realm_payload/host_realm_simd_common.h:6: error: header guard 'HOST_REALM_COMMON_H' followed by '#define' of a different macro [-Werror=header-guard] | 6 | #ifndef HOST_REALM_COMMON_H | tftf/tests/runtime_services/realm_payload/host_realm_simd_common.h:7: note: 'HOST_REALM_COMMON_h' is defined here; did you mean 'HOST_REALM_COMMON_H'? | 7 | #define HOST_REALM_COMMON_h | cc1: all warnings being treated as errors | make: *** [Makefile:605: workspace/corstone1000/build/tmp/work/cortexa35-poky-linux-musl/tf-a-tests/2.12.0/build/corstone1000/release/tftf/host_realm_simd_common.o] Error 1 | make: *** Waiting for unfinished jobs.... | cc1: all warnings being treated as errors | make: *** [Makefile:605: workspace/corstone1000/build/tmp/work/cortexa35-poky-linux-musl/tf-a-tests/2.12.0/build/corstone1000/release/tftf/host_realm_spm.o] Error 1 | cc1: all warnings being treated as errors | make: *** [Makefile:605: workspace/corstone1000/build/tmp/work/cortexa35-poky-linux-musl/tf-a-tests/2.12.0/build/corstone1000/release/tftf/host_realm_payload_simd_tests.o] Error 1 | make: Leaving directory 'workspace/corstone1000/build/tmp/work/cortexa35-poky-linux-musl/tf-a-tests/2.12.0/git'
--- ...-make-PCIe-tests-default-for-testing.patch | 531 ++++++++++++++++++ .../trusted-firmware-a/tf-a-tests_2.12.0.bb | 1 + 2 files changed, 532 insertions(+) create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/files/0001-fix-realm-make-PCIe-tests-default-for-testing.patch
meta-arm/recipes-bsp/trusted-firmware-a/files/0001-fix-realm-make-PCIe-tests-default-for-testing.patch new file +531 -0
@@ -0,0 +1,531 @@ +From f5c206b8d9019d8112e55ac8da1936c79c7d2ce7 Mon Sep 17 00:00:00 2001 +From: Soby Mathew <[email protected]> +Date: Fri, 15 Nov 2024 17:11:24 +0000 +Subject: [PATCH] fix(realm): make PCIe tests default for testing + +This patch moves the PCIe DOE test to the default realm world +testsuite. + +Also fixes some build issues and hardens the PCIe functions. + +Note that FVP_Base_RevC model needs to have the following +options enabled for the PCIe tests to work : + + -C pci.pcie_rc.ahci0.endpoint.doe_supported=1 + -C pci.pcie_rc.ahci0.endpoint.ide_supported=1 + +Change-Id: Icfd6b68799b0bacb44299c6a3cf99a3c425f833d +Signed-off-by: Soby Mathew <[email protected]> +Upstream-Status: Backport [2c2810f79e57e78d77899084b5439cbdd1aaa464] +--- + docs/porting/optional-mods.rst | 12 ++++++ + include/lib/pcie/pcie.h | 9 ++-- + include/plat/common/platform.h | 10 ++++- + lib/pcie/pcie.c | 41 ++++++++++++++----- + plat/arm/fvp/fvp_pcie.c | 4 +- + plat/arm/fvp/include/platform_pcie.h | 2 - + plat/arm/fvp/plat_setup.c | 2 - + plat/arm/fvp/platform.mk | 9 ++-- + plat/common/plat_common.c | 8 +++- + tftf/tests/doe_tests/doe_helpers.c | 11 +++-- + tftf/tests/doe_tests/doe_helpers.h | 2 + + tftf/tests/doe_tests/test_doe.c | 9 +++- + .../realm_payload/host_realm_simd_common.h | 2 +- + tftf/tests/tests-pcie-doe.mk | 22 ---------- + tftf/tests/tests-pcie-doe.xml | 14 ------- + tftf/tests/tests-realm-payload.mk | 14 ++++++- + tftf/tests/tests-realm-payload.xml | 7 +++- + 17 files changed, 105 insertions(+), 73 deletions(-) + delete mode 100644 tftf/tests/tests-pcie-doe.mk + delete mode 100644 tftf/tests/tests-pcie-doe.xml + +diff --git a/docs/porting/optional-mods.rst b/docs/porting/optional-mods.rst +index a88d682..7fc3813 100644 +--- a/docs/porting/optional-mods.rst ++++ b/docs/porting/optional-mods.rst +@@ -50,6 +50,18 @@ The default implementation uses the ARM watchdog peripheral (`SP805`_) to + generate a watchdog timeout interrupt. This interrupt remains deliberately + unserviced, which eventually asserts the reset signal. + ++Function : plat_pcie_get_info_table() ++---------------------------- ++ ++:: ++ ++ Argument : void ++ Return : struct pcie_info_table * ++ ++This function returns the pointer to `pcie_info_table` structure ++correponding to the platform. This needs to be implemented ++only if the platform want to run PCIe related tests. ++ + -------------- + + *Copyright (c) 2019, Arm Limited. All rights reserved.* +diff --git a/include/lib/pcie/pcie.h b/include/lib/pcie/pcie.h +index aa3911f..3ce6986 100644 +--- a/include/lib/pcie/pcie.h ++++ b/include/lib/pcie/pcie.h +@@ -11,6 +11,9 @@ + #include <stdint.h> + #include <utils_def.h> + ++/* platforms need to ensure that number of entries is less that this value */ ++#define MAX_PCIE_INFO_ENTRIES 5 ++ + typedef struct { + unsigned long ecam_base; /* ECAM base address */ + unsigned int segment_num; /* Segment number of this ECAM */ +@@ -18,10 +21,10 @@ typedef struct { + unsigned int end_bus_num; /* Last bus number */ + } pcie_info_block_t; + +-typedef struct { ++struct pcie_info_table{ + unsigned int num_entries; /* Number of entries */ +- pcie_info_block_t block[]; +-} pcie_info_table_t; ++ pcie_info_block_t block[MAX_PCIE_INFO_ENTRIES]; ++}; + + typedef struct { + uint32_t bdf; +diff --git a/include/plat/common/platform.h b/include/plat/common/platform.h +index c8b785c..1a51823 100644 +--- a/include/plat/common/platform.h ++++ b/include/plat/common/platform.h +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2018-2019, Arm Limited. All rights reserved. ++ * Copyright (c) 2018-2024, Arm Limited. All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +@@ -193,4 +193,12 @@ static inline uint32_t get_current_core_id(void) + return platform_get_core_pos(read_mpidr_el1() & MPID_MASK); + } + ++/* Forward declaration */ ++struct pcie_info_table; ++ ++/* ++ * Retrieve platform PCIe information. ++ */ ++const struct pcie_info_table *plat_pcie_get_info_table(void); ++ + #endif /* __PLATFORM_H__ */ +diff --git a/lib/pcie/pcie.c b/lib/pcie/pcie.c +index c3906d5..5f8c97f 100644 +--- a/lib/pcie/pcie.c ++++ b/lib/pcie/pcie.c +@@ -11,13 +11,12 @@ + #include <mmio.h> + #include <pcie.h> + #include <pcie_spec.h> ++#include <platform.h> + #include <tftf_lib.h> + +-#include <platform_pcie.h> +- + #define PCIE_DEBUG VERBOSE + +-const pcie_info_table_t *g_pcie_info_table; ++const struct pcie_info_table *g_pcie_info_table; + pcie_device_bdf_table_t *g_pcie_bdf_table; + + pcie_device_bdf_table_t pcie_bdf_table[PCIE_DEVICE_BDF_TABLE_SZ]; +@@ -256,6 +255,8 @@ uint32_t pcie_get_rootport(uint32_t bdf, uint32_t *rp_bdf) + return 1; + } + ++ assert(g_pcie_bdf_table != NULL); ++ + while (index < g_pcie_bdf_table->num_entries) { + *rp_bdf = g_pcie_bdf_table->device[index++].bdf; + +@@ -294,6 +295,8 @@ static uint32_t pcie_populate_device_rootport(void) + uint32_t bdf, rp_bdf; + pcie_device_bdf_table_t *bdf_tbl_ptr = g_pcie_bdf_table; + ++ assert(bdf_tbl_ptr != NULL); ++ + for (unsigned int tbl_index = 0; tbl_index < bdf_tbl_ptr->num_entries; + tbl_index++) { + bdf = bdf_tbl_ptr->device[tbl_index].bdf; +@@ -317,6 +320,8 @@ static uint32_t pcie_populate_device_rootport(void) + */ + pcie_device_bdf_table_t *pcie_get_bdf_table(void) + { ++ assert(g_pcie_bdf_table != NULL); ++ + return g_pcie_bdf_table; + } + +@@ -336,6 +341,8 @@ void pcie_create_device_bdf_table(void) + assert(g_pcie_bdf_table != NULL); + + g_pcie_bdf_table->num_entries = 0; ++ ++ assert(g_pcie_info_table != NULL); + assert(g_pcie_info_table->num_entries != 0); + + for (ecam_index = 0; ecam_index < g_pcie_info_table->num_entries; ecam_index++) { +@@ -420,6 +427,8 @@ uintptr_t pcie_get_ecam_base(uint32_t bdf) + uint32_t reg_value; + uintptr_t ecam_base = 0; + ++ assert(g_pcie_info_table != NULL); ++ + while (ecam_index < g_pcie_info_table->num_entries) { + /* Derive ECAM specific information */ + const pcie_info_block_t *block = &g_pcie_info_table->block[ecam_index]; +@@ -462,13 +471,15 @@ void pcie_print_device_info(void) + uint32_t ecam_index = 0; + uint32_t ecam_base, ecam_start_bus, ecam_end_bus; + pcie_device_bdf_table_t *bdf_tbl_ptr = g_pcie_bdf_table; +- uint32_t num_rciep = 0, num_rcec = 0; +- uint32_t num_iep = 0, num_irp = 0; +- uint32_t num_ep = 0, num_rp = 0; +- uint32_t num_dp = 0, num_up = 0; +- uint32_t num_pcie_pci = 0, num_pci_pcie = 0; ++ uint32_t num_rciep __unused = 0, num_rcec __unused = 0; ++ uint32_t num_iep __unused = 0, num_irp __unused = 0; ++ uint32_t num_ep __unused = 0, num_rp __unused = 0; ++ uint32_t num_dp __unused = 0, num_up __unused = 0; ++ uint32_t num_pcie_pci __unused = 0, num_pci_pcie __unused = 0; + uint32_t bdf_counter; + ++ assert(bdf_tbl_ptr != NULL); ++ + if (bdf_tbl_ptr->num_entries == 0) { + INFO("BDF Table: No RCiEP or iEP found\n"); + return; +@@ -525,6 +536,8 @@ void pcie_print_device_info(void) + INFO("Number of PCI/PCIe Bridge: %u\n", num_pci_pcie); + INFO("Number of PCIe/PCI Bridge: %u\n", num_pcie_pci); + ++ assert(g_pcie_info_table != NULL); ++ + while (ecam_index < g_pcie_info_table->num_entries) { + + /* Derive ECAM specific information */ +@@ -540,7 +553,7 @@ void pcie_print_device_info(void) + + while (tbl_index < bdf_tbl_ptr->num_entries) { + uint32_t seg_num, bus_num, dev_num, func_num; +- uint32_t device_id, vendor_id, reg_value; ++ uint32_t device_id __unused, vendor_id __unused, reg_value; + uint32_t bdf, dev_ecam_base; + + bdf = bdf_tbl_ptr->device[tbl_index++].bdf; +@@ -588,12 +601,18 @@ void pcie_create_info_table(void) + INFO("Creating PCIe info table\n"); + + g_pcie_info_table = plat_pcie_get_info_table(); ++ if (g_pcie_info_table == NULL) { ++ ERROR("PCIe info not returned by platform\n"); ++ panic(); ++ } ++ + g_pcie_bdf_table = pcie_bdf_table; + + num_ecam = g_pcie_info_table->num_entries; + INFO("Number of ECAM regions : %u\n", num_ecam); +- if (num_ecam == 0) { +- return; ++ if ((num_ecam == 0) || (num_ecam > MAX_PCIE_INFO_ENTRIES)) { ++ ERROR("PCIe info entries invalid\n"); ++ panic(); + } + pcie_create_device_bdf_table(); + pcie_print_device_info(); +diff --git a/plat/arm/fvp/fvp_pcie.c b/plat/arm/fvp/fvp_pcie.c +index 0569832..c43e42d 100644 +--- a/plat/arm/fvp/fvp_pcie.c ++++ b/plat/arm/fvp/fvp_pcie.c +@@ -11,7 +11,7 @@ + + CASSERT(PLATFORM_NUM_ECAM != 0, PLATFORM_NUM_ECAM_is_zero); + +-const pcie_info_table_t fvp_pcie_cfg = { ++const struct pcie_info_table fvp_pcie_cfg = { + .num_entries = PLATFORM_NUM_ECAM, + .block[0] = { + PLATFORM_PCIE_ECAM_BASE_ADDR_0, +@@ -21,7 +21,7 @@ const pcie_info_table_t fvp_pcie_cfg = { + } + }; + +-const pcie_info_table_t *plat_pcie_get_info_table(void) ++const struct pcie_info_table *plat_pcie_get_info_table(void) + { + return &fvp_pcie_cfg; + } +diff --git a/plat/arm/fvp/include/platform_pcie.h b/plat/arm/fvp/include/platform_pcie.h +index c76c7d9..4b3a0e9 100644 +--- a/plat/arm/fvp/include/platform_pcie.h ++++ b/plat/arm/fvp/include/platform_pcie.h +@@ -19,6 +19,4 @@ + #define PLATFORM_PCIE_START_BUS_NUM_0 0x0 + #define PLATFORM_PCIE_END_BUS_NUM_0 0xFF + +-const pcie_info_table_t *plat_pcie_get_info_table(void); +- + #endif /* PLATFORM_PCIE_H */ +diff --git a/plat/arm/fvp/plat_setup.c b/plat/arm/fvp/plat_setup.c +index e6e4244..69cb0a1 100644 +--- a/plat/arm/fvp/plat_setup.c ++++ b/plat/arm/fvp/plat_setup.c +@@ -35,9 +35,7 @@ static const mmap_region_t mmap[] = { + #if USE_NVM + MAP_REGION_FLAT(FLASH_BASE, FLASH_SIZE, MT_DEVICE | MT_RW | MT_NS), + #endif +-#if USE_PCIE + MAP_REGION_FLAT(PCIE_CONFIG_BASE, PCIE_CONFIG_SIZE, MT_DEVICE | MT_RW | MT_NS), +-#endif + MAP_REGION_FLAT(DRAM_BASE, TFTF_BASE - DRAM_BASE, MT_MEMORY | MT_RW | MT_NS), + {0} + }; +diff --git a/plat/arm/fvp/platform.mk b/plat/arm/fvp/platform.mk +index 7a2850f..ee30721 100644 +--- a/plat/arm/fvp/platform.mk ++++ b/plat/arm/fvp/platform.mk +@@ -90,12 +90,8 @@ $(eval $(call add_define,NS_BL2U_DEFINES,PA_SIZE)) + $(eval $(call add_define,TFTF_DEFINES,PA_SIZE)) + $(eval $(call add_define,REALM_DEFINES,PA_SIZE)) + +-ifeq ($(TESTS),pcie-doe) +-USE_PCIE=1 +-$(eval $(call add_define,TFTF_DEFINES,USE_PCIE)) +-endif +- +-PLAT_INCLUDES += -Iplat/arm/fvp/include/ ++PLAT_INCLUDES += -Iplat/arm/fvp/include/ \ ++ -Iinclude/lib/pcie/ + + PLAT_SOURCES := drivers/arm/gic/arm_gic_v2v3.c \ + drivers/arm/gic/gic_v2.c \ +@@ -104,6 +100,7 @@ PLAT_SOURCES := drivers/arm/gic/arm_gic_v2v3.c \ + drivers/arm/timer/private_timer.c \ + drivers/arm/timer/system_timer.c \ + plat/arm/fvp/${ARCH}/plat_helpers.S \ ++ plat/arm/fvp/fvp_pcie.c \ + plat/arm/fvp/fvp_pwr_state.c \ + plat/arm/fvp/fvp_topology.c \ + plat/arm/fvp/fvp_mem_prot.c \ +diff --git a/plat/common/plat_common.c b/plat/common/plat_common.c +index c43ae12..a4195c3 100644 +--- a/plat/common/plat_common.c ++++ b/plat/common/plat_common.c +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2018-2020, Arm Limited. All rights reserved. ++ * Copyright (c) 2018-2024, Arm Limited. All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +@@ -24,6 +24,7 @@ + #pragma weak tftf_plat_enable_mmu + #pragma weak tftf_plat_reset + #pragma weak plat_get_prot_regions ++#pragma weak plat_pcie_get_info_table + + #if IMAGE_TFTF + +@@ -148,3 +149,8 @@ const mem_region_t *plat_get_prot_regions(int *nelem) + *nelem = 0; + return NULL; + } ++ ++const struct pcie_info_table *plat_pcie_get_info_table(void) ++{ ++ return NULL; ++} +diff --git a/tftf/tests/doe_tests/doe_helpers.c b/tftf/tests/doe_tests/doe_helpers.c +index 28b6a86..911fbd0 100644 +--- a/tftf/tests/doe_tests/doe_helpers.c ++++ b/tftf/tests/doe_tests/doe_helpers.c +@@ -13,12 +13,15 @@ + #include <pcie_doe.h> + #include <spdm.h> + +-#include <platform_pcie.h> +- + void pcie_init(void) + { ++ static bool is_init; ++ + /* Create PCIe table and enumeration */ +- pcie_create_info_table(); ++ if (!is_init) { ++ pcie_create_info_table(); ++ is_init = true; ++ } + } + + /* +@@ -113,7 +116,7 @@ int get_spdm_version(uint32_t bdf, uint32_t doe_cap_base) + sizeof(ver_resp->version_number_entry_count)); + + while (entry_count-- != 0) { +- spdm_version_number_t ver = *ver_ptr++; ++ spdm_version_number_t ver __unused = *ver_ptr++; + + INFO("SPDM v%llu.%llu.%llu.%llu\n", + EXTRACT(SPDM_VER_MAJOR, ver), +diff --git a/tftf/tests/doe_tests/doe_helpers.h b/tftf/tests/doe_tests/doe_helpers.h +index 08137e3..d0fc5c8 100644 +--- a/tftf/tests/doe_tests/doe_helpers.h ++++ b/tftf/tests/doe_tests/doe_helpers.h +@@ -8,6 +8,8 @@ + #ifndef DOE_HELPERS_H + #define DOE_HELPERS_H + ++#include <stdint.h> ++ + void pcie_init(void); + int find_doe_device(uint32_t *bdf_ptr, uint32_t *cap_base_ptr); + int doe_discovery(uint32_t bdf, uint32_t doe_cap_base); +diff --git a/tftf/tests/doe_tests/test_doe.c b/tftf/tests/doe_tests/test_doe.c +index 6eb5079..cc852fa 100644 +--- a/tftf/tests/doe_tests/test_doe.c ++++ b/tftf/tests/doe_tests/test_doe.c +@@ -10,6 +10,13 @@ + + #define SKIP_TEST_IF_DOE_NOT_SUPPORTED() \ + do { \ ++ /* Test PCIe DOE only for RME */ \ ++ if (!get_armv9_2_feat_rme_support()) { \ ++ tftf_testcase_printf("FEAT_RME not supported\n"); \ ++ return TEST_RESULT_SKIPPED; \ ++ } \ ++ \ ++ pcie_init(); \ + if (find_doe_device(&bdf, &doe_cap_base) != 0) { \ + tftf_testcase_printf("PCIe DOE not supported\n"); \ + return TEST_RESULT_SKIPPED; \ +@@ -21,8 +28,6 @@ test_result_t doe_discovery_test(void) + uint32_t bdf, doe_cap_base; + int ret; + +- pcie_init(); +- + SKIP_TEST_IF_DOE_NOT_SUPPORTED(); + + ret = doe_discovery(bdf, doe_cap_base); +diff --git a/tftf/tests/runtime_services/realm_payload/host_realm_simd_common.h b/tftf/tests/runtime_services/realm_payload/host_realm_simd_common.h +index 377c85b..6ab45c3 100644 +--- a/tftf/tests/runtime_services/realm_payload/host_realm_simd_common.h ++++ b/tftf/tests/runtime_services/realm_payload/host_realm_simd_common.h +@@ -4,7 +4,7 @@ + */ + + #ifndef HOST_REALM_COMMON_H +-#define HOST_REALM_COMMON_h ++#define HOST_REALM_COMMON_H + + #define NS_NORMAL_SVE 0x1U + #define NS_STREAMING_SVE 0x2U +diff --git a/tftf/tests/tests-pcie-doe.mk b/tftf/tests/tests-pcie-doe.mk +deleted file mode 100644 +index 14bc9cf..0000000 +--- a/tftf/tests/tests-pcie-doe.mk ++++ /dev/null +@@ -1,22 +0,0 @@ +-# +-# Copyright (c) 2024, Arm Limited. All rights reserved. +-# +-# SPDX-License-Identifier: BSD-3-Clause +-# +- +-TESTS_SOURCES += \ +- $(addprefix plat/arm/fvp/, \ +- fvp_pcie.c \ +- ) +- +-TESTS_SOURCES += \ +- $(addprefix tftf/tests/doe_tests/, \ +- doe_helpers.c \ +- test_doe.c \ +- ) +- +-TESTS_SOURCES += \ +- $(addprefix lib/pcie/, \ +- pcie.c \ +- pcie_doe.c \ +- ) +diff --git a/tftf/tests/tests-pcie-doe.xml b/tftf/tests/tests-pcie-doe.xml +deleted file mode 100644 +index ed8b7cb..0000000 +--- a/tftf/tests/tests-pcie-doe.xml ++++ /dev/null +@@ -1,14 +0,0 @@ +-<?xml version="1.0" encoding="utf-8"?> +- +-<!-- +- Copyright (c) 2024, Arm Limited. All rights reserved. +- +- SPDX-License-Identifier: BSD-3-Clause +---> +- +-<testsuites> +- <testsuite name="PCI Data Object Exchange" description="Check PCI DOE support"> +- <testcase name="PCI DOE Discovery" function="doe_discovery_test" /> +- <testcase name="SPDM Get Version" function="spdm_version_test" /> +- </testsuite> +-</testsuites> +diff --git a/tftf/tests/tests-realm-payload.mk b/tftf/tests/tests-realm-payload.mk +index ae4b20a..4da8e3e 100644 +--- a/tftf/tests/tests-realm-payload.mk ++++ b/tftf/tests/tests-realm-payload.mk +@@ -1,5 +1,5 @@ + # +-# Copyright (c) 2021-2023, Arm Limited. All rights reserved. ++# Copyright (c) 2021-2024, Arm Limited. All rights reserved. + # + # SPDX-License-Identifier: BSD-3-Clause + # +@@ -44,4 +44,16 @@ TESTS_SOURCES += \ + $(addprefix lib/extensions/fpu/, \ + fpu.c \ + ) ++ ++TESTS_SOURCES += \ ++ $(addprefix tftf/tests/doe_tests/, \ ++ doe_helpers.c \ ++ test_doe.c \ ++ ) ++ ++TESTS_SOURCES += \ ++ $(addprefix lib/pcie/, \ ++ pcie.c \ ++ pcie_doe.c \ ++ ) + endif +diff --git a/tftf/tests/tests-realm-payload.xml b/tftf/tests/tests-realm-payload.xml +index 3c0dda4..d99a6b9 100644 +--- a/tftf/tests/tests-realm-payload.xml ++++ b/tftf/tests/tests-realm-payload.xml +@@ -1,7 +1,7 @@ + <?xml version="1.0" encoding="utf-8"?> + + <!-- +- Copyright (c) 2021-2023, Arm Limited. All rights reserved. ++ Copyright (c) 2021-2024, Arm Limited. All rights reserved. + + SPDX-License-Identifier: BSD-3-Clause + --> +@@ -126,5 +126,10 @@ + function="host_test_non_lpa2_realm_on_lpa2plat" /> + <testcase name="Test Realm creation with LPA2 enabled but FEAT_LPA2 absent on platform" + function="host_test_lpa2_realm_on_non_lpa2plat" /> ++ <!-- Test case related to PCIE-DOE --> ++ <testcase name="PCI DOE Discovery" ++ function="doe_discovery_test" /> ++ <testcase name="SPDM Get Version" ++ function="spdm_version_test" /> + </testsuite> + </testsuites> +-- +2.34.1 +
meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.12.0.bb +1 -0
@@ -9,6 +9,7 @@ COMPATIBLE_MACHINE ?= "invalid" SRC_URI_TRUSTED_FIRMWARE_A_TESTS ?= "git://git.trustedfirmware.org/TF-A/tf-a-tests.git;protocol=https" SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A_TESTS};branch=${SRCBRANCH} \ + file://0001-fix-realm-make-PCIe-tests-default-for-testing.patch \ " SRCBRANCH = "master" SRCREV = "6a113621a9efdc143e9270b1789046cd7d9cdfb1"
PATCH 2/3 arm-bsp/trusted-firmware-a: corstone1000: Upgrade TF-A to 2.12.1
In reply to Clement FaureFrom: Clément Faure <[email protected]>
Upgrade trusted-firmware-a to 2.12.1 for Corstone-1000
When GENERATE_COT is enabled, use the Yocto dependency cot-dt2c instead of installing it with Poetry.
--- meta-arm-bsp/conf/machine/include/corstone1000.inc | 4 ++-- .../trusted-firmware-a/trusted-firmware-a-corstone1000.inc | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-)
meta-arm-bsp/conf/machine/include/corstone1000.inc +2 -2
@@ -7,8 +7,8 @@ PREFERRED_VERSION_trusted-firmware-m ?= "2.1.%" # TF-A TFA_PLATFORM = "corstone1000" -PREFERRED_VERSION_trusted-firmware-a ?= "2.11.%" -PREFERRED_VERSION_tf-a-tests ?= "2.10.%" +PREFERRED_VERSION_trusted-firmware-a ?= "2.12.%" +PREFERRED_VERSION_tf-a-tests ?= "2.12.%" TFA_BL2_BINARY = "bl2-corstone1000.bin" TFA_FIP_BINARY = "fip-corstone1000.bin"
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone1000.inc +6 -0
@@ -56,3 +56,9 @@ EXTRA_OEMAKE:append = " \ FVP_USE_GIC_DRIVER=FVP_GICV2 \ " EXTRA_OEMAKE:append:corstone1000-fvp = "${@bb.utils.contains('MACHINE_FEATURES', 'corstone1000_fvp_smp', ' ENABLE_MULTICORE=1', '', d)}" + +# If GENERATE_COT is set, then TF-A will try to use local poetry install +# to run the python cot-dt2c command. Disable the local poetry and use +# the provided cot-dt2c. +EXTRA_OEMAKE += "POETRY=''" +DEPENDS += "cot-dt2c-native"
PATCH 3/3 arm-bsp/trusted-firmware-a: corstone1000: remove TF-A 2.11.0 recipe
In reply to Clement FaureFrom: Clément Faure <[email protected]>
Remove TF-A 2.11.0 Yocto recipe.
Remove patches that are now upstreamed in TF-A 2.12
--- ...stone1000-pass-spsr-value-explicitly.patch | 32 ---- ...0-remove-unused-NS_SHARED_RAM-region.patch | 92 ---------- ...-clean-the-cache-and-disable-interru.patch | 46 ----- ...0-Add-multicore-support-for-FVP-plat.patch | 161 ------------------ ...one1000-include-platform-header-file.patch | 28 --- .../trusted-firmware-a-corstone1000.inc | 5 - .../trusted-firmware-a_2.11.0.bb | 20 --- 7 files changed, 384 deletions(-) delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0002-fix-corstone1000-pass-spsr-value-explicitly.patch delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0003-fix-corstone1000-remove-unused-NS_SHARED_RAM-region.patch delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0004-fix-corstone1000-clean-the-cache-and-disable-interru.patch delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0005-feat-corstone1000-Add-multicore-support-for-FVP-plat.patch delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0006-feat-corstone1000-include-platform-header-file.patch delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.11.0.bb
meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0002-fix-corstone1000-pass-spsr-value-explicitly.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From d70a07562d3b0a7b4441922fd3ce136565927d04 Mon Sep 17 00:00:00 2001 -From: Emekcan Aras <[email protected]> -Date: Wed, 21 Feb 2024 07:57:36 +0000 -Subject: [PATCH] fix(corstone1000): pass spsr value explicitly - -Passes spsr value for BL32 (OPTEE) explicitly between different boot -stages. - -Upstream-Status: Submitted [https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/30116/2] -Signed-off-by: Emekcan Aras <[email protected]> ---- - .../corstone1000/common/corstone1000_bl2_mem_params_desc.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/plat/arm/board/corstone1000/common/corstone1000_bl2_mem_params_desc.c b/plat/arm/board/corstone1000/common/corstone1000_bl2_mem_params_desc.c -index fe521a9fa..2cc096f38 100644 ---- a/plat/arm/board/corstone1000/common/corstone1000_bl2_mem_params_desc.c -+++ b/plat/arm/board/corstone1000/common/corstone1000_bl2_mem_params_desc.c -@@ -72,7 +72,8 @@ static bl_mem_params_node_t bl2_mem_params_descs[] = { - SET_STATIC_PARAM_HEAD(ep_info, PARAM_EP, - VERSION_2, entry_point_info_t, NON_SECURE | EXECUTABLE), - .ep_info.pc = BL33_BASE, -- -+ .ep_info.spsr = SPSR_64(MODE_EL2, MODE_SP_ELX, -+ DISABLE_ALL_EXCEPTIONS), - SET_STATIC_PARAM_HEAD(image_info, PARAM_EP, - VERSION_2, image_info_t, 0), - .image_info.image_base = BL33_BASE, --- -2.25.1 - -
meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0003-fix-corstone1000-remove-unused-NS_SHARED_RAM-region.patch deleted +0 -92
92 lines not on this page · raw message
meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0004-fix-corstone1000-clean-the-cache-and-disable-interru.patch deleted +0 -46
46 lines not on this page · raw message
meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0005-feat-corstone1000-Add-multicore-support-for-FVP-plat.patch deleted +0 -161
161 lines not on this page · raw message
meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0006-feat-corstone1000-include-platform-header-file.patch deleted +0 -28
@@ -1,28 +0,0 @@ -From 8070bf4a89492727b6da3fb7bdec61748eae1d7d Mon Sep 17 00:00:00 2001 -From: Harsimran Singh Tungal <[email protected]> -Date: Tue, 2 Jul 2024 12:49:12 +0000 -Subject: [PATCH] fix(corstone1000): include platform header file - -Include platform.h file in order to remove compiler warnings - -Upstream-Status: Submitted [https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/29727] -Signed-off-by: Harsimran Singh Tungal <[email protected]> ---- - plat/arm/board/corstone1000/common/corstone1000_pm.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/plat/arm/board/corstone1000/common/corstone1000_pm.c b/plat/arm/board/corstone1000/common/corstone1000_pm.c -index 979243317..9babe5b11 100644 ---- a/plat/arm/board/corstone1000/common/corstone1000_pm.c -+++ b/plat/arm/board/corstone1000/common/corstone1000_pm.c -@@ -8,6 +8,7 @@ - #include <plat/arm/common/plat_arm.h> - #include <platform_def.h> - #include <drivers/arm/gicv2.h> -+#include <plat/common/platform.h> - /******************************************************************************* - * Export the platform handlers via plat_arm_psci_pm_ops. The ARM Standard - * platform layer will take care of registering the handlers with PSCI. --- -2.34.1 -
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone1000.inc +0 -5
@@ -5,11 +5,6 @@ COMPATIBLE_MACHINE = "(corstone1000)" FILESEXTRAPATHS:prepend := "${THISDIR}/files/corstone1000:" SRC_URI:append = " \ file://0001-Fix-FF-A-version-in-SPMC-manifest.patch \ - file://0002-fix-corstone1000-pass-spsr-value-explicitly.patch \ - file://0003-fix-corstone1000-remove-unused-NS_SHARED_RAM-region.patch \ - file://0004-fix-corstone1000-clean-the-cache-and-disable-interru.patch \ - file://0005-feat-corstone1000-Add-multicore-support-for-FVP-plat.patch \ - file://0006-feat-corstone1000-include-platform-header-file.patch \ " TFA_DEBUG = "1"
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.11.0.bb deleted +0 -20
@@ -1,20 +0,0 @@ -require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc - -# TF-A v2.11.0 -SRCREV_tfa = "f2735ebccf5173f74c0458736ec526276106097e" -SRCBRANCH = "master" - -LIC_FILES_CHKSUM += "file://docs/license.rst;md5=b5fbfdeb6855162dded31fadcd5d4dc5" - -# in TF-A src, docs/getting_started/prerequisites.rst lists the expected version mbedtls -# mbedtls-3.6.0 -SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=main" -SRCREV_mbedtls = "2ca6c285a0dd3f33982dd57299012dacab1ff206" - -LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" - -# continue to boot also without TPM -SRC_URI += "\ - file://0001-qemu_measured_boot.c-ignore-TPM-error-and-continue-w.patch \ - file://0001-fix-zynqmp-handle-secure-SGI-at-EL1-for-OP-TEE.patch \ -"
Jon Mason
AppliedQuoted 9 lines · Clement Faure
Upgrade Corstone-1000 to TF-A 2.12.1
Remove TF-A 2.11.0 recipesClement Faure (3):
arm/tf-a-tests: fix header guard compilation warning arm-bsp/trusted-firmware-a: corstone1000: Upgrade TF-A to 2.12.1 arm-bsp/trusted-firmware-a: corstone1000: remove TF-A 2.11.0 recipe[...]
Applied, thanks!
[1/3] arm/tf-a-tests: fix header guard compilation warning
commit: 6478eca548573cd32675791de728245e6d8deeed
[2/3] arm-bsp/trusted-firmware-a: corstone1000: Upgrade TF-A to 2.12.1
commit: da4ea26f60813cfb814164781c4186306c8bd445
[3/3] arm-bsp/trusted-firmware-a: corstone1000: remove TF-A 2.11.0 recipe
commit: ee74646ce8ce44e309fe08958dc9cec1b372d2d6Best regards,
Signature · 1 line
Jon Mason <[email protected]>