| From foo@baz Fri Aug 12 09:33:59 CEST 2016 |
| From: Manish Chopra <manish.chopra@qlogic.com> |
| Date: Mon, 25 Jul 2016 19:07:46 +0300 |
| Subject: qed: Fix setting/clearing bit in completion bitmap |
| |
| From: Manish Chopra <manish.chopra@qlogic.com> |
| |
| [ Upstream commit 59d3f1ceb69b54569685d0c34dff16a1e0816b19 ] |
| |
| Slowpath completion handling is incorrectly changing |
| SPQ_RING_SIZE bits instead of a single one. |
| |
| Fixes: 76a9a3642a0b ("qed: fix handling of concurrent ramrods") |
| Signed-off-by: Manish Chopra <manish.chopra@qlogic.com> |
| Signed-off-by: Yuval Mintz <Yuval.Mintz@qlogic.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/qlogic/qed/qed_spq.c | 7 +++---- |
| 1 file changed, 3 insertions(+), 4 deletions(-) |
| |
| --- a/drivers/net/ethernet/qlogic/qed/qed_spq.c |
| +++ b/drivers/net/ethernet/qlogic/qed/qed_spq.c |
| @@ -794,13 +794,12 @@ int qed_spq_completion(struct qed_hwfn * |
| * in a bitmap and increasing the chain consumer only |
| * for the first successive completed entries. |
| */ |
| - bitmap_set(p_spq->p_comp_bitmap, pos, SPQ_RING_SIZE); |
| + __set_bit(pos, p_spq->p_comp_bitmap); |
| |
| while (test_bit(p_spq->comp_bitmap_idx, |
| p_spq->p_comp_bitmap)) { |
| - bitmap_clear(p_spq->p_comp_bitmap, |
| - p_spq->comp_bitmap_idx, |
| - SPQ_RING_SIZE); |
| + __clear_bit(p_spq->comp_bitmap_idx, |
| + p_spq->p_comp_bitmap); |
| p_spq->comp_bitmap_idx++; |
| qed_chain_return_produced(&p_spq->chain); |
| } |