Commit c6401660 authored by Avadhut Naik's avatar Avadhut Naik Committed by Borislav Petkov (AMD)
Browse files

x86/amd_nb: Add PCI IDs for AMD Family 1Ah-based models 



Add new PCI Device IDs required to support AMD's new Family 1Ah-based
models 00h-1Fh, 20h and 40h-4Fh.

  [ bp: Zap a useless sentence. ]

Co-developed-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarAvadhut Naik <Avadhut.Naik@amd.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20230809035244.2722455-2-avadhut.naik@amd.com
parent 52a93d39

arch/x86/kernel/amd_nb.c

+8 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
#define PCI_DEVICE_ID_AMD_19H_M40H_ROOT		0x14b5

#define PCI_DEVICE_ID_AMD_19H_M60H_ROOT		0x14d8

#define PCI_DEVICE_ID_AMD_19H_M70H_ROOT		0x14e8

#define PCI_DEVICE_ID_AMD_1AH_M00H_ROOT		0x153a

#define PCI_DEVICE_ID_AMD_1AH_M20H_ROOT		0x1507

#define PCI_DEVICE_ID_AMD_MI200_ROOT		0x14bb



#define PCI_DEVICE_ID_AMD_17H_DF_F4		0x1464
@@ -39,6 +41,7 @@ 
#define PCI_DEVICE_ID_AMD_19H_M60H_DF_F4	0x14e4

#define PCI_DEVICE_ID_AMD_19H_M70H_DF_F4	0x14f4

#define PCI_DEVICE_ID_AMD_19H_M78H_DF_F4	0x12fc

#define PCI_DEVICE_ID_AMD_1AH_M00H_DF_F4	0x12c4

#define PCI_DEVICE_ID_AMD_MI200_DF_F4		0x14d4



/* Protect the PCI config register pairs used for SMN. */
@@ -56,6 +59,8 @@ static const struct pci_device_id amd_root_ids[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M40H_ROOT) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M60H_ROOT) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M70H_ROOT) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_ROOT) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M20H_ROOT) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_ROOT) },

	{}

};
@@ -85,6 +90,8 @@ static const struct pci_device_id amd_nb_misc_ids[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M60H_DF_F3) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M70H_DF_F3) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M78H_DF_F3) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_DF_F3) },

	{}

};
@@ -106,6 +113,7 @@ static const struct pci_device_id amd_nb_link_ids[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M40H_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) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_DF_F4) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_DF_F4) },

	{}

};

include/linux/pci_ids.h

+2 −0
Original line number Diff line number Diff line
@@ -576,6 +576,8 @@ 
#define PCI_DEVICE_ID_AMD_19H_M60H_DF_F3 0x14e3

#define PCI_DEVICE_ID_AMD_19H_M70H_DF_F3 0x14f3

#define PCI_DEVICE_ID_AMD_19H_M78H_DF_F3 0x12fb

#define PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3 0x12c3

#define PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3 0x16fb

#define PCI_DEVICE_ID_AMD_MI200_DF_F3	0x14d3

#define PCI_DEVICE_ID_AMD_CNB17H_F3	0x1703

#define PCI_DEVICE_ID_AMD_LANCE		0x2000