From: Andrew Rybchenko <arybchenko@solarflare.com>
To: <dev@dpdk.org>
Cc: Andy Moreton <amoreton@solarflare.com>
Subject: [dpdk-dev] [PATCH 05/53] net/sfc/base: report verify result from RW finish callback
Date: Thu, 16 Nov 2017 08:03:53 +0000 [thread overview]
Message-ID: <1510819481-6809-6-git-send-email-arybchenko@solarflare.com> (raw)
In-Reply-To: <1510819481-6809-1-git-send-email-arybchenko@solarflare.com>
From: Andy Moreton <amoreton@solarflare.com>
This makes the verify result visible to efx_nvram_rw_finish(), which
can be extended to report it in a later patch.
Signed-off-by: Andy Moreton <amoreton@solarflare.com>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
drivers/net/sfc/base/ef10_impl.h | 3 ++-
drivers/net/sfc/base/ef10_nvram.c | 13 +++++++------
drivers/net/sfc/base/efx_impl.h | 5 +++--
drivers/net/sfc/base/efx_nvram.c | 21 +++++++++++----------
drivers/net/sfc/base/siena_impl.h | 6 ++++--
drivers/net/sfc/base/siena_nvram.c | 12 +++++++-----
drivers/net/sfc/base/siena_vpd.c | 4 ++--
7 files changed, 36 insertions(+), 28 deletions(-)
diff --git a/drivers/net/sfc/base/ef10_impl.h b/drivers/net/sfc/base/ef10_impl.h
index 8f9eb7a..4624113 100644
--- a/drivers/net/sfc/base/ef10_impl.h
+++ b/drivers/net/sfc/base/ef10_impl.h
@@ -460,7 +460,8 @@ ef10_nvram_partn_write(
extern __checkReturn efx_rc_t
ef10_nvram_partn_rw_finish(
__in efx_nic_t *enp,
- __in uint32_t partn);
+ __in uint32_t partn,
+ __out_opt uint32_t *verify_resultp);
extern __checkReturn efx_rc_t
ef10_nvram_partn_get_version(
diff --git a/drivers/net/sfc/base/ef10_nvram.c b/drivers/net/sfc/base/ef10_nvram.c
index 3f9d375..0d742ab 100644
--- a/drivers/net/sfc/base/ef10_nvram.c
+++ b/drivers/net/sfc/base/ef10_nvram.c
@@ -2047,15 +2047,15 @@ ef10_nvram_partn_write(
ef10_nvram_partn_unlock(
__in efx_nic_t *enp,
__in uint32_t partn,
- __out_opt uint32_t *resultp)
+ __out_opt uint32_t *verify_resultp)
{
boolean_t reboot = B_FALSE;
efx_rc_t rc;
- if (resultp != NULL)
- *resultp = MC_CMD_NVRAM_VERIFY_RC_UNKNOWN;
+ if (verify_resultp != NULL)
+ *verify_resultp = MC_CMD_NVRAM_VERIFY_RC_UNKNOWN;
- rc = efx_mcdi_nvram_update_finish(enp, partn, reboot, resultp);
+ rc = efx_mcdi_nvram_update_finish(enp, partn, reboot, verify_resultp);
if (rc != 0)
goto fail1;
@@ -2365,11 +2365,12 @@ ef10_nvram_partn_rw_start(
__checkReturn efx_rc_t
ef10_nvram_partn_rw_finish(
__in efx_nic_t *enp,
- __in uint32_t partn)
+ __in uint32_t partn,
+ __out_opt uint32_t *verify_resultp)
{
efx_rc_t rc;
- if ((rc = ef10_nvram_partn_unlock(enp, partn, NULL)) != 0)
+ if ((rc = ef10_nvram_partn_unlock(enp, partn, verify_resultp)) != 0)
goto fail1;
return (0);
diff --git a/drivers/net/sfc/base/efx_impl.h b/drivers/net/sfc/base/efx_impl.h
index 53fa37a..6cb015a 100644
--- a/drivers/net/sfc/base/efx_impl.h
+++ b/drivers/net/sfc/base/efx_impl.h
@@ -475,7 +475,8 @@ typedef struct efx_nvram_ops_s {
unsigned int, size_t);
efx_rc_t (*envo_partn_write)(efx_nic_t *, uint32_t,
unsigned int, caddr_t, size_t);
- efx_rc_t (*envo_partn_rw_finish)(efx_nic_t *, uint32_t);
+ efx_rc_t (*envo_partn_rw_finish)(efx_nic_t *, uint32_t,
+ uint32_t *);
efx_rc_t (*envo_partn_get_version)(efx_nic_t *, uint32_t,
uint32_t *, uint16_t *);
efx_rc_t (*envo_partn_set_version)(efx_nic_t *, uint32_t,
@@ -564,7 +565,7 @@ efx_mcdi_nvram_update_finish(
__in efx_nic_t *enp,
__in uint32_t partn,
__in boolean_t reboot,
- __out_opt uint32_t *resultp);
+ __out_opt uint32_t *verify_resultp);
#if EFSYS_OPT_DIAG
diff --git a/drivers/net/sfc/base/efx_nvram.c b/drivers/net/sfc/base/efx_nvram.c
index 7d4c9a0..773bc10 100644
--- a/drivers/net/sfc/base/efx_nvram.c
+++ b/drivers/net/sfc/base/efx_nvram.c
@@ -366,6 +366,7 @@ efx_nvram_rw_finish(
{
const efx_nvram_ops_t *envop = enp->en_envop;
uint32_t partn;
+ uint32_t verify_result;
efx_rc_t rc;
EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);
@@ -379,7 +380,7 @@ efx_nvram_rw_finish(
if ((rc = envop->envo_type_to_partn(enp, type, &partn)) != 0)
goto fail1;
- if ((rc = envop->envo_partn_rw_finish(enp, partn)) != 0)
+ if ((rc = envop->envo_partn_rw_finish(enp, partn, &verify_result)) != 0)
goto fail2;
enp->en_nvram_locked = EFX_NVRAM_INVALID;
@@ -915,13 +916,13 @@ efx_mcdi_nvram_update_finish(
__in efx_nic_t *enp,
__in uint32_t partn,
__in boolean_t reboot,
- __out_opt uint32_t *resultp)
+ __out_opt uint32_t *verify_resultp)
{
const efx_nic_cfg_t *encp = &enp->en_nic_cfg;
efx_mcdi_req_t req;
uint8_t payload[MAX(MC_CMD_NVRAM_UPDATE_FINISH_V2_IN_LEN,
MC_CMD_NVRAM_UPDATE_FINISH_V2_OUT_LEN)];
- uint32_t result = MC_CMD_NVRAM_VERIFY_RC_UNKNOWN;
+ uint32_t verify_result = MC_CMD_NVRAM_VERIFY_RC_UNKNOWN;
efx_rc_t rc;
(void) memset(payload, 0, sizeof (payload));
@@ -945,26 +946,26 @@ efx_mcdi_nvram_update_finish(
}
if (req.emr_out_length_used < MC_CMD_NVRAM_UPDATE_FINISH_V2_OUT_LEN) {
- result = MC_CMD_NVRAM_VERIFY_RC_UNKNOWN;
+ verify_result = MC_CMD_NVRAM_VERIFY_RC_UNKNOWN;
if (encp->enc_fw_verified_nvram_update_required) {
/* Mandatory verification result is missing */
rc = EMSGSIZE;
goto fail2;
}
} else {
- result =
+ verify_result =
MCDI_OUT_DWORD(req, NVRAM_UPDATE_FINISH_V2_OUT_RESULT_CODE);
}
if ((encp->enc_fw_verified_nvram_update_required) &&
- (result != MC_CMD_NVRAM_VERIFY_RC_SUCCESS)) {
+ (verify_result != MC_CMD_NVRAM_VERIFY_RC_SUCCESS)) {
/* Mandatory verification failed */
rc = EINVAL;
goto fail3;
}
- if (resultp != NULL)
- *resultp = result;
+ if (verify_resultp != NULL)
+ *verify_resultp = verify_result;
return (0);
@@ -976,8 +977,8 @@ efx_mcdi_nvram_update_finish(
EFSYS_PROBE1(fail1, efx_rc_t, rc);
/* Always report verification result */
- if (resultp != NULL)
- *resultp = result;
+ if (verify_resultp != NULL)
+ *verify_resultp = verify_result;
return (rc);
}
diff --git a/drivers/net/sfc/base/siena_impl.h b/drivers/net/sfc/base/siena_impl.h
index ea6de98..15019f8 100644
--- a/drivers/net/sfc/base/siena_impl.h
+++ b/drivers/net/sfc/base/siena_impl.h
@@ -143,7 +143,8 @@ siena_nvram_partn_lock(
extern __checkReturn efx_rc_t
siena_nvram_partn_unlock(
__in efx_nic_t *enp,
- __in uint32_t partn);
+ __in uint32_t partn,
+ __out_opt uint32_t *verify_resultp);
extern __checkReturn efx_rc_t
siena_nvram_get_dynamic_cfg(
@@ -215,7 +216,8 @@ siena_nvram_partn_write(
extern __checkReturn efx_rc_t
siena_nvram_partn_rw_finish(
__in efx_nic_t *enp,
- __in uint32_t partn);
+ __in uint32_t partn,
+ __out_opt uint32_t *verify_resultp);
extern __checkReturn efx_rc_t
siena_nvram_partn_get_version(
diff --git a/drivers/net/sfc/base/siena_nvram.c b/drivers/net/sfc/base/siena_nvram.c
index af4cf17..bb78ae0 100644
--- a/drivers/net/sfc/base/siena_nvram.c
+++ b/drivers/net/sfc/base/siena_nvram.c
@@ -170,7 +170,8 @@ siena_nvram_partn_write(
__checkReturn efx_rc_t
siena_nvram_partn_unlock(
__in efx_nic_t *enp,
- __in uint32_t partn)
+ __in uint32_t partn,
+ __out_opt uint32_t *verify_resultp)
{
boolean_t reboot;
efx_rc_t rc;
@@ -183,7 +184,7 @@ siena_nvram_partn_unlock(
partn == MC_CMD_NVRAM_TYPE_PHY_PORT1 ||
partn == MC_CMD_NVRAM_TYPE_DISABLED_CALLISTO);
- rc = efx_mcdi_nvram_update_finish(enp, partn, reboot, NULL);
+ rc = efx_mcdi_nvram_update_finish(enp, partn, reboot, verify_resultp);
if (rc != 0)
goto fail1;
@@ -587,11 +588,12 @@ siena_nvram_partn_rw_start(
__checkReturn efx_rc_t
siena_nvram_partn_rw_finish(
__in efx_nic_t *enp,
- __in uint32_t partn)
+ __in uint32_t partn,
+ __out_opt uint32_t *verify_resultp)
{
efx_rc_t rc;
- if ((rc = siena_nvram_partn_unlock(enp, partn)) != 0)
+ if ((rc = siena_nvram_partn_unlock(enp, partn, verify_resultp)) != 0)
goto fail1;
return (0);
@@ -705,7 +707,7 @@ siena_nvram_partn_set_version(
EFSYS_KMEM_FREE(enp->en_esip, length, dcfg);
- siena_nvram_partn_unlock(enp, dcfg_partn);
+ siena_nvram_partn_unlock(enp, dcfg_partn, NULL);
return (0);
diff --git a/drivers/net/sfc/base/siena_vpd.c b/drivers/net/sfc/base/siena_vpd.c
index 4fb2e42..c85ca63 100644
--- a/drivers/net/sfc/base/siena_vpd.c
+++ b/drivers/net/sfc/base/siena_vpd.c
@@ -572,7 +572,7 @@ siena_vpd_write(
EFSYS_KMEM_FREE(enp->en_esip, dcfg_size, dcfg);
- siena_nvram_partn_unlock(enp, dcfg_partn);
+ siena_nvram_partn_unlock(enp, dcfg_partn, NULL);
return (0);
@@ -587,7 +587,7 @@ siena_vpd_write(
fail4:
EFSYS_PROBE(fail4);
- siena_nvram_partn_unlock(enp, dcfg_partn);
+ siena_nvram_partn_unlock(enp, dcfg_partn, NULL);
fail3:
EFSYS_PROBE(fail3);
fail2:
--
2.7.4
next prev parent reply other threads:[~2017-11-16 8:04 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-16 8:03 [dpdk-dev] [PATCH 00/53] net/sfc: base driver update Andrew Rybchenko
2017-11-16 8:03 ` [dpdk-dev] [PATCH 01/53] net/sfc/base: copy new header from firmwaresrc Andrew Rybchenko
2017-11-27 19:58 ` Ferruh Yigit
2017-11-29 9:49 ` Andrew Rybchenko
2017-11-27 19:58 ` Ferruh Yigit
2017-11-16 8:03 ` [dpdk-dev] [PATCH 02/53] net/sfc/base: do not use Tx desc push with TSO descriptors Andrew Rybchenko
2017-11-16 8:03 ` [dpdk-dev] [PATCH 03/53] net/sfc/base: fix result code in MCDI NVRAM update finish Andrew Rybchenko
2017-11-16 8:03 ` [dpdk-dev] [PATCH 04/53] net/sfc/base: simplify verify result handling Andrew Rybchenko
2017-11-16 8:03 ` Andrew Rybchenko [this message]
2017-11-16 8:03 ` [dpdk-dev] [PATCH 06/53] net/sfc/base: extend NVRAM RW finish to return verify result Andrew Rybchenko
2017-11-16 8:03 ` [dpdk-dev] [PATCH 07/53] net/sfc/base: rename firmware update verify result cap field Andrew Rybchenko
2017-11-16 8:03 ` [dpdk-dev] [PATCH 08/53] net/sfc/base: simplify NVRAM type to partition mappings Andrew Rybchenko
2017-11-16 8:03 ` [dpdk-dev] [PATCH 09/53] net/sfc/base: check NVRAM locking by partition ID Andrew Rybchenko
2017-11-16 8:03 ` [dpdk-dev] [PATCH 10/53] net/sfc/base: report correct partition write chunk size Andrew Rybchenko
2017-11-16 8:03 ` [dpdk-dev] [PATCH 11/53] net/sfc/base: fix check in NVRAM validate Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 12/53] net/sfc/base: precheck and verify flash writes Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 13/53] net/sfc/base: remove duplicate NVRAM asserts Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 14/53] net/sfc/base: quieten get version methods Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 15/53] net/sfc/base: fix PreFAST issues Andrew Rybchenko
2017-11-27 19:58 ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit
2017-11-28 11:49 ` Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 16/53] net/sfc/base: add support for MUM/SUC firmware partitions Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 17/53] net/sfc/base: improve PS credits push function name Andrew Rybchenko
2017-11-27 19:59 ` Ferruh Yigit
2017-11-28 9:20 ` Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 18/53] net/sfc/base: improve RxQ label init prototype Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 19/53] net/sfc/base: add description of the PS packets layout Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 20/53] net/sfc/base: clarify meaning of Rx desc lbits in PS mode Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 21/53] net/sfc/base: optimize credits overflow check Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 22/53] net/sfc/base: provide simple access to RxQ state in EvQ Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 23/53] net/sfc/base: enforce packed stream fake buffer size Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 24/53] net/sfc/base: more accurately calculate number of PS credits Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 25/53] net/sfc/base: make MAC naming consistent with other modules Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 26/53] net/sfc/base: support inner checksum offload on transmit Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 27/53] net/sfc/base: use MCDIv2 for requests with too long response Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 28/53] net/sfc/base: ignore error in completion event on MCDIv2 HW Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 29/53] net/sfc/base: request info about outer frame in Rx events Andrew Rybchenko
2017-11-27 19:57 ` Ferruh Yigit
2017-11-28 10:48 ` Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 30/53] net/sfc/base: remove assertion on no longer used define Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 31/53] net/sfc/base: improve names for EVQ descriptor counts Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 32/53] net/sfc/base: improve names for RXQ " Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 33/53] net/sfc/base: improve names for TXQ " Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 34/53] net/sfc/base: fix build issue with PHY LED control enabled Andrew Rybchenko
2017-11-27 19:59 ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit
2017-11-16 8:04 ` [dpdk-dev] [PATCH 35/53] net/sfc/base: move Siena-specific defs to right header Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 36/53] net/sfc/base: run mkconfig.py to add a new sensors Andrew Rybchenko
2017-11-27 19:58 ` Ferruh Yigit
2017-11-28 12:01 ` Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 37/53] net/sfc/base: add support for " Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 38/53] net/sfc/base: remove unused defined for WPTR alignment Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 39/53] net/sfc/base: cstyle fixes Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 40/53] net/sfc/base: allow to use PHY stats on Huntington/Medford Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 41/53] net/sfc/base: fix diagnostics support build without Siena Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 42/53] net/sfc/base: fix probes in licensing support Andrew Rybchenko
2017-11-27 19:58 ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit
2017-11-28 10:17 ` Andrew Rybchenko
2017-11-28 21:38 ` Ferruh Yigit
2017-11-29 9:51 ` Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 43/53] net/sfc/base: fix warnings from VS2015 C compiler (C4310) Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 44/53] net/sfc/base: fix warnings from VS2015 C compiler (C4244) Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 45/53] net/sfc/base: fix warnings from VS2015 C compiler (C4245) Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 46/53] net/sfc/base: fix warnings from VS2015 C compiler (C4100) Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 47/53] net/sfc/base: fix warnings from VS2015 C compiler (C4189) Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 48/53] net/sfc/base: fix warnings from VS2015 C compiler (C4057) Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 49/53] net/sfc/base: fix warnings from VS2015 C compiler (C4214) Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 50/53] net/sfc/base: remove obsolete check for pre-Siena hardware Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 51/53] net/sfc/base: expand on comment on number of queues field Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 52/53] net/sfc/base: fix PreFAST static analysis warning (C6001) Andrew Rybchenko
2017-11-16 8:04 ` [dpdk-dev] [PATCH 53/53] net/sfc/base: move BIU test code into Siena-specific file Andrew Rybchenko
2017-11-27 19:59 ` [dpdk-dev] [PATCH 00/53] net/sfc: base driver update Ferruh Yigit
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=1510819481-6809-6-git-send-email-arybchenko@solarflare.com \
--to=arybchenko@solarflare.com \
--cc=amoreton@solarflare.com \
--cc=dev@dpdk.org \
/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).