Commit 2ade8fc6 authored by David Bartley's avatar David Bartley Committed by Borislav Petkov
Browse files

x86/amd_nb: Add AMD family 19h model 50h PCI ids 



This is required to support Zen3 APUs in k10temp.

Signed-off-by: default avatarDavid Bartley <andareed@gmail.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatarWei Huang <wei.huang2@amd.com>
Link: https://lkml.kernel.org/r/20210520174130.94954-1-andareed@gmail.com
parent 28188cc4

arch/x86/kernel/amd_nb.c

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#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

#define PCI_DEVICE_ID_AMD_19H_M50H_DF_F4 0x166e



/* Protect the PCI config register pairs used for SMN and DF indirect access. */

static DEFINE_MUTEX(smn_mutex);
@@ -57,6 +58,7 @@ static const struct pci_device_id amd_nb_misc_ids[] = { 
	{ 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) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F3) },

	{}

};
@@ -72,6 +74,7 @@ static const struct pci_device_id amd_nb_link_ids[] = { 
	{ 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_19H_M50H_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
@@ -555,6 +555,7 @@ 
#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_19H_M50H_DF_F3 0x166d

#define PCI_DEVICE_ID_AMD_CNB17H_F3	0x1703

#define PCI_DEVICE_ID_AMD_LANCE		0x2000

#define PCI_DEVICE_ID_AMD_LANCE_HOME	0x2001