From ecbf554757061a2b12cb8c0fb25ec0dc9d3f6c6b Mon Sep 17 00:00:00 2001
From: Luciano Coelho <luciano.coelho@nokia.com>
Date: Fri, 26 Mar 2010 12:53:20 +0200
Subject: [PATCH] --- yaml --- r: 194125 b: refs/heads/master c:
 99d84c1de8fdf5f9b09f07fdbc628857a040bf8b h: refs/heads/master i:   194123:
 f6877b500ffddcf220fb2a66f2d2d03172683c16 v: v3

---
 [refs]                                        |  2 +-
 .../drivers/net/wireless/wl12xx/wl1271_boot.c |  3 +-
 .../drivers/net/wireless/wl12xx/wl1271_cmd.c  | 38 ++++++++++++++++---
 .../drivers/net/wireless/wl12xx/wl1271_cmd.h  |  1 +
 4 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 343ffe77b0c6..1ef414c69d8f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9560134ff929a037f0c967ae47089586f4b34390
+refs/heads/master: 99d84c1de8fdf5f9b09f07fdbc628857a040bf8b
diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_boot.c b/trunk/drivers/net/wireless/wl12xx/wl1271_boot.c
index 4195298b5abc..2c7e5612d5ba 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl1271_boot.c
+++ b/trunk/drivers/net/wireless/wl12xx/wl1271_boot.c
@@ -410,7 +410,8 @@ static int wl1271_boot_run_firmware(struct wl1271 *wl)
 	/* unmask required mbox events  */
 	wl->event_mask = BSS_LOSE_EVENT_ID |
 		SCAN_COMPLETE_EVENT_ID |
-		PS_REPORT_EVENT_ID;
+		PS_REPORT_EVENT_ID |
+		JOIN_EVENT_COMPLETE_ID;
 
 	ret = wl1271_event_unmask(wl);
 	if (ret < 0) {
diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_cmd.c b/trunk/drivers/net/wireless/wl12xx/wl1271_cmd.c
index efd94f2c3168..e677f979ca6b 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl1271_cmd.c
+++ b/trunk/drivers/net/wireless/wl12xx/wl1271_cmd.c
@@ -34,6 +34,7 @@
 #include "wl1271_acx.h"
 #include "wl12xx_80211.h"
 #include "wl1271_cmd.h"
+#include "wl1271_event.h"
 
 /*
  * send command to firmware
@@ -248,6 +249,35 @@ int wl1271_cmd_radio_parms(struct wl1271 *wl)
 	return ret;
 }
 
+/*
+ * Poll the mailbox event field until any of the bits in the mask is set or a
+ * timeout occurs (WL1271_EVENT_TIMEOUT in msecs)
+ */
+static int wl1271_cmd_wait_for_event(struct wl1271 *wl, u32 mask)
+{
+	u32 events_vector, event;
+	unsigned long timeout;
+
+	timeout = jiffies + msecs_to_jiffies(WL1271_EVENT_TIMEOUT);
+
+	do {
+		if (time_after(jiffies, timeout))
+			return -ETIMEDOUT;
+
+		msleep(1);
+
+		/* read from both event fields */
+		wl1271_read(wl, wl->mbox_ptr[0], &events_vector,
+			    sizeof(events_vector), false);
+		event = events_vector & mask;
+		wl1271_read(wl, wl->mbox_ptr[1], &events_vector,
+			    sizeof(events_vector), false);
+		event |= events_vector & mask;
+	} while (!event);
+
+	return 0;
+}
+
 int wl1271_cmd_join(struct wl1271 *wl, u8 bss_type)
 {
 	static bool do_cal = true;
@@ -318,11 +348,9 @@ int wl1271_cmd_join(struct wl1271 *wl, u8 bss_type)
 		goto out_free;
 	}
 
-	/*
-	 * ugly hack: we should wait for JOIN_EVENT_COMPLETE_ID but to
-	 * simplify locking we just sleep instead, for now
-	 */
-	msleep(10);
+	ret = wl1271_cmd_wait_for_event(wl, JOIN_EVENT_COMPLETE_ID);
+	if (ret < 0)
+		wl1271_error("cmd join event completion error");
 
 out_free:
 	kfree(join);
diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_cmd.h b/trunk/drivers/net/wireless/wl12xx/wl1271_cmd.h
index 6324bbf36843..bdd7a3d8ece6 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl1271_cmd.h
+++ b/trunk/drivers/net/wireless/wl12xx/wl1271_cmd.h
@@ -123,6 +123,7 @@ enum cmd_templ {
 /* unit ms */
 #define WL1271_COMMAND_TIMEOUT     2000
 #define WL1271_CMD_TEMPL_MAX_SIZE  252
+#define WL1271_EVENT_TIMEOUT       100
 
 struct wl1271_cmd_header {
 	__le16 id;