aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/cxgb4vf/sge.c
diff options
context:
space:
mode:
authorCasey Leedom <leedom@chelsio.com>2010-07-12 17:39:07 -0400
committerDavid S. Miller <davem@davemloft.net>2010-07-12 23:21:41 -0400
commit7f9dd2fa4ac74d35f7e5200b76bd09533afe4e4c (patch)
tree5ce55bc75706f9fa7136a7143bc404e0b55bc00f /drivers/net/cxgb4vf/sge.c
parent84c3b972f37a735dafc25c4c0d5fb98f99e1157a (diff)
cxgb4vf: fix TX Queue restart
Fix up TX Queue Host Flow Control to cause an Egress Queue Status Update to be generated when we run out of TX Queue Descriptors. This will, in turn, allow us to restart a stopped TX Queue. Signed-off-by: Casey Leedom <leedom@chelsio.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/cxgb4vf/sge.c')
-rw-r--r--drivers/net/cxgb4vf/sge.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/net/cxgb4vf/sge.c b/drivers/net/cxgb4vf/sge.c
index 37c6354547c7..f2ee9b0bcc37 100644
--- a/drivers/net/cxgb4vf/sge.c
+++ b/drivers/net/cxgb4vf/sge.c
@@ -1070,6 +1070,7 @@ static inline void txq_advance(struct sge_txq *tq, unsigned int n)
1070 */ 1070 */
1071int t4vf_eth_xmit(struct sk_buff *skb, struct net_device *dev) 1071int t4vf_eth_xmit(struct sk_buff *skb, struct net_device *dev)
1072{ 1072{
1073 u32 wr_mid;
1073 u64 cntrl, *end; 1074 u64 cntrl, *end;
1074 int qidx, credits; 1075 int qidx, credits;
1075 unsigned int flits, ndesc; 1076 unsigned int flits, ndesc;
@@ -1143,14 +1144,19 @@ int t4vf_eth_xmit(struct sk_buff *skb, struct net_device *dev)
1143 goto out_free; 1144 goto out_free;
1144 } 1145 }
1145 1146
1147 wr_mid = FW_WR_LEN16(DIV_ROUND_UP(flits, 2));
1146 if (unlikely(credits < ETHTXQ_STOP_THRES)) { 1148 if (unlikely(credits < ETHTXQ_STOP_THRES)) {
1147 /* 1149 /*
1148 * After we're done injecting the Work Request for this 1150 * After we're done injecting the Work Request for this
1149 * packet, we'll be below our "stop threshhold" so stop the TX 1151 * packet, we'll be below our "stop threshhold" so stop the TX
1150 * Queue now. The queue will get started later on when the 1152 * Queue now and schedule a request for an SGE Egress Queue
1151 * firmware informs us that space has opened up. 1153 * Update message. The queue will get started later on when
1154 * the firmware processes this Work Request and sends us an
1155 * Egress Queue Status Update message indicating that space
1156 * has opened up.
1152 */ 1157 */
1153 txq_stop(txq); 1158 txq_stop(txq);
1159 wr_mid |= FW_WR_EQUEQ | FW_WR_EQUIQ;
1154 } 1160 }
1155 1161
1156 /* 1162 /*
@@ -1161,7 +1167,7 @@ int t4vf_eth_xmit(struct sk_buff *skb, struct net_device *dev)
1161 */ 1167 */
1162 BUG_ON(DIV_ROUND_UP(ETHTXQ_MAX_HDR, TXD_PER_EQ_UNIT) > 1); 1168 BUG_ON(DIV_ROUND_UP(ETHTXQ_MAX_HDR, TXD_PER_EQ_UNIT) > 1);
1163 wr = (void *)&txq->q.desc[txq->q.pidx]; 1169 wr = (void *)&txq->q.desc[txq->q.pidx];
1164 wr->equiq_to_len16 = cpu_to_be32(FW_WR_LEN16(DIV_ROUND_UP(flits, 2))); 1170 wr->equiq_to_len16 = cpu_to_be32(wr_mid);
1165 wr->r3[0] = cpu_to_be64(0); 1171 wr->r3[0] = cpu_to_be64(0);
1166 wr->r3[1] = cpu_to_be64(0); 1172 wr->r3[1] = cpu_to_be64(0);
1167 skb_copy_from_linear_data(skb, (void *)wr->ethmacdst, fw_hdr_copy_len); 1173 skb_copy_from_linear_data(skb, (void *)wr->ethmacdst, fw_hdr_copy_len);