37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
From 55029c1d65158aea9672c5dfadb43a57f23e3100 Mon Sep 17 00:00:00 2001
|
|
From: Ben Hutchings <bhutchings@solarflare.com>
|
|
Date: Wed, 13 Jan 2010 04:34:25 +0000
|
|
Subject: [PATCH 1/5] sfc: Fix polling for slow MCDI operations
|
|
|
|
When the interface is down and we are using polled mode for MCDI
|
|
operations, we busy-wait for completion for approximately 1 jiffy
|
|
using udelay() and then back off to schedule(). But the completion
|
|
will not wake the task, since we are using polled mode! We must use
|
|
schedule_timeout_uninterruptible() instead.
|
|
|
|
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/sfc/mcdi.c | 5 +++--
|
|
1 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/net/sfc/mcdi.c b/drivers/net/sfc/mcdi.c
|
|
index 683353b..0d4eba7 100644
|
|
--- a/drivers/net/sfc/mcdi.c
|
|
+++ b/drivers/net/sfc/mcdi.c
|
|
@@ -142,8 +142,9 @@ static int efx_mcdi_poll(struct efx_nic *efx)
|
|
if (spins != 0) {
|
|
--spins;
|
|
udelay(1);
|
|
- } else
|
|
- schedule();
|
|
+ } else {
|
|
+ schedule_timeout_uninterruptible(1);
|
|
+ }
|
|
|
|
time = get_seconds();
|
|
|
|
--
|
|
1.6.6
|
|
|