drivers/net/ethernet/intel/i40e/i40e_adminq.c | 68 -
drivers/net/ethernet/intel/i40e/i40e_alloc.h | 22
drivers/net/ethernet/intel/i40e/i40e_client.c | 4
- drivers/net/ethernet/intel/i40e/i40e_common.c | 890 ++++++++++-----------
+ drivers/net/ethernet/intel/i40e/i40e_common.c | 886 ++++++++++-----------
drivers/net/ethernet/intel/i40e/i40e_dcb.c | 60 -
drivers/net/ethernet/intel/i40e/i40e_dcb.h | 28
drivers/net/ethernet/intel/i40e/i40e_ddp.c | 14
drivers/net/ethernet/intel/i40e/i40e_main.c | 97 +-
drivers/net/ethernet/intel/i40e/i40e_nvm.c | 248 ++---
drivers/net/ethernet/intel/i40e/i40e_osdep.h | 1
- drivers/net/ethernet/intel/i40e/i40e_prototype.h | 644 +++++++--------
+ drivers/net/ethernet/intel/i40e/i40e_prototype.h | 580 ++++++-------
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 66 -
- 21 files changed, 1220 insertions(+), 1202 deletions(-)
+ 21 files changed, 1179 insertions(+), 1175 deletions(-)
--- a/drivers/net/ethernet/intel/i40e/i40e.h
+++ b/drivers/net/ethernet/intel/i40e/i40e.h
-@@ -1287,9 +1287,9 @@ void i40e_ptp_stop(struct i40e_pf *pf);
+@@ -1286,9 +1286,9 @@ void i40e_ptp_stop(struct i40e_pf *pf);
int i40e_ptp_alloc_pins(struct i40e_pf *pf);
int i40e_update_adq_vsi_queues(struct i40e_vsi *vsi, int vsi_offset);
int i40e_is_vsi_uplink_mode_veb(struct i40e_vsi *vsi);
i40e_fill_default_direct_cmd_desc(&desc,
i40e_aqc_opc_set_phy_int_mask);
-@@ -1690,8 +1692,8 @@ i40e_status i40e_aq_set_phy_int_mask(str
- *
- * Enable/disable loopback on a given port
- */
--i40e_status i40e_aq_set_mac_loopback(struct i40e_hw *hw, bool ena_lpbk,
-- struct i40e_asq_cmd_details *cmd_details)
-+int i40e_aq_set_mac_loopback(struct i40e_hw *hw, bool ena_lpbk,
-+ struct i40e_asq_cmd_details *cmd_details)
- {
- struct i40e_aq_desc desc;
- struct i40e_aqc_set_lb_mode *cmd =
-@@ -1716,13 +1718,13 @@ i40e_status i40e_aq_set_mac_loopback(str
+@@ -1690,13 +1692,13 @@ i40e_status i40e_aq_set_phy_int_mask(str
*
* Reset the external PHY.
**/
i40e_fill_default_direct_cmd_desc(&desc,
i40e_aqc_opc_set_phy_debug);
-@@ -1757,9 +1759,9 @@ static bool i40e_is_aq_api_ver_ge(struct
+@@ -1731,9 +1733,9 @@ static bool i40e_is_aq_api_ver_ge(struct
*
* Add a VSI context to the hardware.
**/
{
struct i40e_aq_desc desc;
struct i40e_aqc_add_get_update_vsi *cmd =
-@@ -1767,7 +1769,7 @@ i40e_status i40e_aq_add_vsi(struct i40e_
+@@ -1741,7 +1743,7 @@ i40e_status i40e_aq_add_vsi(struct i40e_
struct i40e_aqc_add_get_update_vsi_completion *resp =
(struct i40e_aqc_add_get_update_vsi_completion *)
&desc.params.raw;
i40e_fill_default_direct_cmd_desc(&desc,
i40e_aqc_opc_add_vsi);
-@@ -1801,15 +1803,15 @@ aq_add_vsi_exit:
+@@ -1775,15 +1777,15 @@ aq_add_vsi_exit:
* @seid: vsi number
* @cmd_details: pointer to command details structure or NULL
**/
i40e_fill_default_direct_cmd_desc(&desc,
i40e_aqc_opc_set_vsi_promiscuous_modes);
-@@ -1829,15 +1831,15 @@ i40e_status i40e_aq_set_default_vsi(stru
+@@ -1803,15 +1805,15 @@ i40e_status i40e_aq_set_default_vsi(stru
* @seid: vsi number
* @cmd_details: pointer to command details structure or NULL
**/
i40e_fill_default_direct_cmd_desc(&desc,
i40e_aqc_opc_set_vsi_promiscuous_modes);
-@@ -1859,16 +1861,16 @@ i40e_status i40e_aq_clear_default_vsi(st
+@@ -1833,16 +1835,16 @@ i40e_status i40e_aq_clear_default_vsi(st
* @cmd_details: pointer to command details structure or NULL
* @rx_only_promisc: flag to decide if egress traffic gets mirrored in promisc
**/
i40e_fill_default_direct_cmd_desc(&desc,
i40e_aqc_opc_set_vsi_promiscuous_modes);
-@@ -1899,14 +1901,15 @@ i40e_status i40e_aq_set_vsi_unicast_prom
+@@ -1873,14 +1875,15 @@ i40e_status i40e_aq_set_vsi_unicast_prom
* @set: set multicast promiscuous enable/disable
* @cmd_details: pointer to command details structure or NULL
**/
i40e_fill_default_direct_cmd_desc(&desc,
i40e_aqc_opc_set_vsi_promiscuous_modes);
-@@ -1932,16 +1935,16 @@ i40e_status i40e_aq_set_vsi_multicast_pr
+@@ -1906,16 +1909,16 @@ i40e_status i40e_aq_set_vsi_multicast_pr
* @vid: The VLAN tag filter - capture any multicast packet with this VLAN tag
* @cmd_details: pointer to command details structure or NULL
**/
i40e_fill_default_direct_cmd_desc(&desc,
i40e_aqc_opc_set_vsi_promiscuous_modes);
-@@ -1968,16 +1971,16 @@ enum i40e_status_code i40e_aq_set_vsi_mc
+@@ -1942,16 +1945,16 @@ enum i40e_status_code i40e_aq_set_vsi_mc
* @vid: The VLAN tag filter - capture any unicast packet with this VLAN tag
* @cmd_details: pointer to command details structure or NULL
**/
i40e_fill_default_direct_cmd_desc(&desc,
i40e_aqc_opc_set_vsi_promiscuous_modes);
-@@ -2010,15 +2013,15 @@ enum i40e_status_code i40e_aq_set_vsi_uc
+@@ -1984,15 +1987,15 @@ enum i40e_status_code i40e_aq_set_vsi_uc
* @vid: The VLAN tag filter - capture any broadcast packet with this VLAN tag
* @cmd_details: pointer to command details structure or NULL
**/
i40e_fill_default_direct_cmd_desc(&desc,
i40e_aqc_opc_set_vsi_promiscuous_modes);
-@@ -2045,14 +2048,14 @@ i40e_status i40e_aq_set_vsi_bc_promisc_o
+@@ -2019,14 +2022,14 @@ i40e_status i40e_aq_set_vsi_bc_promisc_o
*
* Set or clear the broadcast promiscuous flag (filter) for a given VSI.
**/
i40e_fill_default_direct_cmd_desc(&desc,
i40e_aqc_opc_set_vsi_promiscuous_modes);
-@@ -2078,15 +2081,15 @@ i40e_status i40e_aq_set_vsi_broadcast(st
+@@ -2052,15 +2055,15 @@ i40e_status i40e_aq_set_vsi_broadcast(st
* @enable: set MAC L2 layer unicast promiscuous enable/disable for a given VLAN
* @cmd_details: pointer to command details structure or NULL
**/
i40e_fill_default_direct_cmd_desc(&desc,
i40e_aqc_opc_set_vsi_promiscuous_modes);
-@@ -2108,9 +2111,9 @@ i40e_status i40e_aq_set_vsi_vlan_promisc
+@@ -2082,9 +2085,9 @@ i40e_status i40e_aq_set_vsi_vlan_promisc
* @vsi_ctx: pointer to a vsi context struct
* @cmd_details: pointer to command details structure or NULL
**/
{
struct i40e_aq_desc desc;
struct i40e_aqc_add_get_update_vsi *cmd =
-@@ -2118,7 +2121,7 @@ i40e_status i40e_aq_get_vsi_params(struc
+@@ -2092,7 +2095,7 @@ i40e_status i40e_aq_get_vsi_params(struc
struct i40e_aqc_add_get_update_vsi_completion *resp =
(struct i40e_aqc_add_get_update_vsi_completion *)
&desc.params.raw;
i40e_fill_default_direct_cmd_desc(&desc,
i40e_aqc_opc_get_vsi_parameters);
-@@ -2150,9 +2153,9 @@ aq_get_vsi_params_exit:
+@@ -2124,9 +2127,9 @@ aq_get_vsi_params_exit:
*
* Update a VSI context.
**/
{
struct i40e_aq_desc desc;
struct i40e_aqc_add_get_update_vsi *cmd =
-@@ -2160,7 +2163,7 @@ i40e_status i40e_aq_update_vsi_params(st
+@@ -2134,7 +2137,7 @@ i40e_status i40e_aq_update_vsi_params(st
struct i40e_aqc_add_get_update_vsi_completion *resp =
(struct i40e_aqc_add_get_update_vsi_completion *)
&desc.params.raw;
i40e_fill_default_direct_cmd_desc(&desc,
i40e_aqc_opc_update_vsi_parameters);
-@@ -2188,15 +2191,15 @@ i40e_status i40e_aq_update_vsi_params(st
+@@ -2162,15 +2165,15 @@ i40e_status i40e_aq_update_vsi_params(st
*
* Fill the buf with switch configuration returned from AdminQ command
**/
i40e_fill_default_direct_cmd_desc(&desc,
i40e_aqc_opc_get_switch_config);
-@@ -2222,15 +2225,15 @@ i40e_status i40e_aq_get_switch_config(st
+@@ -2196,15 +2199,15 @@ i40e_status i40e_aq_get_switch_config(st
*
* Set switch configuration bits
**/
i40e_fill_default_direct_cmd_desc(&desc,
i40e_aqc_opc_set_switch_config);
-@@ -2259,16 +2262,16 @@ enum i40e_status_code i40e_aq_set_switch
+@@ -2233,16 +2236,16 @@ enum i40e_status_code i40e_aq_set_switch
*
* Get the firmware version from the admin queue commands
**/
i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_get_version);
-@@ -2298,14 +2301,14 @@ i40e_status i40e_aq_get_firmware_version
+@@ -2272,14 +2275,14 @@ i40e_status i40e_aq_get_firmware_version
*
* Send the driver version to the firmware
**/
u16 len;
if (dv == NULL)
-@@ -2340,9 +2343,9 @@ i40e_status i40e_aq_send_driver_version(
+@@ -2314,9 +2317,9 @@ i40e_status i40e_aq_send_driver_version(
*
* Side effect: LinkStatusEvent reporting becomes enabled
**/
if (hw->phy.get_link_info) {
status = i40e_update_link_info(hw);
-@@ -2361,10 +2364,10 @@ i40e_status i40e_get_link_status(struct
+@@ -2335,10 +2338,10 @@ i40e_status i40e_get_link_status(struct
* i40e_update_link_info - update status of the HW network link
* @hw: pointer to the hw struct
**/
status = i40e_aq_get_link_info(hw, true, NULL, NULL);
if (status)
-@@ -2411,19 +2414,19 @@ noinline_for_stack i40e_status i40e_upda
+@@ -2385,19 +2388,19 @@ noinline_for_stack i40e_status i40e_upda
* This asks the FW to add a VEB between the uplink and downlink
* elements. If the uplink SEID is 0, this will be a floating VEB.
**/
/* SEIDs need to either both be set or both be 0 for floating VEB */
if (!!uplink_seid != !!downlink_seid)
-@@ -2469,17 +2472,17 @@ i40e_status i40e_aq_add_veb(struct i40e_
+@@ -2443,17 +2446,17 @@ i40e_status i40e_aq_add_veb(struct i40e_
* This retrieves the parameters for a particular VEB, specified by
* uplink_seid, and returns them to the caller.
**/
if (veb_seid == 0)
return I40E_ERR_PARAM;
-@@ -2563,7 +2566,7 @@ i40e_prepare_add_macvlan(struct i40e_aqc
+@@ -2537,7 +2540,7 @@ i40e_prepare_add_macvlan(struct i40e_aqc
*
* Add MAC/VLAN addresses to the HW filtering
**/
i40e_aq_add_macvlan(struct i40e_hw *hw, u16 seid,
struct i40e_aqc_add_macvlan_element_data *mv_list,
u16 count, struct i40e_asq_cmd_details *cmd_details)
-@@ -2595,7 +2598,7 @@ i40e_aq_add_macvlan(struct i40e_hw *hw,
+@@ -2569,7 +2572,7 @@ i40e_aq_add_macvlan(struct i40e_hw *hw,
* It also calls _v2 versions of asq_send_command functions to
* get the aq_status on the stack.
**/
i40e_aq_add_macvlan_v2(struct i40e_hw *hw, u16 seid,
struct i40e_aqc_add_macvlan_element_data *mv_list,
u16 count, struct i40e_asq_cmd_details *cmd_details,
-@@ -2623,15 +2626,16 @@ i40e_aq_add_macvlan_v2(struct i40e_hw *h
+@@ -2597,15 +2600,16 @@ i40e_aq_add_macvlan_v2(struct i40e_hw *h
*
* Remove MAC/VLAN addresses from the HW filtering
**/
if (count == 0 || !mv_list || !hw)
return I40E_ERR_PARAM;
-@@ -2670,7 +2674,7 @@ i40e_status i40e_aq_remove_macvlan(struc
+@@ -2644,7 +2648,7 @@ i40e_status i40e_aq_remove_macvlan(struc
* It also calls _v2 versions of asq_send_command functions to
* get the aq_status on the stack.
**/
i40e_aq_remove_macvlan_v2(struct i40e_hw *hw, u16 seid,
struct i40e_aqc_remove_macvlan_element_data *mv_list,
u16 count, struct i40e_asq_cmd_details *cmd_details,
-@@ -2718,19 +2722,19 @@ i40e_aq_remove_macvlan_v2(struct i40e_hw
+@@ -2692,19 +2696,19 @@ i40e_aq_remove_macvlan_v2(struct i40e_hw
* Add/Delete a mirror rule to a specific switch. Mirror rules are supported for
* VEBs/VEPA elements only
**/
buf_size = count * sizeof(*mr_list);
-@@ -2778,10 +2782,11 @@ static i40e_status i40e_mirrorrule_op(st
+@@ -2752,10 +2756,11 @@ static i40e_status i40e_mirrorrule_op(st
*
* Add mirror rule. Mirror rules are supported for VEBs or VEPA elements only
**/
{
if (!(rule_type == I40E_AQC_MIRROR_RULE_TYPE_ALL_INGRESS ||
rule_type == I40E_AQC_MIRROR_RULE_TYPE_ALL_EGRESS)) {
-@@ -2809,10 +2814,11 @@ i40e_status i40e_aq_add_mirrorrule(struc
+@@ -2783,10 +2788,11 @@ i40e_status i40e_aq_add_mirrorrule(struc
*
* Delete a mirror rule. Mirror rules are supported for VEBs/VEPA elements only
**/
{
/* Rule ID has to be valid except rule_type: INGRESS VLAN mirroring */
if (rule_type == I40E_AQC_MIRROR_RULE_TYPE_VLAN) {
-@@ -2841,14 +2847,14 @@ i40e_status i40e_aq_delete_mirrorrule(st
+@@ -2815,14 +2821,14 @@ i40e_status i40e_aq_delete_mirrorrule(st
*
* send msg to vf
**/
i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_send_msg_to_vf);
cmd->id = cpu_to_le32(vfid);
-@@ -2876,14 +2882,14 @@ i40e_status i40e_aq_send_msg_to_vf(struc
+@@ -2850,14 +2856,14 @@ i40e_status i40e_aq_send_msg_to_vf(struc
*
* Read the register using the admin queue commands
**/
if (reg_val == NULL)
return I40E_ERR_PARAM;
-@@ -2911,14 +2917,14 @@ i40e_status i40e_aq_debug_read_register(
+@@ -2885,14 +2891,14 @@ i40e_status i40e_aq_debug_read_register(
*
* Write to a register using the admin queue commands
**/
i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_debug_write_reg);
-@@ -2942,16 +2948,16 @@ i40e_status i40e_aq_debug_write_register
+@@ -2916,16 +2922,16 @@ i40e_status i40e_aq_debug_write_register
*
* requests common resource using the admin queue commands
**/
i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_request_resource);
-@@ -2981,15 +2987,15 @@ i40e_status i40e_aq_request_resource(str
+@@ -2955,15 +2961,15 @@ i40e_status i40e_aq_request_resource(str
*
* release common resource using the admin queue commands
**/
i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_release_resource);
-@@ -3013,15 +3019,15 @@ i40e_status i40e_aq_release_resource(str
+@@ -2987,15 +2993,15 @@ i40e_status i40e_aq_release_resource(str
*
* Read the NVM using the admin queue commands
**/
/* In offset the highest byte must be zeroed. */
if (offset & 0xFF000000) {
-@@ -3059,14 +3065,14 @@ i40e_aq_read_nvm_exit:
+@@ -3033,14 +3039,14 @@ i40e_aq_read_nvm_exit:
*
* Erase the NVM sector using the admin queue commands
**/
/* In offset the highest byte must be zeroed. */
if (offset & 0xFF000000) {
-@@ -3107,8 +3113,8 @@ static void i40e_parse_discover_capabili
+@@ -3081,8 +3087,8 @@ static void i40e_parse_discover_capabili
u32 number, logical_id, phys_id;
struct i40e_hw_capabilities *p;
u16 id, ocp_cfg_word0;
u32 i = 0;
cap = (struct i40e_aqc_list_capabilities_element_resp *) buff;
-@@ -3349,14 +3355,14 @@ static void i40e_parse_discover_capabili
+@@ -3323,14 +3329,14 @@ static void i40e_parse_discover_capabili
*
* Get the device capabilities descriptions from the firmware
**/
cmd = (struct i40e_aqc_list_capabilites *)&desc.params.raw;
-@@ -3398,15 +3404,15 @@ exit:
+@@ -3372,15 +3378,15 @@ exit:
*
* Update the NVM using the admin queue commands
**/
/* In offset the highest byte must be zeroed. */
if (offset & 0xFF000000) {
-@@ -3451,13 +3457,13 @@ i40e_aq_update_nvm_exit:
+@@ -3425,13 +3431,13 @@ i40e_aq_update_nvm_exit:
*
* Rearrange NVM structure, available only for transition FW
**/
cmd = (struct i40e_aqc_nvm_update *)&desc.params.raw;
-@@ -3491,17 +3497,17 @@ i40e_aq_rearrange_nvm_exit:
+@@ -3465,17 +3471,17 @@ i40e_aq_rearrange_nvm_exit:
*
* Requests the complete LLDP MIB (entire packet).
**/
if (buff_size == 0 || !buff)
return I40E_ERR_PARAM;
-@@ -3541,14 +3547,14 @@ i40e_status i40e_aq_get_lldp_mib(struct
+@@ -3515,14 +3521,14 @@ i40e_status i40e_aq_get_lldp_mib(struct
*
* Set the LLDP MIB.
**/
cmd = (struct i40e_aqc_lldp_set_local_mib *)&desc.params.raw;
if (buff_size == 0 || !buff)
-@@ -3580,14 +3586,14 @@ i40e_aq_set_lldp_mib(struct i40e_hw *hw,
+@@ -3554,14 +3560,14 @@ i40e_aq_set_lldp_mib(struct i40e_hw *hw,
* Enable or Disable posting of an event on ARQ when LLDP MIB
* associated with the interface changes
**/
i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_lldp_update_mib);
-@@ -3609,14 +3615,14 @@ i40e_status i40e_aq_cfg_lldp_mib_change_
+@@ -3583,14 +3589,14 @@ i40e_status i40e_aq_cfg_lldp_mib_change_
* Restore LLDP Agent factory settings if @restore set to True. In other case
* only returns factory setting in AQ response.
**/
if (!(hw->flags & I40E_HW_FLAG_FW_LLDP_PERSISTENT)) {
i40e_debug(hw, I40E_DEBUG_ALL,
-@@ -3646,14 +3652,14 @@ i40e_aq_restore_lldp(struct i40e_hw *hw,
+@@ -3620,14 +3626,14 @@ i40e_aq_restore_lldp(struct i40e_hw *hw,
*
* Stop or Shutdown the embedded LLDP Agent
**/
i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_lldp_stop);
-@@ -3681,13 +3687,13 @@ i40e_status i40e_aq_stop_lldp(struct i40
+@@ -3655,13 +3661,13 @@ i40e_status i40e_aq_stop_lldp(struct i40
*
* Start the embedded LLDP Agent on all ports.
**/
i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_lldp_start);
-@@ -3713,14 +3719,14 @@ i40e_status i40e_aq_start_lldp(struct i4
+@@ -3687,14 +3693,14 @@ i40e_status i40e_aq_start_lldp(struct i4
* @dcb_enable: True if DCB configuration needs to be applied
*
**/
if (!(hw->flags & I40E_HW_FLAG_FW_LLDP_STOPPABLE))
return I40E_ERR_DEVICE_NOT_SUPPORTED;
-@@ -3746,12 +3752,12 @@ i40e_aq_set_dcb_parameters(struct i40e_h
+@@ -3720,12 +3726,12 @@ i40e_aq_set_dcb_parameters(struct i40e_h
*
* Get CEE DCBX mode operational configuration from firmware
**/
if (buff_size == 0 || !buff)
return I40E_ERR_PARAM;
-@@ -3777,17 +3783,17 @@ i40e_status i40e_aq_get_cee_dcb_config(s
+@@ -3751,17 +3757,17 @@ i40e_status i40e_aq_get_cee_dcb_config(s
* and this function will call cpu_to_le16 to convert from Host byte order to
* Little Endian order.
**/
i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_add_udp_tunnel);
-@@ -3808,13 +3814,13 @@ i40e_status i40e_aq_add_udp_tunnel(struc
+@@ -3782,13 +3788,13 @@ i40e_status i40e_aq_add_udp_tunnel(struc
* @index: filter index
* @cmd_details: pointer to command details structure or NULL
**/
i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_del_udp_tunnel);
-@@ -3833,13 +3839,13 @@ i40e_status i40e_aq_del_udp_tunnel(struc
+@@ -3807,13 +3813,13 @@ i40e_status i40e_aq_del_udp_tunnel(struc
*
* This deletes a switch element from the switch.
**/
if (seid == 0)
return I40E_ERR_PARAM;
-@@ -3863,11 +3869,11 @@ i40e_status i40e_aq_delete_element(struc
+@@ -3837,11 +3843,11 @@ i40e_status i40e_aq_delete_element(struc
* recomputed and modified. The retval field in the descriptor
* will be set to 0 when RPB is modified.
**/
i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_dcb_updated);
-@@ -3887,15 +3893,15 @@ i40e_status i40e_aq_dcb_updated(struct i
+@@ -3861,15 +3867,15 @@ i40e_status i40e_aq_dcb_updated(struct i
*
* Generic command handler for Tx scheduler AQ commands
**/
bool cmd_param_flag = false;
switch (opcode) {
-@@ -3945,14 +3951,14 @@ static i40e_status i40e_aq_tx_sched_cmd(
+@@ -3919,14 +3925,14 @@ static i40e_status i40e_aq_tx_sched_cmd(
* @max_credit: Max BW limit credits
* @cmd_details: pointer to command details structure or NULL
**/
i40e_fill_default_direct_cmd_desc(&desc,
i40e_aqc_opc_configure_vsi_bw_limit);
-@@ -3973,10 +3979,10 @@ i40e_status i40e_aq_config_vsi_bw_limit(
+@@ -3947,10 +3953,10 @@ i40e_status i40e_aq_config_vsi_bw_limit(
* @bw_data: Buffer holding enabled TCs, relative TC BW limit/credits
* @cmd_details: pointer to command details structure or NULL
**/
{
return i40e_aq_tx_sched_cmd(hw, seid, (void *)bw_data, sizeof(*bw_data),
i40e_aqc_opc_configure_vsi_tc_bw,
-@@ -3991,11 +3997,12 @@ i40e_status i40e_aq_config_vsi_tc_bw(str
+@@ -3965,11 +3971,12 @@ i40e_status i40e_aq_config_vsi_tc_bw(str
* @opcode: Tx scheduler AQ command opcode
* @cmd_details: pointer to command details structure or NULL
**/
{
return i40e_aq_tx_sched_cmd(hw, seid, (void *)ets_data,
sizeof(*ets_data), opcode, cmd_details);
-@@ -4008,7 +4015,8 @@ i40e_status i40e_aq_config_switch_comp_e
+@@ -3982,7 +3989,8 @@ i40e_status i40e_aq_config_switch_comp_e
* @bw_data: Buffer holding enabled TCs, relative/absolute TC BW limit/credits
* @cmd_details: pointer to command details structure or NULL
**/
u16 seid,
struct i40e_aqc_configure_switching_comp_bw_config_data *bw_data,
struct i40e_asq_cmd_details *cmd_details)
-@@ -4025,10 +4033,11 @@ i40e_status i40e_aq_config_switch_comp_b
+@@ -3999,10 +4007,11 @@ i40e_status i40e_aq_config_switch_comp_b
* @bw_data: Buffer to hold VSI BW configuration
* @cmd_details: pointer to command details structure or NULL
**/
{
return i40e_aq_tx_sched_cmd(hw, seid, (void *)bw_data, sizeof(*bw_data),
i40e_aqc_opc_query_vsi_bw_config,
-@@ -4042,10 +4051,11 @@ i40e_status i40e_aq_query_vsi_bw_config(
+@@ -4016,10 +4025,11 @@ i40e_status i40e_aq_query_vsi_bw_config(
* @bw_data: Buffer to hold VSI BW configuration per TC
* @cmd_details: pointer to command details structure or NULL
**/
{
return i40e_aq_tx_sched_cmd(hw, seid, (void *)bw_data, sizeof(*bw_data),
i40e_aqc_opc_query_vsi_ets_sla_config,
-@@ -4059,10 +4069,11 @@ i40e_status i40e_aq_query_vsi_ets_sla_co
+@@ -4033,10 +4043,11 @@ i40e_status i40e_aq_query_vsi_ets_sla_co
* @bw_data: Buffer to hold switching component's per TC BW config
* @cmd_details: pointer to command details structure or NULL
**/
{
return i40e_aq_tx_sched_cmd(hw, seid, (void *)bw_data, sizeof(*bw_data),
i40e_aqc_opc_query_switching_comp_ets_config,
-@@ -4076,10 +4087,11 @@ i40e_status i40e_aq_query_switch_comp_et
+@@ -4050,10 +4061,11 @@ i40e_status i40e_aq_query_switch_comp_et
* @bw_data: Buffer to hold current ETS configuration for the Physical Port
* @cmd_details: pointer to command details structure or NULL
**/
{
return i40e_aq_tx_sched_cmd(hw, seid, (void *)bw_data, sizeof(*bw_data),
i40e_aqc_opc_query_port_ets_config,
-@@ -4093,10 +4105,11 @@ i40e_status i40e_aq_query_port_ets_confi
+@@ -4067,10 +4079,11 @@ i40e_status i40e_aq_query_port_ets_confi
* @bw_data: Buffer to hold switching component's BW configuration
* @cmd_details: pointer to command details structure or NULL
**/
{
return i40e_aq_tx_sched_cmd(hw, seid, (void *)bw_data, sizeof(*bw_data),
i40e_aqc_opc_query_switching_comp_bw_config,
-@@ -4115,8 +4128,9 @@ i40e_status i40e_aq_query_switch_comp_bw
+@@ -4089,8 +4102,9 @@ i40e_status i40e_aq_query_switch_comp_bw
* Returns 0 if the values passed are valid and within
* range else returns an error.
**/
{
u32 fcoe_cntx_size, fcoe_filt_size;
u32 fcoe_fmax;
-@@ -4202,11 +4216,11 @@ static i40e_status i40e_validate_filter_
+@@ -4176,11 +4190,11 @@ static i40e_status i40e_validate_filter_
* for a single PF. It is expected that these settings are programmed
* at the driver initialization time.
**/
u32 val;
if (!settings)
-@@ -4276,11 +4290,11 @@ i40e_status i40e_set_filter_control(stru
+@@ -4250,11 +4264,11 @@ i40e_status i40e_set_filter_control(stru
* In return it will update the total number of perfect filter count in
* the stats member.
**/
{
struct i40e_aq_desc desc;
struct i40e_aqc_add_remove_control_packet_filter *cmd =
-@@ -4289,7 +4303,7 @@ i40e_status i40e_aq_add_rem_control_pack
+@@ -4263,7 +4277,7 @@ i40e_status i40e_aq_add_rem_control_pack
struct i40e_aqc_add_remove_control_packet_filter_completion *resp =
(struct i40e_aqc_add_remove_control_packet_filter_completion *)
&desc.params.raw;
if (vsi_seid == 0)
return I40E_ERR_PARAM;
-@@ -4335,7 +4349,7 @@ void i40e_add_filter_to_drop_tx_flow_con
+@@ -4309,7 +4323,7 @@ void i40e_add_filter_to_drop_tx_flow_con
I40E_AQC_ADD_CONTROL_PACKET_FLAGS_DROP |
I40E_AQC_ADD_CONTROL_PACKET_FLAGS_TX;
u16 ethtype = I40E_FLOW_CONTROL_ETHTYPE;
status = i40e_aq_add_rem_control_packet_filter(hw, NULL, ethtype, flag,
seid, 0, true, NULL,
-@@ -4357,14 +4371,14 @@ void i40e_add_filter_to_drop_tx_flow_con
+@@ -4331,14 +4345,14 @@ void i40e_add_filter_to_drop_tx_flow_con
* is not passed then only register at 'reg_addr0' is read.
*
**/
if (!reg_val0)
return I40E_ERR_PARAM;
-@@ -4393,12 +4407,12 @@ static i40e_status i40e_aq_alternate_rea
+@@ -4367,12 +4381,12 @@ static i40e_status i40e_aq_alternate_rea
*
* Suspend port's Tx traffic
**/
cmd = (struct i40e_aqc_tx_sched_ind *)&desc.params.raw;
i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_suspend_port_tx);
-@@ -4415,11 +4429,11 @@ i40e_status i40e_aq_suspend_port_tx(stru
+@@ -4389,11 +4403,11 @@ i40e_status i40e_aq_suspend_port_tx(stru
*
* Resume port's Tx traffic
**/
i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_resume_port_tx);
-@@ -4489,18 +4503,18 @@ void i40e_set_pci_config_data(struct i40
+@@ -4463,18 +4477,18 @@ void i40e_set_pci_config_data(struct i40
* Dump internal FW/HW data for debug purposes.
*
**/
if (buff_size == 0 || !buff)
return I40E_ERR_PARAM;
-@@ -4541,12 +4555,12 @@ i40e_status i40e_aq_debug_dump(struct i4
+@@ -4515,12 +4529,12 @@ i40e_status i40e_aq_debug_dump(struct i4
*
* Read bw from the alternate ram for the given pf
**/
/* Calculate the address of the min/max bw registers */
max_bw_addr = I40E_ALT_STRUCT_FIRST_PF_OFFSET +
-@@ -4581,13 +4595,14 @@ i40e_status i40e_read_bw_from_alt_ram(st
+@@ -4555,13 +4569,14 @@ i40e_status i40e_read_bw_from_alt_ram(st
*
* Configure partitions guaranteed/max bw
**/
i40e_fill_default_direct_cmd_desc(&desc,
i40e_aqc_opc_configure_partition_bw);
-@@ -4616,11 +4631,11 @@ i40e_status i40e_aq_configure_partition_
+@@ -4590,11 +4605,11 @@ i40e_status i40e_aq_configure_partition_
*
* Reads specified PHY register value
**/
u32 command = 0;
u16 retry = 1000;
-@@ -4661,11 +4676,11 @@ i40e_status i40e_read_phy_register_claus
+@@ -4635,11 +4650,11 @@ i40e_status i40e_read_phy_register_claus
*
* Writes specified PHY register value
**/
u32 command = 0;
u16 retry = 1000;
-@@ -4702,13 +4717,13 @@ i40e_status i40e_write_phy_register_clau
+@@ -4676,13 +4691,13 @@ i40e_status i40e_write_phy_register_clau
*
* Reads specified PHY register value
**/
command = (reg << I40E_GLGEN_MSCA_MDIADD_SHIFT) |
(page << I40E_GLGEN_MSCA_DEVADD_SHIFT) |
-@@ -4776,13 +4791,13 @@ phy_read_end:
+@@ -4750,13 +4765,13 @@ phy_read_end:
*
* Writes value to specified PHY register
**/
command = (reg << I40E_GLGEN_MSCA_MDIADD_SHIFT) |
(page << I40E_GLGEN_MSCA_DEVADD_SHIFT) |
-@@ -4843,10 +4858,10 @@ phy_write_end:
+@@ -4817,10 +4832,10 @@ phy_write_end:
*
* Writes value to specified PHY register
**/
switch (hw->device_id) {
case I40E_DEV_ID_1G_BASE_T_X722:
-@@ -4882,10 +4897,10 @@ i40e_status i40e_write_phy_register(stru
+@@ -4856,10 +4871,10 @@ i40e_status i40e_write_phy_register(stru
*
* Reads specified PHY register value
**/
switch (hw->device_id) {
case I40E_DEV_ID_1G_BASE_T_X722:
-@@ -4934,17 +4949,17 @@ u8 i40e_get_phy_address(struct i40e_hw *
+@@ -4908,17 +4923,17 @@ u8 i40e_get_phy_address(struct i40e_hw *
*
* Blinks PHY link LED
**/
i = rd32(hw, I40E_PFGEN_PORTNUM);
port_num = (u8)(i & I40E_PFGEN_PORTNUM_PORT_NUM_MASK);
-@@ -5006,12 +5021,12 @@ phy_blinking_end:
+@@ -4980,12 +4995,12 @@ phy_blinking_end:
* @led_addr: LED register address
* @reg_val: read register value
**/
u32 i;
*reg_val = 0;
-@@ -5040,12 +5055,12 @@ static enum i40e_status_code i40e_led_ge
+@@ -5014,12 +5029,12 @@ static enum i40e_status_code i40e_led_ge
* @led_addr: LED register address
* @reg_val: register value to write
**/
u32 i;
if (hw->flags & I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE) {
-@@ -5075,17 +5090,17 @@ static enum i40e_status_code i40e_led_se
+@@ -5049,17 +5064,17 @@ static enum i40e_status_code i40e_led_se
* @val: original value of register to use
*
**/
if (hw->flags & I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE) {
status =
-@@ -5130,12 +5145,12 @@ i40e_status i40e_led_get_phy(struct i40e
+@@ -5104,12 +5119,12 @@ i40e_status i40e_led_get_phy(struct i40e
* Set led's on or off when controlled by the PHY
*
**/
status = i40e_led_get_reg(hw, led_addr, &led_reg);
if (status)
-@@ -5179,14 +5194,14 @@ restore_config:
+@@ -5153,14 +5168,14 @@ restore_config:
* Use the firmware to read the Rx control register,
* especially useful if the Rx unit is under heavy pressure
**/
if (!reg_val)
return I40E_ERR_PARAM;
-@@ -5210,8 +5225,8 @@ i40e_status i40e_aq_rx_ctl_read_register
+@@ -5184,8 +5199,8 @@ i40e_status i40e_aq_rx_ctl_read_register
**/
u32 i40e_read_rx_ctl(struct i40e_hw *hw, u32 reg_addr)
{
int retry = 5;
u32 val = 0;
-@@ -5245,14 +5260,14 @@ do_retry:
+@@ -5219,14 +5234,14 @@ do_retry:
* Use the firmware to write to an Rx control register,
* especially useful if the Rx unit is under heavy pressure
**/
i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_rx_ctl_reg_write);
-@@ -5272,8 +5287,8 @@ i40e_status i40e_aq_rx_ctl_write_registe
+@@ -5246,8 +5261,8 @@ i40e_status i40e_aq_rx_ctl_write_registe
**/
void i40e_write_rx_ctl(struct i40e_hw *hw, u32 reg_addr, u32 reg_val)
{
int retry = 5;
use_register = (((hw->aq.api_maj_ver == 1) &&
-@@ -5335,16 +5350,16 @@ static void i40e_mdio_if_number_selectio
+@@ -5309,16 +5324,16 @@ static void i40e_mdio_if_number_selectio
* NOTE: In common cases MDIO I/F number should not be changed, thats why you
* may use simple wrapper i40e_aq_set_phy_register.
**/
i40e_fill_default_direct_cmd_desc(&desc,
i40e_aqc_opc_set_phy_register);
-@@ -5380,16 +5395,16 @@ enum i40e_status_code i40e_aq_set_phy_re
+@@ -5354,16 +5369,16 @@ enum i40e_status_code i40e_aq_set_phy_re
* NOTE: In common cases MDIO I/F number should not be changed, thats why you
* may use simple wrapper i40e_aq_get_phy_register.
**/
i40e_fill_default_direct_cmd_desc(&desc,
i40e_aqc_opc_get_phy_register);
-@@ -5420,18 +5435,17 @@ enum i40e_status_code i40e_aq_get_phy_re
+@@ -5394,18 +5409,17 @@ enum i40e_status_code i40e_aq_get_phy_re
* @error_info: returns error information
* @cmd_details: pointer to command details structure or NULL
**/
i40e_fill_default_direct_cmd_desc(&desc,
i40e_aqc_opc_write_personalization_profile);
-@@ -5464,15 +5478,14 @@ i40e_status_code i40e_aq_write_ddp(struc
+@@ -5438,15 +5452,14 @@ i40e_status_code i40e_aq_write_ddp(struc
* @flags: AdminQ command flags
* @cmd_details: pointer to command details structure or NULL
**/
i40e_fill_default_direct_cmd_desc(&desc,
i40e_aqc_opc_get_personalization_profile_list);
-@@ -5571,14 +5584,13 @@ i40e_find_section_in_profile(u32 section
+@@ -5545,14 +5558,13 @@ i40e_find_section_in_profile(u32 section
* @hw: pointer to the hw struct
* @aq: command buffer containing all data to execute AQ
**/
i40e_fill_default_direct_cmd_desc(&desc, aq->opcode);
desc.flags |= cpu_to_le16(aq->flags);
-@@ -5618,14 +5630,14 @@ i40e_status_code i40e_ddp_exec_aq_sectio
+@@ -5592,14 +5604,14 @@ i40e_status_code i40e_ddp_exec_aq_sectio
*
* Validates supported devices and profile's sections.
*/
u32 dev_cnt;
u32 sec_off;
u32 i;
-@@ -5683,16 +5695,16 @@ i40e_validate_profile(struct i40e_hw *hw
+@@ -5657,16 +5669,16 @@ i40e_validate_profile(struct i40e_hw *hw
*
* Handles the download of a complete package.
*/
u32 sec_off;
u32 i;
-@@ -5746,15 +5758,15 @@ i40e_write_profile(struct i40e_hw *hw, s
+@@ -5720,15 +5732,15 @@ i40e_write_profile(struct i40e_hw *hw, s
*
* Rolls back previously loaded package.
*/
u32 sec_off;
int i;
-@@ -5798,15 +5810,15 @@ i40e_rollback_profile(struct i40e_hw *hw
+@@ -5772,15 +5784,15 @@ i40e_rollback_profile(struct i40e_hw *hw
*
* Register a profile to the list of loaded profiles.
*/
sec = (struct i40e_profile_section_header *)profile_info_sec;
sec->tbl_size = 1;
-@@ -5840,7 +5852,7 @@ i40e_add_pinfo_to_list(struct i40e_hw *h
+@@ -5814,7 +5826,7 @@ i40e_add_pinfo_to_list(struct i40e_hw *h
* of the function.
*
**/
i40e_aq_add_cloud_filters(struct i40e_hw *hw, u16 seid,
struct i40e_aqc_cloud_filters_element_data *filters,
u8 filter_count)
-@@ -5848,8 +5860,8 @@ i40e_aq_add_cloud_filters(struct i40e_hw
+@@ -5822,8 +5834,8 @@ i40e_aq_add_cloud_filters(struct i40e_hw
struct i40e_aq_desc desc;
struct i40e_aqc_add_remove_cloud_filters *cmd =
(struct i40e_aqc_add_remove_cloud_filters *)&desc.params.raw;
i40e_fill_default_direct_cmd_desc(&desc,
i40e_aqc_opc_add_cloud_filters);
-@@ -5877,7 +5889,7 @@ i40e_aq_add_cloud_filters(struct i40e_hw
+@@ -5851,7 +5863,7 @@ i40e_aq_add_cloud_filters(struct i40e_hw
* function.
*
**/
i40e_aq_add_cloud_filters_bb(struct i40e_hw *hw, u16 seid,
struct i40e_aqc_cloud_filters_element_bb *filters,
u8 filter_count)
-@@ -5885,8 +5897,8 @@ i40e_aq_add_cloud_filters_bb(struct i40e
+@@ -5859,8 +5871,8 @@ i40e_aq_add_cloud_filters_bb(struct i40e
struct i40e_aq_desc desc;
struct i40e_aqc_add_remove_cloud_filters *cmd =
(struct i40e_aqc_add_remove_cloud_filters *)&desc.params.raw;
int i;
i40e_fill_default_direct_cmd_desc(&desc,
-@@ -5934,7 +5946,7 @@ i40e_aq_add_cloud_filters_bb(struct i40e
+@@ -5908,7 +5920,7 @@ i40e_aq_add_cloud_filters_bb(struct i40e
* of the function.
*
**/
i40e_aq_rem_cloud_filters(struct i40e_hw *hw, u16 seid,
struct i40e_aqc_cloud_filters_element_data *filters,
u8 filter_count)
-@@ -5942,8 +5954,8 @@ i40e_aq_rem_cloud_filters(struct i40e_hw
+@@ -5916,8 +5928,8 @@ i40e_aq_rem_cloud_filters(struct i40e_hw
struct i40e_aq_desc desc;
struct i40e_aqc_add_remove_cloud_filters *cmd =
(struct i40e_aqc_add_remove_cloud_filters *)&desc.params.raw;
i40e_fill_default_direct_cmd_desc(&desc,
i40e_aqc_opc_remove_cloud_filters);
-@@ -5971,7 +5983,7 @@ i40e_aq_rem_cloud_filters(struct i40e_hw
+@@ -5945,7 +5957,7 @@ i40e_aq_rem_cloud_filters(struct i40e_hw
* function.
*
**/
i40e_aq_rem_cloud_filters_bb(struct i40e_hw *hw, u16 seid,
struct i40e_aqc_cloud_filters_element_bb *filters,
u8 filter_count)
-@@ -5979,8 +5991,8 @@ i40e_aq_rem_cloud_filters_bb(struct i40e
+@@ -5953,8 +5965,8 @@ i40e_aq_rem_cloud_filters_bb(struct i40e
struct i40e_aq_desc desc;
struct i40e_aqc_add_remove_cloud_filters *cmd =
(struct i40e_aqc_add_remove_cloud_filters *)&desc.params.raw;
int err = 0;
__u32 speed;
u8 autoneg;
-@@ -1485,7 +1485,7 @@ static int i40e_set_fec_cfg(struct net_d
+@@ -1483,7 +1483,7 @@ static int i40e_set_fec_cfg(struct net_d
struct i40e_aq_get_phy_abilities_resp abilities;
struct i40e_pf *pf = np->vsi->back;
struct i40e_hw *hw = &pf->hw;
u32 flags = 0;
int err = 0;
-@@ -1547,7 +1547,7 @@ static int i40e_get_fec_param(struct net
+@@ -1545,7 +1545,7 @@ static int i40e_get_fec_param(struct net
struct i40e_aq_get_phy_abilities_resp abilities;
struct i40e_pf *pf = np->vsi->back;
struct i40e_hw *hw = &pf->hw;
int err = 0;
u8 fec_cfg;
-@@ -1634,7 +1634,7 @@ static int i40e_nway_reset(struct net_de
+@@ -1632,7 +1632,7 @@ static int i40e_nway_reset(struct net_de
struct i40e_pf *pf = np->vsi->back;
struct i40e_hw *hw = &pf->hw;
bool link_up = hw->phy.link_info.link_info & I40E_AQ_LINK_UP;
ret = i40e_aq_set_link_restart_an(hw, link_up, NULL);
if (ret) {
-@@ -1699,9 +1699,9 @@ static int i40e_set_pauseparam(struct ne
+@@ -1697,9 +1697,9 @@ static int i40e_set_pauseparam(struct ne
struct i40e_link_status *hw_link_info = &hw->phy.link_info;
struct i40e_dcbx_config *dcbx_cfg = &hw->local_dcbx_config;
bool link_up = hw_link_info->link_info & I40E_AQ_LINK_UP;
u32 is_an;
/* Changing the port's flow control is not supported if this isn't the
-@@ -2583,8 +2583,8 @@ static u64 i40e_link_test(struct net_dev
+@@ -2581,8 +2581,8 @@ static u64 i40e_link_test(struct net_dev
{
struct i40e_netdev_priv *np = netdev_priv(netdev);
struct i40e_pf *pf = np->vsi->back;
netif_info(pf, hw, netdev, "link test\n");
status = i40e_get_link_status(&pf->hw, &link_up);
-@@ -2807,11 +2807,11 @@ static int i40e_set_phys_id(struct net_d
+@@ -2805,11 +2805,11 @@ static int i40e_set_phys_id(struct net_d
enum ethtool_phys_id_state state)
{
struct i40e_netdev_priv *np = netdev_priv(netdev);
switch (state) {
case ETHTOOL_ID_ACTIVE:
-@@ -5247,7 +5247,7 @@ static int i40e_set_priv_flags(struct ne
+@@ -5245,7 +5245,7 @@ static int i40e_set_priv_flags(struct ne
struct i40e_vsi *vsi = np->vsi;
struct i40e_pf *pf = vsi->back;
u32 reset_needed = 0;
u32 i, j;
orig_flags = READ_ONCE(pf->flags);
-@@ -5476,8 +5476,8 @@ static int i40e_get_module_info(struct n
+@@ -5474,8 +5474,8 @@ static int i40e_get_module_info(struct n
u32 sff8472_comp = 0;
u32 sff8472_swap = 0;
u32 sff8636_rev = 0;
/* Check if firmware supports reading module EEPROM. */
if (!(hw->flags & I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE)) {
-@@ -5581,8 +5581,8 @@ static int i40e_get_module_eeprom(struct
+@@ -5579,8 +5579,8 @@ static int i40e_get_module_eeprom(struct
struct i40e_pf *pf = vsi->back;
struct i40e_hw *hw = &pf->hw;
bool is_sfp = false;
int i;
if (!ee || !ee->len || !data)
-@@ -5623,10 +5623,10 @@ static int i40e_get_eee(struct net_devic
+@@ -5621,10 +5621,10 @@ static int i40e_get_eee(struct net_devic
{
struct i40e_netdev_priv *np = netdev_priv(netdev);
struct i40e_aq_get_phy_abilities_resp phy_cfg;
/* Get initial PHY capabilities */
status = i40e_aq_get_phy_capabilities(hw, false, true, &phy_cfg, NULL);
-@@ -5688,11 +5688,11 @@ static int i40e_set_eee(struct net_devic
+@@ -5686,11 +5686,11 @@ static int i40e_set_eee(struct net_devic
{
struct i40e_netdev_priv *np = netdev_priv(netdev);
struct i40e_aq_get_phy_abilities_resp abilities;
bool ok;
int ret;
-@@ -5525,8 +5525,8 @@ static int i40e_vsi_get_bw_info(struct i
+@@ -5524,8 +5524,8 @@ static int i40e_vsi_get_bw_info(struct i
struct i40e_aqc_query_vsi_bw_config_resp bw_config = {0};
struct i40e_pf *pf = vsi->back;
struct i40e_hw *hw = &pf->hw;
int i;
/* Get the VSI level BW configuration */
-@@ -5586,7 +5586,7 @@ static int i40e_vsi_configure_bw_alloc(s
+@@ -5585,7 +5585,7 @@ static int i40e_vsi_configure_bw_alloc(s
{
struct i40e_aqc_configure_vsi_tc_bw_data bw_data;
struct i40e_pf *pf = vsi->back;
int i;
/* There is no need to reset BW when mqprio mode is on. */
-@@ -6304,7 +6304,7 @@ static int i40e_channel_config_bw(struct
+@@ -6303,7 +6303,7 @@ static int i40e_channel_config_bw(struct
u8 *bw_share)
{
struct i40e_aqc_configure_vsi_tc_bw_data bw_data;
int i;
memset(&bw_data, 0, sizeof(bw_data));
-@@ -6340,9 +6340,9 @@ static int i40e_channel_config_tx_ring(s
+@@ -6339,9 +6339,9 @@ static int i40e_channel_config_tx_ring(s
struct i40e_vsi *vsi,
struct i40e_channel *ch)
{
/* Enable ETS TCs with equal BW Share for now across all VSIs */
for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++) {
-@@ -7416,15 +7416,15 @@ static void i40e_vsi_reinit_locked(struc
+@@ -7415,15 +7415,15 @@ static void i40e_vsi_reinit_locked(struc
* @pf: board private structure
* @is_up: whether the link state should be forced up or down
**/
/* Card might've been put in an unstable state by other drivers
* and applications, which causes incorrect speed values being
-@@ -7657,11 +7657,11 @@ static void i40e_vsi_set_default_tc_conf
+@@ -7656,11 +7656,11 @@ static void i40e_vsi_set_default_tc_conf
* This function deletes a mac filter on the channel VSI which serves as the
* macvlan. Returns 0 on success.
**/
memset(&element, 0, sizeof(element));
ether_addr_copy(element.mac_addr, macaddr);
-@@ -7683,12 +7683,12 @@ static i40e_status i40e_del_macvlan_filt
+@@ -7682,12 +7682,12 @@ static i40e_status i40e_del_macvlan_filt
* This function adds a mac filter on the channel VSI which serves as the
* macvlan. Returns 0 on success.
**/
ether_addr_copy(element.mac_addr, macaddr);
element.vlan_tag = 0;
-@@ -9886,8 +9886,8 @@ static void i40e_link_event(struct i40e_
+@@ -9885,8 +9885,8 @@ static void i40e_link_event(struct i40e_
{
struct i40e_vsi *vsi = pf->vsi[pf->lan_vsi];
u8 new_link_speed, old_link_speed;
#ifdef CONFIG_I40E_DCB
int err;
#endif /* CONFIG_I40E_DCB */
-@@ -10098,9 +10098,9 @@ static void i40e_clean_adminq_subtask(st
+@@ -10097,9 +10097,9 @@ static void i40e_clean_adminq_subtask(st
struct i40e_arq_event_info event;
struct i40e_hw *hw = &pf->hw;
u16 pending, i = 0;
u32 val;
/* Do not run clean AQ when PF reset fails */
-@@ -10579,7 +10579,7 @@ static int i40e_rebuild_cloud_filters(st
+@@ -10578,7 +10578,7 @@ static int i40e_rebuild_cloud_filters(st
struct i40e_cloud_filter *cfilter;
struct i40e_pf *pf = vsi->back;
struct hlist_node *node;
/* Add cloud filters back if they exist */
hlist_for_each_entry_safe(cfilter, node, &pf->cloud_filter_list,
-@@ -10614,7 +10614,7 @@ static int i40e_rebuild_cloud_filters(st
+@@ -10613,7 +10613,7 @@ static int i40e_rebuild_cloud_filters(st
static int i40e_rebuild_channels(struct i40e_vsi *vsi)
{
struct i40e_channel *ch, *ch_tmp;
if (list_empty(&vsi->ch_list))
return 0;
-@@ -10690,7 +10690,7 @@ static void i40e_clean_xps_state(struct
+@@ -10689,7 +10689,7 @@ static void i40e_clean_xps_state(struct
static void i40e_prep_for_reset(struct i40e_pf *pf)
{
struct i40e_hw *hw = &pf->hw;
u32 v;
clear_bit(__I40E_RESET_INTR_RECEIVED, pf->state);
-@@ -10795,7 +10795,7 @@ static void i40e_get_oem_version(struct
+@@ -10794,7 +10794,7 @@ static void i40e_get_oem_version(struct
static int i40e_reset(struct i40e_pf *pf)
{
struct i40e_hw *hw = &pf->hw;
ret = i40e_pf_reset(hw);
if (ret) {
-@@ -10820,7 +10820,7 @@ static void i40e_rebuild(struct i40e_pf
+@@ -10819,7 +10819,7 @@ static void i40e_rebuild(struct i40e_pf
const bool is_recovery_mode_reported = i40e_check_recovery_mode(pf);
struct i40e_vsi *vsi = pf->vsi[pf->lan_vsi];
struct i40e_hw *hw = &pf->hw;
u32 val;
int v;
-@@ -12510,11 +12510,11 @@ int i40e_reconfig_rss_queues(struct i40e
+@@ -12509,11 +12509,11 @@ int i40e_reconfig_rss_queues(struct i40e
* i40e_get_partition_bw_setting - Retrieve BW settings for this PF partition
* @pf: board private structure
**/
status = i40e_read_bw_from_alt_ram(&pf->hw, &max_bw, &min_bw,
&min_valid, &max_valid);
-@@ -12533,10 +12533,10 @@ i40e_status i40e_get_partition_bw_settin
+@@ -12532,10 +12532,10 @@ i40e_status i40e_get_partition_bw_settin
* i40e_set_partition_bw_setting - Set BW settings for this PF partition
* @pf: board private structure
**/
memset(&bw_data, 0, sizeof(bw_data));
-@@ -12555,12 +12555,12 @@ i40e_status i40e_set_partition_bw_settin
+@@ -12554,12 +12554,12 @@ i40e_status i40e_set_partition_bw_settin
* i40e_commit_partition_bw_setting - Commit BW settings for this PF partition
* @pf: board private structure
**/
if (pf->hw.partition_id != 1) {
dev_info(&pf->pdev->dev,
-@@ -12648,7 +12648,7 @@ static bool i40e_is_total_port_shutdown_
+@@ -12647,7 +12647,7 @@ static bool i40e_is_total_port_shutdown_
#define I40E_LINK_BEHAVIOR_WORD_LENGTH 0x1
#define I40E_LINK_BEHAVIOR_OS_FORCED_ENABLED BIT(0)
#define I40E_LINK_BEHAVIOR_PORT_BIT_LENGTH 4
u16 sr_emp_sr_settings_ptr = 0;
u16 features_enable = 0;
u16 link_behavior = 0;
-@@ -13027,7 +13027,7 @@ static int i40e_udp_tunnel_set_port(stru
+@@ -13000,7 +13000,7 @@ static int i40e_udp_tunnel_set_port(stru
struct i40e_netdev_priv *np = netdev_priv(netdev);
struct i40e_hw *hw = &np->vsi->back->hw;
u8 type, filter_index;
type = ti->type == UDP_TUNNEL_TYPE_VXLAN ? I40E_AQC_TUNNEL_TYPE_VXLAN :
I40E_AQC_TUNNEL_TYPE_NGE;
-@@ -13051,7 +13051,7 @@ static int i40e_udp_tunnel_unset_port(st
+@@ -13024,7 +13024,7 @@ static int i40e_udp_tunnel_unset_port(st
{
struct i40e_netdev_priv *np = netdev_priv(netdev);
struct i40e_hw *hw = &np->vsi->back->hw;
ret = i40e_aq_del_udp_tunnel(hw, ti->hw_priv, NULL);
if (ret) {
-@@ -15441,13 +15441,12 @@ static bool i40e_check_recovery_mode(str
+@@ -15414,13 +15414,12 @@ static bool i40e_check_recovery_mode(str
*
* Return 0 on success, negative on failure.
**/
ret = i40e_pf_reset(hw);
while (ret != I40E_SUCCESS && time_before(jiffies, time_end)) {
-@@ -15493,9 +15492,9 @@ static bool i40e_check_fw_empr(struct i4
+@@ -15466,9 +15465,9 @@ static bool i40e_check_fw_empr(struct i4
* Return 0 if NIC is healthy or negative value when there are issues
* with resets
**/
const bool is_empr = i40e_check_fw_empr(pf);
if (is_empr || pfr != I40E_SUCCESS)
-@@ -15634,13 +15633,15 @@ static int i40e_probe(struct pci_dev *pd
+@@ -15607,13 +15606,15 @@ static int i40e_probe(struct pci_dev *pd
struct i40e_aq_get_phy_abilities_resp abilities;
#ifdef CONFIG_I40E_DCB
enum i40e_get_fw_lldp_status_resp lldp_status;
int err;
u32 val;
u32 i;
-@@ -16244,7 +16245,7 @@ static void i40e_remove(struct pci_dev *
+@@ -16217,7 +16218,7 @@ static void i40e_remove(struct pci_dev *
{
struct i40e_pf *pf = pci_get_drvdata(pdev);
struct i40e_hw *hw = &pf->hw;
int i;
i40e_dbg_pf_exit(pf);
-@@ -16492,9 +16493,9 @@ static void i40e_pci_error_resume(struct
+@@ -16465,9 +16466,9 @@ static void i40e_pci_error_resume(struct
static void i40e_enable_mc_magic_wake(struct i40e_pf *pf)
{
struct i40e_hw *hw = &pf->hw;
i40e_asq_send_command_atomic_v2(struct i40e_hw *hw,
struct i40e_aq_desc *desc,
void *buff, /* can be NULL */
-@@ -53,326 +53,332 @@ void i40e_debug_aq(struct i40e_hw *hw, e
+@@ -53,48 +53,48 @@ void i40e_debug_aq(struct i40e_hw *hw, e
void i40e_idle_aq(struct i40e_hw *hw);
bool i40e_check_asq_alive(struct i40e_hw *hw);
- u32 reg_addr, u64 reg_val,
- struct i40e_asq_cmd_details *cmd_details);
-i40e_status i40e_aq_debug_read_register(struct i40e_hw *hw,
+- u32 reg_addr, u64 *reg_val,
+- struct i40e_asq_cmd_details *cmd_details);
+-i40e_status i40e_aq_set_phy_debug(struct i40e_hw *hw, u8 cmd_flags,
+- struct i40e_asq_cmd_details *cmd_details);
+-i40e_status i40e_aq_set_default_vsi(struct i40e_hw *hw, u16 vsi_id,
+- struct i40e_asq_cmd_details *cmd_details);
+-i40e_status i40e_aq_clear_default_vsi(struct i40e_hw *hw, u16 vsi_id,
+- struct i40e_asq_cmd_details *cmd_details);
+int i40e_aq_get_firmware_version(struct i40e_hw *hw,
+ u16 *fw_major_version, u16 *fw_minor_version,
+ u32 *fw_build,
+ u32 reg_addr, u64 reg_val,
+ struct i40e_asq_cmd_details *cmd_details);
+int i40e_aq_debug_read_register(struct i40e_hw *hw,
- u32 reg_addr, u64 *reg_val,
++ u32 reg_addr, u64 *reg_val,
++ struct i40e_asq_cmd_details *cmd_details);
++int i40e_aq_set_phy_debug(struct i40e_hw *hw, u8 cmd_flags,
++ struct i40e_asq_cmd_details *cmd_details);
++int i40e_aq_set_default_vsi(struct i40e_hw *hw, u16 vsi_id,
++ struct i40e_asq_cmd_details *cmd_details);
++int i40e_aq_clear_default_vsi(struct i40e_hw *hw, u16 vsi_id,
++ struct i40e_asq_cmd_details *cmd_details);
+ enum i40e_status_code i40e_aq_get_phy_capabilities(struct i40e_hw *hw,
+ bool qualified_modules, bool report_init,
+ struct i40e_aq_get_phy_abilities_resp *abilities,
+@@ -104,33 +104,34 @@ enum i40e_status_code i40e_aq_set_phy_co
struct i40e_asq_cmd_details *cmd_details);
--i40e_status i40e_aq_set_phy_debug(struct i40e_hw *hw, u8 cmd_flags,
-- struct i40e_asq_cmd_details *cmd_details);
--i40e_status i40e_aq_set_default_vsi(struct i40e_hw *hw, u16 vsi_id,
-- struct i40e_asq_cmd_details *cmd_details);
--i40e_status i40e_aq_clear_default_vsi(struct i40e_hw *hw, u16 vsi_id,
-- struct i40e_asq_cmd_details *cmd_details);
--enum i40e_status_code i40e_aq_get_phy_capabilities(struct i40e_hw *hw,
-- bool qualified_modules, bool report_init,
-- struct i40e_aq_get_phy_abilities_resp *abilities,
-- struct i40e_asq_cmd_details *cmd_details);
--enum i40e_status_code i40e_aq_set_phy_config(struct i40e_hw *hw,
-- struct i40e_aq_set_phy_config *config,
-- struct i40e_asq_cmd_details *cmd_details);
--enum i40e_status_code i40e_set_fc(struct i40e_hw *hw, u8 *aq_failures,
-- bool atomic_reset);
--i40e_status i40e_aq_set_mac_loopback(struct i40e_hw *hw,
-- bool ena_lpbk,
-- struct i40e_asq_cmd_details *cmd_details);
+ enum i40e_status_code i40e_set_fc(struct i40e_hw *hw, u8 *aq_failures,
+ bool atomic_reset);
-i40e_status i40e_aq_set_phy_int_mask(struct i40e_hw *hw, u16 mask,
- struct i40e_asq_cmd_details *cmd_details);
-i40e_status i40e_aq_clear_pxe_mode(struct i40e_hw *hw,
- u64 advt_reg,
- struct i40e_asq_cmd_details *cmd_details);
-i40e_status i40e_aq_send_driver_version(struct i40e_hw *hw,
-+int i40e_aq_set_phy_debug(struct i40e_hw *hw, u8 cmd_flags,
-+ struct i40e_asq_cmd_details *cmd_details);
-+int i40e_aq_set_default_vsi(struct i40e_hw *hw, u16 vsi_id,
-+ struct i40e_asq_cmd_details *cmd_details);
-+int i40e_aq_clear_default_vsi(struct i40e_hw *hw, u16 vsi_id,
-+ struct i40e_asq_cmd_details *cmd_details);
-+int i40e_aq_get_phy_capabilities(struct i40e_hw *hw,
-+ bool qualified_modules, bool report_init,
-+ struct i40e_aq_get_phy_abilities_resp *abilities,
-+ struct i40e_asq_cmd_details *cmd_details);
-+int i40e_aq_set_phy_config(struct i40e_hw *hw,
-+ struct i40e_aq_set_phy_config *config,
-+ struct i40e_asq_cmd_details *cmd_details);
-+int i40e_set_fc(struct i40e_hw *hw, u8 *aq_failures,
-+ bool atomic_reset);
-+int i40e_aq_set_mac_loopback(struct i40e_hw *hw,
-+ bool ena_lpbk,
-+ struct i40e_asq_cmd_details *cmd_details);
+int i40e_aq_set_phy_int_mask(struct i40e_hw *hw, u16 mask,
+ struct i40e_asq_cmd_details *cmd_details);
+int i40e_aq_clear_pxe_mode(struct i40e_hw *hw,
- bool rx_only_promisc);
-i40e_status i40e_aq_set_vsi_multicast_promiscuous(struct i40e_hw *hw,
- u16 vsi_id, bool set, struct i40e_asq_cmd_details *cmd_details);
--enum i40e_status_code i40e_aq_set_vsi_mc_promisc_on_vlan(struct i40e_hw *hw,
-- u16 seid, bool enable,
-- u16 vid,
-- struct i40e_asq_cmd_details *cmd_details);
--enum i40e_status_code i40e_aq_set_vsi_uc_promisc_on_vlan(struct i40e_hw *hw,
-- u16 seid, bool enable,
-- u16 vid,
-- struct i40e_asq_cmd_details *cmd_details);
++int i40e_aq_add_vsi(struct i40e_hw *hw,
++ struct i40e_vsi_context *vsi_ctx,
++ struct i40e_asq_cmd_details *cmd_details);
++int i40e_aq_set_vsi_broadcast(struct i40e_hw *hw,
++ u16 vsi_id, bool set_filter,
++ struct i40e_asq_cmd_details *cmd_details);
++int i40e_aq_set_vsi_unicast_promiscuous(struct i40e_hw *hw,
++ u16 vsi_id, bool set,
++ struct i40e_asq_cmd_details *cmd_details,
++ bool rx_only_promisc);
++int i40e_aq_set_vsi_multicast_promiscuous(struct i40e_hw *hw,
++ u16 vsi_id, bool set, struct i40e_asq_cmd_details *cmd_details);
+ enum i40e_status_code i40e_aq_set_vsi_mc_promisc_on_vlan(struct i40e_hw *hw,
+ u16 seid, bool enable,
+ u16 vid,
+@@ -139,170 +140,167 @@ enum i40e_status_code i40e_aq_set_vsi_uc
+ u16 seid, bool enable,
+ u16 vid,
+ struct i40e_asq_cmd_details *cmd_details);
-i40e_status i40e_aq_set_vsi_bc_promisc_on_vlan(struct i40e_hw *hw,
- u16 seid, bool enable, u16 vid,
- struct i40e_asq_cmd_details *cmd_details);
- u16 *vebs_free,
- struct i40e_asq_cmd_details *cmd_details);
-i40e_status i40e_aq_add_macvlan(struct i40e_hw *hw, u16 vsi_id,
-+int i40e_aq_add_vsi(struct i40e_hw *hw,
-+ struct i40e_vsi_context *vsi_ctx,
-+ struct i40e_asq_cmd_details *cmd_details);
-+int i40e_aq_set_vsi_broadcast(struct i40e_hw *hw,
-+ u16 vsi_id, bool set_filter,
-+ struct i40e_asq_cmd_details *cmd_details);
-+int i40e_aq_set_vsi_unicast_promiscuous(struct i40e_hw *hw, u16 vsi_id, bool set,
-+ struct i40e_asq_cmd_details *cmd_details,
-+ bool rx_only_promisc);
-+int i40e_aq_set_vsi_multicast_promiscuous(struct i40e_hw *hw, u16 vsi_id, bool set,
-+ struct i40e_asq_cmd_details *cmd_details);
-+int i40e_aq_set_vsi_mc_promisc_on_vlan(struct i40e_hw *hw,
-+ u16 seid, bool enable,
-+ u16 vid,
-+ struct i40e_asq_cmd_details *cmd_details);
-+int i40e_aq_set_vsi_uc_promisc_on_vlan(struct i40e_hw *hw,
-+ u16 seid, bool enable,
-+ u16 vid,
-+ struct i40e_asq_cmd_details *cmd_details);
+int i40e_aq_set_vsi_bc_promisc_on_vlan(struct i40e_hw *hw,
+ u16 seid, bool enable, u16 vid,
+ struct i40e_asq_cmd_details *cmd_details);
struct i40e_aqc_add_macvlan_element_data *mv_list,
u16 count, struct i40e_asq_cmd_details *cmd_details);
-i40e_status
-+int
- i40e_aq_add_macvlan_v2(struct i40e_hw *hw, u16 seid,
- struct i40e_aqc_add_macvlan_element_data *mv_list,
- u16 count, struct i40e_asq_cmd_details *cmd_details,
- enum i40e_admin_queue_err *aq_status);
+-i40e_aq_add_macvlan_v2(struct i40e_hw *hw, u16 seid,
+- struct i40e_aqc_add_macvlan_element_data *mv_list,
+- u16 count, struct i40e_asq_cmd_details *cmd_details,
+- enum i40e_admin_queue_err *aq_status);
-i40e_status i40e_aq_remove_macvlan(struct i40e_hw *hw, u16 vsi_id,
- struct i40e_aqc_remove_macvlan_element_data *mv_list,
- u16 count, struct i40e_asq_cmd_details *cmd_details);
-i40e_status
-+int i40e_aq_remove_macvlan(struct i40e_hw *hw, u16 vsi_id,
-+ struct i40e_aqc_remove_macvlan_element_data *mv_list,
-+ u16 count, struct i40e_asq_cmd_details *cmd_details);
-+int
- i40e_aq_remove_macvlan_v2(struct i40e_hw *hw, u16 seid,
- struct i40e_aqc_remove_macvlan_element_data *mv_list,
- u16 count, struct i40e_asq_cmd_details *cmd_details,
- enum i40e_admin_queue_err *aq_status);
+-i40e_aq_remove_macvlan_v2(struct i40e_hw *hw, u16 seid,
+- struct i40e_aqc_remove_macvlan_element_data *mv_list,
+- u16 count, struct i40e_asq_cmd_details *cmd_details,
+- enum i40e_admin_queue_err *aq_status);
-i40e_status i40e_aq_add_mirrorrule(struct i40e_hw *hw, u16 sw_seid,
- u16 rule_type, u16 dest_vsi, u16 count, __le16 *mr_list,
- struct i40e_asq_cmd_details *cmd_details,
- struct i40e_aqc_get_switch_config_resp *buf,
- u16 buf_size, u16 *start_seid,
- struct i40e_asq_cmd_details *cmd_details);
--enum i40e_status_code i40e_aq_set_switch_config(struct i40e_hw *hw,
-- u16 flags,
-- u16 valid_flags, u8 mode,
-- struct i40e_asq_cmd_details *cmd_details);
--i40e_status i40e_aq_request_resource(struct i40e_hw *hw,
-- enum i40e_aq_resources_ids resource,
-- enum i40e_aq_resource_access_type access,
-- u8 sdp_number, u64 *timeout,
-- struct i40e_asq_cmd_details *cmd_details);
--i40e_status i40e_aq_release_resource(struct i40e_hw *hw,
-- enum i40e_aq_resources_ids resource,
-- u8 sdp_number,
-- struct i40e_asq_cmd_details *cmd_details);
--i40e_status i40e_aq_read_nvm(struct i40e_hw *hw, u8 module_pointer,
-- u32 offset, u16 length, void *data,
-- bool last_command,
-- struct i40e_asq_cmd_details *cmd_details);
--i40e_status i40e_aq_erase_nvm(struct i40e_hw *hw, u8 module_pointer,
-- u32 offset, u16 length, bool last_command,
++int i40e_aq_add_macvlan_v2(struct i40e_hw *hw, u16 seid,
++ struct i40e_aqc_add_macvlan_element_data *mv_list,
++ u16 count, struct i40e_asq_cmd_details *cmd_details,
++ enum i40e_admin_queue_err *aq_status);
++int i40e_aq_remove_macvlan(struct i40e_hw *hw, u16 vsi_id,
++ struct i40e_aqc_remove_macvlan_element_data *mv_list,
++ u16 count, struct i40e_asq_cmd_details *cmd_details);
++int i40e_aq_remove_macvlan_v2(struct i40e_hw *hw, u16 seid,
++ struct i40e_aqc_remove_macvlan_element_data *mv_list,
++ u16 count, struct i40e_asq_cmd_details *cmd_details,
++ enum i40e_admin_queue_err *aq_status);
+int i40e_aq_add_mirrorrule(struct i40e_hw *hw, u16 sw_seid,
+ u16 rule_type, u16 dest_vsi, u16 count, __le16 *mr_list,
+ struct i40e_asq_cmd_details *cmd_details,
+int i40e_aq_get_switch_config(struct i40e_hw *hw,
+ struct i40e_aqc_get_switch_config_resp *buf,
+ u16 buf_size, u16 *start_seid,
- struct i40e_asq_cmd_details *cmd_details);
++ struct i40e_asq_cmd_details *cmd_details);
+ enum i40e_status_code i40e_aq_set_switch_config(struct i40e_hw *hw,
+ u16 flags,
+ u16 valid_flags, u8 mode,
+ struct i40e_asq_cmd_details *cmd_details);
+-i40e_status i40e_aq_request_resource(struct i40e_hw *hw,
+- enum i40e_aq_resources_ids resource,
+- enum i40e_aq_resource_access_type access,
+- u8 sdp_number, u64 *timeout,
+- struct i40e_asq_cmd_details *cmd_details);
+-i40e_status i40e_aq_release_resource(struct i40e_hw *hw,
+- enum i40e_aq_resources_ids resource,
+- u8 sdp_number,
+- struct i40e_asq_cmd_details *cmd_details);
+-i40e_status i40e_aq_read_nvm(struct i40e_hw *hw, u8 module_pointer,
+- u32 offset, u16 length, void *data,
+- bool last_command,
+- struct i40e_asq_cmd_details *cmd_details);
+-i40e_status i40e_aq_erase_nvm(struct i40e_hw *hw, u8 module_pointer,
+- u32 offset, u16 length, bool last_command,
+- struct i40e_asq_cmd_details *cmd_details);
-i40e_status i40e_aq_discover_capabilities(struct i40e_hw *hw,
- void *buff, u16 buff_size, u16 *data_size,
- enum i40e_admin_queue_opc list_type_opc,
- struct i40e_asq_cmd_details *cmd_details);
-i40e_status i40e_aq_rearrange_nvm(struct i40e_hw *hw,
- u8 rearrange_nvm,
-+int i40e_aq_set_switch_config(struct i40e_hw *hw,
-+ u16 flags,
-+ u16 valid_flags, u8 mode,
-+ struct i40e_asq_cmd_details *cmd_details);
+int i40e_aq_request_resource(struct i40e_hw *hw,
+ enum i40e_aq_resources_ids resource,
+ enum i40e_aq_resource_access_type access,
- u8 mib_type, void *buff, u16 buff_size,
- u16 *local_len, u16 *remote_len,
- struct i40e_asq_cmd_details *cmd_details);
--enum i40e_status_code
+int i40e_aq_update_nvm(struct i40e_hw *hw, u8 module_pointer,
+ u32 offset, u16 length, void *data,
+ bool last_command, u8 preservation_flags,
+ u8 mib_type, void *buff, u16 buff_size,
+ u16 *local_len, u16 *remote_len,
+ struct i40e_asq_cmd_details *cmd_details);
-+int
+ enum i40e_status_code
i40e_aq_set_lldp_mib(struct i40e_hw *hw,
u8 mib_type, void *buff, u16 buff_size,
struct i40e_asq_cmd_details *cmd_details);
-i40e_status i40e_aq_cfg_lldp_mib_change_event(struct i40e_hw *hw,
- bool enable_update,
-- struct i40e_asq_cmd_details *cmd_details);
--enum i40e_status_code
+int i40e_aq_cfg_lldp_mib_change_event(struct i40e_hw *hw,
+ bool enable_update,
-+ struct i40e_asq_cmd_details *cmd_details);
-+int
+ struct i40e_asq_cmd_details *cmd_details);
+ enum i40e_status_code
i40e_aq_restore_lldp(struct i40e_hw *hw, u8 *setting, bool restore,
struct i40e_asq_cmd_details *cmd_details);
-i40e_status i40e_aq_stop_lldp(struct i40e_hw *hw, bool shutdown_agent,
+ struct i40e_asq_cmd_details *cmd_details);
+int i40e_aq_set_dcb_parameters(struct i40e_hw *hw,
+ bool dcb_enable,
-+ struct i40e_asq_cmd_details
-+ *cmd_details);
-+int i40e_aq_start_lldp(struct i40e_hw *hw, bool persist,
-+ struct i40e_asq_cmd_details *cmd_details);
-+int i40e_aq_get_cee_dcb_config(struct i40e_hw *hw,
-+ void *buff, u16 buff_size,
struct i40e_asq_cmd_details *cmd_details);
-i40e_status i40e_aq_get_cee_dcb_config(struct i40e_hw *hw,
- void *buff, u16 buff_size,
- u16 flags, u8 *mac_addr,
- struct i40e_asq_cmd_details *cmd_details);
-i40e_status i40e_aq_config_vsi_bw_limit(struct i40e_hw *hw,
++int i40e_aq_start_lldp(struct i40e_hw *hw, bool persist,
++ struct i40e_asq_cmd_details *cmd_details);
++int i40e_aq_get_cee_dcb_config(struct i40e_hw *hw,
++ void *buff, u16 buff_size,
++ struct i40e_asq_cmd_details *cmd_details);
+int i40e_aq_add_udp_tunnel(struct i40e_hw *hw,
+ u16 udp_port, u8 protocol_index,
+ u8 *filter_index,
- enum i40e_admin_queue_opc opcode,
- struct i40e_asq_cmd_details *cmd_details);
-i40e_status i40e_aq_config_switch_comp_bw_config(struct i40e_hw *hw,
-+int i40e_aq_config_switch_comp_bw_limit(struct i40e_hw *hw,
-+ u16 seid, u16 credit, u8 max_bw,
-+ struct i40e_asq_cmd_details *cmd_details);
-+int i40e_aq_config_vsi_tc_bw(struct i40e_hw *hw, u16 seid,
-+ struct i40e_aqc_configure_vsi_tc_bw_data *bw_data,
-+ struct i40e_asq_cmd_details *cmd_details);
-+int
-+i40e_aq_config_switch_comp_ets(struct i40e_hw *hw,
-+ u16 seid,
-+ struct i40e_aqc_configure_switching_comp_ets_data *ets_data,
-+ enum i40e_admin_queue_opc opcode,
-+ struct i40e_asq_cmd_details *cmd_details);
-+int i40e_aq_config_switch_comp_bw_config(struct i40e_hw *hw,
- u16 seid,
- struct i40e_aqc_configure_switching_comp_bw_config_data *bw_data,
- struct i40e_asq_cmd_details *cmd_details);
+- u16 seid,
+- struct i40e_aqc_configure_switching_comp_bw_config_data *bw_data,
+- struct i40e_asq_cmd_details *cmd_details);
-i40e_status i40e_aq_query_vsi_bw_config(struct i40e_hw *hw,
- u16 seid,
- struct i40e_aqc_query_vsi_bw_config_resp *bw_data,
- struct i40e_aqc_query_switching_comp_bw_config_resp *bw_data,
- struct i40e_asq_cmd_details *cmd_details);
-i40e_status i40e_aq_resume_port_tx(struct i40e_hw *hw,
-- struct i40e_asq_cmd_details *cmd_details);
--enum i40e_status_code
++int i40e_aq_config_switch_comp_bw_limit(struct i40e_hw *hw,
++ u16 seid, u16 credit, u8 max_bw,
++ struct i40e_asq_cmd_details *cmd_details);
++int i40e_aq_config_vsi_tc_bw(struct i40e_hw *hw, u16 seid,
++ struct i40e_aqc_configure_vsi_tc_bw_data *bw_data,
++ struct i40e_asq_cmd_details *cmd_details);
++int i40e_aq_config_switch_comp_ets(struct i40e_hw *hw,
++ u16 seid,
++ struct i40e_aqc_configure_switching_comp_ets_data *ets_data,
++ enum i40e_admin_queue_opc opcode,
+ struct i40e_asq_cmd_details *cmd_details);
++int i40e_aq_config_switch_comp_bw_config(struct i40e_hw *hw,
++ u16 seid,
++ struct i40e_aqc_configure_switching_comp_bw_config_data *bw_data,
++ struct i40e_asq_cmd_details *cmd_details);
+int i40e_aq_query_vsi_bw_config(struct i40e_hw *hw,
+ u16 seid,
+ struct i40e_aqc_query_vsi_bw_config_resp *bw_data,
+ struct i40e_asq_cmd_details *cmd_details);
-+int
-+i40e_aq_query_vsi_ets_sla_config(struct i40e_hw *hw,
-+ u16 seid,
-+ struct i40e_aqc_query_vsi_ets_sla_config_resp *bw_data,
-+ struct i40e_asq_cmd_details *cmd_details);
-+int
-+i40e_aq_query_switch_comp_ets_config(struct i40e_hw *hw,
++int i40e_aq_query_vsi_ets_sla_config(struct i40e_hw *hw,
+ u16 seid,
-+ struct i40e_aqc_query_switching_comp_ets_config_resp *bw_data,
++ struct i40e_aqc_query_vsi_ets_sla_config_resp *bw_data,
+ struct i40e_asq_cmd_details *cmd_details);
-+int
-+i40e_aq_query_port_ets_config(struct i40e_hw *hw,
-+ u16 seid,
-+ struct i40e_aqc_query_port_ets_config_resp *bw_data,
-+ struct i40e_asq_cmd_details *cmd_details);
-+int
-+i40e_aq_query_switch_comp_bw_config(struct i40e_hw *hw,
-+ u16 seid,
-+ struct i40e_aqc_query_switching_comp_bw_config_resp *bw_data,
-+ struct i40e_asq_cmd_details *cmd_details);
++int i40e_aq_query_switch_comp_ets_config(struct i40e_hw *hw,
++ u16 seid,
++ struct i40e_aqc_query_switching_comp_ets_config_resp *bw_data,
++ struct i40e_asq_cmd_details *cmd_details);
++int i40e_aq_query_port_ets_config(struct i40e_hw *hw,
++ u16 seid,
++ struct i40e_aqc_query_port_ets_config_resp *bw_data,
++ struct i40e_asq_cmd_details *cmd_details);
++int i40e_aq_query_switch_comp_bw_config(struct i40e_hw *hw,
++ u16 seid,
++ struct i40e_aqc_query_switching_comp_bw_config_resp *bw_data,
++ struct i40e_asq_cmd_details *cmd_details);
+int i40e_aq_resume_port_tx(struct i40e_hw *hw,
+ struct i40e_asq_cmd_details *cmd_details);
-+int
+ enum i40e_status_code
i40e_aq_add_cloud_filters_bb(struct i40e_hw *hw, u16 seid,
struct i40e_aqc_cloud_filters_element_bb *filters,
- u8 filter_count);
--enum i40e_status_code
-+int
- i40e_aq_add_cloud_filters(struct i40e_hw *hw, u16 vsi,
- struct i40e_aqc_cloud_filters_element_data *filters,
- u8 filter_count);
--enum i40e_status_code
-+int
- i40e_aq_rem_cloud_filters(struct i40e_hw *hw, u16 vsi,
- struct i40e_aqc_cloud_filters_element_data *filters,
- u8 filter_count);
--enum i40e_status_code
-+int
+@@ -319,57 +317,51 @@ enum i40e_status_code
i40e_aq_rem_cloud_filters_bb(struct i40e_hw *hw, u16 seid,
struct i40e_aqc_cloud_filters_element_bb *filters,
u8 filter_count);
-i40e_status i40e_read_lldp_cfg(struct i40e_hw *hw,
- struct i40e_lldp_variables *lldp_cfg);
--enum i40e_status_code
-+int i40e_read_lldp_cfg(struct i40e_hw *hw,
-+ struct i40e_lldp_variables *lldp_cfg);
-+int
++int i40e_read_lldp_cfg(struct i40e_hw *hw, struct i40e_lldp_variables *lldp_cfg);
+ enum i40e_status_code
i40e_aq_suspend_port_tx(struct i40e_hw *hw, u16 seid,
struct i40e_asq_cmd_details *cmd_details);
/* i40e_common */
+int i40e_read_bw_from_alt_ram(struct i40e_hw *hw,
+ u32 *max_bw, u32 *min_bw, bool *min_valid,
+ bool *max_valid);
-+int
-+i40e_aq_configure_partition_bw(struct i40e_hw *hw,
-+ struct i40e_aqc_configure_partition_bw_data *bw_data,
-+ struct i40e_asq_cmd_details *cmd_details);
++int i40e_aq_configure_partition_bw(struct i40e_hw *hw,
++ struct i40e_aqc_configure_partition_bw_data *bw_data,
++ struct i40e_asq_cmd_details *cmd_details);
+int i40e_get_port_mac_addr(struct i40e_hw *hw, u8 *mac_addr);
-+int i40e_read_pba_string(struct i40e_hw *hw, u8 *pba_num,
-+ u32 pba_num_size);
++int i40e_read_pba_string(struct i40e_hw *hw, u8 *pba_num, u32 pba_num_size);
+int i40e_validate_mac_addr(u8 *mac_addr);
void i40e_pre_tx_queue_cfg(struct i40e_hw *hw, u32 queue, bool enable);
/* prototype for functions used for NVM access */
-i40e_status i40e_acquire_nvm(struct i40e_hw *hw,
- enum i40e_aq_resource_access_type access);
+int i40e_init_nvm(struct i40e_hw *hw);
-+int i40e_acquire_nvm(struct i40e_hw *hw,
-+ enum i40e_aq_resource_access_type access);
++int i40e_acquire_nvm(struct i40e_hw *hw, enum i40e_aq_resource_access_type access);
void i40e_release_nvm(struct i40e_hw *hw);
-i40e_status i40e_read_nvm_word(struct i40e_hw *hw, u16 offset,
- u16 *data);
--enum i40e_status_code i40e_read_nvm_module_data(struct i40e_hw *hw,
-- u8 module_ptr,
-- u16 module_offset,
-- u16 data_offset,
-- u16 words_data_size,
-- u16 *data_ptr);
++int i40e_read_nvm_word(struct i40e_hw *hw, u16 offset, u16 *data);
+ enum i40e_status_code i40e_read_nvm_module_data(struct i40e_hw *hw,
+ u8 module_ptr,
+ u16 module_offset,
+ u16 data_offset,
+ u16 words_data_size,
+ u16 *data_ptr);
-i40e_status i40e_read_nvm_buffer(struct i40e_hw *hw, u16 offset,
- u16 *words, u16 *data);
-i40e_status i40e_update_nvm_checksum(struct i40e_hw *hw);
-i40e_status i40e_nvmupd_command(struct i40e_hw *hw,
- struct i40e_nvm_access *cmd,
- u8 *bytes, int *);
-+int i40e_read_nvm_word(struct i40e_hw *hw, u16 offset,
-+ u16 *data);
-+int i40e_read_nvm_module_data(struct i40e_hw *hw,
-+ u8 module_ptr,
-+ u16 module_offset,
-+ u16 data_offset,
-+ u16 words_data_size,
-+ u16 *data_ptr);
-+int i40e_read_nvm_buffer(struct i40e_hw *hw, u16 offset,
-+ u16 *words, u16 *data);
++int i40e_read_nvm_buffer(struct i40e_hw *hw, u16 offset, u16 *words, u16 *data);
+int i40e_update_nvm_checksum(struct i40e_hw *hw);
-+int i40e_validate_nvm_checksum(struct i40e_hw *hw,
-+ u16 *checksum);
++int i40e_validate_nvm_checksum(struct i40e_hw *hw, u16 *checksum);
+int i40e_nvmupd_command(struct i40e_hw *hw,
+ struct i40e_nvm_access *cmd,
-+ u8 *bytes, int *errno);
++ u8 *bytes, int *);
void i40e_nvmupd_check_wait_event(struct i40e_hw *hw, u16 opcode,
struct i40e_aq_desc *desc);
void i40e_nvmupd_clear_wait_state(struct i40e_hw *hw);
extern struct i40e_rx_ptype_decoded i40e_ptype_lookup[];
-@@ -421,41 +427,41 @@ i40e_virtchnl_link_speed(enum i40e_aq_li
+@@ -418,41 +410,41 @@ i40e_virtchnl_link_speed(enum i40e_aq_li
/* i40e_common for VF drivers*/
void i40e_vf_parse_hw_config(struct i40e_hw *hw,
struct virtchnl_vf_resource *msg);
i40e_aq_get_phy_register_ext(struct i40e_hw *hw,
u8 phy_select, u8 dev_addr, bool page_change,
bool set_mdio, u8 mdio_num,
-@@ -468,43 +474,43 @@ i40e_aq_get_phy_register_ext(struct i40e
+@@ -465,43 +457,43 @@ i40e_aq_get_phy_register_ext(struct i40e
#define i40e_aq_get_phy_register(hw, ps, da, pc, ra, rv, cd) \
i40e_aq_get_phy_register_ext(hw, ps, da, pc, false, 0, ra, rv, cd)
projects / thirdparty / kernel / stable-queue.git / commitdiff
