From: Yong Liu <yong.liu@intel.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v1 4/7] e1000: add rxq interrupt handler
Date: Fri, 25 Sep 2015 16:28:09 +0800 [thread overview]
Message-ID: <1443169692-4709-5-git-send-email-yong.liu@intel.com> (raw)
In-Reply-To: <1443169692-4709-1-git-send-email-yong.liu@intel.com>
From: Marvin Liu <yong.liu@intel.com>
When datapath rxq interupt is enabled, enable device rxq.
After device stopped, remove the interrupt handler.
Signed-off-by: Marvin Liu <yong.liu@intel.com>
diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c
index 2b67b62..5d94b55 100644
--- a/drivers/net/e1000/em_ethdev.c
+++ b/drivers/net/e1000/em_ethdev.c
@@ -501,7 +501,9 @@ eth_em_start(struct rte_eth_dev *dev)
E1000_DEV_PRIVATE(dev->data->dev_private);
struct e1000_hw *hw =
E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle;
int ret, mask;
+ uint32_t intr_vector = 0;
PMD_INIT_FUNC_TRACE();
@@ -537,6 +539,26 @@ eth_em_start(struct rte_eth_dev *dev)
/* Configure for OS presence */
em_init_manageability(hw);
+ if (dev->data->dev_conf.intr_conf.rxq != 0) {
+ intr_vector = dev->data->nb_rx_queues;
+ if (rte_intr_efd_enable(intr_handle, intr_vector))
+ return -1;
+ }
+
+ if (rte_intr_dp_is_en(intr_handle)) {
+ intr_handle->intr_vec =
+ rte_zmalloc("intr_vec",
+ dev->data->nb_rx_queues * sizeof(int), 0);
+ if (intr_handle->intr_vec == NULL) {
+ PMD_INIT_LOG(ERR, "Failed to allocate %d rx_queues"
+ " intr_vec\n", dev->data->nb_rx_queues);
+ return -ENOMEM;
+ }
+
+ /* enable rx interrupt */
+ em_rxq_intr_enable(hw);
+ }
+
eth_em_tx_init(dev);
ret = eth_em_rx_init(dev);
@@ -621,6 +643,8 @@ eth_em_start(struct rte_eth_dev *dev)
if (dev->data->dev_conf.intr_conf.rxq != 0)
eth_em_rxq_interrupt_setup(dev);
+ rte_intr_enable(intr_handle);
+
adapter->stopped = 0;
PMD_INIT_LOG(DEBUG, "<<");
@@ -646,6 +670,7 @@ eth_em_stop(struct rte_eth_dev *dev)
{
struct rte_eth_link link;
struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle;
em_rxq_intr_disable(hw);
em_lsc_intr_disable(hw);
@@ -662,6 +687,12 @@ eth_em_stop(struct rte_eth_dev *dev)
/* clear the recorded link status */
memset(&link, 0, sizeof(link));
rte_em_dev_atomic_write_link_status(dev, &link);
+ /* Clean datapath event and queue/vec mapping */
+ rte_intr_efd_disable(intr_handle);
+ if (intr_handle->intr_vec != NULL) {
+ rte_free(intr_handle->intr_vec);
+ intr_handle->intr_vec = NULL;
+ }
}
static void
--
1.9.3
next prev parent reply other threads:[~2015-09-25 8:28 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-25 8:28 [dpdk-dev] [PATCH v1 0/7] interrupt mode for e1000 Yong Liu
2015-09-25 8:28 ` [dpdk-dev] [PATCH v1 1/7] e1000: add rx interrupt support Yong Liu
2015-10-26 7:35 ` Liang, Cunming
2015-10-27 14:48 ` Liu, Yong
2015-09-25 8:28 ` [dpdk-dev] [PATCH v1 2/7] e1000: separate lsc and rxq interrupt function Yong Liu
2015-09-25 8:28 ` [dpdk-dev] [PATCH v1 3/7] e1000: add ethdev rxq enable and disable function Yong Liu
2015-10-26 7:37 ` Liang, Cunming
2015-09-25 8:28 ` Yong Liu [this message]
2015-09-25 8:28 ` [dpdk-dev] [PATCH v1 5/7] e1000: check lsc and rxq not enable in the same time Yong Liu
2015-09-25 8:28 ` [dpdk-dev] [PATCH v1 6/7] e1000: lsc interrupt setup only enable itself Yong Liu
2015-09-25 8:28 ` [dpdk-dev] [PATCH v1 7/7] l3fwd-power: disable interrupt when wake up from sleep Yong Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1443169692-4709-5-git-send-email-yong.liu@intel.com \
--to=yong.liu@intel.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).