gpu/cuda: add more NVIDIA devices

[dpdk.git] / drivers / gpu / cuda / cuda.c

diff --git a/drivers/gpu/cuda/cuda.c b/drivers/gpu/cuda/cuda.c
index efb5d14..5b8476a 100644 (file)
--- a/drivers/gpu/cuda/cuda.c
+++ b/drivers/gpu/cuda/cuda.c
@@ -16,6 +16,7 @@
 #include <cudaTypedefs.h>
 
 #include "common.h"
+#include "devices.h"
 
 #define CUDA_DRIVER_MIN_VERSION 11040
 #define CUDA_API_MIN_VERSION 3020
@@ -53,23 +54,6 @@ static unsigned int cuda_api_version;
 static int cuda_driver_version;
 static gdr_t gdrc_h;
 
-/* NVIDIA GPU vendor */
-#define NVIDIA_GPU_VENDOR_ID (0x10de)
-
-/* NVIDIA GPU device IDs */
-#define NVIDIA_GPU_A100_40GB_DEVICE_ID (0x20f1)
-#define NVIDIA_GPU_A100_80GB_DEVICE_ID (0x20b5)
-#define NVIDIA_GPU_A100_80GB_DPU_DEVICE_ID (0x20b8)
-
-#define NVIDIA_GPU_A30_24GB_DEVICE_ID (0x20b7)
-#define NVIDIA_GPU_A10_24GB_DEVICE_ID (0x2236)
-
-#define NVIDIA_GPU_V100_32GB_SXM_DEVICE_ID (0x1db5)
-#define NVIDIA_GPU_V100_32GB_PCIE_DEVICE_ID (0x1db6)
-#define NVIDIA_GPU_V100_16GB_DEVICE_ID (0x1db4)
-
-#define NVIDIA_GPU_T4_16GB_DEVICE_ID (0x1eb8)
-
 #define CUDA_MAX_ALLOCATION_NUM 512
 
 #define GPU_PAGE_SHIFT 16
@@ -81,27 +65,79 @@ RTE_LOG_REGISTER_DEFAULT(cuda_logtype, NOTICE);
 static const struct rte_pci_id pci_id_cuda_map[] = {
        {
                RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
-                               NVIDIA_GPU_A100_40GB_DEVICE_ID)
+                               NVIDIA_GPU_A40_DEVICE_ID)
        },
        {
                RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
-                               NVIDIA_GPU_A100_80GB_DEVICE_ID)
+                               NVIDIA_GPU_A30_24GB_DEVICE_ID)
        },
        {
                RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
-                               NVIDIA_GPU_A100_80GB_DPU_DEVICE_ID)
+                               NVIDIA_GPU_A30X_24GB_DPU_DEVICE_ID)
        },
        {
                RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
-                               NVIDIA_GPU_A30_24GB_DEVICE_ID)
+                               NVIDIA_GPU_A10_24GB_DEVICE_ID)
        },
        {
                RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
-                               NVIDIA_GPU_A10_24GB_DEVICE_ID)
+                               NVIDIA_GPU_A10G_DEVICE_ID)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_A10M_DEVICE_ID)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_A100_40GB_SXM4_DEVICE_ID)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_A100_40GB_PCIE_DEVICE_ID)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_A100_80GB_SXM4_DEVICE_ID)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_A100_80GB_PCIE_DEVICE_ID)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_A100X_80GB_DPU_DEVICE_ID)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_GA100_PG506_207)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_GA100_PCIE)
        },
        {
                RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
-                               NVIDIA_GPU_V100_32GB_SXM_DEVICE_ID)
+                               NVIDIA_GPU_GA100_PG506_217)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_V100_16GB_SXM2_DEVICE_ID)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_V100_16GB_DGXS_DEVICE_ID)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_V100_16GB_FHHL_DEVICE_ID)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_V100_16GB_PCIE_DEVICE_ID)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_V100_32GB_SXM2_DEVICE_ID)
        },
        {
                RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
@@ -109,11 +145,99 @@ static const struct rte_pci_id pci_id_cuda_map[] = {
        },
        {
                RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
-                               NVIDIA_GPU_V100_16GB_DEVICE_ID)
+                               NVIDIA_GPU_V100_32GB_DGXS_DEVICE_ID)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_V100_32GB_SXM3_DEVICE_ID)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_V100_32GB_SXM3_H_DEVICE_ID)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_V100_SXM2)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_V100S_PCIE)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_TITAN_V_CEO_ED)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_GV100GL_PG500_216)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_GV100GL_PG503_216)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_TU102_TITAN_RTX)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_TU102GL_QUADRO_RTX)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_GV100_QUADRO_DEVICE_ID)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_QUADRO_RTX_4000)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_QUADRO_RTX_5000)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_QUADRO_RTX_6000)
        },
        {
                RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
-                               NVIDIA_GPU_T4_16GB_DEVICE_ID)
+                               NVIDIA_GPU_QUADRO_RTX_8000)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_QUADRO_RTX_A4000)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_QUADRO_RTX_A6000)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_QUADRO_RTX_A5000)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_QUADRO_RTX_A4500)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_QUADRO_RTX_A5500)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_QUADRO_RTX_A2000)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_QUADRO_RTX_A2000_12GB)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_T4G)
+       },
+       {
+               RTE_PCI_DEVICE(NVIDIA_GPU_VENDOR_ID,
+                               NVIDIA_GPU_T4)
        },
        {
                .device_id = 0
@@ -169,7 +293,7 @@ cuda_loader(void)
        if (getenv("CUDA_PATH_L") == NULL)
                snprintf(cuda_path, 1024, "%s", "libcuda.so");
        else
-               snprintf(cuda_path, 1024, "%s%s", getenv("CUDA_PATH_L"), "libcuda.so");
+               snprintf(cuda_path, 1024, "%s/%s", getenv("CUDA_PATH_L"), "libcuda.so");
 
        cudalib = dlopen(cuda_path, RTLD_LAZY);
        if (cudalib == NULL) {
@@ -523,6 +647,8 @@ cuda_dev_info_get(struct rte_gpu *dev, struct rte_gpu_info *info)
                }
                dev->mpshared->info.total_memory = parent_info.total_memory;
 
+               dev->mpshared->info.page_size = parent_info.page_size;
+
                /*
                 * GPU Device private info
                 */
@@ -1173,6 +1299,8 @@ cuda_gpu_probe(__rte_unused struct rte_pci_driver *pci_drv, struct rte_pci_devic
                return -rte_errno;
        }
 
+       dev->mpshared->info.page_size = (size_t)GPU_PAGE_SIZE;
+
        /*
         * GPU Device private info
         */