Linux-Hwmon Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH 0/3] k10temp and EDAC support for AMD Renoir
@ 2020-05-10 20:48 Alexander Monakov
  2020-05-10 20:48 ` [PATCH 1/3] x86/amd_nb: add AMD family 17h model 60h PCI IDs Alexander Monakov
                   ` (2 more replies)
  0 siblings, 3 replies; 9+ messages in thread
From: Alexander Monakov @ 2020-05-10 20:48 UTC (permalink / raw)
  To: linux-kernel
  Cc: Alexander Monakov, Thomas Gleixner, Borislav Petkov, x86,
	Yazen Ghannam, Brian Woods, Clemens Ladisch, Jean Delvare,
	Guenter Roeck, linux-hwmon, linux-edac

Hello!

This simple patch series adds support for new AMD Ryzen CPU generation
(model 17h family 60h) by adding the new PCI IDs as appropriate in the
amd_nb, k10temp and amd64_edac drivers.

The change in k10temp is the one most important for users (temperature
sensors of the new CPUs), the amd_nb patch is a prerequisite for that,
and finally edac_amd64 patch is necessary, because otherwise loading
that module produces a warning due to incomplete support.

Thank you.

Alexander Monakov (3):
  x86/amd_nb: add AMD family 17h model 60h PCI IDs
  hwmon: (k10temp) Add AMD family 17h model 60h PCI match
  EDAC/amd64: Add AMD family 17h model 60h PCI IDs

 arch/x86/kernel/amd_nb.c  |  5 +++++
 drivers/edac/amd64_edac.c | 14 ++++++++++++++
 drivers/edac/amd64_edac.h |  3 +++
 drivers/hwmon/k10temp.c   |  1 +
 include/linux/pci_ids.h   |  1 +
 5 files changed, 24 insertions(+)

Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: x86@kernel.org
Cc: Yazen Ghannam <yazen.ghannam@amd.com>
Cc: Brian Woods <brian.woods@amd.com>
Cc: Clemens Ladisch <clemens@ladisch.de>
Cc: Jean Delvare <jdelvare@suse.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: linux-hwmon@vger.kernel.org
Cc: linux-edac@vger.kernel.org
-- 
2.26.2


^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH 1/3] x86/amd_nb: add AMD family 17h model 60h PCI IDs
  2020-05-10 20:48 [PATCH 0/3] k10temp and EDAC support for AMD Renoir Alexander Monakov
@ 2020-05-10 20:48 ` Alexander Monakov
  2020-05-13 15:10   ` Yazen Ghannam
  2020-05-22 14:45   ` Guenter Roeck
  2020-05-10 20:48 ` [PATCH 2/3] hwmon: (k10temp) Add AMD family 17h model 60h PCI match Alexander Monakov
  2020-05-10 20:48 ` [PATCH 3/3] EDAC/amd64: Add AMD family 17h model 60h PCI IDs Alexander Monakov
  2 siblings, 2 replies; 9+ messages in thread
From: Alexander Monakov @ 2020-05-10 20:48 UTC (permalink / raw)
  To: linux-kernel
  Cc: Alexander Monakov, Thomas Gleixner, Borislav Petkov, x86,
	Yazen Ghannam, Brian Woods, Clemens Ladisch, Jean Delvare,
	Guenter Roeck, linux-hwmon, linux-edac

Add PCI IDs for AMD Renoir (4000-series Ryzen CPUs). This is necessary
to enable support for temperature sensors via the k10temp module.

Signed-off-by: Alexander Monakov <amonakov@ispras.ru>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: x86@kernel.org
Cc: Yazen Ghannam <yazen.ghannam@amd.com>
Cc: Brian Woods <brian.woods@amd.com>
Cc: Clemens Ladisch <clemens@ladisch.de>
Cc: Jean Delvare <jdelvare@suse.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: linux-hwmon@vger.kernel.org
Cc: linux-edac@vger.kernel.org
---
 arch/x86/kernel/amd_nb.c | 5 +++++
 include/linux/pci_ids.h  | 1 +
 2 files changed, 6 insertions(+)

diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
index b6b3297851f3..18f6b7c4bd79 100644
--- a/arch/x86/kernel/amd_nb.c
+++ b/arch/x86/kernel/amd_nb.c
@@ -18,9 +18,11 @@
 #define PCI_DEVICE_ID_AMD_17H_ROOT	0x1450
 #define PCI_DEVICE_ID_AMD_17H_M10H_ROOT	0x15d0
 #define PCI_DEVICE_ID_AMD_17H_M30H_ROOT	0x1480
+#define PCI_DEVICE_ID_AMD_17H_M60H_ROOT	0x1630
 #define PCI_DEVICE_ID_AMD_17H_DF_F4	0x1464
 #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F4 0x15ec
 #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F4 0x1494
+#define PCI_DEVICE_ID_AMD_17H_M60H_DF_F4 0x144c
 #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F4 0x1444
 #define PCI_DEVICE_ID_AMD_19H_DF_F4	0x1654
 
@@ -33,6 +35,7 @@ static const struct pci_device_id amd_root_ids[] = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_ROOT) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_ROOT) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_ROOT) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M60H_ROOT) },
 	{}
 };
 
@@ -50,6 +53,7 @@ static const struct pci_device_id amd_nb_misc_ids[] = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_DF_F3) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F3) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_F3) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F3) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_DF_F3) },
@@ -65,6 +69,7 @@ static const struct pci_device_id amd_nb_link_ids[] = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_DF_F4) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F4) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F4) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_F4) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F4) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_DF_F4) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F4) },
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 1dfc4e1dcb94..3155f5ada02e 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -550,6 +550,7 @@
 #define PCI_DEVICE_ID_AMD_17H_DF_F3	0x1463
 #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F3 0x15eb
 #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F3 0x1493
+#define PCI_DEVICE_ID_AMD_17H_M60H_DF_F3 0x144b
 #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F3 0x1443
 #define PCI_DEVICE_ID_AMD_19H_DF_F3	0x1653
 #define PCI_DEVICE_ID_AMD_CNB17H_F3	0x1703
-- 
2.26.2


^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH 2/3] hwmon: (k10temp) Add AMD family 17h model 60h PCI match
  2020-05-10 20:48 [PATCH 0/3] k10temp and EDAC support for AMD Renoir Alexander Monakov
  2020-05-10 20:48 ` [PATCH 1/3] x86/amd_nb: add AMD family 17h model 60h PCI IDs Alexander Monakov
@ 2020-05-10 20:48 ` Alexander Monakov
  2020-05-11 16:42   ` Guenter Roeck
  2020-05-10 20:48 ` [PATCH 3/3] EDAC/amd64: Add AMD family 17h model 60h PCI IDs Alexander Monakov
  2 siblings, 1 reply; 9+ messages in thread
From: Alexander Monakov @ 2020-05-10 20:48 UTC (permalink / raw)
  To: linux-kernel
  Cc: Alexander Monakov, Thomas Gleixner, Borislav Petkov, x86,
	Yazen Ghannam, Brian Woods, Clemens Ladisch, Jean Delvare,
	Guenter Roeck, linux-hwmon, linux-edac

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 <amonakov@ispras.ru>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: x86@kernel.org
Cc: Yazen Ghannam <yazen.ghannam@amd.com>
Cc: Brian Woods <brian.woods@amd.com>
Cc: Clemens Ladisch <clemens@ladisch.de>
Cc: Jean Delvare <jdelvare@suse.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: linux-hwmon@vger.kernel.org
Cc: linux-edac@vger.kernel.org
---
 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


^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH 3/3] EDAC/amd64: Add AMD family 17h model 60h PCI IDs
  2020-05-10 20:48 [PATCH 0/3] k10temp and EDAC support for AMD Renoir Alexander Monakov
  2020-05-10 20:48 ` [PATCH 1/3] x86/amd_nb: add AMD family 17h model 60h PCI IDs Alexander Monakov
  2020-05-10 20:48 ` [PATCH 2/3] hwmon: (k10temp) Add AMD family 17h model 60h PCI match Alexander Monakov
@ 2020-05-10 20:48 ` Alexander Monakov
  2020-05-13 15:11   ` Yazen Ghannam
  2 siblings, 1 reply; 9+ messages in thread
From: Alexander Monakov @ 2020-05-10 20:48 UTC (permalink / raw)
  To: linux-kernel
  Cc: Alexander Monakov, Thomas Gleixner, Borislav Petkov, x86,
	Yazen Ghannam, Brian Woods, Clemens Ladisch, Jean Delvare,
	Guenter Roeck, linux-hwmon, linux-edac

Add support for AMD Renoir (4000-series Ryzen CPUs).

Signed-off-by: Alexander Monakov <amonakov@ispras.ru>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: x86@kernel.org
Cc: Yazen Ghannam <yazen.ghannam@amd.com>
Cc: Brian Woods <brian.woods@amd.com>
Cc: Clemens Ladisch <clemens@ladisch.de>
Cc: Jean Delvare <jdelvare@suse.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: linux-hwmon@vger.kernel.org
Cc: linux-edac@vger.kernel.org
---
 drivers/edac/amd64_edac.c | 14 ++++++++++++++
 drivers/edac/amd64_edac.h |  3 +++
 2 files changed, 17 insertions(+)

diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 1136500c5f53..d50365e9217a 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -2319,6 +2319,16 @@ static struct amd64_family_type family_types[] = {
 			.dbam_to_cs		= f17_addr_mask_to_cs_size,
 		}
 	},
+	[F17_M60H_CPUS] = {
+		.ctl_name = "F17h_M60h",
+		.f0_id = PCI_DEVICE_ID_AMD_17H_M60H_DF_F0,
+		.f6_id = PCI_DEVICE_ID_AMD_17H_M60H_DF_F6,
+		.max_mcs = 2,
+		.ops = {
+			.early_channel_count	= f17_early_channel_count,
+			.dbam_to_cs		= f17_addr_mask_to_cs_size,
+		}
+	},
 	[F17_M70H_CPUS] = {
 		.ctl_name = "F17h_M70h",
 		.f0_id = PCI_DEVICE_ID_AMD_17H_M70H_DF_F0,
@@ -3357,6 +3367,10 @@ static struct amd64_family_type *per_family_init(struct amd64_pvt *pvt)
 			fam_type = &family_types[F17_M30H_CPUS];
 			pvt->ops = &family_types[F17_M30H_CPUS].ops;
 			break;
+		} else if (pvt->model >= 0x60 && pvt->model <= 0x6f) {
+			fam_type = &family_types[F17_M60H_CPUS];
+			pvt->ops = &family_types[F17_M60H_CPUS].ops;
+			break;
 		} else if (pvt->model >= 0x70 && pvt->model <= 0x7f) {
 			fam_type = &family_types[F17_M70H_CPUS];
 			pvt->ops = &family_types[F17_M70H_CPUS].ops;
diff --git a/drivers/edac/amd64_edac.h b/drivers/edac/amd64_edac.h
index abbf3c274d74..52b5d03eeba0 100644
--- a/drivers/edac/amd64_edac.h
+++ b/drivers/edac/amd64_edac.h
@@ -120,6 +120,8 @@
 #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F6 0x15ee
 #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F0 0x1490
 #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F6 0x1496
+#define PCI_DEVICE_ID_AMD_17H_M60H_DF_F0 0x1448
+#define PCI_DEVICE_ID_AMD_17H_M60H_DF_F6 0x144e
 #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F0 0x1440
 #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F6 0x1446
 #define PCI_DEVICE_ID_AMD_19H_DF_F0	0x1650
@@ -293,6 +295,7 @@ enum amd_families {
 	F17_CPUS,
 	F17_M10H_CPUS,
 	F17_M30H_CPUS,
+	F17_M60H_CPUS,
 	F17_M70H_CPUS,
 	F19_CPUS,
 	NUM_FAMILIES,
-- 
2.26.2


^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 2/3] hwmon: (k10temp) Add AMD family 17h model 60h PCI match
  2020-05-10 20:48 ` [PATCH 2/3] hwmon: (k10temp) Add AMD family 17h model 60h PCI match Alexander Monakov
@ 2020-05-11 16:42   ` Guenter Roeck
  0 siblings, 0 replies; 9+ messages in thread
From: Guenter Roeck @ 2020-05-11 16:42 UTC (permalink / raw)
  To: Alexander Monakov
  Cc: linux-kernel, Thomas Gleixner, Borislav Petkov, x86,
	Yazen Ghannam, Brian Woods, Clemens Ladisch, Jean Delvare,
	linux-hwmon, linux-edac

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 <amonakov@ispras.ru>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Borislav Petkov <bp@alien8.de>
> Cc: x86@kernel.org
> Cc: Yazen Ghannam <yazen.ghannam@amd.com>
> Cc: Brian Woods <brian.woods@amd.com>
> Cc: Clemens Ladisch <clemens@ladisch.de>
> Cc: Jean Delvare <jdelvare@suse.com>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Cc: linux-hwmon@vger.kernel.org
> Cc: linux-edac@vger.kernel.org

Acked-by: Guenter Roeck <linux@roeck-us.net>

> ---
>  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
> 

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 1/3] x86/amd_nb: add AMD family 17h model 60h PCI IDs
  2020-05-10 20:48 ` [PATCH 1/3] x86/amd_nb: add AMD family 17h model 60h PCI IDs Alexander Monakov
@ 2020-05-13 15:10   ` Yazen Ghannam
  2020-05-22 14:45   ` Guenter Roeck
  1 sibling, 0 replies; 9+ messages in thread
From: Yazen Ghannam @ 2020-05-13 15:10 UTC (permalink / raw)
  To: Alexander Monakov
  Cc: linux-kernel, Thomas Gleixner, Borislav Petkov, x86, Brian Woods,
	Clemens Ladisch, Jean Delvare, Guenter Roeck, linux-hwmon,
	linux-edac

On Sun, May 10, 2020 at 04:48:40PM -0400, Alexander Monakov wrote:
> Add PCI IDs for AMD Renoir (4000-series Ryzen CPUs). This is necessary
> to enable support for temperature sensors via the k10temp module.
> 
> Signed-off-by: Alexander Monakov <amonakov@ispras.ru>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Borislav Petkov <bp@alien8.de>
> Cc: x86@kernel.org
> Cc: Yazen Ghannam <yazen.ghannam@amd.com>
> Cc: Brian Woods <brian.woods@amd.com>
> Cc: Clemens Ladisch <clemens@ladisch.de>
> Cc: Jean Delvare <jdelvare@suse.com>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Cc: linux-hwmon@vger.kernel.org
> Cc: linux-edac@vger.kernel.org

Acked-by: Yazen Ghannam <yazen.ghannam@amd.com>

Thanks,
Yazen

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 3/3] EDAC/amd64: Add AMD family 17h model 60h PCI IDs
  2020-05-10 20:48 ` [PATCH 3/3] EDAC/amd64: Add AMD family 17h model 60h PCI IDs Alexander Monakov
@ 2020-05-13 15:11   ` Yazen Ghannam
  0 siblings, 0 replies; 9+ messages in thread
From: Yazen Ghannam @ 2020-05-13 15:11 UTC (permalink / raw)
  To: Alexander Monakov
  Cc: linux-kernel, Thomas Gleixner, Borislav Petkov, x86, Brian Woods,
	Clemens Ladisch, Jean Delvare, Guenter Roeck, linux-hwmon,
	linux-edac

On Sun, May 10, 2020 at 04:48:42PM -0400, Alexander Monakov wrote:
> Add support for AMD Renoir (4000-series Ryzen CPUs).
> 
> Signed-off-by: Alexander Monakov <amonakov@ispras.ru>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Borislav Petkov <bp@alien8.de>
> Cc: x86@kernel.org
> Cc: Yazen Ghannam <yazen.ghannam@amd.com>
> Cc: Brian Woods <brian.woods@amd.com>
> Cc: Clemens Ladisch <clemens@ladisch.de>
> Cc: Jean Delvare <jdelvare@suse.com>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Cc: linux-hwmon@vger.kernel.org
> Cc: linux-edac@vger.kernel.org

Acked-by: Yazen Ghannam <yazen.ghannam@amd.com>

Thanks,
Yazen

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 1/3] x86/amd_nb: add AMD family 17h model 60h PCI IDs
  2020-05-10 20:48 ` [PATCH 1/3] x86/amd_nb: add AMD family 17h model 60h PCI IDs Alexander Monakov
  2020-05-13 15:10   ` Yazen Ghannam
@ 2020-05-22 14:45   ` Guenter Roeck
  2020-05-22 16:02     ` Borislav Petkov
  1 sibling, 1 reply; 9+ messages in thread
From: Guenter Roeck @ 2020-05-22 14:45 UTC (permalink / raw)
  To: Alexander Monakov
  Cc: linux-kernel, Thomas Gleixner, Borislav Petkov, x86,
	Yazen Ghannam, Brian Woods, Clemens Ladisch, Jean Delvare,
	linux-hwmon, linux-edac

On Sun, May 10, 2020 at 08:48:40PM +0000, Alexander Monakov wrote:
> Add PCI IDs for AMD Renoir (4000-series Ryzen CPUs). This is necessary
> to enable support for temperature sensors via the k10temp module.
> 
> Signed-off-by: Alexander Monakov <amonakov@ispras.ru>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Borislav Petkov <bp@alien8.de>
> Cc: x86@kernel.org
> Cc: Yazen Ghannam <yazen.ghannam@amd.com>
> Cc: Brian Woods <brian.woods@amd.com>
> Cc: Clemens Ladisch <clemens@ladisch.de>
> Cc: Jean Delvare <jdelvare@suse.com>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Cc: linux-hwmon@vger.kernel.org
> Cc: linux-edac@vger.kernel.org
> Acked-by: Yazen Ghannam <yazen.ghannam@amd.com>

For my own reference:

Acked-by: Guenter Roeck <linux@roeck-us.net>

I didn't see a response from any of the x86 maintainers, so this series may
not make it into v5.8. No idea what to do about that.

Guenter

> ---
>  arch/x86/kernel/amd_nb.c | 5 +++++
>  include/linux/pci_ids.h  | 1 +
>  2 files changed, 6 insertions(+)
> 
> diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
> index b6b3297851f3..18f6b7c4bd79 100644
> --- a/arch/x86/kernel/amd_nb.c
> +++ b/arch/x86/kernel/amd_nb.c
> @@ -18,9 +18,11 @@
>  #define PCI_DEVICE_ID_AMD_17H_ROOT	0x1450
>  #define PCI_DEVICE_ID_AMD_17H_M10H_ROOT	0x15d0
>  #define PCI_DEVICE_ID_AMD_17H_M30H_ROOT	0x1480
> +#define PCI_DEVICE_ID_AMD_17H_M60H_ROOT	0x1630
>  #define PCI_DEVICE_ID_AMD_17H_DF_F4	0x1464
>  #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F4 0x15ec
>  #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F4 0x1494
> +#define PCI_DEVICE_ID_AMD_17H_M60H_DF_F4 0x144c
>  #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F4 0x1444
>  #define PCI_DEVICE_ID_AMD_19H_DF_F4	0x1654
>  
> @@ -33,6 +35,7 @@ static const struct pci_device_id amd_root_ids[] = {
>  	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_ROOT) },
>  	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_ROOT) },
>  	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_ROOT) },
> +	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M60H_ROOT) },
>  	{}
>  };
>  
> @@ -50,6 +53,7 @@ static const struct pci_device_id amd_nb_misc_ids[] = {
>  	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_DF_F3) },
>  	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F3) },
>  	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) },
> +	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_F3) },
>  	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) },
>  	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F3) },
>  	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_DF_F3) },
> @@ -65,6 +69,7 @@ static const struct pci_device_id amd_nb_link_ids[] = {
>  	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_DF_F4) },
>  	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F4) },
>  	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F4) },
> +	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_F4) },
>  	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F4) },
>  	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_DF_F4) },
>  	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F4) },
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index 1dfc4e1dcb94..3155f5ada02e 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -550,6 +550,7 @@
>  #define PCI_DEVICE_ID_AMD_17H_DF_F3	0x1463
>  #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F3 0x15eb
>  #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F3 0x1493
> +#define PCI_DEVICE_ID_AMD_17H_M60H_DF_F3 0x144b
>  #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F3 0x1443
>  #define PCI_DEVICE_ID_AMD_19H_DF_F3	0x1653
>  #define PCI_DEVICE_ID_AMD_CNB17H_F3	0x1703

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH 1/3] x86/amd_nb: add AMD family 17h model 60h PCI IDs
  2020-05-22 14:45   ` Guenter Roeck
@ 2020-05-22 16:02     ` Borislav Petkov
  0 siblings, 0 replies; 9+ messages in thread
From: Borislav Petkov @ 2020-05-22 16:02 UTC (permalink / raw)
  To: Guenter Roeck
  Cc: Alexander Monakov, linux-kernel, Thomas Gleixner, x86,
	Yazen Ghannam, Brian Woods, Clemens Ladisch, Jean Delvare,
	linux-hwmon, linux-edac

On Fri, May 22, 2020 at 07:45:27AM -0700, Guenter Roeck wrote:
> I didn't see a response from any of the x86 maintainers,

It is on a TODO list and will be handled soon.

Thx.

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, back to index

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-10 20:48 [PATCH 0/3] k10temp and EDAC support for AMD Renoir Alexander Monakov
2020-05-10 20:48 ` [PATCH 1/3] x86/amd_nb: add AMD family 17h model 60h PCI IDs Alexander Monakov
2020-05-13 15:10   ` Yazen Ghannam
2020-05-22 14:45   ` Guenter Roeck
2020-05-22 16:02     ` Borislav Petkov
2020-05-10 20:48 ` [PATCH 2/3] hwmon: (k10temp) Add AMD family 17h model 60h PCI match Alexander Monakov
2020-05-11 16:42   ` Guenter Roeck
2020-05-10 20:48 ` [PATCH 3/3] EDAC/amd64: Add AMD family 17h model 60h PCI IDs Alexander Monakov
2020-05-13 15:11   ` Yazen Ghannam

Linux-Hwmon Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-hwmon/0 linux-hwmon/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-hwmon linux-hwmon/ https://lore.kernel.org/linux-hwmon \
		linux-hwmon@vger.kernel.org
	public-inbox-index linux-hwmon

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-hwmon


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git