perf/x86/amd/uncore: Rename cpufeatures macro for cache counters
authorJanakarajan Natarajan <Janakarajan.Natarajan@amd.com>
Wed, 14 Jun 2017 16:26:57 +0000 (11:26 -0500)
committerIngo Molnar <mingo@kernel.org>
Thu, 10 Aug 2017 10:08:38 +0000 (12:08 +0200)
In Family 17h, L3 is the last level cache as opposed to L2 in previous
families. Avoid this name confusion and rename X86_FEATURE_PERFCTR_L2 to
X86_FEATURE_PERFCTR_LLC to indicate the performance counter on the last
level of cache.

Signed-off-by: Janakarajan Natarajan <Janakarajan.Natarajan@amd.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Borislav Petkov <bp@suse.de>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/016311029fdecdc3fdc13b7ed865c6cbf48b2f15.1497452002.git.Janakarajan.Natarajan@amd.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/events/amd/uncore.c
arch/x86/include/asm/cpufeatures.h

index ad44af0dd6679b50ce2c48bf37b56959b967c3cb..e34f8a6b444083870586761861b52c80eca71e5c 100644 (file)
@@ -555,7 +555,7 @@ static int __init amd_uncore_init(void)
                ret = 0;
        }
 
-       if (boot_cpu_has(X86_FEATURE_PERFCTR_L2)) {
+       if (boot_cpu_has(X86_FEATURE_PERFCTR_LLC)) {
                amd_uncore_llc = alloc_percpu(struct amd_uncore *);
                if (!amd_uncore_llc) {
                        ret = -ENOMEM;
index ca3c48c0872f4beba6b03ac92c50eb6a352b3006..73a712736e2ce68da1a5f53ef9a1d05588ec405f 100644 (file)
 #define X86_FEATURE_PERFCTR_NB  ( 6*32+24) /* NB performance counter extensions */
 #define X86_FEATURE_BPEXT      (6*32+26) /* data breakpoint extension */
 #define X86_FEATURE_PTSC       ( 6*32+27) /* performance time-stamp counter */
-#define X86_FEATURE_PERFCTR_L2 ( 6*32+28) /* L2 performance counter extensions */
+#define X86_FEATURE_PERFCTR_LLC        ( 6*32+28) /* Last Level Cache performance counter extensions */
 #define X86_FEATURE_MWAITX     ( 6*32+29) /* MWAIT extension (MONITORX/MWAITX) */
 
 /*