Merge changes I16ebfde5,I88da6fcc,I332f8504 into integration

* changes:
  docs(n1sdp): update PSCI instrumentation data
  docs(juno): update PSCI instrumentation data
  fix(docs): update the instrumentation procedure
diff --git a/docs/perf/psci-performance-juno.rst b/docs/perf/psci-performance-juno.rst
index 9640a24..45c1922 100644
--- a/docs/perf/psci-performance-juno.rst
+++ b/docs/perf/psci-performance-juno.rst
@@ -31,40 +31,14 @@
 
 The following source trees and binaries were used:
 
-- `TF-A v2.12-rc0`_
-- `TFTF v2.12-rc0`_
+- `TF-A v2.13-rc0`_
+- `TFTF v2.13-rc0`_
 
 Please see the Runtime Instrumentation :ref:`Testing Methodology
 <Runtime Instrumentation Methodology>`
-page for more details.
-
-Procedure
----------
-
-#. Build TFTF with runtime instrumentation enabled:
-
-    .. code:: shell
-
-        make CROSS_COMPILE=aarch64-none-elf- PLAT=juno \
-            TESTS=runtime-instrumentation all
-
-#. Fetch Juno's SCP binary from TF-A's archive:
-
-    .. code:: shell
-
-        curl --fail --connect-timeout 5 --retry 5 -sLS -o scp_bl2.bin \
-            https://downloads.trustedfirmware.org/tf-a/css_scp_2.12.0/juno/release/juno-bl2.bin
-
-#. Build TF-A with the following build options:
-
-    .. code:: shell
-
-        make CROSS_COMPILE=aarch64-none-elf- PLAT=juno \
-            BL33="/path/to/tftf.bin" SCP_BL2="scp_bl2.bin" \
-            ENABLE_RUNTIME_INSTRUMENTATION=1 fiptool all fip
-
-#. Load the following images onto the development board: ``fip.bin``,
-   ``scp_bl2.bin``.
+page for more details. The tests were ran using the
+`tf-psci-lava-instr/juno-enable-runtime-instr,juno-instrumentation:juno-tftf`
+configuration in CI.
 
 Results
 -------
@@ -73,6 +47,25 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. table:: ``CPU_SUSPEND`` latencies (µs) to deepest power level in
+        parallel (v2.13)
+
+    +---------+------+------------------+-------------------+--------------------+
+    | Cluster | Core |    Powerdown     |       Wakeup      |    Cache Flush     |
+    +---------+------+------------------+-------------------+--------------------+
+    |    0    |  0   | 333.0 (-52.92%)  |  23.92 (-40.11%)  |       138.88       |
+    +---------+------+------------------+-------------------+--------------------+
+    |    0    |  1   | 630.9 (+145.95%) |  253.72 (-46.56%) | 136.94 (+1987.50%) |
+    +---------+------+------------------+-------------------+--------------------+
+    |    1    |  0   | 184.74 (+71.92%) |  23.16 (-95.39%)  | 80.24 (+1283.45%)  |
+    +---------+------+------------------+-------------------+--------------------+
+    |    1    |  1   |      481.14      |  18.56 (-88.25%)  |  76.5 (+1520.76%)  |
+    +---------+------+------------------+-------------------+--------------------+
+    |    1    |  2   | 933.88 (+67.76%) | 289.58 (+189.64%) | 76.34 (+1510.55%)  |
+    +---------+------+------------------+-------------------+--------------------+
+    |    1    |  3   |     1112.48      | 238.42 (+753.94%) |       76.38        |
+    +---------+------+------------------+-------------------+--------------------+
+
+.. table:: ``CPU_SUSPEND`` latencies (µs) to deepest power level in
         parallel (v2.12)
 
     +---------+------+-------------------+------------------+--------------------+
@@ -92,23 +85,23 @@
     +---------+------+-------------------+------------------+--------------------+
 
 .. table:: ``CPU_SUSPEND`` latencies (µs) to deepest power level in
-        parallel (v2.11)
+        serial (v2.13)
 
-    +---------+------+-------------------+--------------------+-------------+
-    | Cluster | Core |     Powerdown     |       Wakeup       | Cache Flush |
-    +---------+------+-------------------+--------------------+-------------+
-    |    0    |  0   |  112.98 (-53.44%) |  26.16 (-89.33%)   |     5.48    |
-    +---------+------+-------------------+--------------------+-------------+
-    |    0    |  1   |       411.18      | 438.88 (+1572.56%) |    138.54   |
-    +---------+------+-------------------+--------------------+-------------+
-    |    1    |  0   | 261.82 (+150.88%) | 474.06 (+1649.30%) |     5.6     |
-    +---------+------+-------------------+--------------------+-------------+
-    |    1    |  1   |  714.76 (+86.84%) |       26.44        |     4.48    |
-    +---------+------+-------------------+--------------------+-------------+
-    |    1    |  2   |       862.66      |  149.34 (-45.00%)  |     4.38    |
-    +---------+------+-------------------+--------------------+-------------+
-    |    1    |  3   |      1045.12      |  98.12 (-55.76%)   |    79.74    |
-    +---------+------+-------------------+--------------------+-------------+
+    +---------+------+------------------+-----------------+-------------------+
+    | Cluster | Core |    Powerdown     |      Wakeup     |    Cache Flush    |
+    +---------+------+------------------+-----------------+-------------------+
+    |    0    |  0   |      244.08      | 24.48 (-40.00%) |       137.64      |
+    +---------+------+------------------+-----------------+-------------------+
+    |    0    |  1   |      244.2       | 23.84 (-41.57%) |       137.86      |
+    +---------+------+------------------+-----------------+-------------------+
+    |    1    |  0   |      294.78      |      23.54      |       76.62       |
+    +---------+------+------------------+-----------------+-------------------+
+    |    1    |  1   | 180.1 (+74.72%)  |      21.14      | 77.12 (+1533.90%) |
+    +---------+------+------------------+-----------------+-------------------+
+    |    1    |  2   | 180.54 (+75.25%) |       20.8      | 76.76 (+1554.31%) |
+    +---------+------+------------------+-----------------+-------------------+
+    |    1    |  3   | 180.6 (+75.44%)  |       21.2      | 76.86 (+1542.31%) |
+    +---------+------+------------------+-----------------+-------------------+
 
 .. table:: ``CPU_SUSPEND`` latencies (µs) to deepest power level in
         serial (v2.12)
@@ -129,29 +122,29 @@
     |    1    |  3   |   100.96  |      22.54      |     4.38    |
     +---------+------+-----------+-----------------+-------------+
 
-.. table:: ``CPU_SUSPEND`` latencies (µs) to deepest power level in
-        serial (v2.11)
-
-    +---------+------+-----------+--------+-------------+
-    | Cluster | Core | Powerdown | Wakeup | Cache Flush |
-    +---------+------+-----------+--------+-------------+
-    |    0    |  0   |   244.42  | 27.42  |    138.12   |
-    +---------+------+-----------+--------+-------------+
-    |    0    |  1   |   245.02  | 27.34  |    138.08   |
-    +---------+------+-----------+--------+-------------+
-    |    1    |  0   |   297.66  |  26.2  |    77.68    |
-    +---------+------+-----------+--------+-------------+
-    |    1    |  1   |   108.02  | 21.94  |     4.52    |
-    +---------+------+-----------+--------+-------------+
-    |    1    |  2   |   107.48  | 21.88  |     4.46    |
-    +---------+------+-----------+--------+-------------+
-    |    1    |  3   |   107.52  | 21.86  |     4.46    |
-    +---------+------+-----------+--------+-------------+
-
 ``CPU_SUSPEND`` to power level 0
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. table:: ``CPU_SUSPEND`` latencies (µs) to power level 0 in
+        parallel (v2.13)
+
+    +---------+------+-------------------+-----------------+-------------+
+    | Cluster | Core |     Powerdown     |      Wakeup     | Cache Flush |
+    +---------+------+-------------------+-----------------+-------------+
+    |    0    |  0   |       703.06      | 16.86 (-47.87%) |     7.98    |
+    +---------+------+-------------------+-----------------+-------------+
+    |    0    |  1   |       851.88      |  16.4 (-49.41%) |     8.04    |
+    +---------+------+-------------------+-----------------+-------------+
+    |    1    |  0   |  407.4 (+58.99%)  |  15.1 (-26.20%) |     7.2     |
+    +---------+------+-------------------+-----------------+-------------+
+    |    1    |  1   |  110.98 (-72.67%) |      15.46      |     6.56    |
+    +---------+------+-------------------+-----------------+-------------+
+    |    1    |  2   |       554.54      |       15.4      |     6.94    |
+    +---------+------+-------------------+-----------------+-------------+
+    |    1    |  3   | 258.96 (+143.06%) | 15.56 (-25.05%) |     6.64    |
+    +---------+------+-------------------+-----------------+-------------+
+
+.. table:: ``CPU_SUSPEND`` latencies (µs) to power level 0 in
         parallel (v2.12)
 
     +--------------------------------------------------------------------+
@@ -172,24 +165,23 @@
     |    1    |  3   | 523.36 (+391.23%) |       19.0      |     7.3     |
     +---------+------+-------------------+-----------------+-------------+
 
-.. table:: ``CPU_SUSPEND`` latencies (µs) to power level 0 in
-        parallel (v2.11)
+.. table:: ``CPU_SUSPEND`` latencies (µs) to power level 0 in serial (v2.13)
 
-    +---------+------+-------------------+--------+-------------+
-    | Cluster | Core |     Powerdown     | Wakeup | Cache Flush |
-    +---------+------+-------------------+--------+-------------+
-    |    0    |  0   |       704.46      | 19.28  |     7.86    |
-    +---------+------+-------------------+--------+-------------+
-    |    0    |  1   |       853.66      | 18.78  |     7.82    |
-    +---------+------+-------------------+--------+-------------+
-    |    1    |  0   | 556.52 (+425.51%) | 19.06  |     7.82    |
-    +---------+------+-------------------+--------+-------------+
-    |    1    |  1   |  113.28 (-70.47%) | 19.28  |     7.48    |
-    +---------+------+-------------------+--------+-------------+
-    |    1    |  2   |  260.62 (-50.22%) |  19.8  |     7.26    |
-    +---------+------+-------------------+--------+-------------+
-    |    1    |  3   |  408.16 (+66.94%) | 19.82  |     7.38    |
-    +---------+------+-------------------+--------+-------------+
+    +---------+------+-----------+-----------------+-------------+
+    | Cluster | Core | Powerdown |      Wakeup     | Cache Flush |
+    +---------+------+-----------+-----------------+-------------+
+    |    0    |  0   |   106.12  |  17.1 (-48.24%) |     5.26    |
+    +---------+------+-----------+-----------------+-------------+
+    |    0    |  1   |   106.88  | 17.06 (-47.08%) |     5.28    |
+    +---------+------+-----------+-----------------+-------------+
+    |    1    |  0   |   294.36  |       15.6      |     4.56    |
+    +---------+------+-----------+-----------------+-------------+
+    |    1    |  1   |   103.26  |      15.44      |     4.46    |
+    +---------+------+-----------+-----------------+-------------+
+    |    1    |  2   |   103.7   |      15.26      |     4.5     |
+    +---------+------+-----------+-----------------+-------------+
+    |    1    |  3   |   103.68  |      15.72      |     4.5     |
+    +---------+------+-----------+-----------------+-------------+
 
 .. table:: ``CPU_SUSPEND`` latencies (µs) to power level 0 in serial (v2.12)
 
@@ -209,30 +201,30 @@
     |    1    |  3   |   97.52   |      19.46      |     4.26    |
     +---------+------+-----------+-----------------+-------------+
 
-.. table:: ``CPU_SUSPEND`` latencies (µs) to power level 0 in serial (v2.11)
-
-    +---------+------+-----------+--------+-------------+
-    | Cluster | Core | Powerdown | Wakeup | Cache Flush |
-    +---------+------+-----------+--------+-------------+
-    |    0    |  0   |   106.78  |  19.2  |     5.32    |
-    +---------+------+-----------+--------+-------------+
-    |    0    |  1   |   107.44  | 19.64  |     5.44    |
-    +---------+------+-----------+--------+-------------+
-    |    1    |  0   |   295.82  | 19.14  |     4.34    |
-    +---------+------+-----------+--------+-------------+
-    |    1    |  1   |   104.34  | 19.18  |     4.28    |
-    +---------+------+-----------+--------+-------------+
-    |    1    |  2   |   103.96  | 19.34  |     4.4     |
-    +---------+------+-----------+--------+-------------+
-    |    1    |  3   |   104.32  | 19.18  |     4.34    |
-    +---------+------+-----------+--------+-------------+
-
 ``CPU_OFF`` on all non-lead CPUs
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 ``CPU_OFF`` on all non-lead CPUs in sequence then, ``CPU_SUSPEND`` on the lead
 core to the deepest power level.
 
+.. table:: ``CPU_OFF`` latencies (µs) on all non-lead CPUs (v2.13)
+
+    +---------+------+-----------+-----------------+-------------+
+    | Cluster | Core | Powerdown |      Wakeup     | Cache Flush |
+    +---------+------+-----------+-----------------+-------------+
+    |    0    |  0   |   243.02  | 26.42 (-39.51%) |    137.58   |
+    +---------+------+-----------+-----------------+-------------+
+    |    0    |  1   |   244.24  | 26.32 (-38.93%) |    137.88   |
+    +---------+------+-----------+-----------------+-------------+
+    |    1    |  0   |   182.36  |      23.66      |     78.0    |
+    +---------+------+-----------+-----------------+-------------+
+    |    1    |  1   |   108.18  |      22.68      |     4.42    |
+    +---------+------+-----------+-----------------+-------------+
+    |    1    |  2   |   108.34  |      21.72      |     4.24    |
+    +---------+------+-----------+-----------------+-------------+
+    |    1    |  3   |   108.22  |      21.68      |     4.34    |
+    +---------+------+-----------+-----------------+-------------+
+
 .. table:: ``CPU_OFF`` latencies (µs) on all non-lead CPUs (v2.12)
 
     +---------+------+-----------+-----------------+-------------+
@@ -251,61 +243,43 @@
     |    1    |  3   |   101.08  |      26.74      |     4.4     |
     +---------+------+-----------+-----------------+-------------+
 
-.. table:: ``CPU_OFF`` latencies (µs) on all non-lead CPUs (v2.11)
-
-    +---------+------+-----------+--------+-------------+
-    | Cluster | Core | Powerdown | Wakeup | Cache Flush |
-    +---------+------+-----------+--------+-------------+
-    |    0    |  0   |   243.62  | 29.84  |    137.66   |
-    +---------+------+-----------+--------+-------------+
-    |    0    |  1   |   243.88  | 29.54  |    137.8    |
-    +---------+------+-----------+--------+-------------+
-    |    1    |  0   |   183.26  | 26.22  |    77.76    |
-    +---------+------+-----------+--------+-------------+
-    |    1    |  1   |   107.64  | 26.74  |     4.34    |
-    +---------+------+-----------+--------+-------------+
-    |    1    |  2   |   107.52  |  25.9  |     4.32    |
-    +---------+------+-----------+--------+-------------+
-    |    1    |  3   |   107.74  |  25.8  |     4.34    |
-    +---------+------+-----------+--------+-------------+
-
 ``CPU_VERSION`` in parallel
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. table:: ``CPU_VERSION`` latency (µs) in parallel on all cores (2.12)
+.. table:: ``CPU_VERSION`` latency (µs) in parallel on all cores (2.13)
 
     +-------------+--------+--------------+
     |   Cluster   |  Core  |   Latency    |
     +-------------+--------+--------------+
     |      0      |   0    |     1.0      |
     +-------------+--------+--------------+
-    |      0      |   1    |     1.02     |
+    |      0      |   1    |     1.06     |
     +-------------+--------+--------------+
-    |      1      |   0    |     0.52     |
+    |      1      |   0    |     0.6      |
     +-------------+--------+--------------+
-    |      1      |   1    |     0.94     |
+    |      1      |   1    |     1.0      |
     +-------------+--------+--------------+
-    |      1      |   2    |     0.94     |
+    |      1      |   2    |     0.98     |
     +-------------+--------+--------------+
-    |      1      |   3    |     0.92     |
+    |      1      |   3    |     1.0      |
     +-------------+--------+--------------+
 
-.. table:: ``CPU_VERSION`` latency (µs) in parallel on all cores (2.11)
+.. table:: ``CPU_VERSION`` latency (µs) in parallel on all cores (2.12)
 
     +-------------+--------+--------------+
     |   Cluster   |  Core  |   Latency    |
     +-------------+--------+--------------+
-    |      0      |   0    |     1.26     |
+    |      0      |   0    |     1.0      |
     +-------------+--------+--------------+
-    |      0      |   1    |     0.96     |
+    |      0      |   1    |     1.02     |
     +-------------+--------+--------------+
-    |      1      |   0    |     0.54     |
+    |      1      |   0    |     0.52     |
     +-------------+--------+--------------+
     |      1      |   1    |     0.94     |
     +-------------+--------+--------------+
-    |      1      |   2    |     0.92     |
+    |      1      |   2    |     0.94     |
     +-------------+--------+--------------+
-    |      1      |   3    |     1.02     |
+    |      1      |   3    |     0.92     |
     +-------------+--------+--------------+
 
 Annotated Historic Results
@@ -526,9 +500,9 @@
 
 --------------
 
-*Copyright (c) 2019-2024, Arm Limited and Contributors. All rights reserved.*
+*Copyright (c) 2019-2025, Arm Limited and Contributors. All rights reserved.*
 
 .. _Juno R1 platform: https://developer.arm.com/documentation/100122/latest/
 .. _TF master as of 31/01/2017: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/tree/?id=c38b36d
-.. _TF-A v2.12-rc0: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/tree/?h=v2.12-rc0
-.. _TFTF v2.12-rc0: https://git.trustedfirmware.org/TF-A/tf-a-tests.git/tree/?h=v2.12-rc0
+.. _TF-A v2.13-rc0: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/tree/?h=v2.13-rc0
+.. _TFTF v2.13-rc0: https://git.trustedfirmware.org/TF-A/tf-a-tests.git/tree/?h=v2.13-rc0
diff --git a/docs/perf/psci-performance-n1sdp.rst b/docs/perf/psci-performance-n1sdp.rst
index 178d8e6..196cdb1 100644
--- a/docs/perf/psci-performance-n1sdp.rst
+++ b/docs/perf/psci-performance-n1sdp.rst
@@ -4,87 +4,16 @@
 For this test we used the N1 System Development Platform (`N1SDP`_), which
 contains an SoC consisting of two dual-core Arm N1 clusters.
 
-The following source trees and binaries were used:
+The following source trees were used:
 
-- `TF-A v2.12-rc0`_
-- `TFTF v2.12-rc0`_
-- SCP/MCP `Prebuilt Images`_
+- `TF-A v2.13-rc0`_
+- `TFTF v2.13-rc0`_
 
 Please see the Runtime Instrumentation :ref:`Testing Methodology
-<Runtime Instrumentation Methodology>` page for more details.
-
-Procedure
----------
-
-#. Build TFTF with runtime instrumentation enabled:
-
-    .. code:: shell
-
-        make CROSS_COMPILE=aarch64-none-elf- PLAT=n1sdp \
-            TESTS=runtime-instrumentation all
-
-#. Build TF-A with the following build options:
-
-    .. code:: shell
-
-        make CROSS_COMPILE=aarch64-none-elf- PLAT=n1sdp \
-            ENABLE_RUNTIME_INSTRUMENTATION=1 fiptool all
-
-#. Fetch the SCP firmware images:
-
-    .. code:: shell
-
-        curl --fail --connect-timeout 5 --retry 5 \
-            -sLS -o build/n1sdp/release/scp_rom.bin \
-            https://downloads.trustedfirmware.org/tf-a/css_scp_2.12.0/n1sdp/release/n1sdp-bl1.bin
-        curl --fail --connect-timeout 5 \
-            --retry 5 -sLS -o build/n1sdp/release/scp_ram.bin \
-            https://downloads.trustedfirmware.org/tf-a/css_scp_2.12.0/n1sdp/release/n1sdp-bl2.bin
-
-#. Fetch the MCP firmware images:
-
-    .. code:: shell
-
-        curl --fail --connect-timeout 5 --retry 5 \
-            -sLS -o build/n1sdp/release/mcp_rom.bin \
-            https://downloads.trustedfirmware.org/tf-a/css_scp_2.12.0/n1sdp/release/n1sdp-mcp-bl1.bin
-        curl --fail --connect-timeout 5 --retry 5 \
-            -sLS -o build/n1sdp/release/mcp_ram.bin \
-            https://downloads.trustedfirmware.org/tf-a/css_scp_2.12.0/n1sdp/release/n1sdp-mcp-bl2.bin
-
-#. Using the fiptool, create a new FIP package and append the SCP ram image onto
-   it.
-
-    .. code:: shell
-
-        ./tools/fiptool/fiptool create --blob \
-                uuid=cfacc2c4-15e8-4668-82be-430a38fad705,file=build/n1sdp/release/bl1.bin \
-                --scp-fw build/n1sdp/release/scp_ram.bin build/n1sdp/release/scp_fw.bin
-
-#. Append the MCP image to the FIP.
-
-    .. code:: shell
-
-        ./tools/fiptool/fiptool create \
-            --blob uuid=54464222-a4cf-4bf8-b1b6-cee7dade539e,file=build/n1sdp/release/mcp_ram.bin \
-            build/n1sdp/release/mcp_fw.bin
-
-#. Then, add TFTF as the Non-Secure workload in the FIP image:
-
-    .. code:: shell
-
-        make CROSS_COMPILE=aarch64-none-elf- PLAT=n1sdp \
-            ENABLE_RUNTIME_INSTRUMENTATION=1 SCP_BL2=/dev/null \
-            BL33=<path/to/tftf.bin>  fip
-
-#. Load the following images onto the development board: ``fip.bin``,
-   ``scp_rom.bin``, ``scp_ram.bin``, ``mcp_rom.bin``, and ``mcp_ram.bin``.
-
-.. note::
-
-    These instructions presume you have a complete firmware stack. The N1SDP
-    `user guide`_ provides a detailed explanation on how to get setup from
-    scratch.
+<Runtime Instrumentation Methodology>` page for more details. The tests were ran
+using the
+`tf-psci-lava-instr/n1sdp-runtime-instrumentation,n1sdp-runtime-instrumentation:n1sdp-fip.tftf-firmware`
+configuration in CI.
 
 Results
 -------
@@ -92,6 +21,20 @@
 ``CPU_SUSPEND`` to deepest power level
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+.. table:: ``CPU_SUSPEND`` latencies (µs) to deepest power level in parallel (v2.13)
+
+    +---------+------+----------------+-----------------+----------------+
+    | Cluster | Core |   Powerdown    |      Wakeup     |  Cache Flush   |
+    +---------+------+----------------+-----------------+----------------+
+    |    0    |  0   |      3.32      | 13.42 (-45.40%) | 0.28 (-69.57%) |
+    +---------+------+----------------+-----------------+----------------+
+    |    0    |  0   | 4.02 (-35.78%) | 18.14 (-52.88%) |      0.28      |
+    +---------+------+----------------+-----------------+----------------+
+    |    1    |  0   | 2.7 (-27.42%)  | 17.38 (-49.36%) |      0.26      |
+    +---------+------+----------------+-----------------+----------------+
+    |    1    |  0   |      2.96      | 10.86 (-73.64%) |      0.26      |
+    +---------+------+----------------+-----------------+----------------+
+
 .. table:: ``CPU_SUSPEND`` latencies (µs) to deepest power level in parallel (v2.12)
 
     +---------+------+----------------+--------+----------------+
@@ -106,19 +49,19 @@
     |    1    |  0   |      3.28      | 42.36  |      0.3       |
     +---------+------+----------------+--------+----------------+
 
-.. table:: ``CPU_SUSPEND`` latencies (µs) to deepest power level in parallel (v2.11)
+.. table:: ``CPU_SUSPEND`` latencies (µs) to deepest power level in serial (v2.13)
 
-    +---------+------+----------------+--------+----------------+
-    | Cluster | Core |   Powerdown    | Wakeup |  Cache Flush   |
-    +---------+------+----------------+--------+----------------+
-    |    0    |  0   | 3.0 (+41.51%)  | 23.14  | 1.2 (+185.71%) |
-    +---------+------+----------------+--------+----------------+
-    |    0    |  0   |      4.6       | 35.86  |      0.3       |
-    +---------+------+----------------+--------+----------------+
-    |    1    |  0   | 3.68 (+33.33%) | 33.36  |      0.3       |
-    +---------+------+----------------+--------+----------------+
-    |    1    |  0   | 3.7 (+40.15%)  |  38.1  |      0.28      |
-    +---------+------+----------------+--------+----------------+
+    +---------+------+-----------+-----------------+----------------+
+    | Cluster | Core | Powerdown |      Wakeup     |  Cache Flush   |
+    +---------+------+-----------+-----------------+----------------+
+    |    0    |  0   |    1.62   | 10.14 (-58.10%) |      0.3       |
+    +---------+------+-----------+-----------------+----------------+
+    |    0    |  0   |    1.86   | 10.62 (-56.44%) | 0.28 (-26.32%) |
+    +---------+------+-----------+-----------------+----------------+
+    |    1    |  0   |    1.8    | 10.16 (-57.84%) |      0.32      |
+    +---------+------+-----------+-----------------+----------------+
+    |    1    |  0   |    2.16   |  10.6 (-56.84%) | 0.5 (+56.25%)  |
+    +---------+------+-----------+-----------------+----------------+
 
 .. table:: ``CPU_SUSPEND`` latencies (µs) to deepest power level in serial (v2.12)
 
@@ -134,23 +77,23 @@
     |    1    |  0   |    2.24   | 23.84  |     0.36    |
     +---------+------+-----------+--------+-------------+
 
-.. table:: ``CPU_SUSPEND`` latencies (µs) to deepest power level in serial (v2.11)
-
-    +---------+------+-----------+--------+-------------+
-    | Cluster | Core | Powerdown | Wakeup | Cache Flush |
-    +---------+------+-----------+--------+-------------+
-    |    0    |  0   |    1.7    | 22.46  |     0.3     |
-    +---------+------+-----------+--------+-------------+
-    |    0    |  0   |    2.28   |  22.5  |     0.3     |
-    +---------+------+-----------+--------+-------------+
-    |    1    |  0   |    2.14   |  21.5  |     0.32    |
-    +---------+------+-----------+--------+-------------+
-    |    1    |  0   |    2.24   | 22.66  |     0.3     |
-    +---------+------+-----------+--------+-------------+
-
 ``CPU_SUSPEND`` to power level 0
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+.. table:: ``CPU_SUSPEND`` latencies (µs) to power level 0 in parallel (v2.13)
+
+    +---------+------+----------------+-----------------+---------------+
+    | Cluster | Core |   Powerdown    |      Wakeup     |  Cache Flush  |
+    +---------+------+----------------+-----------------+---------------+
+    |    0    |  0   | 0.8 (-57.45%)  | 11.98 (-61.75%) |      0.26     |
+    +---------+------+----------------+-----------------+---------------+
+    |    0    |  0   | 1.54 (-30.63%) | 16.44 (-53.74%) |      0.26     |
+    +---------+------+----------------+-----------------+---------------+
+    |    1    |  0   | 1.62 (-30.77%) |  16.1 (-53.92%) |      0.3      |
+    +---------+------+----------------+-----------------+---------------+
+    |    1    |  0   |      1.8       | 10.54 (-55.30%) | 0.2 (-33.33%) |
+    +---------+------+----------------+-----------------+---------------+
+
 .. table:: ``CPU_SUSPEND`` latencies (µs) to power level 0 in parallel (v2.12)
 
     +---------+------+-----------+--------+----------------+
@@ -165,19 +108,19 @@
     |    1    |  0   |    2.08   | 23.38  |      0.28      |
     +---------+------+-----------+--------+----------------+
 
-.. table:: ``CPU_SUSPEND`` latencies (µs) to power level 0 in parallel (v2.11)
+.. table:: ``CPU_SUSPEND`` latencies (µs) to power level 0 in serial (v2.13)
 
-    +---------+------+----------------+--------+-------------+
-    | Cluster | Core |   Powerdown    | Wakeup | Cache Flush |
-    +---------+------+----------------+--------+-------------+
-    |    0    |  0   | 0.94 (-37.33%) | 30.36  |     0.3     |
-    +---------+------+----------------+--------+-------------+
-    |    0    |  0   |      2.12      | 33.12  |     0.28    |
-    +---------+------+----------------+--------+-------------+
-    |    1    |  0   |      2.08      | 32.56  |     0.3     |
-    +---------+------+----------------+--------+-------------+
-    |    1    |  0   |      2.14      | 21.92  |     0.28    |
-    +---------+------+----------------+--------+-------------+
+    +---------+------+----------------+-----------------+----------------+
+    | Cluster | Core |   Powerdown    |      Wakeup     |  Cache Flush   |
+    +---------+------+----------------+-----------------+----------------+
+    |    0    |  0   |      1.44      |  9.9 (-58.05%)  |      0.3       |
+    +---------+------+----------------+-----------------+----------------+
+    |    0    |  0   | 1.74 (-25.64%) |  10.4 (-56.23%) | 0.28 (-33.33%) |
+    +---------+------+----------------+-----------------+----------------+
+    |    1    |  0   |      1.8       | 10.04 (-57.71%) |      0.34      |
+    +---------+------+----------------+-----------------+----------------+
+    |    1    |  0   |      1.96      | 10.46 (-56.23%) |      0.44      |
+    +---------+------+----------------+-----------------+----------------+
 
 .. table:: ``CPU_SUSPEND`` latencies (µs) to power level 0 in serial (v2.12)
 
@@ -193,26 +136,26 @@
     |    1    |  0   |    2.16   | 23.92  |      0.34      |
     +---------+------+-----------+--------+----------------+
 
-.. table:: ``CPU_SUSPEND`` latencies (µs) to power level 0 in serial (v2.11)
-
-    +---------+------+-----------+--------+-------------+
-    | Cluster | Core | Powerdown | Wakeup | Cache Flush |
-    +---------+------+-----------+--------+-------------+
-    |    0    |  0   |    1.64   | 21.88  |     0.34    |
-    +---------+------+-----------+--------+-------------+
-    |    0    |  0   |    2.42   | 21.76  |     0.34    |
-    +---------+------+-----------+--------+-------------+
-    |    1    |  0   |    2.02   | 21.14  |     0.32    |
-    +---------+------+-----------+--------+-------------+
-    |    1    |  0   |    2.18   |  22.3  |     0.34    |
-    +---------+------+-----------+--------+-------------+
-
 ``CPU_OFF`` on all non-lead CPUs
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 ``CPU_OFF`` on all non-lead CPUs in sequence then, ``CPU_SUSPEND`` on the lead
 core to the deepest power level.
 
+.. table:: ``CPU_OFF`` latencies (µs) on all non-lead CPUs (v2.13)
+
+    +---------+------+-----------+-----------------+---------------+
+    | Cluster | Core | Powerdown |      Wakeup     |  Cache Flush  |
+    +---------+------+-----------+-----------------+---------------+
+    |    0    |  0   |    1.64   | 10.24 (-57.72%) |      0.3      |
+    +---------+------+-----------+-----------------+---------------+
+    |    0    |  0   |   13.92   |  17.7 (-43.74%) |      0.3      |
+    +---------+------+-----------+-----------------+---------------+
+    |    1    |  0   |   13.54   | 16.74 (-44.90%) | 0.3 (-37.50%) |
+    +---------+------+-----------+-----------------+---------------+
+    |    1    |  0   |   14.12   | 18.28 (-41.93%) | 0.3 (-44.44%) |
+    +---------+------+-----------+-----------------+---------------+
+
 .. table:: ``CPU_OFF`` latencies (µs) on all non-lead CPUs (v2.12)
 
     +---------+------+-----------+--------+----------------+
@@ -227,22 +170,21 @@
     |    1    |  0   |   14.18   | 31.82  |      0.68      |
     +---------+------+-----------+--------+----------------+
 
-.. table:: ``CPU_OFF`` latencies (µs) on all non-lead CPUs (v2.11)
-
-    +---------+------+-----------+--------+----------------+
-    | Cluster | Core | Powerdown | Wakeup |  Cache Flush   |
-    +---------+------+-----------+--------+----------------+
-    |    0    |  0   |    1.96   | 22.44  |      0.38      |
-    +---------+------+-----------+--------+----------------+
-    |    0    |  0   |   13.76   | 30.34  |      0.26      |
-    +---------+------+-----------+--------+----------------+
-    |    1    |  0   |   13.46   | 28.28  |      0.24      |
-    +---------+------+-----------+--------+----------------+
-    |    1    |  0   |   13.84   | 30.06  | 0.28 (-60.00%) |
-    +---------+------+-----------+--------+----------------+
-
 ``CPU_VERSION`` in parallel
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.. table:: ``CPU_VERSION`` latency (µs) in parallel on all cores (v2.13)
+
+    +----------+------+-------------------+
+    | Cluster  | Core |      Latency      |
+    +----------+------+-------------------+
+    |    0     |  0   |        0.12       |
+    +----------+------+-------------------+
+    |    0     |  0   |   0.2 (-28.57%)   |
+    +----------+------+-------------------+
+    |    1     |  0   |        0.2        |
+    +----------+------+-------------------+
+    |    1     |  0   |   0.24 (-25.00%)  |
+    +----------+------+-------------------+
 
 .. table:: ``CPU_VERSION`` latency (µs) in parallel on all cores (v2.12)
 
@@ -258,26 +200,11 @@
     |    1     |  0   |        0.26       |
     +----------+------+-------------------+
 
-.. table:: ``CPU_VERSION`` latency (µs) in parallel on all cores (v2.11)
-
-    +-------------+--------+--------------+
-    |   Cluster   |  Core  |   Latency    |
-    +-------------+--------+--------------+
-    |      0      |   0    |     0.12     |
-    +-------------+--------+--------------+
-    |      0      |   0    |     0.24     |
-    +-------------+--------+--------------+
-    |      1      |   0    |     0.2      |
-    +-------------+--------+--------------+
-    |      1      |   0    |     0.26     |
-    +-------------+--------+--------------+
-
 --------------
 
-*Copyright (c) 2023-2024, Arm Limited. All rights reserved.*
+*Copyright (c) 2023-2025, Arm Limited. All rights reserved.*
 
-.. _TF-A v2.12-rc0: https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/refs/tags/v2.12-rc0
-.. _TFTF v2.12-rc0: https://review.trustedfirmware.org/plugins/gitiles/TF-A/tf-a-tests/+/refs/tags/v2.12-rc0
+.. _TF-A v2.13-rc0: https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/refs/tags/v2.13-rc0
+.. _TFTF v2.13-rc0: https://review.trustedfirmware.org/plugins/gitiles/TF-A/tf-a-tests/+/refs/tags/v2.13-rc0
 .. _user guide: https://gitlab.arm.com/arm-reference-solutions/arm-reference-solutions-docs/-/blob/master/docs/n1sdp/user-guide.rst
-.. _Prebuilt Images:  https://downloads.trustedfirmware.org/tf-a/css_scp_2.12.0/n1sdp/release/
 .. _N1SDP: https://developer.arm.com/documentation/101489/latest