Page MenuHomeFreeBSD
Files F153062168

D18087.id50967.diff
No OneTemporary
Actions

D18087.id50967.diff
View Options

Index: head/sys/dev/sfxge/common/efx.h
===================================================================
--- head/sys/dev/sfxge/common/efx.h
+++ head/sys/dev/sfxge/common/efx.h
@@ -1418,7 +1418,8 @@
extern __checkReturn efx_rc_t
efx_nvram_rw_finish(
__in efx_nic_t *enp,
- __in efx_nvram_type_t type);
+ __in efx_nvram_type_t type,
+ __out_opt uint32_t *verify_resultp);
extern __checkReturn efx_rc_t
efx_nvram_get_version(
Index: head/sys/dev/sfxge/common/efx_bootcfg.c
===================================================================
--- head/sys/dev/sfxge/common/efx_bootcfg.c
+++ head/sys/dev/sfxge/common/efx_bootcfg.c
@@ -350,11 +350,11 @@
if ((rc = efx_nvram_read_chunk(enp, EFX_NVRAM_BOOTROM_CFG,
sector_offset, (caddr_t)payload, sector_length)) != 0) {
- (void) efx_nvram_rw_finish(enp, EFX_NVRAM_BOOTROM_CFG);
+ (void) efx_nvram_rw_finish(enp, EFX_NVRAM_BOOTROM_CFG, NULL);
goto fail6;
}
- if ((rc = efx_nvram_rw_finish(enp, EFX_NVRAM_BOOTROM_CFG)) != 0)
+ if ((rc = efx_nvram_rw_finish(enp, EFX_NVRAM_BOOTROM_CFG, NULL)) != 0)
goto fail7;
/* Verify that the area is correctly formatted and checksummed */
@@ -526,7 +526,7 @@
0, (caddr_t)partn_data, partn_length)) != 0)
goto fail11;
- if ((rc = efx_nvram_rw_finish(enp, EFX_NVRAM_BOOTROM_CFG)) != 0)
+ if ((rc = efx_nvram_rw_finish(enp, EFX_NVRAM_BOOTROM_CFG, NULL)) != 0)
goto fail12;
EFSYS_KMEM_FREE(enp->en_esip, partn_length, partn_data);
@@ -542,7 +542,7 @@
fail9:
EFSYS_PROBE(fail9);
- (void) efx_nvram_rw_finish(enp, EFX_NVRAM_BOOTROM_CFG);
+ (void) efx_nvram_rw_finish(enp, EFX_NVRAM_BOOTROM_CFG, NULL);
fail8:
EFSYS_PROBE(fail8);
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
@@ -367,11 +367,12 @@
__checkReturn efx_rc_t
efx_nvram_rw_finish(
__in efx_nic_t *enp,
- __in efx_nvram_type_t type)
+ __in efx_nvram_type_t type,
+ __out_opt uint32_t *verify_resultp)
{
const efx_nvram_ops_t *envop = enp->en_envop;
uint32_t partn;
- uint32_t verify_result;
+ uint32_t verify_result = 0;
efx_rc_t rc;
EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);
@@ -390,6 +391,9 @@
enp->en_nvram_locked = EFX_NVRAM_INVALID;
+ if (verify_resultp != NULL)
+ *verify_resultp = verify_result;
+
return (0);
fail2:
@@ -398,6 +402,10 @@
fail1:
EFSYS_PROBE1(fail1, efx_rc_t, rc);
+
+ /* Always report verification result */
+ if (verify_resultp != NULL)
+ *verify_resultp = verify_result;
return (rc);
}
Index: head/sys/dev/sfxge/sfxge_nvram.c
===================================================================
--- head/sys/dev/sfxge/sfxge_nvram.c
+++ head/sys/dev/sfxge/sfxge_nvram.c
@@ -104,7 +104,7 @@
fail3:
free(buf, M_TEMP);
- efx_nvram_rw_finish(enp, type);
+ efx_nvram_rw_finish(enp, type, NULL);
fail1:
return (rc);
}
@@ -125,7 +125,7 @@
rc = efx_nvram_erase(enp, type);
- efx_nvram_rw_finish(enp, type);
+ efx_nvram_rw_finish(enp, type, NULL);
return (rc);
}

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 19, 10:02 PM (40 m, 40 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31776047
Default Alt Text
D18087.id50967.diff (3 KB)

Event Timeline