Commit a86cc765 authored by Avadhut Naik's avatar Avadhut Naik Committed by PvsNarasimha
Browse files

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

mainline inclusion
from mainline-v6.6-rc1
commit c6401660
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IAU6ZD

Reference: https://github.com/torvalds/linux/commit/c64016609b6f66b753b5f37929a191477fa584c0



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

commit c6401660 upstream

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


Signed-off-by: default avatarPvsNarasimha <PVS.NarasimhaRao@amd.com>
parent c406e1ef

arch/x86/kernel/amd_nb.c

+8 −0
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ 
#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

#define PCI_DEVICE_ID_AMD_1AH_M00H_ROOT		0x153a

#define PCI_DEVICE_ID_AMD_1AH_M20H_ROOT		0x1507

#define PCI_DEVICE_ID_AMD_1AH_M00H_DF_F4	0x12c4



/* Protect the PCI config register pairs used for SMN. */

static DEFINE_MUTEX(smn_mutex);
@@ -52,6 +55,8 @@ static const struct pci_device_id amd_root_ids[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M60H_ROOT) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M10H_ROOT) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M40H_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) },

	{}

};
@@ -76,6 +81,8 @@ static const struct pci_device_id amd_nb_misc_ids[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M10H_DF_F3) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M40H_DF_F3) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M50H_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) },

	{}

};
@@ -95,6 +102,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) },

	{}

};

include/linux/pci_ids.h

+2 −0
Original line number Diff line number Diff line
@@ -560,6 +560,8 @@ 
#define PCI_DEVICE_ID_AMD_19H_M10H_DF_F3 0x14b0

#define PCI_DEVICE_ID_AMD_19H_M40H_DF_F3 0x167c

#define PCI_DEVICE_ID_AMD_19H_M50H_DF_F3 0x166d

#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_CNB17H_F3	0x1703

#define PCI_DEVICE_ID_AMD_LANCE		0x2000

#define PCI_DEVICE_ID_AMD_LANCE_HOME	0x2001