Commit d93ca2a4 authored by Brice Goglin's avatar Brice Goglin Committed by Jeff Garzik

myri10ge: increase and fix handoff timeout

Increase the handoff timeout to 512ms so as to give the aeluros based
NICs sufficient time to handoff without relying on the msleep() being
sloppy, and accidentally sleeping way longer than the 20ms we specified
in 20 separate 1ms sleeps.

Fix typo in the handoff sleep delay, which made it additive, not
exponential.
Signed-off-by: default avatarBrice Goglin <brice@myri.com>
Signed-off-by: default avatarAndrew Gallatin <gallatin@myri.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent d1ce3a0f
...@@ -682,8 +682,8 @@ static int myri10ge_load_firmware(struct myri10ge_priv *mgp) ...@@ -682,8 +682,8 @@ static int myri10ge_load_firmware(struct myri10ge_priv *mgp)
msleep(1); msleep(1);
mb(); mb();
i = 0; i = 0;
while (mgp->cmd->data != MYRI10GE_NO_CONFIRM_DATA && i < 20) { while (mgp->cmd->data != MYRI10GE_NO_CONFIRM_DATA && i < 9) {
msleep(1); msleep(1 << i);
i++; i++;
} }
if (mgp->cmd->data != MYRI10GE_NO_CONFIRM_DATA) { if (mgp->cmd->data != MYRI10GE_NO_CONFIRM_DATA) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment