| Message ID | 1550473262-10323-1-git-send-email-rui.zhang@intel.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Delegated to: | Rafael Wysocki |
| Headers | show |
| Series | powercap/intel_rapl: add Ice Lake mobile | expand |
On 一, 2019-02-18 at 15:01 +0800, Zhang Rui wrote: > From: Gayatri Kammela <gayatri.kammela@intel.com> > > Add Ice Lake mobile support to intel_rapl driver. > Just FYI, the ICELAKE_MOBILE cpuid was added into linus' tree AFTER 5.0-rc6. thanks, rui > Signed-off-by: Gayatri Kammela <gayatri.kammela@intel.com> > Signed-off-by: Joe Konno <joe.konno@intel.com> > Signed-off-by: Zhang Rui <rui.zhang@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 6cdb2c1..19905b9 100644 > --- a/drivers/powercap/intel_rapl.c > +++ b/drivers/powercap/intel_rapl.c > @@ -1156,6 +1156,7 @@ static const struct x86_cpu_id rapl_ids[] > __initconst = { > INTEL_CPU_FAM6(KABYLAKE_MOBILE, rapl_defaults > _core), > 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(ATOM_SILVERMONT, rapl_defaults > _byt), > INTEL_CPU_FAM6(ATOM_AIRMONT, rapl_defaults_ch > t),
On Monday, February 18, 2019 8:09:14 AM CET Zhang Rui wrote: > On 一, 2019-02-18 at 15:01 +0800, Zhang Rui wrote: > > From: Gayatri Kammela <gayatri.kammela@intel.com> > > > > Add Ice Lake mobile support to intel_rapl driver. > > > Just FYI, the ICELAKE_MOBILE cpuid was added into linus' tree AFTER > 5.0-rc6. > > thanks, > rui > > Signed-off-by: Gayatri Kammela <gayatri.kammela@intel.com> > > Signed-off-by: Joe Konno <joe.konno@intel.com> > > Signed-off-by: Zhang Rui <rui.zhang@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 6cdb2c1..19905b9 100644 > > --- a/drivers/powercap/intel_rapl.c > > +++ b/drivers/powercap/intel_rapl.c > > @@ -1156,6 +1156,7 @@ static const struct x86_cpu_id rapl_ids[] > > __initconst = { > > INTEL_CPU_FAM6(KABYLAKE_MOBILE, rapl_defaults > > _core), > > 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(ATOM_SILVERMONT, rapl_defaults > > _byt), > > INTEL_CPU_FAM6(ATOM_AIRMONT, rapl_defaults_ch > > t), > Applied, thanks!
diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c index 6cdb2c1..19905b9 100644 --- a/drivers/powercap/intel_rapl.c +++ b/drivers/powercap/intel_rapl.c @@ -1156,6 +1156,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = { INTEL_CPU_FAM6(KABYLAKE_MOBILE, rapl_defaults_core), 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(ATOM_SILVERMONT, rapl_defaults_byt), INTEL_CPU_FAM6(ATOM_AIRMONT, rapl_defaults_cht),