diff options
| author | Bipin Ravi <bipin.ravi@arm.com> | 2023-09-08 22:18:32 +0200 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2023-09-08 22:18:32 +0200 |
| commit | e99df5c295717c2ca0bb9093432454a153a3025c (patch) | |
| tree | 785cf7ff2b4616907a696b19e072f91af17b82c8 /services/std_svc/errata_abi | |
| parent | 77fc89fd22a04e2e78352e9b3345e6d0b8239524 (diff) | |
| parent | 5b0e4438d0e604e80ffff17d02e37cae0f4b2a8f (diff) | |
Merge changes from topic "sm/errata_X3" into integration
* changes:
fix(cpus): workaround for Cortex-X3 erratum 2742421
feat(errata_abi): add support for Cortex-X3
Diffstat (limited to 'services/std_svc/errata_abi')
| -rw-r--r-- | services/std_svc/errata_abi/cpu_errata_info.h | 1 | ||||
| -rw-r--r-- | services/std_svc/errata_abi/errata_abi_main.c | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/services/std_svc/errata_abi/cpu_errata_info.h b/services/std_svc/errata_abi/cpu_errata_info.h index 9906facf6..e24a6217e 100644 --- a/services/std_svc/errata_abi/cpu_errata_info.h +++ b/services/std_svc/errata_abi/cpu_errata_info.h @@ -28,6 +28,7 @@ #include <cortex_a715.h> #include <cortex_x1.h> #include <cortex_x2.h> +#include <cortex_x3.h> #include <neoverse_n1.h> #include <neoverse_n2.h> #include <neoverse_v1.h> diff --git a/services/std_svc/errata_abi/errata_abi_main.c b/services/std_svc/errata_abi/errata_abi_main.c index 559351679..8fee6acf8 100644 --- a/services/std_svc/errata_abi/errata_abi_main.c +++ b/services/std_svc/errata_abi/errata_abi_main.c @@ -418,6 +418,18 @@ struct em_cpu_list cpu_list[] = { } }, #endif /* CORTEX_A715_H_INC */ + +#if CORTEX_X3_H_INC +{ + .cpu_partnumber = CORTEX_X3_MIDR, + .cpu_errata_list = { + [0] = {2313909, 0x00, 0x10, ERRATA_X3_2313909}, + [1] = {2615812, 0x00, 0x11, ERRATA_X3_2615812}, + [2] = {2742421, 0x00, 0x11, ERRATA_X3_2742421}, + [3 ... ERRATA_LIST_END] = UNDEF_ERRATA, + } +}, +#endif /* CORTEX_X3_H_INC */ }; /* |