net/sfc/base: support data path with EVB module

[dpdk.git] / drivers / net / sfc / base / siena_nvram.c

diff --git a/drivers/net/sfc/base/siena_nvram.c b/drivers/net/sfc/base/siena_nvram.c
index 7d423d2..51e601e 100644 (file)
--- a/drivers/net/sfc/base/siena_nvram.c
+++ b/drivers/net/sfc/base/siena_nvram.c
@@ -18,16 +18,17 @@ siena_nvram_partn_size(
        __out                   size_t *sizep)
 {
        efx_rc_t rc;
+       efx_nvram_info_t eni = { 0 };
 
        if ((1 << partn) & ~enp->en_u.siena.enu_partn_mask) {
                rc = ENOTSUP;
                goto fail1;
        }
 
-       if ((rc = efx_mcdi_nvram_info(enp, partn, sizep,
-           NULL, NULL, NULL)) != 0) {
+       if ((rc = efx_mcdi_nvram_info(enp, partn, &eni)) != 0)
                goto fail2;
-       }
+
+       *sizep = eni.eni_partn_size;
 
        return (0);
 
@@ -47,7 +48,7 @@ siena_nvram_partn_info(
 {
        efx_rc_t rc;
 
-       if ((rc = efx_mcdi_nvram_info_ex(enp, partn, enip)) != 0)
+       if ((rc = efx_mcdi_nvram_info(enp, partn, enip)) != 0)
                goto fail1;
 
        if (enip->eni_write_size == 0)
@@ -173,6 +174,7 @@ siena_nvram_partn_unlock(
        __out_opt               uint32_t *verify_resultp)
 {
        boolean_t reboot;
+       uint32_t flags = 0;
        efx_rc_t rc;
 
        /*
@@ -183,7 +185,8 @@ siena_nvram_partn_unlock(
                    partn == MC_CMD_NVRAM_TYPE_PHY_PORT1 ||
                    partn == MC_CMD_NVRAM_TYPE_DISABLED_CALLISTO);
 
-       rc = efx_mcdi_nvram_update_finish(enp, partn, reboot, verify_resultp);
+       rc = efx_mcdi_nvram_update_finish(enp, partn, reboot, flags,
+                   verify_resultp);
        if (rc != 0)
                goto fail1;