* [PATCH 2/2] hwmon: (k10temp) Add PCI device IDs for family 17h, model 70h
2019-07-14 18:32 [PATCH 1/2] x86/amd_nb: Add PCI device IDs for family 17h, model 70h Vicki Pfau
@ 2019-07-14 18:32 ` Vicki Pfau
2019-07-14 21:33 ` Guenter Roeck
2019-07-14 21:31 ` [PATCH 1/2] x86/amd_nb: " Guenter Roeck
2019-07-23 23:10 ` Bjorn Helgaas
2 siblings, 1 reply; 5+ messages in thread
From: Vicki Pfau @ 2019-07-14 18:32 UTC (permalink / raw)
To: linux-hwmon, linux-pci, Guenter Roeck, Brian Woods; +Cc: Vicki Pfau
Add PCI device IDs for the new AMD Ryzen 3xxx (Matisse) CPUs to k10temp,
as they function identically from k10temp's point of view.
Signed-off-by: Vicki Pfau <vi@endrift.com>
---
drivers/hwmon/k10temp.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
index c77e89239dcd..5c1dddde193c 100644
--- a/drivers/hwmon/k10temp.c
+++ b/drivers/hwmon/k10temp.c
@@ -349,6 +349,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_M70H_DF_F3) },
{ PCI_VDEVICE(HYGON, PCI_DEVICE_ID_AMD_17H_DF_F3) },
{}
};
--
2.22.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 2/2] hwmon: (k10temp) Add PCI device IDs for family 17h, model 70h
2019-07-14 18:32 ` [PATCH 2/2] hwmon: (k10temp) " Vicki Pfau
@ 2019-07-14 21:33 ` Guenter Roeck
0 siblings, 0 replies; 5+ messages in thread
From: Guenter Roeck @ 2019-07-14 21:33 UTC (permalink / raw)
To: Vicki Pfau, linux-hwmon, linux-pci, Brian Woods
On 7/14/19 11:32 AM, Vicki Pfau wrote:
> Add PCI device IDs for the new AMD Ryzen 3xxx (Matisse) CPUs to k10temp,
> as they function identically from k10temp's point of view.
>
> Signed-off-by: Vicki Pfau <vi@endrift.com>
Acked-by: Guenter Roeck <linux@roeck-us.net>
I can not directly apply this patch since it depends on patch 1
of the series. You might want to resubmit and include x86 maintainers;
otherwise I don't see a path to get it accepted.
Guenter
> ---
> drivers/hwmon/k10temp.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
> index c77e89239dcd..5c1dddde193c 100644
> --- a/drivers/hwmon/k10temp.c
> +++ b/drivers/hwmon/k10temp.c
> @@ -349,6 +349,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_M70H_DF_F3) },
> { PCI_VDEVICE(HYGON, PCI_DEVICE_ID_AMD_17H_DF_F3) },
> {}
> };
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] x86/amd_nb: Add PCI device IDs for family 17h, model 70h
2019-07-14 18:32 [PATCH 1/2] x86/amd_nb: Add PCI device IDs for family 17h, model 70h Vicki Pfau
2019-07-14 18:32 ` [PATCH 2/2] hwmon: (k10temp) " Vicki Pfau
@ 2019-07-14 21:31 ` Guenter Roeck
2019-07-23 23:10 ` Bjorn Helgaas
2 siblings, 0 replies; 5+ messages in thread
From: Guenter Roeck @ 2019-07-14 21:31 UTC (permalink / raw)
To: Vicki Pfau, linux-hwmon, linux-pci, Brian Woods
On 7/14/19 11:32 AM, Vicki Pfau wrote:
> Add the PCI device IDs for the newly released AMD Ryzen 3xxx desktop
> (Matisse) CPU line northbridge link and misc devices.
>
> Signed-off-by: Vicki Pfau <vi@endrift.com>
You didn't copy any of the x86 maintainers.
FWIW:
Acked-by: Guenter Roeck <linux@roeck-us.net>
> ---
> arch/x86/kernel/amd_nb.c | 3 +++
> include/linux/pci_ids.h | 1 +
> 2 files changed, 4 insertions(+)
>
> diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
> index d63e63b7d1d9..0a8b816857c1 100644
> --- a/arch/x86/kernel/amd_nb.c
> +++ b/arch/x86/kernel/amd_nb.c
> @@ -21,6 +21,7 @@
> #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_M70H_DF_F4 0x1444
>
> /* Protect the PCI config register pairs used for SMN and DF indirect access. */
> static DEFINE_MUTEX(smn_mutex);
> @@ -49,6 +50,7 @@ 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_M70H_DF_F3) },
> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) },
> {}
> };
> @@ -63,6 +65,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_M70H_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 70e86148cb1e..862556761bbf 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -548,6 +548,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_M70H_DF_F3 0x1443
> #define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703
> #define PCI_DEVICE_ID_AMD_LANCE 0x2000
> #define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 1/2] x86/amd_nb: Add PCI device IDs for family 17h, model 70h
2019-07-14 18:32 [PATCH 1/2] x86/amd_nb: Add PCI device IDs for family 17h, model 70h Vicki Pfau
2019-07-14 18:32 ` [PATCH 2/2] hwmon: (k10temp) " Vicki Pfau
2019-07-14 21:31 ` [PATCH 1/2] x86/amd_nb: " Guenter Roeck
@ 2019-07-23 23:10 ` Bjorn Helgaas
2 siblings, 0 replies; 5+ messages in thread
From: Bjorn Helgaas @ 2019-07-23 23:10 UTC (permalink / raw)
To: Vicki Pfau; +Cc: linux-hwmon, linux-pci, Guenter Roeck, Brian Woods
On Sun, Jul 14, 2019 at 11:32:08AM -0700, Vicki Pfau wrote:
> Add the PCI device IDs for the newly released AMD Ryzen 3xxx desktop
> (Matisse) CPU line northbridge link and misc devices.
>
> Signed-off-by: Vicki Pfau <vi@endrift.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com> # pci_ids.h
It's still a shame to have to modify the kernel to add new device IDs
even though there's no new functionality here. But ISTR there was a
hornet's nest there ;)
> ---
> arch/x86/kernel/amd_nb.c | 3 +++
> include/linux/pci_ids.h | 1 +
> 2 files changed, 4 insertions(+)
>
> diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
> index d63e63b7d1d9..0a8b816857c1 100644
> --- a/arch/x86/kernel/amd_nb.c
> +++ b/arch/x86/kernel/amd_nb.c
> @@ -21,6 +21,7 @@
> #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_M70H_DF_F4 0x1444
>
> /* Protect the PCI config register pairs used for SMN and DF indirect access. */
> static DEFINE_MUTEX(smn_mutex);
> @@ -49,6 +50,7 @@ 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_M70H_DF_F3) },
> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) },
> {}
> };
> @@ -63,6 +65,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_M70H_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 70e86148cb1e..862556761bbf 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -548,6 +548,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_M70H_DF_F3 0x1443
> #define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703
> #define PCI_DEVICE_ID_AMD_LANCE 0x2000
> #define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001
> --
> 2.22.0
>
^ permalink raw reply [flat|nested] 5+ messages in thread