Skip to content

Commit 0a6890b

Browse files
Sudarsana Reddy Kallurudavem330
Sudarsana Reddy Kalluru
authored and
davem330
committed
bnx2x: Utilize FW 7.13.15.0.
Commit 97a27d6d6e8d "bnx2x: Add FW 7.13.15.0" added said .bin FW to linux-firmware tree. This FW addresses few important issues in the earlier FW release. This patch incorporates FW 7.13.15.0 in the bnx2x driver. Signed-off-by: Sudarsana Reddy Kalluru <skalluru@marvell.com> Signed-off-by: Ariel Elior <aelior@marvell.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent f921861 commit 0a6890b

File tree

2 files changed

+67
-67
lines changed

2 files changed

+67
-67
lines changed

‎drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -32,31 +32,31 @@
3232
* IRO[142].m2) + ((sbId) * IRO[142].m3))
3333
#define CSTORM_IGU_MODE_OFFSET (IRO[161].base)
3434
#define CSTORM_ISCSI_CQ_SIZE_OFFSET(pfId) \
35-
(IRO[323].base + ((pfId) * IRO[323].m1))
36-
#define CSTORM_ISCSI_CQ_SQN_SIZE_OFFSET(pfId) \
3735
(IRO[324].base + ((pfId) * IRO[324].m1))
36+
#define CSTORM_ISCSI_CQ_SQN_SIZE_OFFSET(pfId) \
37+
(IRO[325].base + ((pfId) * IRO[325].m1))
3838
#define CSTORM_ISCSI_EQ_CONS_OFFSET(pfId, iscsiEqId) \
39-
(IRO[316].base + ((pfId) * IRO[316].m1) + ((iscsiEqId) * IRO[316].m2))
39+
(IRO[317].base + ((pfId) * IRO[317].m1) + ((iscsiEqId) * IRO[317].m2))
4040
#define CSTORM_ISCSI_EQ_NEXT_EQE_ADDR_OFFSET(pfId, iscsiEqId) \
41-
(IRO[318].base + ((pfId) * IRO[318].m1) + ((iscsiEqId) * IRO[318].m2))
41+
(IRO[319].base + ((pfId) * IRO[319].m1) + ((iscsiEqId) * IRO[319].m2))
4242
#define CSTORM_ISCSI_EQ_NEXT_PAGE_ADDR_OFFSET(pfId, iscsiEqId) \
43-
(IRO[317].base + ((pfId) * IRO[317].m1) + ((iscsiEqId) * IRO[317].m2))
43+
(IRO[318].base + ((pfId) * IRO[318].m1) + ((iscsiEqId) * IRO[318].m2))
4444
#define CSTORM_ISCSI_EQ_NEXT_PAGE_ADDR_VALID_OFFSET(pfId, iscsiEqId) \
45-
(IRO[319].base + ((pfId) * IRO[319].m1) + ((iscsiEqId) * IRO[319].m2))
45+
(IRO[320].base + ((pfId) * IRO[320].m1) + ((iscsiEqId) * IRO[320].m2))
4646
#define CSTORM_ISCSI_EQ_PROD_OFFSET(pfId, iscsiEqId) \
47-
(IRO[315].base + ((pfId) * IRO[315].m1) + ((iscsiEqId) * IRO[315].m2))
47+
(IRO[316].base + ((pfId) * IRO[316].m1) + ((iscsiEqId) * IRO[316].m2))
4848
#define CSTORM_ISCSI_EQ_SB_INDEX_OFFSET(pfId, iscsiEqId) \
49-
(IRO[321].base + ((pfId) * IRO[321].m1) + ((iscsiEqId) * IRO[321].m2))
49+
(IRO[322].base + ((pfId) * IRO[322].m1) + ((iscsiEqId) * IRO[322].m2))
5050
#define CSTORM_ISCSI_EQ_SB_NUM_OFFSET(pfId, iscsiEqId) \
51-
(IRO[320].base + ((pfId) * IRO[320].m1) + ((iscsiEqId) * IRO[320].m2))
51+
(IRO[321].base + ((pfId) * IRO[321].m1) + ((iscsiEqId) * IRO[321].m2))
5252
#define CSTORM_ISCSI_HQ_SIZE_OFFSET(pfId) \
53-
(IRO[322].base + ((pfId) * IRO[322].m1))
53+
(IRO[323].base + ((pfId) * IRO[323].m1))
5454
#define CSTORM_ISCSI_NUM_OF_TASKS_OFFSET(pfId) \
55-
(IRO[314].base + ((pfId) * IRO[314].m1))
55+
(IRO[315].base + ((pfId) * IRO[315].m1))
5656
#define CSTORM_ISCSI_PAGE_SIZE_LOG_OFFSET(pfId) \
57-
(IRO[313].base + ((pfId) * IRO[313].m1))
57+
(IRO[314].base + ((pfId) * IRO[314].m1))
5858
#define CSTORM_ISCSI_PAGE_SIZE_OFFSET(pfId) \
59-
(IRO[312].base + ((pfId) * IRO[312].m1))
59+
(IRO[313].base + ((pfId) * IRO[313].m1))
6060
#define CSTORM_RECORD_SLOW_PATH_OFFSET(funcId) \
6161
(IRO[155].base + ((funcId) * IRO[155].m1))
6262
#define CSTORM_SP_STATUS_BLOCK_DATA_OFFSET(pfId) \
@@ -99,81 +99,81 @@
9999
#define TSTORM_FUNC_EN_OFFSET(funcId) \
100100
(IRO[107].base + ((funcId) * IRO[107].m1))
101101
#define TSTORM_ISCSI_ERROR_BITMAP_OFFSET(pfId) \
102-
(IRO[278].base + ((pfId) * IRO[278].m1))
103-
#define TSTORM_ISCSI_L2_ISCSI_OOO_CID_TABLE_OFFSET(pfId) \
104102
(IRO[279].base + ((pfId) * IRO[279].m1))
105-
#define TSTORM_ISCSI_L2_ISCSI_OOO_CLIENT_ID_TABLE_OFFSET(pfId) \
103+
#define TSTORM_ISCSI_L2_ISCSI_OOO_CID_TABLE_OFFSET(pfId) \
106104
(IRO[280].base + ((pfId) * IRO[280].m1))
107-
#define TSTORM_ISCSI_L2_ISCSI_OOO_PROD_OFFSET(pfId) \
105+
#define TSTORM_ISCSI_L2_ISCSI_OOO_CLIENT_ID_TABLE_OFFSET(pfId) \
108106
(IRO[281].base + ((pfId) * IRO[281].m1))
107+
#define TSTORM_ISCSI_L2_ISCSI_OOO_PROD_OFFSET(pfId) \
108+
(IRO[282].base + ((pfId) * IRO[282].m1))
109109
#define TSTORM_ISCSI_NUM_OF_TASKS_OFFSET(pfId) \
110-
(IRO[277].base + ((pfId) * IRO[277].m1))
110+
(IRO[278].base + ((pfId) * IRO[278].m1))
111111
#define TSTORM_ISCSI_PAGE_SIZE_LOG_OFFSET(pfId) \
112-
(IRO[276].base + ((pfId) * IRO[276].m1))
112+
(IRO[277].base + ((pfId) * IRO[277].m1))
113113
#define TSTORM_ISCSI_PAGE_SIZE_OFFSET(pfId) \
114-
(IRO[275].base + ((pfId) * IRO[275].m1))
114+
(IRO[276].base + ((pfId) * IRO[276].m1))
115115
#define TSTORM_ISCSI_RQ_SIZE_OFFSET(pfId) \
116-
(IRO[274].base + ((pfId) * IRO[274].m1))
116+
(IRO[275].base + ((pfId) * IRO[275].m1))
117117
#define TSTORM_ISCSI_TCP_LOCAL_ADV_WND_OFFSET(pfId) \
118-
(IRO[284].base + ((pfId) * IRO[284].m1))
118+
(IRO[285].base + ((pfId) * IRO[285].m1))
119119
#define TSTORM_ISCSI_TCP_VARS_FLAGS_OFFSET(pfId) \
120-
(IRO[270].base + ((pfId) * IRO[270].m1))
121-
#define TSTORM_ISCSI_TCP_VARS_LSB_LOCAL_MAC_ADDR_OFFSET(pfId) \
122120
(IRO[271].base + ((pfId) * IRO[271].m1))
123-
#define TSTORM_ISCSI_TCP_VARS_MID_LOCAL_MAC_ADDR_OFFSET(pfId) \
121+
#define TSTORM_ISCSI_TCP_VARS_LSB_LOCAL_MAC_ADDR_OFFSET(pfId) \
124122
(IRO[272].base + ((pfId) * IRO[272].m1))
125-
#define TSTORM_ISCSI_TCP_VARS_MSB_LOCAL_MAC_ADDR_OFFSET(pfId) \
123+
#define TSTORM_ISCSI_TCP_VARS_MID_LOCAL_MAC_ADDR_OFFSET(pfId) \
126124
(IRO[273].base + ((pfId) * IRO[273].m1))
125+
#define TSTORM_ISCSI_TCP_VARS_MSB_LOCAL_MAC_ADDR_OFFSET(pfId) \
126+
(IRO[274].base + ((pfId) * IRO[274].m1))
127127
#define TSTORM_MAC_FILTER_CONFIG_OFFSET(pfId) \
128128
(IRO[206].base + ((pfId) * IRO[206].m1))
129129
#define TSTORM_RECORD_SLOW_PATH_OFFSET(funcId) \
130130
(IRO[109].base + ((funcId) * IRO[109].m1))
131131
#define TSTORM_TCP_MAX_CWND_OFFSET(pfId) \
132-
(IRO[223].base + ((pfId) * IRO[223].m1))
132+
(IRO[224].base + ((pfId) * IRO[224].m1))
133133
#define TSTORM_VF_TO_PF_OFFSET(funcId) \
134134
(IRO[108].base + ((funcId) * IRO[108].m1))
135-
#define USTORM_AGG_DATA_OFFSET (IRO[212].base)
136-
#define USTORM_AGG_DATA_SIZE (IRO[212].size)
135+
#define USTORM_AGG_DATA_OFFSET (IRO[213].base)
136+
#define USTORM_AGG_DATA_SIZE (IRO[213].size)
137137
#define USTORM_ASSERT_LIST_INDEX_OFFSET (IRO[181].base)
138138
#define USTORM_ASSERT_LIST_OFFSET(assertListEntry) \
139139
(IRO[180].base + ((assertListEntry) * IRO[180].m1))
140140
#define USTORM_ETH_PAUSE_ENABLED_OFFSET(portId) \
141141
(IRO[187].base + ((portId) * IRO[187].m1))
142142
#define USTORM_FCOE_EQ_PROD_OFFSET(pfId) \
143-
(IRO[325].base + ((pfId) * IRO[325].m1))
143+
(IRO[326].base + ((pfId) * IRO[326].m1))
144144
#define USTORM_FUNC_EN_OFFSET(funcId) \
145145
(IRO[182].base + ((funcId) * IRO[182].m1))
146146
#define USTORM_ISCSI_CQ_SIZE_OFFSET(pfId) \
147-
(IRO[289].base + ((pfId) * IRO[289].m1))
148-
#define USTORM_ISCSI_CQ_SQN_SIZE_OFFSET(pfId) \
149147
(IRO[290].base + ((pfId) * IRO[290].m1))
148+
#define USTORM_ISCSI_CQ_SQN_SIZE_OFFSET(pfId) \
149+
(IRO[291].base + ((pfId) * IRO[291].m1))
150150
#define USTORM_ISCSI_ERROR_BITMAP_OFFSET(pfId) \
151-
(IRO[294].base + ((pfId) * IRO[294].m1))
151+
(IRO[295].base + ((pfId) * IRO[295].m1))
152152
#define USTORM_ISCSI_GLOBAL_BUF_PHYS_ADDR_OFFSET(pfId) \
153-
(IRO[291].base + ((pfId) * IRO[291].m1))
153+
(IRO[292].base + ((pfId) * IRO[292].m1))
154154
#define USTORM_ISCSI_NUM_OF_TASKS_OFFSET(pfId) \
155-
(IRO[287].base + ((pfId) * IRO[287].m1))
155+
(IRO[288].base + ((pfId) * IRO[288].m1))
156156
#define USTORM_ISCSI_PAGE_SIZE_LOG_OFFSET(pfId) \
157-
(IRO[286].base + ((pfId) * IRO[286].m1))
157+
(IRO[287].base + ((pfId) * IRO[287].m1))
158158
#define USTORM_ISCSI_PAGE_SIZE_OFFSET(pfId) \
159-
(IRO[285].base + ((pfId) * IRO[285].m1))
159+
(IRO[286].base + ((pfId) * IRO[286].m1))
160160
#define USTORM_ISCSI_R2TQ_SIZE_OFFSET(pfId) \
161-
(IRO[288].base + ((pfId) * IRO[288].m1))
161+
(IRO[289].base + ((pfId) * IRO[289].m1))
162162
#define USTORM_ISCSI_RQ_BUFFER_SIZE_OFFSET(pfId) \
163-
(IRO[292].base + ((pfId) * IRO[292].m1))
164-
#define USTORM_ISCSI_RQ_SIZE_OFFSET(pfId) \
165163
(IRO[293].base + ((pfId) * IRO[293].m1))
164+
#define USTORM_ISCSI_RQ_SIZE_OFFSET(pfId) \
165+
(IRO[294].base + ((pfId) * IRO[294].m1))
166166
#define USTORM_MEM_WORKAROUND_ADDRESS_OFFSET(pfId) \
167167
(IRO[186].base + ((pfId) * IRO[186].m1))
168168
#define USTORM_RECORD_SLOW_PATH_OFFSET(funcId) \
169169
(IRO[184].base + ((funcId) * IRO[184].m1))
170170
#define USTORM_RX_PRODS_E1X_OFFSET(portId, clientId) \
171-
(IRO[215].base + ((portId) * IRO[215].m1) + ((clientId) * \
172-
IRO[215].m2))
171+
(IRO[216].base + ((portId) * IRO[216].m1) + ((clientId) * \
172+
IRO[216].m2))
173173
#define USTORM_RX_PRODS_E2_OFFSET(qzoneId) \
174-
(IRO[216].base + ((qzoneId) * IRO[216].m1))
175-
#define USTORM_TPA_BTR_OFFSET (IRO[213].base)
176-
#define USTORM_TPA_BTR_SIZE (IRO[213].size)
174+
(IRO[217].base + ((qzoneId) * IRO[217].m1))
175+
#define USTORM_TPA_BTR_OFFSET (IRO[214].base)
176+
#define USTORM_TPA_BTR_SIZE (IRO[214].size)
177177
#define USTORM_VF_TO_PF_OFFSET(funcId) \
178178
(IRO[183].base + ((funcId) * IRO[183].m1))
179179
#define XSTORM_AGG_INT_FINAL_CLEANUP_COMP_TYPE (IRO[67].base)
@@ -188,39 +188,39 @@
188188
#define XSTORM_FUNC_EN_OFFSET(funcId) \
189189
(IRO[47].base + ((funcId) * IRO[47].m1))
190190
#define XSTORM_ISCSI_HQ_SIZE_OFFSET(pfId) \
191-
(IRO[302].base + ((pfId) * IRO[302].m1))
191+
(IRO[303].base + ((pfId) * IRO[303].m1))
192192
#define XSTORM_ISCSI_LOCAL_MAC_ADDR0_OFFSET(pfId) \
193-
(IRO[305].base + ((pfId) * IRO[305].m1))
194-
#define XSTORM_ISCSI_LOCAL_MAC_ADDR1_OFFSET(pfId) \
195193
(IRO[306].base + ((pfId) * IRO[306].m1))
196-
#define XSTORM_ISCSI_LOCAL_MAC_ADDR2_OFFSET(pfId) \
194+
#define XSTORM_ISCSI_LOCAL_MAC_ADDR1_OFFSET(pfId) \
197195
(IRO[307].base + ((pfId) * IRO[307].m1))
198-
#define XSTORM_ISCSI_LOCAL_MAC_ADDR3_OFFSET(pfId) \
196+
#define XSTORM_ISCSI_LOCAL_MAC_ADDR2_OFFSET(pfId) \
199197
(IRO[308].base + ((pfId) * IRO[308].m1))
200-
#define XSTORM_ISCSI_LOCAL_MAC_ADDR4_OFFSET(pfId) \
198+
#define XSTORM_ISCSI_LOCAL_MAC_ADDR3_OFFSET(pfId) \
201199
(IRO[309].base + ((pfId) * IRO[309].m1))
202-
#define XSTORM_ISCSI_LOCAL_MAC_ADDR5_OFFSET(pfId) \
200+
#define XSTORM_ISCSI_LOCAL_MAC_ADDR4_OFFSET(pfId) \
203201
(IRO[310].base + ((pfId) * IRO[310].m1))
204-
#define XSTORM_ISCSI_LOCAL_VLAN_OFFSET(pfId) \
202+
#define XSTORM_ISCSI_LOCAL_MAC_ADDR5_OFFSET(pfId) \
205203
(IRO[311].base + ((pfId) * IRO[311].m1))
204+
#define XSTORM_ISCSI_LOCAL_VLAN_OFFSET(pfId) \
205+
(IRO[312].base + ((pfId) * IRO[312].m1))
206206
#define XSTORM_ISCSI_NUM_OF_TASKS_OFFSET(pfId) \
207-
(IRO[301].base + ((pfId) * IRO[301].m1))
207+
(IRO[302].base + ((pfId) * IRO[302].m1))
208208
#define XSTORM_ISCSI_PAGE_SIZE_LOG_OFFSET(pfId) \
209-
(IRO[300].base + ((pfId) * IRO[300].m1))
209+
(IRO[301].base + ((pfId) * IRO[301].m1))
210210
#define XSTORM_ISCSI_PAGE_SIZE_OFFSET(pfId) \
211-
(IRO[299].base + ((pfId) * IRO[299].m1))
211+
(IRO[300].base + ((pfId) * IRO[300].m1))
212212
#define XSTORM_ISCSI_R2TQ_SIZE_OFFSET(pfId) \
213-
(IRO[304].base + ((pfId) * IRO[304].m1))
213+
(IRO[305].base + ((pfId) * IRO[305].m1))
214214
#define XSTORM_ISCSI_SQ_SIZE_OFFSET(pfId) \
215-
(IRO[303].base + ((pfId) * IRO[303].m1))
215+
(IRO[304].base + ((pfId) * IRO[304].m1))
216216
#define XSTORM_ISCSI_TCP_VARS_ADV_WND_SCL_OFFSET(pfId) \
217-
(IRO[298].base + ((pfId) * IRO[298].m1))
217+
(IRO[299].base + ((pfId) * IRO[299].m1))
218218
#define XSTORM_ISCSI_TCP_VARS_FLAGS_OFFSET(pfId) \
219-
(IRO[297].base + ((pfId) * IRO[297].m1))
219+
(IRO[298].base + ((pfId) * IRO[298].m1))
220220
#define XSTORM_ISCSI_TCP_VARS_TOS_OFFSET(pfId) \
221-
(IRO[296].base + ((pfId) * IRO[296].m1))
221+
(IRO[297].base + ((pfId) * IRO[297].m1))
222222
#define XSTORM_ISCSI_TCP_VARS_TTL_OFFSET(pfId) \
223-
(IRO[295].base + ((pfId) * IRO[295].m1))
223+
(IRO[296].base + ((pfId) * IRO[296].m1))
224224
#define XSTORM_RATE_SHAPING_PER_VN_VARS_OFFSET(pfId) \
225225
(IRO[44].base + ((pfId) * IRO[44].m1))
226226
#define XSTORM_RECORD_SLOW_PATH_OFFSET(funcId) \
@@ -233,12 +233,12 @@
233233
#define XSTORM_SPQ_PROD_OFFSET(funcId) \
234234
(IRO[31].base + ((funcId) * IRO[31].m1))
235235
#define XSTORM_TCP_GLOBAL_DEL_ACK_COUNTER_ENABLED_OFFSET(portId) \
236-
(IRO[217].base + ((portId) * IRO[217].m1))
237-
#define XSTORM_TCP_GLOBAL_DEL_ACK_COUNTER_MAX_COUNT_OFFSET(portId) \
238236
(IRO[218].base + ((portId) * IRO[218].m1))
237+
#define XSTORM_TCP_GLOBAL_DEL_ACK_COUNTER_MAX_COUNT_OFFSET(portId) \
238+
(IRO[219].base + ((portId) * IRO[219].m1))
239239
#define XSTORM_TCP_TX_SWS_TIMER_VAL_OFFSET(pfId) \
240-
(IRO[220].base + (((pfId)>>1) * IRO[220].m1) + (((pfId)&1) * \
241-
IRO[220].m2))
240+
(IRO[221].base + (((pfId)>>1) * IRO[221].m1) + (((pfId)&1) * \
241+
IRO[221].m2))
242242
#define XSTORM_VF_TO_PF_OFFSET(funcId) \
243243
(IRO[48].base + ((funcId) * IRO[48].m1))
244244
#define COMMON_ASM_INVALID_ASSERT_OPCODE 0x0

‎drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3024,7 +3024,7 @@ struct afex_stats {
30243024

30253025
#define BCM_5710_FW_MAJOR_VERSION 7
30263026
#define BCM_5710_FW_MINOR_VERSION 13
3027-
#define BCM_5710_FW_REVISION_VERSION 11
3027+
#define BCM_5710_FW_REVISION_VERSION 15
30283028
#define BCM_5710_FW_ENGINEERING_VERSION 0
30293029
#define BCM_5710_FW_COMPILE_FLAGS 1
30303030

0 commit comments

Comments
 (0)