net/sfc/base: report verify result from RW finish callback

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>

diff --git a/drivers/net/sfc/base/ef10_impl.h b/drivers/net/sfc/base/ef10_impl.h
index 8f9eb7a..4624113 100644 (file)
--- 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 (file)
--- a/drivers/net/sfc/base/ef10_nvram.c
+++ b/drivers/net/sfc/base/ef10_nvram.c
@@ -2047,15 +2047,15 @@ fail1:
 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 @@ fail1:
        __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 (file)
--- 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 (file)
--- 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 @@ fail1:
        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 (file)
--- 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 (file)
--- a/drivers/net/sfc/base/siena_nvram.c
+++ b/drivers/net/sfc/base/siena_nvram.c
@@ -170,7 +170,8 @@ fail1:
        __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 @@ fail1:
        __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 (file)
--- 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 @@ fail5:
 fail4:
        EFSYS_PROBE(fail4);
 
-       siena_nvram_partn_unlock(enp, dcfg_partn);
+       siena_nvram_partn_unlock(enp, dcfg_partn, NULL);
 fail3:
        EFSYS_PROBE(fail3);
 fail2: