net/sfc/base: rename firmware update verify result cap field

The existing name confuses support for secure boot with
support for reporting a verify result after an NVRAM update.

As the capability only reports support for returning a verify
result, change the name to be less confusing.

Signed-off-by: Andy Moreton <amoreton@solarflare.com>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>

diff --git a/drivers/net/sfc/base/ef10_mcdi.c b/drivers/net/sfc/base/ef10_mcdi.c
index 5a26bda..dbdfa36 100644 (file)
--- a/drivers/net/sfc/base/ef10_mcdi.c
+++ b/drivers/net/sfc/base/ef10_mcdi.c
@@ -130,7 +130,7 @@ ef10_mcdi_get_timeout(
        case MC_CMD_NVRAM_ERASE:
        case MC_CMD_LICENSING_V3:
        case MC_CMD_NVRAM_UPDATE_FINISH:
-               if (encp->enc_fw_verified_nvram_update_required != B_FALSE) {
+               if (encp->enc_nvram_update_verify_result_supported != B_FALSE) {
                        /*
                         * Potentially longer running commands, which firmware
                         * may choose to process in a background thread.

diff --git a/drivers/net/sfc/base/ef10_nic.c b/drivers/net/sfc/base/ef10_nic.c
index 83c958c..53ec227 100644 (file)
--- a/drivers/net/sfc/base/ef10_nic.c
+++ b/drivers/net/sfc/base/ef10_nic.c
@@ -1054,7 +1054,7 @@ ef10_get_datapath_caps(
         * and version 2 of MC_CMD_NVRAM_UPDATE_FINISH (to verify the updated
         * partition and report the result).
         */
-       encp->enc_fw_verified_nvram_update_required =
+       encp->enc_nvram_update_verify_result_supported =
            CAP_FLAG2(flags2, NVRAM_UPDATE_REPORT_VERIFY_RESULT) ?
            B_TRUE : B_FALSE;
 

diff --git a/drivers/net/sfc/base/efx.h b/drivers/net/sfc/base/efx.h
index 3bde46f..b298a75 100644 (file)
--- a/drivers/net/sfc/base/efx.h
+++ b/drivers/net/sfc/base/efx.h
@@ -1206,7 +1206,7 @@ typedef struct efx_nic_cfg_s {
        uint32_t                enc_required_pcie_bandwidth_mbps;
        uint32_t                enc_max_pcie_link_gen;
        /* Firmware verifies integrity of NVRAM updates */
-       uint32_t                enc_fw_verified_nvram_update_required;
+       uint32_t                enc_nvram_update_verify_result_supported;
 } efx_nic_cfg_t;
 
 #define        EFX_PCI_FUNCTION_IS_PF(_encp)   ((_encp)->enc_vf == 0xffff)

diff --git a/drivers/net/sfc/base/efx_nvram.c b/drivers/net/sfc/base/efx_nvram.c
index 6e18e44..6e22169 100644 (file)
--- a/drivers/net/sfc/base/efx_nvram.c
+++ b/drivers/net/sfc/base/efx_nvram.c
@@ -955,8 +955,8 @@ efx_mcdi_nvram_update_finish(
 
        if (req.emr_out_length_used < MC_CMD_NVRAM_UPDATE_FINISH_V2_OUT_LEN) {
                verify_result = MC_CMD_NVRAM_VERIFY_RC_UNKNOWN;
-               if (encp->enc_fw_verified_nvram_update_required) {
-                       /* Mandatory verification result is missing */
+               if (encp->enc_nvram_update_verify_result_supported) {
+                       /* Result of update verification is missing */
                        rc = EMSGSIZE;
                        goto fail2;
                }
@@ -965,9 +965,9 @@ efx_mcdi_nvram_update_finish(
                    MCDI_OUT_DWORD(req, NVRAM_UPDATE_FINISH_V2_OUT_RESULT_CODE);
        }
 
-       if ((encp->enc_fw_verified_nvram_update_required) &&
+       if ((encp->enc_nvram_update_verify_result_supported) &&
            (verify_result != MC_CMD_NVRAM_VERIFY_RC_SUCCESS)) {
-               /* Mandatory verification failed */
+               /* Update verification failed */
                rc = EINVAL;
                goto fail3;
        }

diff --git a/drivers/net/sfc/base/siena_nic.c b/drivers/net/sfc/base/siena_nic.c
index fcc8f15..d574b24 100644 (file)
--- a/drivers/net/sfc/base/siena_nic.c
+++ b/drivers/net/sfc/base/siena_nic.c
@@ -174,7 +174,7 @@ siena_board_cfg(
        encp->enc_required_pcie_bandwidth_mbps = 2 * 10000;
        encp->enc_max_pcie_link_gen = EFX_PCIE_LINK_SPEED_GEN2;
 
-       encp->enc_fw_verified_nvram_update_required = B_FALSE;
+       encp->enc_nvram_update_verify_result_supported = B_FALSE;
 
        return (0);