]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
ice: Move common functions out of ice_main.c part 2/7
authorAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Thu, 20 Sep 2018 00:23:05 +0000 (17:23 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Mon, 1 Oct 2018 19:45:56 +0000 (12:45 -0700)
This patch continues the code move out of ice_main.c

The following top level functions (and related dependency functions) were
moved to ice_lib.c:
ice_vsi_start_rx_rings
ice_vsi_stop_rx_rings
ice_vsi_stop_tx_rings
ice_vsi_cfg_rxqs
ice_vsi_cfg_txqs
ice_vsi_cfg_msix

Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/ice/ice_lib.c
drivers/net/ethernet/intel/ice/ice_lib.h
drivers/net/ethernet/intel/ice/ice_main.c

index 1cf4dca124959eea41038b43979919efad42b11f..06a54d79fba814024446552a29965f93d96494ca 100644 (file)
@@ -4,6 +4,227 @@
 #include "ice.h"
 #include "ice_lib.h"
 
+/**
+ * ice_setup_rx_ctx - Configure a receive ring context
+ * @ring: The Rx ring to configure
+ *
+ * Configure the Rx descriptor ring in RLAN context.
+ */
+static int ice_setup_rx_ctx(struct ice_ring *ring)
+{
+       struct ice_vsi *vsi = ring->vsi;
+       struct ice_hw *hw = &vsi->back->hw;
+       u32 rxdid = ICE_RXDID_FLEX_NIC;
+       struct ice_rlan_ctx rlan_ctx;
+       u32 regval;
+       u16 pf_q;
+       int err;
+
+       /* what is RX queue number in global space of 2K Rx queues */
+       pf_q = vsi->rxq_map[ring->q_index];
+
+       /* clear the context structure first */
+       memset(&rlan_ctx, 0, sizeof(rlan_ctx));
+
+       rlan_ctx.base = ring->dma >> 7;
+
+       rlan_ctx.qlen = ring->count;
+
+       /* Receive Packet Data Buffer Size.
+        * The Packet Data Buffer Size is defined in 128 byte units.
+        */
+       rlan_ctx.dbuf = vsi->rx_buf_len >> ICE_RLAN_CTX_DBUF_S;
+
+       /* use 32 byte descriptors */
+       rlan_ctx.dsize = 1;
+
+       /* Strip the Ethernet CRC bytes before the packet is posted to host
+        * memory.
+        */
+       rlan_ctx.crcstrip = 1;
+
+       /* L2TSEL flag defines the reported L2 Tags in the receive descriptor */
+       rlan_ctx.l2tsel = 1;
+
+       rlan_ctx.dtype = ICE_RX_DTYPE_NO_SPLIT;
+       rlan_ctx.hsplit_0 = ICE_RLAN_RX_HSPLIT_0_NO_SPLIT;
+       rlan_ctx.hsplit_1 = ICE_RLAN_RX_HSPLIT_1_NO_SPLIT;
+
+       /* This controls whether VLAN is stripped from inner headers
+        * The VLAN in the inner L2 header is stripped to the receive
+        * descriptor if enabled by this flag.
+        */
+       rlan_ctx.showiv = 0;
+
+       /* Max packet size for this queue - must not be set to a larger value
+        * than 5 x DBUF
+        */
+       rlan_ctx.rxmax = min_t(u16, vsi->max_frame,
+                              ICE_MAX_CHAINED_RX_BUFS * vsi->rx_buf_len);
+
+       /* Rx queue threshold in units of 64 */
+       rlan_ctx.lrxqthresh = 1;
+
+        /* Enable Flexible Descriptors in the queue context which
+         * allows this driver to select a specific receive descriptor format
+         */
+       regval = rd32(hw, QRXFLXP_CNTXT(pf_q));
+       regval |= (rxdid << QRXFLXP_CNTXT_RXDID_IDX_S) &
+               QRXFLXP_CNTXT_RXDID_IDX_M;
+
+       /* increasing context priority to pick up profile id;
+        * default is 0x01; setting to 0x03 to ensure profile
+        * is programming if prev context is of same priority
+        */
+       regval |= (0x03 << QRXFLXP_CNTXT_RXDID_PRIO_S) &
+               QRXFLXP_CNTXT_RXDID_PRIO_M;
+
+       wr32(hw, QRXFLXP_CNTXT(pf_q), regval);
+
+       /* Absolute queue number out of 2K needs to be passed */
+       err = ice_write_rxq_ctx(hw, &rlan_ctx, pf_q);
+       if (err) {
+               dev_err(&vsi->back->pdev->dev,
+                       "Failed to set LAN Rx queue context for absolute Rx queue %d error: %d\n",
+                       pf_q, err);
+               return -EIO;
+       }
+
+       /* init queue specific tail register */
+       ring->tail = hw->hw_addr + QRX_TAIL(pf_q);
+       writel(0, ring->tail);
+       ice_alloc_rx_bufs(ring, ICE_DESC_UNUSED(ring));
+
+       return 0;
+}
+
+/**
+ * ice_setup_tx_ctx - setup a struct ice_tlan_ctx instance
+ * @ring: The Tx ring to configure
+ * @tlan_ctx: Pointer to the Tx LAN queue context structure to be initialized
+ * @pf_q: queue index in the PF space
+ *
+ * Configure the Tx descriptor ring in TLAN context.
+ */
+static void
+ice_setup_tx_ctx(struct ice_ring *ring, struct ice_tlan_ctx *tlan_ctx, u16 pf_q)
+{
+       struct ice_vsi *vsi = ring->vsi;
+       struct ice_hw *hw = &vsi->back->hw;
+
+       tlan_ctx->base = ring->dma >> ICE_TLAN_CTX_BASE_S;
+
+       tlan_ctx->port_num = vsi->port_info->lport;
+
+       /* Transmit Queue Length */
+       tlan_ctx->qlen = ring->count;
+
+       /* PF number */
+       tlan_ctx->pf_num = hw->pf_id;
+
+       /* queue belongs to a specific VSI type
+        * VF / VM index should be programmed per vmvf_type setting:
+        * for vmvf_type = VF, it is VF number between 0-256
+        * for vmvf_type = VM, it is VM number between 0-767
+        * for PF or EMP this field should be set to zero
+        */
+       switch (vsi->type) {
+       case ICE_VSI_PF:
+               tlan_ctx->vmvf_type = ICE_TLAN_CTX_VMVF_TYPE_PF;
+               break;
+       default:
+               return;
+       }
+
+       /* make sure the context is associated with the right VSI */
+       tlan_ctx->src_vsi = vsi->vsi_num;
+
+       tlan_ctx->tso_ena = ICE_TX_LEGACY;
+       tlan_ctx->tso_qnum = pf_q;
+
+       /* Legacy or Advanced Host Interface:
+        * 0: Advanced Host Interface
+        * 1: Legacy Host Interface
+        */
+       tlan_ctx->legacy_int = ICE_TX_LEGACY;
+}
+
+/**
+ * ice_pf_rxq_wait - Wait for a PF's Rx queue to be enabled or disabled
+ * @pf: the PF being configured
+ * @pf_q: the PF queue
+ * @ena: enable or disable state of the queue
+ *
+ * This routine will wait for the given Rx queue of the PF to reach the
+ * enabled or disabled state.
+ * Returns -ETIMEDOUT in case of failing to reach the requested state after
+ * multiple retries; else will return 0 in case of success.
+ */
+static int ice_pf_rxq_wait(struct ice_pf *pf, int pf_q, bool ena)
+{
+       int i;
+
+       for (i = 0; i < ICE_Q_WAIT_RETRY_LIMIT; i++) {
+               u32 rx_reg = rd32(&pf->hw, QRX_CTRL(pf_q));
+
+               if (ena == !!(rx_reg & QRX_CTRL_QENA_STAT_M))
+                       break;
+
+               usleep_range(10, 20);
+       }
+       if (i >= ICE_Q_WAIT_RETRY_LIMIT)
+               return -ETIMEDOUT;
+
+       return 0;
+}
+
+/**
+ * ice_vsi_ctrl_rx_rings - Start or stop a VSI's Rx rings
+ * @vsi: the VSI being configured
+ * @ena: start or stop the Rx rings
+ */
+static int ice_vsi_ctrl_rx_rings(struct ice_vsi *vsi, bool ena)
+{
+       struct ice_pf *pf = vsi->back;
+       struct ice_hw *hw = &pf->hw;
+       int i, j, ret = 0;
+
+       for (i = 0; i < vsi->num_rxq; i++) {
+               int pf_q = vsi->rxq_map[i];
+               u32 rx_reg;
+
+               for (j = 0; j < ICE_Q_WAIT_MAX_RETRY; j++) {
+                       rx_reg = rd32(hw, QRX_CTRL(pf_q));
+                       if (((rx_reg >> QRX_CTRL_QENA_REQ_S) & 1) ==
+                           ((rx_reg >> QRX_CTRL_QENA_STAT_S) & 1))
+                               break;
+                       usleep_range(1000, 2000);
+               }
+
+               /* Skip if the queue is already in the requested state */
+               if (ena == !!(rx_reg & QRX_CTRL_QENA_STAT_M))
+                       continue;
+
+               /* turn on/off the queue */
+               if (ena)
+                       rx_reg |= QRX_CTRL_QENA_REQ_M;
+               else
+                       rx_reg &= ~QRX_CTRL_QENA_REQ_M;
+               wr32(hw, QRX_CTRL(pf_q), rx_reg);
+
+               /* wait for the change to finish */
+               ret = ice_pf_rxq_wait(pf, pf_q, ena);
+               if (ret) {
+                       dev_err(&pf->pdev->dev,
+                               "VSI idx %d Rx ring %d %sable timeout\n",
+                               vsi->idx, pf_q, (ena ? "en" : "dis"));
+                       break;
+               }
+       }
+
+       return ret;
+}
+
 /**
  * ice_add_mac_to_list - Add a mac address filter entry to the list
  * @vsi: the VSI to be forwarded to
@@ -185,6 +406,174 @@ int ice_vsi_kill_vlan(struct ice_vsi *vsi, u16 vid)
        return status;
 }
 
+/**
+ * ice_vsi_cfg_rxqs - Configure the VSI for Rx
+ * @vsi: the VSI being configured
+ *
+ * Return 0 on success and a negative value on error
+ * Configure the Rx VSI for operation.
+ */
+int ice_vsi_cfg_rxqs(struct ice_vsi *vsi)
+{
+       int err = 0;
+       u16 i;
+
+       if (vsi->netdev && vsi->netdev->mtu > ETH_DATA_LEN)
+               vsi->max_frame = vsi->netdev->mtu +
+                       ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN;
+       else
+               vsi->max_frame = ICE_RXBUF_2048;
+
+       vsi->rx_buf_len = ICE_RXBUF_2048;
+       /* set up individual rings */
+       for (i = 0; i < vsi->num_rxq && !err; i++)
+               err = ice_setup_rx_ctx(vsi->rx_rings[i]);
+
+       if (err) {
+               dev_err(&vsi->back->pdev->dev, "ice_setup_rx_ctx failed\n");
+               return -EIO;
+       }
+       return err;
+}
+
+/**
+ * ice_vsi_cfg_txqs - Configure the VSI for Tx
+ * @vsi: the VSI being configured
+ *
+ * Return 0 on success and a negative value on error
+ * Configure the Tx VSI for operation.
+ */
+int ice_vsi_cfg_txqs(struct ice_vsi *vsi)
+{
+       struct ice_aqc_add_tx_qgrp *qg_buf;
+       struct ice_aqc_add_txqs_perq *txq;
+       struct ice_pf *pf = vsi->back;
+       enum ice_status status;
+       u16 buf_len, i, pf_q;
+       int err = 0, tc = 0;
+       u8 num_q_grps;
+
+       buf_len = sizeof(struct ice_aqc_add_tx_qgrp);
+       qg_buf = devm_kzalloc(&pf->pdev->dev, buf_len, GFP_KERNEL);
+       if (!qg_buf)
+               return -ENOMEM;
+
+       if (vsi->num_txq > ICE_MAX_TXQ_PER_TXQG) {
+               err = -EINVAL;
+               goto err_cfg_txqs;
+       }
+       qg_buf->num_txqs = 1;
+       num_q_grps = 1;
+
+       /* set up and configure the Tx queues */
+       ice_for_each_txq(vsi, i) {
+               struct ice_tlan_ctx tlan_ctx = { 0 };
+
+               pf_q = vsi->txq_map[i];
+               ice_setup_tx_ctx(vsi->tx_rings[i], &tlan_ctx, pf_q);
+               /* copy context contents into the qg_buf */
+               qg_buf->txqs[0].txq_id = cpu_to_le16(pf_q);
+               ice_set_ctx((u8 *)&tlan_ctx, qg_buf->txqs[0].txq_ctx,
+                           ice_tlan_ctx_info);
+
+               /* init queue specific tail reg. It is referred as transmit
+                * comm scheduler queue doorbell.
+                */
+               vsi->tx_rings[i]->tail = pf->hw.hw_addr + QTX_COMM_DBELL(pf_q);
+               status = ice_ena_vsi_txq(vsi->port_info, vsi->vsi_num, tc,
+                                        num_q_grps, qg_buf, buf_len, NULL);
+               if (status) {
+                       dev_err(&vsi->back->pdev->dev,
+                               "Failed to set LAN Tx queue context, error: %d\n",
+                               status);
+                       err = -ENODEV;
+                       goto err_cfg_txqs;
+               }
+
+               /* Add Tx Queue TEID into the VSI Tx ring from the response
+                * This will complete configuring and enabling the queue.
+                */
+               txq = &qg_buf->txqs[0];
+               if (pf_q == le16_to_cpu(txq->txq_id))
+                       vsi->tx_rings[i]->txq_teid =
+                               le32_to_cpu(txq->q_teid);
+       }
+err_cfg_txqs:
+       devm_kfree(&pf->pdev->dev, qg_buf);
+       return err;
+}
+
+/**
+ * ice_vsi_cfg_msix - MSIX mode Interrupt Config in the HW
+ * @vsi: the VSI being configured
+ */
+void ice_vsi_cfg_msix(struct ice_vsi *vsi)
+{
+       struct ice_pf *pf = vsi->back;
+       u16 vector = vsi->base_vector;
+       struct ice_hw *hw = &pf->hw;
+       u32 txq = 0, rxq = 0;
+       int i, q, itr;
+       u8 itr_gran;
+
+       for (i = 0; i < vsi->num_q_vectors; i++, vector++) {
+               struct ice_q_vector *q_vector = vsi->q_vectors[i];
+
+               itr_gran = hw->itr_gran_200;
+
+               if (q_vector->num_ring_rx) {
+                       q_vector->rx.itr =
+                               ITR_TO_REG(vsi->rx_rings[rxq]->rx_itr_setting,
+                                          itr_gran);
+                       q_vector->rx.latency_range = ICE_LOW_LATENCY;
+               }
+
+               if (q_vector->num_ring_tx) {
+                       q_vector->tx.itr =
+                               ITR_TO_REG(vsi->tx_rings[txq]->tx_itr_setting,
+                                          itr_gran);
+                       q_vector->tx.latency_range = ICE_LOW_LATENCY;
+               }
+               wr32(hw, GLINT_ITR(ICE_RX_ITR, vector), q_vector->rx.itr);
+               wr32(hw, GLINT_ITR(ICE_TX_ITR, vector), q_vector->tx.itr);
+
+               /* Both Transmit Queue Interrupt Cause Control register
+                * and Receive Queue Interrupt Cause control register
+                * expects MSIX_INDX field to be the vector index
+                * within the function space and not the absolute
+                * vector index across PF or across device.
+                * For SR-IOV VF VSIs queue vector index always starts
+                * with 1 since first vector index(0) is used for OICR
+                * in VF space. Since VMDq and other PF VSIs are within
+                * the PF function space, use the vector index that is
+                * tracked for this PF.
+                */
+               for (q = 0; q < q_vector->num_ring_tx; q++) {
+                       u32 val;
+
+                       itr = ICE_ITR_NONE;
+                       val = QINT_TQCTL_CAUSE_ENA_M |
+                             (itr << QINT_TQCTL_ITR_INDX_S)  |
+                             (vector << QINT_TQCTL_MSIX_INDX_S);
+                       wr32(hw, QINT_TQCTL(vsi->txq_map[txq]), val);
+                       txq++;
+               }
+
+               for (q = 0; q < q_vector->num_ring_rx; q++) {
+                       u32 val;
+
+                       itr = ICE_ITR_NONE;
+                       val = QINT_RQCTL_CAUSE_ENA_M |
+                             (itr << QINT_RQCTL_ITR_INDX_S)  |
+                             (vector << QINT_RQCTL_MSIX_INDX_S);
+                       wr32(hw, QINT_RQCTL(vsi->rxq_map[rxq]), val);
+                       rxq++;
+               }
+       }
+
+       ice_flush(hw);
+}
+
 /**
  * ice_vsi_manage_vlan_insertion - Manage VLAN insertion for the VSI for Tx
  * @vsi: the VSI being changed
@@ -256,3 +645,105 @@ int ice_vsi_manage_vlan_stripping(struct ice_vsi *vsi, bool ena)
        vsi->info.vlan_flags = ctxt.info.vlan_flags;
        return 0;
 }
+
+/**
+ * ice_vsi_start_rx_rings - start VSI's Rx rings
+ * @vsi: the VSI whose rings are to be started
+ *
+ * Returns 0 on success and a negative value on error
+ */
+int ice_vsi_start_rx_rings(struct ice_vsi *vsi)
+{
+       return ice_vsi_ctrl_rx_rings(vsi, true);
+}
+
+/**
+ * ice_vsi_stop_rx_rings - stop VSI's Rx rings
+ * @vsi: the VSI
+ *
+ * Returns 0 on success and a negative value on error
+ */
+int ice_vsi_stop_rx_rings(struct ice_vsi *vsi)
+{
+       return ice_vsi_ctrl_rx_rings(vsi, false);
+}
+
+/**
+ * ice_vsi_stop_tx_rings - Disable Tx rings
+ * @vsi: the VSI being configured
+ */
+int ice_vsi_stop_tx_rings(struct ice_vsi *vsi)
+{
+       struct ice_pf *pf = vsi->back;
+       struct ice_hw *hw = &pf->hw;
+       enum ice_status status;
+       u32 *q_teids, val;
+       u16 *q_ids, i;
+       int err = 0;
+
+       if (vsi->num_txq > ICE_LAN_TXQ_MAX_QDIS)
+               return -EINVAL;
+
+       q_teids = devm_kcalloc(&pf->pdev->dev, vsi->num_txq, sizeof(*q_teids),
+                              GFP_KERNEL);
+       if (!q_teids)
+               return -ENOMEM;
+
+       q_ids = devm_kcalloc(&pf->pdev->dev, vsi->num_txq, sizeof(*q_ids),
+                            GFP_KERNEL);
+       if (!q_ids) {
+               err = -ENOMEM;
+               goto err_alloc_q_ids;
+       }
+
+       /* set up the Tx queue list to be disabled */
+       ice_for_each_txq(vsi, i) {
+               u16 v_idx;
+
+               if (!vsi->tx_rings || !vsi->tx_rings[i]) {
+                       err = -EINVAL;
+                       goto err_out;
+               }
+
+               q_ids[i] = vsi->txq_map[i];
+               q_teids[i] = vsi->tx_rings[i]->txq_teid;
+
+               /* clear cause_ena bit for disabled queues */
+               val = rd32(hw, QINT_TQCTL(vsi->tx_rings[i]->reg_idx));
+               val &= ~QINT_TQCTL_CAUSE_ENA_M;
+               wr32(hw, QINT_TQCTL(vsi->tx_rings[i]->reg_idx), val);
+
+               /* software is expected to wait for 100 ns */
+               ndelay(100);
+
+               /* trigger a software interrupt for the vector associated to
+                * the queue to schedule NAPI handler
+                */
+               v_idx = vsi->tx_rings[i]->q_vector->v_idx;
+               wr32(hw, GLINT_DYN_CTL(vsi->base_vector + v_idx),
+                    GLINT_DYN_CTL_SWINT_TRIG_M | GLINT_DYN_CTL_INTENA_MSK_M);
+       }
+       status = ice_dis_vsi_txq(vsi->port_info, vsi->num_txq, q_ids, q_teids,
+                                NULL);
+       /* if the disable queue command was exercised during an active reset
+        * flow, ICE_ERR_RESET_ONGOING is returned. This is not an error as
+        * the reset operation disables queues at the hardware level anyway.
+        */
+       if (status == ICE_ERR_RESET_ONGOING) {
+               dev_info(&pf->pdev->dev,
+                        "Reset in progress. LAN Tx queues already disabled\n");
+       } else if (status) {
+               dev_err(&pf->pdev->dev,
+                       "Failed to disable LAN Tx queues, error: %d\n",
+                       status);
+               err = -ENODEV;
+       }
+
+err_out:
+       devm_kfree(&pf->pdev->dev, q_ids);
+
+err_alloc_q_ids:
+       devm_kfree(&pf->pdev->dev, q_teids);
+
+       return err;
+}
index c10874d26eeea7caa5e4afd610e1d539c97c5410..ad4257929b9b2c514ba737fe292047b52e645517 100644 (file)
@@ -13,6 +13,12 @@ void ice_free_fltr_list(struct device *dev, struct list_head *h);
 
 void ice_update_eth_stats(struct ice_vsi *vsi);
 
+int ice_vsi_cfg_rxqs(struct ice_vsi *vsi);
+
+int ice_vsi_cfg_txqs(struct ice_vsi *vsi);
+
+void ice_vsi_cfg_msix(struct ice_vsi *vsi);
+
 int ice_vsi_add_vlan(struct ice_vsi *vsi, u16 vid);
 
 int ice_vsi_kill_vlan(struct ice_vsi *vsi, u16 vid);
@@ -20,4 +26,11 @@ int ice_vsi_kill_vlan(struct ice_vsi *vsi, u16 vid);
 int ice_vsi_manage_vlan_insertion(struct ice_vsi *vsi);
 
 int ice_vsi_manage_vlan_stripping(struct ice_vsi *vsi, bool ena);
+
+int ice_vsi_start_rx_rings(struct ice_vsi *vsi);
+
+int ice_vsi_stop_rx_rings(struct ice_vsi *vsi);
+
+int ice_vsi_stop_tx_rings(struct ice_vsi *vsi);
+
 #endif /* !_ICE_LIB_H_ */
index 2673430ec2e9a69f377035cd842d5a1bb4d7e203..ececf3dabf7e2681e2540601a94b82e8914d8252 100644 (file)
@@ -1844,77 +1844,6 @@ static void ice_vsi_free_irq(struct ice_vsi *vsi)
        }
 }
 
-/**
- * ice_vsi_cfg_msix - MSIX mode Interrupt Config in the HW
- * @vsi: the VSI being configured
- */
-static void ice_vsi_cfg_msix(struct ice_vsi *vsi)
-{
-       struct ice_pf *pf = vsi->back;
-       u16 vector = vsi->base_vector;
-       struct ice_hw *hw = &pf->hw;
-       u32 txq = 0, rxq = 0;
-       int i, q, itr;
-       u8 itr_gran;
-
-       for (i = 0; i < vsi->num_q_vectors; i++, vector++) {
-               struct ice_q_vector *q_vector = vsi->q_vectors[i];
-
-               itr_gran = hw->itr_gran_200;
-
-               if (q_vector->num_ring_rx) {
-                       q_vector->rx.itr =
-                               ITR_TO_REG(vsi->rx_rings[rxq]->rx_itr_setting,
-                                          itr_gran);
-                       q_vector->rx.latency_range = ICE_LOW_LATENCY;
-               }
-
-               if (q_vector->num_ring_tx) {
-                       q_vector->tx.itr =
-                               ITR_TO_REG(vsi->tx_rings[txq]->tx_itr_setting,
-                                          itr_gran);
-                       q_vector->tx.latency_range = ICE_LOW_LATENCY;
-               }
-               wr32(hw, GLINT_ITR(ICE_RX_ITR, vector), q_vector->rx.itr);
-               wr32(hw, GLINT_ITR(ICE_TX_ITR, vector), q_vector->tx.itr);
-
-               /* Both Transmit Queue Interrupt Cause Control register
-                * and Receive Queue Interrupt Cause control register
-                * expects MSIX_INDX field to be the vector index
-                * within the function space and not the absolute
-                * vector index across PF or across device.
-                * For SR-IOV VF VSIs queue vector index always starts
-                * with 1 since first vector index(0) is used for OICR
-                * in VF space. Since VMDq and other PF VSIs are withtin
-                * the PF function space, use the vector index thats
-                * tracked for this PF.
-                */
-               for (q = 0; q < q_vector->num_ring_tx; q++) {
-                       u32 val;
-
-                       itr = ICE_TX_ITR;
-                       val = QINT_TQCTL_CAUSE_ENA_M |
-                             (itr << QINT_TQCTL_ITR_INDX_S)  |
-                             (vector << QINT_TQCTL_MSIX_INDX_S);
-                       wr32(hw, QINT_TQCTL(vsi->txq_map[txq]), val);
-                       txq++;
-               }
-
-               for (q = 0; q < q_vector->num_ring_rx; q++) {
-                       u32 val;
-
-                       itr = ICE_RX_ITR;
-                       val = QINT_RQCTL_CAUSE_ENA_M |
-                             (itr << QINT_RQCTL_ITR_INDX_S)  |
-                             (vector << QINT_RQCTL_MSIX_INDX_S);
-                       wr32(hw, QINT_RQCTL(vsi->rxq_map[rxq]), val);
-                       rxq++;
-               }
-       }
-
-       ice_flush(hw);
-}
-
 /**
  * ice_ena_misc_vector - enable the non-queue interrupts
  * @pf: board private structure
@@ -3966,248 +3895,6 @@ static int ice_restore_vlan(struct ice_vsi *vsi)
        return err;
 }
 
-/**
- * ice_setup_tx_ctx - setup a struct ice_tlan_ctx instance
- * @ring: The Tx ring to configure
- * @tlan_ctx: Pointer to the Tx LAN queue context structure to be initialized
- * @pf_q: queue index in the PF space
- *
- * Configure the Tx descriptor ring in TLAN context.
- */
-static void
-ice_setup_tx_ctx(struct ice_ring *ring, struct ice_tlan_ctx *tlan_ctx, u16 pf_q)
-{
-       struct ice_vsi *vsi = ring->vsi;
-       struct ice_hw *hw = &vsi->back->hw;
-
-       tlan_ctx->base = ring->dma >> ICE_TLAN_CTX_BASE_S;
-
-       tlan_ctx->port_num = vsi->port_info->lport;
-
-       /* Transmit Queue Length */
-       tlan_ctx->qlen = ring->count;
-
-       /* PF number */
-       tlan_ctx->pf_num = hw->pf_id;
-
-       /* queue belongs to a specific VSI type
-        * VF / VM index should be programmed per vmvf_type setting:
-        * for vmvf_type = VF, it is VF number between 0-256
-        * for vmvf_type = VM, it is VM number between 0-767
-        * for PF or EMP this field should be set to zero
-        */
-       switch (vsi->type) {
-       case ICE_VSI_PF:
-               tlan_ctx->vmvf_type = ICE_TLAN_CTX_VMVF_TYPE_PF;
-               break;
-       default:
-               return;
-       }
-
-       /* make sure the context is associated with the right VSI */
-       tlan_ctx->src_vsi = vsi->vsi_num;
-
-       tlan_ctx->tso_ena = ICE_TX_LEGACY;
-       tlan_ctx->tso_qnum = pf_q;
-
-       /* Legacy or Advanced Host Interface:
-        * 0: Advanced Host Interface
-        * 1: Legacy Host Interface
-        */
-       tlan_ctx->legacy_int = ICE_TX_LEGACY;
-}
-
-/**
- * ice_vsi_cfg_txqs - Configure the VSI for Tx
- * @vsi: the VSI being configured
- *
- * Return 0 on success and a negative value on error
- * Configure the Tx VSI for operation.
- */
-static int ice_vsi_cfg_txqs(struct ice_vsi *vsi)
-{
-       struct ice_aqc_add_tx_qgrp *qg_buf;
-       struct ice_aqc_add_txqs_perq *txq;
-       struct ice_pf *pf = vsi->back;
-       enum ice_status status;
-       u16 buf_len, i, pf_q;
-       int err = 0, tc = 0;
-       u8 num_q_grps;
-
-       buf_len = sizeof(struct ice_aqc_add_tx_qgrp);
-       qg_buf = devm_kzalloc(&pf->pdev->dev, buf_len, GFP_KERNEL);
-       if (!qg_buf)
-               return -ENOMEM;
-
-       if (vsi->num_txq > ICE_MAX_TXQ_PER_TXQG) {
-               err = -EINVAL;
-               goto err_cfg_txqs;
-       }
-       qg_buf->num_txqs = 1;
-       num_q_grps = 1;
-
-       /* set up and configure the tx queues */
-       ice_for_each_txq(vsi, i) {
-               struct ice_tlan_ctx tlan_ctx = { 0 };
-
-               pf_q = vsi->txq_map[i];
-               ice_setup_tx_ctx(vsi->tx_rings[i], &tlan_ctx, pf_q);
-               /* copy context contents into the qg_buf */
-               qg_buf->txqs[0].txq_id = cpu_to_le16(pf_q);
-               ice_set_ctx((u8 *)&tlan_ctx, qg_buf->txqs[0].txq_ctx,
-                           ice_tlan_ctx_info);
-
-               /* init queue specific tail reg. It is referred as transmit
-                * comm scheduler queue doorbell.
-                */
-               vsi->tx_rings[i]->tail = pf->hw.hw_addr + QTX_COMM_DBELL(pf_q);
-               status = ice_ena_vsi_txq(vsi->port_info, vsi->vsi_num, tc,
-                                        num_q_grps, qg_buf, buf_len, NULL);
-               if (status) {
-                       dev_err(&vsi->back->pdev->dev,
-                               "Failed to set LAN Tx queue context, error: %d\n",
-                               status);
-                       err = -ENODEV;
-                       goto err_cfg_txqs;
-               }
-
-               /* Add Tx Queue TEID into the VSI tx ring from the response
-                * This will complete configuring and enabling the queue.
-                */
-               txq = &qg_buf->txqs[0];
-               if (pf_q == le16_to_cpu(txq->txq_id))
-                       vsi->tx_rings[i]->txq_teid =
-                               le32_to_cpu(txq->q_teid);
-       }
-err_cfg_txqs:
-       devm_kfree(&pf->pdev->dev, qg_buf);
-       return err;
-}
-
-/**
- * ice_setup_rx_ctx - Configure a receive ring context
- * @ring: The Rx ring to configure
- *
- * Configure the Rx descriptor ring in RLAN context.
- */
-static int ice_setup_rx_ctx(struct ice_ring *ring)
-{
-       struct ice_vsi *vsi = ring->vsi;
-       struct ice_hw *hw = &vsi->back->hw;
-       u32 rxdid = ICE_RXDID_FLEX_NIC;
-       struct ice_rlan_ctx rlan_ctx;
-       u32 regval;
-       u16 pf_q;
-       int err;
-
-       /* what is RX queue number in global space of 2K rx queues */
-       pf_q = vsi->rxq_map[ring->q_index];
-
-       /* clear the context structure first */
-       memset(&rlan_ctx, 0, sizeof(rlan_ctx));
-
-       rlan_ctx.base = ring->dma >> ICE_RLAN_BASE_S;
-
-       rlan_ctx.qlen = ring->count;
-
-       /* Receive Packet Data Buffer Size.
-        * The Packet Data Buffer Size is defined in 128 byte units.
-        */
-       rlan_ctx.dbuf = vsi->rx_buf_len >> ICE_RLAN_CTX_DBUF_S;
-
-       /* use 32 byte descriptors */
-       rlan_ctx.dsize = 1;
-
-       /* Strip the Ethernet CRC bytes before the packet is posted to host
-        * memory.
-        */
-       rlan_ctx.crcstrip = 1;
-
-       /* L2TSEL flag defines the reported L2 Tags in the receive descriptor */
-       rlan_ctx.l2tsel = 1;
-
-       rlan_ctx.dtype = ICE_RX_DTYPE_NO_SPLIT;
-       rlan_ctx.hsplit_0 = ICE_RLAN_RX_HSPLIT_0_NO_SPLIT;
-       rlan_ctx.hsplit_1 = ICE_RLAN_RX_HSPLIT_1_NO_SPLIT;
-
-       /* This controls whether VLAN is stripped from inner headers
-        * The VLAN in the inner L2 header is stripped to the receive
-        * descriptor if enabled by this flag.
-        */
-       rlan_ctx.showiv = 0;
-
-       /* Max packet size for this queue - must not be set to a larger value
-        * than 5 x DBUF
-        */
-       rlan_ctx.rxmax = min_t(u16, vsi->max_frame,
-                              ICE_MAX_CHAINED_RX_BUFS * vsi->rx_buf_len);
-
-       /* Rx queue threshold in units of 64 */
-       rlan_ctx.lrxqthresh = 1;
-
-        /* Enable Flexible Descriptors in the queue context which
-         * allows this driver to select a specific receive descriptor format
-         */
-       regval = rd32(hw, QRXFLXP_CNTXT(pf_q));
-       regval |= (rxdid << QRXFLXP_CNTXT_RXDID_IDX_S) &
-               QRXFLXP_CNTXT_RXDID_IDX_M;
-
-       /* increasing context priority to pick up profile id;
-        * default is 0x01; setting to 0x03 to ensure profile
-        * is programming if prev context is of same priority
-        */
-       regval |= (0x03 << QRXFLXP_CNTXT_RXDID_PRIO_S) &
-               QRXFLXP_CNTXT_RXDID_PRIO_M;
-
-       wr32(hw, QRXFLXP_CNTXT(pf_q), regval);
-
-       /* Absolute queue number out of 2K needs to be passed */
-       err = ice_write_rxq_ctx(hw, &rlan_ctx, pf_q);
-       if (err) {
-               dev_err(&vsi->back->pdev->dev,
-                       "Failed to set LAN Rx queue context for absolute Rx queue %d error: %d\n",
-                       pf_q, err);
-               return -EIO;
-       }
-
-       /* init queue specific tail register */
-       ring->tail = hw->hw_addr + QRX_TAIL(pf_q);
-       writel(0, ring->tail);
-       ice_alloc_rx_bufs(ring, ICE_DESC_UNUSED(ring));
-
-       return 0;
-}
-
-/**
- * ice_vsi_cfg_rxqs - Configure the VSI for Rx
- * @vsi: the VSI being configured
- *
- * Return 0 on success and a negative value on error
- * Configure the Rx VSI for operation.
- */
-static int ice_vsi_cfg_rxqs(struct ice_vsi *vsi)
-{
-       int err = 0;
-       u16 i;
-
-       if (vsi->netdev && vsi->netdev->mtu > ETH_DATA_LEN)
-               vsi->max_frame = vsi->netdev->mtu +
-                       ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN;
-       else
-               vsi->max_frame = ICE_RXBUF_2048;
-
-       vsi->rx_buf_len = ICE_RXBUF_2048;
-       /* set up individual rings */
-       for (i = 0; i < vsi->num_rxq && !err; i++)
-               err = ice_setup_rx_ctx(vsi->rx_rings[i]);
-
-       if (err) {
-               dev_err(&vsi->back->pdev->dev, "ice_setup_rx_ctx failed\n");
-               return -EIO;
-       }
-       return err;
-}
-
 /**
  * ice_vsi_cfg - Setup the VSI
  * @vsi: the VSI being configured
@@ -4232,207 +3919,6 @@ static int ice_vsi_cfg(struct ice_vsi *vsi)
        return err;
 }
 
-/**
- * ice_vsi_stop_tx_rings - Disable Tx rings
- * @vsi: the VSI being configured
- */
-static int ice_vsi_stop_tx_rings(struct ice_vsi *vsi)
-{
-       struct ice_pf *pf = vsi->back;
-       struct ice_hw *hw = &pf->hw;
-       enum ice_status status;
-       u32 *q_teids, val;
-       u16 *q_ids, i;
-       int err = 0;
-
-       if (vsi->num_txq > ICE_LAN_TXQ_MAX_QDIS)
-               return -EINVAL;
-
-       q_teids = devm_kcalloc(&pf->pdev->dev, vsi->num_txq, sizeof(*q_teids),
-                              GFP_KERNEL);
-       if (!q_teids)
-               return -ENOMEM;
-
-       q_ids = devm_kcalloc(&pf->pdev->dev, vsi->num_txq, sizeof(*q_ids),
-                            GFP_KERNEL);
-       if (!q_ids) {
-               err = -ENOMEM;
-               goto err_alloc_q_ids;
-       }
-
-       /* set up the tx queue list to be disabled */
-       ice_for_each_txq(vsi, i) {
-               u16 v_idx;
-
-               if (!vsi->tx_rings || !vsi->tx_rings[i]) {
-                       err = -EINVAL;
-                       goto err_out;
-               }
-
-               q_ids[i] = vsi->txq_map[i];
-               q_teids[i] = vsi->tx_rings[i]->txq_teid;
-
-               /* clear cause_ena bit for disabled queues */
-               val = rd32(hw, QINT_TQCTL(vsi->tx_rings[i]->reg_idx));
-               val &= ~QINT_TQCTL_CAUSE_ENA_M;
-               wr32(hw, QINT_TQCTL(vsi->tx_rings[i]->reg_idx), val);
-
-               /* software is expected to wait for 100 ns */
-               ndelay(100);
-
-               /* trigger a software interrupt for the vector associated to
-                * the queue to schedule napi handler
-                */
-               v_idx = vsi->tx_rings[i]->q_vector->v_idx;
-               wr32(hw, GLINT_DYN_CTL(vsi->base_vector + v_idx),
-                    GLINT_DYN_CTL_SWINT_TRIG_M | GLINT_DYN_CTL_INTENA_MSK_M);
-       }
-       status = ice_dis_vsi_txq(vsi->port_info, vsi->num_txq, q_ids, q_teids,
-                                NULL);
-       /* if the disable queue command was exercised during an active reset
-        * flow, ICE_ERR_RESET_ONGOING is returned. This is not an error as
-        * the reset operation disables queues at the hardware level anyway.
-        */
-       if (status == ICE_ERR_RESET_ONGOING) {
-               dev_dbg(&pf->pdev->dev,
-                       "Reset in progress. LAN Tx queues already disabled\n");
-       } else if (status) {
-               dev_err(&pf->pdev->dev,
-                       "Failed to disable LAN Tx queues, error: %d\n",
-                       status);
-               err = -ENODEV;
-       }
-
-err_out:
-       devm_kfree(&pf->pdev->dev, q_ids);
-
-err_alloc_q_ids:
-       devm_kfree(&pf->pdev->dev, q_teids);
-
-       return err;
-}
-
-/**
- * ice_pf_rxq_wait - Wait for a PF's Rx queue to be enabled or disabled
- * @pf: the PF being configured
- * @pf_q: the PF queue
- * @ena: enable or disable state of the queue
- *
- * This routine will wait for the given Rx queue of the PF to reach the
- * enabled or disabled state.
- * Returns -ETIMEDOUT in case of failing to reach the requested state after
- * multiple retries; else will return 0 in case of success.
- */
-static int ice_pf_rxq_wait(struct ice_pf *pf, int pf_q, bool ena)
-{
-       int i;
-
-       for (i = 0; i < ICE_Q_WAIT_RETRY_LIMIT; i++) {
-               u32 rx_reg = rd32(&pf->hw, QRX_CTRL(pf_q));
-
-               if (ena == !!(rx_reg & QRX_CTRL_QENA_STAT_M))
-                       break;
-
-               usleep_range(10, 20);
-       }
-       if (i >= ICE_Q_WAIT_RETRY_LIMIT)
-               return -ETIMEDOUT;
-
-       return 0;
-}
-
-/**
- * ice_vsi_ctrl_rx_rings - Start or stop a VSI's rx rings
- * @vsi: the VSI being configured
- * @ena: start or stop the rx rings
- */
-static int ice_vsi_ctrl_rx_rings(struct ice_vsi *vsi, bool ena)
-{
-       struct ice_pf *pf = vsi->back;
-       struct ice_hw *hw = &pf->hw;
-       int i, j, ret = 0;
-
-       for (i = 0; i < vsi->num_rxq; i++) {
-               int pf_q = vsi->rxq_map[i];
-               u32 rx_reg;
-
-               for (j = 0; j < ICE_Q_WAIT_MAX_RETRY; j++) {
-                       rx_reg = rd32(hw, QRX_CTRL(pf_q));
-                       if (((rx_reg >> QRX_CTRL_QENA_REQ_S) & 1) ==
-                           ((rx_reg >> QRX_CTRL_QENA_STAT_S) & 1))
-                               break;
-                       usleep_range(1000, 2000);
-               }
-
-               /* Skip if the queue is already in the requested state */
-               if (ena == !!(rx_reg & QRX_CTRL_QENA_STAT_M))
-                       continue;
-
-               /* turn on/off the queue */
-               if (ena)
-                       rx_reg |= QRX_CTRL_QENA_REQ_M;
-               else
-                       rx_reg &= ~QRX_CTRL_QENA_REQ_M;
-               wr32(hw, QRX_CTRL(pf_q), rx_reg);
-
-               /* wait for the change to finish */
-               ret = ice_pf_rxq_wait(pf, pf_q, ena);
-               if (ret) {
-                       dev_err(&pf->pdev->dev,
-                               "VSI idx %d Rx ring %d %sable timeout\n",
-                               vsi->idx, pf_q, (ena ? "en" : "dis"));
-                       break;
-               }
-       }
-
-       return ret;
-}
-
-/**
- * ice_vsi_start_rx_rings - start VSI's rx rings
- * @vsi: the VSI whose rings are to be started
- *
- * Returns 0 on success and a negative value on error
- */
-static int ice_vsi_start_rx_rings(struct ice_vsi *vsi)
-{
-       return ice_vsi_ctrl_rx_rings(vsi, true);
-}
-
-/**
- * ice_vsi_stop_rx_rings - stop VSI's rx rings
- * @vsi: the VSI
- *
- * Returns 0 on success and a negative value on error
- */
-static int ice_vsi_stop_rx_rings(struct ice_vsi *vsi)
-{
-       return ice_vsi_ctrl_rx_rings(vsi, false);
-}
-
-/**
- * ice_vsi_stop_tx_rx_rings - stop VSI's tx and rx rings
- * @vsi: the VSI
- * Returns 0 on success and a negative value on error
- */
-static int ice_vsi_stop_tx_rx_rings(struct ice_vsi *vsi)
-{
-       int err_tx, err_rx;
-
-       err_tx = ice_vsi_stop_tx_rings(vsi);
-       if (err_tx)
-               dev_dbg(&vsi->back->pdev->dev, "Failed to disable Tx rings\n");
-
-       err_rx = ice_vsi_stop_rx_rings(vsi);
-       if (err_rx)
-               dev_dbg(&vsi->back->pdev->dev, "Failed to disable Rx rings\n");
-
-       if (err_tx || err_rx)
-               return -EIO;
-
-       return 0;
-}
-
 /**
  * ice_napi_enable_all - Enable NAPI for all q_vectors in the VSI
  * @vsi: the VSI being configured
@@ -4822,7 +4308,7 @@ static void ice_napi_disable_all(struct ice_vsi *vsi)
  */
 int ice_down(struct ice_vsi *vsi)
 {
-       int i, err;
+       int i, tx_err, rx_err;
 
        /* Caller of this function is expected to set the
         * vsi->state __ICE_DOWN bit
@@ -4833,7 +4319,18 @@ int ice_down(struct ice_vsi *vsi)
        }
 
        ice_vsi_dis_irq(vsi);
-       err = ice_vsi_stop_tx_rx_rings(vsi);
+       tx_err = ice_vsi_stop_tx_rings(vsi);
+       if (tx_err)
+               netdev_err(vsi->netdev,
+                          "Failed stop Tx rings, VSI %d error %d\n",
+                          vsi->vsi_num, tx_err);
+
+       rx_err = ice_vsi_stop_rx_rings(vsi);
+       if (rx_err)
+               netdev_err(vsi->netdev,
+                          "Failed stop Rx rings, VSI %d error %d\n",
+                          vsi->vsi_num, rx_err);
+
        ice_napi_disable_all(vsi);
 
        ice_for_each_txq(vsi, i)
@@ -4842,10 +4339,14 @@ int ice_down(struct ice_vsi *vsi)
        ice_for_each_rxq(vsi, i)
                ice_clean_rx_ring(vsi->rx_rings[i]);
 
-       if (err)
-               netdev_err(vsi->netdev, "Failed to close VSI 0x%04X on switch 0x%04X\n",
+       if (tx_err || rx_err) {
+               netdev_err(vsi->netdev,
+                          "Failed to close VSI 0x%04X on switch 0x%04X\n",
                           vsi->vsi_num, vsi->vsw->sw_id);
-       return err;
+               return -EIO;
+       }
+
+       return 0;
 }
 
 /**
@@ -4865,6 +4366,7 @@ static int ice_vsi_setup_tx_rings(struct ice_vsi *vsi)
        }
 
        ice_for_each_txq(vsi, i) {
+               vsi->tx_rings[i]->netdev = vsi->netdev;
                err = ice_setup_tx_ring(vsi->tx_rings[i]);
                if (err)
                        break;
@@ -4890,6 +4392,7 @@ static int ice_vsi_setup_rx_rings(struct ice_vsi *vsi)
        }
 
        ice_for_each_rxq(vsi, i) {
+               vsi->rx_rings[i]->netdev = vsi->netdev;
                err = ice_setup_rx_ring(vsi->rx_rings[i]);
                if (err)
                        break;