BACKPORT qed: Enable RoCE parser searching on fp init

Since we're closing the parser searching for RDMA when stoping the
fastpath, we need to re-enable it when starting the fastpath once again.

Signed-off-by: Michal Kalderon <Michal.Kalderon@cavium.com>

diff --git a/linux-next-cherry-picks/0205-qed-Enable-RoCE-parser-searching-on-fp-init.patch b/linux-next-cherry-picks/0205-qed-Enable-RoCE-parser-searching-on-fp-init.patch
new file mode 100644 (file)
index 0000000..55ffa44
--- /dev/null
+++ b/linux-next-cherry-picks/0205-qed-Enable-RoCE-parser-searching-on-fp-init.patch
@@ -0,0 +1,36 @@
+From c11c426b3bab981c0887b9c17af94b7aa55907d8 Mon Sep 17 00:00:00 2001
+From: Michal Kalderon <Michal.Kalderon@cavium.com>
+Date: Tue, 23 May 2017 09:41:25 +0300
+Subject: [PATCH] qed: Enable RoCE parser searching on fp init
+
+Since we're closing the parser searching for RDMA when stoping the
+fastpath, we need to re-enable it when starting the fastpath once again.
+
+Signed-off-by: Michal Kalderon <Michal.Kalderon@cavium.com>
+Signed-off-by: Yuval Mintz <Yuval.Mintz@cavium.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/ethernet/qlogic/qed/qed_dev.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/drivers/net/ethernet/qlogic/qed/qed_dev.c b/drivers/net/ethernet/qlogic/qed/qed_dev.c
+index fad7319..bdf0926 100644
+--- a/drivers/net/ethernet/qlogic/qed/qed_dev.c
++++ b/drivers/net/ethernet/qlogic/qed/qed_dev.c
+@@ -1943,6 +1943,13 @@ int qed_hw_start_fastpath(struct qed_hwfn *p_hwfn)
+       if (!p_ptt)
+               return -EAGAIN;
+ 
++      /* If roce info is allocated it means roce is initialized and should
++       * be enabled in searcher.
++       */
++      if (p_hwfn->p_rdma_info &&
++          p_hwfn->b_rdma_enabled_in_prs)
++              qed_wr(p_hwfn, p_ptt, p_hwfn->rdma_prs_search_reg, 0x1);
++
+       /* Re-open incoming traffic */
+       qed_wr(p_hwfn, p_ptt, NIG_REG_RX_LLH_BRB_GATE_DNTFWD_PERPF, 0x0);
+       qed_ptt_release(p_hwfn, p_ptt);
+-- 
+1.8.3.1
+

diff --git a/patches/quiltrc b/patches/quiltrc
index daf48dd0f621a2b040252574939d0cdc80744d26..6adf2ae87cd59a085bb27a721a863b4473134c76 100644 (file)
--- a/patches/quiltrc
+++ b/patches/quiltrc
@@ -1,2 +1,4 @@
 QUILT_DIFF_OPTS='-x .svn -p --ignore-matching-lines=$Id'
 QUILT_PATCH_OPTS='-l'
+QUILT_DIFF_OPTS='-x .svn -p --ignore-matching-lines=$Id'
+QUILT_PATCH_OPTS='-l'