ice: Create framework for VSI queue context

This patch introduces a framework to store queue specific information
in VSI queue contexts. Currently VSI queue context (represented by
struct ice_q_ctx) only has q_handle as a member. In future patches,
this structure will be updated to hold queue specific information.

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>

1 files changed, 57 insertions, 5 deletions

diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c
index 2937c6be1aee..dce07882f7e1 100644
--- a/drivers/net/ethernet/intel/ice/ice_common.c
+++ b/drivers/net/ethernet/intel/ice/ice_common.c
@@ -2791,10 +2791,35 @@ ice_set_ctx(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info)
 }
 
 /**
+ * ice_get_lan_q_ctx - get the LAN queue context for the given VSI and TC
+ * @hw: pointer to the HW struct
+ * @vsi_handle: software VSI handle
+ * @tc: TC number
+ * @q_handle: software queue handle
+ */
+static struct ice_q_ctx *
+ice_get_lan_q_ctx(struct ice_hw *hw, u16 vsi_handle, u8 tc, u16 q_handle)
+{
+        struct ice_vsi_ctx *vsi;
+        struct ice_q_ctx *q_ctx;
+
+        vsi = ice_get_vsi_ctx(hw, vsi_handle);
+        if (!vsi)
+                return NULL;
+        if (q_handle >= vsi->num_lan_q_entries[tc])
+                return NULL;
+        if (!vsi->lan_q_ctx[tc])
+                return NULL;
+        q_ctx = vsi->lan_q_ctx[tc];
+        return &q_ctx[q_handle];
+}
+
+/**
  * ice_ena_vsi_txq
  * @pi: port information structure
  * @vsi_handle: software VSI handle
  * @tc: TC number
+ * @q_handle: software queue handle
  * @num_qgrps: Number of added queue groups
  * @buf: list of queue groups to be added
  * @buf_size: size of buffer for indirect command
@@ -2803,12 +2828,13 @@ ice_set_ctx(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info)
  * This function adds one LAN queue
  */
 enum ice_status
-ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps,
-                struct ice_aqc_add_tx_qgrp *buf, u16 buf_size,
+ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u16 q_handle,
+                u8 num_qgrps, struct ice_aqc_add_tx_qgrp *buf, u16 buf_size,
                 struct ice_sq_cd *cd)
 {
         struct ice_aqc_txsched_elem_data node = { 0 };
         struct ice_sched_node *parent;
+        struct ice_q_ctx *q_ctx;
         enum ice_status status;
         struct ice_hw *hw;
 
@@ -2825,6 +2851,14 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps,
 
         mutex_lock(&pi->sched_lock);
 
+        q_ctx = ice_get_lan_q_ctx(hw, vsi_handle, tc, q_handle);
+        if (!q_ctx) {
+                ice_debug(hw, ICE_DBG_SCHED, "Enaq: invalid queue handle %d\n",
+                          q_handle);
+                status = ICE_ERR_PARAM;
+                goto ena_txq_exit;
+        }
+
         /* find a parent node */
         parent = ice_sched_get_free_qparent(pi, vsi_handle, tc,
                                             ICE_SCHED_NODE_OWNER_LAN);
@@ -2851,7 +2885,7 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps,
         /* add the LAN queue */
         status = ice_aq_add_lan_txq(hw, num_qgrps, buf, buf_size, cd);
         if (status) {
-                ice_debug(hw, ICE_DBG_SCHED, "enable Q %d failed %d\n",
+                ice_debug(hw, ICE_DBG_SCHED, "enable queue %d failed %d\n",
                           le16_to_cpu(buf->txqs[0].txq_id),
                           hw->adminq.sq_last_status);
                 goto ena_txq_exit;
@@ -2859,6 +2893,7 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps,
 
         node.node_teid = buf->txqs[0].q_teid;
         node.data.elem_type = ICE_AQC_ELEM_TYPE_LEAF;
+        q_ctx->q_handle = q_handle;
 
         /* add a leaf node into schduler tree queue layer */
         status = ice_sched_add_node(pi, hw->num_tx_sched_layers - 1, &node);
@@ -2871,7 +2906,10 @@ ena_txq_exit:
 /**
  * ice_dis_vsi_txq
  * @pi: port information structure
+ * @vsi_handle: software VSI handle
+ * @tc: TC number
  * @num_queues: number of queues
+ * @q_handles: pointer to software queue handle array
  * @q_ids: pointer to the q_id array
  * @q_teids: pointer to queue node teids
  * @rst_src: if called due to reset, specifies the reset source
@@ -2881,12 +2919,14 @@ ena_txq_exit:
  * This function removes queues and their corresponding nodes in SW DB
  */
 enum ice_status
-ice_dis_vsi_txq(struct ice_port_info *pi, u8 num_queues, u16 *q_ids,
-                u32 *q_teids, enum ice_disq_rst_src rst_src, u16 vmvf_num,
+ice_dis_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_queues,
+                u16 *q_handles, u16 *q_ids, u32 *q_teids,
+                enum ice_disq_rst_src rst_src, u16 vmvf_num,
                 struct ice_sq_cd *cd)
 {
         enum ice_status status = ICE_ERR_DOES_NOT_EXIST;
         struct ice_aqc_dis_txq_item qg_list;
+        struct ice_q_ctx *q_ctx;
         u16 i;
 
         if (!pi || pi->port_state != ICE_SCHED_PORT_STATE_READY)
@@ -2909,6 +2949,17 @@ ice_dis_vsi_txq(struct ice_port_info *pi, u8 num_queues, u16 *q_ids,
                 node = ice_sched_find_node_by_teid(pi->root, q_teids[i]);
                 if (!node)
                         continue;
+                q_ctx = ice_get_lan_q_ctx(pi->hw, vsi_handle, tc, q_handles[i]);
+                if (!q_ctx) {
+                        ice_debug(pi->hw, ICE_DBG_SCHED, "invalid queue handle%d\n",
+                                  q_handles[i]);
+                        continue;
+                }
+                if (q_ctx->q_handle != q_handles[i]) {
+                        ice_debug(pi->hw, ICE_DBG_SCHED, "Err:handles %d %d\n",
+                                  q_ctx->q_handle, q_handles[i]);
+                        continue;
+                }
                 qg_list.parent_teid = node->info.parent_teid;
                 qg_list.num_qs = 1;
                 qg_list.q_id[0] = cpu_to_le16(q_ids[i]);
@@ -2919,6 +2970,7 @@ ice_dis_vsi_txq(struct ice_port_info *pi, u8 num_queues, u16 *q_ids,
                 if (status)
                         break;
                 ice_free_sched_node(pi, node);
+                q_ctx->q_handle = ICE_INVAL_Q_HANDLE;
         }
         mutex_unlock(&pi->sched_lock);
         return status;