Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/81486/?format=api
{ "id": 81486, "url": "http://patches.dpdk.org/api/patches/81486/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1603183709-23420-41-git-send-email-arybchenko@solarflare.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": "<1603183709-23420-41-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1603183709-23420-41-git-send-email-arybchenko@solarflare.com", "date": "2020-10-20T08:48:07", "name": "[40/62] common/sfc_efx/base: refactor version / boot info get helper", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "46f824797e0b4d1a19b2a8860052e6f96dd73b8a", "submitter": { "id": 607, "url": "http://patches.dpdk.org/api/people/607/?format=api", "name": "Andrew Rybchenko", "email": "arybchenko@solarflare.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1603183709-23420-41-git-send-email-arybchenko@solarflare.com/mbox/", "series": [ { "id": 13132, "url": "http://patches.dpdk.org/api/series/13132/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=13132", "date": "2020-10-20T08:47:30", "name": "net/sfc: support flow API transfer rules", "version": 1, "mbox": "http://patches.dpdk.org/series/13132/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/81486/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/81486/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id E246BA04DD;\n\tTue, 20 Oct 2020 11:05:16 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 0214FBBC2;\n\tTue, 20 Oct 2020 10:50:10 +0200 (CEST)", "from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com\n [148.163.129.52]) by dpdk.org (Postfix) with ESMTP id B7AE2BBA0\n for <dev@dpdk.org>; Tue, 20 Oct 2020 10:49:06 +0200 (CEST)", "from mx1-us1.ppe-hosted.com (unknown [10.7.65.61])\n by dispatch1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id\n 82D1A60089 for <dev@dpdk.org>; Tue, 20 Oct 2020 08:49:06 +0000 (UTC)", "from us4-mdac16-42.ut7.mdlocal (unknown [10.7.64.24])\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 81EA08009E\n for <dev@dpdk.org>; Tue, 20 Oct 2020 08:49:06 +0000 (UTC)", "from mx1-us1.ppe-hosted.com (unknown [10.7.65.200])\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 055288005D\n for <dev@dpdk.org>; Tue, 20 Oct 2020 08:49:06 +0000 (UTC)", "from webmail.solarflare.com (uk.solarflare.com [193.34.186.16])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))\n (No client certificate requested)\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id\n AF69A800058\n for <dev@dpdk.org>; Tue, 20 Oct 2020 08:49:05 +0000 (UTC)", "from ukex01.SolarFlarecom.com (10.17.10.4) by\n ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server (TLS) id\n 15.0.1497.2; Tue, 20 Oct 2020 09:48:50 +0100", "from opal.uk.solarflarecom.com (10.17.10.1) by\n ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server id\n 15.0.1497.2 via Frontend Transport; Tue, 20 Oct 2020 09:48:50 +0100", "from ukv-loginhost.uk.solarflarecom.com\n (ukv-loginhost.uk.solarflarecom.com [10.17.10.39])\n by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id 09K8mnI3030800;\n Tue, 20 Oct 2020 09:48:50 +0100", "from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1])\n by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id D28101613A9;\n Tue, 20 Oct 2020 09:48:49 +0100 (BST)" ], "X-Virus-Scanned": "Proofpoint Essentials engine", "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "<y@solarflare.com>", "CC": "<dev@dpdk.org>, Ivan Malov <ivan.malov@oktetlabs.ru>", "Date": "Tue, 20 Oct 2020 09:48:07 +0100", "Message-ID": "<1603183709-23420-41-git-send-email-arybchenko@solarflare.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1603183709-23420-1-git-send-email-arybchenko@solarflare.com>", "References": "<1603183709-23420-1-git-send-email-arybchenko@solarflare.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-TM-AS-Product-Ver": "SMEX-12.5.0.1300-8.6.1012-25736.003", "X-TM-AS-Result": "No-1.143800-8.000000-10", "X-TMASE-MatchedRID": "S9Ceak9KoSgdqirDt7KDjMeuFL5UpINx66i2vtqzeKX5+tteD5RzhamE\n 6sikRTtfuA9fFHhyLzywgcHDNo5AtCHhSBQfglfsA9lly13c/gGrlTqw7wfC06jxqhyDxmYjM74\n 8GW9lTth1/2ejr+BWJnug5fIqIMi3lW8+jFKPmuajGOtqnkAZC/fjx7YIT/BiGlfXMQvierfjLK\n PupB6SI6P4tSedQfydN8eHxrg3vgIEIbfwCb92vZ4CIKY/Hg3AGdQnQSTrKGPEQdG7H66TyJ8TM\n nmE+d0ZMZKyPnlHaGefE5OShXLriM1ov2rmo4g7eczzwAdnPmgrbsVQSwOPc8cME+FNINstctHd\n Jx5wkFarVCyHXe6rPfbLITVN89Mvk3UkV5Qp4wSI45Rd9ORJwFlJvEhEss3fvN+d4ahMo5NWXGv\n UUmKP2w==", "X-TM-AS-User-Approved-Sender": "Yes", "X-TM-AS-User-Blocked-Sender": "No", "X-TMASE-Result": "10--1.143800-8.000000", "X-TMASE-Version": "SMEX-12.5.0.1300-8.6.1012-25736.003", "X-MDID": "1603183746-v_RwHpSrJZJJ", "X-PPE-DISP": "1603183746;v_RwHpSrJZJJ", "Subject": "[dpdk-dev] [PATCH 40/62] common/sfc_efx/base: refactor version /\n\tboot info get helper", "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 <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 <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Ivan Malov <ivan.malov@oktetlabs.ru>\n\nRefactor MCDI helper for version information and boot status\nretrieval; it should comprise two dedicated helper functions.\n\nA later patch will extend and reuse version retrieval helper.\n\nSigned-off-by: Ivan Malov <ivan.malov@oktetlabs.ru>\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\n---\n drivers/common/sfc_efx/base/efx_mcdi.c | 156 ++++++++++++++++---------\n drivers/common/sfc_efx/base/efx_mcdi.h | 12 ++\n 2 files changed, 116 insertions(+), 52 deletions(-)", "diff": "diff --git a/drivers/common/sfc_efx/base/efx_mcdi.c b/drivers/common/sfc_efx/base/efx_mcdi.c\nindex ede052a26a..edd069c969 100644\n--- a/drivers/common/sfc_efx/base/efx_mcdi.c\n+++ b/drivers/common/sfc_efx/base/efx_mcdi.c\n@@ -962,31 +962,32 @@ efx_mcdi_ev_death(\n }\n \n \t__checkReturn\t\tefx_rc_t\n-efx_mcdi_version(\n+efx_mcdi_get_version(\n \t__in\t\t\tefx_nic_t *enp,\n-\t__out_ecount_opt(4)\tuint16_t versionp[4],\n-\t__out_opt\t\tuint32_t *buildp,\n-\t__out_opt\t\tefx_mcdi_boot_t *statusp)\n+\t__out\t\t\tefx_mcdi_version_t *verp)\n {\n-\tefx_mcdi_req_t req;\n \tEFX_MCDI_DECLARE_BUF(payload,\n-\t\tMAX(MC_CMD_GET_VERSION_IN_LEN, MC_CMD_GET_BOOT_STATUS_IN_LEN),\n-\t\tMAX(MC_CMD_GET_VERSION_OUT_LEN,\n-\t\t\tMC_CMD_GET_BOOT_STATUS_OUT_LEN));\n-\tefx_word_t *ver_words;\n-\tuint16_t version[4];\n-\tuint32_t build;\n-\tefx_mcdi_boot_t status;\n+\t MC_CMD_GET_VERSION_IN_LEN,\n+\t MC_CMD_GET_VERSION_OUT_LEN);\n+\tsize_t min_resp_len_required;\n+\tefx_mcdi_req_t req;\n \tefx_rc_t rc;\n \n+\tEFX_STATIC_ASSERT(sizeof (verp->emv_version) ==\n+\t MC_CMD_GET_VERSION_OUT_VERSION_LEN);\n+\tEFX_STATIC_ASSERT(sizeof (verp->emv_firmware) ==\n+\t MC_CMD_GET_VERSION_OUT_FIRMWARE_LEN);\n+\n \tEFSYS_ASSERT3U(enp->en_features, &, EFX_FEATURE_MCDI);\n \n \treq.emr_cmd = MC_CMD_GET_VERSION;\n \treq.emr_in_buf = payload;\n-\treq.emr_in_length = MC_CMD_GET_VERSION_IN_LEN;\n \treq.emr_out_buf = payload;\n+\treq.emr_in_length = MC_CMD_GET_VERSION_IN_LEN;\n \treq.emr_out_length = MC_CMD_GET_VERSION_OUT_LEN;\n \n+\tmin_resp_len_required = MC_CMD_GET_VERSION_V0_OUT_LEN;\n+\n \tefx_mcdi_execute(enp, &req);\n \n \tif (req.emr_rc != 0) {\n@@ -994,34 +995,56 @@ efx_mcdi_version(\n \t\tgoto fail1;\n \t}\n \n-\t/* bootrom support */\n-\tif (req.emr_out_length_used == MC_CMD_GET_VERSION_V0_OUT_LEN) {\n-\t\tversion[0] = version[1] = version[2] = version[3] = 0;\n-\t\tbuild = MCDI_OUT_DWORD(req, GET_VERSION_OUT_FIRMWARE);\n-\n-\t\tgoto version;\n-\t}\n-\n-\tif (req.emr_out_length_used < MC_CMD_GET_VERSION_OUT_LEN) {\n+\tif (req.emr_out_length_used < min_resp_len_required) {\n \t\trc = EMSGSIZE;\n \t\tgoto fail2;\n \t}\n \n-\tver_words = MCDI_OUT2(req, efx_word_t, GET_VERSION_OUT_VERSION);\n-\tversion[0] = EFX_WORD_FIELD(ver_words[0], EFX_WORD_0);\n-\tversion[1] = EFX_WORD_FIELD(ver_words[1], EFX_WORD_0);\n-\tversion[2] = EFX_WORD_FIELD(ver_words[2], EFX_WORD_0);\n-\tversion[3] = EFX_WORD_FIELD(ver_words[3], EFX_WORD_0);\n-\tbuild = MCDI_OUT_DWORD(req, GET_VERSION_OUT_FIRMWARE);\n+\tmemset(verp, 0, sizeof (*verp));\n \n-version:\n-\t/* The bootrom doesn't understand BOOT_STATUS */\n-\tif (MC_FW_VERSION_IS_BOOTLOADER(build)) {\n-\t\tstatus = EFX_MCDI_BOOT_ROM;\n-\t\tgoto out;\n+\tif (req.emr_out_length_used > min_resp_len_required) {\n+\t\tefx_word_t *ver_words;\n+\n+\t\tif (req.emr_out_length_used < MC_CMD_GET_VERSION_OUT_LEN) {\n+\t\t\trc = EMSGSIZE;\n+\t\t\tgoto fail3;\n+\t\t}\n+\n+\t\tver_words = MCDI_OUT2(req, efx_word_t, GET_VERSION_OUT_VERSION);\n+\n+\t\tverp->emv_version[0] = EFX_WORD_FIELD(ver_words[0], EFX_WORD_0);\n+\t\tverp->emv_version[1] = EFX_WORD_FIELD(ver_words[1], EFX_WORD_0);\n+\t\tverp->emv_version[2] = EFX_WORD_FIELD(ver_words[2], EFX_WORD_0);\n+\t\tverp->emv_version[3] = EFX_WORD_FIELD(ver_words[3], EFX_WORD_0);\n \t}\n \n-\t(void) memset(payload, 0, sizeof (payload));\n+\tverp->emv_firmware = MCDI_OUT_DWORD(req, GET_VERSION_OUT_FIRMWARE);\n+\n+\treturn (0);\n+\n+fail3:\n+\tEFSYS_PROBE(fail3);\n+fail2:\n+\tEFSYS_PROBE(fail2);\n+fail1:\n+\tEFSYS_PROBE1(fail1, efx_rc_t, rc);\n+\n+\treturn (rc);\n+}\n+\n+static\t__checkReturn\t\tefx_rc_t\n+efx_mcdi_get_boot_status(\n+\t__in\t\t\tefx_nic_t *enp,\n+\t__out\t\t\tefx_mcdi_boot_t *statusp)\n+{\n+\tEFX_MCDI_DECLARE_BUF(payload,\n+\t MC_CMD_GET_BOOT_STATUS_IN_LEN,\n+\t MC_CMD_GET_BOOT_STATUS_OUT_LEN);\n+\tefx_mcdi_req_t req;\n+\tefx_rc_t rc;\n+\n+\tEFSYS_ASSERT3U(enp->en_features, &, EFX_FEATURE_MCDI);\n+\n \treq.emr_cmd = MC_CMD_GET_BOOT_STATUS;\n \treq.emr_in_buf = payload;\n \treq.emr_in_length = MC_CMD_GET_BOOT_STATUS_IN_LEN;\n@@ -1030,44 +1053,73 @@ efx_mcdi_version(\n \n \tefx_mcdi_execute_quiet(enp, &req);\n \n-\tif (req.emr_rc == EACCES) {\n-\t\t/* Unprivileged functions cannot access BOOT_STATUS */\n-\t\tstatus = EFX_MCDI_BOOT_PRIMARY;\n-\t\tversion[0] = version[1] = version[2] = version[3] = 0;\n-\t\tbuild = 0;\n-\t\tgoto out;\n-\t}\n-\n \tif (req.emr_rc != 0) {\n \t\trc = req.emr_rc;\n-\t\tgoto fail3;\n+\t\tgoto fail1;\n \t}\n \n \tif (req.emr_out_length_used < MC_CMD_GET_BOOT_STATUS_OUT_LEN) {\n \t\trc = EMSGSIZE;\n-\t\tgoto fail4;\n+\t\tgoto fail2;\n \t}\n \n \tif (MCDI_OUT_DWORD_FIELD(req, GET_BOOT_STATUS_OUT_FLAGS,\n \t GET_BOOT_STATUS_OUT_FLAGS_PRIMARY))\n-\t\tstatus = EFX_MCDI_BOOT_PRIMARY;\n+\t\t*statusp = EFX_MCDI_BOOT_PRIMARY;\n \telse\n-\t\tstatus = EFX_MCDI_BOOT_SECONDARY;\n+\t\t*statusp = EFX_MCDI_BOOT_SECONDARY;\n+\n+\treturn (0);\n+\n+fail2:\n+\tEFSYS_PROBE(fail2);\n+fail1:\n+\tEFSYS_PROBE1(fail1, efx_rc_t, rc);\n+\n+\treturn (rc);\n+}\n+\n+\t__checkReturn\t\tefx_rc_t\n+efx_mcdi_version(\n+\t__in\t\t\tefx_nic_t *enp,\n+\t__out_ecount_opt(4)\tuint16_t versionp[4],\n+\t__out_opt\t\tuint32_t *buildp,\n+\t__out_opt\t\tefx_mcdi_boot_t *statusp)\n+{\n+\tefx_mcdi_version_t ver;\n+\tefx_mcdi_boot_t status;\n+\tefx_rc_t rc;\n+\n+\trc = efx_mcdi_get_version(enp, &ver);\n+\tif (rc != 0)\n+\t\tgoto fail1;\n+\n+\t/* The bootrom doesn't understand BOOT_STATUS */\n+\tif (MC_FW_VERSION_IS_BOOTLOADER(ver.emv_firmware)) {\n+\t\tstatus = EFX_MCDI_BOOT_ROM;\n+\t\tgoto out;\n+\t}\n+\n+\trc = efx_mcdi_get_boot_status(enp, &status);\n+\tif (rc == EACCES) {\n+\t\t/* Unprivileged functions cannot access BOOT_STATUS */\n+\t\tstatus = EFX_MCDI_BOOT_PRIMARY;\n+\t\tmemset(ver.emv_version, 0, sizeof (ver.emv_version));\n+\t\tver.emv_firmware = 0;\n+\t} else if (rc != 0) {\n+\t\tgoto fail2;\n+\t}\n \n out:\n \tif (versionp != NULL)\n-\t\tmemcpy(versionp, version, sizeof (version));\n+\t\tmemcpy(versionp, ver.emv_version, sizeof (ver.emv_version));\n \tif (buildp != NULL)\n-\t\t*buildp = build;\n+\t\t*buildp = ver.emv_firmware;\n \tif (statusp != NULL)\n \t\t*statusp = status;\n \n \treturn (0);\n \n-fail4:\n-\tEFSYS_PROBE(fail4);\n-fail3:\n-\tEFSYS_PROBE(fail3);\n fail2:\n \tEFSYS_PROBE(fail2);\n fail1:\ndiff --git a/drivers/common/sfc_efx/base/efx_mcdi.h b/drivers/common/sfc_efx/base/efx_mcdi.h\nindex 9dd0a23862..8b50b8a949 100644\n--- a/drivers/common/sfc_efx/base/efx_mcdi.h\n+++ b/drivers/common/sfc_efx/base/efx_mcdi.h\n@@ -118,6 +118,18 @@ efx_mcdi_raise_exception(\n \t__in_opt\tefx_mcdi_req_t *emrp,\n \t__in\t\tint rc);\n \n+typedef struct efx_mcdi_version_s {\n+\t/* Basic version information */\n+\tuint16_t\t\temv_version[4];\n+\tuint32_t\t\temv_firmware;\n+} efx_mcdi_version_t;\n+\n+LIBEFX_INTERNAL\n+extern\t__checkReturn\tefx_rc_t\n+efx_mcdi_get_version(\n+\t__in\t\tefx_nic_t *enp,\n+\t__out\t\tefx_mcdi_version_t *verp);\n+\n typedef enum efx_mcdi_boot_e {\n \tEFX_MCDI_BOOT_PRIMARY,\n \tEFX_MCDI_BOOT_SECONDARY,\n", "prefixes": [ "40/62" ] }