From: Matt Carlson <mcarlson@broadcom.com>
Date: Fri, 15 Aug 2008 21:08:55 +0000 (-0700)
Subject: tg3: Turn off ASF "driver alive" heartbeats for APE
X-Git-Tag: v2.6.27-rc4~39^2~37
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=bc7959b2cbb57393b625b423c73e6fd07610257f;p=linux-2.6-omap-h63xx.git

tg3: Turn off ASF "driver alive" heartbeats for APE

The ENABLE_ASF flag is set when DASH is enabled on the NIC, but DASH
does not run on the RX CPU.  Instead it runs on the APE.
Consequently, the driver does not need to send "driver alive" updates
to the RX CPU when the APE is present.

Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 0ebf2ff60c4..e952b91ca2a 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -7862,7 +7862,8 @@ static void tg3_timer(unsigned long __opaque)
 	 * resets.
 	 */
 	if (!--tp->asf_counter) {
-		if (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) {
+		if ((tp->tg3_flags & TG3_FLAG_ENABLE_ASF) &&
+		    !(tp->tg3_flags3 & TG3_FLG3_ENABLE_APE)) {
 			u32 val;
 
 			tg3_wait_for_event_ack(tp);