diff mbox series

[for-4.4,01/16] net/mlx4_core: Fix when to save some qp context flags for dynamic VST to VGT transitions

Message ID 1491846272-14882-2-git-send-email-sumit.semwal@linaro.org
State Superseded
Headers show
Series Stable commits from Ubuntu Xenial 4.4-lts | expand

Commit Message

Sumit Semwal April 10, 2017, 5:44 p.m. UTC 
From: Jack Morgenstein <jackm@dev.mellanox.co.il>


[Upstream commit 61a4577c9a4419b99e647744923517d47255da35]

Save the qp context flags byte containing the flag disabling vlan stripping
in the RESET to INIT qp transition, rather than in the INIT to RTR
transition. Per the firmware spec, the flags in this byte are active
in the RESET to INIT transition.

As a result of saving the flags in the incorrect qp transition, when
switching dynamically from VGT to VST and back to VGT, the vlan
remained stripped (as is required for VST) and did not return to
not-stripped (as is required for VGT).

Fixes: f0f829bf42cd ("net/mlx4_core: Add immediate activate for VGT->VST->VGT")
Signed-off-by: Jack Morgenstein <jackm@dev.mellanox.co.il>

Signed-off-by: Tariq Toukan <tariqt@mellanox.com>

Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>

 [sumits: cherry picked for 4.4.y]
---
 drivers/net/ethernet/mellanox/mlx4/resource_tracker.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

-- 
2.7.4

Comments

Greg KH April 12, 2017, 1:41 p.m. UTC | #1 
On Mon, Apr 10, 2017 at 11:14:17PM +0530, Sumit Semwal wrote:
> From: Jack Morgenstein <jackm@dev.mellanox.co.il>

> 

> [Upstream commit 61a4577c9a4419b99e647744923517d47255da35]


Huh?  That commit is the v4.4.59 commit id.  It's not a commit in
Linus's tree at all.  What went wrong here?

thanks,

greg k-h
Sumit Semwal April 12, 2017, 3:14 p.m. UTC | #2 
Hi Greg,

On 12 April 2017 at 19:11, Greg KH <greg@kroah.com> wrote:
> On Mon, Apr 10, 2017 at 11:14:17PM +0530, Sumit Semwal wrote:

>> From: Jack Morgenstein <jackm@dev.mellanox.co.il>

>>

>> [Upstream commit 61a4577c9a4419b99e647744923517d47255da35]

>

> Huh?  That commit is the v4.4.59 commit id.  It's not a commit in

> Linus's tree at all.  What went wrong here?

>

I checked all the patches in this series, and it was a stupid
copy/paste problem, only for this one patch, unfortunately right in
the beginning :/.

I have corrected this and updated the series; will post out after
checking patch applicability in 4.9/4.10.

> thanks,

>

> greg k-h


Best,
Sumit.
diff mbox series

Patch

diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
index d314d96..d1fc7fa 100644
--- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
+++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
@@ -2955,6 +2955,9 @@  int mlx4_RST2INIT_QP_wrapper(struct mlx4_dev *dev, int slave,
 		put_res(dev, slave, srqn, RES_SRQ);
 		qp->srq = srq;
 	}
+
+	/* Save param3 for dynamic changes from VST back to VGT */
+	qp->param3 = qpc->param3;
 	put_res(dev, slave, rcqn, RES_CQ);
 	put_res(dev, slave, mtt_base, RES_MTT);
 	res_end_move(dev, slave, RES_QP, qpn);
@@ -3747,7 +3750,6 @@  int mlx4_INIT2RTR_QP_wrapper(struct mlx4_dev *dev, int slave,
 	int qpn = vhcr->in_modifier & 0x7fffff;
 	struct res_qp *qp;
 	u8 orig_sched_queue;
-	__be32	orig_param3 = qpc->param3;
 	u8 orig_vlan_control = qpc->pri_path.vlan_control;
 	u8 orig_fvl_rx = qpc->pri_path.fvl_rx;
 	u8 orig_pri_path_fl = qpc->pri_path.fl;
@@ -3789,7 +3791,6 @@  out:
 	 */
 	if (!err) {
 		qp->sched_queue = orig_sched_queue;
-		qp->param3	= orig_param3;
 		qp->vlan_control = orig_vlan_control;
 		qp->fvl_rx	=  orig_fvl_rx;
 		qp->pri_path_fl = orig_pri_path_fl;