Author: arybchik Date: Thu Nov 22 14:10:46 2018 New Revision: 340765 URL: https://svnweb.freebsd.org/changeset/base/340765
Log: 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. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D18024 Modified: head/sys/dev/sfxge/common/ef10_nic.c Modified: head/sys/dev/sfxge/common/ef10_nic.c ============================================================================== --- head/sys/dev/sfxge/common/ef10_nic.c Thu Nov 22 13:18:58 2018 (r340764) +++ head/sys/dev/sfxge/common/ef10_nic.c Thu Nov 22 14:10:46 2018 (r340765) @@ -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 _______________________________________________ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
