* [PATCH 1/2] powercap: intel_rapl: Add support for MeteorLake platforms
@ 2022-09-10 13:15 Zhang Rui
2022-09-10 13:15 ` [PATCH 2/2] tools/power turbostat: " Zhang Rui
2022-09-10 16:44 ` [PATCH 1/2] powercap: intel_rapl: " Rafael J. Wysocki
0 siblings, 2 replies; 4+ messages in thread
From: Zhang Rui @ 2022-09-10 13:15 UTC (permalink / raw)
To: rjw; +Cc: linux-pm, rui.zhang
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(+)
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),
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] tools/power turbostat: Add support for MeteorLake platforms
2022-09-10 13:15 [PATCH 1/2] powercap: intel_rapl: Add support for MeteorLake platforms Zhang Rui
@ 2022-09-10 13:15 ` Zhang Rui
2022-09-10 16:44 ` [PATCH 1/2] powercap: intel_rapl: " Rafael J. Wysocki
1 sibling, 0 replies; 4+ messages in thread
From: Zhang Rui @ 2022-09-10 13:15 UTC (permalink / raw)
To: rjw; +Cc: linux-pm, rui.zhang
Add turbostat support for 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 patch
"tools/power turbostat: add support for RPL-S" at
https://patchwork.kernel.org/project/linux-pm/patch/20220831064957.1773-1-rui.zhang@intel.com/
to avoid conflict.
---
tools/power/x86/turbostat/turbostat.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index df040d87edd8..597cc2dbc456 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -5448,6 +5448,8 @@ unsigned int intel_model_duplicates(unsigned int model)
case INTEL_FAM6_RAPTORLAKE:
case INTEL_FAM6_RAPTORLAKE_P:
case INTEL_FAM6_RAPTORLAKE_S:
+ case INTEL_FAM6_METEORLAKE:
+ case INTEL_FAM6_METEORLAKE_L:
return INTEL_FAM6_CANNONLAKE_L;
case INTEL_FAM6_ATOM_TREMONT_L:
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 1/2] powercap: intel_rapl: Add support for MeteorLake platforms
2022-09-10 13:15 [PATCH 1/2] powercap: intel_rapl: Add support for MeteorLake platforms Zhang Rui
2022-09-10 13:15 ` [PATCH 2/2] tools/power turbostat: " Zhang Rui
@ 2022-09-10 16:44 ` Rafael J. Wysocki
2022-09-11 4:08 ` Zhang Rui
1 sibling, 1 reply; 4+ messages in thread
From: Rafael J. Wysocki @ 2022-09-10 16:44 UTC (permalink / raw)
To: Zhang Rui; +Cc: Rafael J. Wysocki, Linux PM
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),
>
> --
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 1/2] powercap: intel_rapl: Add support for MeteorLake platforms
2022-09-10 16:44 ` [PATCH 1/2] powercap: intel_rapl: " Rafael J. Wysocki
@ 2022-09-11 4:08 ` Zhang Rui
0 siblings, 0 replies; 4+ messages in thread
From: Zhang Rui @ 2022-09-11 4:08 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Rafael J. Wysocki, Linux PM
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),
> >
> > --
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-09-11 4:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-10 13:15 [PATCH 1/2] powercap: intel_rapl: Add support for MeteorLake platforms Zhang Rui
2022-09-10 13:15 ` [PATCH 2/2] tools/power turbostat: " Zhang Rui
2022-09-10 16:44 ` [PATCH 1/2] powercap: intel_rapl: " Rafael J. Wysocki
2022-09-11 4:08 ` Zhang Rui
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox