common/sfc_efx/base: introduce UDP tunnel destruct operation

[dpdk.git] / drivers / common / sfc_efx / base / efx_tunnel.c

diff --git a/drivers/common/sfc_efx/base/efx_tunnel.c b/drivers/common/sfc_efx/base/efx_tunnel.c
index 1cc072f..5f2186c 100644 (file)
--- a/drivers/common/sfc_efx/base/efx_tunnel.c
+++ b/drivers/common/sfc_efx/base/efx_tunnel.c
@@ -10,12 +10,12 @@
 
 #if EFSYS_OPT_TUNNEL
 
-#if EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON
+#if EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || EFSYS_OPT_RIVERHEAD
 static const efx_tunnel_ops_t  __efx_tunnel_dummy_ops = {
-       NULL,   /* eto_udp_encap_supported */
        NULL,   /* eto_reconfigure */
+       NULL,   /* eto_fini */
 };
-#endif /* EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON */
+#endif /* EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || EFSYS_OPT_RIVERHEAD */
 
 #if EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2
 static __checkReturn   boolean_t
@@ -26,9 +26,13 @@ static       __checkReturn   efx_rc_t
 ef10_tunnel_reconfigure(
        __in            efx_nic_t *enp);
 
+static                 void
+ef10_tunnel_fini(
+       __in            efx_nic_t *enp);
+
 static const efx_tunnel_ops_t  __efx_tunnel_ef10_ops = {
-       ef10_udp_encap_supported,       /* eto_udp_encap_supported */
        ef10_tunnel_reconfigure,        /* eto_reconfigure */
+       ef10_tunnel_fini,               /* eto_fini */
 };
 #endif /* EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */
 
@@ -171,6 +175,12 @@ efx_tunnel_init(
                break;
 #endif /* EFSYS_OPT_MEDFORD2 */
 
+#if EFSYS_OPT_RIVERHEAD
+       case EFX_FAMILY_RIVERHEAD:
+               etop = &__efx_tunnel_dummy_ops;
+               break;
+#endif /* EFSYS_OPT_RIVERHEAD */
+
        default:
                EFSYS_ASSERT(0);
                rc = ENOTSUP;
@@ -198,22 +208,12 @@ fail1:
 efx_tunnel_fini(
        __in            efx_nic_t *enp)
 {
-       boolean_t resetting;
-
        EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);
        EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_PROBE);
        EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_TUNNEL);
 
-       if ((enp->en_etop->eto_udp_encap_supported != NULL) &&
-           enp->en_etop->eto_udp_encap_supported(enp)) {
-               /*
-                * The UNLOADING flag allows the MC to suppress the datapath
-                * reset if it was set on the last call to
-                * MC_CMD_SET_TUNNEL_ENCAP_UDP_PORTS by all functions
-                */
-               (void) efx_mcdi_set_tunnel_encap_udp_ports(enp, NULL, B_TRUE,
-                   &resetting);
-       }
+       if (enp->en_etop->eto_fini != NULL)
+               enp->en_etop->eto_fini(enp);
 
        enp->en_etop = NULL;
        enp->en_mod_flags &= ~EFX_MOD_TUNNEL;
@@ -470,6 +470,23 @@ fail1:
 
        return (rc);
 }
+
+static                 void
+ef10_tunnel_fini(
+       __in            efx_nic_t *enp)
+{
+       boolean_t resetting;
+
+       if (ef10_udp_encap_supported(enp) != B_FALSE) {
+               /*
+                * The UNLOADING flag allows the MC to suppress the datapath
+                * reset if it was set on the last call to
+                * MC_CMD_SET_TUNNEL_ENCAP_UDP_PORTS by all functions
+                */
+               (void) efx_mcdi_set_tunnel_encap_udp_ports(enp, NULL, B_TRUE,
+                   &resetting);
+       }
+}
 #endif /* EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */
 
 #endif /* EFSYS_OPT_TUNNEL */