2020-05-10 21:00:14

by Alexander Monakov

Subject: [PATCH 2/3] hwmon: (k10temp) Add AMD family 17h model 60h PCI match

Add support for retrieving Tdie and Tctl on AMD Renoir (4000-series
Ryzen CPUs).

It appears SMU offsets for reading current/voltage and CCD temperature
have changed for this generation (reads from currently used offsets
yield zeros), so those features cannot be enabled so trivially.

Signed-off-by: Alexander Monakov <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: [email protected]
Cc: Yazen Ghannam <[email protected]>
Cc: Brian Woods <[email protected]>
Cc: Clemens Ladisch <[email protected]>
Cc: Jean Delvare <[email protected]>
Cc: Guenter Roeck <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
drivers/hwmon/k10temp.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
index 9915578533bb..8f12995ec133 100644
--- a/drivers/hwmon/k10temp.c
+++ b/drivers/hwmon/k10temp.c
@@ -632,6 +632,7 @@ static const struct pci_device_id k10temp_id_table[] = {
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_DF_F3) },
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F3) },
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) },
+ { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_F3) },
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F3) },
{ PCI_VDEVICE(HYGON, PCI_DEVICE_ID_AMD_17H_DF_F3) },
{}
--
2.26.2

2020-05-11 16:45:16

by Guenter Roeck

Subject: Re: [PATCH 2/3] hwmon: (k10temp) Add AMD family 17h model 60h PCI match

On Sun, May 10, 2020 at 08:48:41PM +0000, Alexander Monakov wrote:
> Add support for retrieving Tdie and Tctl on AMD Renoir (4000-series
> Ryzen CPUs).
>
> It appears SMU offsets for reading current/voltage and CCD temperature
> have changed for this generation (reads from currently used offsets
> yield zeros), so those features cannot be enabled so trivially.
>
> Signed-off-by: Alexander Monakov <[email protected]>
> Cc: Thomas Gleixner <[email protected]>
> Cc: Borislav Petkov <[email protected]>
> Cc: [email protected]
> Cc: Yazen Ghannam <[email protected]>
> Cc: Brian Woods <[email protected]>
> Cc: Clemens Ladisch <[email protected]>
> Cc: Jean Delvare <[email protected]>
> Cc: Guenter Roeck <[email protected]>
> Cc: [email protected]
> Cc: [email protected]

Acked-by: Guenter Roeck <[email protected]>

> ---
> drivers/hwmon/k10temp.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
> index 9915578533bb..8f12995ec133 100644
> --- a/drivers/hwmon/k10temp.c
> +++ b/drivers/hwmon/k10temp.c
> @@ -632,6 +632,7 @@ static const struct pci_device_id k10temp_id_table[] = {
> { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_DF_F3) },
> { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F3) },
> { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) },
> + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_F3) },
> { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F3) },
> { PCI_VDEVICE(HYGON, PCI_DEVICE_ID_AMD_17H_DF_F3) },
> {}
> --
> 2.26.2
>

2020-05-22 18:00:35

by tip-bot2 for Jacob Pan

Subject: [tip: ras/core] hwmon: (k10temp) Add AMD family 17h model 60h PCI match

The following commit has been merged into the ras/core branch of tip:

Commit-ID: 279f0b3a4b80660fba6faadc2ca2fa426bf3f7e9
Gitweb: https://git.kernel.org/tip/279f0b3a4b80660fba6faadc2ca2fa426bf3f7e9
Author: Alexander Monakov <[email protected]>
AuthorDate: Sun, 10 May 2020 20:48:41
Committer: Borislav Petkov <[email protected]>
CommitterDate: Fri, 22 May 2020 18:39:07 +02:00

hwmon: (k10temp) Add AMD family 17h model 60h PCI match

Add support for retrieving Tdie and Tctl on AMD Renoir (4000-series
Ryzen CPUs).

It appears SMU offsets for reading current/voltage and CCD temperature
have changed for this generation (reads from currently used offsets
yield zeros), so those features cannot be enabled so trivially.

Signed-off-by: Alexander Monakov <[email protected]>
Signed-off-by: Borislav Petkov <[email protected]>
Acked-by: Guenter Roeck <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]
---
drivers/hwmon/k10temp.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
index 3f37d5d..7ba82e0 100644
--- a/drivers/hwmon/k10temp.c
+++ b/drivers/hwmon/k10temp.c
@@ -632,6 +632,7 @@ static const struct pci_device_id k10temp_id_table[] = {
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_DF_F3) },
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F3) },
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) },
+ { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_F3) },
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F3) },
{ PCI_VDEVICE(HYGON, PCI_DEVICE_ID_AMD_17H_DF_F3) },
{}