svn commit: r340818 - head/sys/dev/sfxge/common

[Andrew Rybchenko]

Author: arybchik
Date: Fri Nov 23 10:20:44 2018
New Revision: 340818
URL: https://svnweb.freebsd.org/changeset/base/340818

Log:
  sfxge(4): 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.
  
  Submitted by:   Andy Moreton <amoreton at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.
  Differential Revision:  https://reviews.freebsd.org/D18088

Modified:
  head/sys/dev/sfxge/common/ef10_mcdi.c
  head/sys/dev/sfxge/common/ef10_nic.c
  head/sys/dev/sfxge/common/efx.h
  head/sys/dev/sfxge/common/efx_nvram.c
  head/sys/dev/sfxge/common/siena_nic.c

Modified: head/sys/dev/sfxge/common/ef10_mcdi.c
==============================================================================
--- head/sys/dev/sfxge/common/ef10_mcdi.c	Fri Nov 23 10:20:32 2018	(r340817)
+++ head/sys/dev/sfxge/common/ef10_mcdi.c	Fri Nov 23 10:20:44 2018	(r340818)
@@ -133,7 +133,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.

Modified: head/sys/dev/sfxge/common/ef10_nic.c
==============================================================================
--- head/sys/dev/sfxge/common/ef10_nic.c	Fri Nov 23 10:20:32 2018	(r340817)
+++ head/sys/dev/sfxge/common/ef10_nic.c	Fri Nov 23 10:20:44 2018	(r340818)
@@ -1057,7 +1057,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;
 

Modified: head/sys/dev/sfxge/common/efx.h
==============================================================================
--- head/sys/dev/sfxge/common/efx.h	Fri Nov 23 10:20:32 2018	(r340817)
+++ head/sys/dev/sfxge/common/efx.h	Fri Nov 23 10:20:44 2018	(r340818)
@@ -1213,7 +1213,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)

Modified: head/sys/dev/sfxge/common/efx_nvram.c
==============================================================================
--- head/sys/dev/sfxge/common/efx_nvram.c	Fri Nov 23 10:20:32 2018	(r340817)
+++ head/sys/dev/sfxge/common/efx_nvram.c	Fri Nov 23 10:20:44 2018	(r340818)
@@ -960,8 +960,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;
 		}
@@ -970,9 +970,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;
 	}

Modified: head/sys/dev/sfxge/common/siena_nic.c
==============================================================================
--- head/sys/dev/sfxge/common/siena_nic.c	Fri Nov 23 10:20:32 2018	(r340817)
+++ head/sys/dev/sfxge/common/siena_nic.c	Fri Nov 23 10:20:44 2018	(r340818)
@@ -179,7 +179,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);