net/enic: get Rx queue count

[dpdk.git] / drivers / net / enic / enic_ethdev.c

diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c
index 47b07c9..6c8a779 100644 (file)
--- a/drivers/net/enic/enic_ethdev.c
+++ b/drivers/net/enic/enic_ethdev.c
@@ -260,6 +260,35 @@ static void enicpmd_dev_rx_queue_release(void *rxq)
        enic_free_rq(rxq);
 }
 
+static uint32_t enicpmd_dev_rx_queue_count(struct rte_eth_dev *dev,
+                                          uint16_t rx_queue_id)
+{
+       struct enic *enic = pmd_priv(dev);
+       uint32_t queue_count = 0;
+       struct vnic_cq *cq;
+       uint32_t cq_tail;
+       uint16_t cq_idx;
+       int rq_num;
+
+       if (rx_queue_id >= dev->data->nb_rx_queues) {
+               dev_err(enic, "Invalid RX queue id=%d", rx_queue_id);
+               return 0;
+       }
+
+       rq_num = enic_sop_rq(rx_queue_id);
+       cq = &enic->cq[enic_cq_rq(enic, rq_num)];
+       cq_idx = cq->to_clean;
+
+       cq_tail = ioread32(&cq->ctrl->cq_tail);
+
+       if (cq_tail < cq_idx)
+               cq_tail += cq->ring.desc_count;
+
+       queue_count = cq_tail - cq_idx;
+
+       return queue_count;
+}
+
 static int enicpmd_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
        uint16_t queue_idx,
        uint16_t nb_desc,
@@ -568,7 +597,7 @@ static const struct eth_dev_ops enicpmd_eth_dev_ops = {
        .tx_queue_stop        = enicpmd_dev_tx_queue_stop,
        .rx_queue_setup       = enicpmd_dev_rx_queue_setup,
        .rx_queue_release     = enicpmd_dev_rx_queue_release,
-       .rx_queue_count       = NULL,
+       .rx_queue_count       = enicpmd_dev_rx_queue_count,
        .rx_descriptor_done   = NULL,
        .tx_queue_setup       = enicpmd_dev_tx_queue_setup,
        .tx_queue_release     = enicpmd_dev_tx_queue_release,
@@ -613,32 +642,14 @@ static int eth_enicpmd_dev_init(struct rte_eth_dev *eth_dev)
 
 static struct eth_driver rte_enic_pmd = {
        .pci_drv = {
-               .name = "rte_enic_pmd",
                .id_table = pci_id_enic_map,
                .drv_flags = RTE_PCI_DRV_NEED_MAPPING,
+               .probe = rte_eth_dev_pci_probe,
+               .remove = rte_eth_dev_pci_remove,
        },
        .eth_dev_init = eth_enicpmd_dev_init,
        .dev_private_size = sizeof(struct enic),
 };
 
-/* Driver initialization routine.
- * Invoked once at EAL init time.
- * Register as the [Poll Mode] Driver of Cisco ENIC device.
- */
-static int
-rte_enic_pmd_init(__rte_unused const char *name,
-        __rte_unused const char *params)
-{
-       ENICPMD_FUNC_TRACE();
-
-       rte_eth_driver_register(&rte_enic_pmd);
-       return 0;
-}
-
-static struct rte_driver rte_enic_driver = {
-       .type = PMD_PDEV,
-       .init = rte_enic_pmd_init,
-};
-
-PMD_REGISTER_DRIVER(rte_enic_driver, enic);
-DRIVER_REGISTER_PCI_TABLE(enic, pci_id_enic_map);
+DRIVER_REGISTER_PCI(net_enic, rte_enic_pmd.pci_drv);
+DRIVER_REGISTER_PCI_TABLE(net_enic, pci_id_enic_map);