Commit 47a3fc83 authored by Liao Xuan's avatar Liao Xuan
Browse files

x86/amd_nb: Add support for Hygon family 18h model 10h 

hygon inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9VW9Q


CVE: NA

---------------------------

Add root and DF F1/F3/F4 device IDs for Hygon family 18h model
10h processors.

Signed-off-by: default avatarLiao Xuan <liaoxuan@hygon.cn>
parent cd67f83c

arch/x86/kernel/amd_nb.c

+5 −0
Original line number Diff line number Diff line
@@ -32,9 +32,11 @@ 
#define PCI_DEVICE_ID_AMD_19H_M50H_DF_F4 0x166e



#define PCI_DEVICE_ID_HYGON_18H_M05H_ROOT  0x14a0

#define PCI_DEVICE_ID_HYGON_18H_M10H_ROOT  0x14c0

#define PCI_DEVICE_ID_HYGON_18H_M04H_DF_F1 0x1491

#define PCI_DEVICE_ID_HYGON_18H_M05H_DF_F1 0x14b1

#define PCI_DEVICE_ID_HYGON_18H_M05H_DF_F4 0x14b4

#define PCI_DEVICE_ID_HYGON_18H_M10H_DF_F4 0x14d4

#define PCI_DEVICE_ID_HYGON_18H_M06H_DF_F5 0x14b5



/* Protect the PCI config register pairs used for SMN and DF indirect access. */
@@ -100,6 +102,7 @@ static const struct pci_device_id hygon_root_ids[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_HYGON, PCI_DEVICE_ID_AMD_17H_ROOT) },

	{ PCI_DEVICE(PCI_VENDOR_ID_HYGON, PCI_DEVICE_ID_AMD_17H_M30H_ROOT) },

	{ PCI_DEVICE(PCI_VENDOR_ID_HYGON, PCI_DEVICE_ID_HYGON_18H_M05H_ROOT) },

	{ PCI_DEVICE(PCI_VENDOR_ID_HYGON, PCI_DEVICE_ID_HYGON_18H_M10H_ROOT) },

	{}

};
@@ -107,6 +110,7 @@ static const struct pci_device_id hygon_nb_misc_ids[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_HYGON, PCI_DEVICE_ID_AMD_17H_DF_F3) },

	{ PCI_DEVICE(PCI_VENDOR_ID_HYGON, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) },

	{ PCI_DEVICE(PCI_VENDOR_ID_HYGON, PCI_DEVICE_ID_HYGON_18H_M05H_DF_F3) },

	{ PCI_DEVICE(PCI_VENDOR_ID_HYGON, PCI_DEVICE_ID_HYGON_18H_M10H_DF_F3) },

	{}

};
@@ -114,6 +118,7 @@ static const struct pci_device_id hygon_nb_link_ids[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_HYGON, PCI_DEVICE_ID_AMD_17H_DF_F4) },

	{ PCI_DEVICE(PCI_VENDOR_ID_HYGON, PCI_DEVICE_ID_AMD_17H_M30H_DF_F4) },

	{ PCI_DEVICE(PCI_VENDOR_ID_HYGON, PCI_DEVICE_ID_HYGON_18H_M05H_DF_F4) },

	{ PCI_DEVICE(PCI_VENDOR_ID_HYGON, PCI_DEVICE_ID_HYGON_18H_M10H_DF_F4) },

	{}

};

include/linux/pci_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -2613,6 +2613,7 @@ 
#define PCI_VENDOR_ID_HYGON		0x1d94

#define PCI_DEVICE_ID_HYGON_18H_M05H_HDA	0x14a9

#define PCI_DEVICE_ID_HYGON_18H_M05H_DF_F3	0x14b3

#define PCI_DEVICE_ID_HYGON_18H_M10H_DF_F3	0x14d3



#define PCI_VENDOR_ID_HXT		0x1dbf