Page MenuHomeFreeBSD
Files F107194829

D18088.diff
No OneTemporary
Actions

D18088.diff
View Options

Index: head/sys/dev/sfxge/common/ef10_mcdi.c
===================================================================
--- head/sys/dev/sfxge/common/ef10_mcdi.c
+++ head/sys/dev/sfxge/common/ef10_mcdi.c
@@ -133,7 +133,7 @@
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.
Index: head/sys/dev/sfxge/common/ef10_nic.c
===================================================================
--- head/sys/dev/sfxge/common/ef10_nic.c
+++ head/sys/dev/sfxge/common/ef10_nic.c
@@ -1057,7 +1057,7 @@
* 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;
Index: head/sys/dev/sfxge/common/efx.h
===================================================================
--- head/sys/dev/sfxge/common/efx.h
+++ head/sys/dev/sfxge/common/efx.h
@@ -1213,7 +1213,7 @@
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)
Index: head/sys/dev/sfxge/common/efx_nvram.c
===================================================================
--- head/sys/dev/sfxge/common/efx_nvram.c
+++ head/sys/dev/sfxge/common/efx_nvram.c
@@ -960,8 +960,8 @@
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 @@
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;
}
Index: head/sys/dev/sfxge/common/siena_nic.c
===================================================================
--- head/sys/dev/sfxge/common/siena_nic.c
+++ head/sys/dev/sfxge/common/siena_nic.c
@@ -179,7 +179,7 @@
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);

File Metadata

Mime Type
text/plain
Expires
Sun, Jan 12, 11:56 AM (21 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15769099
Default Alt Text
D18088.diff (2 KB)

Event Timeline