Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/11103/?format=api
{ "id": 11103, "url": "https://patches.dpdk.org/api/patches/11103/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1457278919-30800-10-git-send-email-helin.zhang@intel.com/", "project": { "id": 1, "url": "https://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": "<1457278919-30800-10-git-send-email-helin.zhang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1457278919-30800-10-git-send-email-helin.zhang@intel.com", "date": "2016-03-06T15:41:39", "name": "[dpdk-dev,v4,09/29] i40e: update device id", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "f7df4b63c7e23034421a3f33ad97063e4cf605c6", "submitter": { "id": 14, "url": "https://patches.dpdk.org/api/people/14/?format=api", "name": "Zhang, Helin", "email": "helin.zhang@intel.com" }, "delegate": { "id": 10, "url": "https://patches.dpdk.org/api/users/10/?format=api", "username": "bruce", "first_name": "Bruce", "last_name": "Richardson", "email": "bruce.richardson@intel.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1457278919-30800-10-git-send-email-helin.zhang@intel.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/11103/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/11103/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 D72CF374C;\n\tSun, 6 Mar 2016 16:42:28 +0100 (CET)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby dpdk.org (Postfix) with ESMTP id 8C4173208\n\tfor <dev@dpdk.org>; Sun, 6 Mar 2016 16:42:26 +0100 (CET)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby fmsmga103.fm.intel.com with ESMTP; 06 Mar 2016 07:42:26 -0800", "from shvmail01.sh.intel.com ([10.239.29.42])\n\tby fmsmga001.fm.intel.com with ESMTP; 06 Mar 2016 07:42:25 -0800", "from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com\n\t[10.239.29.89])\n\tby shvmail01.sh.intel.com with ESMTP id u26FgNFG032211;\n\tSun, 6 Mar 2016 23:42:23 +0800", "from shecgisg004.sh.intel.com (localhost [127.0.0.1])\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP\n\tid u26FgKfd030898; Sun, 6 Mar 2016 23:42:22 +0800", "(from hzhan75@localhost)\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id u26FgKVx030894; \n\tSun, 6 Mar 2016 23:42:20 +0800" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.22,546,1449561600\"; d=\"scan'208\";a=\"918013305\"", "From": "Helin Zhang <helin.zhang@intel.com>", "To": "dev@dpdk.org", "Date": "Sun, 6 Mar 2016 23:41:39 +0800", "Message-Id": "<1457278919-30800-10-git-send-email-helin.zhang@intel.com>", "X-Mailer": "git-send-email 1.7.4.1", "In-Reply-To": "<1457278919-30800-1-git-send-email-helin.zhang@intel.com>", "References": "<1455806076-18497-1-git-send-email-helin.zhang@intel.com>\n\t<1457278919-30800-1-git-send-email-helin.zhang@intel.com>", "Subject": "[dpdk-dev] [PATCH v4 09/29] i40e: update device id", "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": "Add new Device ID's for backplane and QSFP+ adapters, and delete\ndeprecated one for backplane.\n\nSigned-off-by: Helin Zhang <helin.zhang@intel.com>\nAcked-by: Jingjing Wu <jingjing.wu@intel.com>\n---\n drivers/net/i40e/base/i40e_common.c | 12 ++++++++++--\n drivers/net/i40e/base/i40e_devids.h | 10 +++++++++-\n drivers/net/i40e/i40e_ethdev.h | 2 +-\n drivers/net/i40e/i40e_rxtx.c | 8 ++++----\n lib/librte_eal/common/include/rte_pci_dev_ids.h | 8 ++++++--\n 5 files changed, 30 insertions(+), 10 deletions(-)\n\nv4:\n - Reworded the commit logs.\n - Merged all device IDs related code changes together.", "diff": "diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/i40e/base/i40e_common.c\nindex 5e1b39e..67a5e21 100644\n--- a/drivers/net/i40e/base/i40e_common.c\n+++ b/drivers/net/i40e/base/i40e_common.c\n@@ -58,7 +58,6 @@ STATIC enum i40e_status_code i40e_set_mac_type(struct i40e_hw *hw)\n \t\tswitch (hw->device_id) {\n \t\tcase I40E_DEV_ID_SFP_XL710:\n \t\tcase I40E_DEV_ID_QEMU:\n-\t\tcase I40E_DEV_ID_KX_A:\n \t\tcase I40E_DEV_ID_KX_B:\n \t\tcase I40E_DEV_ID_KX_C:\n \t\tcase I40E_DEV_ID_QSFP_A:\n@@ -74,6 +73,8 @@ STATIC enum i40e_status_code i40e_set_mac_type(struct i40e_hw *hw)\n #ifdef X722_A0_SUPPORT\n \t\tcase I40E_DEV_ID_X722_A0:\n #endif\n+\t\tcase I40E_DEV_ID_KX_X722:\n+\t\tcase I40E_DEV_ID_QSFP_X722:\n \t\tcase I40E_DEV_ID_SFP_X722:\n \t\tcase I40E_DEV_ID_1G_BASE_T_X722:\n \t\tcase I40E_DEV_ID_10G_BASE_T_X722:\n@@ -81,15 +82,22 @@ STATIC enum i40e_status_code i40e_set_mac_type(struct i40e_hw *hw)\n \t\t\tbreak;\n #endif\n #ifdef X722_SUPPORT\n+#if defined(INTEGRATED_VF) || defined(VF_DRIVER)\n \t\tcase I40E_DEV_ID_X722_VF:\n \t\tcase I40E_DEV_ID_X722_VF_HV:\n+#ifdef X722_A0_SUPPORT\n+\t\tcase I40E_DEV_ID_X722_A0_VF:\n+#endif\n \t\t\thw->mac.type = I40E_MAC_X722_VF;\n \t\t\tbreak;\n-#endif\n+#endif /* INTEGRATED_VF || VF_DRIVER */\n+#endif /* X722_SUPPORT */\n+#if defined(INTEGRATED_VF) || defined(VF_DRIVER)\n \t\tcase I40E_DEV_ID_VF:\n \t\tcase I40E_DEV_ID_VF_HV:\n \t\t\thw->mac.type = I40E_MAC_VF;\n \t\t\tbreak;\n+#endif\n \t\tdefault:\n \t\t\thw->mac.type = I40E_MAC_GENERIC;\n \t\t\tbreak;\ndiff --git a/drivers/net/i40e/base/i40e_devids.h b/drivers/net/i40e/base/i40e_devids.h\nindex 26cfd54..f844340 100644\n--- a/drivers/net/i40e/base/i40e_devids.h\n+++ b/drivers/net/i40e/base/i40e_devids.h\n@@ -40,7 +40,6 @@ POSSIBILITY OF SUCH DAMAGE.\n /* Device IDs */\n #define I40E_DEV_ID_SFP_XL710\t\t0x1572\n #define I40E_DEV_ID_QEMU\t\t0x1574\n-#define I40E_DEV_ID_KX_A\t\t0x157F\n #define I40E_DEV_ID_KX_B\t\t0x1580\n #define I40E_DEV_ID_KX_C\t\t0x1581\n #define I40E_DEV_ID_QSFP_A\t\t0x1583\n@@ -50,17 +49,26 @@ POSSIBILITY OF SUCH DAMAGE.\n #define I40E_DEV_ID_20G_KR2\t\t0x1587\n #define I40E_DEV_ID_20G_KR2_A\t\t0x1588\n #define I40E_DEV_ID_10G_BASE_T4\t\t0x1589\n+#if defined(INTEGRATED_VF) || defined(VF_DRIVER) || defined(I40E_NDIS_SUPPORT)\n #define I40E_DEV_ID_VF\t\t\t0x154C\n #define I40E_DEV_ID_VF_HV\t\t0x1571\n+#endif /* VF_DRIVER */\n #ifdef X722_SUPPORT\n #ifdef X722_A0_SUPPORT\n #define I40E_DEV_ID_X722_A0\t\t0x374C\n+#if defined(INTEGRATED_VF) || defined(VF_DRIVER)\n+#define I40E_DEV_ID_X722_A0_VF\t\t0x374D\n #endif\n+#endif\n+#define I40E_DEV_ID_KX_X722\t\t0x37CE\n+#define I40E_DEV_ID_QSFP_X722\t\t0x37CF\n #define I40E_DEV_ID_SFP_X722\t\t0x37D0\n #define I40E_DEV_ID_1G_BASE_T_X722\t0x37D1\n #define I40E_DEV_ID_10G_BASE_T_X722\t0x37D2\n+#if defined(INTEGRATED_VF) || defined(VF_DRIVER) || defined(I40E_NDIS_SUPPORT)\n #define I40E_DEV_ID_X722_VF\t\t0x37CD\n #define I40E_DEV_ID_X722_VF_HV\t\t0x37D9\n+#endif /* VF_DRIVER */\n #endif /* X722_SUPPORT */\n \n #define i40e_is_40G_device(d)\t\t((d) == I40E_DEV_ID_QSFP_A || \\\ndiff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h\nindex 6edd7dd..a5207fc 100644\n--- a/drivers/net/i40e/i40e_ethdev.h\n+++ b/drivers/net/i40e/i40e_ethdev.h\n@@ -599,7 +599,7 @@ i40e_get_vsi_from_adapter(struct i40e_adapter *adapter)\n return NULL;\n \n \thw = I40E_DEV_PRIVATE_TO_HW(adapter);\n-\tif (hw->mac.type == I40E_MAC_VF) {\n+\tif (hw->mac.type == I40E_MAC_VF || hw->mac.type == I40E_MAC_X722_VF) {\n \t\tstruct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(adapter);\n \t\treturn &vf->vsi;\n \t} else {\ndiff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c\nindex 40cffc1..90ca819 100644\n--- a/drivers/net/i40e/i40e_rxtx.c\n+++ b/drivers/net/i40e/i40e_rxtx.c\n@@ -2113,7 +2113,7 @@ i40e_dev_rx_queue_setup(struct rte_eth_dev *dev,\n \tuint16_t base, bsf, tc_mapping;\n \tint use_def_burst_func = 1;\n \n-\tif (hw->mac.type == I40E_MAC_VF) {\n+\tif (hw->mac.type == I40E_MAC_VF || hw->mac.type == I40E_MAC_X722_VF) {\n \t\tstruct i40e_vf *vf =\n \t\t\tI40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);\n \t\tvsi = &vf->vsi;\n@@ -2153,7 +2153,7 @@ i40e_dev_rx_queue_setup(struct rte_eth_dev *dev,\n \trxq->nb_rx_desc = nb_desc;\n \trxq->rx_free_thresh = rx_conf->rx_free_thresh;\n \trxq->queue_id = queue_idx;\n-\tif (hw->mac.type == I40E_MAC_VF)\n+\tif (hw->mac.type == I40E_MAC_VF || hw->mac.type == I40E_MAC_X722_VF)\n \t\trxq->reg_idx = queue_idx;\n \telse /* PF device */\n \t\trxq->reg_idx = vsi->base_queue +\n@@ -2330,7 +2330,7 @@ i40e_dev_tx_queue_setup(struct rte_eth_dev *dev,\n \tuint16_t tx_rs_thresh, tx_free_thresh;\n \tuint16_t i, base, bsf, tc_mapping;\n \n-\tif (hw->mac.type == I40E_MAC_VF) {\n+\tif (hw->mac.type == I40E_MAC_VF || hw->mac.type == I40E_MAC_X722_VF) {\n \t\tstruct i40e_vf *vf =\n \t\t\tI40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);\n \t\tvsi = &vf->vsi;\n@@ -2458,7 +2458,7 @@ i40e_dev_tx_queue_setup(struct rte_eth_dev *dev,\n \ttxq->hthresh = tx_conf->tx_thresh.hthresh;\n \ttxq->wthresh = tx_conf->tx_thresh.wthresh;\n \ttxq->queue_id = queue_idx;\n-\tif (hw->mac.type == I40E_MAC_VF)\n+\tif (hw->mac.type == I40E_MAC_VF || hw->mac.type == I40E_MAC_X722_VF)\n \t\ttxq->reg_idx = queue_idx;\n \telse /* PF device */\n \t\ttxq->reg_idx = vsi->base_queue +\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 d088191..40ba98c 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@@ -496,7 +496,6 @@ RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_BYPASS)\n \n #define I40E_DEV_ID_SFP_XL710 0x1572\n #define I40E_DEV_ID_QEMU 0x1574\n-#define I40E_DEV_ID_KX_A 0x157F\n #define I40E_DEV_ID_KX_B 0x1580\n #define I40E_DEV_ID_KX_C 0x1581\n #define I40E_DEV_ID_QSFP_A 0x1583\n@@ -507,13 +506,14 @@ RTE_PCI_DEV_ID_DECL_IXGBE(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_82599_BYPASS)\n #define I40E_DEV_ID_20G_KR2_A 0x1588\n #define I40E_DEV_ID_10G_BASE_T4 0x1589\n #define I40E_DEV_ID_X722_A0 0x374C\n+#define I40E_DEV_ID_KX_X722 0x37CE\n+#define I40E_DEV_ID_QSFP_X722 0x37CF\n #define I40E_DEV_ID_SFP_X722 0x37D0\n #define I40E_DEV_ID_1G_BASE_T_X722 0x37D1\n #define I40E_DEV_ID_10G_BASE_T_X722 0x37D2\n \n RTE_PCI_DEV_ID_DECL_I40E(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_SFP_XL710)\n RTE_PCI_DEV_ID_DECL_I40E(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_QEMU)\n-RTE_PCI_DEV_ID_DECL_I40E(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_KX_A)\n RTE_PCI_DEV_ID_DECL_I40E(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_KX_B)\n RTE_PCI_DEV_ID_DECL_I40E(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_KX_C)\n RTE_PCI_DEV_ID_DECL_I40E(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_QSFP_A)\n@@ -524,6 +524,8 @@ RTE_PCI_DEV_ID_DECL_I40E(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_20G_KR2)\n RTE_PCI_DEV_ID_DECL_I40E(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_20G_KR2_A)\n RTE_PCI_DEV_ID_DECL_I40E(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_10G_BASE_T4)\n RTE_PCI_DEV_ID_DECL_I40E(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_X722_A0)\n+RTE_PCI_DEV_ID_DECL_I40E(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_KX_X722)\n+RTE_PCI_DEV_ID_DECL_I40E(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_QSFP_X722)\n RTE_PCI_DEV_ID_DECL_I40E(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_SFP_X722)\n RTE_PCI_DEV_ID_DECL_I40E(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_1G_BASE_T_X722)\n RTE_PCI_DEV_ID_DECL_I40E(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_10G_BASE_T_X722)\n@@ -572,11 +574,13 @@ RTE_PCI_DEV_ID_DECL_IXGBEVF(PCI_VENDOR_ID_INTEL, IXGBE_DEV_ID_X550EM_X_VF_HV)\n \n #define I40E_DEV_ID_VF 0x154C\n #define I40E_DEV_ID_VF_HV 0x1571\n+#define I40E_DEV_ID_X722_A0_VF 0x374D\n #define I40E_DEV_ID_X722_VF 0x37CD\n #define I40E_DEV_ID_X722_VF_HV 0x37D9\n \n RTE_PCI_DEV_ID_DECL_I40EVF(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_VF)\n RTE_PCI_DEV_ID_DECL_I40EVF(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_VF_HV)\n+RTE_PCI_DEV_ID_DECL_I40EVF(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_X722_A0_VF)\n RTE_PCI_DEV_ID_DECL_I40EVF(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_X722_VF)\n RTE_PCI_DEV_ID_DECL_I40EVF(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_X722_VF_HV)\n \n", "prefixes": [ "dpdk-dev", "v4", "09/29" ] }