Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 16587,
    "url": "http://patches.dpdk.org/api/patches/16587/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/1476451768-21278-1-git-send-email-bernard.iremonger@intel.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": "<1476451768-21278-1-git-send-email-bernard.iremonger@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1476451768-21278-1-git-send-email-bernard.iremonger@intel.com",
    "date": "2016-10-14T13:29:28",
    "name": "[dpdk-dev,v2] net/ixgbe: support multiqueue mode VMDq DCB with SRIOV",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "b8c14afec809567e322a5cf2054f657f0fab97ab",
    "submitter": {
        "id": 91,
        "url": "http://patches.dpdk.org/api/people/91/?format=api",
        "name": "Iremonger, Bernard",
        "email": "bernard.iremonger@intel.com"
    },
    "delegate": {
        "id": 10,
        "url": "http://patches.dpdk.org/api/users/10/?format=api",
        "username": "bruce",
        "first_name": "Bruce",
        "last_name": "Richardson",
        "email": "bruce.richardson@intel.com"
    },
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/1476451768-21278-1-git-send-email-bernard.iremonger@intel.com/mbox/",
    "series": [],
    "comments": "http://patches.dpdk.org/api/patches/16587/comments/",
    "check": "pending",
    "checks": "http://patches.dpdk.org/api/patches/16587/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 4F61A6CC4;\n\tFri, 14 Oct 2016 15:29:35 +0200 (CEST)",
            "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby dpdk.org (Postfix) with ESMTP id 5D2BA1396\n\tfor <dev@dpdk.org>; Fri, 14 Oct 2016 15:29:33 +0200 (CEST)",
            "from orsmga005.jf.intel.com ([10.7.209.41])\n\tby orsmga102.jf.intel.com with ESMTP; 14 Oct 2016 06:29:32 -0700",
            "from sivswdev01.ir.intel.com (HELO localhost.localdomain)\n\t([10.237.217.45])\n\tby orsmga005.jf.intel.com with ESMTP; 14 Oct 2016 06:29:31 -0700"
        ],
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.31,493,1473145200\"; d=\"scan'208\";a=\"19650883\"",
        "From": "Bernard Iremonger <bernard.iremonger@intel.com>",
        "To": "dev@dpdk.org,\n\trahul.r.shah@intel.com,\n\twenzhuo.lu@intel.com",
        "Cc": "Bernard Iremonger <bernard.iremonger@intel.com>",
        "Date": "Fri, 14 Oct 2016 14:29:28 +0100",
        "Message-Id": "<1476451768-21278-1-git-send-email-bernard.iremonger@intel.com>",
        "X-Mailer": "git-send-email 1.7.0.7",
        "In-Reply-To": "<1472202487-20119-1-git-send-email-bernard.iremonger@intel.com>",
        "References": "<1472202487-20119-1-git-send-email-bernard.iremonger@intel.com>",
        "Subject": "[dpdk-dev] [PATCH v2] net/ixgbe: support multiqueue mode VMDq DCB\n\twith SRIOV",
        "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": "modify ixgbe_dcb_tx_hw_config function.\nmodify ixgbe_dev_mq_rx_configure function.\nmodify ixgbe_configure_dcb function.\n\nChanges in v2:\nRebased to DPDK v16.11-rc1\n\nSigned-off-by: Rahul R Shah <rahul.r.shah@intel.com>\nSigned-off-by: Bernard Iremonger <bernard.iremonger@intel.com>\n---\n drivers/net/ixgbe/ixgbe_ethdev.c |  9 ++++-----\n drivers/net/ixgbe/ixgbe_rxtx.c   | 37 +++++++++++++++++++++----------------\n 2 files changed, 25 insertions(+), 21 deletions(-)",
    "diff": "diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c\nindex 4ca5747..114698d 100644\n--- a/drivers/net/ixgbe/ixgbe_ethdev.c\n+++ b/drivers/net/ixgbe/ixgbe_ethdev.c\n@@ -1977,6 +1977,8 @@ ixgbe_check_mq_mode(struct rte_eth_dev *dev)\n \t\t/* check multi-queue mode */\n \t\tswitch (dev_conf->rxmode.mq_mode) {\n \t\tcase ETH_MQ_RX_VMDQ_DCB:\n+\t\t\tPMD_INIT_LOG(INFO, \"ETH_MQ_RX_VMDQ_DCB mode supported in SRIOV\");\n+\t\t\tbreak;\n \t\tcase ETH_MQ_RX_VMDQ_DCB_RSS:\n \t\t\t/* DCB/RSS VMDQ in SRIOV mode, not implement yet */\n \t\t\tPMD_INIT_LOG(ERR, \"SRIOV active,\"\n@@ -2012,11 +2014,8 @@ ixgbe_check_mq_mode(struct rte_eth_dev *dev)\n \n \t\tswitch (dev_conf->txmode.mq_mode) {\n \t\tcase ETH_MQ_TX_VMDQ_DCB:\n-\t\t\t/* DCB VMDQ in SRIOV mode, not implement yet */\n-\t\t\tPMD_INIT_LOG(ERR, \"SRIOV is active,\"\n-\t\t\t\t\t\" unsupported VMDQ mq_mode tx %d.\",\n-\t\t\t\t\tdev_conf->txmode.mq_mode);\n-\t\t\treturn -EINVAL;\n+\t\t\tPMD_INIT_LOG(INFO, \"ETH_MQ_TX_VMDQ_DCB mode supported in SRIOV\");\n+\t\t\tbreak;\n \t\tdefault: /* ETH_MQ_TX_VMDQ_ONLY or ETH_MQ_TX_NONE */\n \t\t\tdev->data->dev_conf.txmode.mq_mode = ETH_MQ_TX_VMDQ_ONLY;\n \t\t\tbreak;\ndiff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c\nindex 2ce8234..bb13889 100644\n--- a/drivers/net/ixgbe/ixgbe_rxtx.c\n+++ b/drivers/net/ixgbe/ixgbe_rxtx.c\n@@ -1,7 +1,7 @@\n /*-\n  *   BSD LICENSE\n  *\n- *   Copyright(c) 2010-2015 Intel Corporation. All rights reserved.\n+ *   Copyright(c) 2010-2016 Intel Corporation. All rights reserved.\n  *   Copyright 2014 6WIND S.A.\n  *   All rights reserved.\n  *\n@@ -3313,15 +3313,16 @@ ixgbe_vmdq_dcb_configure(struct rte_eth_dev *dev)\n \n /**\n  * ixgbe_dcb_config_tx_hw_config - Configure general DCB TX parameters\n- * @hw: pointer to hardware structure\n+ * @dev: pointer to eth_dev structure\n  * @dcb_config: pointer to ixgbe_dcb_config structure\n  */\n static void\n-ixgbe_dcb_tx_hw_config(struct ixgbe_hw *hw,\n+ixgbe_dcb_tx_hw_config(struct rte_eth_dev *dev,\n \t\t       struct ixgbe_dcb_config *dcb_config)\n {\n \tuint32_t reg;\n \tuint32_t q;\n+\tstruct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \n \tPMD_INIT_FUNC_TRACE();\n \tif (hw->mac.type != ixgbe_mac_82598EB) {\n@@ -3339,11 +3340,17 @@ ixgbe_dcb_tx_hw_config(struct ixgbe_hw *hw,\n \t\tif (dcb_config->vt_mode)\n \t\t\treg |= IXGBE_MTQC_VT_ENA;\n \t\tIXGBE_WRITE_REG(hw, IXGBE_MTQC, reg);\n-\n-\t\t/* Disable drop for all queues */\n-\t\tfor (q = 0; q < 128; q++)\n-\t\t\tIXGBE_WRITE_REG(hw, IXGBE_QDE,\n-\t\t\t\t(IXGBE_QDE_WRITE | (q << IXGBE_QDE_IDX_SHIFT)));\n+\t\tif (RTE_ETH_DEV_SRIOV(dev).active == 0) {\n+\t\t\t/* Disable drop for all queues in VMDQ mode*/\n+\t\t\tfor (q = 0; q < 128; q++)\n+\t\t\t\tIXGBE_WRITE_REG(hw, IXGBE_QDE,\n+\t\t\t\t\t\t(IXGBE_QDE_WRITE | (q << IXGBE_QDE_IDX_SHIFT) | IXGBE_QDE_ENABLE));\n+\t\t} else {\n+\t\t\t/* Enable drop for all queues in SRIOV mode */\n+\t\t\tfor (q = 0; q < 128; q++)\n+\t\t\t\tIXGBE_WRITE_REG(hw, IXGBE_QDE,\n+\t\t\t\t\t\t(IXGBE_QDE_WRITE | (q << IXGBE_QDE_IDX_SHIFT)));\n+\t\t}\n \n \t\t/* Enable the Tx desc arbiter */\n \t\treg = IXGBE_READ_REG(hw, IXGBE_RTTDCS);\n@@ -3378,7 +3385,7 @@ ixgbe_vmdq_dcb_hw_tx_config(struct rte_eth_dev *dev,\n \t\t\tvmdq_tx_conf->nb_queue_pools == ETH_16_POOLS ? 0xFFFF : 0xFFFFFFFF);\n \n \t/*Configure general DCB TX parameters*/\n-\tixgbe_dcb_tx_hw_config(hw, dcb_config);\n+\tixgbe_dcb_tx_hw_config(dev, dcb_config);\n }\n \n static void\n@@ -3661,7 +3668,7 @@ ixgbe_dcb_hw_configure(struct rte_eth_dev *dev,\n \t\t/*get DCB TX configuration parameters from rte_eth_conf*/\n \t\tixgbe_dcb_tx_config(dev, dcb_config);\n \t\t/*Configure general DCB TX parameters*/\n-\t\tixgbe_dcb_tx_hw_config(hw, dcb_config);\n+\t\tixgbe_dcb_tx_hw_config(dev, dcb_config);\n \t\tbreak;\n \tdefault:\n \t\tPMD_INIT_LOG(ERR, \"Incorrect DCB TX mode configuration\");\n@@ -3810,9 +3817,6 @@ void ixgbe_configure_dcb(struct rte_eth_dev *dev)\n \t    (dev_conf->rxmode.mq_mode != ETH_MQ_RX_DCB_RSS))\n \t\treturn;\n \n-\tif (dev->data->nb_rx_queues != ETH_DCB_NUM_QUEUES)\n-\t\treturn;\n-\n \t/** Configure DCB hardware **/\n \tixgbe_dcb_hw_configure(dev, dcb_cfg);\n }\n@@ -4082,12 +4086,13 @@ ixgbe_dev_mq_rx_configure(struct rte_eth_dev *dev)\n \t\tcase ETH_MQ_RX_VMDQ_RSS:\n \t\t\tixgbe_config_vf_rss(dev);\n \t\t\tbreak;\n-\n-\t\t/* FIXME if support DCB/RSS together with VMDq & SRIOV */\n \t\tcase ETH_MQ_RX_VMDQ_DCB:\n+\t\t\tixgbe_vmdq_dcb_configure(dev);\n+\t\t\tbreak;\n+\t\t/* FIXME if support DCB/RSS together with VMDq & SRIOV */\n \t\tcase ETH_MQ_RX_VMDQ_DCB_RSS:\n \t\t\tPMD_INIT_LOG(ERR,\n-\t\t\t\t\"Could not support DCB with VMDq & SRIOV\");\n+\t\t\t\t\"Could not support DCB/RSS with VMDq & SRIOV\");\n \t\t\treturn -1;\n \t\tdefault:\n \t\t\tixgbe_config_vf_default(dev);\n",
    "prefixes": [
        "dpdk-dev",
        "v2"
    ]
}