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_common.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_common.c')
-rw-r--r-- | drivers/net/ethernet/intel/ice/ice_common.c | 94 |
1 files changed, 47 insertions, 47 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c index aeae0205bec3..3730daf1bc1a 100644 --- a/drivers/net/ethernet/intel/ice/ice_common.c +++ b/drivers/net/ethernet/intel/ice/ice_common.c | |||
@@ -31,7 +31,7 @@ | |||
31 | * @hw: pointer to the HW structure | 31 | * @hw: pointer to the HW structure |
32 | * | 32 | * |
33 | * This function sets the MAC type of the adapter based on the | 33 | * This function sets the MAC type of the adapter based on the |
34 | * vendor ID and device ID stored in the hw structure. | 34 | * vendor ID and device ID stored in the HW structure. |
35 | */ | 35 | */ |
36 | static enum ice_status ice_set_mac_type(struct ice_hw *hw) | 36 | static enum ice_status ice_set_mac_type(struct ice_hw *hw) |
37 | { | 37 | { |
@@ -77,7 +77,7 @@ enum ice_status ice_clear_pf_cfg(struct ice_hw *hw) | |||
77 | 77 | ||
78 | /** | 78 | /** |
79 | * ice_aq_manage_mac_read - manage MAC address read command | 79 | * ice_aq_manage_mac_read - manage MAC address read command |
80 | * @hw: pointer to the hw struct | 80 | * @hw: pointer to the HW struct |
81 | * @buf: a virtual buffer to hold the manage MAC read response | 81 | * @buf: a virtual buffer to hold the manage MAC read response |
82 | * @buf_size: Size of the virtual buffer | 82 | * @buf_size: Size of the virtual buffer |
83 | * @cd: pointer to command details structure or NULL | 83 | * @cd: pointer to command details structure or NULL |
@@ -418,7 +418,7 @@ static void ice_init_flex_flds(struct ice_hw *hw, enum ice_rxdid prof_id) | |||
418 | 418 | ||
419 | /** | 419 | /** |
420 | * ice_init_fltr_mgmt_struct - initializes filter management list and locks | 420 | * ice_init_fltr_mgmt_struct - initializes filter management list and locks |
421 | * @hw: pointer to the hw struct | 421 | * @hw: pointer to the HW struct |
422 | */ | 422 | */ |
423 | static enum ice_status ice_init_fltr_mgmt_struct(struct ice_hw *hw) | 423 | static enum ice_status ice_init_fltr_mgmt_struct(struct ice_hw *hw) |
424 | { | 424 | { |
@@ -438,7 +438,7 @@ static enum ice_status ice_init_fltr_mgmt_struct(struct ice_hw *hw) | |||
438 | 438 | ||
439 | /** | 439 | /** |
440 | * ice_cleanup_fltr_mgmt_struct - cleanup filter management list and locks | 440 | * ice_cleanup_fltr_mgmt_struct - cleanup filter management list and locks |
441 | * @hw: pointer to the hw struct | 441 | * @hw: pointer to the HW struct |
442 | */ | 442 | */ |
443 | static void ice_cleanup_fltr_mgmt_struct(struct ice_hw *hw) | 443 | static void ice_cleanup_fltr_mgmt_struct(struct ice_hw *hw) |
444 | { | 444 | { |
@@ -477,7 +477,7 @@ static void ice_cleanup_fltr_mgmt_struct(struct ice_hw *hw) | |||
477 | 477 | ||
478 | /** | 478 | /** |
479 | * ice_cfg_fw_log - configure FW logging | 479 | * ice_cfg_fw_log - configure FW logging |
480 | * @hw: pointer to the hw struct | 480 | * @hw: pointer to the HW struct |
481 | * @enable: enable certain FW logging events if true, disable all if false | 481 | * @enable: enable certain FW logging events if true, disable all if false |
482 | * | 482 | * |
483 | * This function enables/disables the FW logging via Rx CQ events and a UART | 483 | * This function enables/disables the FW logging via Rx CQ events and a UART |
@@ -626,7 +626,7 @@ out: | |||
626 | 626 | ||
627 | /** | 627 | /** |
628 | * ice_output_fw_log | 628 | * ice_output_fw_log |
629 | * @hw: pointer to the hw struct | 629 | * @hw: pointer to the HW struct |
630 | * @desc: pointer to the AQ message descriptor | 630 | * @desc: pointer to the AQ message descriptor |
631 | * @buf: pointer to the buffer accompanying the AQ message | 631 | * @buf: pointer to the buffer accompanying the AQ message |
632 | * | 632 | * |
@@ -642,7 +642,7 @@ void ice_output_fw_log(struct ice_hw *hw, struct ice_aq_desc *desc, void *buf) | |||
642 | 642 | ||
643 | /** | 643 | /** |
644 | * ice_get_itr_intrl_gran - determine int/intrl granularity | 644 | * ice_get_itr_intrl_gran - determine int/intrl granularity |
645 | * @hw: pointer to the hw struct | 645 | * @hw: pointer to the HW struct |
646 | * | 646 | * |
647 | * Determines the itr/intrl granularities based on the maximum aggregate | 647 | * Determines the itr/intrl granularities based on the maximum aggregate |
648 | * bandwidth according to the device's configuration during power-on. | 648 | * bandwidth according to the device's configuration during power-on. |
@@ -731,7 +731,7 @@ enum ice_status ice_init_hw(struct ice_hw *hw) | |||
731 | goto err_unroll_cqinit; | 731 | goto err_unroll_cqinit; |
732 | } | 732 | } |
733 | 733 | ||
734 | /* set the back pointer to hw */ | 734 | /* set the back pointer to HW */ |
735 | hw->port_info->hw = hw; | 735 | hw->port_info->hw = hw; |
736 | 736 | ||
737 | /* Initialize port_info struct with switch configuration data */ | 737 | /* Initialize port_info struct with switch configuration data */ |
@@ -988,7 +988,7 @@ enum ice_status ice_reset(struct ice_hw *hw, enum ice_reset_req req) | |||
988 | * @ice_rxq_ctx: pointer to the rxq context | 988 | * @ice_rxq_ctx: pointer to the rxq context |
989 | * @rxq_index: the index of the Rx queue | 989 | * @rxq_index: the index of the Rx queue |
990 | * | 990 | * |
991 | * Copies rxq context from dense structure to hw register space | 991 | * Copies rxq context from dense structure to HW register space |
992 | */ | 992 | */ |
993 | static enum ice_status | 993 | static enum ice_status |
994 | ice_copy_rxq_ctx_to_hw(struct ice_hw *hw, u8 *ice_rxq_ctx, u32 rxq_index) | 994 | ice_copy_rxq_ctx_to_hw(struct ice_hw *hw, u8 *ice_rxq_ctx, u32 rxq_index) |
@@ -1001,7 +1001,7 @@ ice_copy_rxq_ctx_to_hw(struct ice_hw *hw, u8 *ice_rxq_ctx, u32 rxq_index) | |||
1001 | if (rxq_index > QRX_CTRL_MAX_INDEX) | 1001 | if (rxq_index > QRX_CTRL_MAX_INDEX) |
1002 | return ICE_ERR_PARAM; | 1002 | return ICE_ERR_PARAM; |
1003 | 1003 | ||
1004 | /* Copy each dword separately to hw */ | 1004 | /* Copy each dword separately to HW */ |
1005 | for (i = 0; i < ICE_RXQ_CTX_SIZE_DWORDS; i++) { | 1005 | for (i = 0; i < ICE_RXQ_CTX_SIZE_DWORDS; i++) { |
1006 | wr32(hw, QRX_CONTEXT(i, rxq_index), | 1006 | wr32(hw, QRX_CONTEXT(i, rxq_index), |
1007 | *((u32 *)(ice_rxq_ctx + (i * sizeof(u32))))); | 1007 | *((u32 *)(ice_rxq_ctx + (i * sizeof(u32))))); |
@@ -1045,7 +1045,7 @@ static const struct ice_ctx_ele ice_rlan_ctx_info[] = { | |||
1045 | * @rxq_index: the index of the Rx queue | 1045 | * @rxq_index: the index of the Rx queue |
1046 | * | 1046 | * |
1047 | * Converts rxq context from sparse to dense structure and then writes | 1047 | * Converts rxq context from sparse to dense structure and then writes |
1048 | * it to hw register space | 1048 | * it to HW register space |
1049 | */ | 1049 | */ |
1050 | enum ice_status | 1050 | enum ice_status |
1051 | ice_write_rxq_ctx(struct ice_hw *hw, struct ice_rlan_ctx *rlan_ctx, | 1051 | ice_write_rxq_ctx(struct ice_hw *hw, struct ice_rlan_ctx *rlan_ctx, |
@@ -1144,7 +1144,7 @@ ice_debug_cq(struct ice_hw *hw, u32 __maybe_unused mask, void *desc, void *buf, | |||
1144 | 1144 | ||
1145 | /** | 1145 | /** |
1146 | * ice_aq_send_cmd - send FW Admin Queue command to FW Admin Queue | 1146 | * ice_aq_send_cmd - send FW Admin Queue command to FW Admin Queue |
1147 | * @hw: pointer to the hw struct | 1147 | * @hw: pointer to the HW struct |
1148 | * @desc: descriptor describing the command | 1148 | * @desc: descriptor describing the command |
1149 | * @buf: buffer to use for indirect commands (NULL for direct commands) | 1149 | * @buf: buffer to use for indirect commands (NULL for direct commands) |
1150 | * @buf_size: size of buffer for indirect commands (0 for direct commands) | 1150 | * @buf_size: size of buffer for indirect commands (0 for direct commands) |
@@ -1161,7 +1161,7 @@ ice_aq_send_cmd(struct ice_hw *hw, struct ice_aq_desc *desc, void *buf, | |||
1161 | 1161 | ||
1162 | /** | 1162 | /** |
1163 | * ice_aq_get_fw_ver | 1163 | * ice_aq_get_fw_ver |
1164 | * @hw: pointer to the hw struct | 1164 | * @hw: pointer to the HW struct |
1165 | * @cd: pointer to command details structure or NULL | 1165 | * @cd: pointer to command details structure or NULL |
1166 | * | 1166 | * |
1167 | * Get the firmware version (0x0001) from the admin queue commands | 1167 | * Get the firmware version (0x0001) from the admin queue commands |
@@ -1195,7 +1195,7 @@ enum ice_status ice_aq_get_fw_ver(struct ice_hw *hw, struct ice_sq_cd *cd) | |||
1195 | 1195 | ||
1196 | /** | 1196 | /** |
1197 | * ice_aq_q_shutdown | 1197 | * ice_aq_q_shutdown |
1198 | * @hw: pointer to the hw struct | 1198 | * @hw: pointer to the HW struct |
1199 | * @unloading: is the driver unloading itself | 1199 | * @unloading: is the driver unloading itself |
1200 | * | 1200 | * |
1201 | * Tell the Firmware that we're shutting down the AdminQ and whether | 1201 | * Tell the Firmware that we're shutting down the AdminQ and whether |
@@ -1218,8 +1218,8 @@ enum ice_status ice_aq_q_shutdown(struct ice_hw *hw, bool unloading) | |||
1218 | 1218 | ||
1219 | /** | 1219 | /** |
1220 | * ice_aq_req_res | 1220 | * ice_aq_req_res |
1221 | * @hw: pointer to the hw struct | 1221 | * @hw: pointer to the HW struct |
1222 | * @res: resource id | 1222 | * @res: resource ID |
1223 | * @access: access type | 1223 | * @access: access type |
1224 | * @sdp_number: resource number | 1224 | * @sdp_number: resource number |
1225 | * @timeout: the maximum time in ms that the driver may hold the resource | 1225 | * @timeout: the maximum time in ms that the driver may hold the resource |
@@ -1304,8 +1304,8 @@ ice_aq_req_res(struct ice_hw *hw, enum ice_aq_res_ids res, | |||
1304 | 1304 | ||
1305 | /** | 1305 | /** |
1306 | * ice_aq_release_res | 1306 | * ice_aq_release_res |
1307 | * @hw: pointer to the hw struct | 1307 | * @hw: pointer to the HW struct |
1308 | * @res: resource id | 1308 | * @res: resource ID |
1309 | * @sdp_number: resource number | 1309 | * @sdp_number: resource number |
1310 | * @cd: pointer to command details structure or NULL | 1310 | * @cd: pointer to command details structure or NULL |
1311 | * | 1311 | * |
@@ -1331,7 +1331,7 @@ ice_aq_release_res(struct ice_hw *hw, enum ice_aq_res_ids res, u8 sdp_number, | |||
1331 | /** | 1331 | /** |
1332 | * ice_acquire_res | 1332 | * ice_acquire_res |
1333 | * @hw: pointer to the HW structure | 1333 | * @hw: pointer to the HW structure |
1334 | * @res: resource id | 1334 | * @res: resource ID |
1335 | * @access: access type (read or write) | 1335 | * @access: access type (read or write) |
1336 | * @timeout: timeout in milliseconds | 1336 | * @timeout: timeout in milliseconds |
1337 | * | 1337 | * |
@@ -1393,7 +1393,7 @@ ice_acquire_res_exit: | |||
1393 | /** | 1393 | /** |
1394 | * ice_release_res | 1394 | * ice_release_res |
1395 | * @hw: pointer to the HW structure | 1395 | * @hw: pointer to the HW structure |
1396 | * @res: resource id | 1396 | * @res: resource ID |
1397 | * | 1397 | * |
1398 | * This function will release a resource using the proper Admin Command. | 1398 | * This function will release a resource using the proper Admin Command. |
1399 | */ | 1399 | */ |
@@ -1405,7 +1405,7 @@ void ice_release_res(struct ice_hw *hw, enum ice_aq_res_ids res) | |||
1405 | status = ice_aq_release_res(hw, res, 0, NULL); | 1405 | status = ice_aq_release_res(hw, res, 0, NULL); |
1406 | 1406 | ||
1407 | /* there are some rare cases when trying to release the resource | 1407 | /* there are some rare cases when trying to release the resource |
1408 | * results in an admin Q timeout, so handle them correctly | 1408 | * results in an admin queue timeout, so handle them correctly |
1409 | */ | 1409 | */ |
1410 | while ((status == ICE_ERR_AQ_TIMEOUT) && | 1410 | while ((status == ICE_ERR_AQ_TIMEOUT) && |
1411 | (total_delay < hw->adminq.sq_cmd_timeout)) { | 1411 | (total_delay < hw->adminq.sq_cmd_timeout)) { |
@@ -1417,7 +1417,7 @@ void ice_release_res(struct ice_hw *hw, enum ice_aq_res_ids res) | |||
1417 | 1417 | ||
1418 | /** | 1418 | /** |
1419 | * ice_get_num_per_func - determine number of resources per PF | 1419 | * ice_get_num_per_func - determine number of resources per PF |
1420 | * @hw: pointer to the hw structure | 1420 | * @hw: pointer to the HW structure |
1421 | * @max: value to be evenly split between each PF | 1421 | * @max: value to be evenly split between each PF |
1422 | * | 1422 | * |
1423 | * Determine the number of valid functions by going through the bitmap returned | 1423 | * Determine the number of valid functions by going through the bitmap returned |
@@ -1440,7 +1440,7 @@ static u32 ice_get_num_per_func(struct ice_hw *hw, u32 max) | |||
1440 | 1440 | ||
1441 | /** | 1441 | /** |
1442 | * ice_parse_caps - parse function/device capabilities | 1442 | * ice_parse_caps - parse function/device capabilities |
1443 | * @hw: pointer to the hw struct | 1443 | * @hw: pointer to the HW struct |
1444 | * @buf: pointer to a buffer containing function/device capability records | 1444 | * @buf: pointer to a buffer containing function/device capability records |
1445 | * @cap_count: number of capability records in the list | 1445 | * @cap_count: number of capability records in the list |
1446 | * @opc: type of capabilities list to parse | 1446 | * @opc: type of capabilities list to parse |
@@ -1582,7 +1582,7 @@ ice_parse_caps(struct ice_hw *hw, void *buf, u32 cap_count, | |||
1582 | 1582 | ||
1583 | /** | 1583 | /** |
1584 | * ice_aq_discover_caps - query function/device capabilities | 1584 | * ice_aq_discover_caps - query function/device capabilities |
1585 | * @hw: pointer to the hw struct | 1585 | * @hw: pointer to the HW struct |
1586 | * @buf: a virtual buffer to hold the capabilities | 1586 | * @buf: a virtual buffer to hold the capabilities |
1587 | * @buf_size: Size of the virtual buffer | 1587 | * @buf_size: Size of the virtual buffer |
1588 | * @cap_count: cap count needed if AQ err==ENOMEM | 1588 | * @cap_count: cap count needed if AQ err==ENOMEM |
@@ -1681,7 +1681,7 @@ enum ice_status ice_get_caps(struct ice_hw *hw) | |||
1681 | 1681 | ||
1682 | /** | 1682 | /** |
1683 | * ice_aq_manage_mac_write - manage MAC address write command | 1683 | * ice_aq_manage_mac_write - manage MAC address write command |
1684 | * @hw: pointer to the hw struct | 1684 | * @hw: pointer to the HW struct |
1685 | * @mac_addr: MAC address to be written as LAA/LAA+WoL/Port address | 1685 | * @mac_addr: MAC address to be written as LAA/LAA+WoL/Port address |
1686 | * @flags: flags to control write behavior | 1686 | * @flags: flags to control write behavior |
1687 | * @cd: pointer to command details structure or NULL | 1687 | * @cd: pointer to command details structure or NULL |
@@ -1709,7 +1709,7 @@ ice_aq_manage_mac_write(struct ice_hw *hw, const u8 *mac_addr, u8 flags, | |||
1709 | 1709 | ||
1710 | /** | 1710 | /** |
1711 | * ice_aq_clear_pxe_mode | 1711 | * ice_aq_clear_pxe_mode |
1712 | * @hw: pointer to the hw struct | 1712 | * @hw: pointer to the HW struct |
1713 | * | 1713 | * |
1714 | * Tell the firmware that the driver is taking over from PXE (0x0110). | 1714 | * Tell the firmware that the driver is taking over from PXE (0x0110). |
1715 | */ | 1715 | */ |
@@ -1725,7 +1725,7 @@ static enum ice_status ice_aq_clear_pxe_mode(struct ice_hw *hw) | |||
1725 | 1725 | ||
1726 | /** | 1726 | /** |
1727 | * ice_clear_pxe_mode - clear pxe operations mode | 1727 | * ice_clear_pxe_mode - clear pxe operations mode |
1728 | * @hw: pointer to the hw struct | 1728 | * @hw: pointer to the HW struct |
1729 | * | 1729 | * |
1730 | * Make sure all PXE mode settings are cleared, including things | 1730 | * Make sure all PXE mode settings are cleared, including things |
1731 | * like descriptor fetch/write-back mode. | 1731 | * like descriptor fetch/write-back mode. |
@@ -1741,10 +1741,10 @@ void ice_clear_pxe_mode(struct ice_hw *hw) | |||
1741 | * @phy_type_low: lower part of phy_type | 1741 | * @phy_type_low: lower part of phy_type |
1742 | * @phy_type_high: higher part of phy_type | 1742 | * @phy_type_high: higher part of phy_type |
1743 | * | 1743 | * |
1744 | * This helper function will convert an entry in phy type structure | 1744 | * This helper function will convert an entry in PHY type structure |
1745 | * [phy_type_low, phy_type_high] to its corresponding link speed. | 1745 | * [phy_type_low, phy_type_high] to its corresponding link speed. |
1746 | * Note: In the structure of [phy_type_low, phy_type_high], there should | 1746 | * Note: In the structure of [phy_type_low, phy_type_high], there should |
1747 | * be one bit set, as this function will convert one phy type to its | 1747 | * be one bit set, as this function will convert one PHY type to its |
1748 | * speed. | 1748 | * speed. |
1749 | * If no bit gets set, ICE_LINK_SPEED_UNKNOWN will be returned | 1749 | * If no bit gets set, ICE_LINK_SPEED_UNKNOWN will be returned |
1750 | * If more than one bit gets set, ICE_LINK_SPEED_UNKNOWN will be returned | 1750 | * If more than one bit gets set, ICE_LINK_SPEED_UNKNOWN will be returned |
@@ -1914,7 +1914,7 @@ ice_update_phy_type(u64 *phy_type_low, u64 *phy_type_high, | |||
1914 | 1914 | ||
1915 | /** | 1915 | /** |
1916 | * ice_aq_set_phy_cfg | 1916 | * ice_aq_set_phy_cfg |
1917 | * @hw: pointer to the hw struct | 1917 | * @hw: pointer to the HW struct |
1918 | * @lport: logical port number | 1918 | * @lport: logical port number |
1919 | * @cfg: structure with PHY configuration data to be set | 1919 | * @cfg: structure with PHY configuration data to be set |
1920 | * @cd: pointer to command details structure or NULL | 1920 | * @cd: pointer to command details structure or NULL |
@@ -2029,7 +2029,7 @@ ice_set_fc(struct ice_port_info *pi, u8 *aq_failures, bool ena_auto_link_update) | |||
2029 | if (!pcaps) | 2029 | if (!pcaps) |
2030 | return ICE_ERR_NO_MEMORY; | 2030 | return ICE_ERR_NO_MEMORY; |
2031 | 2031 | ||
2032 | /* Get the current phy config */ | 2032 | /* Get the current PHY config */ |
2033 | status = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_SW_CFG, pcaps, | 2033 | status = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_SW_CFG, pcaps, |
2034 | NULL); | 2034 | NULL); |
2035 | if (status) { | 2035 | if (status) { |
@@ -2338,7 +2338,7 @@ ice_aq_set_rss_lut(struct ice_hw *hw, u16 vsi_handle, u8 lut_type, | |||
2338 | 2338 | ||
2339 | /** | 2339 | /** |
2340 | * __ice_aq_get_set_rss_key | 2340 | * __ice_aq_get_set_rss_key |
2341 | * @hw: pointer to the hw struct | 2341 | * @hw: pointer to the HW struct |
2342 | * @vsi_id: VSI FW index | 2342 | * @vsi_id: VSI FW index |
2343 | * @key: pointer to key info struct | 2343 | * @key: pointer to key info struct |
2344 | * @set: set true to set the key, false to get the key | 2344 | * @set: set true to set the key, false to get the key |
@@ -2373,7 +2373,7 @@ ice_status __ice_aq_get_set_rss_key(struct ice_hw *hw, u16 vsi_id, | |||
2373 | 2373 | ||
2374 | /** | 2374 | /** |
2375 | * ice_aq_get_rss_key | 2375 | * ice_aq_get_rss_key |
2376 | * @hw: pointer to the hw struct | 2376 | * @hw: pointer to the HW struct |
2377 | * @vsi_handle: software VSI handle | 2377 | * @vsi_handle: software VSI handle |
2378 | * @key: pointer to key info struct | 2378 | * @key: pointer to key info struct |
2379 | * | 2379 | * |
@@ -2392,7 +2392,7 @@ ice_aq_get_rss_key(struct ice_hw *hw, u16 vsi_handle, | |||
2392 | 2392 | ||
2393 | /** | 2393 | /** |
2394 | * ice_aq_set_rss_key | 2394 | * ice_aq_set_rss_key |
2395 | * @hw: pointer to the hw struct | 2395 | * @hw: pointer to the HW struct |
2396 | * @vsi_handle: software VSI handle | 2396 | * @vsi_handle: software VSI handle |
2397 | * @keys: pointer to key info struct | 2397 | * @keys: pointer to key info struct |
2398 | * | 2398 | * |
@@ -2517,7 +2517,7 @@ ice_aq_dis_lan_txq(struct ice_hw *hw, u8 num_qgrps, | |||
2517 | break; | 2517 | break; |
2518 | case ICE_VF_RESET: | 2518 | case ICE_VF_RESET: |
2519 | cmd->cmd_type = ICE_AQC_Q_DIS_CMD_VF_RESET; | 2519 | cmd->cmd_type = ICE_AQC_Q_DIS_CMD_VF_RESET; |
2520 | /* In this case, FW expects vmvf_num to be absolute VF id */ | 2520 | /* In this case, FW expects vmvf_num to be absolute VF ID */ |
2521 | cmd->vmvf_and_timeout |= | 2521 | cmd->vmvf_and_timeout |= |
2522 | cpu_to_le16((vmvf_num + hw->func_caps.vf_base_id) & | 2522 | cpu_to_le16((vmvf_num + hw->func_caps.vf_base_id) & |
2523 | ICE_AQC_Q_DIS_VMVF_NUM_M); | 2523 | ICE_AQC_Q_DIS_VMVF_NUM_M); |
@@ -2794,13 +2794,13 @@ ice_set_ctx(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info) | |||
2794 | * ice_ena_vsi_txq | 2794 | * ice_ena_vsi_txq |
2795 | * @pi: port information structure | 2795 | * @pi: port information structure |
2796 | * @vsi_handle: software VSI handle | 2796 | * @vsi_handle: software VSI handle |
2797 | * @tc: tc number | 2797 | * @tc: TC number |
2798 | * @num_qgrps: Number of added queue groups | 2798 | * @num_qgrps: Number of added queue groups |
2799 | * @buf: list of queue groups to be added | 2799 | * @buf: list of queue groups to be added |
2800 | * @buf_size: size of buffer for indirect command | 2800 | * @buf_size: size of buffer for indirect command |
2801 | * @cd: pointer to command details structure or NULL | 2801 | * @cd: pointer to command details structure or NULL |
2802 | * | 2802 | * |
2803 | * This function adds one lan q | 2803 | * This function adds one LAN queue |
2804 | */ | 2804 | */ |
2805 | enum ice_status | 2805 | enum ice_status |
2806 | ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps, | 2806 | ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps, |
@@ -2844,11 +2844,11 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps, | |||
2844 | * Bit 5-6. | 2844 | * Bit 5-6. |
2845 | * - Bit 7 is reserved. | 2845 | * - Bit 7 is reserved. |
2846 | * Without setting the generic section as valid in valid_sections, the | 2846 | * Without setting the generic section as valid in valid_sections, the |
2847 | * Admin Q command will fail with error code ICE_AQ_RC_EINVAL. | 2847 | * Admin queue command will fail with error code ICE_AQ_RC_EINVAL. |
2848 | */ | 2848 | */ |
2849 | buf->txqs[0].info.valid_sections = ICE_AQC_ELEM_VALID_GENERIC; | 2849 | buf->txqs[0].info.valid_sections = ICE_AQC_ELEM_VALID_GENERIC; |
2850 | 2850 | ||
2851 | /* add the lan q */ | 2851 | /* add the LAN queue */ |
2852 | status = ice_aq_add_lan_txq(hw, num_qgrps, buf, buf_size, cd); | 2852 | status = ice_aq_add_lan_txq(hw, num_qgrps, buf, buf_size, cd); |
2853 | if (status) { | 2853 | if (status) { |
2854 | ice_debug(hw, ICE_DBG_SCHED, "enable Q %d failed %d\n", | 2854 | ice_debug(hw, ICE_DBG_SCHED, "enable Q %d failed %d\n", |
@@ -2860,7 +2860,7 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps, | |||
2860 | node.node_teid = buf->txqs[0].q_teid; | 2860 | node.node_teid = buf->txqs[0].q_teid; |
2861 | node.data.elem_type = ICE_AQC_ELEM_TYPE_LEAF; | 2861 | node.data.elem_type = ICE_AQC_ELEM_TYPE_LEAF; |
2862 | 2862 | ||
2863 | /* add a leaf node into schduler tree q layer */ | 2863 | /* add a leaf node into schduler tree queue layer */ |
2864 | status = ice_sched_add_node(pi, hw->num_tx_sched_layers - 1, &node); | 2864 | status = ice_sched_add_node(pi, hw->num_tx_sched_layers - 1, &node); |
2865 | 2865 | ||
2866 | ena_txq_exit: | 2866 | ena_txq_exit: |
@@ -2930,7 +2930,7 @@ ice_dis_vsi_txq(struct ice_port_info *pi, u8 num_queues, u16 *q_ids, | |||
2930 | * @vsi_handle: software VSI handle | 2930 | * @vsi_handle: software VSI handle |
2931 | * @tc_bitmap: TC bitmap | 2931 | * @tc_bitmap: TC bitmap |
2932 | * @maxqs: max queues array per TC | 2932 | * @maxqs: max queues array per TC |
2933 | * @owner: lan or rdma | 2933 | * @owner: LAN or RDMA |
2934 | * | 2934 | * |
2935 | * This function adds/updates the VSI queues per TC. | 2935 | * This function adds/updates the VSI queues per TC. |
2936 | */ | 2936 | */ |
@@ -2965,13 +2965,13 @@ ice_cfg_vsi_qs(struct ice_port_info *pi, u16 vsi_handle, u8 tc_bitmap, | |||
2965 | } | 2965 | } |
2966 | 2966 | ||
2967 | /** | 2967 | /** |
2968 | * ice_cfg_vsi_lan - configure VSI lan queues | 2968 | * ice_cfg_vsi_lan - configure VSI LAN queues |
2969 | * @pi: port information structure | 2969 | * @pi: port information structure |
2970 | * @vsi_handle: software VSI handle | 2970 | * @vsi_handle: software VSI handle |
2971 | * @tc_bitmap: TC bitmap | 2971 | * @tc_bitmap: TC bitmap |
2972 | * @max_lanqs: max lan queues array per TC | 2972 | * @max_lanqs: max LAN queues array per TC |
2973 | * | 2973 | * |
2974 | * This function adds/updates the VSI lan queues per TC. | 2974 | * This function adds/updates the VSI LAN queues per TC. |
2975 | */ | 2975 | */ |
2976 | enum ice_status | 2976 | enum ice_status |
2977 | ice_cfg_vsi_lan(struct ice_port_info *pi, u16 vsi_handle, u8 tc_bitmap, | 2977 | ice_cfg_vsi_lan(struct ice_port_info *pi, u16 vsi_handle, u8 tc_bitmap, |
@@ -2983,7 +2983,7 @@ ice_cfg_vsi_lan(struct ice_port_info *pi, u16 vsi_handle, u8 tc_bitmap, | |||
2983 | 2983 | ||
2984 | /** | 2984 | /** |
2985 | * ice_replay_pre_init - replay pre initialization | 2985 | * ice_replay_pre_init - replay pre initialization |
2986 | * @hw: pointer to the hw struct | 2986 | * @hw: pointer to the HW struct |
2987 | * | 2987 | * |
2988 | * Initializes required config data for VSI, FD, ACL, and RSS before replay. | 2988 | * Initializes required config data for VSI, FD, ACL, and RSS before replay. |
2989 | */ | 2989 | */ |
@@ -3007,7 +3007,7 @@ static enum ice_status ice_replay_pre_init(struct ice_hw *hw) | |||
3007 | 3007 | ||
3008 | /** | 3008 | /** |
3009 | * ice_replay_vsi - replay VSI configuration | 3009 | * ice_replay_vsi - replay VSI configuration |
3010 | * @hw: pointer to the hw struct | 3010 | * @hw: pointer to the HW struct |
3011 | * @vsi_handle: driver VSI handle | 3011 | * @vsi_handle: driver VSI handle |
3012 | * | 3012 | * |
3013 | * Restore all VSI configuration after reset. It is required to call this | 3013 | * Restore all VSI configuration after reset. It is required to call this |
@@ -3034,7 +3034,7 @@ enum ice_status ice_replay_vsi(struct ice_hw *hw, u16 vsi_handle) | |||
3034 | 3034 | ||
3035 | /** | 3035 | /** |
3036 | * ice_replay_post - post replay configuration cleanup | 3036 | * ice_replay_post - post replay configuration cleanup |
3037 | * @hw: pointer to the hw struct | 3037 | * @hw: pointer to the HW struct |
3038 | * | 3038 | * |
3039 | * Post replay cleanup. | 3039 | * Post replay cleanup. |
3040 | */ | 3040 | */ |