tg3: Don't send APE events for NCSI firmware

NCSI firmware does not accept APE events.  It relies on a "driver state"
location in shared memory to tell it what the driver's current state is.

This patch pivots the code to use the new driver state scheme.

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

1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index 783cd77b6165..5cd0653d6caf 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -2180,7 +2180,7 @@
 #define TG3_APE_HOST_SEG_SIG            0x4200
 #define  APE_HOST_SEG_SIG_MAGIC          0x484f5354
 #define TG3_APE_HOST_SEG_LEN            0x4204
-#define  APE_HOST_SEG_LEN_MAGIC          0x0000001c
+#define  APE_HOST_SEG_LEN_MAGIC          0x00000020
 #define TG3_APE_HOST_INIT_COUNT         0x4208
 #define TG3_APE_HOST_DRIVER_ID          0x420c
 #define  APE_HOST_DRIVER_ID_LINUX        0xf0000000
@@ -2192,6 +2192,12 @@
 #define  APE_HOST_HEARTBEAT_INT_DISABLE  0
 #define  APE_HOST_HEARTBEAT_INT_5SEC     5000
 #define TG3_APE_HOST_HEARTBEAT_COUNT    0x4218
+#define TG3_APE_HOST_DRVR_STATE         0x421c
+#define TG3_APE_HOST_DRVR_STATE_START    0x00000001
+#define TG3_APE_HOST_DRVR_STATE_UNLOAD   0x00000002
+#define TG3_APE_HOST_DRVR_STATE_WOL      0x00000003
+#define TG3_APE_HOST_WOL_SPEED          0x4224
+#define TG3_APE_HOST_WOL_SPEED_AUTO      0x00008000
 
 #define TG3_APE_EVENT_STATUS            0x4300
 
@@ -2854,6 +2860,7 @@ struct tg3 {
 #define TG3_FLG3_USE_JUMBO_BDFLAG       0x00400000
 #define TG3_FLG3_L1PLLPD_EN             0x00800000
 #define TG3_FLG3_5717_PLUS              0x01000000
+#define TG3_FLG3_APE_HAS_NCSI           0x02000000
 
         struct timer_list               timer;
         u16                             timer_counter;