moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net/qla3xxx: fix schedule while atomic in ql_wait_for_drvr_lock and ql_adapter_reset

Browse Source 
[ Upstream commit 92766c4628 ]

When calling the 'ql_wait_for_drvr_lock' and 'ql_adapter_reset', the driver
has already acquired the spin lock, so the driver should not call 'ssleep'
in atomic context.

This bug can be fixed by using 'mdelay' instead of 'ssleep'.

Reported-by: Letu Ren <fantasquex@gmail.com>
Signed-off-by: Letu Ren <fantasquex@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Letu Ren
2021-07-25 21:45:12 +08:00
committed by Greg Kroah-Hartman
parent fbbb209268
commit 8cfdd039ca
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ethernet/qlogic/qla3xxx.c
View File

@@ -154,7 +154,7 @@ static int ql_wait_for_drvr_lock(struct ql3_adapter *qdev)
"driver lock acquired\n"); "driver lock acquired\n");
return 1; return 1;
} }
ssleep(1); mdelay(1000);
} while (++i < 10); } while (++i < 10);
netdev_err(qdev->ndev, "Timed out waiting for driver lock...\n"); netdev_err(qdev->ndev, "Timed out waiting for driver lock...\n");
@@ -3290,7 +3290,7 @@ static int ql_adapter_reset(struct ql3_adapter *qdev)
if ((value & ISP_CONTROL_SR) == 0) if ((value & ISP_CONTROL_SR) == 0)
break; break;
ssleep(1); mdelay(1000);
} while ((--max_wait_time)); } while ((--max_wait_time));
/* /*
@@ -3326,7 +3326,7 @@ static int ql_adapter_reset(struct ql3_adapter *qdev)
ispControlStatus); ispControlStatus);
if ((value & ISP_CONTROL_FSR) == 0) if ((value & ISP_CONTROL_FSR) == 0)
break; break;
ssleep(1); mdelay(1000);
} while ((--max_wait_time)); } while ((--max_wait_time));
} }
if (max_wait_time == 0) if (max_wait_time == 0)