diff --git a/include/spdk/env.h b/include/spdk/env.h index 8273f1e32..0203c8d53 100644 --- a/include/spdk/env.h +++ b/include/spdk/env.h @@ -667,6 +667,13 @@ typedef int (*spdk_pci_enum_cb)(void *enum_ctx, struct spdk_pci_device *pci_dev) */ struct spdk_pci_driver *spdk_pci_nvme_get_driver(void); +/** + * Get the VMD PCI driver object. + * + * \return PCI driver. + */ +struct spdk_pci_driver *spdk_pci_vmd_get_driver(void); + /** * Get the I/OAT PCI driver object. * diff --git a/include/spdk/pci_ids.h b/include/spdk/pci_ids.h index b078dec1e..5380493eb 100644 --- a/include/spdk/pci_ids.h +++ b/include/spdk/pci_ids.h @@ -123,6 +123,8 @@ extern "C" { #define PCI_DEVICE_ID_VIRTIO_BLK_MODERN 0x1001 #define PCI_DEVICE_ID_VIRTIO_SCSI_MODERN 0x1004 +#define PCI_DEVICE_ID_INTEL_VMD 0x201d + #ifdef __cplusplus } #endif diff --git a/lib/env_dpdk/Makefile b/lib/env_dpdk/Makefile index da43adc3a..9c9188904 100644 --- a/lib/env_dpdk/Makefile +++ b/lib/env_dpdk/Makefile @@ -36,7 +36,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk CFLAGS += $(ENV_CFLAGS) C_SRCS = env.c memory.c pci.c init.c threads.c -C_SRCS += pci_nvme.c pci_ioat.c pci_virtio.c +C_SRCS += pci_nvme.c pci_ioat.c pci_virtio.c pci_vmd.c LIBNAME = env_dpdk include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/lib/env_dpdk/pci_vmd.c b/lib/env_dpdk/pci_vmd.c new file mode 100644 index 000000000..8168e1238 --- /dev/null +++ b/lib/env_dpdk/pci_vmd.c @@ -0,0 +1,67 @@ +/*- + * BSD LICENSE + * + * Copyright (c) Intel Corporation. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "env_internal.h" + +#include "spdk/pci_ids.h" + +static struct rte_pci_id vmd_pci_driver_id[] = { + { RTE_PCI_DEVICE(SPDK_PCI_VID_INTEL, PCI_DEVICE_ID_INTEL_VMD) }, + { .vendor_id = 0, /* sentinel */ }, +}; + +static struct spdk_pci_driver g_vmd_pci_drv = { + .driver = { + .drv_flags = RTE_PCI_DRV_NEED_MAPPING +#if RTE_VERSION >= RTE_VERSION_NUM(18, 8, 0, 0) + | RTE_PCI_DRV_WC_ACTIVATE +#endif + , + .id_table = vmd_pci_driver_id, + .probe = spdk_pci_device_init, + .remove = spdk_pci_device_fini, + .driver.name = "spdk_vmd", + }, + + .cb_fn = NULL, + .cb_arg = NULL, + .is_registered = false, +}; + +struct spdk_pci_driver * +spdk_pci_vmd_get_driver(void) +{ + return &g_vmd_pci_drv; +} + +SPDK_PMD_REGISTER_PCI(g_vmd_pci_drv);