net/ena: add reset routine

Reset routine can be used by the DPDK application to reset the device in
case of receiving RTE_ETH_EVENT_INTR_RESET from the PMD.

The reset event is not triggered by the driver, yet. It will be added in
next commits to enable error recovery in case of misfunctioning of the
device.

Signed-off-by: Michal Krawczyk <mk@semihalf.com>

diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
index 58cf8a9..4fae4fd 100644 (file)
--- a/drivers/net/ena/ena_ethdev.c
+++ b/drivers/net/ena/ena_ethdev.c
@@ -225,6 +225,7 @@ static int ena_mtu_set(struct rte_eth_dev *dev, uint16_t mtu);
 static int ena_start(struct rte_eth_dev *dev);
 static void ena_stop(struct rte_eth_dev *dev);
 static void ena_close(struct rte_eth_dev *dev);
+static int ena_dev_reset(struct rte_eth_dev *dev);
 static int ena_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats);
 static void ena_rx_queue_release_all(struct rte_eth_dev *dev);
 static void ena_tx_queue_release_all(struct rte_eth_dev *dev);
@@ -262,6 +263,7 @@ static const struct eth_dev_ops ena_dev_ops = {
        .rx_queue_release     = ena_rx_queue_release,
        .tx_queue_release     = ena_tx_queue_release,
        .dev_close            = ena_close,
+       .dev_reset            = ena_dev_reset,
        .reta_update          = ena_rss_reta_update,
        .reta_query           = ena_rss_reta_query,
 };
@@ -470,6 +472,63 @@ static void ena_close(struct rte_eth_dev *dev)
        ena_tx_queue_release_all(dev);
 }
 
+static int
+ena_dev_reset(struct rte_eth_dev *dev)
+{
+       struct rte_mempool *mb_pool_rx[ENA_MAX_NUM_QUEUES];
+       struct rte_eth_dev *eth_dev;
+       struct rte_pci_device *pci_dev;
+       struct rte_intr_handle *intr_handle;
+       struct ena_com_dev *ena_dev;
+       struct ena_com_dev_get_features_ctx get_feat_ctx;
+       struct ena_adapter *adapter;
+       int nb_queues;
+       int rc, i;
+
+       adapter = (struct ena_adapter *)(dev->data->dev_private);
+       ena_dev = &adapter->ena_dev;
+       eth_dev = adapter->rte_dev;
+       pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
+       intr_handle = &pci_dev->intr_handle;
+       nb_queues = eth_dev->data->nb_rx_queues;
+
+       ena_com_set_admin_running_state(ena_dev, false);
+
+       ena_com_dev_reset(ena_dev, adapter->reset_reason);
+
+       for (i = 0; i < nb_queues; i++)
+               mb_pool_rx[i] = adapter->rx_ring[i].mb_pool;
+
+       ena_rx_queue_release_all(eth_dev);
+       ena_tx_queue_release_all(eth_dev);
+
+       rte_intr_disable(intr_handle);
+
+       ena_com_abort_admin_commands(ena_dev);
+       ena_com_wait_for_abort_completion(ena_dev);
+       ena_com_admin_destroy(ena_dev);
+       ena_com_mmio_reg_read_request_destroy(ena_dev);
+
+       rc = ena_device_init(ena_dev, &get_feat_ctx);
+       if (rc) {
+               PMD_INIT_LOG(CRIT, "Cannot initialize device\n");
+               return rc;
+       }
+
+       rte_intr_enable(intr_handle);
+       ena_com_set_admin_polling_mode(ena_dev, false);
+       ena_com_admin_aenq_enable(ena_dev);
+
+       for (i = 0; i < nb_queues; ++i)
+               ena_rx_queue_setup(eth_dev, i, adapter->rx_ring_size, 0, NULL,
+                       mb_pool_rx[i]);
+
+       for (i = 0; i < nb_queues; ++i)
+               ena_tx_queue_setup(eth_dev, i, adapter->tx_ring_size, 0, NULL);
+
+       return 0;
+}
+
 static int ena_rss_reta_update(struct rte_eth_dev *dev,
                               struct rte_eth_rss_reta_entry64 *reta_conf,
                               uint16_t reta_size)
@@ -1074,7 +1133,10 @@ static int ena_tx_queue_setup(struct rte_eth_dev *dev,
        for (i = 0; i < txq->ring_size; i++)
                txq->empty_tx_reqs[i] = i;
 
-       txq->offloads = tx_conf->offloads | dev->data->dev_conf.txmode.offloads;
+       if (tx_conf != NULL) {
+               txq->offloads =
+                       tx_conf->offloads | dev->data->dev_conf.txmode.offloads;
+       }
 
        /* Store pointer to this queue in upper layer */
        txq->configured = 1;

diff --git a/drivers/net/ena/ena_ethdev.h b/drivers/net/ena/ena_ethdev.h
index 16172a5..79e9e65 100644 (file)
--- a/drivers/net/ena/ena_ethdev.h
+++ b/drivers/net/ena/ena_ethdev.h
@@ -183,6 +183,8 @@ struct ena_adapter {
        uint64_t rx_selected_offloads;
 
        bool link_status;
+
+       enum ena_regs_reset_reason_types reset_reason;
 };
 
 #endif /* _ENA_ETHDEV_H_ */