Merge "refactor(errata_abi): add Cortex-X925 and update Cortex-X4"
diff --git a/tftf/tests/runtime_services/standard_service/errata_abi/api_tests/test_errata_abi_functionality.c b/tftf/tests/runtime_services/standard_service/errata_abi/api_tests/test_errata_abi_functionality.c
index 0baf471..91e5307 100644
--- a/tftf/tests/runtime_services/standard_service/errata_abi/api_tests/test_errata_abi_functionality.c
+++ b/tftf/tests/runtime_services/standard_service/errata_abi/api_tests/test_errata_abi_functionality.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023-2024, Arm Limited. All rights reserved.
+ * Copyright (c) 2023-2025, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -387,7 +387,23 @@
em_cpu_t cortex_X4_errata_list = {
.cpu_pn = 0xD82,
.cpu_errata = {
- {2701112, 0x00, 0x00},
+ {2726228, 0x00, 0x01},
+ {2740089, 0x00, 0x01},
+ {2763018, 0x00, 0x01},
+ {2816013, 0x00, 0x01},
+ {2897503, 0x00, 0x01},
+ {2923985, 0x00, 0x01},
+ {2957258, 0x00, 0x01},
+ {3076789, 0x00, 0x01},
+ {-1}
+ },
+};
+
+em_cpu_t cortex_X925_errata_list = {
+ .cpu_pn = 0xD85,
+ .cpu_errata = {
+ {2963999, 0x00, 0x00},
+ {3701747, 0x00, 0x01},
{-1}
},
};
@@ -631,6 +647,12 @@
cpu_ptr = &cortex_X4_errata_list;
break;
}
+ case 0xD85:
+ {
+ VERBOSE("MIDR matches Cortex-X925 -> %x\n", midr_val);
+ cpu_ptr = &cortex_X925_errata_list;
+ break;
+ }
case 0xD4E:
{
VERBOSE("MIDR matches Cortex-X3 -> %x\n", midr_val);