diff mbox series

[1/2] powercap: intel_rapl: Add support for MeteorLake platforms

Message ID 20220910131542.22708-1-rui.zhang@intel.com
State Superseded
Headers show
Series [1/2] powercap: intel_rapl: Add support for MeteorLake platforms | expand

Commit Message

Zhang, Rui Sept. 10, 2022, 1:15 p.m. UTC
Add intel_rapl support for the MeteorLake platforms, which behave the
same as RaptorLake platforms.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
---

Note:
This patch depends on commit 5515d21c6817
("x86/cpu: Add CPU model numbers for Meteor Lake") in the x86/urgent
branch of tip tree.

Note:
This patch is made on top of commit 0d7a23b5f8e1
("powercap: intel_rapl: Add support for RAPTORLAKE_S") in the
linux-next branch of pm tree to avoid conflict.

---
 drivers/powercap/intel_rapl_common.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Rafael J. Wysocki Sept. 10, 2022, 4:44 p.m. UTC | #1
On Sat, Sep 10, 2022 at 3:12 PM Zhang Rui <rui.zhang@intel.com> wrote:
>
> Add intel_rapl support for the MeteorLake platforms, which behave the
> same as RaptorLake platforms.
>
> Signed-off-by: Zhang Rui <rui.zhang@intel.com>
> ---
>
> Note:
> This patch depends on commit 5515d21c6817
> ("x86/cpu: Add CPU model numbers for Meteor Lake") in the x86/urgent
> branch of tip tree.

So I think I will have to rebase the powercap branch on top of a
future -rc in order to apply this one.

> Note:
> This patch is made on top of commit 0d7a23b5f8e1
> ("powercap: intel_rapl: Add support for RAPTORLAKE_S") in the
> linux-next branch of pm tree to avoid conflict.
>
> ---
>  drivers/powercap/intel_rapl_common.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
> index 6812c1ca3100..949eb90f5733 100644
> --- a/drivers/powercap/intel_rapl_common.c
> +++ b/drivers/powercap/intel_rapl_common.c
> @@ -1111,6 +1111,8 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
>         X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE,          &rapl_defaults_core),
>         X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P,        &rapl_defaults_core),
>         X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S,        &rapl_defaults_core),
> +       X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE,          &rapl_defaults_core),
> +       X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L,        &rapl_defaults_core),
>         X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X,    &rapl_defaults_spr_server),
>         X86_MATCH_INTEL_FAM6_MODEL(LAKEFIELD,           &rapl_defaults_core),
>
> --
Zhang, Rui Sept. 11, 2022, 4:08 a.m. UTC | #2
On Sat, 2022-09-10 at 18:44 +0200, Rafael J. Wysocki wrote:
> On Sat, Sep 10, 2022 at 3:12 PM Zhang Rui <rui.zhang@intel.com>
> wrote:
> > Add intel_rapl support for the MeteorLake platforms, which behave
> > the
> > same as RaptorLake platforms.
> > 
> > Signed-off-by: Zhang Rui <rui.zhang@intel.com>
> > ---
> > 
> > Note:
> > This patch depends on commit 5515d21c6817
> > ("x86/cpu: Add CPU model numbers for Meteor Lake") in the
> > x86/urgent
> > branch of tip tree.
> 
> So I think I will have to rebase the powercap branch on top of a
> future -rc in order to apply this one.

Yeah, or we can wait for the next release cycle as this is not that
urgent.

thanks,
rui
> 
> > Note:
> > This patch is made on top of commit 0d7a23b5f8e1
> > ("powercap: intel_rapl: Add support for RAPTORLAKE_S") in the
> > linux-next branch of pm tree to avoid conflict.
> > 
> > ---
> >  drivers/powercap/intel_rapl_common.c | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/drivers/powercap/intel_rapl_common.c
> > b/drivers/powercap/intel_rapl_common.c
> > index 6812c1ca3100..949eb90f5733 100644
> > --- a/drivers/powercap/intel_rapl_common.c
> > +++ b/drivers/powercap/intel_rapl_common.c
> > @@ -1111,6 +1111,8 @@ static const struct x86_cpu_id rapl_ids[]
> > __initconst = {
> >         X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE,          &rapl_defau
> > lts_core),
> >         X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P,        &rapl_defau
> > lts_core),
> >         X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S,        &rapl_defau
> > lts_core),
> > +       X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE,          &rapl_defau
> > lts_core),
> > +       X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L,        &rapl_defau
> > lts_core),
> >         X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X,    &rapl_defau
> > lts_spr_server),
> >         X86_MATCH_INTEL_FAM6_MODEL(LAKEFIELD,           &rapl_defau
> > lts_core),
> > 
> > --
diff mbox series

Patch

diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
index 6812c1ca3100..949eb90f5733 100644
--- a/drivers/powercap/intel_rapl_common.c
+++ b/drivers/powercap/intel_rapl_common.c
@@ -1111,6 +1111,8 @@  static const struct x86_cpu_id rapl_ids[] __initconst = {
 	X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE,		&rapl_defaults_core),
 	X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P,        &rapl_defaults_core),
 	X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S,	&rapl_defaults_core),
+	X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE,		&rapl_defaults_core),
+	X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L,	&rapl_defaults_core),
 	X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X,	&rapl_defaults_spr_server),
 	X86_MATCH_INTEL_FAM6_MODEL(LAKEFIELD,		&rapl_defaults_core),