diff options
| author |   Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2017-10-09 09:26:25 -0700 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2017-12-04 10:52:52 -0800 |
| commit | cb7e125e03274cffa97d74433c876765efffaf6a (patch) | |
| tree | 5e6be1ed0c2ec7f97e5203636dc5eb6604d8dd56 /drivers/net/ethernet/qlogic/qed/qed_spq.c | |
| parent | mn10300: READ_ONCE() now implies smp_read_barrier_depends() (diff) | |
| download | linux-dev-cb7e125e03274cffa97d74433c876765efffaf6a.tar.xz linux-dev-cb7e125e03274cffa97d74433c876765efffaf6a.zip | |
drivers/net/ethernet/qlogic/qed: Fix __qed_spq_block() ordering
The __qed_spq_block() function expects an smp_read_barrier_depends()
to order a prior READ_ONCE() against a later load that does not depend
on the prior READ_ONCE(), an expectation that can fail to be met.
This commit therefore replaces the READ_ONCE() with smp_load_acquire()
and removes the smp_read_barrier_depends().
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Ariel Elior <Ariel.Elior@cavium.com>
Cc: <everest-linux-l2@cavium.com>
Cc: <netdev@vger.kernel.org>
Diffstat (limited to 'drivers/net/ethernet/qlogic/qed/qed_spq.c')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qed/qed_spq.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/qlogic/qed/qed_spq.c b/drivers/net/ethernet/qlogic/qed/qed_spq.c index be48d9abd001..c1237ec58b6c 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_spq.c +++ b/drivers/net/ethernet/qlogic/qed/qed_spq.c @@ -97,9 +97,7 @@ static int __qed_spq_block(struct qed_hwfn *p_hwfn, while (iter_cnt--) { /* Validate we receive completion update */ - if (READ_ONCE(comp_done->done) == 1) { - /* Read updated FW return value */ - smp_read_barrier_depends(); + if (smp_load_acquire(&comp_done->done) == 1) { /* ^^^ */ if (p_fw_ret) *p_fw_ret = comp_done->fw_return_code; return 0; |