Re: [PATCH 1/2] powercap/rapl: add support for skx

From: Rafael J. Wysocki
Date: Mon Jun 13 2016 - 17:28:10 EST


On Monday, May 23, 2016 09:45:42 AM Jacob Pan wrote:
> SKX RAPL interface is similar to HSX/BDX.
>
> Signed-off-by: Jacob Pan <jacob.jun.pan@xxxxxxxxxxxxxxx>
> ---
> drivers/powercap/intel_rapl.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c
> index 470bb62..a417e68 100644
> --- a/drivers/powercap/intel_rapl.c
> +++ b/drivers/powercap/intel_rapl.c
> @@ -1096,6 +1096,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
> RAPL_CPU(0x4E, rapl_defaults_core),/* Skylake */
> RAPL_CPU(0x4C, rapl_defaults_cht),/* Braswell/Cherryview */
> RAPL_CPU(0x4A, rapl_defaults_tng),/* Tangier */
> + RAPL_CPU(0x55, rapl_defaults_hsw_server),/* Skylake server */
> RAPL_CPU(0x56, rapl_defaults_core),/* Future Xeon */
> RAPL_CPU(0x5A, rapl_defaults_ann),/* Annidale */
> RAPL_CPU(0X5C, rapl_defaults_core),/* Broxton */
>

Can you please rebase this on top of 4.7-rc3?

Thanks,
Rafael