| From foo@baz Mon Apr 9 17:09:24 CEST 2018 |
| From: Jia-Ju Bai <baijiaju1990@163.com> |
| Date: Thu, 1 Jun 2017 16:18:10 +0800 |
| Subject: qlcnic: Fix a sleep-in-atomic bug in qlcnic_82xx_hw_write_wx_2M and qlcnic_82xx_hw_read_wx_2M |
| |
| From: Jia-Ju Bai <baijiaju1990@163.com> |
| |
| |
| [ Upstream commit 5ea6d691aac6c93b790f0905e3460d44cc4c449b ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- 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_adapt |
| } |
| return -EIO; |
| } |
| - usleep_range(1000, 1500); |
| + udelay(1200); |
| } |
| |
| if (id_reg) |
