[PATCH 0/2] hwmon: (fam15h_power) Add new AMD family 15h processors

[PATCH 0/2] hwmon: (fam15h_power) Add new AMD family 15h processors

[Huang Rui]

Hi Guenter,

This serial adds support for new AMD family 15h processor
(Models 70-7f) and maintainer info updates.

For accumulated power feature:
http://marc.info/?l=linux-kernel&m=144633156632674&w=2
http://marc.info/?l=linux-kernel&m=144619918504720&w=2

For the patch "x86, amd: add accessor for number of cores per compute
unit", I will send it with accumulated power perf support with
forthcoming. Then resend v4 of accumulated power hwmon support.
Refer: http://marc.info/?l=linux-kernel&m=144103718130563&w=2

So can you apply these two patches to hwmon-next firstly?

Thanks,
Rui

Huang Rui (2):
  hwmon: (fam15h_power) Add support for AMD new 15h processors
  MAINTAINERS: change the maintainer of fam15h_power driver

 CREDITS                      | 8 ++++++++
 MAINTAINERS                  | 4 ++--
 drivers/hwmon/fam15h_power.c | 7 +++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

-- 
1.9.1

[PATCH 1/2] hwmon: (fam15h_power) Add support for AMD new 15h processors

[Huang Rui]

AMD Family 15h Models 70h-7fh processors also support TDP power
reporting interface.

Signed-off-by: Huang Rui <ray.huang@amd.com>
---
 drivers/hwmon/fam15h_power.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c
index 5f7067d..f77eb97 100644
--- a/drivers/hwmon/fam15h_power.c
+++ b/drivers/hwmon/fam15h_power.c
@@ -47,6 +47,8 @@ MODULE_LICENSE("GPL");
 
 #define MSR_F15H_CU_MAX_PWR_ACCUMULATOR	0xc001007b
 
+#define PCI_DEVICE_ID_AMD_15H_M70H_NB_F4 0x15b4
+
 struct fam15h_power_data {
 	struct pci_dev *pdev;
 	unsigned int tdp_to_watts;
@@ -124,7 +126,7 @@ static int fam15h_power_init_attrs(struct pci_dev *pdev,
 
 	if (c->x86 == 0x15 &&
 	    (c->x86_model <= 0xf ||
-	     (c->x86_model >= 0x60 && c->x86_model <= 0x6f)))
+	     (c->x86_model >= 0x60 && c->x86_model <= 0x7f)))
 		n += 1;
 
 	fam15h_power_attrs = devm_kcalloc(&pdev->dev, n,
@@ -138,7 +140,7 @@ static int fam15h_power_init_attrs(struct pci_dev *pdev,
 	fam15h_power_attrs[n++] = &dev_attr_power1_crit.attr;
 	if (c->x86 == 0x15 &&
 	    (c->x86_model <= 0xf ||
-	     (c->x86_model >= 0x60 && c->x86_model <= 0x6f)))
+	     (c->x86_model >= 0x60 && c->x86_model <= 0x7f)))
 		fam15h_power_attrs[n++] = &dev_attr_power1_input.attr;
 
 	data->group.attrs = fam15h_power_attrs;
@@ -296,6 +298,7 @@ static const struct pci_device_id fam15h_power_id_table[] = {
 	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) },
 	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M30H_NB_F4) },
 	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M60H_NB_F4) },
+	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M70H_NB_F4) },
 	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F4) },
 	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_M30H_NB_F4) },
 	{}
-- 
1.9.1

Re: [PATCH 1/2] hwmon: (fam15h_power) Add support for AMD new 15h processors

[Guenter Roeck]

On 12/09/2015 07:56 PM, Huang Rui wrote:
> AMD Family 15h Models 70h-7fh processors also support TDP power
> reporting interface.
>
> Signed-off-by: Huang Rui <ray.huang@amd.com>

Applied to -next.

Thanks,
Guenter

[PATCH 2/2] MAINTAINERS: change the maintainer of fam15h_power driver

[Huang Rui]

Andreas Herrmann won't take the maintainer of fam15h_power driver. I
will take it and appreciate him for the great contributions on this
driver.

Signed-off-by: Huang Rui <ray.huang@amd.com>
Acked-by: Andreas Herrmann <herrmann.der.user@googlemail.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com>
---
 CREDITS     | 8 ++++++++
 MAINTAINERS | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CREDITS b/CREDITS
index 8207cc6..30bdce8 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1507,6 +1507,14 @@ S: 312/107 Canberra Avenue
 S: Griffith, ACT 2603 
 S: Australia
 
+N: Andreas Herrmann
+E: herrmann.der.user@gmail.com
+E: herrmann.der.user@googlemail.com
+D: Key developer of x86/AMD64
+D: Author of AMD family 15h processor power monintoring driver
+D: Maintainer of AMD Athlon 64 and Opteron processor frequency driver
+S: Germany
+
 N: Sebastian Hetze
 E: she@lunetix.de
 D: German Linux Documentation,
diff --git a/MAINTAINERS b/MAINTAINERS
index cba790b..c99dd93 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -614,9 +614,9 @@ F:	drivers/crypto/ccp/
 F:	include/linux/ccp.h
 
 AMD FAM15H PROCESSOR POWER MONITORING DRIVER
-M:	Andreas Herrmann <herrmann.der.user@googlemail.com>
+M:	Huang Rui <ray.huang@amd.com>
 L:	lm-sensors@lm-sensors.org
-S:	Maintained
+S:	Supported
 F:	Documentation/hwmon/fam15h_power
 F:	drivers/hwmon/fam15h_power.c
 
-- 
1.9.1

Re: [PATCH 2/2] MAINTAINERS: change the maintainer of fam15h_power driver

[Joe Perches]

On Thu, 2015-12-10 at 11:56 +0800, Huang Rui wrote:
> Andreas Herrmann won't take the maintainer of fam15h_power driver. I
> will take it and appreciate him for the great contributions on this
> driver.
[]
> diff --git a/CREDITS b/CREDITS
[]
> @@ -1507,6 +1507,14 @@ S: 312/107 Canberra Avenue
>  S: Griffith, ACT 2603 
>  S: Australia
>  
> +N: Andreas Herrmann
> +E: herrmann.der.user@gmail.com
> +E: herrmann.der.user@googlemail.com
> +D: Key developer of x86/AMD64
> +D: Author of AMD family 15h processor power monintoring driver

trivia:  monitoring

Re: [PATCH 2/2] MAINTAINERS: change the maintainer of fam15h_power driver

[Huang Rui]

On Wed, Dec 09, 2015 at 10:33:04PM -0800, Joe Perches wrote:
> On Thu, 2015-12-10 at 11:56 +0800, Huang Rui wrote:
> > Andreas Herrmann won't take the maintainer of fam15h_power driver. I
> > will take it and appreciate him for the great contributions on this
> > driver.
> []
> > diff --git a/CREDITS b/CREDITS
> []
> > @@ -1507,6 +1507,14 @@ S: 312/107 Canberra Avenue
> > ?S: Griffith, ACT 2603?
> > ?S: Australia
> > ?
> > +N: Andreas Herrmann
> > +E: herrmann.der.user@gmail.com
> > +E: herrmann.der.user@googlemail.com
> > +D: Key developer of x86/AMD64
> > +D: Author of AMD family 15h processor power monintoring driver
> 
> trivia: ?monitoring
> 

Oh, that's a typo. Should be "monitoring". Thanks to point out. :)
Guenter, can you help to correct it when you apply? Or will I send a
v2?

Thanks,
Rui

Re: [PATCH 2/2] MAINTAINERS: change the maintainer of fam15h_power driver

[Guenter Roeck]

On 12/09/2015 11:29 PM, Huang Rui wrote:
> On Wed, Dec 09, 2015 at 10:33:04PM -0800, Joe Perches wrote:
>> On Thu, 2015-12-10 at 11:56 +0800, Huang Rui wrote:
>>> Andreas Herrmann won't take the maintainer of fam15h_power driver. I
>>> will take it and appreciate him for the great contributions on this
>>> driver.
>> []
>>> diff --git a/CREDITS b/CREDITS
>> []
>>> @@ -1507,6 +1507,14 @@ S: 312/107 Canberra Avenue
>>> ?S: Griffith, ACT 2603?
>>> ?S: Australia
>>> ?
>>> +N: Andreas Herrmann
>>> +E: herrmann.der.user@gmail.com
>>> +E: herrmann.der.user@googlemail.com
>>> +D: Key developer of x86/AMD64
>>> +D: Author of AMD family 15h processor power monintoring driver
>>
>> trivia: ?monitoring
>>
>
> Oh, that's a typo. Should be "monitoring". Thanks to point out. :)
> Guenter, can you help to correct it when you apply? Or will I send a
> v2?
>
I'll fix it up.

Guenter

Re: [PATCH 2/2] MAINTAINERS: change the maintainer of fam15h_power driver

[Guenter Roeck]

On 12/09/2015 07:56 PM, Huang Rui wrote:
> Andreas Herrmann won't take the maintainer of fam15h_power driver. I
> will take it and appreciate him for the great contributions on this
> driver.
>
> Signed-off-by: Huang Rui <ray.huang@amd.com>
> Acked-by: Andreas Herrmann <herrmann.der.user@googlemail.com>
> Cc: Borislav Petkov <bp@alien8.de>
> Cc: Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com>

Applied to -next (with spelling fix).

Thanks,
Guenter