From: Intel <intel.com>
Date: Mon, 3 Jun 2013 00:00:00 +0000 (+0200)
Subject: e1000: retrieve RX available descriptors
X-Git-Tag: spdx-start~11222
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=6acc6176c43cb6b06e8c30331ee433bc0a389b7b;p=dpdk.git

e1000: retrieve RX available descriptors

Signed-off-by: Intel
---

diff --git a/lib/librte_pmd_e1000/e1000_ethdev.h b/lib/librte_pmd_e1000/e1000_ethdev.h
index a589a89988..6acac23a9e 100644
--- a/lib/librte_pmd_e1000/e1000_ethdev.h
+++ b/lib/librte_pmd_e1000/e1000_ethdev.h
@@ -131,6 +131,9 @@ int eth_em_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
 		const struct rte_eth_rxconf *rx_conf,
 		struct rte_mempool *mb_pool);
 
+uint32_t eth_em_rx_queue_count(struct rte_eth_dev *dev, 
+		uint16_t rx_queue_id);
+
 int eth_em_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
 		uint16_t nb_tx_desc, unsigned int socket_id,
 		const struct rte_eth_txconf *tx_conf);
diff --git a/lib/librte_pmd_e1000/em_ethdev.c b/lib/librte_pmd_e1000/em_ethdev.c
index 01cad14793..7c6bf77ad4 100644
--- a/lib/librte_pmd_e1000/em_ethdev.c
+++ b/lib/librte_pmd_e1000/em_ethdev.c
@@ -147,6 +147,7 @@ static struct eth_dev_ops eth_em_ops = {
 	.vlan_offload_set     = eth_em_vlan_offload_set,
 	.rx_queue_setup       = eth_em_rx_queue_setup,
 	.rx_queue_release     = eth_em_rx_queue_release,
+	.rx_queue_count       = eth_em_rx_queue_count,	
 	.tx_queue_setup       = eth_em_tx_queue_setup,
 	.tx_queue_release     = eth_em_tx_queue_release,
 	.dev_led_on           = eth_em_led_on,
diff --git a/lib/librte_pmd_e1000/em_rxtx.c b/lib/librte_pmd_e1000/em_rxtx.c
index b7c4598132..b63071f607 100644
--- a/lib/librte_pmd_e1000/em_rxtx.c
+++ b/lib/librte_pmd_e1000/em_rxtx.c
@@ -121,6 +121,7 @@ struct em_rx_queue {
 	volatile struct e1000_rx_desc *rx_ring; /**< RX ring virtual address. */
 	uint64_t            rx_ring_phys_addr; /**< RX ring DMA address. */
 	volatile uint32_t   *rdt_reg_addr; /**< RDT register address. */
+	volatile uint32_t   *rdh_reg_addr; /**< RDH register address. */
 	struct em_rx_entry *sw_ring;   /**< address of RX software ring. */
 	struct rte_mbuf *pkt_first_seg; /**< First segment of current packet. */
 	struct rte_mbuf *pkt_last_seg;  /**< Last segment of current packet. */
@@ -1403,6 +1404,7 @@ eth_em_rx_queue_setup(struct rte_eth_dev *dev,
 				0 : ETHER_CRC_LEN);
 
 	rxq->rdt_reg_addr = E1000_PCI_REG_ADDR(hw, E1000_RDT(queue_idx));
+	rxq->rdh_reg_addr = E1000_PCI_REG_ADDR(hw, E1000_RDH(queue_idx));	
 	rxq->rx_ring_phys_addr = (uint64_t) rz->phys_addr;
 	rxq->rx_ring = (struct e1000_rx_desc *) rz->addr;
 
@@ -1415,6 +1417,31 @@ eth_em_rx_queue_setup(struct rte_eth_dev *dev,
 	return (0);
 }
 
+uint32_t 
+eth_em_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id)
+{
+	struct em_rx_queue *rxq;
+	uint32_t nb_pkts_available;
+	uint32_t rx_rdh;
+	uint32_t rx_id;
+
+	if (rx_queue_id >= dev->data->nb_rx_queues) {
+		PMD_RX_LOG(DEBUG,"Invalid RX queue_id=%d\n", rx_queue_id);
+		return 0;
+	}
+
+	rxq = dev->data->rx_queues[rx_queue_id];
+	rx_id = (uint16_t) ((rxq->rx_tail == 0) ? (rxq->nb_rx_desc - 1) :
+							(rxq->rx_tail - 1));
+	rx_rdh = E1000_PCI_REG(rxq->rdh_reg_addr);
+	if (rx_rdh > rx_id) 
+		nb_pkts_available = rx_rdh - rx_id;
+	else 
+		nb_pkts_available = rx_rdh - rx_id + rxq->nb_rx_desc;
+	
+	return (nb_pkts_available);	
+}
+
 void
 em_dev_clear_queues(struct rte_eth_dev *dev)
 {