diff mbox series

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

Message ID 20190614080523.13464-1-rajneesh.bhardwaj@linux.intel.com (mailing list archive)
State Superseded, archived
Headers show
Series None | expand

Commit Message

Bhardwaj, Rajneesh June 14, 2019, 8:05 a.m. UTC
Enables support for ICL-NNPI, which is a 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 | 1 +
 1 file changed, 1 insertion(+)

Comments

Rafael J. Wysocki June 27, 2019, 10:02 p.m. UTC | #1
On Friday, June 14, 2019 10:05:23 AM CEST Rajneesh Bhardwaj wrote:
> Enables support for ICL-NNPI, which is a 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 | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c
> index 4347f15165f8..431c8c8bdf07 100644
> --- a/drivers/powercap/intel_rapl.c
> +++ b/drivers/powercap/intel_rapl.c
> @@ -1157,6 +1157,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
>  	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),
> 

It is in my queue, but I get build errors when I try to apply it.

I guess the definition of ICELAKE_NNPI is not there in the Linus' tree yet.
Bhardwaj, Rajneesh June 28, 2019, 8:21 a.m. UTC | #2
On 28-Jun-19 3:32 AM, Rafael J. Wysocki wrote:
> On Friday, June 14, 2019 10:05:23 AM CEST Rajneesh Bhardwaj wrote:
>> Enables support for ICL-NNPI, which is a 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 | 1 +
>>   1 file changed, 1 insertion(+)
>>
>> diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c
>> index 4347f15165f8..431c8c8bdf07 100644
>> --- a/drivers/powercap/intel_rapl.c
>> +++ b/drivers/powercap/intel_rapl.c
>> @@ -1157,6 +1157,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
>>   	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),
>>
> It is in my queue, but I get build errors when I try to apply it.
>
> I guess the definition of ICELAKE_NNPI is not there in the Linus' tree yet.

Yes, though 
https://www.spinics.net/lists/linux-tip-commits/msg48978.html is 
accepted by Thomas already.


>
>
>
Rafael J. Wysocki July 5, 2019, 10:13 a.m. UTC | #3
On Friday, June 28, 2019 10:21:41 AM CEST Bhardwaj, Rajneesh wrote:
> 
> On 28-Jun-19 3:32 AM, Rafael J. Wysocki wrote:
> > On Friday, June 14, 2019 10:05:23 AM CEST Rajneesh Bhardwaj wrote:
> >> Enables support for ICL-NNPI, which is a 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 | 1 +
> >>   1 file changed, 1 insertion(+)
> >>
> >> diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c
> >> index 4347f15165f8..431c8c8bdf07 100644
> >> --- a/drivers/powercap/intel_rapl.c
> >> +++ b/drivers/powercap/intel_rapl.c
> >> @@ -1157,6 +1157,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
> >>   	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),
> >>
> > It is in my queue, but I get build errors when I try to apply it.
> >
> > I guess the definition of ICELAKE_NNPI is not there in the Linus' tree yet.
> 
> Yes, though 
> https://www.spinics.net/lists/linux-tip-commits/msg48978.html is 
> accepted by Thomas already.

It is not in 5.2-rc7, though, AFAICS.

The patch is still in my queue and waiting.
Bhardwaj, Rajneesh July 25, 2019, 8:01 a.m. UTC | #4
Hi Rafael,

On 05-Jul-19 3:43 PM, Rafael J. Wysocki wrote:
> On Friday, June 28, 2019 10:21:41 AM CEST Bhardwaj, Rajneesh wrote:
>> On 28-Jun-19 3:32 AM, Rafael J. Wysocki wrote:
>>> On Friday, June 14, 2019 10:05:23 AM CEST Rajneesh Bhardwaj wrote:
>>>> Enables support for ICL-NNPI, which is a 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 | 1 +
>>>>    1 file changed, 1 insertion(+)
>>>>
>>>> diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c
>>>> index 4347f15165f8..431c8c8bdf07 100644
>>>> --- a/drivers/powercap/intel_rapl.c
>>>> +++ b/drivers/powercap/intel_rapl.c
>>>> @@ -1157,6 +1157,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
>>>>    	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),
>>>>
>>> It is in my queue, but I get build errors when I try to apply it.
>>>
>>> I guess the definition of ICELAKE_NNPI is not there in the Linus' tree yet.
>> Yes, though
>> https://www.spinics.net/lists/linux-tip-commits/msg48978.html is
>> accepted by Thomas already.
> It is not in 5.2-rc7, though, AFAICS.
>
> The patch is still in my queue and waiting.


The CPUID patch on which this change depends is upstream now. 
https://github.com/torvalds/linux/blob/bed38c3e2dca01b358a62b5e73b46e875742fd75/arch/x86/include/asm/intel-family.h#L59 


Thank you

Rajneesh

>
>
>
Bhardwaj, Rajneesh July 25, 2019, 8:03 a.m. UTC | #5
Hi Rafael

On 28-Jun-19 3:32 AM, Rafael J. Wysocki wrote:
> On Friday, June 14, 2019 10:05:23 AM CEST Rajneesh Bhardwaj wrote:
>> Enables support for ICL-NNPI, which is a 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 | 1 +
>>   1 file changed, 1 insertion(+)
>>
>> diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c
>> index 4347f15165f8..431c8c8bdf07 100644
>> --- a/drivers/powercap/intel_rapl.c
>> +++ b/drivers/powercap/intel_rapl.c
>> @@ -1157,6 +1157,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
>>   	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),
>>
> It is in my queue, but I get build errors when I try to apply it.
>
> I guess the definition of ICELAKE_NNPI is not there in the Linus' tree yet.

The dependent patch is now available in mainline, so can you please 
apply this one?

https://github.com/torvalds/linux/blob/bed38c3e2dca01b358a62b5e73b46e875742fd75/arch/x86/include/asm/intel-family.h#L59 


Thanks

Rajneesh


>
>
>
Rafael J. Wysocki July 25, 2019, 8:25 a.m. UTC | #6
On Thu, Jul 25, 2019 at 10:03 AM Bhardwaj, Rajneesh
<rajneesh.bhardwaj@linux.intel.com> wrote:
>
> Hi Rafael
>
> On 28-Jun-19 3:32 AM, Rafael J. Wysocki wrote:
> > On Friday, June 14, 2019 10:05:23 AM CEST Rajneesh Bhardwaj wrote:
> >> Enables support for ICL-NNPI, which is a 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 | 1 +
> >>   1 file changed, 1 insertion(+)
> >>
> >> diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c
> >> index 4347f15165f8..431c8c8bdf07 100644
> >> --- a/drivers/powercap/intel_rapl.c
> >> +++ b/drivers/powercap/intel_rapl.c
> >> @@ -1157,6 +1157,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
> >>      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),
> >>
> > It is in my queue, but I get build errors when I try to apply it.
> >
> > I guess the definition of ICELAKE_NNPI is not there in the Linus' tree yet.
>
> The dependent patch is now available in mainline, so can you please
> apply this one?
>
> https://github.com/torvalds/linux/blob/bed38c3e2dca01b358a62b5e73b46e875742fd75/arch/x86/include/asm/intel-family.h#L59

It's already been applied along with the Rui's series.
diff mbox series

Patch

diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c
index 4347f15165f8..431c8c8bdf07 100644
--- a/drivers/powercap/intel_rapl.c
+++ b/drivers/powercap/intel_rapl.c
@@ -1157,6 +1157,7 @@  static const struct x86_cpu_id rapl_ids[] __initconst = {
 	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),