diff options
Diffstat (limited to 'include/linux/qed/qed_if.h')
-rw-r--r-- | include/linux/qed/qed_if.h | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/include/linux/qed/qed_if.h b/include/linux/qed/qed_if.h index cc646ca97974..15e398c7230e 100644 --- a/include/linux/qed/qed_if.h +++ b/include/linux/qed/qed_if.h | |||
@@ -244,16 +244,11 @@ struct qed_fcoe_pf_params { | |||
244 | /* Most of the the parameters below are described in the FW iSCSI / TCP HSI */ | 244 | /* Most of the the parameters below are described in the FW iSCSI / TCP HSI */ |
245 | struct qed_iscsi_pf_params { | 245 | struct qed_iscsi_pf_params { |
246 | u64 glbl_q_params_addr; | 246 | u64 glbl_q_params_addr; |
247 | u64 bdq_pbl_base_addr[2]; | 247 | u64 bdq_pbl_base_addr[3]; |
248 | u32 max_cwnd; | ||
249 | u16 cq_num_entries; | 248 | u16 cq_num_entries; |
250 | u16 cmdq_num_entries; | 249 | u16 cmdq_num_entries; |
251 | u32 two_msl_timer; | 250 | u32 two_msl_timer; |
252 | u16 dup_ack_threshold; | ||
253 | u16 tx_sws_timer; | 251 | u16 tx_sws_timer; |
254 | u16 min_rto; | ||
255 | u16 min_rto_rt; | ||
256 | u16 max_rto; | ||
257 | 252 | ||
258 | /* The following parameters are used during HW-init | 253 | /* The following parameters are used during HW-init |
259 | * and these parameters need to be passed as arguments | 254 | * and these parameters need to be passed as arguments |
@@ -264,8 +259,8 @@ struct qed_iscsi_pf_params { | |||
264 | 259 | ||
265 | /* The following parameters are used during protocol-init */ | 260 | /* The following parameters are used during protocol-init */ |
266 | u16 half_way_close_timeout; | 261 | u16 half_way_close_timeout; |
267 | u16 bdq_xoff_threshold[2]; | 262 | u16 bdq_xoff_threshold[3]; |
268 | u16 bdq_xon_threshold[2]; | 263 | u16 bdq_xon_threshold[3]; |
269 | u16 cmdq_xoff_threshold; | 264 | u16 cmdq_xoff_threshold; |
270 | u16 cmdq_xon_threshold; | 265 | u16 cmdq_xon_threshold; |
271 | u16 rq_buffer_size; | 266 | u16 rq_buffer_size; |
@@ -281,10 +276,11 @@ struct qed_iscsi_pf_params { | |||
281 | u8 gl_cmd_pi; | 276 | u8 gl_cmd_pi; |
282 | u8 debug_mode; | 277 | u8 debug_mode; |
283 | u8 ll2_ooo_queue_id; | 278 | u8 ll2_ooo_queue_id; |
284 | u8 ooo_enable; | ||
285 | 279 | ||
286 | u8 is_target; | 280 | u8 is_target; |
287 | u8 bdq_pbl_num_entries[2]; | 281 | u8 is_soc_en; |
282 | u8 soc_num_of_blocks_log; | ||
283 | u8 bdq_pbl_num_entries[3]; | ||
288 | }; | 284 | }; |
289 | 285 | ||
290 | struct qed_rdma_pf_params { | 286 | struct qed_rdma_pf_params { |
@@ -316,16 +312,16 @@ enum qed_int_mode { | |||
316 | }; | 312 | }; |
317 | 313 | ||
318 | struct qed_sb_info { | 314 | struct qed_sb_info { |
319 | struct status_block *sb_virt; | 315 | struct status_block_e4 *sb_virt; |
320 | dma_addr_t sb_phys; | 316 | dma_addr_t sb_phys; |
321 | u32 sb_ack; /* Last given ack */ | 317 | u32 sb_ack; /* Last given ack */ |
322 | u16 igu_sb_id; | 318 | u16 igu_sb_id; |
323 | void __iomem *igu_addr; | 319 | void __iomem *igu_addr; |
324 | u8 flags; | 320 | u8 flags; |
325 | #define QED_SB_INFO_INIT 0x1 | 321 | #define QED_SB_INFO_INIT 0x1 |
326 | #define QED_SB_INFO_SETUP 0x2 | 322 | #define QED_SB_INFO_SETUP 0x2 |
327 | 323 | ||
328 | struct qed_dev *cdev; | 324 | struct qed_dev *cdev; |
329 | }; | 325 | }; |
330 | 326 | ||
331 | enum qed_dev_type { | 327 | enum qed_dev_type { |
@@ -939,7 +935,7 @@ static inline u16 qed_sb_update_sb_idx(struct qed_sb_info *sb_info) | |||
939 | u16 rc = 0; | 935 | u16 rc = 0; |
940 | 936 | ||
941 | prod = le32_to_cpu(sb_info->sb_virt->prod_index) & | 937 | prod = le32_to_cpu(sb_info->sb_virt->prod_index) & |
942 | STATUS_BLOCK_PROD_INDEX_MASK; | 938 | STATUS_BLOCK_E4_PROD_INDEX_MASK; |
943 | if (sb_info->sb_ack != prod) { | 939 | if (sb_info->sb_ack != prod) { |
944 | sb_info->sb_ack = prod; | 940 | sb_info->sb_ack = prod; |
945 | rc |= QED_SB_IDX; | 941 | rc |= QED_SB_IDX; |