Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/9784/?format=api
{ "id": 9784, "url": "http://patches.dpdk.org/api/patches/9784/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1452430254-30390-3-git-send-email-david.marchand@6wind.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1452430254-30390-3-git-send-email-david.marchand@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1452430254-30390-3-git-send-email-david.marchand@6wind.com", "date": "2016-01-10T12:50:45", "name": "[dpdk-dev,02/11] ixgbe: move pci device ids to driver", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "297bcebf1b9d5f403a09f4ed0434a2f395c419bf", "submitter": { "id": 3, "url": "http://patches.dpdk.org/api/people/3/?format=api", "name": "David Marchand", "email": "david.marchand@6wind.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1452430254-30390-3-git-send-email-david.marchand@6wind.com/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/9784/comments/", "check": "pending", "checks": "http://patches.dpdk.org/api/patches/9784/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id 473438D9D;\n\tSun, 10 Jan 2016 13:51:11 +0100 (CET)", "from mail-wm0-f53.google.com (mail-wm0-f53.google.com\n\t[74.125.82.53]) by dpdk.org (Postfix) with ESMTP id C052E8D3C\n\tfor <dev@dpdk.org>; Sun, 10 Jan 2016 13:51:07 +0100 (CET)", "by mail-wm0-f53.google.com with SMTP id l65so182056845wmf.1\n\tfor <dev@dpdk.org>; Sun, 10 Jan 2016 04:51:07 -0800 (PST)", "from gloops.dev.6wind.com (144.77.126.78.rev.sfr.net.\n\t[78.126.77.144]) by smtp.gmail.com with ESMTPSA id\n\tu12sm8088011wmu.10.2016.01.10.04.51.06\n\t(version=TLSv1/SSLv3 cipher=OTHER);\n\tSun, 10 Jan 2016 04:51:06 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=6wind-com.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=XU1bXZSTPLBnPsYdUv9pl+g9zH6ZFy40dtxIY9lplh4=;\n\tb=G2oWwCzE9PnV9sJm8GumVVJ7mRze56dy95K6DRZE71eQ3ougz8A2eIR7zv2RrxeZU/\n\txX3i0BSCQRT6v+gGSud0lvqzxhWnCLub/X07xL7+cLfCTh1GC/BQk0xsYe/9P41EYSDX\n\tj+ybDGKSx+R/RzJOv4SEuP7/OOO7ktj3IxTSaMKyaFPmNzaAn3ZrG3nQycXsUoMfVQKe\n\t8E7M5vSr6i2DI3qGvm807UGp5yMrL9uCEAcH5OHKYAuDEtg51Y0Ob933SSHehjM1ENm/\n\tMUaKHOZ0aHicWSbVZ6FqPzxsbTgQjQhfszP7DbbojRCBE8aQMoNvBrofIRrB35s4QIJT\n\tmCiQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20130820;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=XU1bXZSTPLBnPsYdUv9pl+g9zH6ZFy40dtxIY9lplh4=;\n\tb=To+f5sXGwQhxoaHiVUgMxbZ2ctLQ1JYXEEGdY9vuZgJ4bZuqSx+cN3/l/fLfUkoAyf\n\t4wzlYikXvNz43xwuqRGZXKFSjboMvQ3UpOrfw08auHmPnenIlxrUA8NYCrp42GyLRgYs\n\tH4YUQRfOejn81arMZEGIePsHM+T6wLgZZNUaKuRVjtUmjsMC0O0uTmL9cTgU1S/DfNFl\n\tjIlI7dLgBOn3em6j3oeLoLKE+q9huMm5HTHpfyqW0vvXsLrx1EGVmJrX6vGGUth9HO+Z\n\tMxoeYzhX3oplPYQQqGog7siHoxh8RLXr84DqwyF3S1J/T/4LNkcbHgoZbu8VRlmgjj0l\n\tflvQ==", "X-Gm-Message-State": "ALoCoQku5/zH+ssjjRWo7s2zkXLRkJozISXoznlquiX8ppKstTYVWX6zf3v0i/vQt+uWsMzU2U9LDxkfMW+dATnnTeZ3pzko+A==", "X-Received": "by 10.194.94.138 with SMTP id dc10mr46394749wjb.37.1452430267636;\n\tSun, 10 Jan 2016 04:51:07 -0800 (PST)", "From": "David Marchand <david.marchand@6wind.com>", "To": "dev@dpdk.org", "Date": "Sun, 10 Jan 2016 13:50:45 +0100", "Message-Id": "<1452430254-30390-3-git-send-email-david.marchand@6wind.com>", "X-Mailer": "git-send-email 1.9.1", "In-Reply-To": "<1452430254-30390-1-git-send-email-david.marchand@6wind.com>", "References": "<CALwxeUt49PB2TKy_V-9GoQYdDHP3GeBb5LK6jBxdLEYVnRY-vw@mail.gmail.com>\n\t<1452430254-30390-1-git-send-email-david.marchand@6wind.com>", "Cc": "thomas.monjalon@dpdk.org", "Subject": "[dpdk-dev] [PATCH 02/11] ixgbe: move pci device ids to driver", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "test application and kni still want to know ixgbe pci devices.\nSo let's create a header in the driver that will be used by them.\n\nSigned-off-by: David Marchand <david.marchand@6wind.com>\n---\n app/test-pmd/Makefile | 2 +\n app/test-pmd/cmdline.c | 2 +-\n app/test/Makefile | 1 +\n app/test/test_pci.c | 2 +-\n drivers/net/ixgbe/ixgbe_ethdev.c | 4 +-\n drivers/net/ixgbe/ixgbe_pci_dev_ids.h | 185 ++++++++++++++++++++++++\n lib/librte_eal/common/include/rte_pci_dev_ids.h | 130 -----------------\n lib/librte_eal/linuxapp/kni/Makefile | 1 +\n lib/librte_eal/linuxapp/kni/kni_misc.c | 4 +-\n 9 files changed, 195 insertions(+), 136 deletions(-)\n create mode 100644 drivers/net/ixgbe/ixgbe_pci_dev_ids.h", "diff": "diff --git a/app/test-pmd/Makefile b/app/test-pmd/Makefile\nindex 72426f3..a8899b8 100644\n--- a/app/test-pmd/Makefile\n+++ b/app/test-pmd/Makefile\n@@ -64,6 +64,8 @@ ifeq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y)\n CFLAGS_mempool_anon.o := -D_GNU_SOURCE\n endif\n CFLAGS_cmdline.o := -D_GNU_SOURCE\n+# for bypass pci device ids\n+CFLAGS_cmdline.o += -I$(RTE_SDK)/drivers/net/ixgbe\n \n # this application needs libraries first\n DEPDIRS-y += lib drivers\ndiff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c\nindex 73298c9..fdb2e1b 100644\n--- a/app/test-pmd/cmdline.c\n+++ b/app/test-pmd/cmdline.c\n@@ -9816,7 +9816,7 @@ cmd_reconfig_device_queue(portid_t id, uint8_t dev, uint8_t queue)\n }\n \n #ifdef RTE_NIC_BYPASS\n-#include <rte_pci_dev_ids.h>\n+#include <ixgbe_pci_dev_ids.h>\n uint8_t\n bypass_is_supported(portid_t port_id)\n {\ndiff --git a/app/test/Makefile b/app/test/Makefile\nindex 687ae59..13fed78 100644\n--- a/app/test/Makefile\n+++ b/app/test/Makefile\n@@ -170,6 +170,7 @@ endif\n \n # pci tests want to know some pci devices ids\n CFLAGS_test_pci.o += -I$(RTE_SDK)/drivers/net/e1000\n+CFLAGS_test_pci.o += -I$(RTE_SDK)/drivers/net/ixgbe\n \n # this application needs libraries first\n DEPDIRS-y += lib drivers\ndiff --git a/app/test/test_pci.c b/app/test/test_pci.c\nindex b289138..d6a23d6 100644\n--- a/app/test/test_pci.c\n+++ b/app/test/test_pci.c\n@@ -68,7 +68,7 @@ static int my_driver_init(struct rte_pci_driver *dr,\n struct rte_pci_id my_driver_id[] = {\n \n #define RTE_PCI_DEV_ID_DECL_IXGBE(vend, dev) {RTE_PCI_DEVICE(vend, dev)},\n-#include <rte_pci_dev_ids.h>\n+#include <ixgbe_pci_dev_ids.h>\n \n { .vendor_id = 0, /* sentinel */ },\n };\ndiff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c\nindex 4c4c6df..b31f52e 100644\n--- a/drivers/net/ixgbe/ixgbe_ethdev.c\n+++ b/drivers/net/ixgbe/ixgbe_ethdev.c\n@@ -381,7 +381,7 @@ static int ixgbe_timesync_write_time(struct rte_eth_dev *dev,\n static const struct rte_pci_id pci_id_ixgbe_map[] = {\n \n #define RTE_PCI_DEV_ID_DECL_IXGBE(vend, dev) {RTE_PCI_DEVICE(vend, dev)},\n-#include \"rte_pci_dev_ids.h\"\n+#include \"ixgbe_pci_dev_ids.h\"\n \n { .vendor_id = 0, /* sentinel */ },\n };\n@@ -393,7 +393,7 @@ static const struct rte_pci_id pci_id_ixgbe_map[] = {\n static const struct rte_pci_id pci_id_ixgbevf_map[] = {\n \n #define RTE_PCI_DEV_ID_DECL_IXGBEVF(vend, dev) {RTE_PCI_DEVICE(vend, dev)},\n-#include \"rte_pci_dev_ids.h\"\n+#include \"ixgbe_pci_dev_ids.h\"\n { .vendor_id = 0, /* sentinel */ },\n \n };\ndiff --git a/drivers/net/ixgbe/ixgbe_pci_dev_ids.h b/drivers/net/ixgbe/ixgbe_pci_dev_ids.h\nnew file mode 100644\nindex 0000000..362a2ce\n--- /dev/null\n+++ b/drivers/net/ixgbe/ixgbe_pci_dev_ids.h\n@@ -0,0 +1,185 @@\n+/*-\n+ * This file is provided under a dual BSD/GPLv2 license. When using or\n+ * redistributing this file, you may do so under either license.\n+ *\n+ * GPL LICENSE SUMMARY\n+ *\n+ * Copyright(c) 2010-2015 Intel Corporation. All rights reserved.\n+ *\n+ * This program is free software; you can redistribute it and/or modify\n+ * it under the terms of version 2 of the GNU General Public License as\n+ * published by the Free Software Foundation.\n+ *\n+ * This program is distributed in the hope that it will be useful, but\n+ * WITHOUT ANY WARRANTY; without even the implied warranty of\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n+ * General Public License for more details.\n+ *\n+ * The full GNU General Public License is included in this distribution\n+ * in the file called LICENSE.GPL.\n+ *\n+ * Contact Information:\n+ * Intel Corporation\n+ *\n+ * BSD LICENSE\n+ *\n+ * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.\n+ * All rights reserved.\n+ *\n+ * Redistribution and use in source and binary forms, with or without\n+ * modification, are permitted provided that the following conditions\n+ * are met:\n+ *\n+ * * Redistributions of source code must retain the above copyright\n+ * notice, this list of conditions and the following disclaimer.\n+ * * Redistributions in binary form must reproduce the above copyright\n+ * notice, this list of conditions and the following disclaimer in\n+ * the documentation and/or other materials provided with the\n+ * distribution.\n+ * * Neither the name of Intel Corporation nor the names of its\n+ * contributors may be used to endorse or promote products derived\n+ * from this software without specific prior written permission.\n+ *\n+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n+ * \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n+ *\n+ */\n+\n+#ifndef RTE_PCI_DEV_ID_DECL_IXGBE\n+#define RTE_PCI_DEV_ID_DECL_IXGBE(vend, dev)\n+#endif\n+\n+#ifndef RTE_PCI_DEV_ID_DECL_IXGBEVF\n+#define RTE_PCI_DEV_ID_DECL_IXGBEVF(vend, dev)\n+#endif\n+\n+#ifndef PCI_VENDOR_ID_INTEL\n+/** Vendor ID used by Intel devices */\n+#define PCI_VENDOR_ID_INTEL 0x8086\n+#endif\n+\n+/****************** Physical IXGBE devices from ixgbe_type.h ******************/\n+\n+#define IXGBE_DEV_ID_82598 0x10B6\n+#define IXGBE_DEV_ID_82598_BX 0x1508\n+#define IXGBE_DEV_ID_82598AF_DUAL_PORT 0x10C6\n+#define IXGBE_DEV_ID_82598AF_SINGLE_PORT 0x10C7\n+#define IXGBE_DEV_ID_82598AT 0x10C8\n+#define IXGBE_DEV_ID_82598AT2 0x150B\n+#define IXGBE_DEV_ID_82598EB_SFP_LOM 0x10DB\n+#define IXGBE_DEV_ID_82598EB_CX4 0x10DD\n+#define IXGBE_DEV_ID_82598_CX4_DUAL_PORT 0x10EC\n+#define IXGBE_DEV_ID_82598_DA_DUAL_PORT 0x10F1\n+#define IXGBE_DEV_ID_82598_SR_DUAL_PORT_EM 0x10E1\n+#define IXGBE_DEV_ID_82598EB_XF_LR 0x10F4\n+#define IXGBE_DEV_ID_82599_KX4 0x10F7\n+#define IXGBE_DEV_ID_82599_KX4_MEZZ 0x1514\n+#define IXGBE_DEV_ID_82599_KR 0x1517\n+#define IXGBE_DEV_ID_82599_COMBO_BACKPLANE 0x10F8\n+#define IXGBE_SUBDEV_ID_82599_KX4_KR_MEZZ 0x000C\n+#define IXGBE_DEV_ID_82599_CX4 0x10F9\n+#define IXGBE_DEV_ID_82599_SFP 0x10FB\n+#define IXGBE_SUBDEV_ID_82599_SFP 0x11A9\n+#define IXGBE_SUBDEV_ID_82599_RNDC 0x1F72\n+#define IXGBE_SUBDEV_ID_82599_560FLR 0x17D0\n+#define IXGBE_SUBDEV_ID_82599_ECNA_DP 0x0470\n+#define IXGBE_DEV_ID_82599_BACKPLANE_FCOE 0x152A\n+#define IXGBE_DEV_ID_82599_SFP_FCOE 0x1529\n+#define IXGBE_DEV_ID_82599_SFP_EM 0x1507\n+#define IXGBE_DEV_ID_82599_SFP_SF2 0x154D\n+#define IXGBE_DEV_ID_82599_SFP_SF_QP 0x154A\n+#define IXGBE_DEV_ID_82599_QSFP_SF_QP 0x1558\n+#define IXGBE_DEV_ID_82599EN_SFP 0x1557\n+#define IXGBE_DEV_ID_82599_XAUI_LOM 0x10FC\n+#define IXGBE_DEV_ID_82599_T3_LOM 0x151C\n+#define IXGBE_DEV_ID_82599_LS 0x154F\n+#define IXGBE_DEV_ID_X540T 0x1528\n+#define IXGBE_DEV_ID_X540T1 0x1560\n+#define IXGBE_DEV_ID_X550EM_X_SFP 0x15AC\n+#define IXGBE_DEV_ID_X550EM_X_10G_T 0x15AD\n+#define IXGBE_DEV_ID_X550EM_X_1G_T 0x15AE\n+#define IXGBE_DEV_ID_X550T 0x1563\n+#define IXGBE_DEV_ID_X550EM_X_KX4 0x15AA\n+#define IXGBE_DEV_ID_X550EM_X_KR 0x15AB\n+\n+#ifdef RTE_NIC_BYPASS\n+#define IXGBE_DEV_ID_82599_BYPASS 0x155D\n+#endif\n+\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82598)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82598_BX)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82598AF_DUAL_PORT)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82598AF_SINGLE_PORT)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82598AT)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82598AT2)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82598EB_SFP_LOM)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82598EB_CX4)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82598_CX4_DUAL_PORT)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82598_DA_DUAL_PORT)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82598_SR_DUAL_PORT_EM)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82598EB_XF_LR)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_KX4)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_KX4_MEZZ)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_KR)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_COMBO_BACKPLANE)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_SUBDEV_ID_82599_KX4_KR_MEZZ)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_CX4)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_SFP)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_SUBDEV_ID_82599_SFP)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_SUBDEV_ID_82599_RNDC)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_SUBDEV_ID_82599_560FLR)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_SUBDEV_ID_82599_ECNA_DP)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_BACKPLANE_FCOE)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_SFP_FCOE)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_SFP_EM)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_SFP_SF2)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_SFP_SF_QP)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_QSFP_SF_QP)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599EN_SFP)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_XAUI_LOM)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_T3_LOM)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_LS)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X540T)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X540T1)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X550EM_X_SFP)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X550EM_X_10G_T)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X550EM_X_1G_T)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X550T)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X550EM_X_KX4)\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X550EM_X_KR)\n+\n+#ifdef RTE_NIC_BYPASS\n+RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_BYPASS)\n+#endif\n+\n+/****************** Virtual IXGBE devices from ixgbe_type.h ******************/\n+\n+#define IXGBE_DEV_ID_82599_VF 0x10ED\n+#define IXGBE_DEV_ID_82599_VF_HV 0x152E\n+#define IXGBE_DEV_ID_X540_VF 0x1515\n+#define IXGBE_DEV_ID_X540_VF_HV 0x1530\n+#define IXGBE_DEV_ID_X550_VF_HV 0x1564\n+#define IXGBE_DEV_ID_X550_VF 0x1565\n+#define IXGBE_DEV_ID_X550EM_X_VF 0x15A8\n+#define IXGBE_DEV_ID_X550EM_X_VF_HV 0x15A9\n+\n+RTE_PCI_DEV_ID_DECL_IXGBEVF(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_VF)\n+RTE_PCI_DEV_ID_DECL_IXGBEVF(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_VF_HV)\n+RTE_PCI_DEV_ID_DECL_IXGBEVF(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X540_VF)\n+RTE_PCI_DEV_ID_DECL_IXGBEVF(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X540_VF_HV)\n+RTE_PCI_DEV_ID_DECL_IXGBEVF(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X550_VF_HV)\n+RTE_PCI_DEV_ID_DECL_IXGBEVF(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X550_VF)\n+RTE_PCI_DEV_ID_DECL_IXGBEVF(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X550EM_X_VF)\n+RTE_PCI_DEV_ID_DECL_IXGBEVF(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X550EM_X_VF_HV)\n+\n+#undef RTE_PCI_DEV_ID_DECL_IXGBE\n+#undef RTE_PCI_DEV_ID_DECL_IXGBEVF\ndiff --git a/lib/librte_eal/common/include/rte_pci_dev_ids.h b/lib/librte_eal/common/include/rte_pci_dev_ids.h\nindex 244ef3d..ab6c4fb 100644\n--- a/lib/librte_eal/common/include/rte_pci_dev_ids.h\n+++ b/lib/librte_eal/common/include/rte_pci_dev_ids.h\n@@ -68,8 +68,6 @@\n * driver which is a para virtualization driver running in guest virtual machine.\n * The inclusion of these in an array built using this file depends on the\n * definition of\n- * RTE_PCI_DEV_ID_DECL_IXGBE\n- * RTE_PCI_DEV_ID_DECL_IXGBEVF\n * RTE_PCI_DEV_ID_DECL_I40E\n * RTE_PCI_DEV_ID_DECL_I40EVF\n * RTE_PCI_DEV_ID_DECL_VIRTIO\n@@ -93,14 +91,6 @@\n * Note that this file can be included multiple times within the same file.\n */\n \n-#ifndef RTE_PCI_DEV_ID_DECL_IXGBE\n-#define RTE_PCI_DEV_ID_DECL_IXGBE(vend, dev)\n-#endif\n-\n-#ifndef RTE_PCI_DEV_ID_DECL_IXGBEVF\n-#define RTE_PCI_DEV_ID_DECL_IXGBEVF(vend, dev)\n-#endif\n-\n #ifndef RTE_PCI_DEV_ID_DECL_I40E\n #define RTE_PCI_DEV_ID_DECL_I40E(vend, dev)\n #endif\n@@ -162,104 +152,6 @@\n #define PCI_VENDOR_ID_BROADCOM 0x14E4\n #endif\n \n-/****************** Physical IXGBE devices from ixgbe_type.h ******************/\n-\n-#define IXGBE_DEV_ID_82598 0x10B6\n-#define IXGBE_DEV_ID_82598_BX 0x1508\n-#define IXGBE_DEV_ID_82598AF_DUAL_PORT 0x10C6\n-#define IXGBE_DEV_ID_82598AF_SINGLE_PORT 0x10C7\n-#define IXGBE_DEV_ID_82598AT 0x10C8\n-#define IXGBE_DEV_ID_82598AT2 0x150B\n-#define IXGBE_DEV_ID_82598EB_SFP_LOM 0x10DB\n-#define IXGBE_DEV_ID_82598EB_CX4 0x10DD\n-#define IXGBE_DEV_ID_82598_CX4_DUAL_PORT 0x10EC\n-#define IXGBE_DEV_ID_82598_DA_DUAL_PORT 0x10F1\n-#define IXGBE_DEV_ID_82598_SR_DUAL_PORT_EM 0x10E1\n-#define IXGBE_DEV_ID_82598EB_XF_LR 0x10F4\n-#define IXGBE_DEV_ID_82599_KX4 0x10F7\n-#define IXGBE_DEV_ID_82599_KX4_MEZZ 0x1514\n-#define IXGBE_DEV_ID_82599_KR 0x1517\n-#define IXGBE_DEV_ID_82599_COMBO_BACKPLANE 0x10F8\n-#define IXGBE_SUBDEV_ID_82599_KX4_KR_MEZZ 0x000C\n-#define IXGBE_DEV_ID_82599_CX4 0x10F9\n-#define IXGBE_DEV_ID_82599_SFP 0x10FB\n-#define IXGBE_SUBDEV_ID_82599_SFP 0x11A9\n-#define IXGBE_SUBDEV_ID_82599_RNDC 0x1F72\n-#define IXGBE_SUBDEV_ID_82599_560FLR 0x17D0\n-#define IXGBE_SUBDEV_ID_82599_ECNA_DP 0x0470\n-#define IXGBE_DEV_ID_82599_BACKPLANE_FCOE 0x152A\n-#define IXGBE_DEV_ID_82599_SFP_FCOE 0x1529\n-#define IXGBE_DEV_ID_82599_SFP_EM 0x1507\n-#define IXGBE_DEV_ID_82599_SFP_SF2 0x154D\n-#define IXGBE_DEV_ID_82599_SFP_SF_QP 0x154A\n-#define IXGBE_DEV_ID_82599_QSFP_SF_QP 0x1558\n-#define IXGBE_DEV_ID_82599EN_SFP 0x1557\n-#define IXGBE_DEV_ID_82599_XAUI_LOM 0x10FC\n-#define IXGBE_DEV_ID_82599_T3_LOM 0x151C\n-#define IXGBE_DEV_ID_82599_LS 0x154F\n-#define IXGBE_DEV_ID_X540T 0x1528\n-#define IXGBE_DEV_ID_X540T1 0x1560\n-#define IXGBE_DEV_ID_X550EM_X_SFP 0x15AC\n-#define IXGBE_DEV_ID_X550EM_X_10G_T 0x15AD\n-#define IXGBE_DEV_ID_X550EM_X_1G_T 0x15AE\n-#define IXGBE_DEV_ID_X550T 0x1563\n-#define IXGBE_DEV_ID_X550EM_X_KX4 0x15AA\n-#define IXGBE_DEV_ID_X550EM_X_KR 0x15AB\n-\n-#ifdef RTE_NIC_BYPASS\n-#define IXGBE_DEV_ID_82599_BYPASS 0x155D\n-#endif\n-\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82598)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82598_BX)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82598AF_DUAL_PORT)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, \\\n-\tIXGBE_DEV_ID_82598AF_SINGLE_PORT)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82598AT)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82598AT2)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82598EB_SFP_LOM)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82598EB_CX4)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82598_CX4_DUAL_PORT)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82598_DA_DUAL_PORT)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, \\\n-\tIXGBE_DEV_ID_82598_SR_DUAL_PORT_EM)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82598EB_XF_LR)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_KX4)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_KX4_MEZZ)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_KR)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, \\\n-\tIXGBE_DEV_ID_82599_COMBO_BACKPLANE)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, \\\n-\tIXGBE_SUBDEV_ID_82599_KX4_KR_MEZZ)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_CX4)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_SFP)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_SUBDEV_ID_82599_SFP)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_SUBDEV_ID_82599_RNDC)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_SUBDEV_ID_82599_560FLR)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_SUBDEV_ID_82599_ECNA_DP)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_BACKPLANE_FCOE)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_SFP_FCOE)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_SFP_EM)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_SFP_SF2)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_SFP_SF_QP)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_QSFP_SF_QP)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599EN_SFP)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_XAUI_LOM)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_T3_LOM)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_LS)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X540T)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X540T1)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X550EM_X_SFP)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X550EM_X_10G_T)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X550EM_X_1G_T)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X550T)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X550EM_X_KX4)\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X550EM_X_KR)\n-\n-#ifdef RTE_NIC_BYPASS\n-RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_BYPASS)\n-#endif\n-\n /*************** Physical I40E devices from i40e_type.h *****************/\n \n #define I40E_DEV_ID_SFP_XL710 0x1572\n@@ -304,26 +196,6 @@ RTE_PCI_DEV_ID_DECL_I40E(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_10G_BASE_T_X722)\n RTE_PCI_DEV_ID_DECL_FM10K(PCI_VENDOR_ID_INTEL, FM10K_DEV_ID_PF)\n RTE_PCI_DEV_ID_DECL_FM10K(PCI_VENDOR_ID_INTEL, FM10K_DEV_ID_SDI_FM10420_QDA2)\n \n-/****************** Virtual IXGBE devices from ixgbe_type.h ******************/\n-\n-#define IXGBE_DEV_ID_82599_VF 0x10ED\n-#define IXGBE_DEV_ID_82599_VF_HV 0x152E\n-#define IXGBE_DEV_ID_X540_VF 0x1515\n-#define IXGBE_DEV_ID_X540_VF_HV 0x1530\n-#define IXGBE_DEV_ID_X550_VF_HV 0x1564\n-#define IXGBE_DEV_ID_X550_VF 0x1565\n-#define IXGBE_DEV_ID_X550EM_X_VF 0x15A8\n-#define IXGBE_DEV_ID_X550EM_X_VF_HV 0x15A9\n-\n-RTE_PCI_DEV_ID_DECL_IXGBEVF(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_VF)\n-RTE_PCI_DEV_ID_DECL_IXGBEVF(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_VF_HV)\n-RTE_PCI_DEV_ID_DECL_IXGBEVF(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X540_VF)\n-RTE_PCI_DEV_ID_DECL_IXGBEVF(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X540_VF_HV)\n-RTE_PCI_DEV_ID_DECL_IXGBEVF(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X550_VF_HV)\n-RTE_PCI_DEV_ID_DECL_IXGBEVF(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X550_VF)\n-RTE_PCI_DEV_ID_DECL_IXGBEVF(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X550EM_X_VF)\n-RTE_PCI_DEV_ID_DECL_IXGBEVF(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X550EM_X_VF_HV)\n-\n /****************** Virtual I40E devices from i40e_type.h ********************/\n \n #define I40E_DEV_ID_VF 0x154C\n@@ -412,8 +284,6 @@ RTE_PCI_DEV_ID_DECL_BNX2X(PCI_VENDOR_ID_BROADCOM, BNX2X_DEV_ID_57840_MF)\n */\n #undef RTE_PCI_DEV_ID_DECL_BNX2X\n #undef RTE_PCI_DEV_ID_DECL_BNX2XVF\n-#undef RTE_PCI_DEV_ID_DECL_IXGBE\n-#undef RTE_PCI_DEV_ID_DECL_IXGBEVF\n #undef RTE_PCI_DEV_ID_DECL_I40E\n #undef RTE_PCI_DEV_ID_DECL_I40EVF\n #undef RTE_PCI_DEV_ID_DECL_VIRTIO\ndiff --git a/lib/librte_eal/linuxapp/kni/Makefile b/lib/librte_eal/linuxapp/kni/Makefile\nindex 6ac7637..3bdf352 100644\n--- a/lib/librte_eal/linuxapp/kni/Makefile\n+++ b/lib/librte_eal/linuxapp/kni/Makefile\n@@ -44,6 +44,7 @@ MODULE_CFLAGS += -I$(RTE_OUTPUT)/include -I$(SRCDIR)/ethtool/ixgbe -I$(SRCDIR)/e\n MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h\n MODULE_CFLAGS += -Wall -Werror\n MODULE_CFLAGS += -I$(RTE_SDK)/drivers/net/e1000\n+MODULE_CFLAGS += -I$(RTE_SDK)/drivers/net/ixgbe\n \n ifeq ($(shell lsb_release -si 2>/dev/null),Ubuntu)\n MODULE_CFLAGS += -DUBUNTU_RELEASE_CODE=$(shell lsb_release -sr | tr -d .)\ndiff --git a/lib/librte_eal/linuxapp/kni/kni_misc.c b/lib/librte_eal/linuxapp/kni/kni_misc.c\nindex 96b07c2..f731d7c 100644\n--- a/lib/librte_eal/linuxapp/kni/kni_misc.c\n+++ b/lib/librte_eal/linuxapp/kni/kni_misc.c\n@@ -357,7 +357,7 @@ kni_dev_remove(struct kni_dev *dev)\n \t\tigb_kni_remove(dev->pci_dev);\n \t\tbreak;\n \t#define RTE_PCI_DEV_ID_DECL_IXGBE(vend, dev) case (dev):\n-\t#include <rte_pci_dev_ids.h>\n+\t#include <ixgbe_pci_dev_ids.h>\n \t\tixgbe_kni_remove(dev->pci_dev);\n \t\tbreak;\n \tdefault:\n@@ -515,7 +515,7 @@ kni_ioctl_create(struct net *net,\n \t\t\t\tbreak;\n \t\t\t#define RTE_PCI_DEV_ID_DECL_IXGBE(vend, dev) \\\n \t\t\t\t\t\t\tcase (dev):\n-\t\t\t#include <rte_pci_dev_ids.h>\n+\t\t\t#include <ixgbe_pci_dev_ids.h>\n \t\t\t\tret = ixgbe_kni_probe(found_pci, &lad_dev);\n \t\t\t\tbreak;\n \t\t\tdefault:\n", "prefixes": [ "dpdk-dev", "02/11" ] }