sfxge: convert nvram read method to use partition id

Submitted by:   Andy Moreton <amoreton at solarflare.com>
Reviewed by:    gnn
Sponsored by:   Solarflare Communications, Inc.
MFC after:      2 days
Differential Revision: https://reviews.freebsd.org/D4951

1 files changed, 10 insertions, 4 deletions

diff --git a/sys/dev/sfxge/common/efx_nvram.c b/sys/dev/sfxge/common/efx_nvram.c
index abb1dd7508b9..97ef37e4ee14 100644
--- a/sys/dev/sfxge/common/efx_nvram.c
+++ b/sys/dev/sfxge/common/efx_nvram.c
@@ -43,7 +43,6 @@ static efx_nvram_ops_t	__efx_nvram_falcon_ops = {
 	falcon_nvram_test,		/* envo_test */
 #endif	/* EFSYS_OPT_DIAG */
 	falcon_nvram_get_version,	/* envo_get_version */
-	falcon_nvram_read_chunk,	/* envo_read_chunk */
 	falcon_nvram_erase,		/* envo_erase */
 	falcon_nvram_write_chunk,	/* envo_write_chunk */
 	falcon_nvram_rw_finish,		/* envo_rw_finish */
@@ -51,6 +50,7 @@ static efx_nvram_ops_t	__efx_nvram_falcon_ops = {
 	falcon_nvram_type_to_partn,	/* envo_type_to_partn */
 	falcon_nvram_partn_size,	/* envo_partn_size */
 	falcon_nvram_partn_rw_start,	/* envo_partn_rw_start */
+	falcon_nvram_partn_read,	/* envo_partn_read */
 };
 
 #endif	/* EFSYS_OPT_FALCON */
@@ -62,7 +62,6 @@ static efx_nvram_ops_t	__efx_nvram_siena_ops = {
 	siena_nvram_test,		/* envo_test */
 #endif	/* EFSYS_OPT_DIAG */
 	siena_nvram_get_version,	/* envo_get_version */
-	siena_nvram_read_chunk,		/* envo_read_chunk */
 	siena_nvram_erase,		/* envo_erase */
 	siena_nvram_write_chunk,	/* envo_write_chunk */
 	siena_nvram_rw_finish,		/* envo_rw_finish */
@@ -70,6 +69,7 @@ static efx_nvram_ops_t	__efx_nvram_siena_ops = {
 	siena_nvram_type_to_partn,	/* envo_type_to_partn */
 	siena_nvram_partn_size,		/* envo_partn_size */
 	siena_nvram_partn_rw_start,	/* envo_partn_rw_start */
+	siena_nvram_partn_read,		/* envo_partn_read */
 };
 
 #endif	/* EFSYS_OPT_SIENA */
@@ -81,7 +81,6 @@ static efx_nvram_ops_t	__efx_nvram_ef10_ops = {
 	ef10_nvram_test,		/* envo_test */
 #endif	/* EFSYS_OPT_DIAG */
 	ef10_nvram_get_version,		/* envo_get_version */
-	ef10_nvram_read_chunk,		/* envo_read_chunk */
 	ef10_nvram_erase,		/* envo_erase */
 	ef10_nvram_write_chunk,		/* envo_write_chunk */
 	ef10_nvram_rw_finish,		/* envo_rw_finish */
@@ -89,6 +88,7 @@ static efx_nvram_ops_t	__efx_nvram_ef10_ops = {
 	ef10_nvram_type_to_partn,	/* envo_type_to_partn */
 	ef10_nvram_partn_size,		/* envo_partn_size */
 	ef10_nvram_partn_rw_start,	/* envo_partn_rw_start */
+	ef10_nvram_partn_read,		/* envo_partn_read */
 };
 
 #endif	/* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD */
@@ -275,6 +275,7 @@ efx_nvram_read_chunk(
 	__in			size_t size)
 {
 	efx_nvram_ops_t *envop = enp->en_envop;
+	uint32_t partn;
 	efx_rc_t rc;
 
 	EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);
@@ -285,11 +286,16 @@ efx_nvram_read_chunk(
 
 	EFSYS_ASSERT3U(enp->en_nvram_locked, ==, type);
 
-	if ((rc = envop->envo_read_chunk(enp, type, offset, data, size)) != 0)
+	if ((rc = envop->envo_type_to_partn(enp, type, &partn)) != 0)
 		goto fail1;
 
+	if ((rc = envop->envo_partn_read(enp, partn, offset, data, size)) != 0)
+		goto fail2;
+
 	return (0);
 
+fail2:
+	EFSYS_PROBE(fail2);
 fail1:
 	EFSYS_PROBE1(fail1, efx_rc_t, rc);