net/hns3: fix return value for unsupported tuple
[dpdk.git] / drivers / net / ice / base / ice_sched.c
index be3f56c..1b060d3 100644 (file)
@@ -2841,8 +2841,8 @@ static enum ice_status
 ice_sched_assoc_vsi_to_agg(struct ice_port_info *pi, u32 agg_id,
                           u16 vsi_handle, ice_bitmap_t *tc_bitmap)
 {
-       struct ice_sched_agg_vsi_info *agg_vsi_info;
-       struct ice_sched_agg_info *agg_info;
+       struct ice_sched_agg_vsi_info *agg_vsi_info, *old_agg_vsi_info = NULL;
+       struct ice_sched_agg_info *agg_info, *old_agg_info;
        enum ice_status status = ICE_SUCCESS;
        struct ice_hw *hw = pi->hw;
        u8 tc;
@@ -2852,6 +2852,20 @@ ice_sched_assoc_vsi_to_agg(struct ice_port_info *pi, u32 agg_id,
        agg_info = ice_get_agg_info(hw, agg_id);
        if (!agg_info)
                return ICE_ERR_PARAM;
+       /* If the vsi is already part of another aggregator then update
+        * its vsi info list
+        */
+       old_agg_info = ice_get_vsi_agg_info(hw, vsi_handle);
+       if (old_agg_info && old_agg_info != agg_info) {
+               struct ice_sched_agg_vsi_info *vtmp;
+
+               LIST_FOR_EACH_ENTRY_SAFE(old_agg_vsi_info, vtmp,
+                                        &old_agg_info->agg_vsi_list,
+                                        ice_sched_agg_vsi_info, list_entry)
+                       if (old_agg_vsi_info->vsi_handle == vsi_handle)
+                               break;
+       }
+
        /* check if entry already exist */
        agg_vsi_info = ice_get_agg_vsi_info(agg_info, vsi_handle);
        if (!agg_vsi_info) {
@@ -2876,6 +2890,12 @@ ice_sched_assoc_vsi_to_agg(struct ice_port_info *pi, u32 agg_id,
                        break;
 
                ice_set_bit(tc, agg_vsi_info->tc_bitmap);
+               if (old_agg_vsi_info)
+                       ice_clear_bit(tc, old_agg_vsi_info->tc_bitmap);
+       }
+       if (old_agg_vsi_info && !old_agg_vsi_info->tc_bitmap[0]) {
+               LIST_DEL(&old_agg_vsi_info->list_entry);
+               ice_free(pi->hw, old_agg_vsi_info);
        }
        return status;
 }
@@ -2925,6 +2945,9 @@ ice_sched_update_elem(struct ice_hw *hw, struct ice_sched_node *node,
        u16 num_elems = 1;
 
        buf = *info;
+       /* For TC nodes, CIR config is not supported */
+       if (node->info.data.elem_type == ICE_AQC_ELEM_TYPE_TC)
+               buf.data.valid_sections &= ~ICE_AQC_ELEM_VALID_CIR;
        /* Parent TEID is reserved field in this aq call */
        buf.parent_teid = 0;
        /* Element type is reserved field in this aq call */
@@ -3590,6 +3613,92 @@ ice_cfg_vsi_q_priority(struct ice_port_info *pi, u16 num_qs, u32 *q_ids,
        return status;
 }
 
+/**
+ * ice_sched_cfg_sibl_node_prio_lock - config priority of node
+ * @pi: port information structure
+ * @node: sched node to configure
+ * @priority: sibling priority
+ *
+ * This function configures node element's sibling priority only.
+ */
+enum ice_status
+ice_sched_cfg_sibl_node_prio_lock(struct ice_port_info *pi,
+                                 struct ice_sched_node *node,
+                                 u8 priority)
+{
+       enum ice_status status;
+
+       ice_acquire_lock(&pi->sched_lock);
+       status = ice_sched_cfg_sibl_node_prio(pi, node, priority);
+       ice_release_lock(&pi->sched_lock);
+
+       return status;
+}
+
+/**
+ * ice_sched_save_q_bw_alloc - save queue node's BW allocation information
+ * @q_ctx: queue context structure
+ * @rl_type: rate limit type min, max, or shared
+ * @bw_alloc: BW weight/allocation
+ *
+ * Save BW information of queue type node for post replay use.
+ */
+static enum ice_status
+ice_sched_save_q_bw_alloc(struct ice_q_ctx *q_ctx, enum ice_rl_type rl_type,
+                         u32 bw_alloc)
+{
+       switch (rl_type) {
+       case ICE_MIN_BW:
+               ice_set_clear_cir_bw_alloc(&q_ctx->bw_t_info, bw_alloc);
+               break;
+       case ICE_MAX_BW:
+               ice_set_clear_eir_bw_alloc(&q_ctx->bw_t_info, bw_alloc);
+               break;
+       default:
+               return ICE_ERR_PARAM;
+       }
+       return ICE_SUCCESS;
+}
+
+/**
+ * ice_cfg_q_bw_alloc - configure queue BW weight/alloc params
+ * @pi: port information structure
+ * @vsi_handle: sw VSI handle
+ * @tc: traffic class
+ * @q_handle: software queue handle
+ * @rl_type: min, max, or shared
+ * @bw_alloc: BW weight/allocation
+ *
+ * This function configures BW allocation of queue scheduling node.
+ */
+enum ice_status
+ice_cfg_q_bw_alloc(struct ice_port_info *pi, u16 vsi_handle, u8 tc,
+                  u16 q_handle, enum ice_rl_type rl_type, u32 bw_alloc)
+{
+       enum ice_status status = ICE_ERR_PARAM;
+       struct ice_sched_node *node;
+       struct ice_q_ctx *q_ctx;
+
+       ice_acquire_lock(&pi->sched_lock);
+       q_ctx = ice_get_lan_q_ctx(pi->hw, vsi_handle, tc, q_handle);
+       if (!q_ctx)
+               goto exit_q_bw_alloc;
+
+       node = ice_sched_find_node_by_teid(pi->root, q_ctx->q_teid);
+       if (!node) {
+               ice_debug(pi->hw, ICE_DBG_SCHED, "Wrong q_teid\n");
+               goto exit_q_bw_alloc;
+       }
+
+       status = ice_sched_cfg_node_bw_alloc(pi->hw, node, rl_type, bw_alloc);
+       if (!status)
+               status = ice_sched_save_q_bw_alloc(q_ctx, rl_type, bw_alloc);
+
+exit_q_bw_alloc:
+       ice_release_lock(&pi->sched_lock);
+       return status;
+}
+
 /**
  * ice_cfg_agg_vsi_priority_per_tc - config aggregator's VSI priority per TC
  * @pi: port information structure
@@ -4751,12 +4860,12 @@ ice_sched_get_node_by_id_type(struct ice_port_info *pi, u32 id,
 
        case ICE_AGG_TYPE_Q:
                /* The current implementation allows single queue to modify */
-               node = ice_sched_get_node(pi, id);
+               node = ice_sched_find_node_by_teid(pi->root, id);
                break;
 
        case ICE_AGG_TYPE_QG:
                /* The current implementation allows single qg to modify */
-               child_node = ice_sched_get_node(pi, id);
+               child_node = ice_sched_find_node_by_teid(pi->root, id);
                if (!child_node)
                        break;
                node = child_node->parent;