Re: [PATCH v4 0/2] Skylake PSys support
From: Peter Zijlstra
Date: Wed Apr 20 2016 - 09:59:57 EST
On Sun, Apr 17, 2016 at 03:02:59PM -0700, Srinivas Pandruvada wrote:
> Skylake processor supports a new set of RAPL registers for controlling
> entire SoC instead of just CPU package called PSys. This change adds
> support in two sub systems:
> x86/perf: Adds basic support for Skylake RAPL and PSys support
> powercap/rapl: A new platform domain to the current power capping Intel
> RAPL driver.
> Srinivas Pandruvada (2):
> perf/x86/intel/rapl: support Skylake RAPL domains
> powercap: intel_rapl: PSys support
> arch/x86/events/intel/rapl.c | 51 +++++++++++++++++++++++++++--
> arch/x86/include/asm/msr-index.h | 2 ++
> drivers/powercap/intel_rapl.c | 69 ++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 120 insertions(+), 2 deletions(-)
These two patches depend on one another, right? Because the first patch
adds the MSR the second patch uses?
How should we go about merging this? The perf-rapl stuff normally goes
through tip while the powercap stuff goes through Rafael's tree.