Skip to content

Commit bb9366a

Browse files
Divy Le RayDavid S. Miller
authored andcommitted
cxgb3 - CQ context operations time out too soon.
Currently, the driver only tries up to 5 times (5us) to get the results of a CQ context operation. Testing has shown the chip can take as much as 50us to return the response on SG_CONTEXT_CMD operations. So we up the retry count to 100 to cover high loads. Signed-off-by: Divy Le Ray <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
1 parent 1c17ae8 commit bb9366a

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

drivers/net/cxgb3/t3_hw.c

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1870,6 +1870,8 @@ void t3_port_intr_clear(struct adapter *adapter, int idx)
18701870
phy->ops->intr_clear(phy);
18711871
}
18721872

1873+
#define SG_CONTEXT_CMD_ATTEMPTS 100
1874+
18731875
/**
18741876
* t3_sge_write_context - write an SGE context
18751877
* @adapter: the adapter
@@ -1889,7 +1891,7 @@ static int t3_sge_write_context(struct adapter *adapter, unsigned int id,
18891891
t3_write_reg(adapter, A_SG_CONTEXT_CMD,
18901892
V_CONTEXT_CMD_OPCODE(1) | type | V_CONTEXT(id));
18911893
return t3_wait_op_done(adapter, A_SG_CONTEXT_CMD, F_CONTEXT_CMD_BUSY,
1892-
0, 5, 1);
1894+
0, SG_CONTEXT_CMD_ATTEMPTS, 1);
18931895
}
18941896

18951897
/**
@@ -2075,7 +2077,7 @@ int t3_sge_enable_ecntxt(struct adapter *adapter, unsigned int id, int enable)
20752077
t3_write_reg(adapter, A_SG_CONTEXT_CMD,
20762078
V_CONTEXT_CMD_OPCODE(1) | F_EGRESS | V_CONTEXT(id));
20772079
return t3_wait_op_done(adapter, A_SG_CONTEXT_CMD, F_CONTEXT_CMD_BUSY,
2078-
0, 5, 1);
2080+
0, SG_CONTEXT_CMD_ATTEMPTS, 1);
20792081
}
20802082

20812083
/**
@@ -2099,7 +2101,7 @@ int t3_sge_disable_fl(struct adapter *adapter, unsigned int id)
20992101
t3_write_reg(adapter, A_SG_CONTEXT_CMD,
21002102
V_CONTEXT_CMD_OPCODE(1) | F_FREELIST | V_CONTEXT(id));
21012103
return t3_wait_op_done(adapter, A_SG_CONTEXT_CMD, F_CONTEXT_CMD_BUSY,
2102-
0, 5, 1);
2104+
0, SG_CONTEXT_CMD_ATTEMPTS, 1);
21032105
}
21042106

21052107
/**
@@ -2123,7 +2125,7 @@ int t3_sge_disable_rspcntxt(struct adapter *adapter, unsigned int id)
21232125
t3_write_reg(adapter, A_SG_CONTEXT_CMD,
21242126
V_CONTEXT_CMD_OPCODE(1) | F_RESPONSEQ | V_CONTEXT(id));
21252127
return t3_wait_op_done(adapter, A_SG_CONTEXT_CMD, F_CONTEXT_CMD_BUSY,
2126-
0, 5, 1);
2128+
0, SG_CONTEXT_CMD_ATTEMPTS, 1);
21272129
}
21282130

21292131
/**
@@ -2147,7 +2149,7 @@ int t3_sge_disable_cqcntxt(struct adapter *adapter, unsigned int id)
21472149
t3_write_reg(adapter, A_SG_CONTEXT_CMD,
21482150
V_CONTEXT_CMD_OPCODE(1) | F_CQ | V_CONTEXT(id));
21492151
return t3_wait_op_done(adapter, A_SG_CONTEXT_CMD, F_CONTEXT_CMD_BUSY,
2150-
0, 5, 1);
2152+
0, SG_CONTEXT_CMD_ATTEMPTS, 1);
21512153
}
21522154

21532155
/**
@@ -2172,7 +2174,7 @@ int t3_sge_cqcntxt_op(struct adapter *adapter, unsigned int id, unsigned int op,
21722174
t3_write_reg(adapter, A_SG_CONTEXT_CMD, V_CONTEXT_CMD_OPCODE(op) |
21732175
V_CONTEXT(id) | F_CQ);
21742176
if (t3_wait_op_done_val(adapter, A_SG_CONTEXT_CMD, F_CONTEXT_CMD_BUSY,
2175-
0, 5, 1, &val))
2177+
0, SG_CONTEXT_CMD_ATTEMPTS, 1, &val))
21762178
return -EIO;
21772179

21782180
if (op >= 2 && op < 7) {
@@ -2182,7 +2184,8 @@ int t3_sge_cqcntxt_op(struct adapter *adapter, unsigned int id, unsigned int op,
21822184
t3_write_reg(adapter, A_SG_CONTEXT_CMD,
21832185
V_CONTEXT_CMD_OPCODE(0) | F_CQ | V_CONTEXT(id));
21842186
if (t3_wait_op_done(adapter, A_SG_CONTEXT_CMD,
2185-
F_CONTEXT_CMD_BUSY, 0, 5, 1))
2187+
F_CONTEXT_CMD_BUSY, 0,
2188+
SG_CONTEXT_CMD_ATTEMPTS, 1))
21862189
return -EIO;
21872190
return G_CQ_INDEX(t3_read_reg(adapter, A_SG_CONTEXT_DATA0));
21882191
}
@@ -2208,7 +2211,7 @@ static int t3_sge_read_context(unsigned int type, struct adapter *adapter,
22082211
t3_write_reg(adapter, A_SG_CONTEXT_CMD,
22092212
V_CONTEXT_CMD_OPCODE(0) | type | V_CONTEXT(id));
22102213
if (t3_wait_op_done(adapter, A_SG_CONTEXT_CMD, F_CONTEXT_CMD_BUSY, 0,
2211-
5, 1))
2214+
SG_CONTEXT_CMD_ATTEMPTS, 1))
22122215
return -EIO;
22132216
data[0] = t3_read_reg(adapter, A_SG_CONTEXT_DATA0);
22142217
data[1] = t3_read_reg(adapter, A_SG_CONTEXT_DATA1);

0 commit comments

Comments
 (0)