DPDK patches and discussions
 help / color / mirror / Atom feed
From: Yong Liu <yong.liu@intel.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v3 5/8] e1000: check lsc and rxq not enable in the same time
Date: Thu, 29 Oct 2015 17:18:42 +0800	[thread overview]
Message-ID: <1446110325-14148-6-git-send-email-yong.liu@intel.com> (raw)
In-Reply-To: <1446110325-14148-1-git-send-email-yong.liu@intel.com>

e1000 only support one type of interrupt cause, so remove lsc interrupt
handler if rxq enabled.

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 fc3cc1e..b1e0c3c 100644
--- a/drivers/net/e1000/em_ethdev.c
+++ b/drivers/net/e1000/em_ethdev.c
@@ -630,14 +630,22 @@ eth_em_start(struct rte_eth_dev *dev)
 	}
 	e1000_setup_link(hw);
 
-	/* check if lsc interrupt feature is enabled */
-	if (dev->data->dev_conf.intr_conf.lsc != 0) {
-		ret = eth_em_interrupt_setup(dev);
-		if (ret) {
-			PMD_INIT_LOG(ERR, "Unable to setup interrupts");
-			em_dev_clear_queues(dev);
-			return ret;
-		}
+	if (rte_intr_allow_others(intr_handle)) {
+		/* check if lsc interrupt is enabled */
+		if (dev->data->dev_conf.intr_conf.lsc != 0)
+			ret = eth_em_interrupt_setup(dev);
+			if (ret) {
+				PMD_INIT_LOG(ERR, "Unable to setup interrupts");
+				em_dev_clear_queues(dev);
+				return ret;
+			}
+	} else {
+		rte_intr_callback_unregister(intr_handle,
+						eth_em_interrupt_handler,
+						(void *)dev);
+		if (dev->data->dev_conf.intr_conf.lsc != 0)
+			PMD_INIT_LOG(INFO, "lsc won't enable because of"
+				     " no intr multiplex\n");
 	}
 	/* check if rxq interrupt is enabled */
 	if (dev->data->dev_conf.intr_conf.rxq != 0)
@@ -688,6 +696,12 @@ eth_em_stop(struct rte_eth_dev *dev)
 	memset(&link, 0, sizeof(link));
 	rte_em_dev_atomic_write_link_status(dev, &link);
 
+	if (!rte_intr_allow_others(intr_handle))
+		/* resume to the default handler */
+		rte_intr_callback_register(intr_handle,
+					   eth_em_interrupt_handler,
+					   (void *)dev);
+
 	/* Clean datapath event and queue/vec mapping */
 	rte_intr_efd_disable(intr_handle);
 	if (intr_handle->intr_vec != NULL) {
-- 
1.9.3

  parent reply	other threads:[~2015-10-29  9:19 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-29  9:18 [dpdk-dev] [PATCH v3 0/8] interrupt mode for e1000 Yong Liu
2015-10-29  9:18 ` [dpdk-dev] [PATCH v3 1/8] e1000: add rx interrupt support Yong Liu
2015-10-29  9:18 ` [dpdk-dev] [PATCH v3 2/8] e1000: separate lsc and rxq interrupt disable function Yong Liu
2015-10-29  9:18 ` [dpdk-dev] [PATCH v3 3/8] e1000: add ethdev rxq enable and " Yong Liu
2015-10-29  9:18 ` [dpdk-dev] [PATCH v3 4/8] e1000: add rxq interrupt handler Yong Liu
2015-10-29  9:18 ` Yong Liu [this message]
2015-10-29  9:18 ` [dpdk-dev] [PATCH v3 6/8] e1000: lsc interrupt setup function only enable itself Yong Liu
2015-10-29  9:18 ` [dpdk-dev] [PATCH v3 7/8] l3fwd-power: disable interrupt when wake up from sleep Yong Liu
2015-10-29  9:18 ` [dpdk-dev] [PATCH v3 8/8] doc: release note update for e1000 intr mode Yong Liu
2015-10-29 10:19 ` [dpdk-dev] [PATCH v3 0/8] interrupt mode for e1000 Liang, Cunming

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=1446110325-14148-6-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).