Thread (231 messages) 231 messages, 9 authors, 2016-11-11

Re: [PATCH v3 12/15] ether: extract function eth_dev_get_intr_handle

From: Hunt, David <hidden>
Date: 2016-09-15 13:02:22

On 9/9/2016 9:43 AM, Shreyansh Jain wrote:
quoted hunk ↗ jump to hunk
We abstract access to the intr_handle here as we want to get
it either from the pci_dev or soc_dev.

Signed-off-by: Jan Viktorin <redacted>
Signed-off-by: Shreyansh Jain <redacted>
Signed-off-by: Hemant Agrawal <redacted>
---
  lib/librte_ether/rte_ethdev.c | 15 +++++++++++++--
  1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index e9f5467..104ea4a 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -2526,6 +2526,17 @@ _rte_eth_dev_callback_process(struct rte_eth_dev *dev,
  	rte_spinlock_unlock(&rte_eth_dev_cb_lock);
  }
  
+static inline
+struct rte_intr_handle *eth_dev_get_intr_handle(struct rte_eth_dev *dev)
+{
+	if (dev->pci_dev) {
+		return &dev->pci_dev->intr_handle;
+	}
+
+	RTE_VERIFY(0);
Rather than RTE_VERIFY(0), might I suggest using rte_panic with a more 
relevant error message?

quoted hunk ↗ jump to hunk
+	return NULL;
+}
+
  int
  rte_eth_dev_rx_intr_ctl(uint8_t port_id, int epfd, int op, void *data)
  {
@@ -2538,7 +2549,7 @@ rte_eth_dev_rx_intr_ctl(uint8_t port_id, int epfd, int op, void *data)
  	RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
  
  	dev = &rte_eth_devices[port_id];
-	intr_handle = &dev->pci_dev->intr_handle;
+	intr_handle = eth_dev_get_intr_handle(dev);
  	if (!intr_handle->intr_vec) {
  		RTE_PMD_DEBUG_TRACE("RX Intr vector unset\n");
  		return -EPERM;
@@ -2598,7 +2609,7 @@ rte_eth_dev_rx_intr_ctl_q(uint8_t port_id, uint16_t queue_id,
  		return -EINVAL;
  	}
  
-	intr_handle = &dev->pci_dev->intr_handle;
+	intr_handle = eth_dev_get_intr_handle(dev);
  	if (!intr_handle->intr_vec) {
  		RTE_PMD_DEBUG_TRACE("RX Intr vector unset\n");
  		return -EPERM;
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help