diff mbox

[1/2] powercap/rapl: add support for skx

Message ID 1464021943-14915-2-git-send-email-jacob.jun.pan@linux.intel.com (mailing list archive)
State Not Applicable, archived
Delegated to: Rafael Wysocki
Headers show

Commit Message

Jacob Pan May 23, 2016, 4:45 p.m. UTC
SKX RAPL interface is similar to HSX/BDX.

Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
---
 drivers/powercap/intel_rapl.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Rafael J. Wysocki June 13, 2016, 9:32 p.m. UTC | #1
On Monday, May 23, 2016 09:45:42 AM Jacob Pan wrote:
> SKX RAPL interface is similar to HSX/BDX.
> 
> Signed-off-by: Jacob Pan <jacob.jun.pan@linux.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 470bb62..a417e68 100644
> --- a/drivers/powercap/intel_rapl.c
> +++ b/drivers/powercap/intel_rapl.c
> @@ -1096,6 +1096,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
>  	RAPL_CPU(0x4E, rapl_defaults_core),/* Skylake */
>  	RAPL_CPU(0x4C, rapl_defaults_cht),/* Braswell/Cherryview */
>  	RAPL_CPU(0x4A, rapl_defaults_tng),/* Tangier */
> +	RAPL_CPU(0x55, rapl_defaults_hsw_server),/* Skylake server */
>  	RAPL_CPU(0x56, rapl_defaults_core),/* Future Xeon */
>  	RAPL_CPU(0x5A, rapl_defaults_ann),/* Annidale */
>  	RAPL_CPU(0X5C, rapl_defaults_core),/* Broxton */
> 

Can you please rebase this on top of 4.7-rc3?

Thanks,
Rafael

--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Rafael J. Wysocki June 13, 2016, 9:56 p.m. UTC | #2
On Monday, June 13, 2016 11:32:10 PM Rafael J. Wysocki wrote:
> On Monday, May 23, 2016 09:45:42 AM Jacob Pan wrote:
> > SKX RAPL interface is similar to HSX/BDX.
> > 
> > Signed-off-by: Jacob Pan <jacob.jun.pan@linux.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 470bb62..a417e68 100644
> > --- a/drivers/powercap/intel_rapl.c
> > +++ b/drivers/powercap/intel_rapl.c
> > @@ -1096,6 +1096,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
> >  	RAPL_CPU(0x4E, rapl_defaults_core),/* Skylake */
> >  	RAPL_CPU(0x4C, rapl_defaults_cht),/* Braswell/Cherryview */
> >  	RAPL_CPU(0x4A, rapl_defaults_tng),/* Tangier */
> > +	RAPL_CPU(0x55, rapl_defaults_hsw_server),/* Skylake server */
> >  	RAPL_CPU(0x56, rapl_defaults_core),/* Future Xeon */
> >  	RAPL_CPU(0x5A, rapl_defaults_ann),/* Annidale */
> >  	RAPL_CPU(0X5C, rapl_defaults_core),/* Broxton */
> > 
> 
> Can you please rebase this on top of 4.7-rc3?

Or rather on top of the x86/cpu branch from tip?

BTW, I can take the Denverton support for RAPL too (unless already applied
elsewhere), but it has to be based on x86/cpu as well.

Thanks,
Rafael

--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jacob Pan June 14, 2016, 12:06 a.m. UTC | #3
On Mon, 13 Jun 2016 23:56:18 +0200
"Rafael J. Wysocki" <rjw@rjwysocki.net> wrote:

> On Monday, June 13, 2016 11:32:10 PM Rafael J. Wysocki wrote:
> > On Monday, May 23, 2016 09:45:42 AM Jacob Pan wrote:
> > > SKX RAPL interface is similar to HSX/BDX.
> > > 
> > > Signed-off-by: Jacob Pan <jacob.jun.pan@linux.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 470bb62..a417e68 100644
> > > --- a/drivers/powercap/intel_rapl.c
> > > +++ b/drivers/powercap/intel_rapl.c
> > > @@ -1096,6 +1096,7 @@ static const struct x86_cpu_id rapl_ids[]
> > > __initconst = { RAPL_CPU(0x4E, rapl_defaults_core),/* Skylake */
> > >  	RAPL_CPU(0x4C, rapl_defaults_cht),/* Braswell/Cherryview
> > > */ RAPL_CPU(0x4A, rapl_defaults_tng),/* Tangier */
> > > +	RAPL_CPU(0x55, rapl_defaults_hsw_server),/* Skylake
> > > server */ RAPL_CPU(0x56, rapl_defaults_core),/* Future Xeon */
> > >  	RAPL_CPU(0x5A, rapl_defaults_ann),/* Annidale */
> > >  	RAPL_CPU(0X5C, rapl_defaults_core),/* Broxton */
> > > 
> > 
> > Can you please rebase this on top of 4.7-rc3?
> 
> Or rather on top of the x86/cpu branch from tip?
> 
done. just sent you v2.
[PATCH v2] powercap/rapl: add support for denverton
> BTW, I can take the Denverton support for RAPL too (unless already
> applied elsewhere), but it has to be based on x86/cpu as well.
> 
Not applied elsewhere, please take it. I was confused powercap/rapl with
perf/rapl which should be in tip.
--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Rafael J. Wysocki June 14, 2016, 12:21 a.m. UTC | #4
On Tue, Jun 14, 2016 at 2:06 AM, Jacob Pan
<jacob.jun.pan@linux.intel.com> wrote:
> On Mon, 13 Jun 2016 23:56:18 +0200
> "Rafael J. Wysocki" <rjw@rjwysocki.net> wrote:
>
>> On Monday, June 13, 2016 11:32:10 PM Rafael J. Wysocki wrote:
>> > On Monday, May 23, 2016 09:45:42 AM Jacob Pan wrote:
>> > > SKX RAPL interface is similar to HSX/BDX.
>> > >
>> > > Signed-off-by: Jacob Pan <jacob.jun.pan@linux.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 470bb62..a417e68 100644
>> > > --- a/drivers/powercap/intel_rapl.c
>> > > +++ b/drivers/powercap/intel_rapl.c
>> > > @@ -1096,6 +1096,7 @@ static const struct x86_cpu_id rapl_ids[]
>> > > __initconst = { RAPL_CPU(0x4E, rapl_defaults_core),/* Skylake */
>> > >   RAPL_CPU(0x4C, rapl_defaults_cht),/* Braswell/Cherryview
>> > > */ RAPL_CPU(0x4A, rapl_defaults_tng),/* Tangier */
>> > > + RAPL_CPU(0x55, rapl_defaults_hsw_server),/* Skylake
>> > > server */ RAPL_CPU(0x56, rapl_defaults_core),/* Future Xeon */
>> > >   RAPL_CPU(0x5A, rapl_defaults_ann),/* Annidale */
>> > >   RAPL_CPU(0X5C, rapl_defaults_core),/* Broxton */
>> > >
>> >
>> > Can you please rebase this on top of 4.7-rc3?
>>
>> Or rather on top of the x86/cpu branch from tip?
>>
> done. just sent you v2.
> [PATCH v2] powercap/rapl: add support for denverton

Thanks for that one, but the $subject one was for SKX.  Any chance to
rebase and resend this one too?
--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c
index 470bb62..a417e68 100644
--- a/drivers/powercap/intel_rapl.c
+++ b/drivers/powercap/intel_rapl.c
@@ -1096,6 +1096,7 @@  static const struct x86_cpu_id rapl_ids[] __initconst = {
 	RAPL_CPU(0x4E, rapl_defaults_core),/* Skylake */
 	RAPL_CPU(0x4C, rapl_defaults_cht),/* Braswell/Cherryview */
 	RAPL_CPU(0x4A, rapl_defaults_tng),/* Tangier */
+	RAPL_CPU(0x55, rapl_defaults_hsw_server),/* Skylake server */
 	RAPL_CPU(0x56, rapl_defaults_core),/* Future Xeon */
 	RAPL_CPU(0x5A, rapl_defaults_ann),/* Annidale */
 	RAPL_CPU(0X5C, rapl_defaults_core),/* Broxton */