| From ba0bf86c953c0c5b392d50c4dbb69a89e237802e Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 27 May 2020 15:46:55 -0700 |
| Subject: perf/x86/rapl: Move RAPL support to common x86 code |
| |
| From: Stephane Eranian <eranian@google.com> |
| |
| [ Upstream commit fd3ae1e1587d64ef8cc8e361903d33625458073e ] |
| |
| To prepare for support of both Intel and AMD RAPL. |
| |
| As per the AMD PPR, Fam17h support Package RAPL counters to monitor power usage. |
| The RAPL counter operates as with Intel RAPL, and as such it is beneficial |
| to share the code. |
| |
| No change in functionality. |
| |
| Signed-off-by: Stephane Eranian <eranian@google.com> |
| Signed-off-by: Ingo Molnar <mingo@kernel.org> |
| Link: https://lore.kernel.org/r/20200527224659.206129-2-eranian@google.com |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/x86/events/Kconfig | 6 +++--- |
| arch/x86/events/Makefile | 1 + |
| arch/x86/events/intel/Makefile | 2 -- |
| arch/x86/events/{intel => }/rapl.c | 9 ++++++--- |
| 4 files changed, 10 insertions(+), 8 deletions(-) |
| rename arch/x86/events/{intel => }/rapl.c (98%) |
| |
| diff --git a/arch/x86/events/Kconfig b/arch/x86/events/Kconfig |
| index 9a7a1446cb3a0..4a809c6cbd2f5 100644 |
| --- a/arch/x86/events/Kconfig |
| +++ b/arch/x86/events/Kconfig |
| @@ -10,11 +10,11 @@ config PERF_EVENTS_INTEL_UNCORE |
| available on NehalemEX and more modern processors. |
| |
| config PERF_EVENTS_INTEL_RAPL |
| - tristate "Intel rapl performance events" |
| - depends on PERF_EVENTS && CPU_SUP_INTEL && PCI |
| + tristate "Intel/AMD rapl performance events" |
| + depends on PERF_EVENTS && (CPU_SUP_INTEL || CPU_SUP_AMD) && PCI |
| default y |
| ---help--- |
| - Include support for Intel rapl performance events for power |
| + Include support for Intel and AMD rapl performance events for power |
| monitoring on modern processors. |
| |
| config PERF_EVENTS_INTEL_CSTATE |
| diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile |
| index 9e07f554333fb..b418ef6878796 100644 |
| --- a/arch/x86/events/Makefile |
| +++ b/arch/x86/events/Makefile |
| @@ -1,5 +1,6 @@ |
| # SPDX-License-Identifier: GPL-2.0-only |
| obj-y += core.o probe.o |
| +obj-$(PERF_EVENTS_INTEL_RAPL) += rapl.o |
| obj-y += amd/ |
| obj-$(CONFIG_X86_LOCAL_APIC) += msr.o |
| obj-$(CONFIG_CPU_SUP_INTEL) += intel/ |
| diff --git a/arch/x86/events/intel/Makefile b/arch/x86/events/intel/Makefile |
| index 3468b0c1dc7c9..e67a5886336c1 100644 |
| --- a/arch/x86/events/intel/Makefile |
| +++ b/arch/x86/events/intel/Makefile |
| @@ -2,8 +2,6 @@ |
| obj-$(CONFIG_CPU_SUP_INTEL) += core.o bts.o |
| obj-$(CONFIG_CPU_SUP_INTEL) += ds.o knc.o |
| obj-$(CONFIG_CPU_SUP_INTEL) += lbr.o p4.o p6.o pt.o |
| -obj-$(CONFIG_PERF_EVENTS_INTEL_RAPL) += intel-rapl-perf.o |
| -intel-rapl-perf-objs := rapl.o |
| obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE) += intel-uncore.o |
| intel-uncore-objs := uncore.o uncore_nhmex.o uncore_snb.o uncore_snbep.o |
| obj-$(CONFIG_PERF_EVENTS_INTEL_CSTATE) += intel-cstate.o |
| diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/rapl.c |
| similarity index 98% |
| rename from arch/x86/events/intel/rapl.c |
| rename to arch/x86/events/rapl.c |
| index 5053a403e4ae0..3c222d6fdee3b 100644 |
| --- a/arch/x86/events/intel/rapl.c |
| +++ b/arch/x86/events/rapl.c |
| @@ -1,11 +1,14 @@ |
| // SPDX-License-Identifier: GPL-2.0-only |
| /* |
| - * Support Intel RAPL energy consumption counters |
| + * Support Intel/AMD RAPL energy consumption counters |
| * Copyright (C) 2013 Google, Inc., Stephane Eranian |
| * |
| * Intel RAPL interface is specified in the IA-32 Manual Vol3b |
| * section 14.7.1 (September 2013) |
| * |
| + * AMD RAPL interface for Fam17h is described in the public PPR: |
| + * https://bugzilla.kernel.org/show_bug.cgi?id=206537 |
| + * |
| * RAPL provides more controls than just reporting energy consumption |
| * however here we only expose the 3 energy consumption free running |
| * counters (pp0, pkg, dram). |
| @@ -58,8 +61,8 @@ |
| #include <linux/nospec.h> |
| #include <asm/cpu_device_id.h> |
| #include <asm/intel-family.h> |
| -#include "../perf_event.h" |
| -#include "../probe.h" |
| +#include "perf_event.h" |
| +#include "probe.h" |
| |
| MODULE_LICENSE("GPL"); |
| |
| -- |
| 2.25.1 |
| |