net/failsafe: use ownership mechanism for slaves

[dpdk.git] / drivers / net / failsafe / failsafe.c

diff --git a/drivers/net/failsafe/failsafe.c b/drivers/net/failsafe/failsafe.c
index 12d79ac..02e6035 100644 (file)
--- a/drivers/net/failsafe/failsafe.c
+++ b/drivers/net/failsafe/failsafe.c
@@ -33,11 +33,11 @@
 
 #include <rte_alarm.h>
 #include <rte_malloc.h>
-#include <rte_ethdev.h>
+#include <rte_ethdev_driver.h>
 #include <rte_ethdev_vdev.h>
 #include <rte_devargs.h>
 #include <rte_kvargs.h>
-#include <rte_vdev.h>
+#include <rte_bus_vdev.h>
 
 #include "failsafe_private.h"
 
@@ -46,7 +46,7 @@ static const struct rte_eth_link eth_link = {
        .link_speed = ETH_SPEED_NUM_10G,
        .link_duplex = ETH_LINK_FULL_DUPLEX,
        .link_status = ETH_LINK_UP,
-       .link_autoneg = ETH_LINK_SPEED_AUTONEG,
+       .link_autoneg = ETH_LINK_AUTONEG,
 };
 
 static int
@@ -55,6 +55,7 @@ fs_sub_device_alloc(struct rte_eth_dev *dev,
 {
        uint8_t nb_subs;
        int ret;
+       int i;
 
        ret = failsafe_args_count_subdevice(dev, params);
        if (ret)
@@ -72,6 +73,10 @@ fs_sub_device_alloc(struct rte_eth_dev *dev,
                ERROR("Could not allocate sub_devices");
                return -ENOMEM;
        }
+       /* Initiate static sub devices linked list. */
+       for (i = 1; i < nb_subs; i++)
+               PRIV(dev)->subs[i - 1].next = PRIV(dev)->subs + i;
+       PRIV(dev)->subs[i - 1].next = PRIV(dev)->subs;
        return 0;
 }
 
@@ -142,6 +147,7 @@ fs_hotplug_alarm(void *arg)
                if (ret)
                        ERROR("Unable to synchronize sub_device state");
        }
+       failsafe_dev_remove(dev);
        ret = failsafe_hotplug_alarm_install(dev);
        if (ret)
                ERROR("Unable to set up next alarm");
@@ -190,6 +196,13 @@ fs_eth_dev_create(struct rte_vdev_device *vdev)
        ret = failsafe_args_parse(dev, params);
        if (ret)
                goto free_subs;
+       ret = rte_eth_dev_owner_new(&priv->my_owner.id);
+       if (ret) {
+               ERROR("Failed to get unique owner identifier");
+               goto free_args;
+       }
+       snprintf(priv->my_owner.name, sizeof(priv->my_owner.name),
+                FAILSAFE_OWNER_NAME);
        ret = failsafe_eal_init(dev);
        if (ret)
                goto free_args;
@@ -237,6 +250,11 @@ fs_eth_dev_create(struct rte_vdev_device *vdev)
                mac->addr_bytes[0], mac->addr_bytes[1],
                mac->addr_bytes[2], mac->addr_bytes[3],
                mac->addr_bytes[4], mac->addr_bytes[5]);
+       dev->data->dev_flags |= RTE_ETH_DEV_INTR_LSC;
+       PRIV(dev)->intr_handle = (struct rte_intr_handle){
+               .fd = -1,
+               .type = RTE_INTR_HANDLE_EXT,
+       };
        return 0;
 free_args:
        failsafe_args_free(dev);