[Xenial,1/1] powercap/intel_rapl: Add support for Kabylake

Submitted by Kai-Heng Feng on April 7, 2017, 3:19 p.m.

Details

Message ID 20170407151934.14735-2-kai.heng.feng@canonical.com
State New
Headers show

Commit Message

Kai-Heng Feng April 7, 2017, 3:19 p.m.
From: Jacob Pan <jacob.jun.pan@linux.intel.com>

BugLink: https://bugs.launchpad.net/bugs/1591640

Kabylake is similar to Skylake in terms of RAPL.

Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit 6c51cc0203de25aeaff9d0236d6c2b497be93e3b)
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
---
 drivers/powercap/intel_rapl.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Tim Gardner April 7, 2017, 9:02 p.m.

Colin King April 11, 2017, 7:17 a.m.
On 07/04/17 16:19, Kai-Heng Feng wrote:
> From: Jacob Pan <jacob.jun.pan@linux.intel.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1591640
> 
> Kabylake is similar to Skylake in terms of RAPL.
> 
> Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> (cherry picked from commit 6c51cc0203de25aeaff9d0236d6c2b497be93e3b)
> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
> ---
>  drivers/powercap/intel_rapl.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c
> index 48747c28a43d..0954637c4894 100644
> --- a/drivers/powercap/intel_rapl.c
> +++ b/drivers/powercap/intel_rapl.c
> @@ -1105,6 +1105,8 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
>  	RAPL_CPU(0X5C, rapl_defaults_core),/* Broxton */
>  	RAPL_CPU(0x5E, rapl_defaults_core),/* Skylake-H/S */
>  	RAPL_CPU(0x57, rapl_defaults_hsw_server),/* Knights Landing */
> +	RAPL_CPU(0x8E, rapl_defaults_core),/* Kabylake */
> +	RAPL_CPU(0x9E, rapl_defaults_core),/* Kabylake */
>  	{}
>  };
>  MODULE_DEVICE_TABLE(x86cpu, rapl_ids);
> 
Upstream cherry pick. Looks OK to me.

Acked-by: Colin Ian King <colin.king@canonical.com>
Stefan Bader April 13, 2017, 1:32 p.m.

Patch hide | download patch | download mbox

diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c
index 48747c28a43d..0954637c4894 100644
--- a/drivers/powercap/intel_rapl.c
+++ b/drivers/powercap/intel_rapl.c
@@ -1105,6 +1105,8 @@  static const struct x86_cpu_id rapl_ids[] __initconst = {
 	RAPL_CPU(0X5C, rapl_defaults_core),/* Broxton */
 	RAPL_CPU(0x5E, rapl_defaults_core),/* Skylake-H/S */
 	RAPL_CPU(0x57, rapl_defaults_hsw_server),/* Knights Landing */
+	RAPL_CPU(0x8E, rapl_defaults_core),/* Kabylake */
+	RAPL_CPU(0x9E, rapl_defaults_core),/* Kabylake */
 	{}
 };
 MODULE_DEVICE_TABLE(x86cpu, rapl_ids);