fix(cpus): organize Cortex-X2 errata entries
The entries in cpu-ops.mk and cpu-specific-build-macros.rst are out of
order and the formatting is not consistent. This patch corrects these
minor formatting issues.
Change-Id: Ic01517d58d3ca1b2d39be5282b0058c94fa5d0e7
Signed-off-by: John Powell <john.powell@arm.com>
diff --git a/docs/design/cpu-specific-build-macros.rst b/docs/design/cpu-specific-build-macros.rst
index d47d082..be40d5d 100644
--- a/docs/design/cpu-specific-build-macros.rst
+++ b/docs/design/cpu-specific-build-macros.rst
@@ -745,26 +745,24 @@
CPU. This needs to be enabled only for r1p0, it is fixed in r2p0.
- ``ERRATA_X2_1916945``: This applies errata 1916945 workaround to Cortex-X2
- CPU. This needs to be enabled for revisions r0p0 and r1p0, it is fixed in
- r2p0.
+ CPU. This needs to be enabled only for revisions r0p0 and r1p0 of the CPU, it
+ is fixed in r2p0.
- ``ERRATA_X2_1917258``: This applies errata 1917258 workaround to Cortex-X2
- CPU. This needs to be enabled for revisions r0p0 and r1p0, it is fixed in
- r2p0.
+ CPU. This needs to be enabled only for revisions r0p0 and r1p0 of the CPU, it
+ is fixed in r2p0.
- ``ERRATA_X2_1927200``: This applies errata 1927200 workaround to Cortex-X2
- CPU. This needs to be enabled for revisions r0p0 and r1p0, it is fixed in
- r2p0.
+ CPU. This needs to be enabled only for revisions r0p0 and r1p0 of the CPU, it
+ is fixed in r2p0.
- ``ERRATA_X2_1934260``: This applies errata 1934260 workaround to Cortex-X2
- CPU. This needs to be enabled only for revision r1p0, it is fixed in r2p0.
+ CPU. This needs to be enabled only for revision r1p0 of the CPU, it is fixed
+ in r2p0.
- ``ERRATA_X2_2002765``: This applies errata 2002765 workaround to Cortex-X2
- CPU. This needs to be enabled for revisions r0p0, r1p0, and r2p0 of the CPU,
- it is still open.
-
-- ``ERRATA_X2_2083908``: This applies errata 2083908 workaround to Cortex-X2
- CPU. This needs to be enabled for revision r2p0 of the CPU, it is still open.
+ CPU. This needs to be enabled only for revisions r0p0, r1p0 and r2p0 of the
+ CPU, it is fixed in r2p1.
- ``ERRATA_X2_2017096``: This applies errata 2017096 workaround to Cortex-X2
CPU. This needs to be enabled only for revisions r0p0, r1p0 and r2p0 of the
@@ -774,11 +772,11 @@
CPU. This needs to be enabled only for revisions r0p0, r1p0 and r2p0 of the
CPU, it is fixed in r2p1.
-- ``ERRATA_X2_2136059``: This applies errata 2136059 workaround to Cortex-X2
- CPU. This needs to be enabled only for revisions r0p0, r1p0 and r2p0 of the
- CPU, it is fixed in r2p1.
+- ``ERRATA_X2_2083908``: This applies errata 2083908 workaround to Cortex-X2
+ CPU. This needs to be enabled only for revision r2p0 of the CPU, it is fixed
+ in r2p1.
-- ``ERRATA_X2_2216384``: This applies errata 2216384 workaround to Cortex-X2
+- ``ERRATA_X2_2136059``: This applies errata 2136059 workaround to Cortex-X2
CPU. This needs to be enabled only for revisions r0p0, r1p0 and r2p0 of the
CPU, it is fixed in r2p1.
@@ -786,6 +784,10 @@
CPU. This needs to be enabled only for revision r2p0 of the CPU, it is fixed
in r2p1.
+- ``ERRATA_X2_2216384``: This applies errata 2216384 workaround to Cortex-X2
+ CPU. This needs to be enabled only for revisions r0p0, r1p0 and r2p0 of the
+ CPU, it is fixed in r2p1.
+
- ``ERRATA_X2_2267065``: This applies errata 2267065 workaround to Cortex-X2
CPU. This needs to be enabled only for revisions r0p0, r1p0 and r2p0 of the
CPU, it is fixed in r2p1.
@@ -799,11 +801,11 @@
CPU, it is fixed in r2p1.
- ``ERRATA_X2_2371105``: This applies errata 2371105 workaround to Cortex-X2
- CPU. This needs to be enabled for revisions r0p0, r1p0 and r2p0 of the CPU
- and is fixed in r2p1.
+ CPU. This needs to be enabled only for revisions r0p0, r1p0 and r2p0 of the
+ CPU, it is fixed in r2p1.
-- ``ERRATA_X2_2701952``: This applies erratum 2701952 workaround to Cortex-X2
- CPU and affects system configurations that do not use an ARM interconnect IP.
+- ``ERRATA_X2_2701952``: This applies errata 2701952 workaround to Cortex-X2
+ CPU and affects system configurations that do not use an Arm interconnect IP.
This needs to be enabled for revisions r0p0, r1p0, r2p0 and r2p1 and is
still open.
@@ -817,11 +819,11 @@
- ``ERRATA_X2_2778471``: This applies errata 2778471 workaround to Cortex-X2
CPU. This needs to be enabled for revisions r0p0, r1p0, r2p0 and r2p1 of the
- CPU and it is still open.
+ CPU and is still open.
- ``ERRATA_X2_3701772``: This applies errata 3701772 workaround to Cortex-X2
CPU. This needs to be enabled for revisions r0p0, r1p0, r2p0 and r2p1 of the
- CPU and it is still open.
+ CPU and is still open.
For Cortex-X3, the following errata build flags are defined :
diff --git a/lib/cpus/cpu-ops.mk b/lib/cpus/cpu-ops.mk
index 9948cd4..053ad33 100644
--- a/lib/cpus/cpu-ops.mk
+++ b/lib/cpus/cpu-ops.mk
@@ -763,13 +763,10 @@
CPU_FLAG_LIST += ERRATA_X2_1934260
# Flag to apply erratum 2002765 workaround during reset. This erratum applies
-# to revisions r0p0, r1p0, and r2p0 of the Cortex-X2 cpu and is still open.
+# only to revisions r0p0, r1p0 and r2p0 of the Cortex-X2 cpu, it is fixed in
+# r2p1.
CPU_FLAG_LIST += ERRATA_X2_2002765
-# Flag to apply erratum 2083908 workaround during reset. This erratum applies
-# to revision r2p0 of the Cortex-X2 cpu and is still open.
-CPU_FLAG_LIST += ERRATA_X2_2083908
-
# Flag to apply erratum 2017096 workaround during reset. This erratum applies
# only to revisions r0p0, r1p0 and r2p0 of the Cortex-X2 cpu, it is fixed in
# r2p1.
@@ -780,28 +777,31 @@
# r2p1.
CPU_FLAG_LIST += ERRATA_X2_2081180
+# Flag to apply erratum 2083908 workaround during reset. This erratum applies
+# only to revision r2p0 of the Cortex-X2 cpu, it is fixed in r2p1.
+CPU_FLAG_LIST += ERRATA_X2_2083908
+
# Flag to apply erratum 2136059 workaround during reset. This erratum applies
# only to revisions r0p0, r1p0 and r2p0 of the Cortex-X2 cpu, it is fixed in
# r2p1.
CPU_FLAG_LIST += ERRATA_X2_2136059
+# Flag to apply erratum 2147715 workaround during reset. This erratum applies
+# only to revision r2p0 of the Cortex-X2 cpu, it is fixed in r2p1.
+CPU_FLAG_LIST += ERRATA_X2_2147715
+
# Flag to apply erratum 2216384 workaround during reset. This erratum applies
# only to revisions r0p0, r1p0 and r2p0 of the Cortex-X2 cpu, it is fixed in
# r2p1.
CPU_FLAG_LIST += ERRATA_X2_2216384
-# Flag to apply erratum 2147715 workaround during reset. This erratum applies
-# only to revision r2p0 of the Cortex-X2 cpu, it is fixed in r2p1.
-CPU_FLAG_LIST += ERRATA_X2_2147715
-
# Flag to apply erratum 2267065 workaround during reset. This erratum applies
# only to revisions r0p0, r1p0 and r2p0 of the Cortex-X2 cpu, it is fixed in
# r2p1.
CPU_FLAG_LIST += ERRATA_X2_2267065
# Flag to apply erratum 2282622 workaround during reset. This erratum applies
-# to revision r0p0, r1p0, r2p0 and r2p1 of the Cortex-X2 cpu and is still
-# open.
+# to revisions r0p0, r1p0, r2p0 and r2p1 of the Cortex-X2 cpu and is still open.
CPU_FLAG_LIST += ERRATA_X2_2282622
# Flag to apply erratum 2291219 workaround during reset. This erratum applies
@@ -810,11 +810,11 @@
CPU_FLAG_LIST += ERRATA_X2_2291219
# Flag to apply erratum 2371105 workaround during reset. This erratum applies
-# to revision r0p0, r1p0 and r2p0 of the Cortex-X2 cpu and is fixed in r2p1.
+# to revisions r0p0, r1p0 and r2p0 of the Cortex-X2 cpu, it is fixed in r2p1.
CPU_FLAG_LIST += ERRATA_X2_2371105
-# Flag to apply erratum 2701952 workaround for non-arm interconnect ip. This
-# erratum applies to revisions r0p0, r1p0, r2p0, r2p1 of the Cortex-x2 cpu
+# Flag to apply erratum 2701952 workaround for non-Arm interconnect IP. This
+# erratum applies to revisions r0p0, r1p0, r2p0 and r2p1 of the Cortex-X2 cpu
# and is still open.
CPU_FLAG_LIST += ERRATA_X2_2701952
@@ -823,12 +823,12 @@
CPU_FLAG_LIST += ERRATA_X2_2742423
# Flag to apply erratum 2768515 workaround during power down. This erratum
-# applies to revision r0p0, r1p0, r2p0 and r2p1 of the Cortex-X2 cpu and is
+# applies to revisions r0p0, r1p0, r2p0 and r2p1 of the Cortex-X2 cpu and is
# still open.
CPU_FLAG_LIST += ERRATA_X2_2768515
# Flag to apply erratum 2778471 workaround during reset. This erratum applies
-# to revisions r0p0, r1p0, r2p0, r2p1 of the Cortex-X2 cpu and it is still open.
+# to revisions r0p0, r1p0, r2p0 and r2p1 of the Cortex-X2 cpu and is still open.
CPU_FLAG_LIST += ERRATA_X2_2778471
# Flag to apply erratum 3701772 workaround during context save/restore of