bnx2: Update firmwares and update version to 2.0.8.

- Increase FTQ depth to 256 to ehnabce performance. - Fix RV2P context corruption on 5709 when flow control is enabled. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
author: Michael Chan <mchan@broadcom.com> 2010-02-16 18:19:42 -0500
committer: David S. Miller <davem@davemloft.net> 2010-02-16 18:19:42 -0500
commit: bec92044b73085ba92aabf973cb5aafc251f3a34 (patch)
tree: 73fd288f1568bc1b16ed722ef890cc91a179f5c0
parent: c9885fe5a76dea798543f2938a872bc159e8e69a (diff)
9 files changed, 9143 insertions, 9068 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 3fb110edad49..5f0dda10f20d 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -1,6 +1,6 @@
 /* bnx2.c: Broadcom NX2 network driver.
 *
- * Copyright (c) 2004-2009 Broadcom Corporation
+ * Copyright (c) 2004-2010 Broadcom Corporation
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -58,13 +58,13 @@
 #define DRV_MODULE_NAME         "bnx2"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "2.0.3"
+#define DRV_MODULE_VERSION      "2.0.8"
-#define DRV_MODULE_RELDATE      "Dec 03, 2009"
+#define DRV_MODULE_RELDATE      "Feb 15, 2010"
-#define FW_MIPS_FILE_06         "bnx2/bnx2-mips-06-5.0.0.j3.fw"
+#define FW_MIPS_FILE_06         "bnx2/bnx2-mips-06-5.0.0.j6.fw"
 #define FW_RV2P_FILE_06         "bnx2/bnx2-rv2p-06-5.0.0.j3.fw"
-#define FW_MIPS_FILE_09         "bnx2/bnx2-mips-09-5.0.0.j3.fw"
+#define FW_MIPS_FILE_09         "bnx2/bnx2-mips-09-5.0.0.j9.fw"
-#define FW_RV2P_FILE_09_Ax      "bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw"
+#define FW_RV2P_FILE_09_Ax      "bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw"
-#define FW_RV2P_FILE_09         "bnx2/bnx2-rv2p-09-5.0.0.j3.fw"
+#define FW_RV2P_FILE_09         "bnx2/bnx2-rv2p-09-5.0.0.j10.fw"
 #define RUN_AT(x) (jiffies + (x))
diff --git a/firmware/Makefile b/firmware/Makefile
index 1c00d05578f7..1c0be73c8082 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -33,10 +33,10 @@ fw-shipped-$(CONFIG_ADAPTEC_STARFIRE) += adaptec/starfire_rx.bin \
 fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin
 fw-shipped-$(CONFIG_ATM_AMBASSADOR) += atmsar11.fw
 fw-shipped-$(CONFIG_BNX2X) += bnx2x-e1-5.2.7.0.fw bnx2x-e1h-5.2.7.0.fw
-fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-5.0.0.j3.fw \
+fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-5.0.0.j9.fw \
-                             bnx2/bnx2-rv2p-09-5.0.0.j3.fw \
+                             bnx2/bnx2-rv2p-09-5.0.0.j10.fw \
-                             bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw \
+                             bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw \
-                             bnx2/bnx2-mips-06-5.0.0.j3.fw \
+                             bnx2/bnx2-mips-06-5.0.0.j6.fw \
                             bnx2/bnx2-rv2p-06-5.0.0.j3.fw
 fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin
 fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin
diff --git a/firmware/bnx2/bnx2-mips-06-5.0.0.j3.fw.ihex b/firmware/bnx2/bnx2-mips-06-5.0.0.j3.fw.ihex
deleted file mode 100644
index 652e6c8f37e1..000000000000
--- a/firmware/bnx2/bnx2-mips-06-5.0.0.j3.fw.ihex
+++ /dev/null
@@ -1,5841 +0,0 @@
-:10000000080001100800000000004CC8000000C8F3
-:1000100000000000000000000000000008004CC8C4
-:100020000000001400004D90080000880800000047
-:10003000000058D000004DA408005A400000008481
-:100040000000A674080058D0000001540000A6F873
-:10005000080031D808000000000070F00000A84C33
-:10006000000000000000000000000000080070F028
-:10007000000000240001193C080004880800040066
-:100080000000175C00011960000000000000000083
-:100090000000000000000000000000000000000060
-:1000A000080000A80800000000003B38000130BC38
-:1000B0000000000000000000000000000000000040
-:0800C000000000000000000038
-:0800C8000A00004400000000E2
-:1000D000000000000000000D636F6D352E302E30E3
-:1000E0006A33000005000002000000000000000369
-:1000F00000000014000000320000000300000000B7
-:1001000000000000000000000000000000000000EF
-:1001100000000010000001360000EA600000000549
-:1001200000000000000000000000000000000008C7
-:1001300000000000000000000000000000000000BF
-:1001400000000000000000000000000000000000AF
-:10015000000000000000000000000000000000009F
-:10016000000000020000000000000000000000008D
-:10017000000000000000000000000000000000007F
-:10018000000000000000000000000010000000005F
-:10019000000000000000000000000000000000005F
-:1001A000000000000000000000000000000000004F
-:1001B000000000000000000000000000000000003F
-:1001C000000000000000000000000000000000002F
-:1001D000000000000000000000000000100000030C
-:1001E000000000000000000D0000000D3C020800AF
-:1001F00024424D003C03080024634DFCAC40000049
-:100200000043202B1480FFFD244200043C1D080005
-:1002100037BD7FFC03A0F0213C1008002610011020
-:100220003C1C0800279C4D000E000214000000003A
-:100230000000000D27BDFFE8AFBF0014AFB00010F5
-:100240009742010830437000240220001062000B26
-:10025000286220011440002F0000102124024000D9
-:1002600010620025000000002402600010620026D9
-:10027000000010210A0000948FBF001427500100D5
-:10028000920200091040001A240300013C020800F9
-:100290008C42002010400016000018210E00052B93
-:1002A00000000000960300083C06080094C64DBEFE
-:1002B0008E0400188F8200209605000C00031C009D
-:1002C00000661825AC440000AC450004240400017D
-:1002D000AC400008AC40000CAC400010AC40001436
-:1002E000AC4000180E000550AC43001C0000182163
-:1002F0000A000093006010210E0003BD0000000002
-:100300000A000093000010210E000F810000000081
-:10031000000010218FBF00148FB0001003E0000810
-:1003200027BD001827BDFFE0AFB00010AFBF001819
-:10033000AFB10014275001009203000B2402001AF1
-:10034000961100081462005B00002821322200018F
-:1003500010400008000000008E0200009603001408
-:10036000000211C200021040005A10210A0000DBF6
-:10037000A44300803C0208008C420020104000286A
-:10038000000000000E00052B00000000974201084D
-:100390009743010C8F8500203042003E3063FFFF01
-:1003A0000002140000431025ACA200008F4201009F
-:1003B0003C06080094C64DBEACA20004974301164B
-:1003C0009744010E3C02200000031C003084FFFF14
-:1003D00000641825ACA3000800C230259742011024
-:1003E0009743011224040001000214003063FFFF50
-:1003F00000431025ACA2000C974201143042FFFFCD
-:10040000ACA200108F420118ACA200149342010B61
-:10041000304200FFACA200180E000550ACA6001C34
-:100420003C0208008C420040244200013C010800CC
-:10043000AC2200403C0308008C63004432220002DE
-:1004400032240004246300013C010800AC23004472
-:10045000108000180002282B8F4202B804430008C5
-:100460008E0200203C0208008C4200602442000101
-:100470003C010800AC2200600A0000FB24050001DA
-:100480009603001600002821AF4202808E0200046D
-:10049000A7430284AF4202883C021000AF4202B878
-:1004A0003C0208008C42005C244200013C01080030
-:1004B000AC22005C8FBF00188FB100148FB0001009
-:1004C00000A0102103E0000827BD002027BDFFE0A9
-:1004D000AFB00010AFBF0018AFB10014275001003B
-:1004E0009203000B24020003961100081462006DB1
-:1004F000000020213222000110400008000000000E
-:100500008E02000096030014000211C20002104087
-:10051000005A10210A000142A44300803C02080056
-:100520008C42002010400025000000000E00052B2A
-:1005300000000000974201089743010C8F850020BE
-:100540003042003E3063FFFF0002140000431025DC
-:10055000ACA200008F4201003C06080094C64DBECC
-:10056000ACA20004974301169744010E3C02200000
-:1005700000031C003084FFFF00641825ACA30008B2
-:1005800000C2302597420110974301122404000154
-:10059000000214003063FFFF00431025ACA2000CE2
-:1005A000974201143042FFFFACA20010ACA000142F
-:1005B000ACA000180E000550ACA6001C3C020800C0
-:1005C0008C420040244200013C010800AC22004063
-:1005D0003C0208008C420044322300042442000103
-:1005E0003C010800AC2200441060001A32220002D4
-:1005F0008F4202B8044300088E0200203C0208002B
-:100600008C420060244200013C010800AC220060E2
-:100610000A0001772404000196030016000020213F
-:10062000AF4202808E020004A7430284AF420288D8
-:100630003C021000AF4202B83C0208008C42005C51
-:10064000244200013C010800AC22005C0A00017851
-:100650008FBF001810400013000020218F430104B9
-:100660003C026020AC4300148C420004240301FED1
-:10067000304203FF1443000B000020218F42010091
-:10068000000211C02442FFFC2C420008104000026E
-:100690002403000200031F403C026000AC436914C5
-:1006A000000020218FBF00188FB100148FB0001000
-:1006B0000080102103E0000827BD00208F430100C7
-:1006C0002402010050620003000311C20000000D6B
-:1006D000000311C200021040005A1021A440008003
-:1006E00003E00008000010219362000003E000080E
-:1006F000AF80000003E000080000102103E00008C4
-:1007000000001021240201001482000800000000F3
-:100710003C0208008C4200FC244200013C0108001D
-:10072000AC2200FC0A00019F30A200203C0208001D
-:100730008C420084244200013C010800AC22008469
-:1007400030A200201040000830A300103C02080036
author	Michael Chan <mchan@broadcom.com>	2010-02-16 18:19:42 -0500
committer	David S. Miller <davem@davemloft.net>	2010-02-16 18:19:42 -0500
commit	bec92044b73085ba92aabf973cb5aafc251f3a34 (patch)
tree	73fd288f1568bc1b16ed722ef890cc91a179f5c0
parent	c9885fe5a76dea798543f2938a872bc159e8e69a (diff)

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 3fb110edad49..5f0dda10f20d 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c
@@ -1,6 +1,6 @@
1	/* bnx2.c: Broadcom NX2 network driver.	1	/* bnx2.c: Broadcom NX2 network driver.
2	*	2	*
3	* Copyright (c) 2004-2009 Broadcom Corporation	3	* Copyright (c) 2004-2010 Broadcom Corporation
4	*	4	*
5	* This program is free software; you can redistribute it and/or modify	5	* This program is free software; you can redistribute it and/or modify
6	* it under the terms of the GNU General Public License as published by	6	* it under the terms of the GNU General Public License as published by
@@ -58,13 +58,13 @@
58		58
59	#define DRV_MODULE_NAME "bnx2"	59	#define DRV_MODULE_NAME "bnx2"
60	#define PFX DRV_MODULE_NAME ": "	60	#define PFX DRV_MODULE_NAME ": "
61	#define DRV_MODULE_VERSION "2.0.3"	61	#define DRV_MODULE_VERSION "2.0.8"
62	#define DRV_MODULE_RELDATE "Dec 03, 2009"	62	#define DRV_MODULE_RELDATE "Feb 15, 2010"
63	#define FW_MIPS_FILE_06 "bnx2/bnx2-mips-06-5.0.0.j3.fw"	63	#define FW_MIPS_FILE_06 "bnx2/bnx2-mips-06-5.0.0.j6.fw"
64	#define FW_RV2P_FILE_06 "bnx2/bnx2-rv2p-06-5.0.0.j3.fw"	64	#define FW_RV2P_FILE_06 "bnx2/bnx2-rv2p-06-5.0.0.j3.fw"
65	#define FW_MIPS_FILE_09 "bnx2/bnx2-mips-09-5.0.0.j3.fw"	65	#define FW_MIPS_FILE_09 "bnx2/bnx2-mips-09-5.0.0.j9.fw"
66	#define FW_RV2P_FILE_09_Ax "bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw"	66	#define FW_RV2P_FILE_09_Ax "bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw"
67	#define FW_RV2P_FILE_09 "bnx2/bnx2-rv2p-09-5.0.0.j3.fw"	67	#define FW_RV2P_FILE_09 "bnx2/bnx2-rv2p-09-5.0.0.j10.fw"
68		68
69	#define RUN_AT(x) (jiffies + (x))	69	#define RUN_AT(x) (jiffies + (x))
70		70


diff --git a/firmware/Makefile b/firmware/Makefile index 1c00d05578f7..1c0be73c8082 100644 --- a/firmware/Makefile +++ b/firmware/Makefile
@@ -33,10 +33,10 @@ fw-shipped-$(CONFIG_ADAPTEC_STARFIRE) += adaptec/starfire_rx.bin \
33	fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin	33	fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin
34	fw-shipped-$(CONFIG_ATM_AMBASSADOR) += atmsar11.fw	34	fw-shipped-$(CONFIG_ATM_AMBASSADOR) += atmsar11.fw
35	fw-shipped-$(CONFIG_BNX2X) += bnx2x-e1-5.2.7.0.fw bnx2x-e1h-5.2.7.0.fw	35	fw-shipped-$(CONFIG_BNX2X) += bnx2x-e1-5.2.7.0.fw bnx2x-e1h-5.2.7.0.fw
36	fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-5.0.0.j3.fw \	36	fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-5.0.0.j9.fw \
37	bnx2/bnx2-rv2p-09-5.0.0.j3.fw \	37	bnx2/bnx2-rv2p-09-5.0.0.j10.fw \
38	bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw \	38	bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw \
39	bnx2/bnx2-mips-06-5.0.0.j3.fw \	39	bnx2/bnx2-mips-06-5.0.0.j6.fw \
40	bnx2/bnx2-rv2p-06-5.0.0.j3.fw	40	bnx2/bnx2-rv2p-06-5.0.0.j3.fw
41	fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin	41	fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin
42	fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin	42	fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin


diff --git a/firmware/bnx2/bnx2-mips-06-5.0.0.j3.fw.ihex b/firmware/bnx2/bnx2-mips-06-5.0.0.j3.fw.ihex deleted file mode 100644 index 652e6c8f37e1..000000000000 --- a/firmware/bnx2/bnx2-mips-06-5.0.0.j3.fw.ihex +++ /dev/null
@@ -1,5841 +0,0 @@
1	:10000000080001100800000000004CC8000000C8F3
2	:1000100000000000000000000000000008004CC8C4
3	:100020000000001400004D90080000880800000047
4	:10003000000058D000004DA408005A400000008481
5	:100040000000A674080058D0000001540000A6F873
6	:10005000080031D808000000000070F00000A84C33
7	:10006000000000000000000000000000080070F028
8	:10007000000000240001193C080004880800040066
9	:100080000000175C00011960000000000000000083
10	:100090000000000000000000000000000000000060
11	:1000A000080000A80800000000003B38000130BC38
12	:1000B0000000000000000000000000000000000040
13	:0800C000000000000000000038
14	:0800C8000A00004400000000E2
15	:1000D000000000000000000D636F6D352E302E30E3
16	:1000E0006A33000005000002000000000000000369
17	:1000F00000000014000000320000000300000000B7
18	:1001000000000000000000000000000000000000EF
19	:1001100000000010000001360000EA600000000549
20	:1001200000000000000000000000000000000008C7
21	:1001300000000000000000000000000000000000BF
22	:1001400000000000000000000000000000000000AF
23	:10015000000000000000000000000000000000009F
24	:10016000000000020000000000000000000000008D
25	:10017000000000000000000000000000000000007F
26	:10018000000000000000000000000010000000005F
27	:10019000000000000000000000000000000000005F
28	:1001A000000000000000000000000000000000004F
29	:1001B000000000000000000000000000000000003F
30	:1001C000000000000000000000000000000000002F
31	:1001D000000000000000000000000000100000030C
32	:1001E000000000000000000D0000000D3C020800AF
33	:1001F00024424D003C03080024634DFCAC40000049
34	:100200000043202B1480FFFD244200043C1D080005
35	:1002100037BD7FFC03A0F0213C1008002610011020
36	:100220003C1C0800279C4D000E000214000000003A
37	:100230000000000D27BDFFE8AFBF0014AFB00010F5
38	:100240009742010830437000240220001062000B26
39	:10025000286220011440002F0000102124024000D9
40	:1002600010620025000000002402600010620026D9
41	:10027000000010210A0000948FBF001427500100D5
42	:10028000920200091040001A240300013C020800F9
43	:100290008C42002010400016000018210E00052B93
44	:1002A00000000000960300083C06080094C64DBEFE
45	:1002B0008E0400188F8200209605000C00031C009D
46	:1002C00000661825AC440000AC450004240400017D
47	:1002D000AC400008AC40000CAC400010AC40001436
48	:1002E000AC4000180E000550AC43001C0000182163
49	:1002F0000A000093006010210E0003BD0000000002
50	:100300000A000093000010210E000F810000000081
51	:10031000000010218FBF00148FB0001003E0000810
52	:1003200027BD001827BDFFE0AFB00010AFBF001819
53	:10033000AFB10014275001009203000B2402001AF1
54	:10034000961100081462005B00002821322200018F
55	:1003500010400008000000008E0200009603001408
56	:10036000000211C200021040005A10210A0000DBF6
57	:10037000A44300803C0208008C420020104000286A
58	:10038000000000000E00052B00000000974201084D
59	:100390009743010C8F8500203042003E3063FFFF01
60	:1003A0000002140000431025ACA200008F4201009F
61	:1003B0003C06080094C64DBEACA20004974301164B
62	:1003C0009744010E3C02200000031C003084FFFF14
63	:1003D00000641825ACA3000800C230259742011024
64	:1003E0009743011224040001000214003063FFFF50
65	:1003F00000431025ACA2000C974201143042FFFFCD
66	:10040000ACA200108F420118ACA200149342010B61
67	:10041000304200FFACA200180E000550ACA6001C34
68	:100420003C0208008C420040244200013C010800CC
69	:10043000AC2200403C0308008C63004432220002DE
70	:1004400032240004246300013C010800AC23004472
71	:10045000108000180002282B8F4202B804430008C5
72	:100460008E0200203C0208008C4200602442000101
73	:100470003C010800AC2200600A0000FB24050001DA
74	:100480009603001600002821AF4202808E0200046D
75	:10049000A7430284AF4202883C021000AF4202B878
76	:1004A0003C0208008C42005C244200013C01080030
77	:1004B000AC22005C8FBF00188FB100148FB0001009
78	:1004C00000A0102103E0000827BD002027BDFFE0A9
79	:1004D000AFB00010AFBF0018AFB10014275001003B
80	:1004E0009203000B24020003961100081462006DB1
81	:1004F000000020213222000110400008000000000E
82	:100500008E02000096030014000211C20002104087
83	:10051000005A10210A000142A44300803C02080056
84	:100520008C42002010400025000000000E00052B2A
85	:1005300000000000974201089743010C8F850020BE
86	:100540003042003E3063FFFF0002140000431025DC
87	:10055000ACA200008F4201003C06080094C64DBECC
88	:10056000ACA20004974301169744010E3C02200000
89	:1005700000031C003084FFFF00641825ACA30008B2
90	:1005800000C2302597420110974301122404000154
91	:10059000000214003063FFFF00431025ACA2000CE2
92	:1005A000974201143042FFFFACA20010ACA000142F
93	:1005B000ACA000180E000550ACA6001C3C020800C0
94	:1005C0008C420040244200013C010800AC22004063
95	:1005D0003C0208008C420044322300042442000103
96	:1005E0003C010800AC2200441060001A32220002D4
97	:1005F0008F4202B8044300088E0200203C0208002B
98	:100600008C420060244200013C010800AC220060E2
99	:100610000A0001772404000196030016000020213F
100	:10062000AF4202808E020004A7430284AF420288D8
101	:100630003C021000AF4202B83C0208008C42005C51
102	:10064000244200013C010800AC22005C0A00017851
103	:100650008FBF001810400013000020218F430104B9
104	:100660003C026020AC4300148C420004240301FED1
105	:10067000304203FF1443000B000020218F42010091
106	:10068000000211C02442FFFC2C420008104000026E
107	:100690002403000200031F403C026000AC436914C5
108	:1006A000000020218FBF00188FB100148FB0001000
109	:1006B0000080102103E0000827BD00208F430100C7
110	:1006C0002402010050620003000311C20000000D6B
111	:1006D000000311C200021040005A1021A440008003
112	:1006E00003E00008000010219362000003E000080E
113	:1006F000AF80000003E000080000102103E00008C4
114	:1007000000001021240201001482000800000000F3
115	:100710003C0208008C4200FC244200013C0108001D
116	:10072000AC2200FC0A00019F30A200203C0208001D
117	:100730008C420084244200013C010800AC22008469
118	:1007400030A200201040000830A300103C02080036