New upstream version 17.11.5

[deb_dpdk.git] / drivers / net / failsafe / failsafe_ops.c

diff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_ops.c
index e16a590..7eb6f71 100644 (file)
--- a/drivers/net/failsafe/failsafe_ops.c
+++ b/drivers/net/failsafe/failsafe_ops.c
@@ -124,7 +124,7 @@ fs_dev_configure(struct rte_eth_dev *dev)
                        ERROR("Could not configure sub_device %d", i);
                        return ret;
                }
-               if (rmv_interrupt) {
+               if (rmv_interrupt && sdev->rmv_callback == 0) {
                        ret = rte_eth_dev_callback_register(PORT_ID(sdev),
                                        RTE_ETH_EVENT_INTR_RMV,
                                        failsafe_eth_rmv_event_callback,
@@ -132,9 +132,11 @@ fs_dev_configure(struct rte_eth_dev *dev)
                        if (ret)
                                WARN("Failed to register RMV callback for sub_device %d",
                                     SUB_ID(sdev));
+                       else
+                               sdev->rmv_callback = 1;
                }
                dev->data->dev_conf.intr_conf.rmv = 0;
-               if (lsc_interrupt) {
+               if (lsc_interrupt && sdev->lsc_callback == 0) {
                        ret = rte_eth_dev_callback_register(PORT_ID(sdev),
                                                RTE_ETH_EVENT_INTR_LSC,
                                                failsafe_eth_lsc_event_callback,
@@ -142,6 +144,8 @@ fs_dev_configure(struct rte_eth_dev *dev)
                        if (ret)
                                WARN("Failed to register LSC callback for sub_device %d",
                                     SUB_ID(sdev));
+                       else
+                               sdev->lsc_callback = 1;
                }
                dev->data->dev_conf.intr_conf.lsc = lsc_enabled;
                sdev->state = DEV_ACTIVE;
@@ -237,6 +241,7 @@ fs_dev_close(struct rte_eth_dev *dev)
        PRIV(dev)->state = DEV_ACTIVE - 1;
        FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) {
                DEBUG("Closing sub_device %d", i);
+               failsafe_eth_dev_unregister_callbacks(sdev);
                rte_eth_dev_close(PORT_ID(sdev));
                sdev->state = DEV_ACTIVE - 1;
        }
@@ -255,9 +260,13 @@ fs_rx_queue_release(void *queue)
                return;
        rxq = queue;
        dev = rxq->priv->dev;
-       FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE)
-               SUBOPS(sdev, rx_queue_release)
-                       (ETH(sdev)->data->rx_queues[rxq->qid]);
+       FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) {
+               if (ETH(sdev)->data->rx_queues != NULL &&
+                   ETH(sdev)->data->rx_queues[rxq->qid] != NULL) {
+                       SUBOPS(sdev, rx_queue_release)
+                               (ETH(sdev)->data->rx_queues[rxq->qid]);
+               }
+       }
        dev->data->rx_queues[rxq->qid] = NULL;
        rte_free(rxq);
 }
@@ -275,6 +284,11 @@ fs_rx_queue_setup(struct rte_eth_dev *dev,
        uint8_t i;
        int ret;
 
+       if (rx_conf->rx_deferred_start) {
+               ERROR("Rx queue deferred start is not supported");
+               return -EINVAL;
+       }
+
        rxq = dev->data->rx_queues[rx_queue_id];
        if (rxq != NULL) {
                fs_rx_queue_release(rxq);
@@ -323,9 +337,13 @@ fs_tx_queue_release(void *queue)
                return;
        txq = queue;
        dev = txq->priv->dev;
-       FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE)
-               SUBOPS(sdev, tx_queue_release)
-                       (ETH(sdev)->data->tx_queues[txq->qid]);
+       FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) {
+               if (ETH(sdev)->data->tx_queues != NULL &&
+                   ETH(sdev)->data->tx_queues[txq->qid] != NULL) {
+                       SUBOPS(sdev, tx_queue_release)
+                               (ETH(sdev)->data->tx_queues[txq->qid]);
+               }
+       }
        dev->data->tx_queues[txq->qid] = NULL;
        rte_free(txq);
 }
@@ -342,6 +360,11 @@ fs_tx_queue_setup(struct rte_eth_dev *dev,
        uint8_t i;
        int ret;
 
+       if (tx_conf->tx_deferred_start) {
+               ERROR("Tx queue deferred start is not supported");
+               return -EINVAL;
+       }
+
        txq = dev->data->tx_queues[tx_queue_id];
        if (txq != NULL) {
                fs_tx_queue_release(txq);