2013-08-23 17:38:59

by Wei Hu

[permalink] [raw]
Subject: [PATCH] hwmon: (k10temp) Add support for Fam16h (Kabini)

The temperature reporting interface stays the same, so we just
add the PCI-ID to the list.

Verified on AMD Olive Hill.
---
Documentation/hwmon/k10temp | 1 +
drivers/hwmon/Kconfig | 4 ++--
drivers/hwmon/k10temp.c | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Documentation/hwmon/k10temp b/Documentation/hwmon/k10temp
index 90956b6..4dfdc8f 100644
--- a/Documentation/hwmon/k10temp
+++ b/Documentation/hwmon/k10temp
@@ -12,6 +12,7 @@ Supported chips:
* AMD Family 12h processors: "Llano" (E2/A4/A6/A8-Series)
* AMD Family 14h processors: "Brazos" (C/E/G/Z-Series)
* AMD Family 15h processors: "Bulldozer" (FX-Series), "Trinity"
+* AMD Family 16h processors: "Kabini"

Prefix: 'k10temp'
Addresses scanned: PCI space
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index e989f7f..1e27838 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -296,8 +296,8 @@ config SENSORS_K10TEMP
If you say yes here you get support for the temperature
sensor(s) inside your CPU. Supported are later revisions of
the AMD Family 10h and all revisions of the AMD Family 11h,
- 12h (Llano), 14h (Brazos) and 15h (Bulldozer/Trinity)
- microarchitectures.
+ 12h (Llano), 14h (Brazos), 15h (Bulldozer/Trinity) and
+ 16h (Kabini) microarchitectures.

This driver can also be built as a module. If so, the module
will be called k10temp.
diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
index e3b037c..e633856 100644
--- a/drivers/hwmon/k10temp.c
+++ b/drivers/hwmon/k10temp.c
@@ -1,5 +1,5 @@
/*
- * k10temp.c - AMD Family 10h/11h/12h/14h/15h processor hardware monitoring
+ * k10temp.c - AMD Family 10h/11h/12h/14h/15h/16h processor hardware monitoring
*
* Copyright (c) 2009 Clemens Ladisch <[email protected]>
*
@@ -211,6 +211,7 @@ static DEFINE_PCI_DEVICE_TABLE(k10temp_id_table) = {
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) },
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F3) },
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) },
+ { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F3) },
{}
};
MODULE_DEVICE_TABLE(pci, k10temp_id_table);
--
1.7.4.4


2013-08-23 18:33:40

by Clemens Ladisch

[permalink] [raw]
Subject: Re: [PATCH] hwmon: (k10temp) Add support for Fam16h (Kabini)

Wei Hu wrote:
> The temperature reporting interface stays the same, so we just
> add the PCI-ID to the list.
>
> Verified on AMD Olive Hill.
> ---
> Documentation/hwmon/k10temp | 1 +
> drivers/hwmon/Kconfig | 4 ++--
> drivers/hwmon/k10temp.c | 3 ++-
> 3 files changed, 5 insertions(+), 3 deletions(-)

Acked-by: Clemens Ladisch <[email protected]>

2013-08-23 19:58:16

by Guenter Roeck

[permalink] [raw]
Subject: Re: [lm-sensors] [PATCH] hwmon: (k10temp) Add support for Fam16h (Kabini)

On Fri, Aug 23, 2013 at 10:38:18AM -0700, Wei Hu wrote:
> The temperature reporting interface stays the same, so we just
> add the PCI-ID to the list.
>
> Verified on AMD Olive Hill.

The Signed-off-by: statement is missing. I can not apply the patch without it.

Guenter

> ---
> Documentation/hwmon/k10temp | 1 +
> drivers/hwmon/Kconfig | 4 ++--
> drivers/hwmon/k10temp.c | 3 ++-
> 3 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/hwmon/k10temp b/Documentation/hwmon/k10temp
> index 90956b6..4dfdc8f 100644
> --- a/Documentation/hwmon/k10temp
> +++ b/Documentation/hwmon/k10temp
> @@ -12,6 +12,7 @@ Supported chips:
> * AMD Family 12h processors: "Llano" (E2/A4/A6/A8-Series)
> * AMD Family 14h processors: "Brazos" (C/E/G/Z-Series)
> * AMD Family 15h processors: "Bulldozer" (FX-Series), "Trinity"
> +* AMD Family 16h processors: "Kabini"
>
> Prefix: 'k10temp'
> Addresses scanned: PCI space
> diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
> index e989f7f..1e27838 100644
> --- a/drivers/hwmon/Kconfig
> +++ b/drivers/hwmon/Kconfig
> @@ -296,8 +296,8 @@ config SENSORS_K10TEMP
> If you say yes here you get support for the temperature
> sensor(s) inside your CPU. Supported are later revisions of
> the AMD Family 10h and all revisions of the AMD Family 11h,
> - 12h (Llano), 14h (Brazos) and 15h (Bulldozer/Trinity)
> - microarchitectures.
> + 12h (Llano), 14h (Brazos), 15h (Bulldozer/Trinity) and
> + 16h (Kabini) microarchitectures.
>
> This driver can also be built as a module. If so, the module
> will be called k10temp.
> diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
> index e3b037c..e633856 100644
> --- a/drivers/hwmon/k10temp.c
> +++ b/drivers/hwmon/k10temp.c
> @@ -1,5 +1,5 @@
> /*
> - * k10temp.c - AMD Family 10h/11h/12h/14h/15h processor hardware monitoring
> + * k10temp.c - AMD Family 10h/11h/12h/14h/15h/16h processor hardware monitoring
> *
> * Copyright (c) 2009 Clemens Ladisch <[email protected]>
> *
> @@ -211,6 +211,7 @@ static DEFINE_PCI_DEVICE_TABLE(k10temp_id_table) = {
> { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) },
> { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F3) },
> { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) },
> + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F3) },
> {}
> };
> MODULE_DEVICE_TABLE(pci, k10temp_id_table);
> --
> 1.7.4.4
>
>
> _______________________________________________
> lm-sensors mailing list
> [email protected]
> http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
>

2013-08-23 20:14:44

by Wei Hu

[permalink] [raw]
Subject: [PATCH] hwmon: (k10temp) Add support for Fam16h (Kabini)

The temperature reporting interface stays the same, so we just
add the PCI-ID to the list.

Verified on AMD Olive Hill.

Signed-off-by: Wei Hu <[email protected]>
---
Documentation/hwmon/k10temp | 1 +
drivers/hwmon/Kconfig | 4 ++--
drivers/hwmon/k10temp.c | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Documentation/hwmon/k10temp b/Documentation/hwmon/k10temp
index 90956b6..4dfdc8f 100644
--- a/Documentation/hwmon/k10temp
+++ b/Documentation/hwmon/k10temp
@@ -12,6 +12,7 @@ Supported chips:
* AMD Family 12h processors: "Llano" (E2/A4/A6/A8-Series)
* AMD Family 14h processors: "Brazos" (C/E/G/Z-Series)
* AMD Family 15h processors: "Bulldozer" (FX-Series), "Trinity"
+* AMD Family 16h processors: "Kabini"

Prefix: 'k10temp'
Addresses scanned: PCI space
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index e989f7f..1e27838 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -296,8 +296,8 @@ config SENSORS_K10TEMP
If you say yes here you get support for the temperature
sensor(s) inside your CPU. Supported are later revisions of
the AMD Family 10h and all revisions of the AMD Family 11h,
- 12h (Llano), 14h (Brazos) and 15h (Bulldozer/Trinity)
- microarchitectures.
+ 12h (Llano), 14h (Brazos), 15h (Bulldozer/Trinity) and
+ 16h (Kabini) microarchitectures.

This driver can also be built as a module. If so, the module
will be called k10temp.
diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
index e3b037c..e633856 100644
--- a/drivers/hwmon/k10temp.c
+++ b/drivers/hwmon/k10temp.c
@@ -1,5 +1,5 @@
/*
- * k10temp.c - AMD Family 10h/11h/12h/14h/15h processor hardware monitoring
+ * k10temp.c - AMD Family 10h/11h/12h/14h/15h/16h processor hardware monitoring
*
* Copyright (c) 2009 Clemens Ladisch <[email protected]>
*
@@ -211,6 +211,7 @@ static DEFINE_PCI_DEVICE_TABLE(k10temp_id_table) = {
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) },
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F3) },
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) },
+ { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F3) },
{}
};
MODULE_DEVICE_TABLE(pci, k10temp_id_table);
--
1.7.4.4

2013-08-23 20:47:56

by Guenter Roeck

[permalink] [raw]
Subject: Re: [lm-sensors] [PATCH] hwmon: (k10temp) Add support for Fam16h (Kabini)

On Fri, Aug 23, 2013 at 01:14:03PM -0700, Wei Hu wrote:
> The temperature reporting interface stays the same, so we just
> add the PCI-ID to the list.
>
> Verified on AMD Olive Hill.
>
> Signed-off-by: Wei Hu <[email protected]>

Applied to -next.

I marked it for inclusion in stable-3.10, so it will ultimately find
its way there. It does not apply cleanly to earlier stable releases.
If is needed in any of those, someone will have to back-port it after
it is available in mainline.

Thanks,
Guenter