[PATCH 1/2] tools/power turbostat: Add Ice Lake NNPI support

[PATCH 1/2] tools/power turbostat: Add Ice Lake NNPI support

[Rajneesh Bhardwaj]

This enables turbostat utility on Ice Lake NNPI SoC.

Cc: Len Brown <lenb@kernel.org>
Cc: Linux PM <linux-pm@vger.kernel.org>
Link: https://lkml.org/lkml/2019/6/5/1034
Signed-off-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@linux.intel.com>
---
 tools/power/x86/turbostat/turbostat.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index c7727be9719f..d225cd373966 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -4594,6 +4594,7 @@ unsigned int intel_model_duplicates(unsigned int model)
 		return INTEL_FAM6_SKYLAKE_MOBILE;
 
 	case INTEL_FAM6_ICELAKE_MOBILE:
+	case INTEL_FAM6_ICELAKE_NNPI:
 		return INTEL_FAM6_CANNONLAKE_MOBILE;
 	}
 	return model;
-- 
2.17.1

[PATCH 2/2] powercap/rapl: Add Ice Lake NNPI support to RAPL driver

[Rajneesh Bhardwaj]

Enables support for ICL-NNPI, neural network processor for deep learning
inference. From RAPL point of view it is same as Ice Lake Mobile
processor.

Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: linux-pm@vger.kernel.org
Link: https://lkml.org/lkml/2019/6/5/1034
Signed-off-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@linux.intel.com>
---
 drivers/powercap/intel_rapl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c
index 4347f15165f8..19d470c73b6e 100644
--- a/drivers/powercap/intel_rapl.c
+++ b/drivers/powercap/intel_rapl.c
@@ -1156,7 +1156,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
 	INTEL_CPU_FAM6(KABYLAKE_MOBILE,		rapl_defaults_core),
 	INTEL_CPU_FAM6(KABYLAKE_DESKTOP,	rapl_defaults_core),
 	INTEL_CPU_FAM6(CANNONLAKE_MOBILE,	rapl_defaults_core),
-	INTEL_CPU_FAM6(ICELAKE_MOBILE,		rapl_defaults_core),
+	INTEL_CPU_FAM6(ICELAKE_NNPI,		rapl_defaults_core),
 
 	INTEL_CPU_FAM6(ATOM_SILVERMONT,		rapl_defaults_byt),
 	INTEL_CPU_FAM6(ATOM_AIRMONT,		rapl_defaults_cht),
-- 
2.17.1

Re: [PATCH 2/2] powercap/rapl: Add Ice Lake NNPI support to RAPL driver

[Bhardwaj, Rajneesh]

Hi Rafael

On 14-Jun-19 1:09 PM, Rajneesh Bhardwaj wrote:
> Enables support for ICL-NNPI, neural network processor for deep learning
> inference. From RAPL point of view it is same as Ice Lake Mobile
> processor.
>
> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
> Cc: linux-pm@vger.kernel.org
> Link: https://lkml.org/lkml/2019/6/5/1034
> Signed-off-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@linux.intel.com>
> ---
>   drivers/powercap/intel_rapl.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c
> index 4347f15165f8..19d470c73b6e 100644
> --- a/drivers/powercap/intel_rapl.c
> +++ b/drivers/powercap/intel_rapl.c
> @@ -1156,7 +1156,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
>   	INTEL_CPU_FAM6(KABYLAKE_MOBILE,		rapl_defaults_core),
>   	INTEL_CPU_FAM6(KABYLAKE_DESKTOP,	rapl_defaults_core),
>   	INTEL_CPU_FAM6(CANNONLAKE_MOBILE,	rapl_defaults_core),
> -	INTEL_CPU_FAM6(ICELAKE_MOBILE,		rapl_defaults_core),
> +	INTEL_CPU_FAM6(ICELAKE_NNPI,		rapl_defaults_core),

Sorry, i sent the wrong patch, please ignore this one. I will send 
another one.

Thanks.

>   	INTEL_CPU_FAM6(ATOM_SILVERMONT,		rapl_defaults_byt),
>   	INTEL_CPU_FAM6(ATOM_AIRMONT,		rapl_defaults_cht),