Commit a4e91825 authored by Alexander Monakov's avatar Alexander Monakov Committed by Borislav Petkov
Browse files

x86/amd_nb: Add AMD family 17h model 60h PCI IDs 



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: default avatarAlexander Monakov <amonakov@ispras.ru>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatarYazen Ghannam <yazen.ghannam@amd.com>
Acked-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lkml.kernel.org/r/20200510204842.2603-2-amonakov@ispras.ru
parent 3b4ff4eb

arch/x86/kernel/amd_nb.c

+5 −0
Original line number Diff line number Diff line
@@ -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) },

include/linux/pci_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -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