wimax/i2400m: fix the bootmode RX deadlock in SDIO driver

i2400ms_bus_bm_wait_for_ack() causes a race condition. It happens
because this function clears i2400ms->bm_ack_size before waiting for
an interrupt, which is set by the interrupt service routine i2400ms_rx()
to indicate reception and size of received data; thus, if the interrupt
came right before the clearing/waiting, it is lost.

The fix is clear the bm_ack_size to -EINPROGRESS before we are enabling
the RX interrupt configuration in i2400ms_rx_setup(). Then everytime
when the interrupt service routine i2400ms_rx() is invoked during bootmode,
bm_ack_size is updated with the actual rx_size and it is cleared to
-EINPROGRESS again after the RX data is handled.

Signed-off-by: Cindy H Kao <cindy.h.kao@intel.com>
Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com>

1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/net/wimax/i2400m/sdio-rx.c b/drivers/net/wimax/i2400m/sdio-rx.c
index 321beadf6e47..f6ca51ab216d 100644
--- a/drivers/net/wimax/i2400m/sdio-rx.c
+++ b/drivers/net/wimax/i2400m/sdio-rx.c
@@ -234,6 +234,13 @@ int i2400ms_rx_setup(struct i2400ms *i2400ms)
         init_waitqueue_head(&i2400ms->bm_wfa_wq);
         spin_lock(&i2400m->rx_lock);
         i2400ms->bm_wait_result = -EINPROGRESS;
+        /*
+         * Before we are about to enable the RX interrupt, make sure
+         * bm_ack_size is cleared to -EINPROGRESS which indicates
+         * no RX interrupt happened yet or the previous interrupt
+         * has been handled, we are ready to take the new interrupt
+         */
+        i2400ms->bm_ack_size = -EINPROGRESS;
         spin_unlock(&i2400m->rx_lock);
 
         sdio_claim_host(func);