[dpdk-dev] [PATCH v1 2/7] e1000: separate lsc and rxq interrupt function

[Yong Liu]

From: Marvin Liu <yong....@intel.com>

Separate lsc and rxq interrupt for they have different interrupt handlers.

Signed-off-by: Marvin Liu <yong.liu at 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