Date: Fri, 30 Nov 2018 09:56:47 +0000 (UTC) From: Andrew Rybchenko <arybchik@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r341330 - stable/12/sys/dev/sfxge/common Message-ID: <201811300956.wAU9ulA6073116@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: arybchik Date: Fri Nov 30 09:56:47 2018 New Revision: 341330 URL: https://svnweb.freebsd.org/changeset/base/341330 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. Modified: stable/12/sys/dev/sfxge/common/ef10_nic.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/sfxge/common/ef10_nic.c ============================================================================== --- stable/12/sys/dev/sfxge/common/ef10_nic.c Fri Nov 30 08:42:14 2018 (r341329) +++ stable/12/sys/dev/sfxge/common/ef10_nic.c Fri Nov 30 09:56:47 2018 (r341330) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811300956.wAU9ulA6073116>