From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Wed, 12 Jan 2022 17:19:21 +0000 (-0300)
Subject: Revert "perf powerpc: Add encodings to represent data based on newer composite PERF_M... 
X-Git-Tag: v6.1-rc5~2191^2~67
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8de78328f041f10a2b546fdb3791a87ba6b742e6;p=platform%2Fkernel%2Flinux-starfive.git

Revert "perf powerpc: Add encodings to represent data based on newer composite PERF_MEM_LVLNUM* fields"

This was in a patchkit mixing up kernel with tools/ parts and I
mistakenly got it merged in the perf tools tree, revert it, it'll go via
the PowerPC kernel tree.

This reverts commit 0ebce3d65f1f53c936fdd51e975bd876ba7ed64f.

Cc: kajoljain <kjain@linux.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Link: http://lore.kernel.org/lkml/20220112171659.531d22ce@canb.auug.org.au
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---

diff --git a/arch/powerpc/perf/isa207-common.c b/arch/powerpc/perf/isa207-common.c
index 4037ea65..0c8b1a5 100644
--- a/arch/powerpc/perf/isa207-common.c
+++ b/arch/powerpc/perf/isa207-common.c
@@ -220,13 +220,13 @@ static inline u64 isa207_find_source(u64 idx, u32 sub_idx)
 		/* Nothing to do */
 		break;
 	case 1:
-		ret = PH(LVL, L1) | LEVEL(L1) | P(SNOOP, HIT);
+		ret = PH(LVL, L1);
 		break;
 	case 2:
-		ret = PH(LVL, L2) | LEVEL(L2) | P(SNOOP, HIT);
+		ret = PH(LVL, L2);
 		break;
 	case 3:
-		ret = PH(LVL, L3) | LEVEL(L3) | P(SNOOP, HIT);
+		ret = PH(LVL, L3);
 		break;
 	case 4:
 		if (cpu_has_feature(CPU_FTR_ARCH_31)) {