RDMA/cxgb4: Use correct control txq

There is only one control txq per tx channel.  So use the port number
as the queue index when sending.

Signed-off-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

2 files changed, 10 insertions, 4 deletions

diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c
index e7b08dca740a..ffdc308151ce 100644
--- a/drivers/infiniband/hw/cxgb4/cm.c
+++ b/drivers/infiniband/hw/cxgb4/cm.c
@@ -473,7 +473,7 @@ static int send_connect(struct c4iw_ep *ep)
                        __func__);
                 return -ENOMEM;
         }
-        set_wr_txq(skb, CPL_PRIORITY_SETUP, ep->txq_idx);
+        set_wr_txq(skb, CPL_PRIORITY_SETUP, ep->ctrlq_idx);
 
         cxgb4_best_mtu(ep->com.dev->rdev.lldi.mtus, ep->mtu, &mtu_idx);
         wscale = compute_wscale(rcv_win);
@@ -853,7 +853,7 @@ static int update_rx_credits(struct c4iw_ep *ep, u32 credits)
         req->credit_dack = cpu_to_be32(credits | RX_FORCE_ACK(1) |
                                        F_RX_DACK_CHANGE |
                                        V_RX_DACK_MODE(dack_mode));
-        set_wr_txq(skb, CPL_PRIORITY_ACK, ep->txq_idx);
+        set_wr_txq(skb, CPL_PRIORITY_ACK, ep->ctrlq_idx);
         c4iw_ofld_send(&ep->com.dev->rdev, skb);
         return credits;
 }
@@ -1295,7 +1295,7 @@ static void accept_cr(struct c4iw_ep *ep, __be32 peer_ip, struct sk_buff *skb,
                                       ep->hwtid));
         rpl->opt0 = cpu_to_be64(opt0);
         rpl->opt2 = cpu_to_be32(opt2);
-        set_wr_txq(skb, CPL_PRIORITY_SETUP, ep->txq_idx);
+        set_wr_txq(skb, CPL_PRIORITY_SETUP, ep->ctrlq_idx);
         c4iw_l2t_send(&ep->com.dev->rdev, skb, ep->l2t);
 
         return;
@@ -1352,7 +1352,7 @@ static int pass_accept_req(struct c4iw_dev *dev, struct sk_buff *skb)
         u16 rss_qid;
         u32 mtu;
         int step;
-        int txq_idx;
+        int txq_idx, ctrlq_idx;
 
         parent_ep = lookup_stid(t, stid);
         PDBG("%s parent ep %p tid %u\n", __func__, parent_ep, hwtid);
@@ -1384,6 +1384,7 @@ static int pass_accept_req(struct c4iw_dev *dev, struct sk_buff *skb)
                 smac_idx = (cxgb4_port_viid(pdev) & 0x7F) << 1;
                 step = dev->rdev.lldi.ntxq / dev->rdev.lldi.nchan;
                 txq_idx = cxgb4_port_idx(pdev) * step;
+                ctrlq_idx = cxgb4_port_idx(pdev);
                 step = dev->rdev.lldi.nrxq / dev->rdev.lldi.nchan;
                 rss_qid = dev->rdev.lldi.rxq_ids[cxgb4_port_idx(pdev) * step];
                 dev_put(pdev);
@@ -1395,6 +1396,7 @@ static int pass_accept_req(struct c4iw_dev *dev, struct sk_buff *skb)
                 smac_idx = (cxgb4_port_viid(dst->neighbour->dev) & 0x7F) << 1;
                 step = dev->rdev.lldi.ntxq / dev->rdev.lldi.nchan;
                 txq_idx = cxgb4_port_idx(dst->neighbour->dev) * step;
+                ctrlq_idx = cxgb4_port_idx(dst->neighbour->dev);
                 step = dev->rdev.lldi.nrxq / dev->rdev.lldi.nchan;
                 rss_qid = dev->rdev.lldi.rxq_ids[
                           cxgb4_port_idx(dst->neighbour->dev) * step];
@@ -1434,6 +1436,7 @@ static int pass_accept_req(struct c4iw_dev *dev, struct sk_buff *skb)
         child_ep->rss_qid = rss_qid;
         child_ep->mtu = mtu;
         child_ep->txq_idx = txq_idx;
+        child_ep->ctrlq_idx = ctrlq_idx;
 
         PDBG("%s tx_chan %u smac_idx %u rss_qid %u\n", __func__,
              tx_chan, smac_idx, rss_qid);
@@ -1965,6 +1968,7 @@ int c4iw_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
                 ep->txq_idx = cxgb4_port_idx(pdev) * step;
                 step = ep->com.dev->rdev.lldi.nrxq /
                        ep->com.dev->rdev.lldi.nchan;
+                ep->ctrlq_idx = cxgb4_port_idx(pdev);
                 ep->rss_qid = ep->com.dev->rdev.lldi.rxq_ids[
                               cxgb4_port_idx(pdev) * step];
                 dev_put(pdev);
@@ -1979,6 +1983,7 @@ int c4iw_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
                 step = ep->com.dev->rdev.lldi.ntxq /
                        ep->com.dev->rdev.lldi.nchan;
                 ep->txq_idx = cxgb4_port_idx(ep->dst->neighbour->dev) * step;
+                ep->ctrlq_idx = cxgb4_port_idx(ep->dst->neighbour->dev);
                 step = ep->com.dev->rdev.lldi.nrxq /
                        ep->com.dev->rdev.lldi.nchan;
                 ep->rss_qid = ep->com.dev->rdev.lldi.rxq_ids[
diff --git a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
index d33e1a668811..ed459b8f800f 100644
--- a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
+++ b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
@@ -619,6 +619,7 @@ struct c4iw_ep {
         u16 plen;
         u16 rss_qid;
         u16 txq_idx;
+        u16 ctrlq_idx;
         u8 tos;
 };