Patch Detail

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

{
    "id": 7404,
    "url": "https://patches.dpdk.org/api/patches/7404/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/1444041035-4936-3-git-send-email-bernard.iremonger@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": "<1444041035-4936-3-git-send-email-bernard.iremonger@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1444041035-4936-3-git-send-email-bernard.iremonger@intel.com",
    "date": "2015-10-05T10:30:17",
    "name": "[dpdk-dev,v2,02/20] librte_ether: add fields from rte_pci_driver to rte_eth_dev_data",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "4f98dd0354c1079a2c6f4df019b52372f9b37e2f",
    "submitter": {
        "id": 91,
        "url": "https://patches.dpdk.org/api/people/91/?format=api",
        "name": "Iremonger, Bernard",
        "email": "bernard.iremonger@intel.com"
    },
    "delegate": null,
    "mbox": "https://patches.dpdk.org/project/dpdk/patch/1444041035-4936-3-git-send-email-bernard.iremonger@intel.com/mbox/",
    "series": [],
    "comments": "https://patches.dpdk.org/api/patches/7404/comments/",
    "check": "pending",
    "checks": "https://patches.dpdk.org/api/patches/7404/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 589C18E97;\n\tMon,  5 Oct 2015 12:30:48 +0200 (CEST)",
            "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby dpdk.org (Postfix) with ESMTP id 5F5A28E80\n\tfor <dev@dpdk.org>; Mon,  5 Oct 2015 12:30:45 +0200 (CEST)",
            "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby fmsmga103.fm.intel.com with ESMTP; 05 Oct 2015 03:30:45 -0700",
            "from irvmail001.ir.intel.com ([163.33.26.43])\n\tby orsmga003.jf.intel.com with ESMTP; 05 Oct 2015 03:30:45 -0700",
            "from sivswdev01.ir.intel.com (sivswdev01.ir.intel.com\n\t[10.237.217.45])\n\tby irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id\n\tt95AUh8V014535; Mon, 5 Oct 2015 11:30:43 +0100",
            "from sivswdev01.ir.intel.com (localhost [127.0.0.1])\n\tby sivswdev01.ir.intel.com with ESMTP id t95AUgOY007156;\n\tMon, 5 Oct 2015 11:30:42 +0100",
            "(from bairemon@localhost)\n\tby sivswdev01.ir.intel.com with  id t95AUgGp007150;\n\tMon, 5 Oct 2015 11:30:42 +0100"
        ],
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.17,638,1437462000\"; d=\"scan'208\";a=\"658036007\"",
        "From": "Bernard Iremonger <bernard.iremonger@intel.com>",
        "To": "dev@dpdk.org",
        "Date": "Mon,  5 Oct 2015 11:30:17 +0100",
        "Message-Id": "<1444041035-4936-3-git-send-email-bernard.iremonger@intel.com>",
        "X-Mailer": "git-send-email 1.7.4.1",
        "In-Reply-To": "<1444041035-4936-1-git-send-email-bernard.iremonger@intel.com>",
        "References": "<PATCH v2>\n\t<1444041035-4936-1-git-send-email-bernard.iremonger@intel.com>",
        "Subject": "[dpdk-dev] [PATCH v2 02/20] librte_ether: add fields from\n\trte_pci_driver to rte_eth_dev_data",
        "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 dev_flags to rte_eth_dev_data, add macros for dev_flags.\nadd kdrv to rte_eth_dev_data.\nadd numa_node to rte_eth_dev_data.\nadd drv_name to rte_eth_dev_data.\nuse dev_type to distinguish between vdev's and pdev's.\nremove pci_dev branches.\n\nSigned-off-by: Bernard Iremonger <bernard.iremonger@intel.com>\n---\n lib/librte_ether/rte_ethdev.c | 54 +++++++++++++++++++++++++------------------\n lib/librte_ether/rte_ethdev.h | 15 ++++++++++++\n 2 files changed, 46 insertions(+), 23 deletions(-)",
    "diff": "diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c\nindex f593f6e..2fce370 100644\n--- a/lib/librte_ether/rte_ethdev.c\n+++ b/lib/librte_ether/rte_ethdev.c\n@@ -424,7 +424,7 @@ rte_eth_dev_socket_id(uint8_t port_id)\n {\n \tif (!rte_eth_dev_is_valid_port(port_id))\n \t\treturn -1;\n-\treturn rte_eth_devices[port_id].pci_dev->numa_node;\n+\treturn rte_eth_devices[port_id].data->numa_node;\n }\n \n uint8_t\n@@ -503,27 +503,25 @@ rte_eth_dev_get_name_by_port(uint8_t port_id, char *name)\n static int\n rte_eth_dev_is_detachable(uint8_t port_id)\n {\n-\tuint32_t drv_flags;\n+\tuint32_t dev_flags;\n \n \tif (!rte_eth_dev_is_valid_port(port_id)) {\n \t\tPMD_DEBUG_TRACE(\"Invalid port_id=%d\\n\", port_id);\n \t\treturn -EINVAL;\n \t}\n \n-\tif (rte_eth_devices[port_id].dev_type == RTE_ETH_DEV_PCI) {\n-\t\tswitch (rte_eth_devices[port_id].pci_dev->kdrv) {\n-\t\tcase RTE_KDRV_IGB_UIO:\n-\t\tcase RTE_KDRV_UIO_GENERIC:\n-\t\tcase RTE_KDRV_NIC_UIO:\n-\t\t\tbreak;\n-\t\tcase RTE_KDRV_VFIO:\n-\t\tdefault:\n-\t\t\treturn -ENOTSUP;\n-\t\t}\n+\tswitch (rte_eth_devices[port_id].data->kdrv) {\n+\tcase RTE_KDRV_IGB_UIO:\n+\tcase RTE_KDRV_UIO_GENERIC:\n+\tcase RTE_KDRV_NIC_UIO:\n+\tcase RTE_KDRV_NONE:\n+\t\tbreak;\n+\tcase RTE_KDRV_VFIO:\n+\tdefault:\n+\t\treturn -ENOTSUP;\n \t}\n-\n-\tdrv_flags = rte_eth_devices[port_id].driver->pci_drv.drv_flags;\n-\treturn !(drv_flags & RTE_PCI_DRV_DETACHABLE);\n+\tdev_flags = rte_eth_devices[port_id].data->dev_flags;\n+\treturn !(dev_flags & RTE_ETH_DEV_DETACHABLE);\n }\n \n /* attach the new physical device, then store port_id of the device */\n@@ -1143,14 +1141,11 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,\n \t * If link state interrupt is enabled, check that the\n \t * device supports it.\n \t */\n-\tif (dev_conf->intr_conf.lsc == 1) {\n-\t\tconst struct rte_pci_driver *pci_drv = &dev->driver->pci_drv;\n-\n-\t\tif (!(pci_drv->drv_flags & RTE_PCI_DRV_INTR_LSC)) {\n+\tif ((dev_conf->intr_conf.lsc == 1) &&\n+\t\t(!(dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC))) {\n \t\t\tPMD_DEBUG_TRACE(\"driver %s does not support lsc\\n\",\n-\t\t\t\t\tpci_drv->name);\n+\t\t\t\t\tdev->data->drv_name);\n \t\t\treturn -EINVAL;\n-\t\t}\n \t}\n \n \t/*\n@@ -1795,8 +1790,7 @@ rte_eth_dev_info_get(uint8_t port_id, struct rte_eth_dev_info *dev_info)\n \tFUNC_PTR_OR_RET(*dev->dev_ops->dev_infos_get);\n \t(*dev->dev_ops->dev_infos_get)(dev, dev_info);\n \tdev_info->pci_dev = dev->pci_dev;\n-\tif (dev->driver)\n-\t\tdev_info->driver_name = dev->driver->pci_drv.name;\n+\tdev_info->driver_name = dev->data->drv_name;\n }\n \n void\n@@ -3342,3 +3336,17 @@ rte_eth_dev_set_eeprom(uint8_t port_id, struct rte_dev_eeprom_info *info)\n \tFUNC_PTR_OR_ERR_RET(*dev->dev_ops->set_eeprom, -ENOTSUP);\n \treturn (*dev->dev_ops->set_eeprom)(dev, info);\n }\n+\n+void\n+rte_eth_copy_dev_info(struct rte_eth_dev *eth_dev, struct rte_pci_device *pci_dev)\n+{\n+\tif ((eth_dev == NULL) || (pci_dev == NULL)) {\n+\t\tPMD_DEBUG_TRACE(\"NULL pointer eth_dev=%p pci_dev=%p\\n\",\n+\t\t\t\teth_dev, pci_dev);\n+\t}\n+\n+\teth_dev->data->dev_flags = pci_dev->driver->drv_flags;\n+\teth_dev->data->kdrv = pci_dev->kdrv;\n+\teth_dev->data->numa_node = pci_dev->numa_node;\n+\teth_dev->data->drv_name = pci_dev->driver->name;\n+}\ndiff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h\nindex 8a8c82b..d440bd6 100644\n--- a/lib/librte_ether/rte_ethdev.h\n+++ b/lib/librte_ether/rte_ethdev.h\n@@ -1471,8 +1471,23 @@ struct rte_eth_dev_data {\n \t\tall_multicast : 1, /**< RX all multicast mode ON(1) / OFF(0). */\n \t\tdev_started : 1,   /**< Device state: STARTED(1) / STOPPED(0). */\n \t\tlro         : 1;   /**< RX LRO is ON(1) / OFF(0) */\n+\tuint32_t dev_flags; /**< Flags controlling handling of device. */\n+\tenum rte_kernel_driver kdrv;\t/**< Kernel driver passthrough */\n+\tint numa_node;\n+\tconst char *drv_name;\n };\n \n+/** Device needs PCI BAR mapping (done with either IGB_UIO or VFIO) */\n+#define RTE_ETH_DEV_DRV_NEED_MAPPING\tRTE_PCI_DRV_NEED_MAPPING\n+/** Device needs to be unbound even if no module is provided */\n+#define RTE_ETH_DEV_DRV_FORCE_UNBIND\tRTE_PCI_DRV_FORCE_UNBIND\n+/** Device supports link state interrupt */\n+#define RTE_ETH_DEV_INTR_LSC\tRTE_PCI_DRV_INTR_LSC\n+/** Device  supports detaching capability */\n+#define RTE_ETH_DEV_DETACHABLE\tRTE_PCI_DRV_DETACHABLE\n+/** Device  is a bonded device */\n+#define RTE_ETH_DEV_BONDED\t0x0020\n+\n /**\n  * @internal\n  * The pool of *rte_eth_dev* structures. The size of the pool\n",
    "prefixes": [
        "dpdk-dev",
        "v2",
        "02/20"
    ]
}