| Message ID | 20220830030134.8111-1-rui.zhang@intel.com |
|---|---|
| State | Accepted |
| Commit | 0d7a23b5f8e162bf2c5caab06f5df4aee2619073 |
| Headers | show |
| Series | powercap: intel_rapl: Add support for RAPTORLAKE_S | expand |
On Tue, Aug 30, 2022 at 5:01 AM Zhang Rui <rui.zhang@intel.com> wrote: > > Note that this patch depends on commit > ea902bcc1943 ("x86/cpu: Add new Raptor Lake CPU model number") which > was merged in 6.0-rc3. > > thanks, > rui > > On Tue, 2022-08-30 at 11:01 +0800, Zhang Rui wrote: > > Add intel_rapl support for RAPTORLAKE_S platform, which behaves the > > same > > as RAPTORLAKE and RAPTORLAKE_P platforms. > > > > Signed-off-by: Zhang Rui <rui.zhang@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 21d624f9f5fb..6812c1ca3100 100644 > > --- a/drivers/powercap/intel_rapl_common.c > > +++ b/drivers/powercap/intel_rapl_common.c > > @@ -1110,6 +1110,7 @@ static const struct x86_cpu_id rapl_ids[] > > __initconst = { > > X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_N, &rapl_default > > s_core), > > X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, &rapl_default > > s_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(SAPPHIRERAPIDS_X, &rapl_default > > s_spr_server), > > X86_MATCH_INTEL_FAM6_MODEL(LAKEFIELD, &rapl_default > > s_core), > > Applied as 6.1 material, on top of 6.0-rc3. Thanks!
diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c index 21d624f9f5fb..6812c1ca3100 100644 --- a/drivers/powercap/intel_rapl_common.c +++ b/drivers/powercap/intel_rapl_common.c @@ -1110,6 +1110,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = { 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(RAPTORLAKE_S, &rapl_defaults_core), X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, &rapl_defaults_spr_server), X86_MATCH_INTEL_FAM6_MODEL(LAKEFIELD, &rapl_defaults_core),
Add intel_rapl support for RAPTORLAKE_S platform, which behaves the same as RAPTORLAKE and RAPTORLAKE_P platforms. Signed-off-by: Zhang Rui <rui.zhang@intel.com> --- drivers/powercap/intel_rapl_common.c | 1 + 1 file changed, 1 insertion(+)