Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/54610/?format=api
{ "id": 54610, "url": "http://patches.dpdk.org/api/patches/54610/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1560152324-20538-14-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": "<1560152324-20538-14-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1560152324-20538-14-git-send-email-arybchenko@solarflare.com", "date": "2019-06-10T07:38:28", "name": "[13/29] net/sfc/base: transition to the extensible NVRAM info API", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "601a9182e86bc786088d7c372e8516dc9ead7b9b", "submitter": { "id": 607, "url": "http://patches.dpdk.org/api/people/607/?format=api", "name": "Andrew Rybchenko", "email": "arybchenko@solarflare.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1560152324-20538-14-git-send-email-arybchenko@solarflare.com/mbox/", "series": [ { "id": 4965, "url": "http://patches.dpdk.org/api/series/4965/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=4965", "date": "2019-06-10T07:38:19", "name": "net/sfc/base: update base driver", "version": 1, "mbox": "http://patches.dpdk.org/series/4965/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/54610/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/54610/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 AB1721BF50;\n\tMon, 10 Jun 2019 09:39:43 +0200 (CEST)", "from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com\n\t[67.231.154.164]) by dpdk.org (Postfix) with ESMTP id BA0231BE95\n\tfor <dev@dpdk.org>; Mon, 10 Jun 2019 09:38:59 +0200 (CEST)", "from webmail.solarflare.com (webmail.solarflare.com\n\t[12.187.104.26])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id\n\tD95F8140058\n\tfor <dev@dpdk.org>; Mon, 10 Jun 2019 07:38:58 +0000 (UTC)", "from ocex03.SolarFlarecom.com (10.20.40.36) by\n\tocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server\n\t(TLS) id 15.0.1395.4; Mon, 10 Jun 2019 00:38:52 -0700", "from opal.uk.solarflarecom.com (10.17.10.1) by\n\tocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server\n\t(TLS) id\n\t15.0.1395.4 via Frontend Transport; Mon, 10 Jun 2019 00:38:50 -0700", "from ukv-loginhost.uk.solarflarecom.com\n\t(ukv-loginhost.uk.solarflarecom.com [10.17.10.39])\n\tby opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id\n\tx5A7cnOF008801; Mon, 10 Jun 2019 08:38:49 +0100", "from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1])\n\tby ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id\n\t95C361627D7; Mon, 10 Jun 2019 08:38:49 +0100 (BST)" ], "X-Virus-Scanned": "Proofpoint Essentials engine", "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "<dev@dpdk.org>", "CC": "Richard Houldsworth <rhouldsworth@solarflare.com>", "Date": "Mon, 10 Jun 2019 08:38:28 +0100", "Message-ID": "<1560152324-20538-14-git-send-email-arybchenko@solarflare.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1560152324-20538-1-git-send-email-arybchenko@solarflare.com>", "References": "<1560152324-20538-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.5.1010-24664.003", "X-TM-AS-Result": "No-7.004600-4.000000-10", "X-TMASE-MatchedRID": "eHfivBiCMVlas6sP1BUQLR23b+lJHvPA3V4UShoTXadhGCe0pjZhr8iT\n\tWug2C4DN3iuNqik9NLx7Okmvhl+K960iin8P0KjVPwKTD1v8YV5MkOX0UoduuVVkJxysad/IoLj\n\trCmgL2PUuGBKLx8XK/nk5w+l3wsE1hSCxa/xQsJ9IcJTn2HkqsY7P8sslRxoe5ZPAlhnmbz3D+F\n\t1eEtQinkSP5bfn/F5qWPy/8POTPqDeyYs3+FVYBR/R5SKe31ARNW8jQhzoALXmTInKzpSFSZffm\n\tcaR0qCL4vM1YF6AJbbCCfuIMF6xLXnN0DN7HnFmw9idgnStJ5R6yzUIet90vmP1zznIEGVbTNoC\n\tbKFWxluZfQvK7J3zlJRMZUCEHkRt", "X-TM-AS-User-Approved-Sender": "No", "X-TM-AS-User-Blocked-Sender": "No", "X-TMASE-Result": "10--7.004600-4.000000", "X-TMASE-Version": "SMEX-12.5.0.1300-8.5.1010-24664.003", "X-MDID": "1560152339-m9t5T0jK7If6", "Subject": "[dpdk-dev] [PATCH 13/29] net/sfc/base: transition to the extensible\n\tNVRAM info API", "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": "From: Richard Houldsworth <rhouldsworth@solarflare.com>\n\nOld NVRAM info API required function prototype too often.\n\nSigned-off-by: Richard Houldsworth <rhouldsworth@solarflare.com>\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\n---\n drivers/net/sfc/base/ef10_nvram.c | 20 +++++++++++++-------\n drivers/net/sfc/base/ef10_vpd.c | 7 +++++--\n drivers/net/sfc/base/efx_impl.h | 9 ---------\n drivers/net/sfc/base/efx_nvram.c | 38 +-------------------------------------\n drivers/net/sfc/base/siena_nvram.c | 9 +++++----\n 5 files changed, 24 insertions(+), 59 deletions(-)", "diff": "diff --git a/drivers/net/sfc/base/ef10_nvram.c b/drivers/net/sfc/base/ef10_nvram.c\nindex a618c75..1fb7185 100644\n--- a/drivers/net/sfc/base/ef10_nvram.c\n+++ b/drivers/net/sfc/base/ef10_nvram.c\n@@ -1946,11 +1946,13 @@ static uint32_t checksum_tlv_partition(\n \t__out\t\t\tsize_t *sizep)\n {\n \tefx_rc_t rc;\n+\tefx_nvram_info_t eni = { 0 };\n \n-\tif ((rc = efx_mcdi_nvram_info(enp, partn, sizep,\n-\t NULL, NULL, NULL)) != 0)\n+\tif ((rc = efx_mcdi_nvram_info(enp, partn, &eni)) != 0)\n \t\tgoto fail1;\n \n+\t*sizep = eni.eni_partn_size;\n+\n \treturn (0);\n \n fail1:\n@@ -1967,7 +1969,7 @@ static uint32_t checksum_tlv_partition(\n {\n \tefx_rc_t rc;\n \n-\tif ((rc = efx_mcdi_nvram_info_ex(enp, partn, enip)) != 0)\n+\tif ((rc = efx_mcdi_nvram_info(enp, partn, enip)) != 0)\n \t\tgoto fail1;\n \n \tif (enip->eni_write_size == 0)\n@@ -2080,12 +2082,14 @@ static uint32_t checksum_tlv_partition(\n \t__in\t\t\tsize_t size)\n {\n \tefx_rc_t rc;\n+\tefx_nvram_info_t eni = { 0 };\n \tuint32_t erase_size;\n \n-\tif ((rc = efx_mcdi_nvram_info(enp, partn, NULL, NULL,\n-\t &erase_size, NULL)) != 0)\n+\tif ((rc = efx_mcdi_nvram_info(enp, partn, &eni)) != 0)\n \t\tgoto fail1;\n \n+\terase_size = eni.eni_erase_size;\n+\n \tif (erase_size == 0) {\n \t\tif ((rc = efx_mcdi_nvram_erase(enp, partn, offset, size)) != 0)\n \t\t\tgoto fail2;\n@@ -2126,13 +2130,15 @@ static uint32_t checksum_tlv_partition(\n \t__in\t\t\tsize_t size)\n {\n \tsize_t chunk;\n+\tefx_nvram_info_t eni = { 0 };\n \tuint32_t write_size;\n \tefx_rc_t rc;\n \n-\tif ((rc = efx_mcdi_nvram_info(enp, partn, NULL, NULL,\n-\t NULL, &write_size)) != 0)\n+\tif ((rc = efx_mcdi_nvram_info(enp, partn, &eni)) != 0)\n \t\tgoto fail1;\n \n+\twrite_size = eni.eni_write_size;\n+\n \tif (write_size != 0) {\n \t\t/*\n \t\t * Check that the size is a multiple of the write chunk size if\ndiff --git a/drivers/net/sfc/base/ef10_vpd.c b/drivers/net/sfc/base/ef10_vpd.c\nindex d56747b..c641936 100644\n--- a/drivers/net/sfc/base/ef10_vpd.c\n+++ b/drivers/net/sfc/base/ef10_vpd.c\n@@ -79,6 +79,7 @@\n \t__out\t\t\tsize_t *sizep)\n {\n \tefx_rc_t rc;\n+\tefx_nvram_info_t eni = { 0 };\n \n \tEFSYS_ASSERT(EFX_FAMILY_IS_EF10(enp));\n \n@@ -88,10 +89,12 @@\n \t * so we just need to return an upper bound on the dynamic vpd,\n \t * which is the size of the DYNAMIC_CONFIG partition.\n \t */\n-\tif ((rc = efx_mcdi_nvram_info(enp, NVRAM_PARTITION_TYPE_DYNAMIC_CONFIG,\n-\t\t sizep, NULL, NULL, NULL)) != 0)\n+\tif ((rc = efx_mcdi_nvram_info(enp,\n+\t\t NVRAM_PARTITION_TYPE_DYNAMIC_CONFIG, &eni)) != 0)\n \t\tgoto fail1;\n \n+\t*sizep = eni.eni_partn_size;\n+\n \treturn (0);\n \n fail1:\ndiff --git a/drivers/net/sfc/base/efx_impl.h b/drivers/net/sfc/base/efx_impl.h\nindex 577d5aa..d8cadda 100644\n--- a/drivers/net/sfc/base/efx_impl.h\n+++ b/drivers/net/sfc/base/efx_impl.h\n@@ -563,15 +563,6 @@\n efx_mcdi_nvram_info(\n \t__in\t\t\tefx_nic_t *enp,\n \t__in\t\t\tuint32_t partn,\n-\t__out_opt\t\tsize_t *sizep,\n-\t__out_opt\t\tuint32_t *addressp,\n-\t__out_opt\t\tuint32_t *erase_sizep,\n-\t__out_opt\t\tuint32_t *write_sizep);\n-\n-\t__checkReturn\t\tefx_rc_t\n-efx_mcdi_nvram_info_ex(\n-\t__in\t\t\tefx_nic_t *enp,\n-\t__in\t\t\tuint32_t partn,\n \t__out\t\t\tefx_nvram_info_t *eni);\n \n \t__checkReturn\t\tefx_rc_t\ndiff --git a/drivers/net/sfc/base/efx_nvram.c b/drivers/net/sfc/base/efx_nvram.c\nindex b817cb6..74dac41 100644\n--- a/drivers/net/sfc/base/efx_nvram.c\n+++ b/drivers/net/sfc/base/efx_nvram.c\n@@ -691,7 +691,7 @@\n }\n \n \t__checkReturn\t\tefx_rc_t\n-efx_mcdi_nvram_info_ex(\n+efx_mcdi_nvram_info(\n \t__in\t\t\tefx_nic_t *enp,\n \t__in\t\t\tuint32_t partn,\n \t__out\t\t\tefx_nvram_info_t *enip)\n@@ -752,42 +752,6 @@\n \treturn (rc);\n }\n \n-\t__checkReturn\t\tefx_rc_t\n-efx_mcdi_nvram_info(\n-\t__in\t\t\tefx_nic_t *enp,\n-\t__in\t\t\tuint32_t partn,\n-\t__out_opt\t\tsize_t *sizep,\n-\t__out_opt\t\tuint32_t *addressp,\n-\t__out_opt\t\tuint32_t *erase_sizep,\n-\t__out_opt\t\tuint32_t *write_sizep)\n-{\n-\tefx_nvram_info_t eni;\n-\tefx_rc_t rc;\n-\n-\tif ((rc = efx_mcdi_nvram_info_ex(enp, partn, &eni)) != 0)\n-\t\tgoto fail1;\n-\n-\tif (sizep)\n-\t\t*sizep = eni.eni_partn_size;\n-\n-\tif (addressp)\n-\t\t*addressp = eni.eni_address;\n-\n-\tif (erase_sizep)\n-\t\t*erase_sizep = eni.eni_erase_size;\n-\n-\tif (write_sizep)\n-\t\t*write_sizep = eni.eni_write_size;\n-\n-\treturn (0);\n-\n-fail1:\n-\tEFSYS_PROBE1(fail1, efx_rc_t, rc);\n-\n-\treturn (rc);\n-}\n-\n-\n /*\n * MC_CMD_NVRAM_UPDATE_START_V2 must be used to support firmware-verified\n * NVRAM updates. Older firmware will ignore the flags field in the request.\ndiff --git a/drivers/net/sfc/base/siena_nvram.c b/drivers/net/sfc/base/siena_nvram.c\nindex 7d423d2..47a8ca2 100644\n--- a/drivers/net/sfc/base/siena_nvram.c\n+++ b/drivers/net/sfc/base/siena_nvram.c\n@@ -18,16 +18,17 @@\n \t__out\t\t\tsize_t *sizep)\n {\n \tefx_rc_t rc;\n+\tefx_nvram_info_t eni = { 0 };\n \n \tif ((1 << partn) & ~enp->en_u.siena.enu_partn_mask) {\n \t\trc = ENOTSUP;\n \t\tgoto fail1;\n \t}\n \n-\tif ((rc = efx_mcdi_nvram_info(enp, partn, sizep,\n-\t NULL, NULL, NULL)) != 0) {\n+\tif ((rc = efx_mcdi_nvram_info(enp, partn, &eni)) != 0)\n \t\tgoto fail2;\n-\t}\n+\n+\t*sizep = eni.eni_partn_size;\n \n \treturn (0);\n \n@@ -47,7 +48,7 @@\n {\n \tefx_rc_t rc;\n \n-\tif ((rc = efx_mcdi_nvram_info_ex(enp, partn, enip)) != 0)\n+\tif ((rc = efx_mcdi_nvram_info(enp, partn, enip)) != 0)\n \t\tgoto fail1;\n \n \tif (enip->eni_write_size == 0)\n", "prefixes": [ "13/29" ] }