diff options
author | Anirudh Venkataramanan <anirudh.venkataramanan@intel.com> | 2019-02-19 18:04:13 -0500 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2019-04-18 11:38:47 -0400 |
commit | f9867df6d96593fe678a138230379cda78403429 (patch) | |
tree | c1c6136d1d91b0bcdded6e4fc63804986d51b776 /drivers/net/ethernet/intel/ice/ice_sched.c | |
parent | 94c4441b5a80f38d203432a4389d2dd349403ae5 (diff) |
ice: Fix incorrect use of abbreviations
Capitalize abbreviations and spell out some that aren't obvious.
Reviewed-by: Bruce Allan <bruce.w.allan@intel.com>
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>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_sched.c')
-rw-r--r-- | drivers/net/ethernet/intel/ice/ice_sched.c | 104 |
1 files changed, 52 insertions, 52 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_sched.c b/drivers/net/ethernet/intel/ice/ice_sched.c index e0218f4c8f0b..3d1c941a938e 100644 --- a/drivers/net/ethernet/intel/ice/ice_sched.c +++ b/drivers/net/ethernet/intel/ice/ice_sched.c | |||
@@ -43,9 +43,9 @@ ice_sched_add_root_node(struct ice_port_info *pi, | |||
43 | /** | 43 | /** |
44 | * ice_sched_find_node_by_teid - Find the Tx scheduler node in SW DB | 44 | * ice_sched_find_node_by_teid - Find the Tx scheduler node in SW DB |
45 | * @start_node: pointer to the starting ice_sched_node struct in a sub-tree | 45 | * @start_node: pointer to the starting ice_sched_node struct in a sub-tree |
46 | * @teid: node teid to search | 46 | * @teid: node TEID to search |
47 | * | 47 | * |
48 | * This function searches for a node matching the teid in the scheduling tree | 48 | * This function searches for a node matching the TEID in the scheduling tree |
49 | * from the SW DB. The search is recursive and is restricted by the number of | 49 | * from the SW DB. The search is recursive and is restricted by the number of |
50 | * layers it has searched through; stopping at the max supported layer. | 50 | * layers it has searched through; stopping at the max supported layer. |
51 | * | 51 | * |
@@ -66,7 +66,7 @@ ice_sched_find_node_by_teid(struct ice_sched_node *start_node, u32 teid) | |||
66 | start_node->info.data.elem_type == ICE_AQC_ELEM_TYPE_LEAF) | 66 | start_node->info.data.elem_type == ICE_AQC_ELEM_TYPE_LEAF) |
67 | return NULL; | 67 | return NULL; |
68 | 68 | ||
69 | /* Check if teid matches to any of the children nodes */ | 69 | /* Check if TEID matches to any of the children nodes */ |
70 | for (i = 0; i < start_node->num_children; i++) | 70 | for (i = 0; i < start_node->num_children; i++) |
71 | if (ICE_TXSCHED_GET_NODE_TEID(start_node->children[i]) == teid) | 71 | if (ICE_TXSCHED_GET_NODE_TEID(start_node->children[i]) == teid) |
72 | return start_node->children[i]; | 72 | return start_node->children[i]; |
@@ -86,7 +86,7 @@ ice_sched_find_node_by_teid(struct ice_sched_node *start_node, u32 teid) | |||
86 | 86 | ||
87 | /** | 87 | /** |
88 | * ice_aqc_send_sched_elem_cmd - send scheduling elements cmd | 88 | * ice_aqc_send_sched_elem_cmd - send scheduling elements cmd |
89 | * @hw: pointer to the hw struct | 89 | * @hw: pointer to the HW struct |
90 | * @cmd_opc: cmd opcode | 90 | * @cmd_opc: cmd opcode |
91 | * @elems_req: number of elements to request | 91 | * @elems_req: number of elements to request |
92 | * @buf: pointer to buffer | 92 | * @buf: pointer to buffer |
@@ -118,7 +118,7 @@ ice_aqc_send_sched_elem_cmd(struct ice_hw *hw, enum ice_adminq_opc cmd_opc, | |||
118 | 118 | ||
119 | /** | 119 | /** |
120 | * ice_aq_query_sched_elems - query scheduler elements | 120 | * ice_aq_query_sched_elems - query scheduler elements |
121 | * @hw: pointer to the hw struct | 121 | * @hw: pointer to the HW struct |
122 | * @elems_req: number of elements to query | 122 | * @elems_req: number of elements to query |
123 | * @buf: pointer to buffer | 123 | * @buf: pointer to buffer |
124 | * @buf_size: buffer size in bytes | 124 | * @buf_size: buffer size in bytes |
@@ -138,9 +138,9 @@ ice_aq_query_sched_elems(struct ice_hw *hw, u16 elems_req, | |||
138 | } | 138 | } |
139 | 139 | ||
140 | /** | 140 | /** |
141 | * ice_sched_query_elem - query element information from hw | 141 | * ice_sched_query_elem - query element information from HW |
142 | * @hw: pointer to the hw struct | 142 | * @hw: pointer to the HW struct |
143 | * @node_teid: node teid to be queried | 143 | * @node_teid: node TEID to be queried |
144 | * @buf: buffer to element information | 144 | * @buf: buffer to element information |
145 | * | 145 | * |
146 | * This function queries HW element information | 146 | * This function queries HW element information |
@@ -226,7 +226,7 @@ ice_sched_add_node(struct ice_port_info *pi, u8 layer, | |||
226 | 226 | ||
227 | /** | 227 | /** |
228 | * ice_aq_delete_sched_elems - delete scheduler elements | 228 | * ice_aq_delete_sched_elems - delete scheduler elements |
229 | * @hw: pointer to the hw struct | 229 | * @hw: pointer to the HW struct |
230 | * @grps_req: number of groups to delete | 230 | * @grps_req: number of groups to delete |
231 | * @buf: pointer to buffer | 231 | * @buf: pointer to buffer |
232 | * @buf_size: buffer size in bytes | 232 | * @buf_size: buffer size in bytes |
@@ -246,13 +246,13 @@ ice_aq_delete_sched_elems(struct ice_hw *hw, u16 grps_req, | |||
246 | } | 246 | } |
247 | 247 | ||
248 | /** | 248 | /** |
249 | * ice_sched_remove_elems - remove nodes from hw | 249 | * ice_sched_remove_elems - remove nodes from HW |
250 | * @hw: pointer to the hw struct | 250 | * @hw: pointer to the HW struct |
251 | * @parent: pointer to the parent node | 251 | * @parent: pointer to the parent node |
252 | * @num_nodes: number of nodes | 252 | * @num_nodes: number of nodes |
253 | * @node_teids: array of node teids to be deleted | 253 | * @node_teids: array of node teids to be deleted |
254 | * | 254 | * |
255 | * This function remove nodes from hw | 255 | * This function remove nodes from HW |
256 | */ | 256 | */ |
257 | static enum ice_status | 257 | static enum ice_status |
258 | ice_sched_remove_elems(struct ice_hw *hw, struct ice_sched_node *parent, | 258 | ice_sched_remove_elems(struct ice_hw *hw, struct ice_sched_node *parent, |
@@ -285,7 +285,7 @@ ice_sched_remove_elems(struct ice_hw *hw, struct ice_sched_node *parent, | |||
285 | 285 | ||
286 | /** | 286 | /** |
287 | * ice_sched_get_first_node - get the first node of the given layer | 287 | * ice_sched_get_first_node - get the first node of the given layer |
288 | * @hw: pointer to the hw struct | 288 | * @hw: pointer to the HW struct |
289 | * @parent: pointer the base node of the subtree | 289 | * @parent: pointer the base node of the subtree |
290 | * @layer: layer number | 290 | * @layer: layer number |
291 | * | 291 | * |
@@ -406,7 +406,7 @@ err_exit: | |||
406 | 406 | ||
407 | /** | 407 | /** |
408 | * ice_aq_get_dflt_topo - gets default scheduler topology | 408 | * ice_aq_get_dflt_topo - gets default scheduler topology |
409 | * @hw: pointer to the hw struct | 409 | * @hw: pointer to the HW struct |
410 | * @lport: logical port number | 410 | * @lport: logical port number |
411 | * @buf: pointer to buffer | 411 | * @buf: pointer to buffer |
412 | * @buf_size: buffer size in bytes | 412 | * @buf_size: buffer size in bytes |
@@ -436,7 +436,7 @@ ice_aq_get_dflt_topo(struct ice_hw *hw, u8 lport, | |||
436 | 436 | ||
437 | /** | 437 | /** |
438 | * ice_aq_add_sched_elems - adds scheduling element | 438 | * ice_aq_add_sched_elems - adds scheduling element |
439 | * @hw: pointer to the hw struct | 439 | * @hw: pointer to the HW struct |
440 | * @grps_req: the number of groups that are requested to be added | 440 | * @grps_req: the number of groups that are requested to be added |
441 | * @buf: pointer to buffer | 441 | * @buf: pointer to buffer |
442 | * @buf_size: buffer size in bytes | 442 | * @buf_size: buffer size in bytes |
@@ -457,7 +457,7 @@ ice_aq_add_sched_elems(struct ice_hw *hw, u16 grps_req, | |||
457 | 457 | ||
458 | /** | 458 | /** |
459 | * ice_aq_suspend_sched_elems - suspend scheduler elements | 459 | * ice_aq_suspend_sched_elems - suspend scheduler elements |
460 | * @hw: pointer to the hw struct | 460 | * @hw: pointer to the HW struct |
461 | * @elems_req: number of elements to suspend | 461 | * @elems_req: number of elements to suspend |
462 | * @buf: pointer to buffer | 462 | * @buf: pointer to buffer |
463 | * @buf_size: buffer size in bytes | 463 | * @buf_size: buffer size in bytes |
@@ -478,7 +478,7 @@ ice_aq_suspend_sched_elems(struct ice_hw *hw, u16 elems_req, | |||
478 | 478 | ||
479 | /** | 479 | /** |
480 | * ice_aq_resume_sched_elems - resume scheduler elements | 480 | * ice_aq_resume_sched_elems - resume scheduler elements |
481 | * @hw: pointer to the hw struct | 481 | * @hw: pointer to the HW struct |
482 | * @elems_req: number of elements to resume | 482 | * @elems_req: number of elements to resume |
483 | * @buf: pointer to buffer | 483 | * @buf: pointer to buffer |
484 | * @buf_size: buffer size in bytes | 484 | * @buf_size: buffer size in bytes |
@@ -499,7 +499,7 @@ ice_aq_resume_sched_elems(struct ice_hw *hw, u16 elems_req, | |||
499 | 499 | ||
500 | /** | 500 | /** |
501 | * ice_aq_query_sched_res - query scheduler resource | 501 | * ice_aq_query_sched_res - query scheduler resource |
502 | * @hw: pointer to the hw struct | 502 | * @hw: pointer to the HW struct |
503 | * @buf_size: buffer size in bytes | 503 | * @buf_size: buffer size in bytes |
504 | * @buf: pointer to buffer | 504 | * @buf: pointer to buffer |
505 | * @cd: pointer to command details structure or NULL | 505 | * @cd: pointer to command details structure or NULL |
@@ -518,13 +518,13 @@ ice_aq_query_sched_res(struct ice_hw *hw, u16 buf_size, | |||
518 | } | 518 | } |
519 | 519 | ||
520 | /** | 520 | /** |
521 | * ice_sched_suspend_resume_elems - suspend or resume hw nodes | 521 | * ice_sched_suspend_resume_elems - suspend or resume HW nodes |
522 | * @hw: pointer to the hw struct | 522 | * @hw: pointer to the HW struct |
523 | * @num_nodes: number of nodes | 523 | * @num_nodes: number of nodes |
524 | * @node_teids: array of node teids to be suspended or resumed | 524 | * @node_teids: array of node teids to be suspended or resumed |
525 | * @suspend: true means suspend / false means resume | 525 | * @suspend: true means suspend / false means resume |
526 | * | 526 | * |
527 | * This function suspends or resumes hw nodes | 527 | * This function suspends or resumes HW nodes |
528 | */ | 528 | */ |
529 | static enum ice_status | 529 | static enum ice_status |
530 | ice_sched_suspend_resume_elems(struct ice_hw *hw, u8 num_nodes, u32 *node_teids, | 530 | ice_sched_suspend_resume_elems(struct ice_hw *hw, u8 num_nodes, u32 *node_teids, |
@@ -558,10 +558,10 @@ ice_sched_suspend_resume_elems(struct ice_hw *hw, u8 num_nodes, u32 *node_teids, | |||
558 | } | 558 | } |
559 | 559 | ||
560 | /** | 560 | /** |
561 | * ice_sched_clear_agg - clears the agg related information | 561 | * ice_sched_clear_agg - clears the aggregator related information |
562 | * @hw: pointer to the hardware structure | 562 | * @hw: pointer to the hardware structure |
563 | * | 563 | * |
564 | * This function removes agg list and free up agg related memory | 564 | * This function removes aggregator list and free up aggregator related memory |
565 | * previously allocated. | 565 | * previously allocated. |
566 | */ | 566 | */ |
567 | void ice_sched_clear_agg(struct ice_hw *hw) | 567 | void ice_sched_clear_agg(struct ice_hw *hw) |
@@ -619,7 +619,7 @@ void ice_sched_clear_port(struct ice_port_info *pi) | |||
619 | 619 | ||
620 | /** | 620 | /** |
621 | * ice_sched_cleanup_all - cleanup scheduler elements from SW DB for all ports | 621 | * ice_sched_cleanup_all - cleanup scheduler elements from SW DB for all ports |
622 | * @hw: pointer to the hw struct | 622 | * @hw: pointer to the HW struct |
623 | * | 623 | * |
624 | * Cleanup scheduling elements from SW DB for all the ports | 624 | * Cleanup scheduling elements from SW DB for all the ports |
625 | */ | 625 | */ |
@@ -643,16 +643,16 @@ void ice_sched_cleanup_all(struct ice_hw *hw) | |||
643 | } | 643 | } |
644 | 644 | ||
645 | /** | 645 | /** |
646 | * ice_sched_add_elems - add nodes to hw and SW DB | 646 | * ice_sched_add_elems - add nodes to HW and SW DB |
647 | * @pi: port information structure | 647 | * @pi: port information structure |
648 | * @tc_node: pointer to the branch node | 648 | * @tc_node: pointer to the branch node |
649 | * @parent: pointer to the parent node | 649 | * @parent: pointer to the parent node |
650 | * @layer: layer number to add nodes | 650 | * @layer: layer number to add nodes |
651 | * @num_nodes: number of nodes | 651 | * @num_nodes: number of nodes |
652 | * @num_nodes_added: pointer to num nodes added | 652 | * @num_nodes_added: pointer to num nodes added |
653 | * @first_node_teid: if new nodes are added then return the teid of first node | 653 | * @first_node_teid: if new nodes are added then return the TEID of first node |
654 | * | 654 | * |
655 | * This function add nodes to hw as well as to SW DB for a given layer | 655 | * This function add nodes to HW as well as to SW DB for a given layer |
656 | */ | 656 | */ |
657 | static enum ice_status | 657 | static enum ice_status |
658 | ice_sched_add_elems(struct ice_port_info *pi, struct ice_sched_node *tc_node, | 658 | ice_sched_add_elems(struct ice_port_info *pi, struct ice_sched_node *tc_node, |
@@ -746,7 +746,7 @@ ice_sched_add_elems(struct ice_port_info *pi, struct ice_sched_node *tc_node, | |||
746 | * @parent: pointer to parent node | 746 | * @parent: pointer to parent node |
747 | * @layer: layer number to add nodes | 747 | * @layer: layer number to add nodes |
748 | * @num_nodes: number of nodes to be added | 748 | * @num_nodes: number of nodes to be added |
749 | * @first_node_teid: pointer to the first node teid | 749 | * @first_node_teid: pointer to the first node TEID |
750 | * @num_nodes_added: pointer to number of nodes added | 750 | * @num_nodes_added: pointer to number of nodes added |
751 | * | 751 | * |
752 | * This function add nodes to a given layer. | 752 | * This function add nodes to a given layer. |
@@ -798,7 +798,7 @@ ice_sched_add_nodes_to_layer(struct ice_port_info *pi, | |||
798 | 798 | ||
799 | *num_nodes_added += num_added; | 799 | *num_nodes_added += num_added; |
800 | } | 800 | } |
801 | /* Don't modify the first node teid memory if the first node was | 801 | /* Don't modify the first node TEID memory if the first node was |
802 | * added already in the above call. Instead send some temp | 802 | * added already in the above call. Instead send some temp |
803 | * memory for all other recursive calls. | 803 | * memory for all other recursive calls. |
804 | */ | 804 | */ |
@@ -830,7 +830,7 @@ ice_sched_add_nodes_to_layer(struct ice_port_info *pi, | |||
830 | 830 | ||
831 | /** | 831 | /** |
832 | * ice_sched_get_qgrp_layer - get the current queue group layer number | 832 | * ice_sched_get_qgrp_layer - get the current queue group layer number |
833 | * @hw: pointer to the hw struct | 833 | * @hw: pointer to the HW struct |
834 | * | 834 | * |
835 | * This function returns the current queue group layer number | 835 | * This function returns the current queue group layer number |
836 | */ | 836 | */ |
@@ -842,7 +842,7 @@ static u8 ice_sched_get_qgrp_layer(struct ice_hw *hw) | |||
842 | 842 | ||
843 | /** | 843 | /** |
844 | * ice_sched_get_vsi_layer - get the current VSI layer number | 844 | * ice_sched_get_vsi_layer - get the current VSI layer number |
845 | * @hw: pointer to the hw struct | 845 | * @hw: pointer to the HW struct |
846 | * | 846 | * |
847 | * This function returns the current VSI layer number | 847 | * This function returns the current VSI layer number |
848 | */ | 848 | */ |
@@ -853,7 +853,7 @@ static u8 ice_sched_get_vsi_layer(struct ice_hw *hw) | |||
853 | * 7 4 | 853 | * 7 4 |
854 | * 5 or less sw_entry_point_layer | 854 | * 5 or less sw_entry_point_layer |
855 | */ | 855 | */ |
856 | /* calculate the vsi layer based on number of layers. */ | 856 | /* calculate the VSI layer based on number of layers. */ |
857 | if (hw->num_tx_sched_layers > ICE_VSI_LAYER_OFFSET + 1) { | 857 | if (hw->num_tx_sched_layers > ICE_VSI_LAYER_OFFSET + 1) { |
858 | u8 layer = hw->num_tx_sched_layers - ICE_VSI_LAYER_OFFSET; | 858 | u8 layer = hw->num_tx_sched_layers - ICE_VSI_LAYER_OFFSET; |
859 | 859 | ||
@@ -971,7 +971,7 @@ enum ice_status ice_sched_init_port(struct ice_port_info *pi) | |||
971 | goto err_init_port; | 971 | goto err_init_port; |
972 | } | 972 | } |
973 | 973 | ||
974 | /* If the last node is a leaf node then the index of the Q group | 974 | /* If the last node is a leaf node then the index of the queue group |
975 | * layer is two less than the number of elements. | 975 | * layer is two less than the number of elements. |
976 | */ | 976 | */ |
977 | if (num_elems > 2 && buf[0].generic[num_elems - 1].data.elem_type == | 977 | if (num_elems > 2 && buf[0].generic[num_elems - 1].data.elem_type == |
@@ -1080,7 +1080,7 @@ sched_query_out: | |||
1080 | 1080 | ||
1081 | /** | 1081 | /** |
1082 | * ice_sched_find_node_in_subtree - Find node in part of base node subtree | 1082 | * ice_sched_find_node_in_subtree - Find node in part of base node subtree |
1083 | * @hw: pointer to the hw struct | 1083 | * @hw: pointer to the HW struct |
1084 | * @base: pointer to the base node | 1084 | * @base: pointer to the base node |
1085 | * @node: pointer to the node to search | 1085 | * @node: pointer to the node to search |
1086 | * | 1086 | * |
@@ -1112,13 +1112,13 @@ ice_sched_find_node_in_subtree(struct ice_hw *hw, struct ice_sched_node *base, | |||
1112 | } | 1112 | } |
1113 | 1113 | ||
1114 | /** | 1114 | /** |
1115 | * ice_sched_get_free_qparent - Get a free lan or rdma q group node | 1115 | * ice_sched_get_free_qparent - Get a free LAN or RDMA queue group node |
1116 | * @pi: port information structure | 1116 | * @pi: port information structure |
1117 | * @vsi_handle: software VSI handle | 1117 | * @vsi_handle: software VSI handle |
1118 | * @tc: branch number | 1118 | * @tc: branch number |
1119 | * @owner: lan or rdma | 1119 | * @owner: LAN or RDMA |
1120 | * | 1120 | * |
1121 | * This function retrieves a free lan or rdma q group node | 1121 | * This function retrieves a free LAN or RDMA queue group node |
1122 | */ | 1122 | */ |
1123 | struct ice_sched_node * | 1123 | struct ice_sched_node * |
1124 | ice_sched_get_free_qparent(struct ice_port_info *pi, u16 vsi_handle, u8 tc, | 1124 | ice_sched_get_free_qparent(struct ice_port_info *pi, u16 vsi_handle, u8 tc, |
@@ -1136,11 +1136,11 @@ ice_sched_get_free_qparent(struct ice_port_info *pi, u16 vsi_handle, u8 tc, | |||
1136 | if (!vsi_ctx) | 1136 | if (!vsi_ctx) |
1137 | return NULL; | 1137 | return NULL; |
1138 | vsi_node = vsi_ctx->sched.vsi_node[tc]; | 1138 | vsi_node = vsi_ctx->sched.vsi_node[tc]; |
1139 | /* validate invalid VSI id */ | 1139 | /* validate invalid VSI ID */ |
1140 | if (!vsi_node) | 1140 | if (!vsi_node) |
1141 | goto lan_q_exit; | 1141 | goto lan_q_exit; |
1142 | 1142 | ||
1143 | /* get the first q group node from VSI sub-tree */ | 1143 | /* get the first queue group node from VSI sub-tree */ |
1144 | qgrp_node = ice_sched_get_first_node(pi->hw, vsi_node, qgrp_layer); | 1144 | qgrp_node = ice_sched_get_first_node(pi->hw, vsi_node, qgrp_layer); |
1145 | while (qgrp_node) { | 1145 | while (qgrp_node) { |
1146 | /* make sure the qgroup node is part of the VSI subtree */ | 1146 | /* make sure the qgroup node is part of the VSI subtree */ |
@@ -1156,12 +1156,12 @@ lan_q_exit: | |||
1156 | } | 1156 | } |
1157 | 1157 | ||
1158 | /** | 1158 | /** |
1159 | * ice_sched_get_vsi_node - Get a VSI node based on VSI id | 1159 | * ice_sched_get_vsi_node - Get a VSI node based on VSI ID |
1160 | * @hw: pointer to the hw struct | 1160 | * @hw: pointer to the HW struct |
1161 | * @tc_node: pointer to the TC node | 1161 | * @tc_node: pointer to the TC node |
1162 | * @vsi_handle: software VSI handle | 1162 | * @vsi_handle: software VSI handle |
1163 | * | 1163 | * |
1164 | * This function retrieves a VSI node for a given VSI id from a given | 1164 | * This function retrieves a VSI node for a given VSI ID from a given |
1165 | * TC branch | 1165 | * TC branch |
1166 | */ | 1166 | */ |
1167 | static struct ice_sched_node * | 1167 | static struct ice_sched_node * |
@@ -1186,7 +1186,7 @@ ice_sched_get_vsi_node(struct ice_hw *hw, struct ice_sched_node *tc_node, | |||
1186 | 1186 | ||
1187 | /** | 1187 | /** |
1188 | * ice_sched_calc_vsi_child_nodes - calculate number of VSI child nodes | 1188 | * ice_sched_calc_vsi_child_nodes - calculate number of VSI child nodes |
1189 | * @hw: pointer to the hw struct | 1189 | * @hw: pointer to the HW struct |
1190 | * @num_qs: number of queues | 1190 | * @num_qs: number of queues |
1191 | * @num_nodes: num nodes array | 1191 | * @num_nodes: num nodes array |
1192 | * | 1192 | * |
@@ -1202,7 +1202,7 @@ ice_sched_calc_vsi_child_nodes(struct ice_hw *hw, u16 num_qs, u16 *num_nodes) | |||
1202 | qgl = ice_sched_get_qgrp_layer(hw); | 1202 | qgl = ice_sched_get_qgrp_layer(hw); |
1203 | vsil = ice_sched_get_vsi_layer(hw); | 1203 | vsil = ice_sched_get_vsi_layer(hw); |
1204 | 1204 | ||
1205 | /* calculate num nodes from q group to VSI layer */ | 1205 | /* calculate num nodes from queue group to VSI layer */ |
1206 | for (i = qgl; i > vsil; i--) { | 1206 | for (i = qgl; i > vsil; i--) { |
1207 | /* round to the next integer if there is a remainder */ | 1207 | /* round to the next integer if there is a remainder */ |
1208 | num = DIV_ROUND_UP(num, hw->max_children[i]); | 1208 | num = DIV_ROUND_UP(num, hw->max_children[i]); |
@@ -1218,10 +1218,10 @@ ice_sched_calc_vsi_child_nodes(struct ice_hw *hw, u16 num_qs, u16 *num_nodes) | |||
1218 | * @vsi_handle: software VSI handle | 1218 | * @vsi_handle: software VSI handle |
1219 | * @tc_node: pointer to the TC node | 1219 | * @tc_node: pointer to the TC node |
1220 | * @num_nodes: pointer to the num nodes that needs to be added per layer | 1220 | * @num_nodes: pointer to the num nodes that needs to be added per layer |
1221 | * @owner: node owner (lan or rdma) | 1221 | * @owner: node owner (LAN or RDMA) |
1222 | * | 1222 | * |
1223 | * This function adds the VSI child nodes to tree. It gets called for | 1223 | * This function adds the VSI child nodes to tree. It gets called for |
1224 | * lan and rdma separately. | 1224 | * LAN and RDMA separately. |
1225 | */ | 1225 | */ |
1226 | static enum ice_status | 1226 | static enum ice_status |
1227 | ice_sched_add_vsi_child_nodes(struct ice_port_info *pi, u16 vsi_handle, | 1227 | ice_sched_add_vsi_child_nodes(struct ice_port_info *pi, u16 vsi_handle, |
@@ -1270,7 +1270,7 @@ ice_sched_add_vsi_child_nodes(struct ice_port_info *pi, u16 vsi_handle, | |||
1270 | 1270 | ||
1271 | /** | 1271 | /** |
1272 | * ice_sched_calc_vsi_support_nodes - calculate number of VSI support nodes | 1272 | * ice_sched_calc_vsi_support_nodes - calculate number of VSI support nodes |
1273 | * @hw: pointer to the hw struct | 1273 | * @hw: pointer to the HW struct |
1274 | * @tc_node: pointer to TC node | 1274 | * @tc_node: pointer to TC node |
1275 | * @num_nodes: pointer to num nodes array | 1275 | * @num_nodes: pointer to num nodes array |
1276 | * | 1276 | * |
@@ -1389,7 +1389,7 @@ ice_sched_add_vsi_to_topo(struct ice_port_info *pi, u16 vsi_handle, u8 tc) | |||
1389 | /* calculate number of supported nodes needed for this VSI */ | 1389 | /* calculate number of supported nodes needed for this VSI */ |
1390 | ice_sched_calc_vsi_support_nodes(hw, tc_node, num_nodes); | 1390 | ice_sched_calc_vsi_support_nodes(hw, tc_node, num_nodes); |
1391 | 1391 | ||
1392 | /* add vsi supported nodes to tc subtree */ | 1392 | /* add VSI supported nodes to TC subtree */ |
1393 | return ice_sched_add_vsi_support_nodes(pi, vsi_handle, tc_node, | 1393 | return ice_sched_add_vsi_support_nodes(pi, vsi_handle, tc_node, |
1394 | num_nodes); | 1394 | num_nodes); |
1395 | } | 1395 | } |
@@ -1460,7 +1460,7 @@ ice_sched_update_vsi_child_nodes(struct ice_port_info *pi, u16 vsi_handle, | |||
1460 | * @vsi_handle: software VSI handle | 1460 | * @vsi_handle: software VSI handle |
1461 | * @tc: TC number | 1461 | * @tc: TC number |
1462 | * @maxqs: max number of queues | 1462 | * @maxqs: max number of queues |
1463 | * @owner: lan or rdma | 1463 | * @owner: LAN or RDMA |
1464 | * @enable: TC enabled or disabled | 1464 | * @enable: TC enabled or disabled |
1465 | * | 1465 | * |
1466 | * This function adds/updates VSI nodes based on the number of queues. If TC is | 1466 | * This function adds/updates VSI nodes based on the number of queues. If TC is |
@@ -1485,7 +1485,7 @@ ice_sched_cfg_vsi(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u16 maxqs, | |||
1485 | return ICE_ERR_PARAM; | 1485 | return ICE_ERR_PARAM; |
1486 | vsi_node = ice_sched_get_vsi_node(hw, tc_node, vsi_handle); | 1486 | vsi_node = ice_sched_get_vsi_node(hw, tc_node, vsi_handle); |
1487 | 1487 | ||
1488 | /* suspend the VSI if tc is not enabled */ | 1488 | /* suspend the VSI if TC is not enabled */ |
1489 | if (!enable) { | 1489 | if (!enable) { |
1490 | if (vsi_node && vsi_node->in_use) { | 1490 | if (vsi_node && vsi_node->in_use) { |
1491 | u32 teid = le32_to_cpu(vsi_node->info.node_teid); | 1491 | u32 teid = le32_to_cpu(vsi_node->info.node_teid); |
@@ -1536,7 +1536,7 @@ ice_sched_cfg_vsi(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u16 maxqs, | |||
1536 | } | 1536 | } |
1537 | 1537 | ||
1538 | /** | 1538 | /** |
1539 | * ice_sched_rm_agg_vsi_entry - remove agg related VSI info entry | 1539 | * ice_sched_rm_agg_vsi_entry - remove aggregator related VSI info entry |
1540 | * @pi: port information structure | 1540 | * @pi: port information structure |
1541 | * @vsi_handle: software VSI handle | 1541 | * @vsi_handle: software VSI handle |
1542 | * | 1542 | * |
@@ -1641,7 +1641,7 @@ ice_sched_rm_vsi_cfg(struct ice_port_info *pi, u16 vsi_handle, u8 owner) | |||
1641 | ice_free_sched_node(pi, vsi_node); | 1641 | ice_free_sched_node(pi, vsi_node); |
1642 | vsi_ctx->sched.vsi_node[i] = NULL; | 1642 | vsi_ctx->sched.vsi_node[i] = NULL; |
1643 | 1643 | ||
1644 | /* clean up agg related vsi info if any */ | 1644 | /* clean up aggregator related VSI info if any */ |
1645 | ice_sched_rm_agg_vsi_info(pi, vsi_handle); | 1645 | ice_sched_rm_agg_vsi_info(pi, vsi_handle); |
1646 | } | 1646 | } |
1647 | if (owner == ICE_SCHED_NODE_OWNER_LAN) | 1647 | if (owner == ICE_SCHED_NODE_OWNER_LAN) |