[PATCH v8 13/22] perf arm-spe: Add new function arm_spe_pkt_desc_counter()

[Leo Yan]

This patch moves out the counter packet parsing code from
arm_spe_pkt_desc() to the new function arm_spe_pkt_desc_counter().

Signed-off-by: Leo Yan <leo....@linaro.org>
Reviewed-by: Andre Przywara <andre.przyw...@arm.com>
---
 .../arm-spe-decoder/arm-spe-pkt-decoder.c     | 43 ++++++++++++-------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c 
b/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c
index 7b0f654e5cd6..e8c9da1d4280 100644
--- a/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c
+++ b/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c
@@ -322,6 +322,33 @@ static int arm_spe_pkt_desc_addr(const struct arm_spe_pkt 
*packet,
        return err;
 }
 
+static int arm_spe_pkt_desc_counter(const struct arm_spe_pkt *packet,
+                                   char *buf, size_t buf_len)
+{
+       u64 payload = packet->payload;
+       const char *name = arm_spe_pkt_name(packet->type);
+       int err = 0;
+
+       arm_spe_pkt_snprintf(&err, &buf, &buf_len, "%s %d ", name,
+                            (unsigned short)payload);
+
+       switch (packet->index) {
+       case 0:
+               arm_spe_pkt_snprintf(&err, &buf, &buf_len, "TOT");
+               break;
+       case 1:
+               arm_spe_pkt_snprintf(&err, &buf, &buf_len, "ISSUE");
+               break;
+       case 2:
+               arm_spe_pkt_snprintf(&err, &buf, &buf_len, "XLAT");
+               break;
+       default:
+               break;
+       }
+
+       return err;
+}
+
 int arm_spe_pkt_desc(const struct arm_spe_pkt *packet, char *buf,
                     size_t buf_len)
 {
@@ -414,21 +441,7 @@ int arm_spe_pkt_desc(const struct arm_spe_pkt *packet, 
char *buf,
                                     name, (unsigned long)payload, idx + 1);
                break;
        case ARM_SPE_COUNTER:
-               arm_spe_pkt_snprintf(&err, &buf, &blen, "%s %d ", name,
-                                    (unsigned short)payload);
-               switch (idx) {
-               case 0:
-                       arm_spe_pkt_snprintf(&err, &buf, &blen, "TOT");
-                       break;
-               case 1:
-                       arm_spe_pkt_snprintf(&err, &buf, &blen, "ISSUE");
-                       break;
-               case 2:
-                       arm_spe_pkt_snprintf(&err, &buf, &blen, "XLAT");
-                       break;
-               default:
-                       break;
-               }
+               err = arm_spe_pkt_desc_counter(packet, buf, buf_len);
                break;
        default:
                /* Unknown index */
-- 
2.17.1