From: Yong Liu <yong.liu@intel.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v1 2/7] e1000: separate lsc and rxq interrupt function
Date: Fri, 25 Sep 2015 16:28:07 +0800 [thread overview]
Message-ID: <1443169692-4709-3-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>
Separate lsc and rxq interrupt for they have different interrupt handlers.
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 99beb9c..e86c039 100644
--- a/drivers/net/e1000/em_ethdev.c
+++ b/drivers/net/e1000/em_ethdev.c
@@ -108,11 +108,13 @@ static void em_vlan_hw_strip_disable(struct rte_eth_dev *dev);
static void eth_em_vlan_filter_set(struct rte_eth_dev *dev,
uint16_t vlan_id, int on);
*/
+static void em_lsc_intr_disable(struct e1000_hw *hw);
static void em_rxq_intr_enable(struct e1000_hw *hw);
+static void em_rxq_intr_disable(struct e1000_hw *hw);
+
static int eth_em_led_on(struct rte_eth_dev *dev);
static int eth_em_led_off(struct rte_eth_dev *dev);
-static void em_intr_disable(struct e1000_hw *hw);
static int em_get_rx_buffer_size(struct e1000_hw *hw);
static void eth_em_rar_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr,
uint32_t index, uint32_t pool);
@@ -640,7 +642,9 @@ 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);
- em_intr_disable(hw);
+ em_rxq_intr_disable(hw);
+ em_lsc_intr_disable(hw);
+
e1000_reset_hw(hw);
if (hw->mac.type >= e1000_82544)
E1000_WRITE_REG(hw, E1000_WUC, 0);
@@ -1254,12 +1258,6 @@ eth_em_vlan_offload_set(struct rte_eth_dev *dev, int mask)
}
}
-static void
-em_intr_disable(struct e1000_hw *hw)
-{
- E1000_WRITE_REG(hw, E1000_IMC, ~0);
-}
-
/**
* It enables the interrupt mask and then enable the interrupt.
*
@@ -1302,6 +1300,31 @@ eth_em_rxq_interrupt_setup(struct rte_eth_dev *dev)
return 0;
}
+/* It disabled lsc interrupt.
+ * @param hw
+ * Pointer to struct e1000_hw
+ *
+ * @return
+ */
+static void
+em_lsc_intr_disable(struct e1000_hw *hw)
+{
+ E1000_WRITE_REG(hw, E1000_IMC, E1000_IMS_LSC);
+}
+
+/* It disabled receive packet interrupt.
+ * @param hw
+ * Pointer to struct e1000_hw
+ *
+ * @return
+ */
+static void
+em_rxq_intr_disable(struct e1000_hw *hw)
+{
+ E1000_READ_REG(hw, E1000_ICR);
+ E1000_WRITE_REG(hw, E1000_IMC, E1000_IMS_RXT0);
+}
+
/* It enable receive packet interrupt.
* @param hw
* Pointer to struct e1000_hw
--
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 ` Yong Liu [this message]
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 ` [dpdk-dev] [PATCH v1 4/7] e1000: add rxq interrupt handler Yong Liu
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-3-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).