74 lines
2.8 KiB
Diff
74 lines
2.8 KiB
Diff
From 804f63157ab444ba941a7f6960d954d48d4b29ea Mon Sep 17 00:00:00 2001
|
|
From: Leo Yan <leo.yan@linaro.org>
|
|
Date: Fri, 31 Dec 2021 13:32:07 +0800
|
|
Subject: [PATCH 10/21] perf arm-spe: Refactor context packet handling
|
|
|
|
mainline inclusion
|
|
from mainline-v5.11-rc1
|
|
commit 6550149e801a32b1533ed86509af76319cb75eba
|
|
category: feature
|
|
bugzilla: https://gitee.com/openeuler/kernel/issues/I4NGPV
|
|
CVE: NA
|
|
|
|
-------------------------------------------------
|
|
|
|
Minor refactoring to use macro for index mask.
|
|
|
|
Signed-off-by: Leo Yan <leo.yan@linaro.org>
|
|
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
|
|
Acked-by: Will Deacon <will@kernel.org>
|
|
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Cc: Al Grant <Al.Grant@arm.com>
|
|
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
|
|
Cc: Dave Martin <Dave.Martin@arm.com>
|
|
Cc: Ingo Molnar <mingo@redhat.com>
|
|
Cc: James Clark <james.clark@arm.com>
|
|
Cc: Jiri Olsa <jolsa@redhat.com>
|
|
Cc: John Garry <john.garry@huawei.com>
|
|
Cc: Mark Rutland <mark.rutland@arm.com>
|
|
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
|
|
Cc: Namhyung Kim <namhyung@kernel.org>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Cc: Wei Li <liwei391@huawei.com>
|
|
Link: https://lore.kernel.org/r/20201119152441.6972-7-leo.yan@linaro.org
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Signed-off-by: Wei Li <liwei391@huawei.com>
|
|
Reviewed-by: Yang Jihong <yangjihong1@huawei.com>
|
|
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
---
|
|
tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c | 2 +-
|
|
tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h | 3 +++
|
|
2 files changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
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 d37c4008adbc..978f5551b82c 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
|
|
@@ -136,7 +136,7 @@ static int arm_spe_get_context(const unsigned char *buf, size_t len,
|
|
struct arm_spe_pkt *packet)
|
|
{
|
|
packet->type = ARM_SPE_CONTEXT;
|
|
- packet->index = buf[0] & 0x3;
|
|
+ packet->index = SPE_CTX_PKT_HDR_INDEX(buf[0]);
|
|
return arm_spe_get_payload(buf, len, 0, packet);
|
|
}
|
|
|
|
diff --git a/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h b/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h
|
|
index f97d6840be3a..9bc876bffd35 100644
|
|
--- a/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h
|
|
+++ b/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h
|
|
@@ -79,6 +79,9 @@ struct arm_spe_pkt {
|
|
#define SPE_ADDR_PKT_EL2 2
|
|
#define SPE_ADDR_PKT_EL3 3
|
|
|
|
+/* Context packet header */
|
|
+#define SPE_CTX_PKT_HDR_INDEX(h) ((h) & GENMASK_ULL(1, 0))
|
|
+
|
|
const char *arm_spe_pkt_name(enum arm_spe_pkt_type);
|
|
|
|
int arm_spe_get_packet(const unsigned char *buf, size_t len,
|
|
--
|
|
2.27.0
|
|
|