net/pfe: add MTU and MAC address set

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

diff --git a/drivers/net/sfc/base/ef10_vpd.c b/drivers/net/sfc/base/ef10_vpd.c
index ad522e8..c641936 100644 (file)
--- a/drivers/net/sfc/base/ef10_vpd.c
+++ b/drivers/net/sfc/base/ef10_vpd.c
@@ -10,7 +10,7 @@
 
 #if EFSYS_OPT_VPD
 
-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD
+#if EFX_OPTS_EF10()
 
 #include "ef10_tlv_layout.h"
 
@@ -25,8 +25,7 @@ ef10_vpd_init(
        efx_rc_t rc;
 
        EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_PROBE);
-       EFSYS_ASSERT(enp->en_family == EFX_FAMILY_HUNTINGTON ||
-                   enp->en_family == EFX_FAMILY_MEDFORD);
+       EFSYS_ASSERT(EFX_FAMILY_IS_EF10(enp));
 
        if (enp->en_nic_cfg.enc_vpd_is_global) {
                tag = TLV_TAG_GLOBAL_STATIC_VPD;
@@ -80,9 +79,9 @@ ef10_vpd_size(
        __out                   size_t *sizep)
 {
        efx_rc_t rc;
+       efx_nvram_info_t eni = { 0 };
 
-       EFSYS_ASSERT(enp->en_family == EFX_FAMILY_HUNTINGTON ||
-                   enp->en_family == EFX_FAMILY_MEDFORD);
+       EFSYS_ASSERT(EFX_FAMILY_IS_EF10(enp));
 
        /*
         * This function returns the total size the user should allocate
@@ -90,10 +89,12 @@ ef10_vpd_size(
         * so we just need to return an upper bound on the dynamic vpd,
         * which is the size of the DYNAMIC_CONFIG partition.
         */
-       if ((rc = efx_mcdi_nvram_info(enp, NVRAM_PARTITION_TYPE_DYNAMIC_CONFIG,
-                   sizep, NULL, NULL, NULL)) != 0)
+       if ((rc = efx_mcdi_nvram_info(enp,
+                   NVRAM_PARTITION_TYPE_DYNAMIC_CONFIG, &eni)) != 0)
                goto fail1;
 
+       *sizep = eni.eni_partn_size;
+
        return (0);
 
 fail1:
@@ -114,8 +115,7 @@ ef10_vpd_read(
        uint32_t tag;
        efx_rc_t rc;
 
-       EFSYS_ASSERT(enp->en_family == EFX_FAMILY_HUNTINGTON ||
-                   enp->en_family == EFX_FAMILY_MEDFORD);
+       EFSYS_ASSERT(EFX_FAMILY_IS_EF10(enp));
 
        if (enp->en_nic_cfg.enc_vpd_is_global) {
                tag = TLV_TAG_GLOBAL_DYNAMIC_VPD;
@@ -133,19 +133,22 @@ ef10_vpd_read(
                rc = ENOSPC;
                goto fail2;
        }
-       memcpy(data, dvpd, dvpd_size);
+       if (dvpd != NULL)
+               memcpy(data, dvpd, dvpd_size);
 
        /* Pad data with all-1s, consistent with update operations */
        memset(data + dvpd_size, 0xff, size - dvpd_size);
 
-       EFSYS_KMEM_FREE(enp->en_esip, dvpd_size, dvpd);
+       if (dvpd != NULL)
+               EFSYS_KMEM_FREE(enp->en_esip, dvpd_size, dvpd);
 
        return (0);
 
 fail2:
        EFSYS_PROBE(fail2);
 
-       EFSYS_KMEM_FREE(enp->en_esip, dvpd_size, dvpd);
+       if (dvpd != NULL)
+               EFSYS_KMEM_FREE(enp->en_esip, dvpd_size, dvpd);
 fail1:
        EFSYS_PROBE1(fail1, efx_rc_t, rc);
 
@@ -166,8 +169,7 @@ ef10_vpd_verify(
        unsigned int dcont;
        efx_rc_t rc;
 
-       EFSYS_ASSERT(enp->en_family == EFX_FAMILY_HUNTINGTON ||
-                   enp->en_family == EFX_FAMILY_MEDFORD);
+       EFSYS_ASSERT(EFX_FAMILY_IS_EF10(enp));
 
        /*
         * Strictly you could take the view that dynamic vpd is optional.
@@ -287,8 +289,7 @@ ef10_vpd_get(
        uint8_t length;
        efx_rc_t rc;
 
-       EFSYS_ASSERT(enp->en_family == EFX_FAMILY_HUNTINGTON ||
-                   enp->en_family == EFX_FAMILY_MEDFORD);
+       EFSYS_ASSERT(EFX_FAMILY_IS_EF10(enp));
 
        /* Attempt to satisfy the request from svpd first */
        if (enp->en_arch.ef10.ena_svpd_length > 0) {
@@ -333,8 +334,7 @@ ef10_vpd_set(
 {
        efx_rc_t rc;
 
-       EFSYS_ASSERT(enp->en_family == EFX_FAMILY_HUNTINGTON ||
-                   enp->en_family == EFX_FAMILY_MEDFORD);
+       EFSYS_ASSERT(EFX_FAMILY_IS_EF10(enp));
 
        /* If the provided (tag,keyword) exists in svpd, then it is readonly */
        if (enp->en_arch.ef10.ena_svpd_length > 0) {
@@ -386,8 +386,7 @@ ef10_vpd_write(
        uint32_t tag;
        efx_rc_t rc;
 
-       EFSYS_ASSERT(enp->en_family == EFX_FAMILY_HUNTINGTON ||
-                   enp->en_family == EFX_FAMILY_MEDFORD);
+       EFSYS_ASSERT(EFX_FAMILY_IS_EF10(enp));
 
        if (enp->en_nic_cfg.enc_vpd_is_global) {
                tag = TLV_TAG_GLOBAL_DYNAMIC_VPD;
@@ -422,8 +421,7 @@ fail1:
 ef10_vpd_fini(
        __in                    efx_nic_t *enp)
 {
-       EFSYS_ASSERT(enp->en_family == EFX_FAMILY_HUNTINGTON ||
-                   enp->en_family == EFX_FAMILY_MEDFORD);
+       EFSYS_ASSERT(EFX_FAMILY_IS_EF10(enp));
 
        if (enp->en_arch.ef10.ena_svpd_length > 0) {
                EFSYS_KMEM_FREE(enp->en_esip, enp->en_arch.ef10.ena_svpd_length,
@@ -434,6 +432,6 @@ ef10_vpd_fini(
        }
 }
 
-#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD */
+#endif /* EFX_OPTS_EF10() */
 
 #endif /* EFSYS_OPT_VPD */