* [dpdk-stable] [PATCH 1/3] net/ixgbe: fix lsc interrupt
@ 2017-07-13 9:43 Jingjing Wu
2017-07-13 9:43 ` [dpdk-stable] [PATCH 2/3] net/i40e: " Jingjing Wu
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Jingjing Wu @ 2017-07-13 9:43 UTC (permalink / raw)
To: wenzhuo.lu; +Cc: dev, jingjing.wu, stable
If LSC flag is changed to off last device start, the
enable flag is not cleared in HW.
This patch fixes it.
Fixes: 0eb609239efd ("ixgbe: enable Rx queue interrupts for PF and VF")
Cc: stable@dpdk.org
Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
---
drivers/net/ixgbe/ixgbe_ethdev.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index c54d325..7ceeea8 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -240,7 +240,7 @@ static int ixgbe_dev_rss_reta_query(struct rte_eth_dev *dev,
struct rte_eth_rss_reta_entry64 *reta_conf,
uint16_t reta_size);
static void ixgbe_dev_link_status_print(struct rte_eth_dev *dev);
-static int ixgbe_dev_lsc_interrupt_setup(struct rte_eth_dev *dev);
+static int ixgbe_dev_lsc_interrupt_setup(struct rte_eth_dev *dev, uint8_t on);
static int ixgbe_dev_macsec_interrupt_setup(struct rte_eth_dev *dev);
static int ixgbe_dev_rxq_interrupt_setup(struct rte_eth_dev *dev);
static int ixgbe_dev_interrupt_get_status(struct rte_eth_dev *dev);
@@ -2669,7 +2669,9 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
if (rte_intr_allow_others(intr_handle)) {
/* check if lsc interrupt is enabled */
if (dev->data->dev_conf.intr_conf.lsc != 0)
- ixgbe_dev_lsc_interrupt_setup(dev);
+ ixgbe_dev_lsc_interrupt_setup(dev, TRUE);
+ else
+ ixgbe_dev_lsc_interrupt_setup(dev, FALSE);
ixgbe_dev_macsec_interrupt_setup(dev);
} else {
rte_intr_callback_unregister(intr_handle,
@@ -4052,19 +4054,24 @@ ixgbe_dev_allmulticast_disable(struct rte_eth_dev *dev)
*
* @param dev
* Pointer to struct rte_eth_dev.
+ * @param on
+ * Enable or Disable.
*
* @return
* - On success, zero.
* - On failure, a negative value.
*/
static int
-ixgbe_dev_lsc_interrupt_setup(struct rte_eth_dev *dev)
+ixgbe_dev_lsc_interrupt_setup(struct rte_eth_dev *dev, uint8_t on)
{
struct ixgbe_interrupt *intr =
IXGBE_DEV_PRIVATE_TO_INTR(dev->data->dev_private);
ixgbe_dev_link_status_print(dev);
- intr->mask |= IXGBE_EICR_LSC;
+ if (on)
+ intr->mask |= IXGBE_EICR_LSC;
+ else
+ intr->mask &= ~IXGBE_EICR_LSC;
return 0;
}
--
2.4.11
^ permalink raw reply [flat|nested] 6+ messages in thread
* [dpdk-stable] [PATCH 2/3] net/i40e: fix lsc interrupt
2017-07-13 9:43 [dpdk-stable] [PATCH 1/3] net/ixgbe: fix lsc interrupt Jingjing Wu
@ 2017-07-13 9:43 ` Jingjing Wu
2017-07-13 9:43 ` [dpdk-stable] [PATCH 3/3] net/e1000: " Jingjing Wu
2017-07-13 13:33 ` [dpdk-stable] [PATCH 1/3] net/ixgbe: " Lu, Wenzhuo
2 siblings, 0 replies; 6+ messages in thread
From: Jingjing Wu @ 2017-07-13 9:43 UTC (permalink / raw)
To: wenzhuo.lu; +Cc: dev, jingjing.wu, stable
If LSC flag is changed to off last device start, the
enable flag is not cleared in HW.
This patch fixes it.
Fixes: f4668a33efe5 ("net/i40e: fix link status change interrupt")
Cc: stable@dpdk.org
Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
---
drivers/net/i40e/i40e_ethdev.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 97a73e1..0db4c96 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -2016,7 +2016,7 @@ i40e_dev_start(struct rte_eth_dev *dev)
if (dev->data->dev_conf.intr_conf.lsc != 0)
PMD_INIT_LOG(INFO,
"lsc won't enable because of no intr multiplex");
- } else if (dev->data->dev_conf.intr_conf.lsc != 0) {
+ } else {
ret = i40e_aq_set_phy_int_mask(hw,
~(I40E_AQ_EVENT_LINK_UPDOWN |
I40E_AQ_EVENT_MODULE_QUAL_FAIL |
@@ -2024,7 +2024,7 @@ i40e_dev_start(struct rte_eth_dev *dev)
if (ret != I40E_SUCCESS)
PMD_DRV_LOG(WARNING, "Fail to set phy mask");
- /* Call get_link_info aq commond to enable LSE */
+ /* Call get_link_info aq commond to enable/disable LSE */
i40e_dev_link_update(dev, 0);
}
--
2.4.11
^ permalink raw reply [flat|nested] 6+ messages in thread
* [dpdk-stable] [PATCH 3/3] net/e1000: fix lsc interrupt
2017-07-13 9:43 [dpdk-stable] [PATCH 1/3] net/ixgbe: fix lsc interrupt Jingjing Wu
2017-07-13 9:43 ` [dpdk-stable] [PATCH 2/3] net/i40e: " Jingjing Wu
@ 2017-07-13 9:43 ` Jingjing Wu
2017-07-13 13:34 ` Lu, Wenzhuo
2017-07-13 13:33 ` [dpdk-stable] [PATCH 1/3] net/ixgbe: " Lu, Wenzhuo
2 siblings, 1 reply; 6+ messages in thread
From: Jingjing Wu @ 2017-07-13 9:43 UTC (permalink / raw)
To: wenzhuo.lu; +Cc: dev, jingjing.wu, stable
If LSC flag is changed to off last device start, the
enable flag is not cleared in HW.
This patch fixes it.
Fixes: c3cd3de0ab50 ("igb: enable Rx queue interrupts for PF")
Cc: stable@dpdk.org
Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
---
drivers/net/e1000/igb_ethdev.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
index da03d9b..e4f7a9f 100644
--- a/drivers/net/e1000/igb_ethdev.c
+++ b/drivers/net/e1000/igb_ethdev.c
@@ -138,7 +138,7 @@ static int eth_igb_flow_ctrl_get(struct rte_eth_dev *dev,
struct rte_eth_fc_conf *fc_conf);
static int eth_igb_flow_ctrl_set(struct rte_eth_dev *dev,
struct rte_eth_fc_conf *fc_conf);
-static int eth_igb_lsc_interrupt_setup(struct rte_eth_dev *dev);
+static int eth_igb_lsc_interrupt_setup(struct rte_eth_dev *dev, uint8_t on);
static int eth_igb_rxq_interrupt_setup(struct rte_eth_dev *dev);
static int eth_igb_interrupt_get_status(struct rte_eth_dev *dev);
static int eth_igb_interrupt_action(struct rte_eth_dev *dev,
@@ -1472,7 +1472,9 @@ eth_igb_start(struct rte_eth_dev *dev)
if (rte_intr_allow_others(intr_handle)) {
/* check if lsc interrupt is enabled */
if (dev->data->dev_conf.intr_conf.lsc != 0)
- eth_igb_lsc_interrupt_setup(dev);
+ eth_igb_lsc_interrupt_setup(dev, TRUE);
+ else
+ eth_igb_lsc_interrupt_setup(dev, FALSE);
} else {
rte_intr_callback_unregister(intr_handle,
eth_igb_interrupt_handler,
@@ -2744,18 +2746,23 @@ eth_igb_vlan_offload_set(struct rte_eth_dev *dev, int mask)
*
* @param dev
* Pointer to struct rte_eth_dev.
+ * @param on
+ * Enable or Disable
*
* @return
* - On success, zero.
* - On failure, a negative value.
*/
static int
-eth_igb_lsc_interrupt_setup(struct rte_eth_dev *dev)
+eth_igb_lsc_interrupt_setup(struct rte_eth_dev *dev, uint8_t on)
{
struct e1000_interrupt *intr =
E1000_DEV_PRIVATE_TO_INTR(dev->data->dev_private);
- intr->mask |= E1000_ICR_LSC;
+ if (on)
+ intr->mask |= E1000_ICR_LSC;
+ else
+ intr->mask &= ~E1000_ICR_LSC;
return 0;
}
--
2.4.11
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-stable] [PATCH 1/3] net/ixgbe: fix lsc interrupt
2017-07-13 9:43 [dpdk-stable] [PATCH 1/3] net/ixgbe: fix lsc interrupt Jingjing Wu
2017-07-13 9:43 ` [dpdk-stable] [PATCH 2/3] net/i40e: " Jingjing Wu
2017-07-13 9:43 ` [dpdk-stable] [PATCH 3/3] net/e1000: " Jingjing Wu
@ 2017-07-13 13:33 ` Lu, Wenzhuo
2017-07-18 10:05 ` Ferruh Yigit
2 siblings, 1 reply; 6+ messages in thread
From: Lu, Wenzhuo @ 2017-07-13 13:33 UTC (permalink / raw)
To: Wu, Jingjing; +Cc: dev, stable
Hi,
-----Original Message-----
From: Wu, Jingjing
Sent: Thursday, July 13, 2017 5:43 AM
To: Lu, Wenzhuo <wenzhuo.lu@intel.com>
Cc: dev@dpdk.org; Wu, Jingjing <jingjing.wu@intel.com>; stable@dpdk.org
Subject: [PATCH 1/3] net/ixgbe: fix lsc interrupt
If LSC flag is changed to off last device start, the enable flag is not cleared in HW.
This patch fixes it.
Fixes: 0eb609239efd ("ixgbe: enable Rx queue interrupts for PF and VF")
Cc: stable@dpdk.org
Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
Acked-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-stable] [PATCH 3/3] net/e1000: fix lsc interrupt
2017-07-13 9:43 ` [dpdk-stable] [PATCH 3/3] net/e1000: " Jingjing Wu
@ 2017-07-13 13:34 ` Lu, Wenzhuo
0 siblings, 0 replies; 6+ messages in thread
From: Lu, Wenzhuo @ 2017-07-13 13:34 UTC (permalink / raw)
To: Wu, Jingjing; +Cc: dev, stable
Hi,
-----Original Message-----
From: Wu, Jingjing
Sent: Thursday, July 13, 2017 5:43 AM
To: Lu, Wenzhuo <wenzhuo.lu@intel.com>
Cc: dev@dpdk.org; Wu, Jingjing <jingjing.wu@intel.com>; stable@dpdk.org
Subject: [PATCH 3/3] net/e1000: fix lsc interrupt
If LSC flag is changed to off last device start, the enable flag is not cleared in HW.
This patch fixes it.
Fixes: c3cd3de0ab50 ("igb: enable Rx queue interrupts for PF")
Cc: stable@dpdk.org
Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
Acked-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-stable] [PATCH 1/3] net/ixgbe: fix lsc interrupt
2017-07-13 13:33 ` [dpdk-stable] [PATCH 1/3] net/ixgbe: " Lu, Wenzhuo
@ 2017-07-18 10:05 ` Ferruh Yigit
0 siblings, 0 replies; 6+ messages in thread
From: Ferruh Yigit @ 2017-07-18 10:05 UTC (permalink / raw)
To: Lu, Wenzhuo, Wu, Jingjing; +Cc: dev, stable
<...>
> If LSC flag is changed to off last device start, the enable flag is not cleared in HW.
> This patch fixes it.
>
> Fixes: 0eb609239efd ("ixgbe: enable Rx queue interrupts for PF and VF")
> Cc: stable@dpdk.org
>
> Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
> Acked-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
Series applied to dpdk-next-net/master, thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-07-18 10:05 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-13 9:43 [dpdk-stable] [PATCH 1/3] net/ixgbe: fix lsc interrupt Jingjing Wu
2017-07-13 9:43 ` [dpdk-stable] [PATCH 2/3] net/i40e: " Jingjing Wu
2017-07-13 9:43 ` [dpdk-stable] [PATCH 3/3] net/e1000: " Jingjing Wu
2017-07-13 13:34 ` Lu, Wenzhuo
2017-07-13 13:33 ` [dpdk-stable] [PATCH 1/3] net/ixgbe: " Lu, Wenzhuo
2017-07-18 10:05 ` Ferruh Yigit
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).