Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-12 07:01:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/cxgbit: Use T6 specific macro to set the force bit

Browse Source 
For T6 adapters use T6 specific macro to set the force bit.

Signed-off-by: Varun Prakash <varun@chelsio.com>
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
This commit is contained in:
Varun Prakash 2017-01-24 17:07:02 +05:30 committed by Nicholas Bellinger
parent 5cadafb236
commit bdec518874
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/chelsio/cxgb4/t4_msg.h
View File

@ -1349,6 +1349,10 @@ struct cpl_tx_data {
#define TX_FORCE_S 13 #define TX_FORCE_S 13
#define TX_FORCE_V(x) ((x) << TX_FORCE_S) #define TX_FORCE_V(x) ((x) << TX_FORCE_S)
#define T6_TX_FORCE_S 20
#define T6_TX_FORCE_V(x) ((x) << T6_TX_FORCE_S)
#define T6_TX_FORCE_F T6_TX_FORCE_V(1U)
enum { enum {
ULP_TX_MEM_READ = 2, ULP_TX_MEM_READ = 2,
ULP_TX_MEM_WRITE = 3, ULP_TX_MEM_WRITE = 3,

4
drivers/target/iscsi/cxgbit/cxgbit_target.c
View File

@ -162,12 +162,14 @@ cxgbit_tx_data_wr(struct cxgbit_sock *csk, struct sk_buff *skb, u32 dlen,
u32 len, u32 credits, u32 compl) u32 len, u32 credits, u32 compl)
{ {
struct fw_ofld_tx_data_wr *req; struct fw_ofld_tx_data_wr *req;
const struct cxgb4_lld_info *lldi = &csk->com.cdev->lldi;
u32 submode = cxgbit_skcb_submode(skb); u32 submode = cxgbit_skcb_submode(skb);
u32 wr_ulp_mode = 0; u32 wr_ulp_mode = 0;
u32 hdr_size = sizeof(*req); u32 hdr_size = sizeof(*req);
u32 opcode = FW_OFLD_TX_DATA_WR; u32 opcode = FW_OFLD_TX_DATA_WR;
u32 immlen = 0; u32 immlen = 0;
u32 force = TX_FORCE_V(!submode); u32 force = is_t5(lldi->adapter_type) ? TX_FORCE_V(!submode) :
T6_TX_FORCE_F;
if (cxgbit_skcb_flags(skb) & SKCBF_TX_ISO) { if (cxgbit_skcb_flags(skb) & SKCBF_TX_ISO) {
opcode = FW_ISCSI_TX_DATA_WR; opcode = FW_ISCSI_TX_DATA_WR;