diff options
| author | Jia-Ju Bai <baijiaju1990@163.com> | 2017-06-01 16:18:10 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-01 11:42:19 -0400 |
| commit | 5ea6d691aac6c93b790f0905e3460d44cc4c449b (patch) | |
| tree | c90e6d72606ae7d1777cd0ea1018ad46c072679a /drivers/net | |
| parent | c2e8471d98f072f0f18acdd7df5b401ed0d29a2c (diff) | |
| download | linux-5ea6d691aac6c93b790f0905e3460d44cc4c449b.tar.gz linux-5ea6d691aac6c93b790f0905e3460d44cc4c449b.tar.bz2 linux-5ea6d691aac6c93b790f0905e3460d44cc4c449b.zip | |
qlcnic: Fix a sleep-in-atomic bug in qlcnic_82xx_hw_write_wx_2M and qlcnic_82xx_hw_read_wx_2M
The driver may sleep under a write spin lock, and the function
call path is:
qlcnic_82xx_hw_write_wx_2M (acquire the lock by write_lock_irqsave)
crb_win_lock
qlcnic_pcie_sem_lock
usleep_range
qlcnic_82xx_hw_read_wx_2M (acquire the lock by write_lock_irqsave)
crb_win_lock
qlcnic_pcie_sem_lock
usleep_range
To fix it, the usleep_range is replaced with udelay.
Signed-off-by: Jia-Ju Bai <baijiaju1990@163.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c index 838cc0ceafd8..7848cf04b29a 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c @@ -341,7 +341,7 @@ qlcnic_pcie_sem_lock(struct qlcnic_adapter *adapter, int sem, u32 id_reg) } return -EIO; } - usleep_range(1000, 1500); + udelay(1200); } if (id_reg) |