From 6c36b817c685e52eb52641c5e69188a6e5b6ed4e Mon Sep 17 00:00:00 2001
From: Gabor Juhos <juhosg@openwrt.org>
Date: Tue, 21 Jun 2011 11:23:51 +0200
Subject: [PATCH] --- yaml --- r: 255903 b: refs/heads/master c:
 7d95847c9b3631d31f657d8cede153b518ed9e2e h: refs/heads/master i:   255901:
 d2f3e0549340ce614227a216b2933a24dc762a78   255899:
 a6eb7a05ec562a57cf107300fdaefcc5fade1907   255895:
 9459c29f92cd3cfa2161b8bab82760242c55479e   255887:
 708381de2cb568b8609e539bbea01d0b8e33cac5   255871:
 59b42c0e09c7f59cffe967e325c951e02744e2f3 v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/net/wireless/ath/ath9k/hw.c   | 35 +++++++++++++++++++++
 trunk/drivers/net/wireless/ath/ath9k/hw.h   |  1 +
 trunk/drivers/net/wireless/ath/ath9k/init.c |  1 +
 trunk/include/linux/ath9k_platform.h        |  1 +
 5 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8d8fe88311ef..51125ce835e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4187afa29a73fec1f68243c03437e7c1b37f315d
+refs/heads/master: 7d95847c9b3631d31f657d8cede153b518ed9e2e
diff --git a/trunk/drivers/net/wireless/ath/ath9k/hw.c b/trunk/drivers/net/wireless/ath/ath9k/hw.c
index 4da5284c7773..839ba64c9e49 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/hw.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/hw.c
@@ -1161,6 +1161,41 @@ static bool ath9k_hw_set_reset(struct ath_hw *ah, int type)
 			rst_flags |= AR_RTC_RC_MAC_COLD;
 	}
 
+	if (AR_SREV_9330(ah)) {
+		int npend = 0;
+		int i;
+
+		/* AR9330 WAR:
+		 * call external reset function to reset WMAC if:
+		 * - doing a cold reset
+		 * - we have pending frames in the TX queues
+		 */
+
+		for (i = 0; i < AR_NUM_QCU; i++) {
+			npend = ath9k_hw_numtxpending(ah, i);
+			if (npend)
+				break;
+		}
+
+		if (ah->external_reset &&
+		    (npend || type == ATH9K_RESET_COLD)) {
+			int reset_err = 0;
+
+			ath_dbg(ath9k_hw_common(ah), ATH_DBG_RESET,
+				"reset MAC via external reset\n");
+
+			reset_err = ah->external_reset();
+			if (reset_err) {
+				ath_err(ath9k_hw_common(ah),
+					"External reset failed, err=%d\n",
+					reset_err);
+				return false;
+			}
+
+			REG_WRITE(ah, AR_RTC_RESET, 1);
+		}
+	}
+
 	REG_WRITE(ah, AR_RTC_RC, rst_flags);
 
 	REGWRITE_BUFFER_FLUSH(ah);
diff --git a/trunk/drivers/net/wireless/ath/ath9k/hw.h b/trunk/drivers/net/wireless/ath/ath9k/hw.h
index 0749fa8c3a58..818acdd1ba90 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/hw.h
+++ b/trunk/drivers/net/wireless/ath/ath9k/hw.h
@@ -863,6 +863,7 @@ struct ath_hw {
 
 	bool is_clk_25mhz;
 	int (*get_mac_revision)(void);
+	int (*external_reset)(void);
 };
 
 struct ath_bus_ops {
diff --git a/trunk/drivers/net/wireless/ath/ath9k/init.c b/trunk/drivers/net/wireless/ath/ath9k/init.c
index 1851c222fff0..50103b2792b5 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/init.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/init.c
@@ -575,6 +575,7 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid,
 		sc->sc_ah->led_pin = pdata->led_pin;
 		ah->is_clk_25mhz = pdata->is_clk_25mhz;
 		ah->get_mac_revision = pdata->get_mac_revision;
+		ah->external_reset = pdata->external_reset;
 	}
 
 	common = ath9k_hw_common(ah);
diff --git a/trunk/include/linux/ath9k_platform.h b/trunk/include/linux/ath9k_platform.h
index c207607acada..6e3f54f37844 100644
--- a/trunk/include/linux/ath9k_platform.h
+++ b/trunk/include/linux/ath9k_platform.h
@@ -31,6 +31,7 @@ struct ath9k_platform_data {
 
 	bool is_clk_25mhz;
 	int (*get_mac_revision)(void);
+	int (*external_reset)(void);
 };
 
 #endif /* _LINUX_ATH9K_PLATFORM_H */