Patch Detail

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

{
    "id": 2275,
    "url": "https://patches.dpdk.org/api/patches/2275/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/1421298930-15210-2-git-send-email-changchun.ouyang@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": "<1421298930-15210-2-git-send-email-changchun.ouyang@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1421298930-15210-2-git-send-email-changchun.ouyang@intel.com",
    "date": "2015-01-15T05:15:09",
    "name": "[dpdk-dev,01/22] virtio: Rearrange resource initialization",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "548f10ca76b8bad854e4a581cdba10344f555561",
    "submitter": {
        "id": 31,
        "url": "https://patches.dpdk.org/api/people/31/?format=api",
        "name": "Ouyang Changchun",
        "email": "changchun.ouyang@intel.com"
    },
    "delegate": null,
    "mbox": "https://patches.dpdk.org/project/dpdk/patch/1421298930-15210-2-git-send-email-changchun.ouyang@intel.com/mbox/",
    "series": [],
    "comments": "https://patches.dpdk.org/api/patches/2275/comments/",
    "check": "pending",
    "checks": "https://patches.dpdk.org/api/patches/2275/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 DD89D5A7F;\n\tThu, 15 Jan 2015 06:15:42 +0100 (CET)",
            "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby dpdk.org (Postfix) with ESMTP id ED8B45A7D\n\tfor <dev@dpdk.org>; Thu, 15 Jan 2015 06:15:40 +0100 (CET)",
            "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby orsmga101.jf.intel.com with ESMTP; 14 Jan 2015 21:15:39 -0800",
            "from shvmail01.sh.intel.com ([10.239.29.42])\n\tby orsmga001.jf.intel.com with ESMTP; 14 Jan 2015 21:15:38 -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 t0F5FaK5032065;\n\tThu, 15 Jan 2015 13:15:36 +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 t0F5FYl5015250; Thu, 15 Jan 2015 13:15:36 +0800",
            "(from couyang@localhost)\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id t0F5FYgf015246; \n\tThu, 15 Jan 2015 13:15:34 +0800"
        ],
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.09,401,1418112000\"; d=\"scan'208\";a=\"637552287\"",
        "From": "Ouyang Changchun <changchun.ouyang@intel.com>",
        "To": "dev@dpdk.org",
        "Date": "Thu, 15 Jan 2015 13:15:09 +0800",
        "Message-Id": "<1421298930-15210-2-git-send-email-changchun.ouyang@intel.com>",
        "X-Mailer": "git-send-email 1.7.12.2",
        "In-Reply-To": "<1421298930-15210-1-git-send-email-changchun.ouyang@intel.com>",
        "References": "<1421298930-15210-1-git-send-email-changchun.ouyang@intel.com>",
        "Subject": "[dpdk-dev] [PATCH 01/22] virtio: Rearrange resource initialization",
        "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": "For clarity make the setup of PCI resources for Linux into a function rather\nthan block of code #ifdef'd in middle of dev_init.\n\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\nSigned-off-by: Changchun Ouyang <changchun.ouyang@intel.com>\n---\n lib/librte_pmd_virtio/virtio_ethdev.c | 76 ++++++++++++++++++++---------------\n 1 file changed, 43 insertions(+), 33 deletions(-)",
    "diff": "diff --git a/lib/librte_pmd_virtio/virtio_ethdev.c b/lib/librte_pmd_virtio/virtio_ethdev.c\nindex c009f2a..6c31598 100644\n--- a/lib/librte_pmd_virtio/virtio_ethdev.c\n+++ b/lib/librte_pmd_virtio/virtio_ethdev.c\n@@ -794,6 +794,41 @@ virtio_has_msix(const struct rte_pci_addr *loc)\n \n \treturn (d != NULL);\n }\n+\n+/* Extract I/O port numbers from sysfs */\n+static int virtio_resource_init(struct rte_pci_device *pci_dev)\n+{\n+\tchar dirname[PATH_MAX];\n+\tchar filename[PATH_MAX];\n+\tunsigned long start, size;\n+\n+\tif (get_uio_dev(&pci_dev->addr, dirname, sizeof(dirname)) < 0)\n+\t\treturn -1;\n+\n+\t/* get portio size */\n+\tsnprintf(filename, sizeof(filename),\n+\t\t     \"%s/portio/port0/size\", dirname);\n+\tif (parse_sysfs_value(filename, &size) < 0) {\n+\t\tPMD_INIT_LOG(ERR, \"%s(): cannot parse size\",\n+\t\t\t     __func__);\n+\t\treturn -1;\n+\t}\n+\n+\t/* get portio start */\n+\tsnprintf(filename, sizeof(filename),\n+\t\t \"%s/portio/port0/start\", dirname);\n+\tif (parse_sysfs_value(filename, &start) < 0) {\n+\t\tPMD_INIT_LOG(ERR, \"%s(): cannot parse portio start\",\n+\t\t\t     __func__);\n+\t\treturn -1;\n+\t}\n+\tpci_dev->mem_resource[0].addr = (void *)(uintptr_t)start;\n+\tpci_dev->mem_resource[0].len =  (uint64_t)size;\n+\tPMD_INIT_LOG(DEBUG,\n+\t\t     \"PCI Port IO found start=0x%lx with size=0x%lx\",\n+\t\t     start, size);\n+\treturn 0;\n+}\n #else\n static int\n virtio_has_msix(const struct rte_pci_addr *loc __rte_unused)\n@@ -801,6 +836,12 @@ virtio_has_msix(const struct rte_pci_addr *loc __rte_unused)\n \t/* nic_uio does not enable interrupts, return 0 (false). */\n \treturn 0;\n }\n+\n+static int virtio_resource_init(struct rte_pci_device *pci_dev __rte_unused)\n+{\n+\t/* no setup required */\n+\treturn 0;\n+}\n #endif\n \n /*\n@@ -831,40 +872,9 @@ eth_virtio_dev_init(__rte_unused struct eth_driver *eth_drv,\n \t\treturn 0;\n \n \tpci_dev = eth_dev->pci_dev;\n+\tif (virtio_resource_init(pci_dev) < 0)\n+\t\treturn -1;\n \n-#ifdef RTE_EXEC_ENV_LINUXAPP\n-\t{\n-\t\tchar dirname[PATH_MAX];\n-\t\tchar filename[PATH_MAX];\n-\t\tunsigned long start, size;\n-\n-\t\tif (get_uio_dev(&pci_dev->addr, dirname, sizeof(dirname)) < 0)\n-\t\t\treturn -1;\n-\n-\t\t/* get portio size */\n-\t\tsnprintf(filename, sizeof(filename),\n-\t\t\t     \"%s/portio/port0/size\", dirname);\n-\t\tif (parse_sysfs_value(filename, &size) < 0) {\n-\t\t\tPMD_INIT_LOG(ERR, \"%s(): cannot parse size\",\n-\t\t\t\t     __func__);\n-\t\t\treturn -1;\n-\t\t}\n-\n-\t\t/* get portio start */\n-\t\tsnprintf(filename, sizeof(filename),\n-\t\t\t     \"%s/portio/port0/start\", dirname);\n-\t\tif (parse_sysfs_value(filename, &start) < 0) {\n-\t\t\tPMD_INIT_LOG(ERR, \"%s(): cannot parse portio start\",\n-\t\t\t\t     __func__);\n-\t\t\treturn -1;\n-\t\t}\n-\t\tpci_dev->mem_resource[0].addr = (void *)(uintptr_t)start;\n-\t\tpci_dev->mem_resource[0].len =  (uint64_t)size;\n-\t\tPMD_INIT_LOG(DEBUG,\n-\t\t\t     \"PCI Port IO found start=0x%lx with size=0x%lx\",\n-\t\t\t     start, size);\n-\t}\n-#endif\n \thw->use_msix = virtio_has_msix(&pci_dev->addr);\n \thw->io_base = (uint32_t)(uintptr_t)pci_dev->mem_resource[0].addr;\n \n",
    "prefixes": [
        "dpdk-dev",
        "01/22"
    ]
}