From: Andrew Rybchenko <arybchenko@solarflare.com>
To: <dev@dpdk.org>
Cc: Richard Houldsworth <rhouldsworth@solarflare.com>
Subject: [dpdk-dev] [PATCH 12/29] net/sfc/base: support direct FW update for bundle partitions
Date: Mon, 10 Jun 2019 08:38:27 +0100 [thread overview]
Message-ID: <1560152324-20538-13-git-send-email-arybchenko@solarflare.com> (raw)
In-Reply-To: <1560152324-20538-1-git-send-email-arybchenko@solarflare.com>
From: Richard Houldsworth <rhouldsworth@solarflare.com>
All signed images other than for the MCFW partition should
be written fully to the partition with no rearrangement.
Signed-off-by: Richard Houldsworth <rhouldsworth@solarflare.com>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
drivers/net/sfc/base/ef10_image.c | 74 ++++++++++++++++++++++++---------------
drivers/net/sfc/base/efx.h | 1 +
2 files changed, 47 insertions(+), 28 deletions(-)
diff --git a/drivers/net/sfc/base/ef10_image.c b/drivers/net/sfc/base/ef10_image.c
index c035e0d..a19df7f 100644
--- a/drivers/net/sfc/base/ef10_image.c
+++ b/drivers/net/sfc/base/ef10_image.c
@@ -7,6 +7,8 @@
#include "efx.h"
#include "efx_impl.h"
+#include "ef10_firmware_ids.h"
+
#if EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2
#if EFSYS_OPT_IMAGE_LAYOUT
@@ -429,54 +431,59 @@
static __checkReturn efx_rc_t
efx_check_unsigned_image(
- __in void *bufferp,
- __in uint32_t buffer_size)
+ __in void *bufferp,
+ __in uint32_t buffer_size,
+ __out efx_image_header_t **headerpp,
+ __out efx_image_trailer_t **trailerpp)
{
- efx_image_header_t *header;
- efx_image_trailer_t *trailer;
+ efx_image_header_t *headerp;
+ efx_image_trailer_t *trailerp;
uint32_t crc;
efx_rc_t rc;
- EFX_STATIC_ASSERT(sizeof (*header) == EFX_IMAGE_HEADER_SIZE);
- EFX_STATIC_ASSERT(sizeof (*trailer) == EFX_IMAGE_TRAILER_SIZE);
+ EFX_STATIC_ASSERT(sizeof (*headerp) == EFX_IMAGE_HEADER_SIZE);
+ EFX_STATIC_ASSERT(sizeof (*trailerp) == EFX_IMAGE_TRAILER_SIZE);
/* Must have at least enough space for required image header fields */
if (buffer_size < (EFX_FIELD_OFFSET(efx_image_header_t, eih_size) +
- sizeof (header->eih_size))) {
+ sizeof (headerp->eih_size))) {
rc = ENOSPC;
goto fail1;
}
- header = (efx_image_header_t *)bufferp;
+ headerp = (efx_image_header_t *)bufferp;
- if (header->eih_magic != EFX_IMAGE_HEADER_MAGIC) {
- rc = EINVAL;
+ /* Buffer must have space for image header, code and image trailer. */
+ if (buffer_size < (headerp->eih_size + headerp->eih_code_size +
+ EFX_IMAGE_TRAILER_SIZE)) {
+ rc = ENOSPC;
goto fail2;
}
+ trailerp = (efx_image_trailer_t *)((uint8_t *)headerp +
+ headerp->eih_size + headerp->eih_code_size);
+
+ *headerpp = headerp;
+ *trailerpp = trailerp;
+
+ if (headerp->eih_magic != EFX_IMAGE_HEADER_MAGIC) {
+ rc = EINVAL;
+ goto fail3;
+ }
+
/*
* Check image header version is same or higher than lowest required
* version.
*/
- if (header->eih_version < EFX_IMAGE_HEADER_VERSION) {
+ if (headerp->eih_version < EFX_IMAGE_HEADER_VERSION) {
rc = EINVAL;
- goto fail3;
- }
-
- /* Buffer must have space for image header, code and image trailer. */
- if (buffer_size < (header->eih_size + header->eih_code_size +
- EFX_IMAGE_TRAILER_SIZE)) {
- rc = ENOSPC;
goto fail4;
}
/* Check CRC from image buffer matches computed CRC. */
- trailer = (efx_image_trailer_t *)((uint8_t *)header +
- header->eih_size + header->eih_code_size);
+ crc = efx_crc32_calculate(0, (uint8_t *)headerp,
+ (headerp->eih_size + headerp->eih_code_size));
- crc = efx_crc32_calculate(0, (uint8_t *)header,
- (header->eih_size + header->eih_code_size));
-
- if (trailer->eit_crc != crc) {
+ if (trailerp->eit_crc != crc) {
rc = EINVAL;
goto fail5;
}
@@ -507,9 +514,10 @@
uint32_t image_offset;
uint32_t image_size;
void *imagep;
+ efx_image_header_t *headerp;
+ efx_image_trailer_t *trailerp;
efx_rc_t rc;
-
EFSYS_ASSERT(infop != NULL);
if (infop == NULL) {
rc = EINVAL;
@@ -531,7 +539,7 @@
if (rc == 0) {
/*
* Buffer holds signed image format. Check that the encapsulated
- * content is in unsigned image format.
+ * content contains an unsigned image format header.
*/
format = EFX_IMAGE_FORMAT_SIGNED;
} else {
@@ -546,11 +554,21 @@
}
imagep = (uint8_t *)bufferp + image_offset;
- /* Check unsigned image layout (image header, code, image trailer) */
- rc = efx_check_unsigned_image(imagep, image_size);
+ /* Check image layout (image header, code, image trailer) */
+ rc = efx_check_unsigned_image(imagep, image_size, &headerp, &trailerp);
if (rc != 0)
goto fail4;
+ /*
+ * Signed images are packages consumed directly by the firmware,
+ * with the exception of MC firmware, where the image must be
+ * rearranged for booting purposes.
+ */
+ if (format == EFX_IMAGE_FORMAT_SIGNED) {
+ if (headerp->eih_type != FIRMWARE_TYPE_MCFW)
+ format = EFX_IMAGE_FORMAT_SIGNED_PACKAGE;
+ }
+
/* Return image details */
infop->eii_format = format;
infop->eii_imagep = bufferp;
diff --git a/drivers/net/sfc/base/efx.h b/drivers/net/sfc/base/efx.h
index 4905918..d46e650 100644
--- a/drivers/net/sfc/base/efx.h
+++ b/drivers/net/sfc/base/efx.h
@@ -1889,6 +1889,7 @@ enum {
EFX_IMAGE_FORMAT_INVALID,
EFX_IMAGE_FORMAT_UNSIGNED,
EFX_IMAGE_FORMAT_SIGNED,
+ EFX_IMAGE_FORMAT_SIGNED_PACKAGE
} efx_image_format_t;
typedef struct efx_image_info_s {
--
1.8.3.1
next prev parent reply other threads:[~2019-06-10 7:39 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-10 7:38 [dpdk-dev] [PATCH 00/29] net/sfc/base: update base driver Andrew Rybchenko
2019-06-10 7:38 ` [dpdk-dev] [PATCH 01/29] net/sfc/base: enable chained multicast on all EF10 cards Andrew Rybchenko
2019-06-10 7:38 ` [dpdk-dev] [PATCH 02/29] net/sfc/base: fix signed/unsigned mismatch errors Andrew Rybchenko
2019-06-10 7:38 ` [dpdk-dev] [PATCH 03/29] net/sfc/base: fix shift by more bits than field width Andrew Rybchenko
2019-06-10 7:38 ` [dpdk-dev] [PATCH 04/29] net/sfc/base: improve code style in sensors decoding Andrew Rybchenko
2019-06-10 7:38 ` [dpdk-dev] [PATCH 05/29] net/sfc/base: do not rely on indirect header inclusion Andrew Rybchenko
2019-06-10 7:38 ` [dpdk-dev] [PATCH 06/29] net/sfc/base: add driver version string registration Andrew Rybchenko
2019-06-10 7:38 ` [dpdk-dev] [PATCH 07/29] net/sfc/base: add capabilities for bundle partition support Andrew Rybchenko
2019-06-10 7:38 ` [dpdk-dev] [PATCH 08/29] net/sfc/base: add extensible NVRAM info function Andrew Rybchenko
2019-06-10 7:38 ` [dpdk-dev] [PATCH 09/29] net/sfc/base: add NVRAM info to API Andrew Rybchenko
2019-06-10 7:38 ` [dpdk-dev] [PATCH 10/29] net/sfc/base: update MCDI headers Andrew Rybchenko
2019-06-10 7:38 ` [dpdk-dev] [PATCH 11/29] net/sfc/base: add firmware ID header Andrew Rybchenko
2019-06-10 7:38 ` Andrew Rybchenko [this message]
2019-06-10 7:38 ` [dpdk-dev] [PATCH 13/29] net/sfc/base: transition to the extensible NVRAM info API Andrew Rybchenko
2019-06-10 7:38 ` [dpdk-dev] [PATCH 14/29] net/sfc/base: add background mode firmware updating Andrew Rybchenko
2019-06-10 7:38 ` [dpdk-dev] [PATCH 15/29] net/sfc/base: add definition of bundle metadata partition Andrew Rybchenko
2019-06-10 7:38 ` [dpdk-dev] [PATCH 16/29] net/sfc/base: add definition of OEM TLV Andrew Rybchenko
2019-06-10 7:38 ` [dpdk-dev] [PATCH 17/29] net/sfc/base: export the zero-based MCDI port number Andrew Rybchenko
2019-06-10 7:38 ` [dpdk-dev] [PATCH 18/29] net/sfc/base: introduce of EVB module for SR-IOV support Andrew Rybchenko
2019-06-10 7:38 ` [dpdk-dev] [PATCH 19/29] net/sfc/base: add MCDI wrappers for vPort and vSwitch in EVB Andrew Rybchenko
2019-06-10 7:38 ` [dpdk-dev] [PATCH 20/29] net/sfc/base: add EVB module vSwitch/vPort/vAdaptor ops Andrew Rybchenko
2019-06-10 7:38 ` [dpdk-dev] [PATCH 21/29] net/sfc/base: implement vSwitch create/destroy Andrew Rybchenko
2019-06-10 7:38 ` [dpdk-dev] [PATCH 22/29] net/sfc/base: factor out upstream port vAdaptor allocation Andrew Rybchenko
2019-06-10 7:38 ` [dpdk-dev] [PATCH 23/29] net/sfc/base: support data path with EVB module Andrew Rybchenko
2019-06-10 7:38 ` [dpdk-dev] [PATCH 24/29] net/sfc/base: support proxy auth operations for SR-IOV Andrew Rybchenko
2019-06-10 7:38 ` [dpdk-dev] [PATCH 25/29] net/sfc/base: implement proxy auth MCDI event handling Andrew Rybchenko
2019-06-10 7:38 ` [dpdk-dev] [PATCH 26/29] net/sfc/base: provide proxy APIs to client drivers Andrew Rybchenko
2019-06-10 7:38 ` [dpdk-dev] [PATCH 27/29] net/sfc/base: provide APIs to configure and reset vPort Andrew Rybchenko
2019-06-10 7:38 ` [dpdk-dev] [PATCH 28/29] net/sfc/base: provide API to fetch vPort statistics Andrew Rybchenko
2019-06-10 7:38 ` [dpdk-dev] [PATCH 29/29] net/sfc/base: add APIs for PTP privilege configuration Andrew Rybchenko
2019-06-18 7:52 ` [dpdk-dev] [PATCH 00/29] net/sfc/base: update base driver Ferruh Yigit
2019-06-23 22:37 ` Thomas Monjalon
2019-06-24 7:53 ` Andrew Rybchenko
2019-06-24 11:17 ` Ferruh Yigit
2019-06-24 13:07 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1560152324-20538-13-git-send-email-arybchenko@solarflare.com \
--to=arybchenko@solarflare.com \
--cc=dev@dpdk.org \
--cc=rhouldsworth@solarflare.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).