svn commit: r341331 - stable/11/sys/dev/sfxge/common

[Andrew Rybchenko]

Author: arybchik
Date: Fri Nov 30 09:58:11 2018
New Revision: 341331
URL: https://svnweb.freebsd.org/changeset/base/341331

Log:
  MFC r340765
  
  sfxge(4): cleanup: move into right place
  
  Due to incorrect merge the piece of code was put in incorrect
  place and diverge from libefx in other locations.
  
  Sponsored by:   Solarflare Communications, Inc.
  Differential Revision:  https://reviews.freebsd.org/D18024

Modified:
  stable/11/sys/dev/sfxge/common/ef10_nic.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/sfxge/common/ef10_nic.c
==============================================================================
--- stable/11/sys/dev/sfxge/common/ef10_nic.c	Fri Nov 30 09:56:47 2018	(r341330)
+++ stable/11/sys/dev/sfxge/common/ef10_nic.c	Fri Nov 30 09:58:11 2018	(r341331)
@@ -1092,6 +1092,18 @@ ef10_get_datapath_caps(
 		CAP_FLAG2(flags2, INIT_EVQ_V2) ? B_TRUE : B_FALSE;
 
 	/*
+	 * Check if firmware-verified NVRAM updates must be used.
+	 *
+	 * The firmware trusted installer requires all NVRAM updates to use
+	 * version 2 of MC_CMD_NVRAM_UPDATE_START (to enable verified update)
+	 * 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 =
+	    CAP_FLAG2(flags2, NVRAM_UPDATE_REPORT_VERIFY_RESULT) ?
+	    B_TRUE : B_FALSE;
+
+	/*
 	 * Check if firmware provides packet memory and Rx datapath
 	 * counters.
 	 */
@@ -1104,18 +1116,6 @@ ef10_get_datapath_caps(
 	 */
 	encp->enc_mac_stats_40g_tx_size_bins =
 	    CAP_FLAG2(flags2, MAC_STATS_40G_TX_SIZE_BINS) ? B_TRUE : B_FALSE;
-
-	/*
-	 * Check if firmware-verified NVRAM updates must be used.
-	 *
-	 * The firmware trusted installer requires all NVRAM updates to use
-	 * version 2 of MC_CMD_NVRAM_UPDATE_START (to enable verified update)
-	 * 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 =
-	    CAP_FLAG2(flags2, NVRAM_UPDATE_REPORT_VERIFY_RESULT) ?
-	    B_TRUE : B_FALSE;
 
 #undef CAP_FLAG
 #undef CAP_FLAG2