diff mbox series

powercap: intel_rapl: Add support for RAPTORLAKE_P

Message ID 20220601192216.9174-1-george.d.sworo@intel.com
State Accepted
Commit 2755714656d0f2f41adfe231f3865e72da2cbe39
Headers show
Series powercap: intel_rapl: Add support for RAPTORLAKE_P | expand

Commit Message

Sworo, George D June 1, 2022, 7:22 p.m. UTC 
From: George D Sworo <george.d.sworo@intel.com>

Add RAPTORLAKE_P to the list of supported processor model in the Intel

RAPL power capping driver.

Signed-off-by: George D Sworo <george.d.sworo@intel.com>
---
 drivers/powercap/intel_rapl_common.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Rafael J. Wysocki June 9, 2022, 6:55 p.m. UTC | #1 
Rui, Srinivas, should I take this one?

On Wed, Jun 1, 2022 at 9:22 PM <george.d.sworo@intel.com> wrote:
>
> From: George D Sworo <george.d.sworo@intel.com>
>
> Add RAPTORLAKE_P to the list of supported processor model in the Intel
>
> RAPL power capping driver.
>
> Signed-off-by: George D Sworo <george.d.sworo@intel.com>
> ---
>  drivers/powercap/intel_rapl_common.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
> index a9c99d9e8b42..21d624f9f5fb 100644
> --- a/drivers/powercap/intel_rapl_common.c
> +++ b/drivers/powercap/intel_rapl_common.c
> @@ -1109,6 +1109,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
>         X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L,         &rapl_defaults_core),
>         X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_N,         &rapl_defaults_core),
>         X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE,          &rapl_defaults_core),
> +       X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P,        &rapl_defaults_core),
>         X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X,    &rapl_defaults_spr_server),
>         X86_MATCH_INTEL_FAM6_MODEL(LAKEFIELD,           &rapl_defaults_core),
>
> --
> 2.17.1
>
Srinivas Pandruvada June 9, 2022, 9:02 p.m. UTC | #2 
On Thu, 2022-06-09 at 20:55 +0200, Rafael J. Wysocki wrote:
> Rui, Srinivas, should I take this one?
> 
Yes.

Not sure if the RAPL-MMIO driver is loaded on this system.

George,

What is the output of
lspci -vv -s :0:4.0

If the device id is 0xA71D, then we have this change in the
upstream kernel. If not then we need to submit patch for that.

Thanks,
Srinivas

> On Wed, Jun 1, 2022 at 9:22 PM <george.d.sworo@intel.com> wrote:
> > 
> > From: George D Sworo <george.d.sworo@intel.com>
> > 
> > Add RAPTORLAKE_P to the list of supported processor model in the
> > Intel
> > 
> > RAPL power capping driver.
> > 
> > Signed-off-by: George D Sworo <george.d.sworo@intel.com>
> > ---
> >  drivers/powercap/intel_rapl_common.c | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/drivers/powercap/intel_rapl_common.c
> > b/drivers/powercap/intel_rapl_common.c
> > index a9c99d9e8b42..21d624f9f5fb 100644
> > --- a/drivers/powercap/intel_rapl_common.c
> > +++ b/drivers/powercap/intel_rapl_common.c
> > @@ -1109,6 +1109,7 @@ static const struct x86_cpu_id rapl_ids[]
> > __initconst = {
> >         X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L,        
> > &rapl_defaults_core),
> >         X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_N,        
> > &rapl_defaults_core),
> >         X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE,         
> > &rapl_defaults_core),
> > +       X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P,       
> > &rapl_defaults_core),
> >         X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X,   
> > &rapl_defaults_spr_server),
> >         X86_MATCH_INTEL_FAM6_MODEL(LAKEFIELD,          
> > &rapl_defaults_core),
> > 
> > --
> > 2.17.1
> >
Srinivas Pandruvada June 9, 2022, 10:10 p.m. UTC | #3 
On Thu, 2022-06-09 at 21:47 +0000, Sworo, George D wrote:
> On Thu, 2022-06-09 at 14:02 -0700, srinivas pandruvada wrote:
> > On Thu, 2022-06-09 at 20:55 +0200, Rafael J. Wysocki wrote:
> > > Rui, Srinivas, should I take this one?
> > > 
> > Yes.
> > 
> > Not sure if the RAPL-MMIO driver is loaded on this system.
> > 
> > George,
> > 
> > What is the output of
> > lspci -vv -s :0:4.0
> > 
> > If the device id is 0xA71D, then we have this change in the
> > upstream kernel. If not then we need to submit patch for that.
> > 
> > Thanks,
> > Srinivas
> > 
> Thanks for the quick review.
> 
> the device id is 0xA71D
We have upstream patch for this ID. So we are good.

Thanks,
Srinivas

>  is not avaible without this patch. But when
> add it i can see the ID. Below are the outputs
> 
> Output from a kernel without this patch:
> -------------------------------------
> localhost ~ # lspci -vv -s :0:4.0
> 00:04.0 Signal processing controller: Intel Corporation Alder Lake
> Innovation Platform Framework Processor Participant (rev 03)
>         Subsystem: Intel Corporation Device 7270
>         Control: I/O- Mem+ BusMaster- SpecCycle- MemWINV- VGASnoop-
> 
> Output with this patch added:
> ----------------------------------------
> localhost ~ # lspci -vv -s :0:4.0
> 00:04.0 Signal processing controller: Intel Corporation Device a71d
> 
> > > On Wed, Jun 1, 2022 at 9:22 PM <george.d.sworo@intel.com> wrote:
> > > > From: George D Sworo <george.d.sworo@intel.com>
> > > > 
> > > > Add RAPTORLAKE_P to the list of supported processor model in
> > > > the
> > > > Intel
> > > > 
> > > > RAPL power capping driver.
> > > > 
> > > > Signed-off-by: George D Sworo <george.d.sworo@intel.com>
> > > > ---
> > > >  drivers/powercap/intel_rapl_common.c | 1 +
> > > >  1 file changed, 1 insertion(+)
> > > > 
> > > > diff --git a/drivers/powercap/intel_rapl_common.c
> > > > b/drivers/powercap/intel_rapl_common.c
> > > > index a9c99d9e8b42..21d624f9f5fb 100644
> > > > --- a/drivers/powercap/intel_rapl_common.c
> > > > +++ b/drivers/powercap/intel_rapl_common.c
> > > > @@ -1109,6 +1109,7 @@ static const struct x86_cpu_id rapl_ids[]
> > > > __initconst = {
> > > >         X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L,        
> > > > &rapl_defaults_core),
> > > >         X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_N,        
> > > > &rapl_defaults_core),
> > > >         X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE,         
> > > > &rapl_defaults_core),
> > > > +       X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P,       
> > > > &rapl_defaults_core),
> > > >         X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X,   
> > > > &rapl_defaults_spr_server),
> > > >         X86_MATCH_INTEL_FAM6_MODEL(LAKEFIELD,          
> > > > &rapl_defaults_core),
> > > > 
> > > > --
> > > > 2.17.1
> > > >
Sumeet Pawnikar June 21, 2022, 2:49 p.m. UTC | #4 
> -----Original Message-----
> From: Sworo, George D <george.d.sworo@intel.com>
> Sent: Friday, June 10, 2022 9:02 AM
> To: Zhang, Rui <rui.zhang@intel.com>; srinivas.pandruvada@linux.intel.com;
> rafael@kernel.org
> Cc: linux-pm@vger.kernel.org
> Subject: Re: [PATCH] powercap: intel_rapl: Add support for RAPTORLAKE_P
> 
> On Fri, 2022-06-10 at 10:26 +0800, Zhang Rui wrote:
> > On Thu, 2022-06-09 at 20:55 +0200, Rafael J. Wysocki wrote:
> > > Rui, Srinivas, should I take this one?
> >
> > Sorry that I missed this one.
> >
> > George,
> >
> > Have this patch been tested yet?
> yes. This is tested on RPL SOC. Thanks
> > I have the same patch internally, it should work but I haven't got
> > chance to test it yet.
> >
> > thanks,
> > rui
> > > On Wed, Jun 1, 2022 at 9:22 PM <george.d.sworo@intel.com> wrote:
> > > > From: George D Sworo <george.d.sworo@intel.com>
> > > >
> > > > Add RAPTORLAKE_P to the list of supported processor model in the
> > > > Intel
> > > >
> > > > RAPL power capping driver.
> > > >
> > > > Signed-off-by: George D Sworo <george.d.sworo@intel.com>

Hi George, 
Thank you for this patch. 
I have tested this on Raptor Lake system and it works. 

Tested-by: Sumeet Pawnikar <sumeet.r.pawnikar@intel.com> 

Thanks,
Sumeet. 

> > > > ---
> > > >  drivers/powercap/intel_rapl_common.c | 1 +
> > > >  1 file changed, 1 insertion(+)
> > > >
> > > > diff --git a/drivers/powercap/intel_rapl_common.c
> > > > b/drivers/powercap/intel_rapl_common.c
> > > > index a9c99d9e8b42..21d624f9f5fb 100644
> > > > --- a/drivers/powercap/intel_rapl_common.c
> > > > +++ b/drivers/powercap/intel_rapl_common.c
> > > > @@ -1109,6 +1109,7 @@ static const struct x86_cpu_id rapl_ids[]
> > > > __initconst = {
> > > >         X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L,         &rapl_def
> > > > au
> > > > lts_core),
> > > >         X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_N,         &rapl_def
> > > > au
> > > > lts_core),
> > > >         X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE,          &rapl_def
> > > > au
> > > > lts_core),
> > > > +       X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P,        &rapl_def
> > > > au
> > > > lts_core),
> > > >         X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X,    &rapl_def
> > > > au
> > > > lts_spr_server),
> > > >         X86_MATCH_INTEL_FAM6_MODEL(LAKEFIELD,           &rapl_def
> > > > au
> > > > lts_core),
> > > >
> > > > --
> > > > 2.17.1
> > > >
Sworo, George D June 21, 2022, 7:22 p.m. UTC | #5 
On Tue, 2022-06-21 at 14:49 +0000, Pawnikar, Sumeet R wrote:
> > -----Original Message-----
> > From: Sworo, George D <george.d.sworo@intel.com>
> > Sent: Friday, June 10, 2022 9:02 AM
> > To: Zhang, Rui <rui.zhang@intel.com>; 
> > srinivas.pandruvada@linux.intel.com;
> > rafael@kernel.org
> > Cc: linux-pm@vger.kernel.org
> > Subject: Re: [PATCH] powercap: intel_rapl: Add support for
> > RAPTORLAKE_P
> > 
> > On Fri, 2022-06-10 at 10:26 +0800, Zhang Rui wrote:
> > > On Thu, 2022-06-09 at 20:55 +0200, Rafael J. Wysocki wrote:
> > > > Rui, Srinivas, should I take this one?
> > > 
> > > Sorry that I missed this one.
> > > 
> > > George,
> > > 
> > > Have this patch been tested yet?
> > yes. This is tested on RPL SOC. Thanks
> > > I have the same patch internally, it should work but I haven't
> > > got
> > > chance to test it yet.
> > > 
> > > thanks,
> > > rui
> > > > On Wed, Jun 1, 2022 at 9:22 PM <george.d.sworo@intel.com>
> > > > wrote:
> > > > > From: George D Sworo <george.d.sworo@intel.com>
> > > > > 
> > > > > Add RAPTORLAKE_P to the list of supported processor model in
> > > > > the
> > > > > Intel
> > > > > 
> > > > > RAPL power capping driver.
> > > > > 
> > > > > Signed-off-by: George D Sworo <george.d.sworo@intel.com>
> 
> Hi George, 
> Thank you for this patch. 
> I have tested this on Raptor Lake system and it works. 
> 
> Tested-by: Sumeet Pawnikar <sumeet.r.pawnikar@intel.com> 
> 
> Thanks,
> Sumeet. 
> 
Thanks Sumeet for confirming!
@Rafael, let me know if you have further comments
> > > > > ---
> > > > >  drivers/powercap/intel_rapl_common.c | 1 +
> > > > >  1 file changed, 1 insertion(+)
> > > > > 
> > > > > diff --git a/drivers/powercap/intel_rapl_common.c
> > > > > b/drivers/powercap/intel_rapl_common.c
> > > > > index a9c99d9e8b42..21d624f9f5fb 100644
> > > > > --- a/drivers/powercap/intel_rapl_common.c
> > > > > +++ b/drivers/powercap/intel_rapl_common.c
> > > > > @@ -1109,6 +1109,7 @@ static const struct x86_cpu_id
> > > > > rapl_ids[]
> > > > > __initconst = {
> > > > >         X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L,         &rapl
> > > > > _def
> > > > > au
> > > > > lts_core),
> > > > >         X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_N,         &rapl
> > > > > _def
> > > > > au
> > > > > lts_core),
> > > > >         X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE,          &rapl
> > > > > _def
> > > > > au
> > > > > lts_core),
> > > > > +       X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P,        &rapl
> > > > > _def
> > > > > au
> > > > > lts_core),
> > > > >         X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X,    &rapl
> > > > > _def
> > > > > au
> > > > > lts_spr_server),
> > > > >         X86_MATCH_INTEL_FAM6_MODEL(LAKEFIELD,           &rapl
> > > > > _def
> > > > > au
> > > > > lts_core),
> > > > > 
> > > > > --
> > > > > 2.17.1
> > > > >
Rafael J. Wysocki July 5, 2022, 7:01 p.m. UTC | #6 
On Tue, Jun 21, 2022 at 9:22 PM Sworo, George D
<george.d.sworo@intel.com> wrote:
>
> On Tue, 2022-06-21 at 14:49 +0000, Pawnikar, Sumeet R wrote:
> > > -----Original Message-----
> > > From: Sworo, George D <george.d.sworo@intel.com>
> > > Sent: Friday, June 10, 2022 9:02 AM
> > > To: Zhang, Rui <rui.zhang@intel.com>;
> > > srinivas.pandruvada@linux.intel.com;
> > > rafael@kernel.org
> > > Cc: linux-pm@vger.kernel.org
> > > Subject: Re: [PATCH] powercap: intel_rapl: Add support for
> > > RAPTORLAKE_P
> > >
> > > On Fri, 2022-06-10 at 10:26 +0800, Zhang Rui wrote:
> > > > On Thu, 2022-06-09 at 20:55 +0200, Rafael J. Wysocki wrote:
> > > > > Rui, Srinivas, should I take this one?
> > > >
> > > > Sorry that I missed this one.
> > > >
> > > > George,
> > > >
> > > > Have this patch been tested yet?
> > > yes. This is tested on RPL SOC. Thanks
> > > > I have the same patch internally, it should work but I haven't
> > > > got
> > > > chance to test it yet.
> > > >
> > > > thanks,
> > > > rui
> > > > > On Wed, Jun 1, 2022 at 9:22 PM <george.d.sworo@intel.com>
> > > > > wrote:
> > > > > > From: George D Sworo <george.d.sworo@intel.com>
> > > > > >
> > > > > > Add RAPTORLAKE_P to the list of supported processor model in
> > > > > > the
> > > > > > Intel
> > > > > >
> > > > > > RAPL power capping driver.
> > > > > >
> > > > > > Signed-off-by: George D Sworo <george.d.sworo@intel.com>
> >
> > Hi George,
> > Thank you for this patch.
> > I have tested this on Raptor Lake system and it works.
> >
> > Tested-by: Sumeet Pawnikar <sumeet.r.pawnikar@intel.com>
> >
> > Thanks,
> > Sumeet.
> >
> Thanks Sumeet for confirming!
> @Rafael, let me know if you have further comments

I've applied the patch as 5.20 material with a couple of minor edits
in the changelog.

Thanks!


> > > > > > ---
> > > > > >  drivers/powercap/intel_rapl_common.c | 1 +
> > > > > >  1 file changed, 1 insertion(+)
> > > > > >
> > > > > > diff --git a/drivers/powercap/intel_rapl_common.c
> > > > > > b/drivers/powercap/intel_rapl_common.c
> > > > > > index a9c99d9e8b42..21d624f9f5fb 100644
> > > > > > --- a/drivers/powercap/intel_rapl_common.c
> > > > > > +++ b/drivers/powercap/intel_rapl_common.c
> > > > > > @@ -1109,6 +1109,7 @@ static const struct x86_cpu_id
> > > > > > rapl_ids[]
> > > > > > __initconst = {
> > > > > >         X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L,         &rapl
> > > > > > _def
> > > > > > au
> > > > > > lts_core),
> > > > > >         X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_N,         &rapl
> > > > > > _def
> > > > > > au
> > > > > > lts_core),
> > > > > >         X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE,          &rapl
> > > > > > _def
> > > > > > au
> > > > > > lts_core),
> > > > > > +       X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P,        &rapl
> > > > > > _def
> > > > > > au
> > > > > > lts_core),
> > > > > >         X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X,    &rapl
> > > > > > _def
> > > > > > au
> > > > > > lts_spr_server),
> > > > > >         X86_MATCH_INTEL_FAM6_MODEL(LAKEFIELD,           &rapl
> > > > > > _def
> > > > > > au
> > > > > > lts_core),
> > > > > >
> > > > > > --
> > > > > > 2.17.1
> > > > > >
diff mbox series

Patch

diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
index a9c99d9e8b42..21d624f9f5fb 100644
--- a/drivers/powercap/intel_rapl_common.c
+++ b/drivers/powercap/intel_rapl_common.c
@@ -1109,6 +1109,7 @@  static const struct x86_cpu_id rapl_ids[] __initconst = {
 	X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L,		&rapl_defaults_core),
 	X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_N,		&rapl_defaults_core),
 	X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE,		&rapl_defaults_core),
+	X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P,        &rapl_defaults_core),
 	X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X,	&rapl_defaults_spr_server),
 	X86_MATCH_INTEL_FAM6_MODEL(LAKEFIELD,		&rapl_defaults_core),