net: add rte prefix to ether defines
[dpdk.git] / drivers / net / cxgbe / sge.c
index 9cbd4ec..b3c4ec2 100644 (file)
@@ -1,34 +1,6 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2014-2015 Chelsio Communications.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Chelsio Communications nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2014-2018 Chelsio Communications.
+ * All rights reserved.
  */
 
 #include <sys/queue.h>
 #include <rte_eal.h>
 #include <rte_alarm.h>
 #include <rte_ether.h>
-#include <rte_ethdev.h>
-#include <rte_atomic.h>
+#include <rte_ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_random.h>
 #include <rte_dev.h>
 
-#include "common.h"
-#include "t4_regs.h"
-#include "t4_msg.h"
+#include "base/common.h"
+#include "base/t4_regs.h"
+#include "base/t4_msg.h"
 #include "cxgbe.h"
 
 static inline void ship_tx_pkt_coalesce_wr(struct adapter *adap,
@@ -83,6 +54,11 @@ static inline void ship_tx_pkt_coalesce_wr(struct adapter *adap,
  */
 #define MAX_IMM_TX_PKT_LEN 256
 
+/*
+ * Max size of a WR sent through a control Tx queue.
+ */
+#define MAX_CTRL_WR_LEN SGE_MAX_WR_LEN
+
 /*
  * Rx buffer sizes for "usembufs" Free List buffers (one ingress packet
  * per mbuf buffer).  We currently only support two sizes for 1500- and
@@ -97,7 +73,7 @@ static inline unsigned int fl_mtu_bufsize(struct adapter *adapter,
 {
        struct sge *s = &adapter->sge;
 
-       return CXGBE_ALIGN(s->pktshift + ETHER_HDR_LEN + VLAN_HLEN + mtu,
+       return CXGBE_ALIGN(s->pktshift + RTE_ETHER_HDR_LEN + VLAN_HLEN + mtu,
                           s->fl_align);
 }
 
@@ -150,7 +126,7 @@ static int map_mbuf(struct rte_mbuf *mbuf, dma_addr_t *addr)
        struct rte_mbuf *m = mbuf;
 
        for (; m; m = m->next, addr++) {
-               *addr = m->buf_physaddr + rte_pktmbuf_headroom(m);
+               *addr = m->buf_iova + rte_pktmbuf_headroom(m);
                if (*addr == 0)
                        goto out_err;
        }
@@ -338,7 +314,11 @@ static inline void ring_fl_db(struct adapter *adap, struct sge_fl *q)
                 * mechanism.
                 */
                if (unlikely(!q->bar2_addr)) {
-                       t4_write_reg_relaxed(adap, MYPF_REG(A_SGE_PF_KDOORBELL),
+                       u32 reg = is_pf4(adap) ? MYPF_REG(A_SGE_PF_KDOORBELL) :
+                                                T4VF_SGE_BASE_ADDR +
+                                                A_SGE_VF_KDOORBELL;
+
+                       t4_write_reg_relaxed(adap, reg,
                                             val | V_QID(q->cntxt_id));
                } else {
                        writel_relaxed(val | V_QID(q->bar2_qid),
@@ -386,9 +366,10 @@ static unsigned int refill_fl_usembufs(struct adapter *adap, struct sge_fl *q,
        struct rte_mbuf *buf_bulk[n];
        int ret, i;
        struct rte_pktmbuf_pool_private *mbp_priv;
-       u8 jumbo_en = rxq->rspq.eth_dev->data->dev_conf.rxmode.jumbo_frame;
+       u8 jumbo_en = rxq->rspq.eth_dev->data->dev_conf.rxmode.offloads &
+               DEV_RX_OFFLOAD_JUMBO_FRAME;
 
-       /* Use jumbo mtu buffers iff mbuf data room size can fit jumbo data. */
+       /* Use jumbo mtu buffers if mbuf data room size can fit jumbo data. */
        mbp_priv = rte_mempool_get_priv(rxq->rspq.mb_pool);
        if (jumbo_en &&
            ((mbp_priv->mbuf_data_room_size - RTE_PKTMBUF_HEADROOM) >= 9000))
@@ -415,12 +396,17 @@ static unsigned int refill_fl_usembufs(struct adapter *adap, struct sge_fl *q,
                }
 
                rte_mbuf_refcnt_set(mbuf, 1);
-               mbuf->data_off = RTE_PKTMBUF_HEADROOM;
+               mbuf->data_off =
+                       (uint16_t)((char *)
+                                  RTE_PTR_ALIGN((char *)mbuf->buf_addr +
+                                                RTE_PKTMBUF_HEADROOM,
+                                                adap->sge.fl_align) -
+                                  (char *)mbuf->buf_addr);
                mbuf->next = NULL;
                mbuf->nb_segs = 1;
                mbuf->port = rxq->rspq.port_id;
 
-               mapping = (dma_addr_t)RTE_ALIGN(mbuf->buf_physaddr +
+               mapping = (dma_addr_t)RTE_ALIGN(mbuf->buf_iova +
                                                mbuf->data_off,
                                                adap->sge.fl_align);
                mapping |= buf_size_idx;
@@ -567,12 +553,16 @@ static inline int is_eth_imm(const struct rte_mbuf *m)
 /**
  * calc_tx_flits - calculate the number of flits for a packet Tx WR
  * @m: the packet
+ * @adap: adapter structure pointer
  *
  * Returns the number of flits needed for a Tx WR for the given Ethernet
  * packet, including the needed WR and CPL headers.
  */
-static inline unsigned int calc_tx_flits(const struct rte_mbuf *m)
+static inline unsigned int calc_tx_flits(const struct rte_mbuf *m,
+                                        struct adapter *adap)
 {
+       size_t wr_size = is_pf4(adap) ? sizeof(struct fw_eth_tx_pkt_wr) :
+                                       sizeof(struct fw_eth_tx_pkt_vm_wr);
        unsigned int flits;
        int hdrlen;
 
@@ -593,15 +583,14 @@ static inline unsigned int calc_tx_flits(const struct rte_mbuf *m)
         * Write Header (incorporated as part of the cpl_tx_pkt_lso and
         * cpl_tx_pkt structures), followed by either a TX Packet Write CPL
         * message or, if we're doing a Large Send Offload, an LSO CPL message
-        * with an embeded TX Packet Write CPL message.
+        * with an embedded TX Packet Write CPL message.
         */
        flits = sgl_len(m->nb_segs);
        if (m->tso_segsz)
-               flits += (sizeof(struct fw_eth_tx_pkt_wr) +
-                         sizeof(struct cpl_tx_pkt_lso_core) +
+               flits += (wr_size + sizeof(struct cpl_tx_pkt_lso_core) +
                          sizeof(struct cpl_tx_pkt_core)) / sizeof(__be64);
        else
-               flits += (sizeof(struct fw_eth_tx_pkt_wr) +
+               flits += (wr_size +
                          sizeof(struct cpl_tx_pkt_core)) / sizeof(__be64);
        return flits;
 }
@@ -845,14 +834,20 @@ static void tx_timer_cb(void *data)
 static inline void ship_tx_pkt_coalesce_wr(struct adapter *adap,
                                           struct sge_eth_txq *txq)
 {
-       u32 wr_mid;
-       struct sge_txq *q = &txq->q;
+       struct fw_eth_tx_pkts_vm_wr *vmwr;
+       const size_t fw_hdr_copy_len = (sizeof(vmwr->ethmacdst) +
+                                       sizeof(vmwr->ethmacsrc) +
+                                       sizeof(vmwr->ethtype) +
+                                       sizeof(vmwr->vlantci));
        struct fw_eth_tx_pkts_wr *wr;
+       struct sge_txq *q = &txq->q;
        unsigned int ndesc;
+       u32 wr_mid;
 
        /* fill the pkts WR header */
        wr = (void *)&q->desc[q->pidx];
        wr->op_pkd = htonl(V_FW_WR_OP(FW_ETH_TX_PKTS2_WR));
+       vmwr = (void *)&q->desc[q->pidx];
 
        wr_mid = V_FW_WR_LEN16(DIV_ROUND_UP(q->coalesce.flits, 2));
        ndesc = flits_to_desc(q->coalesce.flits);
@@ -860,12 +855,18 @@ static inline void ship_tx_pkt_coalesce_wr(struct adapter *adap,
        wr->plen = cpu_to_be16(q->coalesce.len);
        wr->npkt = q->coalesce.idx;
        wr->r3 = 0;
-       wr->type = q->coalesce.type;
+       if (is_pf4(adap)) {
+               wr->op_pkd = htonl(V_FW_WR_OP(FW_ETH_TX_PKTS2_WR));
+               wr->type = q->coalesce.type;
+       } else {
+               wr->op_pkd = htonl(V_FW_WR_OP(FW_ETH_TX_PKTS_VM_WR));
+               vmwr->r4 = 0;
+               memcpy((void *)vmwr->ethmacdst, (void *)q->coalesce.ethmacdst,
+                      fw_hdr_copy_len);
+       }
 
        /* zero out coalesce structure members */
-       q->coalesce.idx = 0;
-       q->coalesce.flits = 0;
-       q->coalesce.len = 0;
+       memset((void *)&q->coalesce, 0, sizeof(struct eth_coalesce));
 
        txq_advance(q, ndesc);
        txq->stats.coal_wr++;
@@ -893,13 +894,27 @@ static inline int should_tx_packet_coalesce(struct sge_eth_txq *txq,
                                            unsigned int *nflits,
                                            struct adapter *adap)
 {
+       struct fw_eth_tx_pkts_vm_wr *wr;
+       const size_t fw_hdr_copy_len = (sizeof(wr->ethmacdst) +
+                                       sizeof(wr->ethmacsrc) +
+                                       sizeof(wr->ethtype) +
+                                       sizeof(wr->vlantci));
        struct sge_txq *q = &txq->q;
        unsigned int flits, ndesc;
        unsigned char type = 0;
-       int credits;
+       int credits, wr_size;
 
        /* use coal WR type 1 when no frags are present */
        type = (mbuf->nb_segs == 1) ? 1 : 0;
+       if (!is_pf4(adap)) {
+               if (!type)
+                       return 0;
+
+               if (q->coalesce.idx && memcmp((void *)q->coalesce.ethmacdst,
+                                             rte_pktmbuf_mtod(mbuf, void *),
+                                             fw_hdr_copy_len))
+                       ship_tx_pkt_coalesce_wr(adap, txq);
+       }
 
        if (unlikely(type != q->coalesce.type && q->coalesce.idx))
                ship_tx_pkt_coalesce_wr(adap, txq);
@@ -945,16 +960,21 @@ static inline int should_tx_packet_coalesce(struct sge_eth_txq *txq,
 
 new:
        /* start a new pkts WR, the WR header is not filled below */
-       flits += sizeof(struct fw_eth_tx_pkts_wr) / sizeof(__be64);
+       wr_size = is_pf4(adap) ? sizeof(struct fw_eth_tx_pkts_wr) :
+                                sizeof(struct fw_eth_tx_pkts_vm_wr);
+       flits += wr_size / sizeof(__be64);
        ndesc = flits_to_desc(q->coalesce.flits + flits);
        credits = txq_avail(q) - ndesc;
 
        if (unlikely(credits < 0 || wraps_around(q, ndesc)))
                return 0;
-       q->coalesce.flits += 2;
+       q->coalesce.flits += wr_size / sizeof(__be64);
        q->coalesce.type = type;
        q->coalesce.ptr = (unsigned char *)&q->desc[q->pidx] +
-                          2 * sizeof(__be64);
+                          q->coalesce.flits * sizeof(__be64);
+       if (!is_pf4(adap))
+               memcpy((void *)q->coalesce.ethmacdst,
+                      rte_pktmbuf_mtod(mbuf, void *), fw_hdr_copy_len);
        return 1;
 }
 
@@ -984,6 +1004,8 @@ static inline int tx_do_packet_coalesce(struct sge_eth_txq *txq,
        struct cpl_tx_pkt_core *cpl;
        struct tx_sw_desc *sd;
        unsigned int idx = q->coalesce.idx, len = mbuf->pkt_len;
+       unsigned int max_coal_pkt_num = is_pf4(adap) ? ETH_COALESCE_PKT_NUM :
+                                                      ETH_COALESCE_VF_PKT_NUM;
 
 #ifdef RTE_LIBRTE_CXGBE_TPUT
        RTE_SET_USED(nb_pkts);
@@ -1027,9 +1049,12 @@ static inline int tx_do_packet_coalesce(struct sge_eth_txq *txq,
                cntrl |= F_TXPKT_VLAN_VLD | V_TXPKT_VLAN(mbuf->vlan_tci);
        }
 
-       cpl->ctrl0 = htonl(V_TXPKT_OPCODE(CPL_TX_PKT_XT) |
-                          V_TXPKT_INTF(pi->tx_chan) |
-                          V_TXPKT_PF(adap->pf));
+       cpl->ctrl0 = htonl(V_TXPKT_OPCODE(CPL_TX_PKT_XT));
+       if (is_pf4(adap))
+               cpl->ctrl0 |= htonl(V_TXPKT_INTF(pi->tx_chan) |
+                                   V_TXPKT_PF(adap->pf));
+       else
+               cpl->ctrl0 |= htonl(V_TXPKT_INTF(pi->port_id));
        cpl->pack = htons(0);
        cpl->len = htons(len);
        cpl->ctrl1 = cpu_to_be64(cntrl);
@@ -1058,7 +1083,7 @@ static inline int tx_do_packet_coalesce(struct sge_eth_txq *txq,
        sd->coalesce.idx = (idx & 1) + 1;
 
        /* send the coaelsced work request if max reached */
-       if (++q->coalesce.idx == ETH_COALESCE_PKT_NUM
+       if (++q->coalesce.idx == max_coal_pkt_num
 #ifndef RTE_LIBRTE_CXGBE_TPUT
            || q->coalesce.idx >= nb_pkts
 #endif
@@ -1082,6 +1107,7 @@ int t4_eth_xmit(struct sge_eth_txq *txq, struct rte_mbuf *mbuf,
        struct adapter *adap;
        struct rte_mbuf *m = mbuf;
        struct fw_eth_tx_pkt_wr *wr;
+       struct fw_eth_tx_pkt_vm_wr *vmwr;
        struct cpl_tx_pkt_core *cpl;
        struct tx_sw_desc *d;
        dma_addr_t addr[m->nb_segs];
@@ -1092,7 +1118,7 @@ int t4_eth_xmit(struct sge_eth_txq *txq, struct rte_mbuf *mbuf,
        u32 wr_mid;
        u64 cntrl, *end;
        bool v6;
-       u32 max_pkt_len = txq->eth_dev->data->dev_conf.rxmode.max_rx_pkt_len;
+       u32 max_pkt_len = txq->data->dev_conf.rxmode.max_rx_pkt_len;
 
        /* Reject xmit if queue is stopped */
        if (unlikely(txq->flags & EQ_STOPPED))
@@ -1102,7 +1128,7 @@ int t4_eth_xmit(struct sge_eth_txq *txq, struct rte_mbuf *mbuf,
         * The chip min packet length is 10 octets but play safe and reject
         * anything shorter than an Ethernet header.
         */
-       if (unlikely(m->pkt_len < ETHER_HDR_LEN)) {
+       if (unlikely(m->pkt_len < RTE_ETHER_HDR_LEN)) {
 out_free:
                rte_pktmbuf_free(m);
                return 0;
@@ -1112,14 +1138,15 @@ out_free:
            (unlikely(m->pkt_len > max_pkt_len)))
                goto out_free;
 
-       pi = (struct port_info *)txq->eth_dev->data->dev_private;
+       pi = (struct port_info *)txq->data->dev_private;
        adap = pi->adapter;
 
        cntrl = F_TXPKT_L4CSUM_DIS | F_TXPKT_IPCSUM_DIS;
        /* align the end of coalesce WR to a 512 byte boundary */
        txq->q.coalesce.max = (8 - (txq->q.pidx & 7)) * 8;
 
-       if (!((m->ol_flags & PKT_TX_TCP_SEG) || (m->pkt_len > ETHER_MAX_LEN))) {
+       if (!((m->ol_flags & PKT_TX_TCP_SEG) ||
+                       m->pkt_len > RTE_ETHER_MAX_LEN)) {
                if (should_tx_packet_coalesce(txq, mbuf, &cflits, adap)) {
                        if (unlikely(map_mbuf(mbuf, addr) < 0)) {
                                dev_warn(adap, "%s: mapping err for coalesce\n",
@@ -1138,7 +1165,7 @@ out_free:
        if (txq->q.coalesce.idx)
                ship_tx_pkt_coalesce_wr(adap, txq);
 
-       flits = calc_tx_flits(m);
+       flits = calc_tx_flits(m, adap);
        ndesc = flits_to_desc(flits);
        credits = txq_avail(&txq->q) - ndesc;
 
@@ -1160,31 +1187,55 @@ out_free:
        }
 
        wr = (void *)&txq->q.desc[txq->q.pidx];
+       vmwr = (void *)&txq->q.desc[txq->q.pidx];
        wr->equiq_to_len16 = htonl(wr_mid);
-       wr->r3 = rte_cpu_to_be_64(0);
-       end = (u64 *)wr + flits;
+       if (is_pf4(adap)) {
+               wr->r3 = rte_cpu_to_be_64(0);
+               end = (u64 *)wr + flits;
+       } else {
+               const size_t fw_hdr_copy_len = (sizeof(vmwr->ethmacdst) +
+                                               sizeof(vmwr->ethmacsrc) +
+                                               sizeof(vmwr->ethtype) +
+                                               sizeof(vmwr->vlantci));
+
+               vmwr->r3[0] = rte_cpu_to_be_32(0);
+               vmwr->r3[1] = rte_cpu_to_be_32(0);
+               memcpy((void *)vmwr->ethmacdst, rte_pktmbuf_mtod(m, void *),
+                      fw_hdr_copy_len);
+               end = (u64 *)vmwr + flits;
+       }
 
        len = 0;
        len += sizeof(*cpl);
 
        /* Coalescing skipped and we send through normal path */
        if (!(m->ol_flags & PKT_TX_TCP_SEG)) {
-               wr->op_immdlen = htonl(V_FW_WR_OP(FW_ETH_TX_PKT_WR) |
+               wr->op_immdlen = htonl(V_FW_WR_OP(is_pf4(adap) ?
+                                                 FW_ETH_TX_PKT_WR :
+                                                 FW_ETH_TX_PKT_VM_WR) |
                                       V_FW_WR_IMMDLEN(len));
-               cpl = (void *)(wr + 1);
+               if (is_pf4(adap))
+                       cpl = (void *)(wr + 1);
+               else
+                       cpl = (void *)(vmwr + 1);
                if (m->ol_flags & PKT_TX_IP_CKSUM) {
                        cntrl = hwcsum(adap->params.chip, m) |
                                F_TXPKT_IPCSUM_DIS;
                        txq->stats.tx_cso++;
                }
        } else {
-               lso = (void *)(wr + 1);
+               if (is_pf4(adap))
+                       lso = (void *)(wr + 1);
+               else
+                       lso = (void *)(vmwr + 1);
                v6 = (m->ol_flags & PKT_TX_IPV6) != 0;
                l3hdr_len = m->l3_len;
                l4hdr_len = m->l4_len;
-               eth_xtra_len = m->l2_len - ETHER_HDR_LEN;
+               eth_xtra_len = m->l2_len - RTE_ETHER_HDR_LEN;
                len += sizeof(*lso);
-               wr->op_immdlen = htonl(V_FW_WR_OP(FW_ETH_TX_PKT_WR) |
+               wr->op_immdlen = htonl(V_FW_WR_OP(is_pf4(adap) ?
+                                                 FW_ETH_TX_PKT_WR :
+                                                 FW_ETH_TX_PKT_VM_WR) |
                                       V_FW_WR_IMMDLEN(len));
                lso->lso_ctrl = htonl(V_LSO_OPCODE(CPL_TX_PKT_LSO) |
                                      F_LSO_FIRST_SLICE | F_LSO_LAST_SLICE |
@@ -1218,9 +1269,14 @@ out_free:
                cntrl |= F_TXPKT_VLAN_VLD | V_TXPKT_VLAN(m->vlan_tci);
        }
 
-       cpl->ctrl0 = htonl(V_TXPKT_OPCODE(CPL_TX_PKT_XT) |
-                          V_TXPKT_INTF(pi->tx_chan) |
-                          V_TXPKT_PF(adap->pf));
+       cpl->ctrl0 = htonl(V_TXPKT_OPCODE(CPL_TX_PKT_XT));
+       if (is_pf4(adap))
+               cpl->ctrl0 |= htonl(V_TXPKT_INTF(pi->tx_chan) |
+                                   V_TXPKT_PF(adap->pf));
+       else
+               cpl->ctrl0 |= htonl(V_TXPKT_INTF(pi->port_id) |
+                                   V_TXPKT_PF(0));
+
        cpl->pack = htons(0);
        cpl->len = htons(m->pkt_len);
        cpl->ctrl1 = cpu_to_be64(cntrl);
@@ -1250,6 +1306,126 @@ out_free:
        return 0;
 }
 
+/**
+ * reclaim_completed_tx_imm - reclaim completed control-queue Tx descs
+ * @q: the SGE control Tx queue
+ *
+ * This is a variant of reclaim_completed_tx() that is used for Tx queues
+ * that send only immediate data (presently just the control queues) and
+ * thus do not have any mbufs to release.
+ */
+static inline void reclaim_completed_tx_imm(struct sge_txq *q)
+{
+       int hw_cidx = ntohs(q->stat->cidx);
+       int reclaim = hw_cidx - q->cidx;
+
+       if (reclaim < 0)
+               reclaim += q->size;
+
+       q->in_use -= reclaim;
+       q->cidx = hw_cidx;
+}
+
+/**
+ * is_imm - check whether a packet can be sent as immediate data
+ * @mbuf: the packet
+ *
+ * Returns true if a packet can be sent as a WR with immediate data.
+ */
+static inline int is_imm(const struct rte_mbuf *mbuf)
+{
+       return mbuf->pkt_len <= MAX_CTRL_WR_LEN;
+}
+
+/**
+ * inline_tx_mbuf: inline a packet's data into TX descriptors
+ * @q: the TX queue where the packet will be inlined
+ * @from: pointer to data portion of packet
+ * @to: pointer after cpl where data has to be inlined
+ * @len: length of data to inline
+ *
+ * Inline a packet's contents directly to TX descriptors, starting at
+ * the given position within the TX DMA ring.
+ * Most of the complexity of this operation is dealing with wrap arounds
+ * in the middle of the packet we want to inline.
+ */
+static void inline_tx_mbuf(const struct sge_txq *q, caddr_t from, caddr_t *to,
+                          int len)
+{
+       int left = RTE_PTR_DIFF(q->stat, *to);
+
+       if (likely((uintptr_t)*to + len <= (uintptr_t)q->stat)) {
+               rte_memcpy(*to, from, len);
+               *to = RTE_PTR_ADD(*to, len);
+       } else {
+               rte_memcpy(*to, from, left);
+               from = RTE_PTR_ADD(from, left);
+               left = len - left;
+               rte_memcpy((void *)q->desc, from, left);
+               *to = RTE_PTR_ADD((void *)q->desc, left);
+       }
+}
+
+/**
+ * ctrl_xmit - send a packet through an SGE control Tx queue
+ * @q: the control queue
+ * @mbuf: the packet
+ *
+ * Send a packet through an SGE control Tx queue.  Packets sent through
+ * a control queue must fit entirely as immediate data.
+ */
+static int ctrl_xmit(struct sge_ctrl_txq *q, struct rte_mbuf *mbuf)
+{
+       unsigned int ndesc;
+       struct fw_wr_hdr *wr;
+       caddr_t dst;
+
+       if (unlikely(!is_imm(mbuf))) {
+               WARN_ON(1);
+               rte_pktmbuf_free(mbuf);
+               return -1;
+       }
+
+       reclaim_completed_tx_imm(&q->q);
+       ndesc = DIV_ROUND_UP(mbuf->pkt_len, sizeof(struct tx_desc));
+       t4_os_lock(&q->ctrlq_lock);
+
+       q->full = txq_avail(&q->q) < ndesc ? 1 : 0;
+       if (unlikely(q->full)) {
+               t4_os_unlock(&q->ctrlq_lock);
+               return -1;
+       }
+
+       wr = (struct fw_wr_hdr *)&q->q.desc[q->q.pidx];
+       dst = (void *)wr;
+       inline_tx_mbuf(&q->q, rte_pktmbuf_mtod(mbuf, caddr_t),
+                      &dst, mbuf->data_len);
+
+       txq_advance(&q->q, ndesc);
+       if (unlikely(txq_avail(&q->q) < 64))
+               wr->lo |= htonl(F_FW_WR_EQUEQ);
+
+       q->txp++;
+
+       ring_tx_db(q->adapter, &q->q);
+       t4_os_unlock(&q->ctrlq_lock);
+
+       rte_pktmbuf_free(mbuf);
+       return 0;
+}
+
+/**
+ * t4_mgmt_tx - send a management message
+ * @q: the control queue
+ * @mbuf: the packet containing the management message
+ *
+ * Send a management message through control queue.
+ */
+int t4_mgmt_tx(struct sge_ctrl_txq *q, struct rte_mbuf *mbuf)
+{
+       return ctrl_xmit(q, mbuf);
+}
+
 /**
  * alloc_ring - allocate resources for an SGE descriptor ring
  * @dev: the PCI device's core device
@@ -1296,7 +1472,8 @@ static void *alloc_ring(size_t nelem, size_t elem_size,
         * handle the maximum ring size is allocated in order to allow for
         * resizing in later calls to the queue setup function.
         */
-       tz = rte_memzone_reserve_aligned(z_name, len, socket_id, 0, 4096);
+       tz = rte_memzone_reserve_aligned(z_name, len, socket_id,
+                       RTE_MEMZONE_IOVA_CONTIG, 4096);
        if (!tz)
                return NULL;
 
@@ -1315,102 +1492,10 @@ alloc_sw_ring:
        if (metadata)
                *(void **)metadata = s;
 
-       *phys = (uint64_t)tz->phys_addr;
+       *phys = (uint64_t)tz->iova;
        return tz->addr;
 }
 
-/**
- * t4_pktgl_to_mbuf_usembufs - build an mbuf from a packet gather list
- * @gl: the gather list
- *
- * Builds an mbuf from the given packet gather list.  Returns the mbuf or
- * %NULL if mbuf allocation failed.
- */
-static struct rte_mbuf *t4_pktgl_to_mbuf_usembufs(const struct pkt_gl *gl)
-{
-       /*
-        * If there's only one mbuf fragment, just return that.
-        */
-       if (likely(gl->nfrags == 1))
-               return gl->mbufs[0];
-
-       return NULL;
-}
-
-/**
- * t4_pktgl_to_mbuf - build an mbuf from a packet gather list
- * @gl: the gather list
- *
- * Builds an mbuf from the given packet gather list.  Returns the mbuf or
- * %NULL if mbuf allocation failed.
- */
-static struct rte_mbuf *t4_pktgl_to_mbuf(const struct pkt_gl *gl)
-{
-       return t4_pktgl_to_mbuf_usembufs(gl);
-}
-
-/**
- * t4_ethrx_handler - process an ingress ethernet packet
- * @q: the response queue that received the packet
- * @rsp: the response queue descriptor holding the RX_PKT message
- * @si: the gather list of packet fragments
- *
- * Process an ingress ethernet packet and deliver it to the stack.
- */
-int t4_ethrx_handler(struct sge_rspq *q, const __be64 *rsp,
-                    const struct pkt_gl *si)
-{
-       struct rte_mbuf *mbuf;
-       const struct cpl_rx_pkt *pkt;
-       const struct rss_header *rss_hdr;
-       bool csum_ok;
-       struct sge_eth_rxq *rxq = container_of(q, struct sge_eth_rxq, rspq);
-       u16 err_vec;
-
-       rss_hdr = (const void *)rsp;
-       pkt = (const void *)&rsp[1];
-       /* Compressed error vector is enabled for T6 only */
-       if (q->adapter->params.tp.rx_pkt_encap)
-               err_vec = G_T6_COMPR_RXERR_VEC(ntohs(pkt->err_vec));
-       else
-               err_vec = ntohs(pkt->err_vec);
-       csum_ok = pkt->csum_calc && !err_vec;
-
-       mbuf = t4_pktgl_to_mbuf(si);
-       if (unlikely(!mbuf)) {
-               rxq->stats.rx_drops++;
-               return 0;
-       }
-
-       mbuf->port = pkt->iff;
-       if (pkt->l2info & htonl(F_RXF_IP)) {
-               mbuf->packet_type = RTE_PTYPE_L3_IPV4;
-               if (unlikely(!csum_ok))
-                       mbuf->ol_flags |= PKT_RX_IP_CKSUM_BAD;
-
-               if ((pkt->l2info & htonl(F_RXF_UDP | F_RXF_TCP)) && !csum_ok)
-                       mbuf->ol_flags |= PKT_RX_L4_CKSUM_BAD;
-       } else if (pkt->l2info & htonl(F_RXF_IP6)) {
-               mbuf->packet_type = RTE_PTYPE_L3_IPV6;
-       }
-
-       mbuf->port = pkt->iff;
-
-       if (!rss_hdr->filter_tid && rss_hdr->hash_type) {
-               mbuf->ol_flags |= PKT_RX_RSS_HASH;
-               mbuf->hash.rss = ntohl(rss_hdr->hash_val);
-       }
-
-       if (pkt->vlan_ex) {
-               mbuf->ol_flags |= PKT_RX_VLAN_PKT;
-               mbuf->vlan_tci = ntohs(pkt->vlan);
-       }
-       rxq->stats.pkts++;
-       rxq->stats.rx_bytes += mbuf->pkt_len;
-
-       return 0;
-}
-
 #define CXGB4_MSG_AN ((void *)1)
 
 /**
@@ -1429,6 +1514,52 @@ static inline void rspq_next(struct sge_rspq *q)
        }
 }
 
+static inline void cxgbe_set_mbuf_info(struct rte_mbuf *pkt, uint32_t ptype,
+                                      uint64_t ol_flags)
+{
+       pkt->packet_type |= ptype;
+       pkt->ol_flags |= ol_flags;
+}
+
+static inline void cxgbe_fill_mbuf_info(struct adapter *adap,
+                                       const struct cpl_rx_pkt *cpl,
+                                       struct rte_mbuf *pkt)
+{
+       bool csum_ok;
+       u16 err_vec;
+
+       if (adap->params.tp.rx_pkt_encap)
+               err_vec = G_T6_COMPR_RXERR_VEC(ntohs(cpl->err_vec));
+       else
+               err_vec = ntohs(cpl->err_vec);
+
+       csum_ok = cpl->csum_calc && !err_vec;
+
+       if (cpl->vlan_ex)
+               cxgbe_set_mbuf_info(pkt, RTE_PTYPE_L2_ETHER_VLAN,
+                                   PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED);
+       else
+               cxgbe_set_mbuf_info(pkt, RTE_PTYPE_L2_ETHER, 0);
+
+       if (cpl->l2info & htonl(F_RXF_IP))
+               cxgbe_set_mbuf_info(pkt, RTE_PTYPE_L3_IPV4,
+                                   csum_ok ? PKT_RX_IP_CKSUM_GOOD :
+                                             PKT_RX_IP_CKSUM_BAD);
+       else if (cpl->l2info & htonl(F_RXF_IP6))
+               cxgbe_set_mbuf_info(pkt, RTE_PTYPE_L3_IPV6,
+                                   csum_ok ? PKT_RX_IP_CKSUM_GOOD :
+                                             PKT_RX_IP_CKSUM_BAD);
+
+       if (cpl->l2info & htonl(F_RXF_TCP))
+               cxgbe_set_mbuf_info(pkt, RTE_PTYPE_L4_TCP,
+                                   csum_ok ? PKT_RX_L4_CKSUM_GOOD :
+                                             PKT_RX_L4_CKSUM_BAD);
+       else if (cpl->l2info & htonl(F_RXF_UDP))
+               cxgbe_set_mbuf_info(pkt, RTE_PTYPE_L4_UDP,
+                                   csum_ok ? PKT_RX_L4_CKSUM_GOOD :
+                                             PKT_RX_L4_CKSUM_BAD);
+}
+
 /**
  * process_responses - process responses from an SGE response queue
  * @q: the ingress queue to process
@@ -1465,6 +1596,7 @@ static int process_responses(struct sge_rspq *q, int budget,
                rsp_type = G_RSPD_TYPE(rc->u.type_gen);
 
                if (likely(rsp_type == X_RSPD_TYPE_FLBUF)) {
+                       struct sge *s = &q->adapter->sge;
                        unsigned int stat_pidx;
                        int stat_pidx_diff;
 
@@ -1479,8 +1611,6 @@ static int process_responses(struct sge_rspq *q, int budget,
                                        (const void *)&q->cur_desc[1];
                                struct rte_mbuf *pkt, *npkt;
                                u32 len, bufsz;
-                               bool csum_ok;
-                               u16 err_vec;
 
                                rc = (const struct rsp_ctrl *)
                                     ((const char *)q->cur_desc +
@@ -1497,16 +1627,6 @@ static int process_responses(struct sge_rspq *q, int budget,
                                len = G_RSPD_LEN(len);
                                pkt->pkt_len = len;
 
-                               /* Compressed error vector is enabled for
-                                * T6 only
-                                */
-                               if (q->adapter->params.tp.rx_pkt_encap)
-                                       err_vec = G_T6_COMPR_RXERR_VEC(
-                                                       ntohs(cpl->err_vec));
-                               else
-                                       err_vec = ntohs(cpl->err_vec);
-                               csum_ok = cpl->csum_calc && !err_vec;
-
                                /* Chain mbufs into len if necessary */
                                while (len) {
                                        struct rte_mbuf *new_pkt = rsd->buf;
@@ -1524,20 +1644,7 @@ static int process_responses(struct sge_rspq *q, int budget,
                                npkt->next = NULL;
                                pkt->nb_segs--;
 
-                               if (cpl->l2info & htonl(F_RXF_IP)) {
-                                       pkt->packet_type = RTE_PTYPE_L3_IPV4;
-                                       if (unlikely(!csum_ok))
-                                               pkt->ol_flags |=
-                                                       PKT_RX_IP_CKSUM_BAD;
-
-                                       if ((cpl->l2info &
-                                            htonl(F_RXF_UDP | F_RXF_TCP)) &&
-                                           !csum_ok)
-                                               pkt->ol_flags |=
-                                                       PKT_RX_L4_CKSUM_BAD;
-                               } else if (cpl->l2info & htonl(F_RXF_IP6)) {
-                                       pkt->packet_type = RTE_PTYPE_L3_IPV6;
-                               }
+                               cxgbe_fill_mbuf_info(q->adapter, cpl, pkt);
 
                                if (!rss_hdr->filter_tid &&
                                    rss_hdr->hash_type) {
@@ -1546,11 +1653,10 @@ static int process_responses(struct sge_rspq *q, int budget,
                                                ntohl(rss_hdr->hash_val);
                                }
 
-                               if (cpl->vlan_ex) {
-                                       pkt->ol_flags |= PKT_RX_VLAN_PKT;
+                               if (cpl->vlan_ex)
                                        pkt->vlan_tci = ntohs(cpl->vlan);
-                               }
 
+                               rte_pktmbuf_adj(pkt, s->pktshift);
                                rxq->stats.pkts++;
                                rxq->stats.rx_bytes += pkt->pkt_len;
                                rx_pkts[budget - budget_left] = pkt;
@@ -1609,7 +1715,11 @@ int cxgbe_poll(struct sge_rspq *q, struct rte_mbuf **rx_pkts,
                val = V_CIDXINC(cidx_inc) | V_SEINTARM(params);
 
                if (unlikely(!q->bar2_addr)) {
-                       t4_write_reg(q->adapter, MYPF_REG(A_SGE_PF_GTS),
+                       u32 reg = is_pf4(q->adapter) ? MYPF_REG(A_SGE_PF_GTS) :
+                                                      T4VF_SGE_BASE_ADDR +
+                                                      A_SGE_VF_GTS;
+
+                       t4_write_reg(q->adapter, reg,
                                     val | V_INGRESSQID((u32)q->cntxt_id));
                } else {
                        writel(val | V_INGRESSQID(q->bar2_qid),
@@ -1686,14 +1796,14 @@ int t4_sge_alloc_rxq(struct adapter *adap, struct sge_rspq *iq, bool fwevtq,
        char z_name[RTE_MEMZONE_NAMESIZE];
        char z_name_sw[RTE_MEMZONE_NAMESIZE];
        unsigned int nb_refill;
+       u8 pciechan;
 
        /* Size needs to be multiple of 16, including status entry. */
        iq->size = cxgbe_roundup(iq->size, 16);
 
-       snprintf(z_name, sizeof(z_name), "%s_%s_%d_%d",
-                eth_dev->data->drv_name,
-                fwevtq ? "fwq_ring" : "rx_ring",
-                eth_dev->data->port_id, queue_id);
+       snprintf(z_name, sizeof(z_name), "eth_p%d_q%d_%s",
+                       eth_dev->data->port_id, queue_id,
+                       fwevtq ? "fwq_ring" : "rx_ring");
        snprintf(z_name_sw, sizeof(z_name_sw), "%s_sw_ring", z_name);
 
        iq->desc = alloc_ring(iq->size, iq->iqe_len, 0, &iq->phys_addr, NULL, 0,
@@ -1703,8 +1813,23 @@ int t4_sge_alloc_rxq(struct adapter *adap, struct sge_rspq *iq, bool fwevtq,
 
        memset(&c, 0, sizeof(c));
        c.op_to_vfn = htonl(V_FW_CMD_OP(FW_IQ_CMD) | F_FW_CMD_REQUEST |
-                           F_FW_CMD_WRITE | F_FW_CMD_EXEC |
-                           V_FW_IQ_CMD_PFN(adap->pf) | V_FW_IQ_CMD_VFN(0));
+                           F_FW_CMD_WRITE | F_FW_CMD_EXEC);
+
+       if (is_pf4(adap)) {
+               pciechan = pi->tx_chan;
+               c.op_to_vfn |= htonl(V_FW_IQ_CMD_PFN(adap->pf) |
+                                    V_FW_IQ_CMD_VFN(0));
+               if (cong >= 0)
+                       c.iqns_to_fl0congen =
+                               htonl(F_FW_IQ_CMD_IQFLINTCONGEN |
+                                     V_FW_IQ_CMD_IQTYPE(cong ?
+                                                        FW_IQ_IQTYPE_NIC :
+                                                        FW_IQ_IQTYPE_OFLD) |
+                                     F_FW_IQ_CMD_IQRO);
+       } else {
+               pciechan = pi->port_id;
+       }
+
        c.alloc_to_len16 = htonl(F_FW_IQ_CMD_ALLOC | F_FW_IQ_CMD_IQSTART |
                                 (sizeof(c) / 16));
        c.type_to_iqandstindex =
@@ -1716,16 +1841,12 @@ int t4_sge_alloc_rxq(struct adapter *adap, struct sge_rspq *iq, bool fwevtq,
                      V_FW_IQ_CMD_IQANDSTINDEX(intr_idx >= 0 ? intr_idx :
                                                               -intr_idx - 1));
        c.iqdroprss_to_iqesize =
-               htons(V_FW_IQ_CMD_IQPCIECH(cong > 0 ? cxgbe_ffs(cong) - 1 :
-                                                     pi->tx_chan) |
+               htons(V_FW_IQ_CMD_IQPCIECH(pciechan) |
                      F_FW_IQ_CMD_IQGTSMODE |
                      V_FW_IQ_CMD_IQINTCNTTHRESH(iq->pktcnt_idx) |
                      V_FW_IQ_CMD_IQESIZE(ilog2(iq->iqe_len) - 4));
        c.iqsize = htons(iq->size);
        c.iqaddr = cpu_to_be64(iq->phys_addr);
-       if (cong >= 0)
-               c.iqns_to_fl0congen = htonl(F_FW_IQ_CMD_IQFLINTCONGEN |
-                                           F_FW_IQ_CMD_IQRO);
 
        if (fl) {
                struct sge_eth_rxq *rxq = container_of(fl, struct sge_eth_rxq,
@@ -1744,10 +1865,9 @@ int t4_sge_alloc_rxq(struct adapter *adap, struct sge_rspq *iq, bool fwevtq,
                        fl->size = s->fl_starve_thres - 1 + 2 * 8;
                fl->size = cxgbe_roundup(fl->size, 8);
 
-               snprintf(z_name, sizeof(z_name), "%s_%s_%d_%d",
-                        eth_dev->data->drv_name,
-                        fwevtq ? "fwq_ring" : "fl_ring",
-                        eth_dev->data->port_id, queue_id);
+               snprintf(z_name, sizeof(z_name), "eth_p%d_q%d_%s",
+                               eth_dev->data->port_id, queue_id,
+                               fwevtq ? "fwq_ring" : "fl_ring");
                snprintf(z_name_sw, sizeof(z_name_sw), "%s_sw_ring", z_name);
 
                fl->desc = alloc_ring(fl->size, sizeof(__be64),
@@ -1765,7 +1885,7 @@ int t4_sge_alloc_rxq(struct adapter *adap, struct sge_rspq *iq, bool fwevtq,
                               0 : F_FW_IQ_CMD_FL0PACKEN) |
                              F_FW_IQ_CMD_FL0FETCHRO | F_FW_IQ_CMD_FL0DATARO |
                              F_FW_IQ_CMD_FL0PADEN);
-               if (cong >= 0)
+               if (is_pf4(adap) && cong >= 0)
                        c.iqns_to_fl0congen |=
                                htonl(V_FW_IQ_CMD_FL0CNGCHMAP(cong) |
                                      F_FW_IQ_CMD_FL0CONGCIF |
@@ -1786,7 +1906,10 @@ int t4_sge_alloc_rxq(struct adapter *adap, struct sge_rspq *iq, bool fwevtq,
                c.fl0addr = cpu_to_be64(fl->addr);
        }
 
-       ret = t4_wr_mbox(adap, adap->mbox, &c, sizeof(c), &c);
+       if (is_pf4(adap))
+               ret = t4_wr_mbox(adap, adap->mbox, &c, sizeof(c), &c);
+       else
+               ret = t4vf_wr_mbox(adap, &c, sizeof(c), &c);
        if (ret)
                goto err;
 
@@ -1803,7 +1926,7 @@ int t4_sge_alloc_rxq(struct adapter *adap, struct sge_rspq *iq, bool fwevtq,
        iq->stat = (void *)&iq->desc[iq->size * 8];
        iq->eth_dev = eth_dev;
        iq->handler = hnd;
-       iq->port_id = pi->port_id;
+       iq->port_id = pi->pidx;
        iq->mb_pool = mp;
 
        /* set offset to -1 to distinguish ingress queues without FL */
@@ -1843,7 +1966,7 @@ int t4_sge_alloc_rxq(struct adapter *adap, struct sge_rspq *iq, bool fwevtq,
         * a lot easier to fix in one place ...  For now we do something very
         * simple (and hopefully less wrong).
         */
-       if (!is_t4(adap->params.chip) && cong >= 0) {
+       if (is_pf4(adap) && !is_t4(adap->params.chip) && cong >= 0) {
                u32 param, val;
                int i;
 
@@ -1890,9 +2013,11 @@ err:
        return ret;
 }
 
-static void init_txq(struct adapter *adap, struct sge_txq *q, unsigned int id)
+static void init_txq(struct adapter *adap, struct sge_txq *q, unsigned int id,
+                    unsigned int abs_id)
 {
        q->cntxt_id = id;
+       q->abs_id = abs_id;
        q->bar2_addr = bar2_address(adap, q->cntxt_id, T4_BAR2_QTYPE_EGRESS,
                                    &q->bar2_qid);
        q->cidx = 0;
@@ -1940,13 +2065,13 @@ int t4_sge_alloc_eth_txq(struct adapter *adap, struct sge_eth_txq *txq,
        struct port_info *pi = (struct port_info *)(eth_dev->data->dev_private);
        char z_name[RTE_MEMZONE_NAMESIZE];
        char z_name_sw[RTE_MEMZONE_NAMESIZE];
+       u8 pciechan;
 
        /* Add status entries */
        nentries = txq->q.size + s->stat_len / sizeof(struct tx_desc);
 
-       snprintf(z_name, sizeof(z_name), "%s_%s_%d_%d",
-                eth_dev->data->drv_name, "tx_ring",
-                eth_dev->data->port_id, queue_id);
+       snprintf(z_name, sizeof(z_name), "eth_p%d_q%d_%s",
+                       eth_dev->data->port_id, queue_id, "tx_ring");
        snprintf(z_name_sw, sizeof(z_name_sw), "%s_sw_ring", z_name);
 
        txq->q.desc = alloc_ring(txq->q.size, sizeof(struct tx_desc),
@@ -1958,16 +2083,22 @@ int t4_sge_alloc_eth_txq(struct adapter *adap, struct sge_eth_txq *txq,
 
        memset(&c, 0, sizeof(c));
        c.op_to_vfn = htonl(V_FW_CMD_OP(FW_EQ_ETH_CMD) | F_FW_CMD_REQUEST |
-                           F_FW_CMD_WRITE | F_FW_CMD_EXEC |
-                           V_FW_EQ_ETH_CMD_PFN(adap->pf) |
-                           V_FW_EQ_ETH_CMD_VFN(0));
+                           F_FW_CMD_WRITE | F_FW_CMD_EXEC);
+       if (is_pf4(adap)) {
+               pciechan = pi->tx_chan;
+               c.op_to_vfn |= htonl(V_FW_EQ_ETH_CMD_PFN(adap->pf) |
+                                    V_FW_EQ_ETH_CMD_VFN(0));
+       } else {
+               pciechan = pi->port_id;
+       }
+
        c.alloc_to_len16 = htonl(F_FW_EQ_ETH_CMD_ALLOC |
                                 F_FW_EQ_ETH_CMD_EQSTART | (sizeof(c) / 16));
        c.autoequiqe_to_viid = htonl(F_FW_EQ_ETH_CMD_AUTOEQUEQE |
                                     V_FW_EQ_ETH_CMD_VIID(pi->viid));
        c.fetchszm_to_iqid =
                htonl(V_FW_EQ_ETH_CMD_HOSTFCMODE(X_HOSTFCMODE_NONE) |
-                     V_FW_EQ_ETH_CMD_PCIECHN(pi->tx_chan) |
+                     V_FW_EQ_ETH_CMD_PCIECHN(pciechan) |
                      F_FW_EQ_ETH_CMD_FETCHRO | V_FW_EQ_ETH_CMD_IQID(iqid));
        c.dcaen_to_eqsize =
                htonl(V_FW_EQ_ETH_CMD_FBMIN(X_FETCHBURSTMIN_64B) |
@@ -1975,7 +2106,10 @@ int t4_sge_alloc_eth_txq(struct adapter *adap, struct sge_eth_txq *txq,
                      V_FW_EQ_ETH_CMD_EQSIZE(nentries));
        c.eqaddr = rte_cpu_to_be_64(txq->q.phys_addr);
 
-       ret = t4_wr_mbox(adap, adap->mbox, &c, sizeof(c), &c);
+       if (is_pf4(adap))
+               ret = t4_wr_mbox(adap, adap->mbox, &c, sizeof(c), &c);
+       else
+               ret = t4vf_wr_mbox(adap, &c, sizeof(c), &c);
        if (ret) {
                rte_free(txq->q.sdesc);
                txq->q.sdesc = NULL;
@@ -1983,7 +2117,8 @@ int t4_sge_alloc_eth_txq(struct adapter *adap, struct sge_eth_txq *txq,
                return ret;
        }
 
-       init_txq(adap, &txq->q, G_FW_EQ_ETH_CMD_EQID(ntohl(c.eqid_pkd)));
+       init_txq(adap, &txq->q, G_FW_EQ_ETH_CMD_EQID(ntohl(c.eqid_pkd)),
+                G_FW_EQ_ETH_CMD_PHYSEQID(ntohl(c.physeqid_pkd)));
        txq->stats.tso = 0;
        txq->stats.pkts = 0;
        txq->stats.tx_cso = 0;
@@ -1994,10 +2129,68 @@ int t4_sge_alloc_eth_txq(struct adapter *adap, struct sge_eth_txq *txq,
        txq->stats.mapping_err = 0;
        txq->flags |= EQ_STOPPED;
        txq->eth_dev = eth_dev;
+       txq->data = eth_dev->data;
        t4_os_lock_init(&txq->txq_lock);
        return 0;
 }
 
+int t4_sge_alloc_ctrl_txq(struct adapter *adap, struct sge_ctrl_txq *txq,
+                         struct rte_eth_dev *eth_dev, uint16_t queue_id,
+                         unsigned int iqid, int socket_id)
+{
+       int ret, nentries;
+       struct fw_eq_ctrl_cmd c;
+       struct sge *s = &adap->sge;
+       struct port_info *pi = (struct port_info *)(eth_dev->data->dev_private);
+       char z_name[RTE_MEMZONE_NAMESIZE];
+       char z_name_sw[RTE_MEMZONE_NAMESIZE];
+
+       /* Add status entries */
+       nentries = txq->q.size + s->stat_len / sizeof(struct tx_desc);
+
+       snprintf(z_name, sizeof(z_name), "eth_p%d_q%d_%s",
+                       eth_dev->data->port_id, queue_id, "ctrl_tx_ring");
+       snprintf(z_name_sw, sizeof(z_name_sw), "%s_sw_ring", z_name);
+
+       txq->q.desc = alloc_ring(txq->q.size, sizeof(struct tx_desc),
+                                0, &txq->q.phys_addr,
+                                NULL, 0, queue_id,
+                                socket_id, z_name, z_name_sw);
+       if (!txq->q.desc)
+               return -ENOMEM;
+
+       memset(&c, 0, sizeof(c));
+       c.op_to_vfn = htonl(V_FW_CMD_OP(FW_EQ_CTRL_CMD) | F_FW_CMD_REQUEST |
+                           F_FW_CMD_WRITE | F_FW_CMD_EXEC |
+                           V_FW_EQ_CTRL_CMD_PFN(adap->pf) |
+                           V_FW_EQ_CTRL_CMD_VFN(0));
+       c.alloc_to_len16 = htonl(F_FW_EQ_CTRL_CMD_ALLOC |
+                                F_FW_EQ_CTRL_CMD_EQSTART | (sizeof(c) / 16));
+       c.cmpliqid_eqid = htonl(V_FW_EQ_CTRL_CMD_CMPLIQID(0));
+       c.physeqid_pkd = htonl(0);
+       c.fetchszm_to_iqid =
+               htonl(V_FW_EQ_CTRL_CMD_HOSTFCMODE(X_HOSTFCMODE_NONE) |
+                     V_FW_EQ_CTRL_CMD_PCIECHN(pi->tx_chan) |
+                     F_FW_EQ_CTRL_CMD_FETCHRO | V_FW_EQ_CTRL_CMD_IQID(iqid));
+       c.dcaen_to_eqsize =
+               htonl(V_FW_EQ_CTRL_CMD_FBMIN(X_FETCHBURSTMIN_64B) |
+                     V_FW_EQ_CTRL_CMD_FBMAX(X_FETCHBURSTMAX_512B) |
+                     V_FW_EQ_CTRL_CMD_EQSIZE(nentries));
+       c.eqaddr = cpu_to_be64(txq->q.phys_addr);
+
+       ret = t4_wr_mbox(adap, adap->mbox, &c, sizeof(c), &c);
+       if (ret) {
+               txq->q.desc = NULL;
+               return ret;
+       }
+
+       init_txq(adap, &txq->q, G_FW_EQ_CTRL_CMD_EQID(ntohl(c.cmpliqid_eqid)),
+                G_FW_EQ_CTRL_CMD_EQID(ntohl(c. physeqid_pkd)));
+       txq->adapter = adap;
+       txq->full = 0;
+       return 0;
+}
+
 static void free_txq(struct sge_txq *q)
 {
        q->cntxt_id = 0;
@@ -2092,7 +2285,7 @@ void t4_sge_tx_monitor_stop(struct adapter *adap)
  */
 void t4_free_sge_resources(struct adapter *adap)
 {
-       int i;
+       unsigned int i;
        struct sge_eth_rxq *rxq = &adap->sge.ethrxq[0];
        struct sge_eth_txq *txq = &adap->sge.ethtxq[0];
 
@@ -2109,6 +2302,18 @@ void t4_free_sge_resources(struct adapter *adap)
                }
        }
 
+       /* clean up control Tx queues */
+       for (i = 0; i < ARRAY_SIZE(adap->sge.ctrlq); i++) {
+               struct sge_ctrl_txq *cq = &adap->sge.ctrlq[i];
+
+               if (cq->q.desc) {
+                       reclaim_completed_tx_imm(&cq->q);
+                       t4_ctrl_eq_free(adap, adap->mbox, adap->pf, 0,
+                                       cq->q.cntxt_id);
+                       free_txq(&cq->q);
+               }
+       }
+
        if (adap->sge.fw_evtq.desc)
                free_rspq_fl(adap, &adap->sge.fw_evtq, NULL);
 }
@@ -2277,3 +2482,182 @@ int t4_sge_init(struct adapter *adap)
 
        return 0;
 }
+
+int t4vf_sge_init(struct adapter *adap)
+{
+       struct sge_params *sge_params = &adap->params.sge;
+       u32 sge_ingress_queues_per_page;
+       u32 sge_egress_queues_per_page;
+       u32 sge_control, sge_control2;
+       u32 fl_small_pg, fl_large_pg;
+       u32 sge_ingress_rx_threshold;
+       u32 sge_timer_value_0_and_1;
+       u32 sge_timer_value_2_and_3;
+       u32 sge_timer_value_4_and_5;
+       u32 sge_congestion_control;
+       struct sge *s = &adap->sge;
+       unsigned int s_hps, s_qpp;
+       u32 sge_host_page_size;
+       u32 params[7], vals[7];
+       int v;
+
+       /* query basic params from fw */
+       params[0] = (V_FW_PARAMS_MNEM(FW_PARAMS_MNEM_REG) |
+                    V_FW_PARAMS_PARAM_XYZ(A_SGE_CONTROL));
+       params[1] = (V_FW_PARAMS_MNEM(FW_PARAMS_MNEM_REG) |
+                    V_FW_PARAMS_PARAM_XYZ(A_SGE_HOST_PAGE_SIZE));
+       params[2] = (V_FW_PARAMS_MNEM(FW_PARAMS_MNEM_REG) |
+                    V_FW_PARAMS_PARAM_XYZ(A_SGE_FL_BUFFER_SIZE0));
+       params[3] = (V_FW_PARAMS_MNEM(FW_PARAMS_MNEM_REG) |
+                    V_FW_PARAMS_PARAM_XYZ(A_SGE_FL_BUFFER_SIZE1));
+       params[4] = (V_FW_PARAMS_MNEM(FW_PARAMS_MNEM_REG) |
+                    V_FW_PARAMS_PARAM_XYZ(A_SGE_TIMER_VALUE_0_AND_1));
+       params[5] = (V_FW_PARAMS_MNEM(FW_PARAMS_MNEM_REG) |
+                    V_FW_PARAMS_PARAM_XYZ(A_SGE_TIMER_VALUE_2_AND_3));
+       params[6] = (V_FW_PARAMS_MNEM(FW_PARAMS_MNEM_REG) |
+                    V_FW_PARAMS_PARAM_XYZ(A_SGE_TIMER_VALUE_4_AND_5));
+       v = t4vf_query_params(adap, 7, params, vals);
+       if (v != FW_SUCCESS)
+               return v;
+
+       sge_control = vals[0];
+       sge_host_page_size = vals[1];
+       fl_small_pg = vals[2];
+       fl_large_pg = vals[3];
+       sge_timer_value_0_and_1 = vals[4];
+       sge_timer_value_2_and_3 = vals[5];
+       sge_timer_value_4_and_5 = vals[6];
+
+       /*
+        * Start by vetting the basic SGE parameters which have been set up by
+        * the Physical Function Driver.
+        */
+
+       /* We only bother using the Large Page logic if the Large Page Buffer
+        * is larger than our Page Size Buffer.
+        */
+       if (fl_large_pg <= fl_small_pg)
+               fl_large_pg = 0;
+
+       /* The Page Size Buffer must be exactly equal to our Page Size and the
+        * Large Page Size Buffer should be 0 (per above) or a power of 2.
+        */
+       if (fl_small_pg != CXGBE_PAGE_SIZE ||
+           (fl_large_pg & (fl_large_pg - 1)) != 0) {
+               dev_err(adapter->pdev_dev, "bad SGE FL buffer sizes [%d, %d]\n",
+                       fl_small_pg, fl_large_pg);
+               return -EINVAL;
+       }
+
+       if ((sge_control & F_RXPKTCPLMODE) !=
+           V_RXPKTCPLMODE(X_RXPKTCPLMODE_SPLIT)) {
+               dev_err(adapter->pdev_dev, "bad SGE CPL MODE\n");
+               return -EINVAL;
+       }
+
+
+       /* Grab ingress packing boundary from SGE_CONTROL2 for */
+       params[0] = (V_FW_PARAMS_MNEM(FW_PARAMS_MNEM_REG) |
+                    V_FW_PARAMS_PARAM_XYZ(A_SGE_CONTROL2));
+       v = t4vf_query_params(adap, 1, params, vals);
+       if (v != FW_SUCCESS) {
+               dev_err(adapter, "Unable to get SGE Control2; "
+                       "probably old firmware.\n");
+               return v;
+       }
+       sge_control2 = vals[0];
+
+       params[0] = (V_FW_PARAMS_MNEM(FW_PARAMS_MNEM_REG) |
+                    V_FW_PARAMS_PARAM_XYZ(A_SGE_INGRESS_RX_THRESHOLD));
+       params[1] = (V_FW_PARAMS_MNEM(FW_PARAMS_MNEM_REG) |
+                    V_FW_PARAMS_PARAM_XYZ(A_SGE_CONM_CTRL));
+       v = t4vf_query_params(adap, 2, params, vals);
+       if (v != FW_SUCCESS)
+               return v;
+       sge_ingress_rx_threshold = vals[0];
+       sge_congestion_control = vals[1];
+       params[0] = (V_FW_PARAMS_MNEM(FW_PARAMS_MNEM_REG) |
+                    V_FW_PARAMS_PARAM_XYZ(A_SGE_EGRESS_QUEUES_PER_PAGE_VF));
+       params[1] = (V_FW_PARAMS_MNEM(FW_PARAMS_MNEM_REG) |
+                    V_FW_PARAMS_PARAM_XYZ(A_SGE_INGRESS_QUEUES_PER_PAGE_VF));
+       v = t4vf_query_params(adap, 2, params, vals);
+       if (v != FW_SUCCESS) {
+               dev_warn(adap, "Unable to get VF SGE Queues/Page; "
+                        "probably old firmware.\n");
+               return v;
+       }
+       sge_egress_queues_per_page = vals[0];
+       sge_ingress_queues_per_page = vals[1];
+
+       /*
+        * We need the Queues/Page for our VF.  This is based on the
+        * PF from which we're instantiated and is indexed in the
+        * register we just read.
+        */
+       s_hps = (S_HOSTPAGESIZEPF0 +
+                (S_HOSTPAGESIZEPF1 - S_HOSTPAGESIZEPF0) * adap->pf);
+       sge_params->hps =
+               ((sge_host_page_size >> s_hps) & M_HOSTPAGESIZEPF0);
+
+       s_qpp = (S_QUEUESPERPAGEPF0 +
+                (S_QUEUESPERPAGEPF1 - S_QUEUESPERPAGEPF0) * adap->pf);
+       sge_params->eq_qpp =
+               ((sge_egress_queues_per_page >> s_qpp)
+                & M_QUEUESPERPAGEPF0);
+       sge_params->iq_qpp =
+               ((sge_ingress_queues_per_page >> s_qpp)
+                & M_QUEUESPERPAGEPF0);
+
+       /*
+        * Now translate the queried parameters into our internal forms.
+        */
+       if (fl_large_pg)
+               s->fl_pg_order = ilog2(fl_large_pg) - PAGE_SHIFT;
+       s->stat_len = ((sge_control & F_EGRSTATUSPAGESIZE)
+                       ? 128 : 64);
+       s->pktshift = G_PKTSHIFT(sge_control);
+       s->fl_align = t4vf_fl_pkt_align(adap, sge_control, sge_control2);
+
+       /*
+        * A FL with <= fl_starve_thres buffers is starving and a periodic
+        * timer will attempt to refill it.  This needs to be larger than the
+        * SGE's Egress Congestion Threshold.  If it isn't, then we can get
+        * stuck waiting for new packets while the SGE is waiting for us to
+        * give it more Free List entries.  (Note that the SGE's Egress
+        * Congestion Threshold is in units of 2 Free List pointers.)
+        */
+       switch (CHELSIO_CHIP_VERSION(adap->params.chip)) {
+       case CHELSIO_T5:
+               s->fl_starve_thres =
+                       G_EGRTHRESHOLDPACKING(sge_congestion_control);
+               break;
+       case CHELSIO_T6:
+       default:
+               s->fl_starve_thres =
+                       G_T6_EGRTHRESHOLDPACKING(sge_congestion_control);
+               break;
+       }
+       s->fl_starve_thres = s->fl_starve_thres * 2 + 1;
+
+       /*
+        * Save RX interrupt holdoff timer values and counter
+        * threshold values from the SGE parameters.
+        */
+       s->timer_val[0] = core_ticks_to_us(adap,
+                       G_TIMERVALUE0(sge_timer_value_0_and_1));
+       s->timer_val[1] = core_ticks_to_us(adap,
+                       G_TIMERVALUE1(sge_timer_value_0_and_1));
+       s->timer_val[2] = core_ticks_to_us(adap,
+                       G_TIMERVALUE2(sge_timer_value_2_and_3));
+       s->timer_val[3] = core_ticks_to_us(adap,
+                       G_TIMERVALUE3(sge_timer_value_2_and_3));
+       s->timer_val[4] = core_ticks_to_us(adap,
+                       G_TIMERVALUE4(sge_timer_value_4_and_5));
+       s->timer_val[5] = core_ticks_to_us(adap,
+                       G_TIMERVALUE5(sge_timer_value_4_and_5));
+       s->counter_val[0] = G_THRESHOLD_0(sge_ingress_rx_threshold);
+       s->counter_val[1] = G_THRESHOLD_1(sge_ingress_rx_threshold);
+       s->counter_val[2] = G_THRESHOLD_2(sge_ingress_rx_threshold);
+       s->counter_val[3] = G_THRESHOLD_3(sge_ingress_rx_threshold);
+       return 0;
+}