x86/amd_nb: Add AMD Family MI300 PCI IDs
PATCH v2 1/1 x86/amd_nb: Add AMD Family MI300 PCI IDs
From: Muralidhara M K <[email protected]>
Add new Root, Device 18h Function 3, and Function 4 PCI IDS for AMD F19h Model 90h-9fh (MI300A).
---
v1 of this patch was submitted as part of
https://lore.kernel.org/linux-edac/[email protected]/T/#m577beb44c3eceb0371cb0306c9ea0cb51f16b16d
Submitting this patch separately because this change is needed for HSMP
driver submitted at
https://lore.kernel.org/platform-driver-x86/[email protected]/T/#u to work on mi300 platform.
arch/x86/kernel/amd_nb.c | 5 +++++ include/linux/pci_ids.h | 1 + 2 files changed, 6 insertions(+)
arch/x86/kernel/amd_nb.c +5 -0
@@ -27,6 +27,7 @@#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_MI300_ROOT 0x14f8#define PCI_DEVICE_ID_AMD_17H_DF_F4 0x1464#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F4 0x15ec
@@ -43,6 +44,7 @@#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 +#define PCI_DEVICE_ID_AMD_MI300_DF_F4 0x152c/* Protect the PCI config register pairs used for SMN. */ static DEFINE_MUTEX (smn_mutex);
@@ -62,6 +64,7 @@ static const struct pci_device_id amd_root_ids[] = { { 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) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI300_ROOT) }, {} };
@@ -93,6 +96,7 @@ static const struct pci_device_id amd_nb_misc_ids[] = { { 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) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI300_DF_F3) }, {} };
@@ -115,6 +119,7 @@ static const struct pci_device_id amd_nb_link_ids[] = { { 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) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI300_DF_F4) }, {} };
include/linux/pci_ids.h +1 -0
@@ -579,6 +579,7 @@#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_MI300_DF_F3 0x152b#define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703#define PCI_DEVICE_ID_AMD_LANCE 0x2000#define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001
Signature · 1 line
2.25.1
Quoted 7 lines · Suma Hegde
From: Muralidhara M K <[email protected]>
Add new Root, Device 18h Function 3, and Function 4 PCI IDS for AMD F19h Model 90h-9fh (MI300A).
Signed-off-by Muralidhara M K <[email protected]>Signed-off-by Suma Hegde <[email protected]>
As long as the pci_ids.h addition meets the criteria at the top of the file, which I assume it does because you add other IDs to amd_nb.c:
* Do not add new entries to this file unless the definitions
* are shared between multiple drivers.
Quoted 70 lines
---
v1 of this patch was submitted as part of
https://lore.kernel.org/linux-edac/[email protected]/T/#m577beb44c3eceb0371cb0306c9ea0cb51f16b16d
Submitting this patch separately because this change is needed for HSMP
driver submitted at
https://lore.kernel.org/platform-driver-x86/[email protected]/T/#u to work on mi300 platform.arch/x86/kernel/amd_nb.c | 5 +++++ include/linux/pci_ids.h | 1 + 2 files changed, 6 insertions(+)arch/x86/kernel/amd_nb.c +5
-0@@ -27,6 +27,7 @@#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_MI300_ROOT 0x14f8#define PCI_DEVICE_ID_AMD_17H_DF_F4 0x1464#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F4 0x15ec@@ -43,6 +44,7 @@#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 +#define PCI_DEVICE_ID_AMD_MI300_DF_F4 0x152c/* Protect the PCI config register pairs used for SMN. */ static DEFINE_MUTEX (smn_mutex);@@ -62,6 +64,7 @@ static const struct pci_device_id amd_root_ids[] = { { 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) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI300_ROOT) }, {} };@@ -93,6 +96,7 @@ static const struct pci_device_id amd_nb_misc_ids[] = { { 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) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI300_DF_F3) }, {} };@@ -115,6 +119,7 @@ static const struct pci_device_id amd_nb_link_ids[] = { { 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) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI300_DF_F4) }, {} };include/linux/pci_ids.h +1
-0@@ -579,6 +579,7 @@#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_MI300_DF_F3 0x152b#define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703#define PCI_DEVICE_ID_AMD_LANCE 0x2000#define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001Signature · 1 line
2.25.1
The following commit has been merged into the x86/platform branch of tip:
The following commit has been merged into the x86/platform branch of tip:
Commit-ID: 24775700eaa93ff83b2a0f1e005879cdf186cdd9 Gitweb: https://git.kernel.org/tip/24775700eaa93ff83b2a0f1e005879cdf186cdd9 Author: Muralidhara M K <[email protected]> AuthorDate: Tue, 26 Sep 2023 05:19:32 Committer: Ingo Molnar <[email protected]> CommitterDate: Wed, 27 Sep 2023 09:53:23 +02:00
x86/amd_nb: Add AMD Family MI300 PCI IDs
Add new Root, Device 18h Function 3, and Function 4 PCI IDS for AMD F19h Model 90h-9fh (MI300A).
--- arch/x86/kernel/amd_nb.c | 5 +++++ include/linux/pci_ids.h | 1 + 2 files changed, 6 insertions(+)
arch/x86/kernel/amd_nb.c +5 -0
@@ -27,6 +27,7 @@#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_MI300_ROOT 0x14f8#define PCI_DEVICE_ID_AMD_17H_DF_F4 0x1464#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F4 0x15ec
@@ -43,6 +44,7 @@#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 +#define PCI_DEVICE_ID_AMD_MI300_DF_F4 0x152c/* Protect the PCI config register pairs used for SMN. */ static DEFINE_MUTEX (smn_mutex);
@@ -62,6 +64,7 @@ static const struct pci_device_id amd_root_ids[] = { { 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) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI300_ROOT) }, {} };
@@ -93,6 +96,7 @@ static const struct pci_device_id amd_nb_misc_ids[] = { { 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) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI300_DF_F3) }, {} };
@@ -115,6 +119,7 @@ static const struct pci_device_id amd_nb_link_ids[] = { { 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) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI300_DF_F4) }, {} };
include/linux/pci_ids.h +1 -0
@@ -579,6 +579,7 @@#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_MI300_DF_F3 0x152b#define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703#define PCI_DEVICE_ID_AMD_LANCE 0x2000#define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001