| Message ID | 1491846272-14882-4-git-send-email-sumit.semwal@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Stable commits from Ubuntu Xenial 4.4-lts | expand |
On Mon, Apr 10, 2017 at 11:14:19PM +0530, Sumit Semwal wrote: > From: Eugenia Emantayev <eugenia@mellanox.com> > > [Upstream commit 6496bbf0ec481966ef9ffe5b6660d8d1b55c60cc] > > Single send WQE in RX buffer should be stamped with software > ownership in order to prevent the flow of QP in error in FW > once UPDATE_QP is called. > > Fixes: 9f519f68cfff ('mlx4_en: Not using Shared Receive Queues') > Signed-off-by: Eugenia Emantayev <eugenia@mellanox.com> > 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] I can't take a patch for 4.4 that is not also in 4.9, sorry. Please fix up this series, and send me what is needed for 4.10, 4.9, and 4.4, and re-check the git commit ids, I don't want to have to do it all for you... thanks, greg k-h
Hi Greg, Apologies on the copy-paste error wrt the commit ID: I'll double check on the whole series. On 12 April 2017 at 19:15, Greg KH <greg@kroah.com> wrote: > On Mon, Apr 10, 2017 at 11:14:19PM +0530, Sumit Semwal wrote: >> From: Eugenia Emantayev <eugenia@mellanox.com> >> >> [Upstream commit 6496bbf0ec481966ef9ffe5b6660d8d1b55c60cc] >> >> Single send WQE in RX buffer should be stamped with software >> ownership in order to prevent the flow of QP in error in FW >> once UPDATE_QP is called. >> >> Fixes: 9f519f68cfff ('mlx4_en: Not using Shared Receive Queues') >> Signed-off-by: Eugenia Emantayev <eugenia@mellanox.com> >> 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] > > I can't take a patch for 4.4 that is not also in 4.9, sorry. Please fix > up this series, and send me what is needed for 4.10, 4.9, and 4.4, and > re-check the git commit ids, I don't want to have to do it all for > you... I didn't realise that having patches in 4.9 was a prerequisite to adding patches to 4.4; will check applicability for 4.9/4.10 as well. Of course, I don't want _you_ to do this kind of checks for patches submitted to stable. Will be careful next time. > > thanks, > > greg k-h Best, Sumit.
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c index 28a4b34..82bf1b5 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c @@ -439,8 +439,14 @@ int mlx4_en_activate_rx_rings(struct mlx4_en_priv *priv) ring->cqn = priv->rx_cq[ring_ind]->mcq.cqn; ring->stride = stride; - if (ring->stride <= TXBB_SIZE) + if (ring->stride <= TXBB_SIZE) { + /* Stamp first unused send wqe */ + __be32 *ptr = (__be32 *)ring->buf; + __be32 stamp = cpu_to_be32(1 << STAMP_SHIFT); + *ptr = stamp; + /* Move pointer to start of rx section */ ring->buf += TXBB_SIZE; + } ring->log_stride = ffs(ring->stride) - 1; ring->buf_size = ring->size * ring->stride;