d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lib/env_dpdk: Added VMD PCI driver object

Browse Source 
This patch add support for VMD driver object.
New PCI device ID for VMD device was added.

Change-Id: I47bd8772a15ad370a14b7cc9460a177c91e6dd6a
Signed-off-by: Wojciech Malikowski <wojciech.malikowski@intel.com>
Signed-off-by: Orden Smith <orden.e.smith@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/455545
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Wojciech Malikowski 2019-05-23 10:51:03 -04:00 committed by Jim Harris
parent 7dcd9c8d37
commit ae18ad68ea
4 changed files with 77 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/spdk/env.h
View File

@ -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.
*

2
include/spdk/pci_ids.h
View File

@ -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

2
lib/env_dpdk/Makefile
View File

@ -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

67
lib/env_dpdk/pci_vmd.c Normal file
View File

@ -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);