[PATCH v5 12/21] 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     | 48 +++++++++++--------
 1 file changed, 29 insertions(+), 19 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 93799bf3d1ac..4e2f7bbd9d35 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
@@ -297,6 +297,34 @@ static int arm_spe_pkt_desc_addr(const struct arm_spe_pkt 
*packet,
        }
 }
 
+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);
+       size_t blen = buf_len;
+       int err = 0;
+
+       arm_spe_pkt_snprintf(&err, &buf, &blen, "%s %d ", name,
+                            (unsigned short)payload);
+
+       switch (packet->index) {
+       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;
+       }
+
+       return err ?: (int)(buf_len - blen);
+}
+
 int arm_spe_pkt_desc(const struct arm_spe_pkt *packet, char *buf,
                     size_t buf_len)
 {
@@ -384,25 +412,7 @@ int arm_spe_pkt_desc(const struct arm_spe_pkt *packet, 
char *buf,
                return arm_spe_pkt_snprintf(&err, &buf, &blen, "%s 0x%lx el%d",
                                            name, (unsigned long)payload, idx + 
1);
        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;
-               }
-
-               return err ?: (int)(buf_len - blen);
-
+               return arm_spe_pkt_desc_counter(packet, buf, buf_len);
        default:
                break;
        }
-- 
2.17.1