summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYahui Cao <yahui.cao@intel.com>2019-11-19 06:23:43 +0800
committerFerruh Yigit <ferruh.yigit@intel.com>2019-11-19 12:28:46 +0000
commit41fbbe10e88570f1639ab9b33a4aa7a0ec0751fd (patch)
tree5aa4c7a31cc46a16d6de3c0ad4f0817e0411c497
parenta4910486ba93d7a3e0343a01a832fdfeb5af96f8 (diff)
downloaddpdk-next-net-brcm-41fbbe10e88570f1639ab9b33a4aa7a0ec0751fd.zip
dpdk-next-net-brcm-41fbbe10e88570f1639ab9b33a4aa7a0ec0751fd.tar.gz
dpdk-next-net-brcm-41fbbe10e88570f1639ab9b33a4aa7a0ec0751fd.tar.xz
net/ice: fix FDIR rule after device stop
By moving irq enable/disable from device start/stop to FDIR setup/teardown, FDIR queue irq config is independent of LAN queue irq config. So device stop will not cause FDIR rule failure. Fixes: 84dc7a95a2d3 ("net/ice: enable flow director engine") Signed-off-by: Yahui Cao <yahui.cao@intel.com> Signed-off-by: Beilei Xing <beilei.xing@intel.com> Acked-by: Qi Zhang <qi.z.zhang@intel.com> Tested-by: Qi Zhang <qi.z.zhang@intel.com>
-rw-r--r--drivers/net/ice/ice_ethdev.c16
-rw-r--r--drivers/net/ice/ice_ethdev.h3
-rw-r--r--drivers/net/ice/ice_fdir_filter.c7
3 files changed, 13 insertions, 13 deletions
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 2e919c5..ecfc6c9 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -2301,7 +2301,7 @@ ice_release_vsi(struct ice_vsi *vsi)
return 0;
}
-static void
+void
ice_vsi_disable_queues_intr(struct ice_vsi *vsi)
{
struct rte_eth_dev *dev = vsi->adapter->eth_dev;
@@ -2354,9 +2354,6 @@ ice_dev_stop(struct rte_eth_dev *dev)
/* disable all queue interrupts */
ice_vsi_disable_queues_intr(main_vsi);
- if (pf->fdir.fdir_vsi)
- ice_vsi_disable_queues_intr(pf->fdir.fdir_vsi);
-
/* Clear all queues and release mbufs */
ice_clear_queues(dev);
@@ -2605,7 +2602,7 @@ __vsi_queues_bind_intr(struct ice_vsi *vsi, uint16_t msix_vect,
}
}
-static void
+void
ice_vsi_queues_bind_intr(struct ice_vsi *vsi)
{
struct rte_eth_dev *dev = vsi->adapter->eth_dev;
@@ -2658,7 +2655,7 @@ ice_vsi_queues_bind_intr(struct ice_vsi *vsi)
}
}
-static void
+void
ice_vsi_enable_queues_intr(struct ice_vsi *vsi)
{
struct rte_eth_dev *dev = vsi->adapter->eth_dev;
@@ -2728,13 +2725,6 @@ ice_rxq_intr_setup(struct rte_eth_dev *dev)
/* Enable interrupts for all the queues */
ice_vsi_enable_queues_intr(vsi);
- /* Enable FDIR MSIX interrupt */
- if (pf->fdir.fdir_vsi) {
- pf->fdir.fdir_vsi->nb_used_qps = 1;
- ice_vsi_queues_bind_intr(pf->fdir.fdir_vsi);
- ice_vsi_enable_queues_intr(pf->fdir.fdir_vsi);
- }
-
rte_intr_enable(intr_handle);
return 0;
diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h
index 4a0d37b..510f686 100644
--- a/drivers/net/ice/ice_ethdev.h
+++ b/drivers/net/ice/ice_ethdev.h
@@ -459,6 +459,9 @@ struct ice_vsi *
ice_setup_vsi(struct ice_pf *pf, enum ice_vsi_type type);
int
ice_release_vsi(struct ice_vsi *vsi);
+void ice_vsi_enable_queues_intr(struct ice_vsi *vsi);
+void ice_vsi_disable_queues_intr(struct ice_vsi *vsi);
+void ice_vsi_queues_bind_intr(struct ice_vsi *vsi);
static inline int
ice_align_floor(int n)
diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c
index a68c295..9e251ce 100644
--- a/drivers/net/ice/ice_fdir_filter.c
+++ b/drivers/net/ice/ice_fdir_filter.c
@@ -491,6 +491,11 @@ ice_fdir_setup(struct ice_pf *pf)
goto fail_mem;
}
+ /* Enable FDIR MSIX interrupt */
+ vsi->nb_used_qps = 1;
+ ice_vsi_queues_bind_intr(vsi);
+ ice_vsi_enable_queues_intr(vsi);
+
/* reserve memory for the fdir programming packet */
snprintf(z_name, sizeof(z_name), "ICE_%s_%d",
ICE_FDIR_MZ_NAME,
@@ -615,6 +620,8 @@ ice_fdir_teardown(struct ice_pf *pf)
if (!vsi)
return;
+ ice_vsi_disable_queues_intr(vsi);
+
err = ice_fdir_tx_queue_stop(eth_dev, pf->fdir.txq->queue_id);
if (err)
PMD_DRV_LOG(ERR, "Failed to stop TX queue.");