Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/17120/?format=api
{ "id": 17120, "url": "https://patches.dpdk.org/api/patches/17120/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1479740470-6723-29-git-send-email-arybchenko@solarflare.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": "<1479740470-6723-29-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1479740470-6723-29-git-send-email-arybchenko@solarflare.com", "date": "2016-11-21T15:00:42", "name": "[dpdk-dev,28/56] net/sfc: import libefx bootrom configuration support", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "a703c29e309eb5125ded035ff8e4ded16f03aa10", "submitter": { "id": 607, "url": "https://patches.dpdk.org/api/people/607/?format=api", "name": "Andrew Rybchenko", "email": "arybchenko@solarflare.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1479740470-6723-29-git-send-email-arybchenko@solarflare.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/17120/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/17120/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 489ADD4C2;\n\tMon, 21 Nov 2016 16:02:54 +0100 (CET)", "from nbfkord-smmo02.seg.att.com (nbfkord-smmo02.seg.att.com\n\t[209.65.160.78]) by dpdk.org (Postfix) with ESMTP id 872E32A5D\n\tfor <dev@dpdk.org>; Mon, 21 Nov 2016 16:01:33 +0100 (CET)", "from unknown [12.187.104.26] (EHLO webmail.solarflare.com)\n\tby nbfkord-smmo02.seg.att.com(mxl_mta-7.2.4-7) over TLS secured\n\tchannel with ESMTP id\n\tc4c03385.0.1541303.00-2318.3424202.nbfkord-smmo02.seg.att.com\n\t(envelope-from <arybchenko@solarflare.com>); \n\tMon, 21 Nov 2016 15:01:33 +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.1044.25; Mon, 21 Nov 2016 07:01:21 -0800", "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.1044.25 via Frontend Transport; Mon, 21 Nov 2016 07:01:21 -0800", "from uklogin.uk.solarflarecom.com (uklogin.uk.solarflarecom.com\n\t[10.17.10.10])\n\tby opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id\n\tuALF1K3Z007180 for <dev@dpdk.org>; Mon, 21 Nov 2016 15:01:20 GMT", "from uklogin.uk.solarflarecom.com (localhost.localdomain\n\t[127.0.0.1])\n\tby uklogin.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id\n\tuALF1J3J006765 for <dev@dpdk.org>; Mon, 21 Nov 2016 15:01:20 GMT" ], "X-MXL-Hash": "58330c4d0252d4bf-9f8fec9d1e0534ba39bf36c064db93eee3f7d8ce", "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "<dev@dpdk.org>", "Date": "Mon, 21 Nov 2016 15:00:42 +0000", "Message-ID": "<1479740470-6723-29-git-send-email-arybchenko@solarflare.com>", "X-Mailer": "git-send-email 1.8.2.3", "In-Reply-To": "<1479740470-6723-1-git-send-email-arybchenko@solarflare.com>", "References": "<1479740470-6723-1-git-send-email-arybchenko@solarflare.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-AnalysisOut": [ "[v=2.1 cv=UI/baXry c=1 sm=1 tr=0 a=8BlWFWvVlq5taO8ncb8nKg==]", "[:17 a=L24OOQBejmoA:10 a=zRKbQ67AAAAA:8 a=Bzv1kxFi6uzmx-JZQ]", "[xcA:9 a=KdwNMYh05hlFxeXz:21 a=xc5kDOgN0wNsf1Hd:21 a=PA03WX]", "[8tBzeizutn5_OT:22]" ], "X-Spam": "[F=0.2000000000; CM=0.500; S=0.200(2015072901)]", "X-MAIL-FROM": "<arybchenko@solarflare.com>", "X-SOURCE-IP": "[12.187.104.26]", "Subject": "[dpdk-dev] [PATCH 28/56] net/sfc: import libefx bootrom\n\tconfiguration support", "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": "Provide API to read/write bootrom configuration from/to NVRAM.\n\nEFSYS_OPT_BOOTROM should be enabled to use it.\n\nFrom Solarflare Communications Inc.\n\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\n---\n drivers/net/sfc/efx/base/efx.h | 39 +++\n drivers/net/sfc/efx/base/efx_bootcfg.c | 563 +++++++++++++++++++++++++++++++++\n drivers/net/sfc/efx/base/efx_check.h | 7 +\n 3 files changed, 609 insertions(+)\n create mode 100644 drivers/net/sfc/efx/base/efx_bootcfg.c", "diff": "diff --git a/drivers/net/sfc/efx/base/efx.h b/drivers/net/sfc/efx/base/efx.h\nindex 1811879..8f22eab 100644\n--- a/drivers/net/sfc/efx/base/efx.h\n+++ b/drivers/net/sfc/efx/base/efx.h\n@@ -1421,6 +1421,45 @@ efx_nvram_fini(\n \n #endif\t/* EFSYS_OPT_NVRAM */\n \n+#if EFSYS_OPT_BOOTCFG\n+\n+/* Report size and offset of bootcfg sector in NVRAM partition. */\n+extern\t__checkReturn\t\tefx_rc_t\n+efx_bootcfg_sector_info(\n+\t__in\t\t\tefx_nic_t *enp,\n+\t__in\t\t\tuint32_t pf,\n+\t__out_opt\t\tuint32_t *sector_countp,\n+\t__out\t\t\tsize_t *offsetp,\n+\t__out\t\t\tsize_t *max_sizep);\n+\n+/*\n+ * Copy bootcfg sector data to a target buffer which may differ in size.\n+ * Optionally corrects format errors in source buffer.\n+ */\n+extern\t\t\t\tefx_rc_t\n+efx_bootcfg_copy_sector(\n+\t__in\t\t\tefx_nic_t *enp,\n+\t__inout_bcount(sector_length)\n+\t\t\t\tuint8_t *sector,\n+\t__in\t\t\tsize_t sector_length,\n+\t__out_bcount(data_size)\tuint8_t *data,\n+\t__in\t\t\tsize_t data_size,\n+\t__in\t\t\tboolean_t handle_format_errors);\n+\n+extern\t\t\t\tefx_rc_t\n+efx_bootcfg_read(\n+\t__in\t\t\tefx_nic_t *enp,\n+\t__out_bcount(size)\tcaddr_t data,\n+\t__in\t\t\tsize_t size);\n+\n+extern\t\t\t\tefx_rc_t\n+efx_bootcfg_write(\n+\t__in\t\t\tefx_nic_t *enp,\n+\t__in_bcount(size)\tcaddr_t data,\n+\t__in\t\t\tsize_t size);\n+\n+#endif\t/* EFSYS_OPT_BOOTCFG */\n+\n #if EFSYS_OPT_DIAG\n \n typedef enum efx_pattern_type_t {\ndiff --git a/drivers/net/sfc/efx/base/efx_bootcfg.c b/drivers/net/sfc/efx/base/efx_bootcfg.c\nnew file mode 100644\nindex 0000000..d589c86\n--- /dev/null\n+++ b/drivers/net/sfc/efx/base/efx_bootcfg.c\n@@ -0,0 +1,563 @@\n+/*\n+ * Copyright (c) 2009-2016 Solarflare Communications Inc.\n+ * All rights reserved.\n+ *\n+ * Redistribution and use in source and binary forms, with or without\n+ * modification, are permitted provided that the following conditions are met:\n+ *\n+ * 1. Redistributions of source code must retain the above copyright notice,\n+ * this list of conditions and the following disclaimer.\n+ * 2. Redistributions in binary form must reproduce the above copyright notice,\n+ * this list of conditions and the following disclaimer in the documentation\n+ * and/or other materials provided with the distribution.\n+ *\n+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\n+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,\n+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\n+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR\n+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,\n+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,\n+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;\n+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,\n+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR\n+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,\n+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n+ *\n+ * The views and conclusions contained in the software and documentation are\n+ * those of the authors and should not be interpreted as representing official\n+ * policies, either expressed or implied, of the FreeBSD Project.\n+ */\n+\n+#include \"efx.h\"\n+#include \"efx_impl.h\"\n+\n+#if EFSYS_OPT_BOOTCFG\n+\n+/*\n+ * Maximum size of BOOTCFG block across all nics as understood by SFCgPXE.\n+ * NOTE: This is larger than the Medford per-PF bootcfg sector.\n+ */\n+#define\tBOOTCFG_MAX_SIZE 0x1000\n+\n+/* Medford per-PF bootcfg sector */\n+#define\tBOOTCFG_PER_PF 0x800\n+#define\tBOOTCFG_PF_COUNT 16\n+\n+#define\tDHCP_END ((uint8_t)0xff)\n+#define\tDHCP_PAD ((uint8_t)0)\n+\n+\n+/* Report the layout of bootcfg sectors in NVRAM partition. */\n+\t__checkReturn\t\tefx_rc_t\n+efx_bootcfg_sector_info(\n+\t__in\t\t\tefx_nic_t *enp,\n+\t__in\t\t\tuint32_t pf,\n+\t__out_opt\t\tuint32_t *sector_countp,\n+\t__out\t\t\tsize_t *offsetp,\n+\t__out\t\t\tsize_t *max_sizep)\n+{\n+\tuint32_t count;\n+\tsize_t max_size;\n+\tsize_t offset;\n+\tint rc;\n+\n+\tswitch (enp->en_family) {\n+#if EFSYS_OPT_SIENA\n+\tcase EFX_FAMILY_SIENA:\n+\t\tmax_size = BOOTCFG_MAX_SIZE;\n+\t\toffset = 0;\n+\t\tcount = 1;\n+\t\tbreak;\n+#endif /* EFSYS_OPT_SIENA */\n+\n+#if EFSYS_OPT_HUNTINGTON\n+\tcase EFX_FAMILY_HUNTINGTON:\n+\t\tmax_size = BOOTCFG_MAX_SIZE;\n+\t\toffset = 0;\n+\t\tcount = 1;\n+\t\tbreak;\n+#endif /* EFSYS_OPT_HUNTINGTON */\n+\n+#if EFSYS_OPT_MEDFORD\n+\tcase EFX_FAMILY_MEDFORD: {\n+\t\t/* Shared partition (array indexed by PF) */\n+\t\tmax_size = BOOTCFG_PER_PF;\n+\t\tcount = BOOTCFG_PF_COUNT;\n+\t\tif (pf >= count) {\n+\t\t\trc = EINVAL;\n+\t\t\tgoto fail2;\n+\t\t}\n+\t\toffset = max_size * pf;\n+\t\tbreak;\n+\t}\n+#endif /* EFSYS_OPT_MEDFORD */\n+\n+\tdefault:\n+\t\tEFSYS_ASSERT(0);\n+\t\trc = ENOTSUP;\n+\t\tgoto fail1;\n+\t}\n+\tEFSYS_ASSERT3U(max_size, <=, BOOTCFG_MAX_SIZE);\n+\n+\tif (sector_countp != NULL)\n+\t\t*sector_countp = count;\n+\t*offsetp = offset;\n+\t*max_sizep = max_size;\n+\n+\treturn (0);\n+\n+#if EFSYS_OPT_MEDFORD\n+fail2:\n+\tEFSYS_PROBE(fail2);\n+#endif\n+fail1:\n+\tEFSYS_PROBE1(fail1, efx_rc_t, rc);\n+\treturn (rc);\n+}\n+\n+\n+static\t__checkReturn\t\tuint8_t\n+efx_bootcfg_csum(\n+\t__in\t\t\tefx_nic_t *enp,\n+\t__in_bcount(size)\tuint8_t const *data,\n+\t__in\t\t\tsize_t size)\n+{\n+\t_NOTE(ARGUNUSED(enp))\n+\n+\tunsigned int pos;\n+\tuint8_t checksum = 0;\n+\n+\tfor (pos = 0; pos < size; pos++)\n+\t\tchecksum += data[pos];\n+\treturn (checksum);\n+}\n+\n+static\t__checkReturn\t\tefx_rc_t\n+efx_bootcfg_verify(\n+\t__in\t\t\tefx_nic_t *enp,\n+\t__in_bcount(size)\tuint8_t const *data,\n+\t__in\t\t\tsize_t size,\n+\t__out_opt\t\tsize_t *usedp)\n+{\n+\tsize_t offset = 0;\n+\tsize_t used = 0;\n+\tefx_rc_t rc;\n+\n+\t/* Start parsing tags immediately after the checksum */\n+\tfor (offset = 1; offset < size; ) {\n+\t\tuint8_t tag;\n+\t\tuint8_t length;\n+\n+\t\t/* Consume tag */\n+\t\ttag = data[offset];\n+\t\tif (tag == DHCP_END) {\n+\t\t\toffset++;\n+\t\t\tused = offset;\n+\t\t\tbreak;\n+\t\t}\n+\t\tif (tag == DHCP_PAD) {\n+\t\t\toffset++;\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\t/* Consume length */\n+\t\tif (offset + 1 >= size) {\n+\t\t\trc = ENOSPC;\n+\t\t\tgoto fail1;\n+\t\t}\n+\t\tlength = data[offset + 1];\n+\n+\t\t/* Consume *length */\n+\t\tif (offset + 1 + length >= size) {\n+\t\t\trc = ENOSPC;\n+\t\t\tgoto fail2;\n+\t\t}\n+\n+\t\toffset += 2 + length;\n+\t\tused = offset;\n+\t}\n+\n+\t/* Checksum the entire sector, including bytes after any DHCP_END */\n+\tif (efx_bootcfg_csum(enp, data, size) != 0) {\n+\t\trc = EINVAL;\n+\t\tgoto fail3;\n+\t}\n+\n+\tif (usedp != NULL)\n+\t\t*usedp = used;\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+/*\n+ * Copy bootcfg sector data to a target buffer which may differ in size.\n+ * Optionally corrects format errors in source buffer.\n+ */\n+\t\t\t\tefx_rc_t\n+efx_bootcfg_copy_sector(\n+\t__in\t\t\tefx_nic_t *enp,\n+\t__inout_bcount(sector_length)\n+\t\t\t\tuint8_t *sector,\n+\t__in\t\t\tsize_t sector_length,\n+\t__out_bcount(data_size)\tuint8_t *data,\n+\t__in\t\t\tsize_t data_size,\n+\t__in\t\t\tboolean_t handle_format_errors)\n+{\n+\tsize_t used_bytes;\n+\tefx_rc_t rc;\n+\n+\t/* Verify that the area is correctly formatted and checksummed */\n+\trc = efx_bootcfg_verify(enp, sector, sector_length,\n+\t\t\t\t &used_bytes);\n+\n+\tif (!handle_format_errors) {\n+\t\tif (rc != 0)\n+\t\t\tgoto fail1;\n+\n+\t\tif ((used_bytes < 2) ||\n+\t\t (sector[used_bytes - 1] != DHCP_END)) {\n+\t\t\t/* Block too short, or DHCP_END missing */\n+\t\t\trc = ENOENT;\n+\t\t\tgoto fail2;\n+\t\t}\n+\t}\n+\n+\t/* Synthesize empty format on verification failure */\n+\tif (rc != 0 || used_bytes == 0) {\n+\t\tsector[0] = 0;\n+\t\tsector[1] = DHCP_END;\n+\t\tused_bytes = 2;\n+\t}\n+\tEFSYS_ASSERT(used_bytes >= 2);\t/* checksum and DHCP_END */\n+\tEFSYS_ASSERT(used_bytes <= sector_length);\n+\tEFSYS_ASSERT(sector_length >= 2);\n+\n+\t/*\n+\t * Legacy bootcfg sectors don't terminate with a DHCP_END character.\n+\t * Modify the returned payload so it does.\n+\t * Reinitialise the sector if there isn't room for the character.\n+\t */\n+\tif (sector[used_bytes - 1] != DHCP_END) {\n+\t\tif (used_bytes >= sector_length) {\n+\t\t\tsector[0] = 0;\n+\t\t\tused_bytes = 1;\n+\t\t}\n+\t\tsector[used_bytes] = DHCP_END;\n+\t\t++used_bytes;\n+\t}\n+\n+\t/*\n+\t * Verify that the target buffer is large enough for the\n+\t * entire used bootcfg area, then copy into the target buffer.\n+\t */\n+\tif (used_bytes > data_size) {\n+\t\trc = ENOSPC;\n+\t\tgoto fail3;\n+\t}\n+\tmemcpy(data, sector, used_bytes);\n+\n+\t/* Zero out the unused portion of the target buffer */\n+\tif (used_bytes < data_size)\n+\t\t(void) memset(data + used_bytes, 0, data_size - used_bytes);\n+\n+\t/*\n+\t * The checksum includes trailing data after any DHCP_END character,\n+\t * which we've just modified (by truncation or appending DHCP_END).\n+\t */\n+\tdata[0] -= efx_bootcfg_csum(enp, data, data_size);\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+\t\t\t\tefx_rc_t\n+efx_bootcfg_read(\n+\t__in\t\t\tefx_nic_t *enp,\n+\t__out_bcount(size)\tcaddr_t data,\n+\t__in\t\t\tsize_t size)\n+{\n+\tuint8_t *payload = NULL;\n+\tsize_t used_bytes;\n+\tsize_t partn_length;\n+\tsize_t sector_length;\n+\tsize_t sector_offset;\n+\tefx_rc_t rc;\n+\tuint32_t sector_number;\n+\n+#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD\n+\tsector_number = enp->en_nic_cfg.enc_pf;\n+#else\n+\tsector_number = 0;\n+#endif\n+\trc = efx_nvram_size(enp, EFX_NVRAM_BOOTROM_CFG, &partn_length);\n+\tif (rc != 0)\n+\t\tgoto fail1;\n+\n+\t/* The bootcfg sector may be stored in a (larger) shared partition */\n+\trc = efx_bootcfg_sector_info(enp, sector_number,\n+\t NULL, §or_offset, §or_length);\n+\tif (rc != 0)\n+\t\tgoto fail2;\n+\n+\tif (sector_length > BOOTCFG_MAX_SIZE)\n+\t\tsector_length = BOOTCFG_MAX_SIZE;\n+\n+\tif (sector_offset + sector_length > partn_length) {\n+\t\t/* Partition is too small */\n+\t\trc = EFBIG;\n+\t\tgoto fail3;\n+\t}\n+\n+\t/*\n+\t * We need to read the entire BOOTCFG sector to ensure we read all the\n+\t * tags, because legacy bootcfg sectors are not guaranteed to end with\n+\t * a DHCP_END character. If the user hasn't supplied a sufficiently\n+\t * large buffer then use our own buffer.\n+\t */\n+\tif (sector_length > size) {\n+\t\tEFSYS_KMEM_ALLOC(enp->en_esip, sector_length, payload);\n+\t\tif (payload == NULL) {\n+\t\t\trc = ENOMEM;\n+\t\t\tgoto fail4;\n+\t\t}\n+\t} else\n+\t\tpayload = (uint8_t *)data;\n+\n+\tif ((rc = efx_nvram_rw_start(enp, EFX_NVRAM_BOOTROM_CFG, NULL)) != 0)\n+\t\tgoto fail5;\n+\n+\tif ((rc = efx_nvram_read_chunk(enp, EFX_NVRAM_BOOTROM_CFG,\n+\t sector_offset, (caddr_t)payload, sector_length)) != 0) {\n+\t\t(void) efx_nvram_rw_finish(enp, EFX_NVRAM_BOOTROM_CFG);\n+\t\tgoto fail6;\n+\t}\n+\n+\tif ((rc = efx_nvram_rw_finish(enp, EFX_NVRAM_BOOTROM_CFG)) != 0)\n+\t\tgoto fail7;\n+\n+\t/* Verify that the area is correctly formatted and checksummed */\n+\trc = efx_bootcfg_verify(enp, (caddr_t)payload, sector_length,\n+\t &used_bytes);\n+\tif (rc != 0 || used_bytes == 0) {\n+\t\tpayload[0] = (uint8_t)~DHCP_END;\n+\t\tpayload[1] = DHCP_END;\n+\t\tused_bytes = 2;\n+\t}\n+\n+\tEFSYS_ASSERT(used_bytes >= 2);\t/* checksum and DHCP_END */\n+\tEFSYS_ASSERT(used_bytes <= sector_length);\n+\n+\t/*\n+\t * Legacy bootcfg sectors don't terminate with a DHCP_END character.\n+\t * Modify the returned payload so it does. BOOTCFG_MAX_SIZE is by\n+\t * definition large enough for any valid (per-port) bootcfg sector,\n+\t * so reinitialise the sector if there isn't room for the character.\n+\t */\n+\tif (payload[used_bytes - 1] != DHCP_END) {\n+\t\tif (used_bytes + 1 > sector_length) {\n+\t\t\tpayload[0] = 0;\n+\t\t\tused_bytes = 1;\n+\t\t}\n+\n+\t\tpayload[used_bytes] = DHCP_END;\n+\t\t++used_bytes;\n+\t}\n+\n+\t/*\n+\t * Verify that the user supplied buffer is large enough for the\n+\t * entire used bootcfg area, then copy into the user supplied buffer.\n+\t */\n+\tif (used_bytes > size) {\n+\t\trc = ENOSPC;\n+\t\tgoto fail8;\n+\t}\n+\tif (sector_length > size) {\n+\t\tmemcpy(data, payload, used_bytes);\n+\t\tEFSYS_KMEM_FREE(enp->en_esip, sector_length, payload);\n+\t}\n+\n+\t/* Zero out the unused portion of the user buffer */\n+\tif (used_bytes < size)\n+\t\t(void) memset(data + used_bytes, 0, size - used_bytes);\n+\n+\t/*\n+\t * The checksum includes trailing data after any DHCP_END character,\n+\t * which we've just modified (by truncation or appending DHCP_END).\n+\t */\n+\tdata[0] -= efx_bootcfg_csum(enp, data, size);\n+\n+\treturn (0);\n+\n+fail8:\n+\tEFSYS_PROBE(fail8);\n+fail7:\n+\tEFSYS_PROBE(fail7);\n+fail6:\n+\tEFSYS_PROBE(fail6);\n+fail5:\n+\tEFSYS_PROBE(fail5);\n+\tif (sector_length > size)\n+\t\tEFSYS_KMEM_FREE(enp->en_esip, sector_length, payload);\n+fail4:\n+\tEFSYS_PROBE(fail4);\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+\t\t\t\tefx_rc_t\n+efx_bootcfg_write(\n+\t__in\t\t\tefx_nic_t *enp,\n+\t__in_bcount(size)\tcaddr_t data,\n+\t__in\t\t\tsize_t size)\n+{\n+\tuint8_t *partn_data;\n+\tuint8_t checksum;\n+\tsize_t partn_length;\n+\tsize_t sector_length;\n+\tsize_t sector_offset;\n+\tsize_t used_bytes;\n+\tefx_rc_t rc;\n+\tuint32_t sector_number;\n+\n+#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD\n+\tsector_number = enp->en_nic_cfg.enc_pf;\n+#else\n+\tsector_number = 0;\n+#endif\n+\n+\trc = efx_nvram_size(enp, EFX_NVRAM_BOOTROM_CFG, &partn_length);\n+\tif (rc != 0)\n+\t\tgoto fail1;\n+\n+\t/* The bootcfg sector may be stored in a (larger) shared partition */\n+\trc = efx_bootcfg_sector_info(enp, sector_number,\n+\t NULL, §or_offset, §or_length);\n+\tif (rc != 0)\n+\t\tgoto fail2;\n+\n+\tif (sector_length > BOOTCFG_MAX_SIZE)\n+\t\tsector_length = BOOTCFG_MAX_SIZE;\n+\n+\tif (sector_offset + sector_length > partn_length) {\n+\t\t/* Partition is too small */\n+\t\trc = EFBIG;\n+\t\tgoto fail3;\n+\t}\n+\n+\tif ((rc = efx_bootcfg_verify(enp, data, size, &used_bytes)) != 0)\n+\t\tgoto fail4;\n+\n+\t/* The caller *must* terminate their block with a DHCP_END character */\n+\tif ((used_bytes < 2) || ((uint8_t)data[used_bytes - 1] != DHCP_END)) {\n+\t\t/* Block too short or DHCP_END missing */\n+\t\trc = ENOENT;\n+\t\tgoto fail5;\n+\t}\n+\n+\t/* Check that the hardware has support for this much data */\n+\tif (used_bytes > MIN(sector_length, BOOTCFG_MAX_SIZE)) {\n+\t\trc = ENOSPC;\n+\t\tgoto fail6;\n+\t}\n+\n+\t/*\n+\t * If the BOOTCFG sector is stored in a shared partition, then we must\n+\t * read the whole partition and insert the updated bootcfg sector at the\n+\t * correct offset.\n+\t */\n+\tEFSYS_KMEM_ALLOC(enp->en_esip, partn_length, partn_data);\n+\tif (partn_data == NULL) {\n+\t\trc = ENOMEM;\n+\t\tgoto fail7;\n+\t}\n+\n+\trc = efx_nvram_rw_start(enp, EFX_NVRAM_BOOTROM_CFG, NULL);\n+\tif (rc != 0)\n+\t\tgoto fail8;\n+\n+\t/* Read the entire partition */\n+\trc = efx_nvram_read_chunk(enp, EFX_NVRAM_BOOTROM_CFG, 0,\n+\t\t\t\t (caddr_t)partn_data, partn_length);\n+\tif (rc != 0)\n+\t\tgoto fail9;\n+\n+\t/*\n+\t * Insert the BOOTCFG sector into the partition, Zero out all data after\n+\t * the DHCP_END tag, and adjust the checksum.\n+\t */\n+\t(void) memset(partn_data + sector_offset, 0x0, sector_length);\n+\t(void) memcpy(partn_data + sector_offset, data, used_bytes);\n+\n+\tchecksum = efx_bootcfg_csum(enp, data, used_bytes);\n+\tpartn_data[sector_offset] -= checksum;\n+\n+\tif ((rc = efx_nvram_erase(enp, EFX_NVRAM_BOOTROM_CFG)) != 0)\n+\t\tgoto fail10;\n+\n+\tif ((rc = efx_nvram_write_chunk(enp, EFX_NVRAM_BOOTROM_CFG,\n+\t\t 0, (caddr_t)partn_data, partn_length)) != 0)\n+\t\tgoto fail11;\n+\n+\tif ((rc = efx_nvram_rw_finish(enp, EFX_NVRAM_BOOTROM_CFG)) != 0)\n+\t\tgoto fail12;\n+\n+\tEFSYS_KMEM_FREE(enp->en_esip, partn_length, partn_data);\n+\n+\treturn (0);\n+\n+fail12:\n+\tEFSYS_PROBE(fail12);\n+fail11:\n+\tEFSYS_PROBE(fail11);\n+fail10:\n+\tEFSYS_PROBE(fail10);\n+fail9:\n+\tEFSYS_PROBE(fail9);\n+\n+\t(void) efx_nvram_rw_finish(enp, EFX_NVRAM_BOOTROM_CFG);\n+fail8:\n+\tEFSYS_PROBE(fail8);\n+\n+\tEFSYS_KMEM_FREE(enp->en_esip, partn_length, partn_data);\n+fail7:\n+\tEFSYS_PROBE(fail7);\n+fail6:\n+\tEFSYS_PROBE(fail6);\n+fail5:\n+\tEFSYS_PROBE(fail5);\n+fail4:\n+\tEFSYS_PROBE(fail4);\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+#endif\t/* EFSYS_OPT_BOOTCFG */\ndiff --git a/drivers/net/sfc/efx/base/efx_check.h b/drivers/net/sfc/efx/base/efx_check.h\nindex bd0a482..5ab4df9 100644\n--- a/drivers/net/sfc/efx/base/efx_check.h\n+++ b/drivers/net/sfc/efx/base/efx_check.h\n@@ -45,6 +45,13 @@\n # error \"FALCON is obsolete and is not supported.\"\n #endif\n \n+#if EFSYS_OPT_BOOTCFG\n+/* Support NVRAM based boot config */\n+# if !EFSYS_OPT_NVRAM\n+# error \"BOOTCFG requires NVRAM\"\n+# endif\n+#endif /* EFSYS_OPT_BOOTCFG */\n+\n #if EFSYS_OPT_CHECK_REG\n /* Verify chip implements accessed registers */\n # if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD)\n", "prefixes": [ "dpdk-dev", "28/56" ] }