On 31/07/2021 07:37, Leo Yan wrote:

quoted

quoted

diff --git a/tools/perf/util/cs-etm.h b/tools/perf/util/cs-etm.h
index d65c7b19407d..52d82dce9d59 100644
--- a/tools/perf/util/cs-etm.h
+++ b/tools/perf/util/cs-etm.h

@@ -59,7 +59,7 @@ enum {
 /* define fixed version 0 length - allow new format reader to read old files. */
 #define CS_ETM_NR_TRC_PARAMS_V0 (CS_ETM_ETMIDR - CS_ETM_ETMCR + 1)

-/* ETMv4 metadata */
+/* ETMv4 + ETE metadata */
 enum {
        /* Dynamic, configurable parameters */
        CS_ETMV4_TRCCONFIGR = CS_ETM_COMMON_BLK_MAX_V1,

@@ -70,7 +70,8 @@ enum {
        CS_ETMV4_TRCIDR2,
        CS_ETMV4_TRCIDR8,
        CS_ETMV4_TRCAUTHSTATUS,
-       CS_ETMV4_PRIV_MAX,
+       CS_ETE_TRCDEVARCH,
+       CS_ETMV4_PRIV_MAX

Spurious change for "CS_ETMV4_PRIV_MAX"?

This change will be removed in the next version due to moving it into
a new enum. But it wasn't a mistake, CS_ETMV4_PRIV_MAX is used to define the length
of the header so it always needs to be at the end if another item is saved.

James