Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/60587/?format=api
{ "id": 60587, "url": "http://patches.dpdk.org/api/patches/60587/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20191006201409.8770-10-rmody@marvell.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": "<20191006201409.8770-10-rmody@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20191006201409.8770-10-rmody@marvell.com", "date": "2019-10-06T20:14:09", "name": "[v2,9/9] net/qede: print adapter info during init failure", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "2f4ec857b9b23628ec7fb05cfa94361e5b613f3c", "submitter": { "id": 1211, "url": "http://patches.dpdk.org/api/people/1211/?format=api", "name": "Rasesh Mody", "email": "rmody@marvell.com" }, "delegate": { "id": 310, "url": "http://patches.dpdk.org/api/users/310/?format=api", "username": "jerin", "first_name": "Jerin", "last_name": "Jacob", "email": "jerinj@marvell.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20191006201409.8770-10-rmody@marvell.com/mbox/", "series": [ { "id": 6713, "url": "http://patches.dpdk.org/api/series/6713/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=6713", "date": "2019-10-06T20:14:09", "name": null, "version": 2, "mbox": "http://patches.dpdk.org/series/6713/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/60587/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/60587/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 [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 0DA8E1D414;\n\tSun, 6 Oct 2019 22:14:44 +0200 (CEST)", "from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com\n\t[67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 58C0F1D171\n\tfor <dev@dpdk.org>; Sun, 6 Oct 2019 22:14:34 +0200 (CEST)", "from pps.filterd (m0045849.ppops.net [127.0.0.1])\n\tby mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id\n\tx96KEXUt010621; Sun, 6 Oct 2019 13:14:33 -0700", "from sc-exch04.marvell.com ([199.233.58.184])\n\tby mx0a-0016f401.pphosted.com with ESMTP id 2verhrc817-1\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); \n\tSun, 06 Oct 2019 13:14:33 -0700", "from SC-EXCH03.marvell.com (10.93.176.83) by SC-EXCH04.marvell.com\n\t(10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1367.3;\n\tSun, 6 Oct 2019 13:14:32 -0700", "from maili.marvell.com (10.93.176.43) by SC-EXCH03.marvell.com\n\t(10.93.176.83) with Microsoft SMTP Server id 15.0.1367.3 via Frontend\n\tTransport; Sun, 6 Oct 2019 13:14:32 -0700", "from irv1user08.caveonetworks.com (unknown [10.104.116.105])\n\tby maili.marvell.com (Postfix) with ESMTP id ED7233F703F;\n\tSun, 6 Oct 2019 13:14:31 -0700 (PDT)", "(from rmody@localhost)\n\tby irv1user08.caveonetworks.com (8.14.4/8.14.4/Submit) id\n\tx96KEVFs008873; Sun, 6 Oct 2019 13:14:31 -0700" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;\n\th=from : to : cc :\n\tsubject : date : message-id : in-reply-to : references : mime-version\n\t: content-type; s=pfpt0818;\n\tbh=K0pD73F9X46R/izfgcJvWjbbORZPOWJ/KA0WALrnlF0=; \n\tb=THyG1C7jUVf8fkcF8oQSXbgn4EBIRmTLnBwR8wAwXSShKy59WMONnVAQo3IOhQYp3a/R\n\t25Nkkf1l5jqVT7E0IGwFCpoE6o3l3k9Aa/UTUE896c0eG6aYV8FNr2AWj2ek/krFz9I9\n\tu+V/Jq8/8Gt1XETcJlzN3IGMX890ta8aLdPQqDgzU8kjrAYsB4+nMRlzpMJxGY+mZZgH\n\tmsup2v42HaTbl6RDL1U2v015oGSkZtkHv9qMleTLOwmF7w4mLIuH48DPZgmLmbLUUNb6\n\tTm1gjJXQnNbHFSjz+lCPiwbRO27EA7zQ3eOlb1Ys7chkP0JXibbwsR2cxIaaic8axVsJ\n\t3A== ", "X-Authentication-Warning": "irv1user08.caveonetworks.com: rmody set sender to\n\trmody@marvell.com using -f", "From": "Rasesh Mody <rmody@marvell.com>", "To": "<dev@dpdk.org>, <jerinj@marvell.com>, <ferruh.yigit@intel.com>", "CC": "Rasesh Mody <rmody@marvell.com>, <GR-Everest-DPDK-Dev@marvell.com>", "Date": "Sun, 6 Oct 2019 13:14:09 -0700", "Message-ID": "<20191006201409.8770-10-rmody@marvell.com>", "X-Mailer": "git-send-email 2.18.0", "In-Reply-To": "<20190930024921.21818-1-rmody@marvell.com>", "References": "<20190930024921.21818-1-rmody@marvell.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10434:6.0.95,1.0.8\n\tdefinitions=2019-10-06_08:2019-10-03,2019-10-06 signatures=0", "Subject": "[dpdk-dev] [PATCH v2 9/9] net/qede: print adapter info during init\n\tfailure", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Dump the info logs banner with available information in case of\ndevice initialization failure.\n\nSigned-off-by: Rasesh Mody <rmody@marvell.com>\n---\n drivers/net/qede/qede_ethdev.c | 81 ++++++++++++++++++++++------------\n drivers/net/qede/qede_ethdev.h | 19 +++++---\n 2 files changed, 67 insertions(+), 33 deletions(-)", "diff": "diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c\nindex 0c9f6590e..53fdfde9a 100644\n--- a/drivers/net/qede/qede_ethdev.c\n+++ b/drivers/net/qede/qede_ethdev.c\n@@ -278,30 +278,44 @@ static void qede_print_adapter_info(struct qede_dev *qdev)\n {\n \tstruct ecore_dev *edev = &qdev->edev;\n \tstruct qed_dev_info *info = &qdev->dev_info.common;\n-\tstatic char drv_ver[QEDE_PMD_DRV_VER_STR_SIZE];\n \tstatic char ver_str[QEDE_PMD_DRV_VER_STR_SIZE];\n \n-\tDP_INFO(edev, \"*********************************\\n\");\n-\tDP_INFO(edev, \" DPDK version:%s\\n\", rte_version());\n-\tDP_INFO(edev, \" Chip details : %s %c%d\\n\",\n+\tDP_INFO(edev, \"**************************************************\\n\");\n+\tDP_INFO(edev, \" DPDK version\\t\\t\\t: %s\\n\", rte_version());\n+\tDP_INFO(edev, \" Chip details\\t\\t\\t: %s %c%d\\n\",\n \t\t ECORE_IS_BB(edev) ? \"BB\" : \"AH\",\n \t\t 'A' + edev->chip_rev,\n \t\t (int)edev->chip_metal);\n-\tsnprintf(ver_str, QEDE_PMD_DRV_VER_STR_SIZE, \"%d.%d.%d.%d\",\n-\t\t info->fw_major, info->fw_minor, info->fw_rev, info->fw_eng);\n-\tsnprintf(drv_ver, QEDE_PMD_DRV_VER_STR_SIZE, \"%s_%s\",\n-\t\t ver_str, QEDE_PMD_VERSION);\n-\tDP_INFO(edev, \" Driver version : %s\\n\", drv_ver);\n-\tDP_INFO(edev, \" Firmware version : %s\\n\", ver_str);\n+\tsnprintf(ver_str, QEDE_PMD_DRV_VER_STR_SIZE, \"%s\",\n+\t\t QEDE_PMD_DRV_VERSION);\n+\tDP_INFO(edev, \" Driver version\\t\\t\\t: %s\\n\", ver_str);\n+\n+\tsnprintf(ver_str, QEDE_PMD_DRV_VER_STR_SIZE, \"%s\",\n+\t\t QEDE_PMD_BASE_VERSION);\n+\tDP_INFO(edev, \" Base version\\t\\t\\t: %s\\n\", ver_str);\n+\n+\tif (!IS_VF(edev))\n+\t\tsnprintf(ver_str, QEDE_PMD_DRV_VER_STR_SIZE, \"%s\",\n+\t\t\t QEDE_PMD_FW_VERSION);\n+\telse\n+\t\tsnprintf(ver_str, QEDE_PMD_DRV_VER_STR_SIZE, \"%d.%d.%d.%d\",\n+\t\t\t info->fw_major, info->fw_minor,\n+\t\t\t info->fw_rev, info->fw_eng);\n+\tDP_INFO(edev, \" Firmware version\\t\\t\\t: %s\\n\", ver_str);\n \n \tsnprintf(ver_str, MCP_DRV_VER_STR_SIZE,\n \t\t \"%d.%d.%d.%d\",\n-\t\t(info->mfw_rev >> 24) & 0xff,\n-\t\t(info->mfw_rev >> 16) & 0xff,\n-\t\t(info->mfw_rev >> 8) & 0xff, (info->mfw_rev) & 0xff);\n-\tDP_INFO(edev, \" Management Firmware version : %s\\n\", ver_str);\n-\tDP_INFO(edev, \" Firmware file : %s\\n\", qede_fw_file);\n-\tDP_INFO(edev, \"*********************************\\n\");\n+\t\t (info->mfw_rev & QED_MFW_VERSION_3_MASK) >>\n+\t\t QED_MFW_VERSION_3_OFFSET,\n+\t\t (info->mfw_rev & QED_MFW_VERSION_2_MASK) >>\n+\t\t QED_MFW_VERSION_2_OFFSET,\n+\t\t (info->mfw_rev & QED_MFW_VERSION_1_MASK) >>\n+\t\t QED_MFW_VERSION_1_OFFSET,\n+\t\t (info->mfw_rev & QED_MFW_VERSION_0_MASK) >>\n+\t\t QED_MFW_VERSION_0_OFFSET);\n+\tDP_INFO(edev, \" Management Firmware version\\t: %s\\n\", ver_str);\n+\tDP_INFO(edev, \" Firmware file\\t\\t\\t: %s\\n\", qede_fw_file);\n+\tDP_INFO(edev, \"**************************************************\\n\");\n }\n \n static void qede_reset_queue_stats(struct qede_dev *qdev, bool xstats)\n@@ -2427,7 +2441,8 @@ static int qede_common_dev_init(struct rte_eth_dev *eth_dev, bool is_vf)\n \tqed_ops = qed_get_eth_ops();\n \tif (!qed_ops) {\n \t\tDP_ERR(edev, \"Failed to get qed_eth_ops_pass\\n\");\n-\t\treturn -EINVAL;\n+\t\trc = -EINVAL;\n+\t\tgoto err;\n \t}\n \n \tDP_INFO(edev, \"Starting qede probe\\n\");\n@@ -2435,7 +2450,8 @@ static int qede_common_dev_init(struct rte_eth_dev *eth_dev, bool is_vf)\n \t\t\t\t dp_level, is_vf);\n \tif (rc != 0) {\n \t\tDP_ERR(edev, \"qede probe failed rc %d\\n\", rc);\n-\t\treturn -ENODEV;\n+\t\trc = -ENODEV;\n+\t\tgoto err;\n \t}\n \tqede_update_pf_params(edev);\n \n@@ -2456,7 +2472,8 @@ static int qede_common_dev_init(struct rte_eth_dev *eth_dev, bool is_vf)\n \n \tif (rte_intr_enable(&pci_dev->intr_handle)) {\n \t\tDP_ERR(edev, \"rte_intr_enable() failed\\n\");\n-\t\treturn -ENODEV;\n+\t\trc = -ENODEV;\n+\t\tgoto err;\n \t}\n \n \t/* Start the Slowpath-process */\n@@ -2491,7 +2508,8 @@ static int qede_common_dev_init(struct rte_eth_dev *eth_dev, bool is_vf)\n \t\tif (rc != 0) {\n \t\t\tDP_ERR(edev, \"Unable to start periodic\"\n \t\t\t\t \" timer rc %d\\n\", rc);\n-\t\t\treturn -EINVAL;\n+\t\t\trc = -EINVAL;\n+\t\t\tgoto err;\n \t\t}\n \t}\n \n@@ -2500,7 +2518,8 @@ static int qede_common_dev_init(struct rte_eth_dev *eth_dev, bool is_vf)\n \t\tDP_ERR(edev, \"Cannot start slowpath rc = %d\\n\", rc);\n \t\trte_eal_alarm_cancel(qede_poll_sp_sb_cb,\n \t\t\t\t (void *)eth_dev);\n-\t\treturn -ENODEV;\n+\t\trc = -ENODEV;\n+\t\tgoto err;\n \t}\n \n \trc = qed_ops->fill_dev_info(edev, &dev_info);\n@@ -2510,11 +2529,17 @@ static int qede_common_dev_init(struct rte_eth_dev *eth_dev, bool is_vf)\n \t\tqed_ops->common->remove(edev);\n \t\trte_eal_alarm_cancel(qede_poll_sp_sb_cb,\n \t\t\t\t (void *)eth_dev);\n-\t\treturn -ENODEV;\n+\t\trc = -ENODEV;\n+\t\tgoto err;\n \t}\n \n \tqede_alloc_etherdev(adapter, &dev_info);\n \n+\tif (do_once) {\n+\t\tqede_print_adapter_info(adapter);\n+\t\tdo_once = false;\n+\t}\n+\n \tadapter->ops->common->set_name(edev, edev->name);\n \n \tif (!is_vf)\n@@ -2571,11 +2596,6 @@ static int qede_common_dev_init(struct rte_eth_dev *eth_dev, bool is_vf)\n \n \teth_dev->dev_ops = (is_vf) ? &qede_eth_vf_dev_ops : &qede_eth_dev_ops;\n \n-\tif (do_once) {\n-\t\tqede_print_adapter_info(adapter);\n-\t\tdo_once = false;\n-\t}\n-\n \t/* Bring-up the link */\n \tqede_dev_set_link_state(eth_dev, true);\n \n@@ -2621,6 +2641,13 @@ static int qede_common_dev_init(struct rte_eth_dev *eth_dev, bool is_vf)\n \tDP_INFO(edev, \"Device initialized\\n\");\n \n \treturn 0;\n+\n+err:\n+\tif (do_once) {\n+\t\tqede_print_adapter_info(adapter);\n+\t\tdo_once = false;\n+\t}\n+\treturn rc;\n }\n \n static int qedevf_eth_dev_init(struct rte_eth_dev *eth_dev)\ndiff --git a/drivers/net/qede/qede_ethdev.h b/drivers/net/qede/qede_ethdev.h\nindex 559638508..1ac2d086a 100644\n--- a/drivers/net/qede/qede_ethdev.h\n+++ b/drivers/net/qede/qede_ethdev.h\n@@ -42,20 +42,27 @@\n #define qede_stringify(x...)\t\tqede_stringify1(x)\n \n /* Driver versions */\n+#define QEDE_PMD_DRV_VER_STR_SIZE NAME_SIZE /* 128 */\n #define QEDE_PMD_VER_PREFIX\t\t\"QEDE PMD\"\n #define QEDE_PMD_VERSION_MAJOR\t\t2\n #define QEDE_PMD_VERSION_MINOR\t 11\n #define QEDE_PMD_VERSION_REVISION 0\n #define QEDE_PMD_VERSION_PATCH\t 1\n \n-#define QEDE_PMD_VERSION qede_stringify(QEDE_PMD_VERSION_MAJOR) \".\" \\\n-\t\t\t qede_stringify(QEDE_PMD_VERSION_MINOR) \".\" \\\n-\t\t\t qede_stringify(QEDE_PMD_VERSION_REVISION) \".\" \\\n-\t\t\t qede_stringify(QEDE_PMD_VERSION_PATCH)\n+#define QEDE_PMD_DRV_VERSION qede_stringify(QEDE_PMD_VERSION_MAJOR) \".\" \\\n+\t\t\t qede_stringify(QEDE_PMD_VERSION_MINOR) \".\" \\\n+\t\t\t qede_stringify(QEDE_PMD_VERSION_REVISION) \".\" \\\n+\t\t\t qede_stringify(QEDE_PMD_VERSION_PATCH)\n \n-#define QEDE_PMD_DRV_VER_STR_SIZE NAME_SIZE\n-#define QEDE_PMD_VER_PREFIX \"QEDE PMD\"\n+#define QEDE_PMD_BASE_VERSION qede_stringify(ECORE_MAJOR_VERSION) \".\" \\\n+\t\t\t qede_stringify(ECORE_MINOR_VERSION) \".\" \\\n+\t\t\t qede_stringify(ECORE_REVISION_VERSION) \".\" \\\n+\t\t\t qede_stringify(ECORE_ENGINEERING_VERSION)\n \n+#define QEDE_PMD_FW_VERSION qede_stringify(FW_MAJOR_VERSION) \".\" \\\n+\t\t\t qede_stringify(FW_MINOR_VERSION) \".\" \\\n+\t\t\t qede_stringify(FW_REVISION_VERSION) \".\" \\\n+\t\t\t qede_stringify(FW_ENGINEERING_VERSION)\n \n #define QEDE_RSS_INDIR_INITED (1 << 0)\n #define QEDE_RSS_KEY_INITED (1 << 1)\n", "prefixes": [ "v2", "9/9" ] }