From: Greg Kroah-Hartman Date: Fri, 9 Jun 2023 10:47:21 +0000 (+0200) Subject: 5.15-stable patches X-Git-Tag: v4.14.318~87 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7b6316efa4d74f690723e3232b7f908517b22287;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: bonding-gcc13-synchronize-bond_-a-t-lb_xmit-types.patch i40e-fix-build-warning-in-ice_fltr_add_mac_to_list.patch i40e-remove-string-printing-for-i40e_status.patch i40e-use-int-for-i40e_status.patch sfc-gcc13-synchronize-ef100_enqueue_skb-s-return-type.patch --- diff --git a/queue-5.15/bonding-gcc13-synchronize-bond_-a-t-lb_xmit-types.patch b/queue-5.15/bonding-gcc13-synchronize-bond_-a-t-lb_xmit-types.patch new file mode 100644 index 00000000000..6f2384a4ea4 --- /dev/null +++ b/queue-5.15/bonding-gcc13-synchronize-bond_-a-t-lb_xmit-types.patch @@ -0,0 +1,45 @@ +From 777fa87c7682228e155cf0892ba61cb2ab1fe3ae Mon Sep 17 00:00:00 2001 +From: "Jiri Slaby (SUSE)" +Date: Mon, 31 Oct 2022 12:44:09 +0100 +Subject: bonding (gcc13): synchronize bond_{a,t}lb_xmit() types + +From: Jiri Slaby (SUSE) + +commit 777fa87c7682228e155cf0892ba61cb2ab1fe3ae upstream. + +Both bond_alb_xmit() and bond_tlb_xmit() produce a valid warning with +gcc-13: + drivers/net/bonding/bond_alb.c:1409:13: error: conflicting types for 'bond_tlb_xmit' due to enum/integer mismatch; have 'netdev_tx_t(struct sk_buff *, struct net_device *)' ... + include/net/bond_alb.h:160:5: note: previous declaration of 'bond_tlb_xmit' with type 'int(struct sk_buff *, struct net_device *)' + + drivers/net/bonding/bond_alb.c:1523:13: error: conflicting types for 'bond_alb_xmit' due to enum/integer mismatch; have 'netdev_tx_t(struct sk_buff *, struct net_device *)' ... + include/net/bond_alb.h:159:5: note: previous declaration of 'bond_alb_xmit' with type 'int(struct sk_buff *, struct net_device *)' + +I.e. the return type of the declaration is int, while the definitions +spell netdev_tx_t. Synchronize both of them to the latter. + +Cc: Martin Liska +Cc: Jay Vosburgh +Cc: Veaceslav Falico +Cc: Andy Gospodarek +Signed-off-by: Jiri Slaby (SUSE) +Link: https://lore.kernel.org/r/20221031114409.10417-1-jirislaby@kernel.org +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + include/net/bond_alb.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/include/net/bond_alb.h ++++ b/include/net/bond_alb.h +@@ -156,8 +156,8 @@ int bond_alb_init_slave(struct bonding * + void bond_alb_deinit_slave(struct bonding *bond, struct slave *slave); + void bond_alb_handle_link_change(struct bonding *bond, struct slave *slave, char link); + void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave); +-int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev); +-int bond_tlb_xmit(struct sk_buff *skb, struct net_device *bond_dev); ++netdev_tx_t bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev); ++netdev_tx_t bond_tlb_xmit(struct sk_buff *skb, struct net_device *bond_dev); + struct slave *bond_xmit_alb_slave_get(struct bonding *bond, + struct sk_buff *skb); + struct slave *bond_xmit_tlb_slave_get(struct bonding *bond, diff --git a/queue-5.15/i40e-fix-build-warning-in-ice_fltr_add_mac_to_list.patch b/queue-5.15/i40e-fix-build-warning-in-ice_fltr_add_mac_to_list.patch new file mode 100644 index 00000000000..adfb9c3d5cf --- /dev/null +++ b/queue-5.15/i40e-fix-build-warning-in-ice_fltr_add_mac_to_list.patch @@ -0,0 +1,29 @@ +From foo@baz Fri Jun 9 12:43:39 PM CEST 2023 +Date: Fri, 09 Jun 2023 12:43:39 +0200 +To: Greg KH +From: Greg Kroah-Hartman +Subject: i40e: fix build warning in ice_fltr_add_mac_to_list() + +Not upstream as this was fixed in a much larger change in commit +5e24d5984c80 ("ice: Use int for ice_status") + +The function ice_fltr_add_mac_to_list() has the wrong prototype match +from the .h file to the .c declaration, so fix it up, otherwise gcc-13 +complains (rightfully) that the type is incorrect. + +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/intel/ice/ice_fltr.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/ethernet/intel/ice/ice_fltr.c ++++ b/drivers/net/ethernet/intel/ice/ice_fltr.c +@@ -128,7 +128,7 @@ void ice_fltr_remove_all(struct ice_vsi + * @mac: MAC address to add + * @action: filter action + */ +-int ++enum ice_status + ice_fltr_add_mac_to_list(struct ice_vsi *vsi, struct list_head *list, + const u8 *mac, enum ice_sw_fwd_act_type action) + { diff --git a/queue-5.15/i40e-remove-string-printing-for-i40e_status.patch b/queue-5.15/i40e-remove-string-printing-for-i40e_status.patch new file mode 100644 index 00000000000..e45d7255b06 --- /dev/null +++ b/queue-5.15/i40e-remove-string-printing-for-i40e_status.patch @@ -0,0 +1,1320 @@ +From 8c82be5525127063bb33bf7c2eff0e915f59c2b7 Mon Sep 17 00:00:00 2001 +From: Jan Sokolowski +Date: Mon, 9 Jan 2023 15:11:17 +0100 +Subject: i40e: Remove string printing for i40e_status + +From: Jan Sokolowski + +commit 5d968af27a166e055bdd5f832f095d809eadb992 upstream. + +Remove the i40e_stat_str() function which prints the string +representation of the i40e_status error code. With upcoming changes +moving away from i40e_status, there will be no need for this function + +Signed-off-by: Jan Sokolowski +Tested-by: Gurucharan G (A Contingent worker at Intel) +Signed-off-by: Tony Nguyen +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/intel/i40e/i40e_client.c | 8 + drivers/net/ethernet/intel/i40e/i40e_common.c | 148 ---------- + drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c | 16 - + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 41 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 307 ++++++++++----------- + drivers/net/ethernet/intel/i40e/i40e_nvm.c | 4 + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 1 + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 28 - + 8 files changed, 201 insertions(+), 352 deletions(-) + +--- a/drivers/net/ethernet/intel/i40e/i40e_client.c ++++ b/drivers/net/ethernet/intel/i40e/i40e_client.c +@@ -686,8 +686,8 @@ static int i40e_client_update_vsi_ctxt(s + ctxt.flags = I40E_AQ_VSI_TYPE_PF; + if (err) { + dev_info(&pf->pdev->dev, +- "couldn't get PF vsi config, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, err), ++ "couldn't get PF vsi config, err %d aq_err %s\n", ++ err, + i40e_aq_str(&pf->hw, + pf->hw.aq.asq_last_status)); + return -ENOENT; +@@ -714,8 +714,8 @@ static int i40e_client_update_vsi_ctxt(s + err = i40e_aq_update_vsi_params(&vsi->back->hw, &ctxt, NULL); + if (err) { + dev_info(&pf->pdev->dev, +- "update VSI ctxt for PE failed, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, err), ++ "update VSI ctxt for PE failed, err %d aq_err %s\n", ++ err, + i40e_aq_str(&pf->hw, + pf->hw.aq.asq_last_status)); + } +--- a/drivers/net/ethernet/intel/i40e/i40e_common.c ++++ b/drivers/net/ethernet/intel/i40e/i40e_common.c +@@ -123,154 +123,6 @@ const char *i40e_aq_str(struct i40e_hw * + } + + /** +- * i40e_stat_str - convert status err code to a string +- * @hw: pointer to the HW structure +- * @stat_err: the status error code to convert +- **/ +-const char *i40e_stat_str(struct i40e_hw *hw, i40e_status stat_err) +-{ +- switch (stat_err) { +- case 0: +- return "OK"; +- case I40E_ERR_NVM: +- return "I40E_ERR_NVM"; +- case I40E_ERR_NVM_CHECKSUM: +- return "I40E_ERR_NVM_CHECKSUM"; +- case I40E_ERR_PHY: +- return "I40E_ERR_PHY"; +- case I40E_ERR_CONFIG: +- return "I40E_ERR_CONFIG"; +- case I40E_ERR_PARAM: +- return "I40E_ERR_PARAM"; +- case I40E_ERR_MAC_TYPE: +- return "I40E_ERR_MAC_TYPE"; +- case I40E_ERR_UNKNOWN_PHY: +- return "I40E_ERR_UNKNOWN_PHY"; +- case I40E_ERR_LINK_SETUP: +- return "I40E_ERR_LINK_SETUP"; +- case I40E_ERR_ADAPTER_STOPPED: +- return "I40E_ERR_ADAPTER_STOPPED"; +- case I40E_ERR_INVALID_MAC_ADDR: +- return "I40E_ERR_INVALID_MAC_ADDR"; +- case I40E_ERR_DEVICE_NOT_SUPPORTED: +- return "I40E_ERR_DEVICE_NOT_SUPPORTED"; +- case I40E_ERR_MASTER_REQUESTS_PENDING: +- return "I40E_ERR_MASTER_REQUESTS_PENDING"; +- case I40E_ERR_INVALID_LINK_SETTINGS: +- return "I40E_ERR_INVALID_LINK_SETTINGS"; +- case I40E_ERR_AUTONEG_NOT_COMPLETE: +- return "I40E_ERR_AUTONEG_NOT_COMPLETE"; +- case I40E_ERR_RESET_FAILED: +- return "I40E_ERR_RESET_FAILED"; +- case I40E_ERR_SWFW_SYNC: +- return "I40E_ERR_SWFW_SYNC"; +- case I40E_ERR_NO_AVAILABLE_VSI: +- return "I40E_ERR_NO_AVAILABLE_VSI"; +- case I40E_ERR_NO_MEMORY: +- return "I40E_ERR_NO_MEMORY"; +- case I40E_ERR_BAD_PTR: +- return "I40E_ERR_BAD_PTR"; +- case I40E_ERR_RING_FULL: +- return "I40E_ERR_RING_FULL"; +- case I40E_ERR_INVALID_PD_ID: +- return "I40E_ERR_INVALID_PD_ID"; +- case I40E_ERR_INVALID_QP_ID: +- return "I40E_ERR_INVALID_QP_ID"; +- case I40E_ERR_INVALID_CQ_ID: +- return "I40E_ERR_INVALID_CQ_ID"; +- case I40E_ERR_INVALID_CEQ_ID: +- return "I40E_ERR_INVALID_CEQ_ID"; +- case I40E_ERR_INVALID_AEQ_ID: +- return "I40E_ERR_INVALID_AEQ_ID"; +- case I40E_ERR_INVALID_SIZE: +- return "I40E_ERR_INVALID_SIZE"; +- case I40E_ERR_INVALID_ARP_INDEX: +- return "I40E_ERR_INVALID_ARP_INDEX"; +- case I40E_ERR_INVALID_FPM_FUNC_ID: +- return "I40E_ERR_INVALID_FPM_FUNC_ID"; +- case I40E_ERR_QP_INVALID_MSG_SIZE: +- return "I40E_ERR_QP_INVALID_MSG_SIZE"; +- case I40E_ERR_QP_TOOMANY_WRS_POSTED: +- return "I40E_ERR_QP_TOOMANY_WRS_POSTED"; +- case I40E_ERR_INVALID_FRAG_COUNT: +- return "I40E_ERR_INVALID_FRAG_COUNT"; +- case I40E_ERR_QUEUE_EMPTY: +- return "I40E_ERR_QUEUE_EMPTY"; +- case I40E_ERR_INVALID_ALIGNMENT: +- return "I40E_ERR_INVALID_ALIGNMENT"; +- case I40E_ERR_FLUSHED_QUEUE: +- return "I40E_ERR_FLUSHED_QUEUE"; +- case I40E_ERR_INVALID_PUSH_PAGE_INDEX: +- return "I40E_ERR_INVALID_PUSH_PAGE_INDEX"; +- case I40E_ERR_INVALID_IMM_DATA_SIZE: +- return "I40E_ERR_INVALID_IMM_DATA_SIZE"; +- case I40E_ERR_TIMEOUT: +- return "I40E_ERR_TIMEOUT"; +- case I40E_ERR_OPCODE_MISMATCH: +- return "I40E_ERR_OPCODE_MISMATCH"; +- case I40E_ERR_CQP_COMPL_ERROR: +- return "I40E_ERR_CQP_COMPL_ERROR"; +- case I40E_ERR_INVALID_VF_ID: +- return "I40E_ERR_INVALID_VF_ID"; +- case I40E_ERR_INVALID_HMCFN_ID: +- return "I40E_ERR_INVALID_HMCFN_ID"; +- case I40E_ERR_BACKING_PAGE_ERROR: +- return "I40E_ERR_BACKING_PAGE_ERROR"; +- case I40E_ERR_NO_PBLCHUNKS_AVAILABLE: +- return "I40E_ERR_NO_PBLCHUNKS_AVAILABLE"; +- case I40E_ERR_INVALID_PBLE_INDEX: +- return "I40E_ERR_INVALID_PBLE_INDEX"; +- case I40E_ERR_INVALID_SD_INDEX: +- return "I40E_ERR_INVALID_SD_INDEX"; +- case I40E_ERR_INVALID_PAGE_DESC_INDEX: +- return "I40E_ERR_INVALID_PAGE_DESC_INDEX"; +- case I40E_ERR_INVALID_SD_TYPE: +- return "I40E_ERR_INVALID_SD_TYPE"; +- case I40E_ERR_MEMCPY_FAILED: +- return "I40E_ERR_MEMCPY_FAILED"; +- case I40E_ERR_INVALID_HMC_OBJ_INDEX: +- return "I40E_ERR_INVALID_HMC_OBJ_INDEX"; +- case I40E_ERR_INVALID_HMC_OBJ_COUNT: +- return "I40E_ERR_INVALID_HMC_OBJ_COUNT"; +- case I40E_ERR_INVALID_SRQ_ARM_LIMIT: +- return "I40E_ERR_INVALID_SRQ_ARM_LIMIT"; +- case I40E_ERR_SRQ_ENABLED: +- return "I40E_ERR_SRQ_ENABLED"; +- case I40E_ERR_ADMIN_QUEUE_ERROR: +- return "I40E_ERR_ADMIN_QUEUE_ERROR"; +- case I40E_ERR_ADMIN_QUEUE_TIMEOUT: +- return "I40E_ERR_ADMIN_QUEUE_TIMEOUT"; +- case I40E_ERR_BUF_TOO_SHORT: +- return "I40E_ERR_BUF_TOO_SHORT"; +- case I40E_ERR_ADMIN_QUEUE_FULL: +- return "I40E_ERR_ADMIN_QUEUE_FULL"; +- case I40E_ERR_ADMIN_QUEUE_NO_WORK: +- return "I40E_ERR_ADMIN_QUEUE_NO_WORK"; +- case I40E_ERR_BAD_IWARP_CQE: +- return "I40E_ERR_BAD_IWARP_CQE"; +- case I40E_ERR_NVM_BLANK_MODE: +- return "I40E_ERR_NVM_BLANK_MODE"; +- case I40E_ERR_NOT_IMPLEMENTED: +- return "I40E_ERR_NOT_IMPLEMENTED"; +- case I40E_ERR_PE_DOORBELL_NOT_ENABLED: +- return "I40E_ERR_PE_DOORBELL_NOT_ENABLED"; +- case I40E_ERR_DIAG_TEST_FAILED: +- return "I40E_ERR_DIAG_TEST_FAILED"; +- case I40E_ERR_NOT_READY: +- return "I40E_ERR_NOT_READY"; +- case I40E_NOT_SUPPORTED: +- return "I40E_NOT_SUPPORTED"; +- case I40E_ERR_FIRMWARE_API_VERSION: +- return "I40E_ERR_FIRMWARE_API_VERSION"; +- case I40E_ERR_ADMIN_QUEUE_CRITICAL_ERROR: +- return "I40E_ERR_ADMIN_QUEUE_CRITICAL_ERROR"; +- } +- +- snprintf(hw->err_str, sizeof(hw->err_str), "%d", stat_err); +- return hw->err_str; +-} +- +-/** + * i40e_debug_aq + * @hw: debug mask related to admin queue + * @mask: debug mask +--- a/drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c ++++ b/drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c +@@ -135,8 +135,8 @@ static int i40e_dcbnl_ieee_setets(struct + ret = i40e_hw_dcb_config(pf, &pf->tmp_cfg); + if (ret) { + dev_info(&pf->pdev->dev, +- "Failed setting DCB ETS configuration err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "Failed setting DCB ETS configuration err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + return -EINVAL; + } +@@ -174,8 +174,8 @@ static int i40e_dcbnl_ieee_setpfc(struct + ret = i40e_hw_dcb_config(pf, &pf->tmp_cfg); + if (ret) { + dev_info(&pf->pdev->dev, +- "Failed setting DCB PFC configuration err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "Failed setting DCB PFC configuration err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + return -EINVAL; + } +@@ -225,8 +225,8 @@ static int i40e_dcbnl_ieee_setapp(struct + ret = i40e_hw_dcb_config(pf, &pf->tmp_cfg); + if (ret) { + dev_info(&pf->pdev->dev, +- "Failed setting DCB configuration err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "Failed setting DCB configuration err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + return -EINVAL; + } +@@ -290,8 +290,8 @@ static int i40e_dcbnl_ieee_delapp(struct + ret = i40e_hw_dcb_config(pf, &pf->tmp_cfg); + if (ret) { + dev_info(&pf->pdev->dev, +- "Failed setting DCB configuration err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "Failed setting DCB configuration err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + return -EINVAL; + } +--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c ++++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c +@@ -1357,8 +1357,8 @@ static int i40e_set_link_ksettings(struc + status = i40e_aq_set_phy_config(hw, &config, NULL); + if (status) { + netdev_info(netdev, +- "Set phy config failed, err %s aq_err %s\n", +- i40e_stat_str(hw, status), ++ "Set phy config failed, err %d aq_err %s\n", ++ status, + i40e_aq_str(hw, hw->aq.asq_last_status)); + err = -EAGAIN; + goto done; +@@ -1367,8 +1367,8 @@ static int i40e_set_link_ksettings(struc + status = i40e_update_link_info(hw); + if (status) + netdev_dbg(netdev, +- "Updating link info failed with err %s aq_err %s\n", +- i40e_stat_str(hw, status), ++ "Updating link info failed with err %d aq_err %s\n", ++ status, + i40e_aq_str(hw, hw->aq.asq_last_status)); + + } else { +@@ -1419,8 +1419,8 @@ static int i40e_set_fec_cfg(struct net_d + status = i40e_aq_set_phy_config(hw, &config, NULL); + if (status) { + netdev_info(netdev, +- "Set phy config failed, err %s aq_err %s\n", +- i40e_stat_str(hw, status), ++ "Set phy config failed, err %d aq_err %s\n", ++ status, + i40e_aq_str(hw, hw->aq.asq_last_status)); + err = -EAGAIN; + goto done; +@@ -1433,8 +1433,8 @@ static int i40e_set_fec_cfg(struct net_d + * (e.g. no physical connection etc.) + */ + netdev_dbg(netdev, +- "Updating link info failed with err %s aq_err %s\n", +- i40e_stat_str(hw, status), ++ "Updating link info failed with err %d aq_err %s\n", ++ status, + i40e_aq_str(hw, hw->aq.asq_last_status)); + } + +@@ -1540,8 +1540,8 @@ static int i40e_nway_reset(struct net_de + + ret = i40e_aq_set_link_restart_an(hw, link_up, NULL); + if (ret) { +- netdev_info(netdev, "link restart failed, err %s aq_err %s\n", +- i40e_stat_str(hw, ret), ++ netdev_info(netdev, "link restart failed, err %d aq_err %s\n", ++ ret, + i40e_aq_str(hw, hw->aq.asq_last_status)); + return -EIO; + } +@@ -1657,20 +1657,20 @@ static int i40e_set_pauseparam(struct ne + status = i40e_set_fc(hw, &aq_failures, link_up); + + if (aq_failures & I40E_SET_FC_AQ_FAIL_GET) { +- netdev_info(netdev, "Set fc failed on the get_phy_capabilities call with err %s aq_err %s\n", +- i40e_stat_str(hw, status), ++ netdev_info(netdev, "Set fc failed on the get_phy_capabilities call with err %d aq_err %s\n", ++ status, + i40e_aq_str(hw, hw->aq.asq_last_status)); + err = -EAGAIN; + } + if (aq_failures & I40E_SET_FC_AQ_FAIL_SET) { +- netdev_info(netdev, "Set fc failed on the set_phy_config call with err %s aq_err %s\n", +- i40e_stat_str(hw, status), ++ netdev_info(netdev, "Set fc failed on the set_phy_config call with err %d aq_err %s\n", ++ status, + i40e_aq_str(hw, hw->aq.asq_last_status)); + err = -EAGAIN; + } + if (aq_failures & I40E_SET_FC_AQ_FAIL_UPDATE) { +- netdev_info(netdev, "Set fc failed on the get_link_info call with err %s aq_err %s\n", +- i40e_stat_str(hw, status), ++ netdev_info(netdev, "Set fc failed on the get_link_info call with err %d aq_err %s\n", ++ status, + i40e_aq_str(hw, hw->aq.asq_last_status)); + err = -EAGAIN; + } +@@ -5260,8 +5260,8 @@ flags_complete: + 0, NULL); + if (ret && pf->hw.aq.asq_last_status != I40E_AQ_RC_ESRCH) { + dev_info(&pf->pdev->dev, +- "couldn't set switch config bits, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "couldn't set switch config bits, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, + pf->hw.aq.asq_last_status)); + /* not a fatal problem, just keep going */ +@@ -5326,9 +5326,8 @@ flags_complete: + return -EBUSY; + default: + dev_warn(&pf->pdev->dev, +- "Starting FW LLDP agent failed: error: %s, %s\n", +- i40e_stat_str(&pf->hw, +- status), ++ "Starting FW LLDP agent failed: error: %d, %s\n", ++ status, + i40e_aq_str(&pf->hw, + adq_err)); + return -EINVAL; +--- a/drivers/net/ethernet/intel/i40e/i40e_main.c ++++ b/drivers/net/ethernet/intel/i40e/i40e_main.c +@@ -1696,8 +1696,8 @@ static int i40e_set_mac(struct net_devic + ret = i40e_aq_mac_address_write(hw, I40E_AQC_WRITE_TYPE_LAA_WOL, + addr->sa_data, NULL); + if (ret) +- netdev_info(netdev, "Ignoring error from firmware on LAA update, status %s, AQ ret %s\n", +- i40e_stat_str(hw, ret), ++ netdev_info(netdev, "Ignoring error from firmware on LAA update, status %d, AQ ret %s\n", ++ ret, + i40e_aq_str(hw, hw->aq.asq_last_status)); + } + +@@ -1728,8 +1728,8 @@ static int i40e_config_rss_aq(struct i40 + ret = i40e_aq_set_rss_key(hw, vsi->id, seed_dw); + if (ret) { + dev_info(&pf->pdev->dev, +- "Cannot set RSS key, err %s aq_err %s\n", +- i40e_stat_str(hw, ret), ++ "Cannot set RSS key, err %d aq_err %s\n", ++ ret, + i40e_aq_str(hw, hw->aq.asq_last_status)); + return ret; + } +@@ -1740,8 +1740,8 @@ static int i40e_config_rss_aq(struct i40 + ret = i40e_aq_set_rss_lut(hw, vsi->id, pf_lut, lut, lut_size); + if (ret) { + dev_info(&pf->pdev->dev, +- "Cannot set RSS lut, err %s aq_err %s\n", +- i40e_stat_str(hw, ret), ++ "Cannot set RSS lut, err %d aq_err %s\n", ++ ret, + i40e_aq_str(hw, hw->aq.asq_last_status)); + return ret; + } +@@ -2232,8 +2232,8 @@ void i40e_aqc_del_filters(struct i40e_vs + if (aq_ret && !(aq_err == I40E_AQ_RC_ENOENT)) { + *retval = -EIO; + dev_info(&vsi->back->pdev->dev, +- "ignoring delete macvlan error on %s, err %s, aq_err %s\n", +- vsi_name, i40e_stat_str(hw, aq_ret), ++ "ignoring delete macvlan error on %s, err %d, aq_err %s\n", ++ vsi_name, aq_ret, + i40e_aq_str(hw, aq_err)); + } + } +@@ -2360,8 +2360,8 @@ static int i40e_set_promiscuous(struct i + NULL); + if (aq_ret) { + dev_info(&pf->pdev->dev, +- "Set default VSI failed, err %s, aq_err %s\n", +- i40e_stat_str(hw, aq_ret), ++ "Set default VSI failed, err %d, aq_err %s\n", ++ aq_ret, + i40e_aq_str(hw, hw->aq.asq_last_status)); + } + } else { +@@ -2372,8 +2372,8 @@ static int i40e_set_promiscuous(struct i + true); + if (aq_ret) { + dev_info(&pf->pdev->dev, +- "set unicast promisc failed, err %s, aq_err %s\n", +- i40e_stat_str(hw, aq_ret), ++ "set unicast promisc failed, err %d, aq_err %s\n", ++ aq_ret, + i40e_aq_str(hw, hw->aq.asq_last_status)); + } + aq_ret = i40e_aq_set_vsi_multicast_promiscuous( +@@ -2382,8 +2382,8 @@ static int i40e_set_promiscuous(struct i + promisc, NULL); + if (aq_ret) { + dev_info(&pf->pdev->dev, +- "set multicast promisc failed, err %s, aq_err %s\n", +- i40e_stat_str(hw, aq_ret), ++ "set multicast promisc failed, err %d, aq_err %s\n", ++ aq_ret, + i40e_aq_str(hw, hw->aq.asq_last_status)); + } + } +@@ -2682,9 +2682,9 @@ int i40e_sync_vsi_filters(struct i40e_vs + retval = i40e_aq_rc_to_posix(aq_ret, + hw->aq.asq_last_status); + dev_info(&pf->pdev->dev, +- "set multi promisc failed on %s, err %s aq_err %s\n", ++ "set multi promisc failed on %s, err %d aq_err %s\n", + vsi_name, +- i40e_stat_str(hw, aq_ret), ++ aq_ret, + i40e_aq_str(hw, hw->aq.asq_last_status)); + } else { + dev_info(&pf->pdev->dev, "%s allmulti mode.\n", +@@ -2702,10 +2702,10 @@ int i40e_sync_vsi_filters(struct i40e_vs + retval = i40e_aq_rc_to_posix(aq_ret, + hw->aq.asq_last_status); + dev_info(&pf->pdev->dev, +- "Setting promiscuous %s failed on %s, err %s aq_err %s\n", ++ "Setting promiscuous %s failed on %s, err %d aq_err %s\n", + cur_promisc ? "on" : "off", + vsi_name, +- i40e_stat_str(hw, aq_ret), ++ aq_ret, + i40e_aq_str(hw, hw->aq.asq_last_status)); + } + } +@@ -2853,8 +2853,8 @@ void i40e_vlan_stripping_enable(struct i + ret = i40e_aq_update_vsi_params(&vsi->back->hw, &ctxt, NULL); + if (ret) { + dev_info(&vsi->back->pdev->dev, +- "update vlan stripping failed, err %s aq_err %s\n", +- i40e_stat_str(&vsi->back->hw, ret), ++ "update vlan stripping failed, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&vsi->back->hw, + vsi->back->hw.aq.asq_last_status)); + } +@@ -2888,8 +2888,8 @@ void i40e_vlan_stripping_disable(struct + ret = i40e_aq_update_vsi_params(&vsi->back->hw, &ctxt, NULL); + if (ret) { + dev_info(&vsi->back->pdev->dev, +- "update vlan stripping failed, err %s aq_err %s\n", +- i40e_stat_str(&vsi->back->hw, ret), ++ "update vlan stripping failed, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&vsi->back->hw, + vsi->back->hw.aq.asq_last_status)); + } +@@ -3120,8 +3120,8 @@ int i40e_vsi_add_pvid(struct i40e_vsi *v + ret = i40e_aq_update_vsi_params(&vsi->back->hw, &ctxt, NULL); + if (ret) { + dev_info(&vsi->back->pdev->dev, +- "add pvid failed, err %s aq_err %s\n", +- i40e_stat_str(&vsi->back->hw, ret), ++ "add pvid failed, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&vsi->back->hw, + vsi->back->hw.aq.asq_last_status)); + return -ENOENT; +@@ -5397,8 +5397,8 @@ static int i40e_vsi_get_bw_info(struct i + ret = i40e_aq_query_vsi_bw_config(hw, vsi->seid, &bw_config, NULL); + if (ret) { + dev_info(&pf->pdev->dev, +- "couldn't get PF vsi bw config, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "couldn't get PF vsi bw config, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + return -EINVAL; + } +@@ -5408,8 +5408,8 @@ static int i40e_vsi_get_bw_info(struct i + NULL); + if (ret) { + dev_info(&pf->pdev->dev, +- "couldn't get PF vsi ets bw config, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "couldn't get PF vsi ets bw config, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + return -EINVAL; + } +@@ -5598,8 +5598,8 @@ int i40e_update_adq_vsi_queues(struct i4 + + ret = i40e_aq_update_vsi_params(hw, &ctxt, NULL); + if (ret) { +- dev_info(&pf->pdev->dev, "Update vsi config failed, err %s aq_err %s\n", +- i40e_stat_str(hw, ret), ++ dev_info(&pf->pdev->dev, "Update vsi config failed, err %d aq_err %s\n", ++ ret, + i40e_aq_str(hw, hw->aq.asq_last_status)); + return ret; + } +@@ -5654,8 +5654,8 @@ static int i40e_vsi_config_tc(struct i40 + &bw_config, NULL); + if (ret) { + dev_info(&pf->pdev->dev, +- "Failed querying vsi bw info, err %s aq_err %s\n", +- i40e_stat_str(hw, ret), ++ "Failed querying vsi bw info, err %d aq_err %s\n", ++ ret, + i40e_aq_str(hw, hw->aq.asq_last_status)); + goto out; + } +@@ -5721,8 +5721,8 @@ static int i40e_vsi_config_tc(struct i40 + ret = i40e_aq_update_vsi_params(hw, &ctxt, NULL); + if (ret) { + dev_info(&pf->pdev->dev, +- "Update vsi tc config failed, err %s aq_err %s\n", +- i40e_stat_str(hw, ret), ++ "Update vsi tc config failed, err %d aq_err %s\n", ++ ret, + i40e_aq_str(hw, hw->aq.asq_last_status)); + goto out; + } +@@ -5734,8 +5734,8 @@ static int i40e_vsi_config_tc(struct i40 + ret = i40e_vsi_get_bw_info(vsi); + if (ret) { + dev_info(&pf->pdev->dev, +- "Failed updating vsi bw info, err %s aq_err %s\n", +- i40e_stat_str(hw, ret), ++ "Failed updating vsi bw info, err %d aq_err %s\n", ++ ret, + i40e_aq_str(hw, hw->aq.asq_last_status)); + goto out; + } +@@ -5826,8 +5826,8 @@ int i40e_set_bw_limit(struct i40e_vsi *v + I40E_MAX_BW_INACTIVE_ACCUM, NULL); + if (ret) + dev_err(&pf->pdev->dev, +- "Failed set tx rate (%llu Mbps) for vsi->seid %u, err %s aq_err %s\n", +- max_tx_rate, seid, i40e_stat_str(&pf->hw, ret), ++ "Failed set tx rate (%llu Mbps) for vsi->seid %u, err %d aq_err %s\n", ++ max_tx_rate, seid, ret, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + return ret; + } +@@ -5902,8 +5902,8 @@ static void i40e_remove_queue_channels(s + last_aq_status = pf->hw.aq.asq_last_status; + if (ret) + dev_info(&pf->pdev->dev, +- "Failed to delete cloud filter, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "Failed to delete cloud filter, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, last_aq_status)); + kfree(cfilter); + } +@@ -6037,8 +6037,8 @@ static int i40e_vsi_reconfig_rss(struct + ret = i40e_config_rss(vsi, seed, lut, vsi->rss_table_size); + if (ret) { + dev_info(&pf->pdev->dev, +- "Cannot set RSS lut, err %s aq_err %s\n", +- i40e_stat_str(hw, ret), ++ "Cannot set RSS lut, err %d aq_err %s\n", ++ ret, + i40e_aq_str(hw, hw->aq.asq_last_status)); + kfree(lut); + return ret; +@@ -6136,8 +6136,8 @@ static int i40e_add_channel(struct i40e_ + ret = i40e_aq_add_vsi(hw, &ctxt, NULL); + if (ret) { + dev_info(&pf->pdev->dev, +- "add new vsi failed, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "add new vsi failed, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, + pf->hw.aq.asq_last_status)); + return -ENOENT; +@@ -6382,8 +6382,8 @@ static int i40e_validate_and_set_switch_ + mode, NULL); + if (ret && hw->aq.asq_last_status != I40E_AQ_RC_ESRCH) + dev_err(&pf->pdev->dev, +- "couldn't set switch config bits, err %s aq_err %s\n", +- i40e_stat_str(hw, ret), ++ "couldn't set switch config bits, err %d aq_err %s\n", ++ ret, + i40e_aq_str(hw, + hw->aq.asq_last_status)); + +@@ -6583,8 +6583,8 @@ int i40e_veb_config_tc(struct i40e_veb * + &bw_data, NULL); + if (ret) { + dev_info(&pf->pdev->dev, +- "VEB bw config failed, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "VEB bw config failed, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + goto out; + } +@@ -6593,8 +6593,8 @@ int i40e_veb_config_tc(struct i40e_veb * + ret = i40e_veb_get_bw_info(veb); + if (ret) { + dev_info(&pf->pdev->dev, +- "Failed getting veb bw config, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "Failed getting veb bw config, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + } + +@@ -6677,8 +6677,8 @@ static int i40e_resume_port_tx(struct i4 + ret = i40e_aq_resume_port_tx(hw, NULL); + if (ret) { + dev_info(&pf->pdev->dev, +- "Resume Port Tx failed, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "Resume Port Tx failed, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + /* Schedule PF reset to recover */ + set_bit(__I40E_PF_RESET_REQUESTED, pf->state); +@@ -6702,8 +6702,8 @@ static int i40e_suspend_port_tx(struct i + ret = i40e_aq_suspend_port_tx(hw, pf->mac_seid, NULL); + if (ret) { + dev_info(&pf->pdev->dev, +- "Suspend Port Tx failed, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "Suspend Port Tx failed, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + /* Schedule PF reset to recover */ + set_bit(__I40E_PF_RESET_REQUESTED, pf->state); +@@ -6742,8 +6742,8 @@ static int i40e_hw_set_dcb_config(struct + ret = i40e_set_dcb_config(&pf->hw); + if (ret) { + dev_info(&pf->pdev->dev, +- "Set DCB Config failed, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "Set DCB Config failed, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + goto out; + } +@@ -6859,8 +6859,8 @@ int i40e_hw_dcb_config(struct i40e_pf *p + i40e_aqc_opc_modify_switching_comp_ets, NULL); + if (ret) { + dev_info(&pf->pdev->dev, +- "Modify Port ETS failed, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "Modify Port ETS failed, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + goto out; + } +@@ -6897,8 +6897,8 @@ int i40e_hw_dcb_config(struct i40e_pf *p + ret = i40e_aq_dcb_updated(&pf->hw, NULL); + if (ret) { + dev_info(&pf->pdev->dev, +- "DCB Updated failed, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "DCB Updated failed, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + goto out; + } +@@ -6981,8 +6981,8 @@ int i40e_dcb_sw_default_config(struct i4 + i40e_aqc_opc_enable_switching_comp_ets, NULL); + if (err) { + dev_info(&pf->pdev->dev, +- "Enable Port ETS failed, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, err), ++ "Enable Port ETS failed, err %d aq_err %s\n", ++ err, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + err = -ENOENT; + goto out; +@@ -7061,8 +7061,8 @@ static int i40e_init_pf_dcb(struct i40e_ + pf->flags |= I40E_FLAG_DISABLE_FW_LLDP; + } else { + dev_info(&pf->pdev->dev, +- "Query for DCB configuration failed, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, err), ++ "Query for DCB configuration failed, err %d aq_err %s\n", ++ err, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + } + +@@ -7300,8 +7300,8 @@ static i40e_status i40e_force_link_state + NULL); + if (err) { + dev_err(&pf->pdev->dev, +- "failed to get phy cap., ret = %s last_status = %s\n", +- i40e_stat_str(hw, err), ++ "failed to get phy cap., ret = %d last_status = %s\n", ++ err, + i40e_aq_str(hw, hw->aq.asq_last_status)); + return err; + } +@@ -7312,8 +7312,8 @@ static i40e_status i40e_force_link_state + NULL); + if (err) { + dev_err(&pf->pdev->dev, +- "failed to get phy cap., ret = %s last_status = %s\n", +- i40e_stat_str(hw, err), ++ "failed to get phy cap., ret = %d last_status = %s\n", ++ err, + i40e_aq_str(hw, hw->aq.asq_last_status)); + return err; + } +@@ -7357,8 +7357,8 @@ static i40e_status i40e_force_link_state + + if (err) { + dev_err(&pf->pdev->dev, +- "set phy config ret = %s last_status = %s\n", +- i40e_stat_str(&pf->hw, err), ++ "set phy config ret = %d last_status = %s\n", ++ err, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + return err; + } +@@ -7698,8 +7698,8 @@ static int i40e_fwd_ring_up(struct i40e_ + rx_ring->netdev = NULL; + } + dev_info(&pf->pdev->dev, +- "Error adding mac filter on macvlan err %s, aq_err %s\n", +- i40e_stat_str(hw, ret), ++ "Error adding mac filter on macvlan err %d, aq_err %s\n", ++ ret, + i40e_aq_str(hw, aq_err)); + netdev_err(vdev, "L2fwd offload disabled to L2 filter error\n"); + } +@@ -7771,8 +7771,8 @@ static int i40e_setup_macvlans(struct i4 + ret = i40e_aq_update_vsi_params(hw, &ctxt, NULL); + if (ret) { + dev_info(&pf->pdev->dev, +- "Update vsi tc config failed, err %s aq_err %s\n", +- i40e_stat_str(hw, ret), ++ "Update vsi tc config failed, err %d aq_err %s\n", ++ ret, + i40e_aq_str(hw, hw->aq.asq_last_status)); + return ret; + } +@@ -7987,8 +7987,8 @@ static void i40e_fwd_del(struct net_devi + ch->fwd = NULL; + } else { + dev_info(&pf->pdev->dev, +- "Error deleting mac filter on macvlan err %s, aq_err %s\n", +- i40e_stat_str(hw, ret), ++ "Error deleting mac filter on macvlan err %d, aq_err %s\n", ++ ret, + i40e_aq_str(hw, aq_err)); + } + break; +@@ -8739,8 +8739,7 @@ static int i40e_delete_clsflower(struct + kfree(filter); + if (err) { + dev_err(&pf->pdev->dev, +- "Failed to delete cloud filter, err %s\n", +- i40e_stat_str(&pf->hw, err)); ++ "Failed to delete cloud filter, err %d\n", err); + return i40e_aq_rc_to_posix(err, pf->hw.aq.asq_last_status); + } + +@@ -9302,8 +9301,8 @@ static int i40e_handle_lldp_event(struct + pf->flags &= ~I40E_FLAG_DCB_CAPABLE; + } else { + dev_info(&pf->pdev->dev, +- "Failed querying DCB configuration data from firmware, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "Failed querying DCB configuration data from firmware, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, + pf->hw.aq.asq_last_status)); + } +@@ -10129,8 +10128,8 @@ static void i40e_enable_pf_switch_lb(str + ret = i40e_aq_get_vsi_params(&pf->hw, &ctxt, NULL); + if (ret) { + dev_info(&pf->pdev->dev, +- "couldn't get PF vsi config, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "couldn't get PF vsi config, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + return; + } +@@ -10141,8 +10140,8 @@ static void i40e_enable_pf_switch_lb(str + ret = i40e_aq_update_vsi_params(&vsi->back->hw, &ctxt, NULL); + if (ret) { + dev_info(&pf->pdev->dev, +- "update vsi switch failed, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "update vsi switch failed, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + } + } +@@ -10165,8 +10164,8 @@ static void i40e_disable_pf_switch_lb(st + ret = i40e_aq_get_vsi_params(&pf->hw, &ctxt, NULL); + if (ret) { + dev_info(&pf->pdev->dev, +- "couldn't get PF vsi config, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "couldn't get PF vsi config, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + return; + } +@@ -10177,8 +10176,8 @@ static void i40e_disable_pf_switch_lb(st + ret = i40e_aq_update_vsi_params(&vsi->back->hw, &ctxt, NULL); + if (ret) { + dev_info(&pf->pdev->dev, +- "update vsi switch failed, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "update vsi switch failed, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + } + } +@@ -10322,8 +10321,8 @@ static int i40e_get_capabilities(struct + buf_len = data_size; + } else if (pf->hw.aq.asq_last_status != I40E_AQ_RC_OK || err) { + dev_info(&pf->pdev->dev, +- "capability discovery failed, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, err), ++ "capability discovery failed, err %d aq_err %s\n", ++ err, + i40e_aq_str(&pf->hw, + pf->hw.aq.asq_last_status)); + return -ENODEV; +@@ -10460,8 +10459,8 @@ static int i40e_rebuild_cloud_filters(st + + if (ret) { + dev_dbg(&pf->pdev->dev, +- "Failed to rebuild cloud filter, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "Failed to rebuild cloud filter, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, + pf->hw.aq.asq_last_status)); + return ret; +@@ -10701,8 +10700,8 @@ static void i40e_rebuild(struct i40e_pf + /* rebuild the basics for the AdminQ, HMC, and initial HW switch */ + ret = i40e_init_adminq(&pf->hw); + if (ret) { +- dev_info(&pf->pdev->dev, "Rebuild AdminQ failed, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ dev_info(&pf->pdev->dev, "Rebuild AdminQ failed, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + goto clear_recovery; + } +@@ -10813,8 +10812,8 @@ static void i40e_rebuild(struct i40e_pf + I40E_AQ_EVENT_MEDIA_NA | + I40E_AQ_EVENT_MODULE_QUAL_FAIL), NULL); + if (ret) +- dev_info(&pf->pdev->dev, "set phy mask fail, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ dev_info(&pf->pdev->dev, "set phy mask fail, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + + /* Rebuild the VSIs and VEBs that existed before reset. +@@ -10917,8 +10916,8 @@ static void i40e_rebuild(struct i40e_pf + msleep(75); + ret = i40e_aq_set_link_restart_an(&pf->hw, true, NULL); + if (ret) +- dev_info(&pf->pdev->dev, "link restart failed, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ dev_info(&pf->pdev->dev, "link restart failed, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, + pf->hw.aq.asq_last_status)); + } +@@ -10949,9 +10948,9 @@ static void i40e_rebuild(struct i40e_pf + ret = i40e_set_promiscuous(pf, pf->cur_promisc); + if (ret) + dev_warn(&pf->pdev->dev, +- "Failed to restore promiscuous setting: %s, err %s aq_err %s\n", ++ "Failed to restore promiscuous setting: %s, err %d aq_err %s\n", + pf->cur_promisc ? "on" : "off", +- i40e_stat_str(&pf->hw, ret), ++ ret, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + + i40e_reset_all_vfs(pf, true); +@@ -12086,8 +12085,8 @@ static int i40e_get_rss_aq(struct i40e_v + (struct i40e_aqc_get_set_rss_key_data *)seed); + if (ret) { + dev_info(&pf->pdev->dev, +- "Cannot get RSS key, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "Cannot get RSS key, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, + pf->hw.aq.asq_last_status)); + return ret; +@@ -12100,8 +12099,8 @@ static int i40e_get_rss_aq(struct i40e_v + ret = i40e_aq_get_rss_lut(hw, vsi->id, pf_lut, lut, lut_size); + if (ret) { + dev_info(&pf->pdev->dev, +- "Cannot get RSS lut, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "Cannot get RSS lut, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, + pf->hw.aq.asq_last_status)); + return ret; +@@ -12441,8 +12440,8 @@ i40e_status i40e_commit_partition_bw_set + last_aq_status = pf->hw.aq.asq_last_status; + if (ret) { + dev_info(&pf->pdev->dev, +- "Cannot acquire NVM for read access, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "Cannot acquire NVM for read access, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, last_aq_status)); + goto bw_commit_out; + } +@@ -12458,8 +12457,8 @@ i40e_status i40e_commit_partition_bw_set + last_aq_status = pf->hw.aq.asq_last_status; + i40e_release_nvm(&pf->hw); + if (ret) { +- dev_info(&pf->pdev->dev, "NVM read error, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ dev_info(&pf->pdev->dev, "NVM read error, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, last_aq_status)); + goto bw_commit_out; + } +@@ -12472,8 +12471,8 @@ i40e_status i40e_commit_partition_bw_set + last_aq_status = pf->hw.aq.asq_last_status; + if (ret) { + dev_info(&pf->pdev->dev, +- "Cannot acquire NVM for write access, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "Cannot acquire NVM for write access, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, last_aq_status)); + goto bw_commit_out; + } +@@ -12492,8 +12491,8 @@ i40e_status i40e_commit_partition_bw_set + i40e_release_nvm(&pf->hw); + if (ret) + dev_info(&pf->pdev->dev, +- "BW settings NOT SAVED, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "BW settings NOT SAVED, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, last_aq_status)); + bw_commit_out: + +@@ -12547,8 +12546,8 @@ static bool i40e_is_total_port_shutdown_ + + err_nvm: + dev_warn(&pf->pdev->dev, +- "total-port-shutdown feature is off due to read nvm error: %s\n", +- i40e_stat_str(&pf->hw, read_status)); ++ "total-port-shutdown feature is off due to read nvm error: %d\n", ++ read_status); + return ret; + } + +@@ -12874,8 +12873,8 @@ static int i40e_udp_tunnel_set_port(stru + ret = i40e_aq_add_udp_tunnel(hw, ntohs(ti->port), type, &filter_index, + NULL); + if (ret) { +- netdev_info(netdev, "add UDP port failed, err %s aq_err %s\n", +- i40e_stat_str(hw, ret), ++ netdev_info(netdev, "add UDP port failed, err %d aq_err %s\n", ++ ret, + i40e_aq_str(hw, hw->aq.asq_last_status)); + return -EIO; + } +@@ -12894,8 +12893,8 @@ static int i40e_udp_tunnel_unset_port(st + + ret = i40e_aq_del_udp_tunnel(hw, ti->hw_priv, NULL); + if (ret) { +- netdev_info(netdev, "delete UDP port failed, err %s aq_err %s\n", +- i40e_stat_str(hw, ret), ++ netdev_info(netdev, "delete UDP port failed, err %d aq_err %s\n", ++ ret, + i40e_aq_str(hw, hw->aq.asq_last_status)); + return -EIO; + } +@@ -13766,8 +13765,8 @@ static int i40e_add_vsi(struct i40e_vsi + ctxt.flags = I40E_AQ_VSI_TYPE_PF; + if (ret) { + dev_info(&pf->pdev->dev, +- "couldn't get PF vsi config, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "couldn't get PF vsi config, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, + pf->hw.aq.asq_last_status)); + return -ENOENT; +@@ -13796,8 +13795,8 @@ static int i40e_add_vsi(struct i40e_vsi + ret = i40e_aq_update_vsi_params(hw, &ctxt, NULL); + if (ret) { + dev_info(&pf->pdev->dev, +- "update vsi failed, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "update vsi failed, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, + pf->hw.aq.asq_last_status)); + ret = -ENOENT; +@@ -13816,8 +13815,8 @@ static int i40e_add_vsi(struct i40e_vsi + ret = i40e_aq_update_vsi_params(hw, &ctxt, NULL); + if (ret) { + dev_info(&pf->pdev->dev, +- "update vsi failed, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "update vsi failed, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, + pf->hw.aq.asq_last_status)); + ret = -ENOENT; +@@ -13839,9 +13838,9 @@ static int i40e_add_vsi(struct i40e_vsi + * message and continue + */ + dev_info(&pf->pdev->dev, +- "failed to configure TCs for main VSI tc_map 0x%08x, err %s aq_err %s\n", ++ "failed to configure TCs for main VSI tc_map 0x%08x, err %d aq_err %s\n", + enabled_tc, +- i40e_stat_str(&pf->hw, ret), ++ ret, + i40e_aq_str(&pf->hw, + pf->hw.aq.asq_last_status)); + } +@@ -13935,8 +13934,8 @@ static int i40e_add_vsi(struct i40e_vsi + ret = i40e_aq_add_vsi(hw, &ctxt, NULL); + if (ret) { + dev_info(&vsi->back->pdev->dev, +- "add vsi failed, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "add vsi failed, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, + pf->hw.aq.asq_last_status)); + ret = -ENOENT; +@@ -13967,8 +13966,8 @@ static int i40e_add_vsi(struct i40e_vsi + ret = i40e_vsi_get_bw_info(vsi); + if (ret) { + dev_info(&pf->pdev->dev, +- "couldn't get vsi bw info, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "couldn't get vsi bw info, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + /* VSI is already added so not tearing that up */ + ret = 0; +@@ -14414,8 +14413,8 @@ static int i40e_veb_get_bw_info(struct i + &bw_data, NULL); + if (ret) { + dev_info(&pf->pdev->dev, +- "query veb bw config failed, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "query veb bw config failed, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, hw->aq.asq_last_status)); + goto out; + } +@@ -14424,8 +14423,8 @@ static int i40e_veb_get_bw_info(struct i + &ets_data, NULL); + if (ret) { + dev_info(&pf->pdev->dev, +- "query veb bw ets config failed, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "query veb bw ets config failed, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, hw->aq.asq_last_status)); + goto out; + } +@@ -14621,8 +14620,8 @@ static int i40e_add_veb(struct i40e_veb + /* get a VEB from the hardware */ + if (ret) { + dev_info(&pf->pdev->dev, +- "couldn't add VEB, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "couldn't add VEB, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + return -EPERM; + } +@@ -14632,16 +14631,16 @@ static int i40e_add_veb(struct i40e_veb + &veb->stats_idx, NULL, NULL, NULL); + if (ret) { + dev_info(&pf->pdev->dev, +- "couldn't get VEB statistics idx, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "couldn't get VEB statistics idx, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + return -EPERM; + } + ret = i40e_veb_get_bw_info(veb); + if (ret) { + dev_info(&pf->pdev->dev, +- "couldn't get VEB bw info, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "couldn't get VEB bw info, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + i40e_aq_delete_element(&pf->hw, veb->seid, NULL); + return -ENOENT; +@@ -14851,8 +14850,8 @@ int i40e_fetch_switch_configuration(stru + &next_seid, NULL); + if (ret) { + dev_info(&pf->pdev->dev, +- "get switch config failed err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "get switch config failed err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, + pf->hw.aq.asq_last_status)); + kfree(aq_buf); +@@ -14897,8 +14896,8 @@ static int i40e_setup_pf_switch(struct i + ret = i40e_fetch_switch_configuration(pf, false); + if (ret) { + dev_info(&pf->pdev->dev, +- "couldn't fetch switch config, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "couldn't fetch switch config, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + return ret; + } +@@ -14924,8 +14923,8 @@ static int i40e_setup_pf_switch(struct i + NULL); + if (ret && pf->hw.aq.asq_last_status != I40E_AQ_RC_ESRCH) { + dev_info(&pf->pdev->dev, +- "couldn't set switch config bits, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, ret), ++ "couldn't set switch config bits, err %d aq_err %s\n", ++ ret, + i40e_aq_str(&pf->hw, + pf->hw.aq.asq_last_status)); + /* not a fatal problem, just keep going */ +@@ -15833,8 +15832,8 @@ static int i40e_probe(struct pci_dev *pd + I40E_AQ_EVENT_MEDIA_NA | + I40E_AQ_EVENT_MODULE_QUAL_FAIL), NULL); + if (err) +- dev_info(&pf->pdev->dev, "set phy mask fail, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, err), ++ dev_info(&pf->pdev->dev, "set phy mask fail, err %d aq_err %s\n", ++ err, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + + /* Reconfigure hardware for allowing smaller MSS in the case +@@ -15852,8 +15851,8 @@ static int i40e_probe(struct pci_dev *pd + msleep(75); + err = i40e_aq_set_link_restart_an(&pf->hw, true, NULL); + if (err) +- dev_info(&pf->pdev->dev, "link restart failed, err %s aq_err %s\n", +- i40e_stat_str(&pf->hw, err), ++ dev_info(&pf->pdev->dev, "link restart failed, err %d aq_err %s\n", ++ err, + i40e_aq_str(&pf->hw, + pf->hw.aq.asq_last_status)); + } +@@ -15985,8 +15984,8 @@ static int i40e_probe(struct pci_dev *pd + /* get the requested speeds from the fw */ + err = i40e_aq_get_phy_capabilities(hw, false, false, &abilities, NULL); + if (err) +- dev_dbg(&pf->pdev->dev, "get requested speeds ret = %s last_status = %s\n", +- i40e_stat_str(&pf->hw, err), ++ dev_dbg(&pf->pdev->dev, "get requested speeds ret = %d last_status = %s\n", ++ err, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + pf->hw.phy.link_info.requested_speeds = abilities.link_speed; + +@@ -15996,8 +15995,8 @@ static int i40e_probe(struct pci_dev *pd + /* get the supported phy types from the fw */ + err = i40e_aq_get_phy_capabilities(hw, false, true, &abilities, NULL); + if (err) +- dev_dbg(&pf->pdev->dev, "get supported phy types ret = %s last_status = %s\n", +- i40e_stat_str(&pf->hw, err), ++ dev_dbg(&pf->pdev->dev, "get supported phy types ret = %d last_status = %s\n", ++ err, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + + /* make sure the MFS hasn't been set lower than the default */ +--- a/drivers/net/ethernet/intel/i40e/i40e_nvm.c ++++ b/drivers/net/ethernet/intel/i40e/i40e_nvm.c +@@ -1428,8 +1428,8 @@ static i40e_status i40e_nvmupd_exec_aq(s + buff_size, &cmd_details); + if (status) { + i40e_debug(hw, I40E_DEBUG_NVM, +- "i40e_nvmupd_exec_aq err %s aq_err %s\n", +- i40e_stat_str(hw, status), ++ "%s err %d aq_err %s\n", ++ __func__, status, + i40e_aq_str(hw, hw->aq.asq_last_status)); + *perrno = i40e_aq_rc_to_posix(status, hw->aq.asq_last_status); + return status; +--- a/drivers/net/ethernet/intel/i40e/i40e_prototype.h ++++ b/drivers/net/ethernet/intel/i40e/i40e_prototype.h +@@ -36,7 +36,6 @@ void i40e_idle_aq(struct i40e_hw *hw); + bool i40e_check_asq_alive(struct i40e_hw *hw); + i40e_status i40e_aq_queue_shutdown(struct i40e_hw *hw, bool unloading); + const char *i40e_aq_str(struct i40e_hw *hw, enum i40e_admin_queue_err aq_err); +-const char *i40e_stat_str(struct i40e_hw *hw, i40e_status stat_err); + + i40e_status i40e_aq_get_rss_lut(struct i40e_hw *hw, u16 seid, + bool pf_lut, u8 *lut, u16 lut_size); +--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c ++++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +@@ -1264,9 +1264,9 @@ i40e_set_vsi_promisc(struct i40e_vf *vf, + int aq_err = pf->hw.aq.asq_last_status; + + dev_err(&pf->pdev->dev, +- "VF %d failed to set multicast promiscuous mode err %s aq_err %s\n", ++ "VF %d failed to set multicast promiscuous mode err %d aq_err %s\n", + vf->vf_id, +- i40e_stat_str(&pf->hw, aq_ret), ++ aq_ret, + i40e_aq_str(&pf->hw, aq_err)); + + return aq_ret; +@@ -1280,9 +1280,9 @@ i40e_set_vsi_promisc(struct i40e_vf *vf, + int aq_err = pf->hw.aq.asq_last_status; + + dev_err(&pf->pdev->dev, +- "VF %d failed to set unicast promiscuous mode err %s aq_err %s\n", ++ "VF %d failed to set unicast promiscuous mode err %d aq_err %s\n", + vf->vf_id, +- i40e_stat_str(&pf->hw, aq_ret), ++ aq_ret, + i40e_aq_str(&pf->hw, aq_err)); + } + +@@ -1297,9 +1297,9 @@ i40e_set_vsi_promisc(struct i40e_vf *vf, + int aq_err = pf->hw.aq.asq_last_status; + + dev_err(&pf->pdev->dev, +- "VF %d failed to set multicast promiscuous mode err %s aq_err %s\n", ++ "VF %d failed to set multicast promiscuous mode err %d aq_err %s\n", + vf->vf_id, +- i40e_stat_str(&pf->hw, aq_ret), ++ aq_ret, + i40e_aq_str(&pf->hw, aq_err)); + + if (!aq_tmp) +@@ -1313,9 +1313,9 @@ i40e_set_vsi_promisc(struct i40e_vf *vf, + int aq_err = pf->hw.aq.asq_last_status; + + dev_err(&pf->pdev->dev, +- "VF %d failed to set unicast promiscuous mode err %s aq_err %s\n", ++ "VF %d failed to set unicast promiscuous mode err %d aq_err %s\n", + vf->vf_id, +- i40e_stat_str(&pf->hw, aq_ret), ++ aq_ret, + i40e_aq_str(&pf->hw, aq_err)); + + if (!aq_tmp) +@@ -3591,8 +3591,8 @@ static void i40e_del_all_cloud_filters(s + ret = i40e_add_del_cloud_filter(vsi, cfilter, false); + if (ret) + dev_err(&pf->pdev->dev, +- "VF %d: Failed to delete cloud filter, err %s aq_err %s\n", +- vf->vf_id, i40e_stat_str(&pf->hw, ret), ++ "VF %d: Failed to delete cloud filter, err %d aq_err %s\n", ++ vf->vf_id, ret, + i40e_aq_str(&pf->hw, + pf->hw.aq.asq_last_status)); + +@@ -3694,8 +3694,8 @@ static int i40e_vc_del_cloud_filter(stru + ret = i40e_add_del_cloud_filter(vsi, &cfilter, false); + if (ret) { + dev_err(&pf->pdev->dev, +- "VF %d: Failed to delete cloud filter, err %s aq_err %s\n", +- vf->vf_id, i40e_stat_str(&pf->hw, ret), ++ "VF %d: Failed to delete cloud filter, err %d aq_err %s\n", ++ vf->vf_id, ret, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + goto err; + } +@@ -3828,8 +3828,8 @@ static int i40e_vc_add_cloud_filter(stru + ret = i40e_add_del_cloud_filter(vsi, cfilter, true); + if (ret) { + dev_err(&pf->pdev->dev, +- "VF %d: Failed to add cloud filter, err %s aq_err %s\n", +- vf->vf_id, i40e_stat_str(&pf->hw, ret), ++ "VF %d: Failed to add cloud filter, err %d aq_err %s\n", ++ vf->vf_id, ret, + i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); + goto err_free; + } diff --git a/queue-5.15/i40e-use-int-for-i40e_status.patch b/queue-5.15/i40e-use-int-for-i40e_status.patch new file mode 100644 index 00000000000..df7381c38c2 --- /dev/null +++ b/queue-5.15/i40e-use-int-for-i40e_status.patch @@ -0,0 +1,5313 @@ +From 915923898ffc66efbbf35f4d5943687e97b781d5 Mon Sep 17 00:00:00 2001 +From: Jan Sokolowski +Date: Mon, 9 Jan 2023 15:11:18 +0100 +Subject: i40e: use int for i40e_status + +From: Jan Sokolowski + +commit 5180ff1364bc26c031b54a68a80aa90ce0028b70 upstream. + +To prepare for removal of i40e_status, change the variables +from i40e_status to int. This eases the transition when values +are changed to return standard int error codes over enum i40e_status. + +As such changes often also change variable orders, a cleanup +is also applied here to make variables conform to RCT and +some lines are also reformatted where applicable. + +Signed-off-by: Jan Sokolowski +Tested-by: Gurucharan G (A Contingent worker at Intel) +Signed-off-by: Tony Nguyen +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/intel/i40e/i40e.h | 6 + drivers/net/ethernet/intel/i40e/i40e_adminq.c | 64 - + 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 | 884 ++++++++++----------- + 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_debugfs.c | 8 + drivers/net/ethernet/intel/i40e/i40e_diag.c | 12 + drivers/net/ethernet/intel/i40e/i40e_diag.h | 4 + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 24 + drivers/net/ethernet/intel/i40e/i40e_hmc.c | 56 - + drivers/net/ethernet/intel/i40e/i40e_hmc.h | 44 - + drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 94 +- + drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h | 32 + 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 | 630 ++++++-------- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 66 - + 21 files changed, 1183 insertions(+), 1215 deletions(-) + +--- a/drivers/net/ethernet/intel/i40e/i40e.h ++++ b/drivers/net/ethernet/intel/i40e/i40e.h +@@ -1266,9 +1266,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_status i40e_get_partition_bw_setting(struct i40e_pf *pf); +-i40e_status i40e_set_partition_bw_setting(struct i40e_pf *pf); +-i40e_status i40e_commit_partition_bw_setting(struct i40e_pf *pf); ++int i40e_get_partition_bw_setting(struct i40e_pf *pf); ++int i40e_set_partition_bw_setting(struct i40e_pf *pf); ++int i40e_commit_partition_bw_setting(struct i40e_pf *pf); + void i40e_print_link_message(struct i40e_vsi *vsi, bool isup); + + void i40e_set_fec_in_flags(u8 fec_cfg, u32 *flags); +--- a/drivers/net/ethernet/intel/i40e/i40e_adminq.c ++++ b/drivers/net/ethernet/intel/i40e/i40e_adminq.c +@@ -47,9 +47,9 @@ static void i40e_adminq_init_regs(struct + * i40e_alloc_adminq_asq_ring - Allocate Admin Queue send rings + * @hw: pointer to the hardware structure + **/ +-static i40e_status i40e_alloc_adminq_asq_ring(struct i40e_hw *hw) ++static int i40e_alloc_adminq_asq_ring(struct i40e_hw *hw) + { +- i40e_status ret_code; ++ int ret_code; + + ret_code = i40e_allocate_dma_mem(hw, &hw->aq.asq.desc_buf, + i40e_mem_atq_ring, +@@ -74,9 +74,9 @@ static i40e_status i40e_alloc_adminq_asq + * i40e_alloc_adminq_arq_ring - Allocate Admin Queue receive rings + * @hw: pointer to the hardware structure + **/ +-static i40e_status i40e_alloc_adminq_arq_ring(struct i40e_hw *hw) ++static int i40e_alloc_adminq_arq_ring(struct i40e_hw *hw) + { +- i40e_status ret_code; ++ int ret_code; + + ret_code = i40e_allocate_dma_mem(hw, &hw->aq.arq.desc_buf, + i40e_mem_arq_ring, +@@ -115,11 +115,11 @@ static void i40e_free_adminq_arq(struct + * i40e_alloc_arq_bufs - Allocate pre-posted buffers for the receive queue + * @hw: pointer to the hardware structure + **/ +-static i40e_status i40e_alloc_arq_bufs(struct i40e_hw *hw) ++static int i40e_alloc_arq_bufs(struct i40e_hw *hw) + { +- i40e_status ret_code; + struct i40e_aq_desc *desc; + struct i40e_dma_mem *bi; ++ int ret_code; + int i; + + /* We'll be allocating the buffer info memory first, then we can +@@ -182,10 +182,10 @@ unwind_alloc_arq_bufs: + * i40e_alloc_asq_bufs - Allocate empty buffer structs for the send queue + * @hw: pointer to the hardware structure + **/ +-static i40e_status i40e_alloc_asq_bufs(struct i40e_hw *hw) ++static int i40e_alloc_asq_bufs(struct i40e_hw *hw) + { +- i40e_status ret_code; + struct i40e_dma_mem *bi; ++ int ret_code; + int i; + + /* No mapped memory needed yet, just the buffer info structures */ +@@ -266,9 +266,9 @@ static void i40e_free_asq_bufs(struct i4 + * + * Configure base address and length registers for the transmit queue + **/ +-static i40e_status i40e_config_asq_regs(struct i40e_hw *hw) ++static int i40e_config_asq_regs(struct i40e_hw *hw) + { +- i40e_status ret_code = 0; ++ int ret_code = 0; + u32 reg = 0; + + /* Clear Head and Tail */ +@@ -295,9 +295,9 @@ static i40e_status i40e_config_asq_regs( + * + * Configure base address and length registers for the receive (event queue) + **/ +-static i40e_status i40e_config_arq_regs(struct i40e_hw *hw) ++static int i40e_config_arq_regs(struct i40e_hw *hw) + { +- i40e_status ret_code = 0; ++ int ret_code = 0; + u32 reg = 0; + + /* Clear Head and Tail */ +@@ -334,9 +334,9 @@ static i40e_status i40e_config_arq_regs( + * Do *NOT* hold the lock when calling this as the memory allocation routines + * called are not going to be atomic context safe + **/ +-static i40e_status i40e_init_asq(struct i40e_hw *hw) ++static int i40e_init_asq(struct i40e_hw *hw) + { +- i40e_status ret_code = 0; ++ int ret_code = 0; + + if (hw->aq.asq.count > 0) { + /* queue already initialized */ +@@ -393,9 +393,9 @@ init_adminq_exit: + * Do *NOT* hold the lock when calling this as the memory allocation routines + * called are not going to be atomic context safe + **/ +-static i40e_status i40e_init_arq(struct i40e_hw *hw) ++static int i40e_init_arq(struct i40e_hw *hw) + { +- i40e_status ret_code = 0; ++ int ret_code = 0; + + if (hw->aq.arq.count > 0) { + /* queue already initialized */ +@@ -445,9 +445,9 @@ init_adminq_exit: + * + * The main shutdown routine for the Admin Send Queue + **/ +-static i40e_status i40e_shutdown_asq(struct i40e_hw *hw) ++static int i40e_shutdown_asq(struct i40e_hw *hw) + { +- i40e_status ret_code = 0; ++ int ret_code = 0; + + mutex_lock(&hw->aq.asq_mutex); + +@@ -479,9 +479,9 @@ shutdown_asq_out: + * + * The main shutdown routine for the Admin Receive Queue + **/ +-static i40e_status i40e_shutdown_arq(struct i40e_hw *hw) ++static int i40e_shutdown_arq(struct i40e_hw *hw) + { +- i40e_status ret_code = 0; ++ int ret_code = 0; + + mutex_lock(&hw->aq.arq_mutex); + +@@ -582,12 +582,12 @@ static void i40e_set_hw_flags(struct i40 + * - hw->aq.arq_buf_size + * - hw->aq.asq_buf_size + **/ +-i40e_status i40e_init_adminq(struct i40e_hw *hw) ++int i40e_init_adminq(struct i40e_hw *hw) + { + u16 cfg_ptr, oem_hi, oem_lo; + u16 eetrack_lo, eetrack_hi; +- i40e_status ret_code; + int retry = 0; ++ int ret_code; + + /* verify input for valid configuration */ + if ((hw->aq.num_arq_entries == 0) || +@@ -779,18 +779,18 @@ static bool i40e_asq_done(struct i40e_hw + * This is the main send command driver routine for the Admin Queue send + * queue. It runs the queue, cleans the queue, etc + **/ +-i40e_status i40e_asq_send_command(struct i40e_hw *hw, +- struct i40e_aq_desc *desc, +- void *buff, /* can be NULL */ +- u16 buff_size, +- struct i40e_asq_cmd_details *cmd_details) ++int i40e_asq_send_command(struct i40e_hw *hw, ++ struct i40e_aq_desc *desc, ++ void *buff, /* can be NULL */ ++ u16 buff_size, ++ struct i40e_asq_cmd_details *cmd_details) + { +- i40e_status status = 0; + struct i40e_dma_mem *dma_buff = NULL; + struct i40e_asq_cmd_details *details; + struct i40e_aq_desc *desc_on_ring; + bool cmd_completed = false; + u16 retval = 0; ++ int status = 0; + u32 val = 0; + + mutex_lock(&hw->aq.asq_mutex); +@@ -993,14 +993,14 @@ void i40e_fill_default_direct_cmd_desc(s + * the contents through e. It can also return how many events are + * left to process through 'pending' + **/ +-i40e_status i40e_clean_arq_element(struct i40e_hw *hw, +- struct i40e_arq_event_info *e, +- u16 *pending) ++int i40e_clean_arq_element(struct i40e_hw *hw, ++ struct i40e_arq_event_info *e, ++ u16 *pending) + { +- i40e_status ret_code = 0; + u16 ntc = hw->aq.arq.next_to_clean; + struct i40e_aq_desc *desc; + struct i40e_dma_mem *bi; ++ int ret_code = 0; + u16 desc_idx; + u16 datalen; + u16 flags; +--- a/drivers/net/ethernet/intel/i40e/i40e_alloc.h ++++ b/drivers/net/ethernet/intel/i40e/i40e_alloc.h +@@ -20,16 +20,16 @@ enum i40e_memory_type { + }; + + /* prototype for functions used for dynamic memory allocation */ +-i40e_status i40e_allocate_dma_mem(struct i40e_hw *hw, +- struct i40e_dma_mem *mem, +- enum i40e_memory_type type, +- u64 size, u32 alignment); +-i40e_status i40e_free_dma_mem(struct i40e_hw *hw, +- struct i40e_dma_mem *mem); +-i40e_status i40e_allocate_virt_mem(struct i40e_hw *hw, +- struct i40e_virt_mem *mem, +- u32 size); +-i40e_status i40e_free_virt_mem(struct i40e_hw *hw, +- struct i40e_virt_mem *mem); ++int i40e_allocate_dma_mem(struct i40e_hw *hw, ++ struct i40e_dma_mem *mem, ++ enum i40e_memory_type type, ++ u64 size, u32 alignment); ++int i40e_free_dma_mem(struct i40e_hw *hw, ++ struct i40e_dma_mem *mem); ++int i40e_allocate_virt_mem(struct i40e_hw *hw, ++ struct i40e_virt_mem *mem, ++ u32 size); ++int i40e_free_virt_mem(struct i40e_hw *hw, ++ struct i40e_virt_mem *mem); + + #endif /* _I40E_ALLOC_H_ */ +--- a/drivers/net/ethernet/intel/i40e/i40e_client.c ++++ b/drivers/net/ethernet/intel/i40e/i40e_client.c +@@ -541,7 +541,7 @@ static int i40e_client_virtchnl_send(str + { + struct i40e_pf *pf = ldev->pf; + struct i40e_hw *hw = &pf->hw; +- i40e_status err; ++ int err; + + err = i40e_aq_send_msg_to_vf(hw, vf_id, VIRTCHNL_OP_IWARP, + 0, msg, len, NULL); +@@ -674,7 +674,7 @@ static int i40e_client_update_vsi_ctxt(s + struct i40e_vsi *vsi = pf->vsi[pf->lan_vsi]; + struct i40e_vsi_context ctxt; + bool update = true; +- i40e_status err; ++ int err; + + /* TODO: for now do not allow setting VF's VSI setting */ + if (is_vf) +--- a/drivers/net/ethernet/intel/i40e/i40e_common.c ++++ b/drivers/net/ethernet/intel/i40e/i40e_common.c +@@ -14,9 +14,9 @@ + * This function sets the mac type of the adapter based on the + * vendor ID and device ID stored in the hw structure. + **/ +-i40e_status i40e_set_mac_type(struct i40e_hw *hw) ++int i40e_set_mac_type(struct i40e_hw *hw) + { +- i40e_status status = 0; ++ int status = 0; + + if (hw->vendor_id == PCI_VENDOR_ID_INTEL) { + switch (hw->device_id) { +@@ -205,13 +205,13 @@ bool i40e_check_asq_alive(struct i40e_hw + * Tell the Firmware that we're shutting down the AdminQ and whether + * or not the driver is unloading as well. + **/ +-i40e_status i40e_aq_queue_shutdown(struct i40e_hw *hw, +- bool unloading) ++int i40e_aq_queue_shutdown(struct i40e_hw *hw, ++ bool unloading) + { + struct i40e_aq_desc desc; + struct i40e_aqc_queue_shutdown *cmd = + (struct i40e_aqc_queue_shutdown *)&desc.params.raw; +- i40e_status status; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, + i40e_aqc_opc_queue_shutdown); +@@ -234,15 +234,15 @@ i40e_status i40e_aq_queue_shutdown(struc + * + * Internal function to get or set RSS look up table + **/ +-static i40e_status i40e_aq_get_set_rss_lut(struct i40e_hw *hw, +- u16 vsi_id, bool pf_lut, +- u8 *lut, u16 lut_size, +- bool set) ++static int i40e_aq_get_set_rss_lut(struct i40e_hw *hw, ++ u16 vsi_id, bool pf_lut, ++ u8 *lut, u16 lut_size, ++ bool set) + { +- i40e_status status; + struct i40e_aq_desc desc; + struct i40e_aqc_get_set_rss_lut *cmd_resp = + (struct i40e_aqc_get_set_rss_lut *)&desc.params.raw; ++ int status; + + if (set) + i40e_fill_default_direct_cmd_desc(&desc, +@@ -287,8 +287,8 @@ static i40e_status i40e_aq_get_set_rss_l + * + * get the RSS lookup table, PF or VSI type + **/ +-i40e_status i40e_aq_get_rss_lut(struct i40e_hw *hw, u16 vsi_id, +- bool pf_lut, u8 *lut, u16 lut_size) ++int i40e_aq_get_rss_lut(struct i40e_hw *hw, u16 vsi_id, ++ bool pf_lut, u8 *lut, u16 lut_size) + { + return i40e_aq_get_set_rss_lut(hw, vsi_id, pf_lut, lut, lut_size, + false); +@@ -304,8 +304,8 @@ i40e_status i40e_aq_get_rss_lut(struct i + * + * set the RSS lookup table, PF or VSI type + **/ +-i40e_status i40e_aq_set_rss_lut(struct i40e_hw *hw, u16 vsi_id, +- bool pf_lut, u8 *lut, u16 lut_size) ++int i40e_aq_set_rss_lut(struct i40e_hw *hw, u16 vsi_id, ++ bool pf_lut, u8 *lut, u16 lut_size) + { + return i40e_aq_get_set_rss_lut(hw, vsi_id, pf_lut, lut, lut_size, true); + } +@@ -319,16 +319,16 @@ i40e_status i40e_aq_set_rss_lut(struct i + * + * get the RSS key per VSI + **/ +-static i40e_status i40e_aq_get_set_rss_key(struct i40e_hw *hw, +- u16 vsi_id, +- struct i40e_aqc_get_set_rss_key_data *key, +- bool set) ++static int i40e_aq_get_set_rss_key(struct i40e_hw *hw, ++ u16 vsi_id, ++ struct i40e_aqc_get_set_rss_key_data *key, ++ bool set) + { +- i40e_status status; + struct i40e_aq_desc desc; + struct i40e_aqc_get_set_rss_key *cmd_resp = + (struct i40e_aqc_get_set_rss_key *)&desc.params.raw; + u16 key_size = sizeof(struct i40e_aqc_get_set_rss_key_data); ++ int status; + + if (set) + i40e_fill_default_direct_cmd_desc(&desc, +@@ -359,9 +359,9 @@ static i40e_status i40e_aq_get_set_rss_k + * @key: pointer to key info struct + * + **/ +-i40e_status i40e_aq_get_rss_key(struct i40e_hw *hw, +- u16 vsi_id, +- struct i40e_aqc_get_set_rss_key_data *key) ++int i40e_aq_get_rss_key(struct i40e_hw *hw, ++ u16 vsi_id, ++ struct i40e_aqc_get_set_rss_key_data *key) + { + return i40e_aq_get_set_rss_key(hw, vsi_id, key, false); + } +@@ -374,9 +374,9 @@ i40e_status i40e_aq_get_rss_key(struct i + * + * set the RSS key per VSI + **/ +-i40e_status i40e_aq_set_rss_key(struct i40e_hw *hw, +- u16 vsi_id, +- struct i40e_aqc_get_set_rss_key_data *key) ++int i40e_aq_set_rss_key(struct i40e_hw *hw, ++ u16 vsi_id, ++ struct i40e_aqc_get_set_rss_key_data *key) + { + return i40e_aq_get_set_rss_key(hw, vsi_id, key, true); + } +@@ -646,10 +646,10 @@ struct i40e_rx_ptype_decoded i40e_ptype_ + * hw_addr, back, device_id, vendor_id, subsystem_device_id, + * subsystem_vendor_id, and revision_id + **/ +-i40e_status i40e_init_shared_code(struct i40e_hw *hw) ++int i40e_init_shared_code(struct i40e_hw *hw) + { +- i40e_status status = 0; + u32 port, ari, func_rid; ++ int status = 0; + + i40e_set_mac_type(hw); + +@@ -686,15 +686,16 @@ i40e_status i40e_init_shared_code(struct + * @addrs: the requestor's mac addr store + * @cmd_details: pointer to command details structure or NULL + **/ +-static i40e_status i40e_aq_mac_address_read(struct i40e_hw *hw, +- u16 *flags, +- struct i40e_aqc_mac_address_read_data *addrs, +- struct i40e_asq_cmd_details *cmd_details) ++static int ++i40e_aq_mac_address_read(struct i40e_hw *hw, ++ u16 *flags, ++ struct i40e_aqc_mac_address_read_data *addrs, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_mac_address_read *cmd_data = + (struct i40e_aqc_mac_address_read *)&desc.params.raw; +- i40e_status status; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_mac_address_read); + desc.flags |= cpu_to_le16(I40E_AQ_FLAG_BUF); +@@ -713,14 +714,14 @@ static i40e_status i40e_aq_mac_address_r + * @mac_addr: address to write + * @cmd_details: pointer to command details structure or NULL + **/ +-i40e_status i40e_aq_mac_address_write(struct i40e_hw *hw, +- u16 flags, u8 *mac_addr, +- struct i40e_asq_cmd_details *cmd_details) ++int i40e_aq_mac_address_write(struct i40e_hw *hw, ++ u16 flags, u8 *mac_addr, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_mac_address_write *cmd_data = + (struct i40e_aqc_mac_address_write *)&desc.params.raw; +- i40e_status status; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, + i40e_aqc_opc_mac_address_write); +@@ -743,11 +744,11 @@ i40e_status i40e_aq_mac_address_write(st + * + * Reads the adapter's MAC address from register + **/ +-i40e_status i40e_get_mac_addr(struct i40e_hw *hw, u8 *mac_addr) ++int i40e_get_mac_addr(struct i40e_hw *hw, u8 *mac_addr) + { + struct i40e_aqc_mac_address_read_data addrs; +- i40e_status status; + u16 flags = 0; ++ int status; + + status = i40e_aq_mac_address_read(hw, &flags, &addrs, NULL); + +@@ -764,11 +765,11 @@ i40e_status i40e_get_mac_addr(struct i40 + * + * Reads the adapter's Port MAC address + **/ +-i40e_status i40e_get_port_mac_addr(struct i40e_hw *hw, u8 *mac_addr) ++int i40e_get_port_mac_addr(struct i40e_hw *hw, u8 *mac_addr) + { + struct i40e_aqc_mac_address_read_data addrs; +- i40e_status status; + u16 flags = 0; ++ int status; + + status = i40e_aq_mac_address_read(hw, &flags, &addrs, NULL); + if (status) +@@ -822,13 +823,13 @@ void i40e_pre_tx_queue_cfg(struct i40e_h + * + * Reads the part number string from the EEPROM. + **/ +-i40e_status 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) + { +- i40e_status status = 0; + u16 pba_word = 0; + u16 pba_size = 0; + u16 pba_ptr = 0; ++ int status = 0; + u16 i = 0; + + status = i40e_read_nvm_word(hw, I40E_SR_PBA_FLAGS, &pba_word); +@@ -937,8 +938,8 @@ static enum i40e_media_type i40e_get_med + * @hw: pointer to the hardware structure + * @retry_limit: how many times to retry before failure + **/ +-static i40e_status i40e_poll_globr(struct i40e_hw *hw, +- u32 retry_limit) ++static int i40e_poll_globr(struct i40e_hw *hw, ++ u32 retry_limit) + { + u32 cnt, reg = 0; + +@@ -964,7 +965,7 @@ static i40e_status i40e_poll_globr(struc + * Assuming someone else has triggered a global reset, + * assure the global reset is complete and then reset the PF + **/ +-i40e_status i40e_pf_reset(struct i40e_hw *hw) ++int i40e_pf_reset(struct i40e_hw *hw) + { + u32 cnt = 0; + u32 cnt1 = 0; +@@ -1303,15 +1304,16 @@ void i40e_led_set(struct i40e_hw *hw, u3 + * + * Returns the various PHY abilities supported on the Port. + **/ +-i40e_status 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_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) + { +- struct i40e_aq_desc desc; +- i40e_status status; + u16 abilities_size = sizeof(struct i40e_aq_get_phy_abilities_resp); + u16 max_delay = I40E_MAX_PHY_TIMEOUT, total_delay = 0; ++ struct i40e_aq_desc desc; ++ int status; + + if (!abilities) + return I40E_ERR_PARAM; +@@ -1382,14 +1384,14 @@ i40e_status i40e_aq_get_phy_capabilities + * of the PHY Config parameters. This status will be indicated by the + * command response. + **/ +-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) ++int i40e_aq_set_phy_config(struct i40e_hw *hw, ++ struct i40e_aq_set_phy_config *config, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aq_set_phy_config *cmd = + (struct i40e_aq_set_phy_config *)&desc.params.raw; +- enum i40e_status_code status; ++ int status; + + if (!config) + return I40E_ERR_PARAM; +@@ -1404,7 +1406,7 @@ enum i40e_status_code i40e_aq_set_phy_co + return status; + } + +-static noinline_for_stack enum i40e_status_code ++static noinline_for_stack int + i40e_set_fc_status(struct i40e_hw *hw, + struct i40e_aq_get_phy_abilities_resp *abilities, + bool atomic_restart) +@@ -1462,11 +1464,11 @@ i40e_set_fc_status(struct i40e_hw *hw, + * + * Set the requested flow control mode using set_phy_config. + **/ +-enum i40e_status_code i40e_set_fc(struct i40e_hw *hw, u8 *aq_failures, +- bool atomic_restart) ++int i40e_set_fc(struct i40e_hw *hw, u8 *aq_failures, ++ bool atomic_restart) + { + struct i40e_aq_get_phy_abilities_resp abilities; +- enum i40e_status_code status; ++ int status; + + *aq_failures = 0x0; + +@@ -1505,13 +1507,13 @@ enum i40e_status_code i40e_set_fc(struct + * + * Tell the firmware that the driver is taking over from PXE + **/ +-i40e_status i40e_aq_clear_pxe_mode(struct i40e_hw *hw, +- struct i40e_asq_cmd_details *cmd_details) ++int i40e_aq_clear_pxe_mode(struct i40e_hw *hw, ++ struct i40e_asq_cmd_details *cmd_details) + { +- i40e_status status; + struct i40e_aq_desc desc; + struct i40e_aqc_clear_pxe *cmd = + (struct i40e_aqc_clear_pxe *)&desc.params.raw; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, + i40e_aqc_opc_clear_pxe_mode); +@@ -1533,14 +1535,14 @@ i40e_status i40e_aq_clear_pxe_mode(struc + * + * Sets up the link and restarts the Auto-Negotiation over the link. + **/ +-i40e_status i40e_aq_set_link_restart_an(struct i40e_hw *hw, +- bool enable_link, +- struct i40e_asq_cmd_details *cmd_details) ++int i40e_aq_set_link_restart_an(struct i40e_hw *hw, ++ bool enable_link, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_set_link_restart_an *cmd = + (struct i40e_aqc_set_link_restart_an *)&desc.params.raw; +- i40e_status status; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, + i40e_aqc_opc_set_link_restart_an); +@@ -1565,17 +1567,17 @@ i40e_status i40e_aq_set_link_restart_an( + * + * Returns the link status of the adapter. + **/ +-i40e_status i40e_aq_get_link_info(struct i40e_hw *hw, +- bool enable_lse, struct i40e_link_status *link, +- struct i40e_asq_cmd_details *cmd_details) ++int i40e_aq_get_link_info(struct i40e_hw *hw, ++ bool enable_lse, struct i40e_link_status *link, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_get_link_status *resp = + (struct i40e_aqc_get_link_status *)&desc.params.raw; + struct i40e_link_status *hw_link_info = &hw->phy.link_info; +- i40e_status status; + bool tx_pause, rx_pause; + u16 command_flags; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_get_link_status); + +@@ -1661,14 +1663,14 @@ aq_get_link_info_exit: + * + * Set link interrupt mask. + **/ +-i40e_status i40e_aq_set_phy_int_mask(struct i40e_hw *hw, +- u16 mask, +- 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) + { + struct i40e_aq_desc desc; + struct i40e_aqc_set_phy_int_mask *cmd = + (struct i40e_aqc_set_phy_int_mask *)&desc.params.raw; +- i40e_status status; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, + i40e_aqc_opc_set_phy_int_mask); +@@ -1688,13 +1690,13 @@ i40e_status i40e_aq_set_phy_int_mask(str + * + * Reset the external PHY. + **/ +-i40e_status i40e_aq_set_phy_debug(struct i40e_hw *hw, u8 cmd_flags, +- 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) + { + struct i40e_aq_desc desc; + struct i40e_aqc_set_phy_debug *cmd = + (struct i40e_aqc_set_phy_debug *)&desc.params.raw; +- i40e_status status; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, + i40e_aqc_opc_set_phy_debug); +@@ -1729,9 +1731,9 @@ static bool i40e_is_aq_api_ver_ge(struct + * + * Add a VSI context to the hardware. + **/ +-i40e_status i40e_aq_add_vsi(struct i40e_hw *hw, +- struct i40e_vsi_context *vsi_ctx, +- 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) + { + struct i40e_aq_desc desc; + struct i40e_aqc_add_get_update_vsi *cmd = +@@ -1739,7 +1741,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_status status; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, + i40e_aqc_opc_add_vsi); +@@ -1772,15 +1774,15 @@ aq_add_vsi_exit: + * @seid: vsi number + * @cmd_details: pointer to command details structure or NULL + **/ +-i40e_status i40e_aq_set_default_vsi(struct i40e_hw *hw, +- u16 seid, +- struct i40e_asq_cmd_details *cmd_details) ++int i40e_aq_set_default_vsi(struct i40e_hw *hw, ++ u16 seid, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_set_vsi_promiscuous_modes *cmd = + (struct i40e_aqc_set_vsi_promiscuous_modes *) + &desc.params.raw; +- i40e_status status; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, + i40e_aqc_opc_set_vsi_promiscuous_modes); +@@ -1800,15 +1802,15 @@ i40e_status i40e_aq_set_default_vsi(stru + * @seid: vsi number + * @cmd_details: pointer to command details structure or NULL + **/ +-i40e_status i40e_aq_clear_default_vsi(struct i40e_hw *hw, +- u16 seid, +- struct i40e_asq_cmd_details *cmd_details) ++int i40e_aq_clear_default_vsi(struct i40e_hw *hw, ++ u16 seid, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_set_vsi_promiscuous_modes *cmd = + (struct i40e_aqc_set_vsi_promiscuous_modes *) + &desc.params.raw; +- i40e_status status; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, + i40e_aqc_opc_set_vsi_promiscuous_modes); +@@ -1830,16 +1832,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_status i40e_aq_set_vsi_unicast_promiscuous(struct i40e_hw *hw, +- u16 seid, bool set, +- struct i40e_asq_cmd_details *cmd_details, +- bool rx_only_promisc) ++int i40e_aq_set_vsi_unicast_promiscuous(struct i40e_hw *hw, ++ u16 seid, bool set, ++ struct i40e_asq_cmd_details *cmd_details, ++ bool rx_only_promisc) + { + struct i40e_aq_desc desc; + struct i40e_aqc_set_vsi_promiscuous_modes *cmd = + (struct i40e_aqc_set_vsi_promiscuous_modes *)&desc.params.raw; +- i40e_status status; + u16 flags = 0; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, + i40e_aqc_opc_set_vsi_promiscuous_modes); +@@ -1870,14 +1872,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_status i40e_aq_set_vsi_multicast_promiscuous(struct i40e_hw *hw, +- u16 seid, bool set, struct i40e_asq_cmd_details *cmd_details) ++int i40e_aq_set_vsi_multicast_promiscuous(struct i40e_hw *hw, ++ u16 seid, bool set, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_set_vsi_promiscuous_modes *cmd = + (struct i40e_aqc_set_vsi_promiscuous_modes *)&desc.params.raw; +- i40e_status status; + u16 flags = 0; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, + i40e_aqc_opc_set_vsi_promiscuous_modes); +@@ -1903,16 +1906,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 + **/ +-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) ++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) + { + struct i40e_aq_desc desc; + struct i40e_aqc_set_vsi_promiscuous_modes *cmd = + (struct i40e_aqc_set_vsi_promiscuous_modes *)&desc.params.raw; +- enum i40e_status_code status; + u16 flags = 0; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, + i40e_aqc_opc_set_vsi_promiscuous_modes); +@@ -1938,16 +1941,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 + **/ +-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_set_vsi_uc_promisc_on_vlan(struct i40e_hw *hw, ++ u16 seid, bool enable, ++ u16 vid, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_set_vsi_promiscuous_modes *cmd = + (struct i40e_aqc_set_vsi_promiscuous_modes *)&desc.params.raw; +- enum i40e_status_code status; + u16 flags = 0; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, + i40e_aqc_opc_set_vsi_promiscuous_modes); +@@ -1979,15 +1982,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_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) ++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_aq_desc desc; + struct i40e_aqc_set_vsi_promiscuous_modes *cmd = + (struct i40e_aqc_set_vsi_promiscuous_modes *)&desc.params.raw; +- i40e_status status; + u16 flags = 0; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, + i40e_aqc_opc_set_vsi_promiscuous_modes); +@@ -2014,14 +2017,14 @@ i40e_status i40e_aq_set_vsi_bc_promisc_o + * + * Set or clear the broadcast promiscuous flag (filter) for a given VSI. + **/ +-i40e_status i40e_aq_set_vsi_broadcast(struct i40e_hw *hw, +- u16 seid, bool set_filter, +- struct i40e_asq_cmd_details *cmd_details) ++int i40e_aq_set_vsi_broadcast(struct i40e_hw *hw, ++ u16 seid, bool set_filter, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_set_vsi_promiscuous_modes *cmd = + (struct i40e_aqc_set_vsi_promiscuous_modes *)&desc.params.raw; +- i40e_status status; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, + i40e_aqc_opc_set_vsi_promiscuous_modes); +@@ -2047,15 +2050,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_status i40e_aq_set_vsi_vlan_promisc(struct i40e_hw *hw, +- u16 seid, bool enable, +- struct i40e_asq_cmd_details *cmd_details) ++int i40e_aq_set_vsi_vlan_promisc(struct i40e_hw *hw, ++ u16 seid, bool enable, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_set_vsi_promiscuous_modes *cmd = + (struct i40e_aqc_set_vsi_promiscuous_modes *)&desc.params.raw; +- i40e_status status; + u16 flags = 0; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, + i40e_aqc_opc_set_vsi_promiscuous_modes); +@@ -2077,9 +2080,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 + **/ +-i40e_status i40e_aq_get_vsi_params(struct i40e_hw *hw, +- struct i40e_vsi_context *vsi_ctx, +- struct i40e_asq_cmd_details *cmd_details) ++int i40e_aq_get_vsi_params(struct i40e_hw *hw, ++ struct i40e_vsi_context *vsi_ctx, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_add_get_update_vsi *cmd = +@@ -2087,7 +2090,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_status status; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, + i40e_aqc_opc_get_vsi_parameters); +@@ -2119,9 +2122,9 @@ aq_get_vsi_params_exit: + * + * Update a VSI context. + **/ +-i40e_status i40e_aq_update_vsi_params(struct i40e_hw *hw, +- struct i40e_vsi_context *vsi_ctx, +- struct i40e_asq_cmd_details *cmd_details) ++int i40e_aq_update_vsi_params(struct i40e_hw *hw, ++ struct i40e_vsi_context *vsi_ctx, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_add_get_update_vsi *cmd = +@@ -2129,7 +2132,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_status status; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, + i40e_aqc_opc_update_vsi_parameters); +@@ -2156,15 +2159,15 @@ i40e_status i40e_aq_update_vsi_params(st + * + * Fill the buf with switch configuration returned from AdminQ command + **/ +-i40e_status 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) ++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_aq_desc desc; + struct i40e_aqc_switch_seid *scfg = + (struct i40e_aqc_switch_seid *)&desc.params.raw; +- i40e_status status; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, + i40e_aqc_opc_get_switch_config); +@@ -2190,15 +2193,15 @@ i40e_status i40e_aq_get_switch_config(st + * + * Set switch configuration bits + **/ +-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) ++int i40e_aq_set_switch_config(struct i40e_hw *hw, ++ u16 flags, ++ u16 valid_flags, u8 mode, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_set_switch_config *scfg = + (struct i40e_aqc_set_switch_config *)&desc.params.raw; +- enum i40e_status_code status; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, + i40e_aqc_opc_set_switch_config); +@@ -2227,16 +2230,16 @@ enum i40e_status_code i40e_aq_set_switch + * + * Get the firmware version from the admin queue commands + **/ +-i40e_status i40e_aq_get_firmware_version(struct i40e_hw *hw, +- u16 *fw_major_version, u16 *fw_minor_version, +- u32 *fw_build, +- u16 *api_major_version, u16 *api_minor_version, +- 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, ++ u16 *api_major_version, u16 *api_minor_version, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_get_version *resp = + (struct i40e_aqc_get_version *)&desc.params.raw; +- i40e_status status; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_get_version); + +@@ -2266,14 +2269,14 @@ i40e_status i40e_aq_get_firmware_version + * + * Send the driver version to the firmware + **/ +-i40e_status i40e_aq_send_driver_version(struct i40e_hw *hw, ++int i40e_aq_send_driver_version(struct i40e_hw *hw, + struct i40e_driver_version *dv, + struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_driver_version *cmd = + (struct i40e_aqc_driver_version *)&desc.params.raw; +- i40e_status status; ++ int status; + u16 len; + + if (dv == NULL) +@@ -2308,9 +2311,9 @@ i40e_status i40e_aq_send_driver_version( + * + * Side effect: LinkStatusEvent reporting becomes enabled + **/ +-i40e_status i40e_get_link_status(struct i40e_hw *hw, bool *link_up) ++int i40e_get_link_status(struct i40e_hw *hw, bool *link_up) + { +- i40e_status status = 0; ++ int status = 0; + + if (hw->phy.get_link_info) { + status = i40e_update_link_info(hw); +@@ -2329,10 +2332,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 + **/ +-noinline_for_stack i40e_status i40e_update_link_info(struct i40e_hw *hw) ++noinline_for_stack int i40e_update_link_info(struct i40e_hw *hw) + { + struct i40e_aq_get_phy_abilities_resp abilities; +- i40e_status status = 0; ++ int status = 0; + + status = i40e_aq_get_link_info(hw, true, NULL, NULL); + if (status) +@@ -2379,19 +2382,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. + **/ +-i40e_status i40e_aq_add_veb(struct i40e_hw *hw, u16 uplink_seid, +- u16 downlink_seid, u8 enabled_tc, +- bool default_port, u16 *veb_seid, +- bool enable_stats, +- struct i40e_asq_cmd_details *cmd_details) ++int i40e_aq_add_veb(struct i40e_hw *hw, u16 uplink_seid, ++ u16 downlink_seid, u8 enabled_tc, ++ bool default_port, u16 *veb_seid, ++ bool enable_stats, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_add_veb *cmd = + (struct i40e_aqc_add_veb *)&desc.params.raw; + struct i40e_aqc_add_veb_completion *resp = + (struct i40e_aqc_add_veb_completion *)&desc.params.raw; +- i40e_status status; + u16 veb_flags = 0; ++ int status; + + /* SEIDs need to either both be set or both be 0 for floating VEB */ + if (!!uplink_seid != !!downlink_seid) +@@ -2437,17 +2440,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. + **/ +-i40e_status i40e_aq_get_veb_parameters(struct i40e_hw *hw, +- u16 veb_seid, u16 *switch_id, +- bool *floating, u16 *statistic_index, +- u16 *vebs_used, u16 *vebs_free, +- struct i40e_asq_cmd_details *cmd_details) ++int i40e_aq_get_veb_parameters(struct i40e_hw *hw, ++ u16 veb_seid, u16 *switch_id, ++ bool *floating, u16 *statistic_index, ++ u16 *vebs_used, u16 *vebs_free, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_get_veb_parameters_completion *cmd_resp = + (struct i40e_aqc_get_veb_parameters_completion *) + &desc.params.raw; +- i40e_status status; ++ int status; + + if (veb_seid == 0) + return I40E_ERR_PARAM; +@@ -2491,14 +2494,14 @@ get_veb_exit: + * + * Add MAC/VLAN addresses to the HW filtering + **/ +-i40e_status i40e_aq_add_macvlan(struct i40e_hw *hw, u16 seid, ++int 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) + { + struct i40e_aq_desc desc; + struct i40e_aqc_macvlan *cmd = + (struct i40e_aqc_macvlan *)&desc.params.raw; +- i40e_status status; ++ int status; + u16 buf_size; + int i; + +@@ -2539,15 +2542,16 @@ i40e_status i40e_aq_add_macvlan(struct i + * + * Remove MAC/VLAN addresses from the HW filtering + **/ +-i40e_status i40e_aq_remove_macvlan(struct i40e_hw *hw, u16 seid, +- struct i40e_aqc_remove_macvlan_element_data *mv_list, +- u16 count, struct i40e_asq_cmd_details *cmd_details) ++int ++i40e_aq_remove_macvlan(struct i40e_hw *hw, u16 seid, ++ struct i40e_aqc_remove_macvlan_element_data *mv_list, ++ u16 count, struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_macvlan *cmd = + (struct i40e_aqc_macvlan *)&desc.params.raw; +- i40e_status status; + u16 buf_size; ++ int status; + + if (count == 0 || !mv_list || !hw) + return I40E_ERR_PARAM; +@@ -2588,19 +2592,19 @@ i40e_status i40e_aq_remove_macvlan(struc + * Add/Delete a mirror rule to a specific switch. Mirror rules are supported for + * VEBs/VEPA elements only + **/ +-static i40e_status i40e_mirrorrule_op(struct i40e_hw *hw, +- u16 opcode, u16 sw_seid, u16 rule_type, u16 id, +- u16 count, __le16 *mr_list, +- struct i40e_asq_cmd_details *cmd_details, +- u16 *rule_id, u16 *rules_used, u16 *rules_free) ++static int i40e_mirrorrule_op(struct i40e_hw *hw, ++ u16 opcode, u16 sw_seid, u16 rule_type, u16 id, ++ u16 count, __le16 *mr_list, ++ struct i40e_asq_cmd_details *cmd_details, ++ u16 *rule_id, u16 *rules_used, u16 *rules_free) + { + struct i40e_aq_desc desc; + struct i40e_aqc_add_delete_mirror_rule *cmd = + (struct i40e_aqc_add_delete_mirror_rule *)&desc.params.raw; + struct i40e_aqc_add_delete_mirror_rule_completion *resp = + (struct i40e_aqc_add_delete_mirror_rule_completion *)&desc.params.raw; +- i40e_status status; + u16 buf_size; ++ int status; + + buf_size = count * sizeof(*mr_list); + +@@ -2648,10 +2652,11 @@ static i40e_status i40e_mirrorrule_op(st + * + * Add mirror rule. Mirror rules are supported for VEBs or VEPA elements only + **/ +-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, +- u16 *rule_id, u16 *rules_used, u16 *rules_free) ++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, ++ u16 *rule_id, u16 *rules_used, u16 *rules_free) + { + if (!(rule_type == I40E_AQC_MIRROR_RULE_TYPE_ALL_INGRESS || + rule_type == I40E_AQC_MIRROR_RULE_TYPE_ALL_EGRESS)) { +@@ -2679,10 +2684,11 @@ i40e_status i40e_aq_add_mirrorrule(struc + * + * Delete a mirror rule. Mirror rules are supported for VEBs/VEPA elements only + **/ +-i40e_status i40e_aq_delete_mirrorrule(struct i40e_hw *hw, u16 sw_seid, +- u16 rule_type, u16 rule_id, u16 count, __le16 *mr_list, +- struct i40e_asq_cmd_details *cmd_details, +- u16 *rules_used, u16 *rules_free) ++int i40e_aq_delete_mirrorrule(struct i40e_hw *hw, u16 sw_seid, ++ u16 rule_type, u16 rule_id, u16 count, ++ __le16 *mr_list, ++ struct i40e_asq_cmd_details *cmd_details, ++ u16 *rules_used, u16 *rules_free) + { + /* Rule ID has to be valid except rule_type: INGRESS VLAN mirroring */ + if (rule_type == I40E_AQC_MIRROR_RULE_TYPE_VLAN) { +@@ -2711,14 +2717,14 @@ i40e_status i40e_aq_delete_mirrorrule(st + * + * send msg to vf + **/ +-i40e_status i40e_aq_send_msg_to_vf(struct i40e_hw *hw, u16 vfid, +- u32 v_opcode, u32 v_retval, u8 *msg, u16 msglen, +- struct i40e_asq_cmd_details *cmd_details) ++int i40e_aq_send_msg_to_vf(struct i40e_hw *hw, u16 vfid, ++ u32 v_opcode, u32 v_retval, u8 *msg, u16 msglen, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_pf_vf_message *cmd = + (struct i40e_aqc_pf_vf_message *)&desc.params.raw; +- i40e_status status; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_send_msg_to_vf); + cmd->id = cpu_to_le32(vfid); +@@ -2746,14 +2752,14 @@ i40e_status i40e_aq_send_msg_to_vf(struc + * + * Read the register using the admin queue commands + **/ +-i40e_status i40e_aq_debug_read_register(struct i40e_hw *hw, ++int i40e_aq_debug_read_register(struct i40e_hw *hw, + u32 reg_addr, u64 *reg_val, + struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_debug_reg_read_write *cmd_resp = + (struct i40e_aqc_debug_reg_read_write *)&desc.params.raw; +- i40e_status status; ++ int status; + + if (reg_val == NULL) + return I40E_ERR_PARAM; +@@ -2781,14 +2787,14 @@ i40e_status i40e_aq_debug_read_register( + * + * Write to a register using the admin queue commands + **/ +-i40e_status i40e_aq_debug_write_register(struct i40e_hw *hw, +- u32 reg_addr, u64 reg_val, +- struct i40e_asq_cmd_details *cmd_details) ++int i40e_aq_debug_write_register(struct i40e_hw *hw, ++ u32 reg_addr, u64 reg_val, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_debug_reg_read_write *cmd = + (struct i40e_aqc_debug_reg_read_write *)&desc.params.raw; +- i40e_status status; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_debug_write_reg); + +@@ -2812,16 +2818,16 @@ i40e_status i40e_aq_debug_write_register + * + * requests common resource using the admin queue commands + **/ +-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) ++int 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) + { + struct i40e_aq_desc desc; + struct i40e_aqc_request_resource *cmd_resp = + (struct i40e_aqc_request_resource *)&desc.params.raw; +- i40e_status status; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_request_resource); + +@@ -2851,15 +2857,15 @@ i40e_status i40e_aq_request_resource(str + * + * release common resource using the admin queue commands + **/ +-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) ++int i40e_aq_release_resource(struct i40e_hw *hw, ++ enum i40e_aq_resources_ids resource, ++ u8 sdp_number, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_request_resource *cmd = + (struct i40e_aqc_request_resource *)&desc.params.raw; +- i40e_status status; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_release_resource); + +@@ -2883,15 +2889,15 @@ i40e_status i40e_aq_release_resource(str + * + * Read the NVM using the admin queue commands + **/ +-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) ++int 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) + { + struct i40e_aq_desc desc; + struct i40e_aqc_nvm_update *cmd = + (struct i40e_aqc_nvm_update *)&desc.params.raw; +- i40e_status status; ++ int status; + + /* In offset the highest byte must be zeroed. */ + if (offset & 0xFF000000) { +@@ -2929,14 +2935,14 @@ i40e_aq_read_nvm_exit: + * + * Erase the NVM sector using the admin queue commands + **/ +-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) ++int 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) + { + struct i40e_aq_desc desc; + struct i40e_aqc_nvm_update *cmd = + (struct i40e_aqc_nvm_update *)&desc.params.raw; +- i40e_status status; ++ int status; + + /* In offset the highest byte must be zeroed. */ + if (offset & 0xFF000000) { +@@ -2977,8 +2983,8 @@ static void i40e_parse_discover_capabili + u32 number, logical_id, phys_id; + struct i40e_hw_capabilities *p; + u16 id, ocp_cfg_word0; +- i40e_status status; + u8 major_rev; ++ int status; + u32 i = 0; + + cap = (struct i40e_aqc_list_capabilities_element_resp *) buff; +@@ -3219,14 +3225,14 @@ static void i40e_parse_discover_capabili + * + * Get the device capabilities descriptions from the firmware + **/ +-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) ++int 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) + { + struct i40e_aqc_list_capabilites *cmd; + struct i40e_aq_desc desc; +- i40e_status status = 0; ++ int status = 0; + + cmd = (struct i40e_aqc_list_capabilites *)&desc.params.raw; + +@@ -3268,15 +3274,15 @@ exit: + * + * Update the NVM using the admin queue commands + **/ +-i40e_status i40e_aq_update_nvm(struct i40e_hw *hw, u8 module_pointer, +- u32 offset, u16 length, void *data, +- bool last_command, u8 preservation_flags, +- struct i40e_asq_cmd_details *cmd_details) ++int i40e_aq_update_nvm(struct i40e_hw *hw, u8 module_pointer, ++ u32 offset, u16 length, void *data, ++ bool last_command, u8 preservation_flags, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_nvm_update *cmd = + (struct i40e_aqc_nvm_update *)&desc.params.raw; +- i40e_status status; ++ int status; + + /* In offset the highest byte must be zeroed. */ + if (offset & 0xFF000000) { +@@ -3321,13 +3327,13 @@ i40e_aq_update_nvm_exit: + * + * Rearrange NVM structure, available only for transition FW + **/ +-i40e_status i40e_aq_rearrange_nvm(struct i40e_hw *hw, +- u8 rearrange_nvm, +- struct i40e_asq_cmd_details *cmd_details) ++int i40e_aq_rearrange_nvm(struct i40e_hw *hw, ++ u8 rearrange_nvm, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aqc_nvm_update *cmd; +- i40e_status status; + struct i40e_aq_desc desc; ++ int status; + + cmd = (struct i40e_aqc_nvm_update *)&desc.params.raw; + +@@ -3361,17 +3367,17 @@ i40e_aq_rearrange_nvm_exit: + * + * Requests the complete LLDP MIB (entire packet). + **/ +-i40e_status i40e_aq_get_lldp_mib(struct i40e_hw *hw, u8 bridge_type, +- u8 mib_type, void *buff, u16 buff_size, +- u16 *local_len, u16 *remote_len, +- struct i40e_asq_cmd_details *cmd_details) ++int i40e_aq_get_lldp_mib(struct i40e_hw *hw, u8 bridge_type, ++ u8 mib_type, void *buff, u16 buff_size, ++ u16 *local_len, u16 *remote_len, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_lldp_get_mib *cmd = + (struct i40e_aqc_lldp_get_mib *)&desc.params.raw; + struct i40e_aqc_lldp_get_mib *resp = + (struct i40e_aqc_lldp_get_mib *)&desc.params.raw; +- i40e_status status; ++ int status; + + if (buff_size == 0 || !buff) + return I40E_ERR_PARAM; +@@ -3411,14 +3417,14 @@ i40e_status i40e_aq_get_lldp_mib(struct + * + * Set the LLDP MIB. + **/ +-enum i40e_status_code ++int + i40e_aq_set_lldp_mib(struct i40e_hw *hw, + u8 mib_type, void *buff, u16 buff_size, + struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aqc_lldp_set_local_mib *cmd; +- enum i40e_status_code status; + struct i40e_aq_desc desc; ++ int status; + + cmd = (struct i40e_aqc_lldp_set_local_mib *)&desc.params.raw; + if (buff_size == 0 || !buff) +@@ -3450,14 +3456,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_status i40e_aq_cfg_lldp_mib_change_event(struct i40e_hw *hw, +- bool enable_update, +- struct i40e_asq_cmd_details *cmd_details) ++int i40e_aq_cfg_lldp_mib_change_event(struct i40e_hw *hw, ++ bool enable_update, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_lldp_update_mib *cmd = + (struct i40e_aqc_lldp_update_mib *)&desc.params.raw; +- i40e_status status; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_lldp_update_mib); + +@@ -3479,14 +3485,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. + **/ +-enum i40e_status_code ++int + i40e_aq_restore_lldp(struct i40e_hw *hw, u8 *setting, bool restore, + struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_lldp_restore *cmd = + (struct i40e_aqc_lldp_restore *)&desc.params.raw; +- i40e_status status; ++ int status; + + if (!(hw->flags & I40E_HW_FLAG_FW_LLDP_PERSISTENT)) { + i40e_debug(hw, I40E_DEBUG_ALL, +@@ -3516,14 +3522,14 @@ i40e_aq_restore_lldp(struct i40e_hw *hw, + * + * Stop or Shutdown the embedded LLDP Agent + **/ +-i40e_status i40e_aq_stop_lldp(struct i40e_hw *hw, bool shutdown_agent, +- bool persist, +- struct i40e_asq_cmd_details *cmd_details) ++int i40e_aq_stop_lldp(struct i40e_hw *hw, bool shutdown_agent, ++ bool persist, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_lldp_stop *cmd = + (struct i40e_aqc_lldp_stop *)&desc.params.raw; +- i40e_status status; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_lldp_stop); + +@@ -3551,13 +3557,13 @@ i40e_status i40e_aq_stop_lldp(struct i40 + * + * Start the embedded LLDP Agent on all ports. + **/ +-i40e_status i40e_aq_start_lldp(struct i40e_hw *hw, bool persist, +- 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) + { + struct i40e_aq_desc desc; + struct i40e_aqc_lldp_start *cmd = + (struct i40e_aqc_lldp_start *)&desc.params.raw; +- i40e_status status; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_lldp_start); + +@@ -3583,14 +3589,14 @@ i40e_status i40e_aq_start_lldp(struct i4 + * @dcb_enable: True if DCB configuration needs to be applied + * + **/ +-enum i40e_status_code ++int + i40e_aq_set_dcb_parameters(struct i40e_hw *hw, bool dcb_enable, + struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_set_dcb_parameters *cmd = + (struct i40e_aqc_set_dcb_parameters *)&desc.params.raw; +- i40e_status status; ++ int status; + + if (!(hw->flags & I40E_HW_FLAG_FW_LLDP_STOPPABLE)) + return I40E_ERR_DEVICE_NOT_SUPPORTED; +@@ -3616,12 +3622,12 @@ i40e_aq_set_dcb_parameters(struct i40e_h + * + * Get CEE DCBX mode operational configuration from firmware + **/ +-i40e_status 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_get_cee_dcb_config(struct i40e_hw *hw, ++ void *buff, u16 buff_size, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; +- i40e_status status; ++ int status; + + if (buff_size == 0 || !buff) + return I40E_ERR_PARAM; +@@ -3647,17 +3653,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_status i40e_aq_add_udp_tunnel(struct i40e_hw *hw, +- u16 udp_port, u8 protocol_index, +- u8 *filter_index, +- 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, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_add_udp_tunnel *cmd = + (struct i40e_aqc_add_udp_tunnel *)&desc.params.raw; + struct i40e_aqc_del_udp_tunnel_completion *resp = + (struct i40e_aqc_del_udp_tunnel_completion *)&desc.params.raw; +- i40e_status status; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_add_udp_tunnel); + +@@ -3678,13 +3684,13 @@ i40e_status i40e_aq_add_udp_tunnel(struc + * @index: filter index + * @cmd_details: pointer to command details structure or NULL + **/ +-i40e_status i40e_aq_del_udp_tunnel(struct i40e_hw *hw, u8 index, +- struct i40e_asq_cmd_details *cmd_details) ++int i40e_aq_del_udp_tunnel(struct i40e_hw *hw, u8 index, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_remove_udp_tunnel *cmd = + (struct i40e_aqc_remove_udp_tunnel *)&desc.params.raw; +- i40e_status status; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_del_udp_tunnel); + +@@ -3703,13 +3709,13 @@ i40e_status i40e_aq_del_udp_tunnel(struc + * + * This deletes a switch element from the switch. + **/ +-i40e_status i40e_aq_delete_element(struct i40e_hw *hw, u16 seid, +- struct i40e_asq_cmd_details *cmd_details) ++int i40e_aq_delete_element(struct i40e_hw *hw, u16 seid, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_switch_seid *cmd = + (struct i40e_aqc_switch_seid *)&desc.params.raw; +- i40e_status status; ++ int status; + + if (seid == 0) + return I40E_ERR_PARAM; +@@ -3732,11 +3738,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_status i40e_aq_dcb_updated(struct i40e_hw *hw, +- struct i40e_asq_cmd_details *cmd_details) ++int i40e_aq_dcb_updated(struct i40e_hw *hw, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; +- i40e_status status; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_dcb_updated); + +@@ -3756,15 +3762,15 @@ i40e_status i40e_aq_dcb_updated(struct i + * + * Generic command handler for Tx scheduler AQ commands + **/ +-static i40e_status i40e_aq_tx_sched_cmd(struct i40e_hw *hw, u16 seid, ++static int i40e_aq_tx_sched_cmd(struct i40e_hw *hw, u16 seid, + void *buff, u16 buff_size, +- enum i40e_admin_queue_opc opcode, ++ enum i40e_admin_queue_opc opcode, + struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_tx_sched_ind *cmd = + (struct i40e_aqc_tx_sched_ind *)&desc.params.raw; +- i40e_status status; ++ int status; + bool cmd_param_flag = false; + + switch (opcode) { +@@ -3814,14 +3820,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_status i40e_aq_config_vsi_bw_limit(struct i40e_hw *hw, ++int i40e_aq_config_vsi_bw_limit(struct i40e_hw *hw, + u16 seid, u16 credit, u8 max_credit, + struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_configure_vsi_bw_limit *cmd = + (struct i40e_aqc_configure_vsi_bw_limit *)&desc.params.raw; +- i40e_status status; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, + i40e_aqc_opc_configure_vsi_bw_limit); +@@ -3842,10 +3848,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 + **/ +-i40e_status 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_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) + { + return i40e_aq_tx_sched_cmd(hw, seid, (void *)bw_data, sizeof(*bw_data), + i40e_aqc_opc_configure_vsi_tc_bw, +@@ -3860,11 +3866,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 + **/ +-i40e_status 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_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) + { + return i40e_aq_tx_sched_cmd(hw, seid, (void *)ets_data, + sizeof(*ets_data), opcode, cmd_details); +@@ -3877,7 +3884,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 + **/ +-i40e_status i40e_aq_config_switch_comp_bw_config(struct i40e_hw *hw, ++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) +@@ -3894,10 +3902,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 + **/ +-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_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) + { + return i40e_aq_tx_sched_cmd(hw, seid, (void *)bw_data, sizeof(*bw_data), + i40e_aqc_opc_query_vsi_bw_config, +@@ -3911,10 +3920,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 + **/ +-i40e_status 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_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) + { + return i40e_aq_tx_sched_cmd(hw, seid, (void *)bw_data, sizeof(*bw_data), + i40e_aqc_opc_query_vsi_ets_sla_config, +@@ -3928,10 +3938,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 + **/ +-i40e_status 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_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) + { + return i40e_aq_tx_sched_cmd(hw, seid, (void *)bw_data, sizeof(*bw_data), + i40e_aqc_opc_query_switching_comp_ets_config, +@@ -3945,10 +3956,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 + **/ +-i40e_status 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_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) + { + return i40e_aq_tx_sched_cmd(hw, seid, (void *)bw_data, sizeof(*bw_data), + i40e_aqc_opc_query_port_ets_config, +@@ -3962,10 +3974,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 + **/ +-i40e_status 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_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) + { + return i40e_aq_tx_sched_cmd(hw, seid, (void *)bw_data, sizeof(*bw_data), + i40e_aqc_opc_query_switching_comp_bw_config, +@@ -3984,8 +3997,9 @@ i40e_status i40e_aq_query_switch_comp_bw + * Returns 0 if the values passed are valid and within + * range else returns an error. + **/ +-static i40e_status i40e_validate_filter_settings(struct i40e_hw *hw, +- struct i40e_filter_control_settings *settings) ++static int ++i40e_validate_filter_settings(struct i40e_hw *hw, ++ struct i40e_filter_control_settings *settings) + { + u32 fcoe_cntx_size, fcoe_filt_size; + u32 pe_cntx_size, pe_filt_size; +@@ -4076,11 +4090,11 @@ static i40e_status i40e_validate_filter_ + * for a single PF. It is expected that these settings are programmed + * at the driver initialization time. + **/ +-i40e_status i40e_set_filter_control(struct i40e_hw *hw, +- struct i40e_filter_control_settings *settings) ++int i40e_set_filter_control(struct i40e_hw *hw, ++ struct i40e_filter_control_settings *settings) + { +- i40e_status ret = 0; + u32 hash_lut_size = 0; ++ int ret = 0; + u32 val; + + if (!settings) +@@ -4150,11 +4164,11 @@ i40e_status i40e_set_filter_control(stru + * In return it will update the total number of perfect filter count in + * the stats member. + **/ +-i40e_status i40e_aq_add_rem_control_packet_filter(struct i40e_hw *hw, +- u8 *mac_addr, u16 ethtype, u16 flags, +- u16 vsi_seid, u16 queue, bool is_add, +- struct i40e_control_filter_stats *stats, +- struct i40e_asq_cmd_details *cmd_details) ++int i40e_aq_add_rem_control_packet_filter(struct i40e_hw *hw, ++ u8 *mac_addr, u16 ethtype, u16 flags, ++ u16 vsi_seid, u16 queue, bool is_add, ++ struct i40e_control_filter_stats *stats, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_add_remove_control_packet_filter *cmd = +@@ -4163,7 +4177,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; +- i40e_status status; ++ int status; + + if (vsi_seid == 0) + return I40E_ERR_PARAM; +@@ -4209,7 +4223,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; +- i40e_status status; ++ int status; + + status = i40e_aq_add_rem_control_packet_filter(hw, NULL, ethtype, flag, + seid, 0, true, NULL, +@@ -4231,14 +4245,14 @@ void i40e_add_filter_to_drop_tx_flow_con + * is not passed then only register at 'reg_addr0' is read. + * + **/ +-static i40e_status i40e_aq_alternate_read(struct i40e_hw *hw, +- u32 reg_addr0, u32 *reg_val0, +- u32 reg_addr1, u32 *reg_val1) ++static int i40e_aq_alternate_read(struct i40e_hw *hw, ++ u32 reg_addr0, u32 *reg_val0, ++ u32 reg_addr1, u32 *reg_val1) + { + struct i40e_aq_desc desc; + struct i40e_aqc_alternate_write *cmd_resp = + (struct i40e_aqc_alternate_write *)&desc.params.raw; +- i40e_status status; ++ int status; + + if (!reg_val0) + return I40E_ERR_PARAM; +@@ -4267,12 +4281,12 @@ static i40e_status i40e_aq_alternate_rea + * + * Suspend port's Tx traffic + **/ +-i40e_status i40e_aq_suspend_port_tx(struct i40e_hw *hw, u16 seid, +- struct i40e_asq_cmd_details *cmd_details) ++int i40e_aq_suspend_port_tx(struct i40e_hw *hw, u16 seid, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aqc_tx_sched_ind *cmd; + struct i40e_aq_desc desc; +- i40e_status status; ++ int status; + + cmd = (struct i40e_aqc_tx_sched_ind *)&desc.params.raw; + i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_suspend_port_tx); +@@ -4289,11 +4303,11 @@ i40e_status i40e_aq_suspend_port_tx(stru + * + * Resume port's Tx traffic + **/ +-i40e_status i40e_aq_resume_port_tx(struct i40e_hw *hw, +- struct i40e_asq_cmd_details *cmd_details) ++int i40e_aq_resume_port_tx(struct i40e_hw *hw, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; +- i40e_status status; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_resume_port_tx); + +@@ -4363,18 +4377,18 @@ void i40e_set_pci_config_data(struct i40 + * Dump internal FW/HW data for debug purposes. + * + **/ +-i40e_status i40e_aq_debug_dump(struct i40e_hw *hw, u8 cluster_id, +- u8 table_id, u32 start_index, u16 buff_size, +- void *buff, u16 *ret_buff_size, +- u8 *ret_next_table, u32 *ret_next_index, +- struct i40e_asq_cmd_details *cmd_details) ++int i40e_aq_debug_dump(struct i40e_hw *hw, u8 cluster_id, ++ u8 table_id, u32 start_index, u16 buff_size, ++ void *buff, u16 *ret_buff_size, ++ u8 *ret_next_table, u32 *ret_next_index, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_debug_dump_internals *cmd = + (struct i40e_aqc_debug_dump_internals *)&desc.params.raw; + struct i40e_aqc_debug_dump_internals *resp = + (struct i40e_aqc_debug_dump_internals *)&desc.params.raw; +- i40e_status status; ++ int status; + + if (buff_size == 0 || !buff) + return I40E_ERR_PARAM; +@@ -4415,12 +4429,12 @@ i40e_status i40e_aq_debug_dump(struct i4 + * + * Read bw from the alternate ram for the given pf + **/ +-i40e_status i40e_read_bw_from_alt_ram(struct i40e_hw *hw, +- u32 *max_bw, u32 *min_bw, +- bool *min_valid, bool *max_valid) ++int i40e_read_bw_from_alt_ram(struct i40e_hw *hw, ++ u32 *max_bw, u32 *min_bw, ++ bool *min_valid, bool *max_valid) + { +- i40e_status status; + u32 max_bw_addr, min_bw_addr; ++ int status; + + /* Calculate the address of the min/max bw registers */ + max_bw_addr = I40E_ALT_STRUCT_FIRST_PF_OFFSET + +@@ -4455,13 +4469,14 @@ i40e_status i40e_read_bw_from_alt_ram(st + * + * Configure partitions guaranteed/max bw + **/ +-i40e_status 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) + { +- i40e_status status; +- struct i40e_aq_desc desc; + u16 bwd_size = sizeof(*bw_data); ++ struct i40e_aq_desc desc; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, + i40e_aqc_opc_configure_partition_bw); +@@ -4490,11 +4505,11 @@ i40e_status i40e_aq_configure_partition_ + * + * Reads specified PHY register value + **/ +-i40e_status i40e_read_phy_register_clause22(struct i40e_hw *hw, +- u16 reg, u8 phy_addr, u16 *value) ++int i40e_read_phy_register_clause22(struct i40e_hw *hw, ++ u16 reg, u8 phy_addr, u16 *value) + { +- i40e_status status = I40E_ERR_TIMEOUT; + u8 port_num = (u8)hw->func_caps.mdio_port_num; ++ int status = I40E_ERR_TIMEOUT; + u32 command = 0; + u16 retry = 1000; + +@@ -4535,11 +4550,11 @@ i40e_status i40e_read_phy_register_claus + * + * Writes specified PHY register value + **/ +-i40e_status i40e_write_phy_register_clause22(struct i40e_hw *hw, +- u16 reg, u8 phy_addr, u16 value) ++int i40e_write_phy_register_clause22(struct i40e_hw *hw, ++ u16 reg, u8 phy_addr, u16 value) + { +- i40e_status status = I40E_ERR_TIMEOUT; + u8 port_num = (u8)hw->func_caps.mdio_port_num; ++ int status = I40E_ERR_TIMEOUT; + u32 command = 0; + u16 retry = 1000; + +@@ -4576,13 +4591,13 @@ i40e_status i40e_write_phy_register_clau + * + * Reads specified PHY register value + **/ +-i40e_status i40e_read_phy_register_clause45(struct i40e_hw *hw, +- u8 page, u16 reg, u8 phy_addr, u16 *value) ++int i40e_read_phy_register_clause45(struct i40e_hw *hw, ++ u8 page, u16 reg, u8 phy_addr, u16 *value) + { +- i40e_status status = I40E_ERR_TIMEOUT; ++ u8 port_num = hw->func_caps.mdio_port_num; ++ int status = I40E_ERR_TIMEOUT; + u32 command = 0; + u16 retry = 1000; +- u8 port_num = hw->func_caps.mdio_port_num; + + command = (reg << I40E_GLGEN_MSCA_MDIADD_SHIFT) | + (page << I40E_GLGEN_MSCA_DEVADD_SHIFT) | +@@ -4650,13 +4665,13 @@ phy_read_end: + * + * Writes value to specified PHY register + **/ +-i40e_status i40e_write_phy_register_clause45(struct i40e_hw *hw, +- u8 page, u16 reg, u8 phy_addr, u16 value) ++int i40e_write_phy_register_clause45(struct i40e_hw *hw, ++ u8 page, u16 reg, u8 phy_addr, u16 value) + { +- i40e_status status = I40E_ERR_TIMEOUT; +- u32 command = 0; +- u16 retry = 1000; + u8 port_num = hw->func_caps.mdio_port_num; ++ int status = I40E_ERR_TIMEOUT; ++ u16 retry = 1000; ++ u32 command = 0; + + command = (reg << I40E_GLGEN_MSCA_MDIADD_SHIFT) | + (page << I40E_GLGEN_MSCA_DEVADD_SHIFT) | +@@ -4717,10 +4732,10 @@ phy_write_end: + * + * Writes value to specified PHY register + **/ +-i40e_status i40e_write_phy_register(struct i40e_hw *hw, +- u8 page, u16 reg, u8 phy_addr, u16 value) ++int i40e_write_phy_register(struct i40e_hw *hw, ++ u8 page, u16 reg, u8 phy_addr, u16 value) + { +- i40e_status status; ++ int status; + + switch (hw->device_id) { + case I40E_DEV_ID_1G_BASE_T_X722: +@@ -4755,10 +4770,10 @@ i40e_status i40e_write_phy_register(stru + * + * Reads specified PHY register value + **/ +-i40e_status i40e_read_phy_register(struct i40e_hw *hw, +- u8 page, u16 reg, u8 phy_addr, u16 *value) ++int i40e_read_phy_register(struct i40e_hw *hw, ++ u8 page, u16 reg, u8 phy_addr, u16 *value) + { +- i40e_status status; ++ int status; + + switch (hw->device_id) { + case I40E_DEV_ID_1G_BASE_T_X722: +@@ -4806,17 +4821,17 @@ u8 i40e_get_phy_address(struct i40e_hw * + * + * Blinks PHY link LED + **/ +-i40e_status i40e_blink_phy_link_led(struct i40e_hw *hw, +- u32 time, u32 interval) ++int i40e_blink_phy_link_led(struct i40e_hw *hw, ++ u32 time, u32 interval) + { +- i40e_status status = 0; +- u32 i; +- u16 led_ctl; +- u16 gpio_led_port; +- u16 led_reg; + u16 led_addr = I40E_PHY_LED_PROV_REG_1; ++ u16 gpio_led_port; + u8 phy_addr = 0; ++ int status = 0; ++ u16 led_ctl; + u8 port_num; ++ u16 led_reg; ++ u32 i; + + i = rd32(hw, I40E_PFGEN_PORTNUM); + port_num = (u8)(i & I40E_PFGEN_PORTNUM_PORT_NUM_MASK); +@@ -4878,12 +4893,12 @@ phy_blinking_end: + * @led_addr: LED register address + * @reg_val: read register value + **/ +-static enum i40e_status_code i40e_led_get_reg(struct i40e_hw *hw, u16 led_addr, +- u32 *reg_val) ++static int i40e_led_get_reg(struct i40e_hw *hw, u16 led_addr, ++ u32 *reg_val) + { +- enum i40e_status_code status; + u8 phy_addr = 0; + u8 port_num; ++ int status; + u32 i; + + *reg_val = 0; +@@ -4912,12 +4927,12 @@ static enum i40e_status_code i40e_led_ge + * @led_addr: LED register address + * @reg_val: register value to write + **/ +-static enum i40e_status_code i40e_led_set_reg(struct i40e_hw *hw, u16 led_addr, +- u32 reg_val) ++static int i40e_led_set_reg(struct i40e_hw *hw, u16 led_addr, ++ u32 reg_val) + { +- enum i40e_status_code status; + u8 phy_addr = 0; + u8 port_num; ++ int status; + u32 i; + + if (hw->flags & I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE) { +@@ -4947,17 +4962,17 @@ static enum i40e_status_code i40e_led_se + * @val: original value of register to use + * + **/ +-i40e_status i40e_led_get_phy(struct i40e_hw *hw, u16 *led_addr, +- u16 *val) ++int i40e_led_get_phy(struct i40e_hw *hw, u16 *led_addr, ++ u16 *val) + { +- i40e_status status = 0; + u16 gpio_led_port; + u8 phy_addr = 0; +- u16 reg_val; ++ u32 reg_val_aq; ++ int status = 0; + u16 temp_addr; ++ u16 reg_val; + u8 port_num; + u32 i; +- u32 reg_val_aq; + + if (hw->flags & I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE) { + status = +@@ -5002,12 +5017,12 @@ i40e_status i40e_led_get_phy(struct i40e + * Set led's on or off when controlled by the PHY + * + **/ +-i40e_status i40e_led_set_phy(struct i40e_hw *hw, bool on, +- u16 led_addr, u32 mode) ++int i40e_led_set_phy(struct i40e_hw *hw, bool on, ++ u16 led_addr, u32 mode) + { +- i40e_status status = 0; + u32 led_ctl = 0; + u32 led_reg = 0; ++ int status = 0; + + status = i40e_led_get_reg(hw, led_addr, &led_reg); + if (status) +@@ -5051,14 +5066,14 @@ restore_config: + * Use the firmware to read the Rx control register, + * especially useful if the Rx unit is under heavy pressure + **/ +-i40e_status i40e_aq_rx_ctl_read_register(struct i40e_hw *hw, +- u32 reg_addr, u32 *reg_val, +- struct i40e_asq_cmd_details *cmd_details) ++int i40e_aq_rx_ctl_read_register(struct i40e_hw *hw, ++ u32 reg_addr, u32 *reg_val, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_rx_ctl_reg_read_write *cmd_resp = + (struct i40e_aqc_rx_ctl_reg_read_write *)&desc.params.raw; +- i40e_status status; ++ int status; + + if (!reg_val) + return I40E_ERR_PARAM; +@@ -5082,8 +5097,8 @@ i40e_status i40e_aq_rx_ctl_read_register + **/ + u32 i40e_read_rx_ctl(struct i40e_hw *hw, u32 reg_addr) + { +- i40e_status status = 0; + bool use_register; ++ int status = 0; + int retry = 5; + u32 val = 0; + +@@ -5117,14 +5132,14 @@ do_retry: + * Use the firmware to write to an Rx control register, + * especially useful if the Rx unit is under heavy pressure + **/ +-i40e_status i40e_aq_rx_ctl_write_register(struct i40e_hw *hw, +- u32 reg_addr, u32 reg_val, +- struct i40e_asq_cmd_details *cmd_details) ++int i40e_aq_rx_ctl_write_register(struct i40e_hw *hw, ++ u32 reg_addr, u32 reg_val, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_rx_ctl_reg_read_write *cmd = + (struct i40e_aqc_rx_ctl_reg_read_write *)&desc.params.raw; +- i40e_status status; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_rx_ctl_reg_write); + +@@ -5144,8 +5159,8 @@ i40e_status i40e_aq_rx_ctl_write_registe + **/ + void i40e_write_rx_ctl(struct i40e_hw *hw, u32 reg_addr, u32 reg_val) + { +- i40e_status status = 0; + bool use_register; ++ int status = 0; + int retry = 5; + + use_register = (((hw->aq.api_maj_ver == 1) && +@@ -5207,16 +5222,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. + **/ +-enum i40e_status_code i40e_aq_set_phy_register_ext(struct i40e_hw *hw, +- u8 phy_select, u8 dev_addr, bool page_change, +- bool set_mdio, u8 mdio_num, +- u32 reg_addr, u32 reg_val, +- struct i40e_asq_cmd_details *cmd_details) ++int i40e_aq_set_phy_register_ext(struct i40e_hw *hw, ++ u8 phy_select, u8 dev_addr, bool page_change, ++ bool set_mdio, u8 mdio_num, ++ u32 reg_addr, u32 reg_val, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_phy_register_access *cmd = + (struct i40e_aqc_phy_register_access *)&desc.params.raw; +- i40e_status status; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, + i40e_aqc_opc_set_phy_register); +@@ -5252,16 +5267,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. + **/ +-enum i40e_status_code 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, +- u32 reg_addr, u32 *reg_val, +- struct i40e_asq_cmd_details *cmd_details) ++int 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, ++ u32 reg_addr, u32 *reg_val, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_phy_register_access *cmd = + (struct i40e_aqc_phy_register_access *)&desc.params.raw; +- i40e_status status; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, + i40e_aqc_opc_get_phy_register); +@@ -5292,18 +5307,17 @@ enum i40e_status_code i40e_aq_get_phy_re + * @error_info: returns error information + * @cmd_details: pointer to command details structure or NULL + **/ +-enum +-i40e_status_code i40e_aq_write_ddp(struct i40e_hw *hw, void *buff, +- u16 buff_size, u32 track_id, +- u32 *error_offset, u32 *error_info, +- struct i40e_asq_cmd_details *cmd_details) ++int i40e_aq_write_ddp(struct i40e_hw *hw, void *buff, ++ u16 buff_size, u32 track_id, ++ u32 *error_offset, u32 *error_info, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_write_personalization_profile *cmd = + (struct i40e_aqc_write_personalization_profile *) + &desc.params.raw; + struct i40e_aqc_write_ddp_resp *resp; +- i40e_status status; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, + i40e_aqc_opc_write_personalization_profile); +@@ -5336,15 +5350,14 @@ i40e_status_code i40e_aq_write_ddp(struc + * @flags: AdminQ command flags + * @cmd_details: pointer to command details structure or NULL + **/ +-enum +-i40e_status_code i40e_aq_get_ddp_list(struct i40e_hw *hw, void *buff, +- u16 buff_size, u8 flags, +- struct i40e_asq_cmd_details *cmd_details) ++int i40e_aq_get_ddp_list(struct i40e_hw *hw, void *buff, ++ u16 buff_size, u8 flags, ++ struct i40e_asq_cmd_details *cmd_details) + { + struct i40e_aq_desc desc; + struct i40e_aqc_get_applied_profiles *cmd = + (struct i40e_aqc_get_applied_profiles *)&desc.params.raw; +- i40e_status status; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, + i40e_aqc_opc_get_personalization_profile_list); +@@ -5443,14 +5456,13 @@ i40e_find_section_in_profile(u32 section + * @hw: pointer to the hw struct + * @aq: command buffer containing all data to execute AQ + **/ +-static enum +-i40e_status_code i40e_ddp_exec_aq_section(struct i40e_hw *hw, +- struct i40e_profile_aq_section *aq) ++static int i40e_ddp_exec_aq_section(struct i40e_hw *hw, ++ struct i40e_profile_aq_section *aq) + { +- i40e_status status; + struct i40e_aq_desc desc; + u8 *msg = NULL; + u16 msglen; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, aq->opcode); + desc.flags |= cpu_to_le16(aq->flags); +@@ -5490,14 +5502,14 @@ i40e_status_code i40e_ddp_exec_aq_sectio + * + * Validates supported devices and profile's sections. + */ +-static enum i40e_status_code ++static int + i40e_validate_profile(struct i40e_hw *hw, struct i40e_profile_segment *profile, + u32 track_id, bool rollback) + { + struct i40e_profile_section_header *sec = NULL; +- i40e_status status = 0; + struct i40e_section_table *sec_tbl; + u32 vendor_dev_id; ++ int status = 0; + u32 dev_cnt; + u32 sec_off; + u32 i; +@@ -5555,16 +5567,16 @@ i40e_validate_profile(struct i40e_hw *hw + * + * Handles the download of a complete package. + */ +-enum i40e_status_code ++int + i40e_write_profile(struct i40e_hw *hw, struct i40e_profile_segment *profile, + u32 track_id) + { +- i40e_status status = 0; +- struct i40e_section_table *sec_tbl; + struct i40e_profile_section_header *sec = NULL; + struct i40e_profile_aq_section *ddp_aq; +- u32 section_size = 0; ++ struct i40e_section_table *sec_tbl; + u32 offset = 0, info = 0; ++ u32 section_size = 0; ++ int status = 0; + u32 sec_off; + u32 i; + +@@ -5618,15 +5630,15 @@ i40e_write_profile(struct i40e_hw *hw, s + * + * Rolls back previously loaded package. + */ +-enum i40e_status_code ++int + i40e_rollback_profile(struct i40e_hw *hw, struct i40e_profile_segment *profile, + u32 track_id) + { + struct i40e_profile_section_header *sec = NULL; +- i40e_status status = 0; + struct i40e_section_table *sec_tbl; + u32 offset = 0, info = 0; + u32 section_size = 0; ++ int status = 0; + u32 sec_off; + int i; + +@@ -5670,15 +5682,15 @@ i40e_rollback_profile(struct i40e_hw *hw + * + * Register a profile to the list of loaded profiles. + */ +-enum i40e_status_code ++int + i40e_add_pinfo_to_list(struct i40e_hw *hw, + struct i40e_profile_segment *profile, + u8 *profile_info_sec, u32 track_id) + { +- i40e_status status = 0; + struct i40e_profile_section_header *sec = NULL; + struct i40e_profile_info *pinfo; + u32 offset = 0, info = 0; ++ int status = 0; + + sec = (struct i40e_profile_section_header *)profile_info_sec; + sec->tbl_size = 1; +@@ -5712,7 +5724,7 @@ i40e_add_pinfo_to_list(struct i40e_hw *h + * of the function. + * + **/ +-enum i40e_status_code ++int + i40e_aq_add_cloud_filters(struct i40e_hw *hw, u16 seid, + struct i40e_aqc_cloud_filters_element_data *filters, + u8 filter_count) +@@ -5720,8 +5732,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; +- enum i40e_status_code status; + u16 buff_len; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, + i40e_aqc_opc_add_cloud_filters); +@@ -5749,7 +5761,7 @@ i40e_aq_add_cloud_filters(struct i40e_hw + * function. + * + **/ +-enum i40e_status_code ++int + i40e_aq_add_cloud_filters_bb(struct i40e_hw *hw, u16 seid, + struct i40e_aqc_cloud_filters_element_bb *filters, + u8 filter_count) +@@ -5757,8 +5769,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; +- i40e_status status; + u16 buff_len; ++ int status; + int i; + + i40e_fill_default_direct_cmd_desc(&desc, +@@ -5806,7 +5818,7 @@ i40e_aq_add_cloud_filters_bb(struct i40e + * of the function. + * + **/ +-enum i40e_status_code ++int + i40e_aq_rem_cloud_filters(struct i40e_hw *hw, u16 seid, + struct i40e_aqc_cloud_filters_element_data *filters, + u8 filter_count) +@@ -5814,8 +5826,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; +- enum i40e_status_code status; + u16 buff_len; ++ int status; + + i40e_fill_default_direct_cmd_desc(&desc, + i40e_aqc_opc_remove_cloud_filters); +@@ -5843,7 +5855,7 @@ i40e_aq_rem_cloud_filters(struct i40e_hw + * function. + * + **/ +-enum i40e_status_code ++int + i40e_aq_rem_cloud_filters_bb(struct i40e_hw *hw, u16 seid, + struct i40e_aqc_cloud_filters_element_bb *filters, + u8 filter_count) +@@ -5851,8 +5863,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; +- i40e_status status; + u16 buff_len; ++ int status; + int i; + + i40e_fill_default_direct_cmd_desc(&desc, +--- a/drivers/net/ethernet/intel/i40e/i40e_dcb.c ++++ b/drivers/net/ethernet/intel/i40e/i40e_dcb.c +@@ -12,7 +12,7 @@ + * + * Get the DCBX status from the Firmware + **/ +-i40e_status i40e_get_dcbx_status(struct i40e_hw *hw, u16 *status) ++int i40e_get_dcbx_status(struct i40e_hw *hw, u16 *status) + { + u32 reg; + +@@ -497,15 +497,15 @@ static void i40e_parse_org_tlv(struct i4 + * + * Parse DCB configuration from the LLDPDU + **/ +-i40e_status i40e_lldp_to_dcb_config(u8 *lldpmib, +- struct i40e_dcbx_config *dcbcfg) ++int i40e_lldp_to_dcb_config(u8 *lldpmib, ++ struct i40e_dcbx_config *dcbcfg) + { +- i40e_status ret = 0; + struct i40e_lldp_org_tlv *tlv; +- u16 type; +- u16 length; + u16 typelength; + u16 offset = 0; ++ int ret = 0; ++ u16 length; ++ u16 type; + + if (!lldpmib || !dcbcfg) + return I40E_ERR_PARAM; +@@ -551,12 +551,12 @@ i40e_status i40e_lldp_to_dcb_config(u8 * + * + * Query DCB configuration from the Firmware + **/ +-i40e_status i40e_aq_get_dcb_config(struct i40e_hw *hw, u8 mib_type, +- u8 bridgetype, +- struct i40e_dcbx_config *dcbcfg) ++int i40e_aq_get_dcb_config(struct i40e_hw *hw, u8 mib_type, ++ u8 bridgetype, ++ struct i40e_dcbx_config *dcbcfg) + { +- i40e_status ret = 0; + struct i40e_virt_mem mem; ++ int ret = 0; + u8 *lldpmib; + + /* Allocate the LLDPDU */ +@@ -767,9 +767,9 @@ static void i40e_cee_to_dcb_config( + * + * Get IEEE mode DCB configuration from the Firmware + **/ +-static i40e_status i40e_get_ieee_dcb_config(struct i40e_hw *hw) ++static int i40e_get_ieee_dcb_config(struct i40e_hw *hw) + { +- i40e_status ret = 0; ++ int ret = 0; + + /* IEEE mode */ + hw->local_dcbx_config.dcbx_mode = I40E_DCBX_MODE_IEEE; +@@ -797,11 +797,11 @@ out: + * + * Get DCB configuration from the Firmware + **/ +-i40e_status i40e_get_dcb_config(struct i40e_hw *hw) ++int i40e_get_dcb_config(struct i40e_hw *hw) + { +- i40e_status ret = 0; +- struct i40e_aqc_get_cee_dcb_cfg_resp cee_cfg; + struct i40e_aqc_get_cee_dcb_cfg_v1_resp cee_v1_cfg; ++ struct i40e_aqc_get_cee_dcb_cfg_resp cee_cfg; ++ int ret = 0; + + /* If Firmware version < v4.33 on X710/XL710, IEEE only */ + if ((hw->mac.type == I40E_MAC_XL710) && +@@ -867,11 +867,11 @@ out: + * + * Update DCB configuration from the Firmware + **/ +-i40e_status i40e_init_dcb(struct i40e_hw *hw, bool enable_mib_change) ++int i40e_init_dcb(struct i40e_hw *hw, bool enable_mib_change) + { +- i40e_status ret = 0; + struct i40e_lldp_variables lldp_cfg; + u8 adminstatus = 0; ++ int ret = 0; + + if (!hw->func_caps.dcb) + return I40E_NOT_SUPPORTED; +@@ -940,13 +940,13 @@ i40e_status i40e_init_dcb(struct i40e_hw + * Get status of FW Link Layer Discovery Protocol (LLDP) Agent. + * Status of agent is reported via @lldp_status parameter. + **/ +-enum i40e_status_code ++int + i40e_get_fw_lldp_status(struct i40e_hw *hw, + enum i40e_get_fw_lldp_status_resp *lldp_status) + { + struct i40e_virt_mem mem; +- i40e_status ret; + u8 *lldpmib; ++ int ret; + + if (!lldp_status) + return I40E_ERR_PARAM; +@@ -1238,13 +1238,13 @@ static void i40e_add_dcb_tlv(struct i40e + * + * Set DCB configuration to the Firmware + **/ +-i40e_status i40e_set_dcb_config(struct i40e_hw *hw) ++int i40e_set_dcb_config(struct i40e_hw *hw) + { + struct i40e_dcbx_config *dcbcfg; + struct i40e_virt_mem mem; + u8 mib_type, *lldpmib; +- i40e_status ret; + u16 miblen; ++ int ret; + + /* update the hw local config */ + dcbcfg = &hw->local_dcbx_config; +@@ -1274,8 +1274,8 @@ i40e_status i40e_set_dcb_config(struct i + * + * send DCB configuration to FW + **/ +-i40e_status i40e_dcb_config_to_lldp(u8 *lldpmib, u16 *miblen, +- struct i40e_dcbx_config *dcbcfg) ++int i40e_dcb_config_to_lldp(u8 *lldpmib, u16 *miblen, ++ struct i40e_dcbx_config *dcbcfg) + { + u16 length, offset = 0, tlvid, typelength; + struct i40e_lldp_org_tlv *tlv; +@@ -1888,13 +1888,13 @@ void i40e_dcb_hw_rx_pb_config(struct i40 + * + * Reads the LLDP configuration data from NVM using passed addresses + **/ +-static i40e_status _i40e_read_lldp_cfg(struct i40e_hw *hw, +- struct i40e_lldp_variables *lldp_cfg, +- u8 module, u32 word_offset) ++static int _i40e_read_lldp_cfg(struct i40e_hw *hw, ++ struct i40e_lldp_variables *lldp_cfg, ++ u8 module, u32 word_offset) + { + u32 address, offset = (2 * word_offset); +- i40e_status ret; + __le16 raw_mem; ++ int ret; + u16 mem; + + ret = i40e_acquire_nvm(hw, I40E_RESOURCE_READ); +@@ -1950,10 +1950,10 @@ err_lldp_cfg: + * + * Reads the LLDP configuration data from NVM + **/ +-i40e_status i40e_read_lldp_cfg(struct i40e_hw *hw, +- struct i40e_lldp_variables *lldp_cfg) ++int i40e_read_lldp_cfg(struct i40e_hw *hw, ++ struct i40e_lldp_variables *lldp_cfg) + { +- i40e_status ret = 0; ++ int ret = 0; + u32 mem; + + if (!lldp_cfg) +--- a/drivers/net/ethernet/intel/i40e/i40e_dcb.h ++++ b/drivers/net/ethernet/intel/i40e/i40e_dcb.h +@@ -264,20 +264,20 @@ void i40e_dcb_hw_calculate_pool_sizes(st + void i40e_dcb_hw_rx_pb_config(struct i40e_hw *hw, + struct i40e_rx_pb_config *old_pb_cfg, + struct i40e_rx_pb_config *new_pb_cfg); +-i40e_status i40e_get_dcbx_status(struct i40e_hw *hw, +- u16 *status); +-i40e_status i40e_lldp_to_dcb_config(u8 *lldpmib, +- struct i40e_dcbx_config *dcbcfg); +-i40e_status i40e_aq_get_dcb_config(struct i40e_hw *hw, u8 mib_type, +- u8 bridgetype, +- struct i40e_dcbx_config *dcbcfg); +-i40e_status i40e_get_dcb_config(struct i40e_hw *hw); +-i40e_status i40e_init_dcb(struct i40e_hw *hw, +- bool enable_mib_change); +-enum i40e_status_code ++int i40e_get_dcbx_status(struct i40e_hw *hw, ++ u16 *status); ++int i40e_lldp_to_dcb_config(u8 *lldpmib, ++ struct i40e_dcbx_config *dcbcfg); ++int i40e_aq_get_dcb_config(struct i40e_hw *hw, u8 mib_type, ++ u8 bridgetype, ++ struct i40e_dcbx_config *dcbcfg); ++int i40e_get_dcb_config(struct i40e_hw *hw); ++int i40e_init_dcb(struct i40e_hw *hw, ++ bool enable_mib_change); ++int + i40e_get_fw_lldp_status(struct i40e_hw *hw, + enum i40e_get_fw_lldp_status_resp *lldp_status); +-i40e_status i40e_set_dcb_config(struct i40e_hw *hw); +-i40e_status i40e_dcb_config_to_lldp(u8 *lldpmib, u16 *miblen, +- struct i40e_dcbx_config *dcbcfg); ++int i40e_set_dcb_config(struct i40e_hw *hw); ++int i40e_dcb_config_to_lldp(u8 *lldpmib, u16 *miblen, ++ struct i40e_dcbx_config *dcbcfg); + #endif /* _I40E_DCB_H_ */ +--- a/drivers/net/ethernet/intel/i40e/i40e_ddp.c ++++ b/drivers/net/ethernet/intel/i40e/i40e_ddp.c +@@ -36,7 +36,7 @@ static int i40e_ddp_does_profile_exist(s + { + struct i40e_ddp_profile_list *profile_list; + u8 buff[I40E_PROFILE_LIST_SIZE]; +- i40e_status status; ++ int status; + int i; + + status = i40e_aq_get_ddp_list(hw, buff, I40E_PROFILE_LIST_SIZE, 0, +@@ -91,7 +91,7 @@ static int i40e_ddp_does_profile_overlap + { + struct i40e_ddp_profile_list *profile_list; + u8 buff[I40E_PROFILE_LIST_SIZE]; +- i40e_status status; ++ int status; + int i; + + status = i40e_aq_get_ddp_list(hw, buff, I40E_PROFILE_LIST_SIZE, 0, +@@ -117,14 +117,14 @@ static int i40e_ddp_does_profile_overlap + * + * Register a profile to the list of loaded profiles. + */ +-static enum i40e_status_code ++static int + i40e_add_pinfo(struct i40e_hw *hw, struct i40e_profile_segment *profile, + u8 *profile_info_sec, u32 track_id) + { + struct i40e_profile_section_header *sec; + struct i40e_profile_info *pinfo; +- i40e_status status; + u32 offset = 0, info = 0; ++ int status; + + sec = (struct i40e_profile_section_header *)profile_info_sec; + sec->tbl_size = 1; +@@ -157,14 +157,14 @@ i40e_add_pinfo(struct i40e_hw *hw, struc + * + * Removes DDP profile from the NIC. + **/ +-static enum i40e_status_code ++static int + i40e_del_pinfo(struct i40e_hw *hw, struct i40e_profile_segment *profile, + u8 *profile_info_sec, u32 track_id) + { + struct i40e_profile_section_header *sec; + struct i40e_profile_info *pinfo; +- i40e_status status; + u32 offset = 0, info = 0; ++ int status; + + sec = (struct i40e_profile_section_header *)profile_info_sec; + sec->tbl_size = 1; +@@ -270,12 +270,12 @@ int i40e_ddp_load(struct net_device *net + struct i40e_profile_segment *profile_hdr; + struct i40e_profile_info pinfo; + struct i40e_package_header *pkg_hdr; +- i40e_status status; + struct i40e_netdev_priv *np = netdev_priv(netdev); + struct i40e_vsi *vsi = np->vsi; + struct i40e_pf *pf = vsi->back; + u32 track_id; + int istatus; ++ int status; + + pkg_hdr = (struct i40e_package_header *)data; + if (!i40e_ddp_is_pkg_hdr_valid(netdev, pkg_hdr, size)) +--- a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c ++++ b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c +@@ -918,9 +918,9 @@ static ssize_t i40e_dbg_command_write(st + dev_info(&pf->pdev->dev, "deleting relay %d\n", veb_seid); + i40e_veb_release(pf->veb[i]); + } else if (strncmp(cmd_buf, "add pvid", 8) == 0) { +- i40e_status ret; +- u16 vid; + unsigned int v; ++ int ret; ++ u16 vid; + + cnt = sscanf(&cmd_buf[8], "%i %u", &vsi_seid, &v); + if (cnt != 2) { +@@ -1284,7 +1284,7 @@ static ssize_t i40e_dbg_command_write(st + } + } else if (strncmp(cmd_buf, "send aq_cmd", 11) == 0) { + struct i40e_aq_desc *desc; +- i40e_status ret; ++ int ret; + + desc = kzalloc(sizeof(struct i40e_aq_desc), GFP_KERNEL); + if (!desc) +@@ -1330,9 +1330,9 @@ static ssize_t i40e_dbg_command_write(st + desc = NULL; + } else if (strncmp(cmd_buf, "send indirect aq_cmd", 20) == 0) { + struct i40e_aq_desc *desc; +- i40e_status ret; + u16 buffer_len; + u8 *buff; ++ int ret; + + desc = kzalloc(sizeof(struct i40e_aq_desc), GFP_KERNEL); + if (!desc) +--- a/drivers/net/ethernet/intel/i40e/i40e_diag.c ++++ b/drivers/net/ethernet/intel/i40e/i40e_diag.c +@@ -10,8 +10,8 @@ + * @reg: reg to be tested + * @mask: bits to be touched + **/ +-static i40e_status i40e_diag_reg_pattern_test(struct i40e_hw *hw, +- u32 reg, u32 mask) ++static int i40e_diag_reg_pattern_test(struct i40e_hw *hw, ++ u32 reg, u32 mask) + { + static const u32 patterns[] = { + 0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF +@@ -74,9 +74,9 @@ const struct i40e_diag_reg_test_info i40 + * + * Perform registers diagnostic test + **/ +-i40e_status i40e_diag_reg_test(struct i40e_hw *hw) ++int i40e_diag_reg_test(struct i40e_hw *hw) + { +- i40e_status ret_code = 0; ++ int ret_code = 0; + u32 reg, mask; + u32 elements; + u32 i, j; +@@ -115,9 +115,9 @@ i40e_status i40e_diag_reg_test(struct i4 + * + * Perform EEPROM diagnostic test + **/ +-i40e_status i40e_diag_eeprom_test(struct i40e_hw *hw) ++int i40e_diag_eeprom_test(struct i40e_hw *hw) + { +- i40e_status ret_code; ++ int ret_code; + u16 reg_val; + + /* read NVM control word and if NVM valid, validate EEPROM checksum*/ +--- a/drivers/net/ethernet/intel/i40e/i40e_diag.h ++++ b/drivers/net/ethernet/intel/i40e/i40e_diag.h +@@ -22,7 +22,7 @@ struct i40e_diag_reg_test_info { + + extern const struct i40e_diag_reg_test_info i40e_reg_list[]; + +-i40e_status i40e_diag_reg_test(struct i40e_hw *hw); +-i40e_status i40e_diag_eeprom_test(struct i40e_hw *hw); ++int i40e_diag_reg_test(struct i40e_hw *hw); ++int i40e_diag_eeprom_test(struct i40e_hw *hw); + + #endif /* _I40E_DIAG_H_ */ +--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c ++++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c +@@ -1154,8 +1154,8 @@ static int i40e_set_link_ksettings(struc + struct i40e_vsi *vsi = np->vsi; + struct i40e_hw *hw = &pf->hw; + bool autoneg_changed = false; +- i40e_status status = 0; + int timeout = 50; ++ int status = 0; + int err = 0; + u8 autoneg; + +@@ -1387,7 +1387,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; +- i40e_status status = 0; ++ int status = 0; + u32 flags = 0; + int err = 0; + +@@ -1449,7 +1449,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; +- i40e_status status = 0; ++ int status = 0; + int err = 0; + u8 fec_cfg; + +@@ -1536,7 +1536,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; +- i40e_status ret = 0; ++ int ret = 0; + + ret = i40e_aq_set_link_restart_an(hw, link_up, NULL); + if (ret) { +@@ -1601,9 +1601,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; +- i40e_status status; + u8 aq_failures; + int err = 0; ++ int status; + u32 is_an; + + /* Changing the port's flow control is not supported if this isn't the +@@ -2481,8 +2481,8 @@ static u64 i40e_link_test(struct net_dev + { + struct i40e_netdev_priv *np = netdev_priv(netdev); + struct i40e_pf *pf = np->vsi->back; +- i40e_status status; + bool link_up = false; ++ int status; + + netif_info(pf, hw, netdev, "link test\n"); + status = i40e_get_link_status(&pf->hw, &link_up); +@@ -2705,11 +2705,11 @@ static int i40e_set_phys_id(struct net_d + enum ethtool_phys_id_state state) + { + struct i40e_netdev_priv *np = netdev_priv(netdev); +- i40e_status ret = 0; + struct i40e_pf *pf = np->vsi->back; + struct i40e_hw *hw = &pf->hw; + int blink_freq = 2; + u16 temp_status; ++ int ret = 0; + + switch (state) { + case ETHTOOL_ID_ACTIVE: +@@ -5145,7 +5145,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; +- i40e_status status; ++ int status; + u32 i, j; + + orig_flags = READ_ONCE(pf->flags); +@@ -5367,8 +5367,8 @@ static int i40e_get_module_info(struct n + u32 sff8472_comp = 0; + u32 sff8472_swap = 0; + u32 sff8636_rev = 0; +- i40e_status status; + u32 type = 0; ++ int status; + + /* Check if firmware supports reading module EEPROM. */ + if (!(hw->flags & I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE)) { +@@ -5472,8 +5472,8 @@ static int i40e_get_module_eeprom(struct + struct i40e_pf *pf = vsi->back; + struct i40e_hw *hw = &pf->hw; + bool is_sfp = false; +- i40e_status status; + u32 value = 0; ++ int status; + int i; + + if (!ee || !ee->len || !data) +@@ -5514,10 +5514,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; +- enum i40e_status_code status = 0; + struct i40e_vsi *vsi = np->vsi; + struct i40e_pf *pf = vsi->back; + struct i40e_hw *hw = &pf->hw; ++ int status = 0; + + /* Get initial PHY capabilities */ + status = i40e_aq_get_phy_capabilities(hw, false, true, &phy_cfg, NULL); +@@ -5579,11 +5579,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; +- enum i40e_status_code status = I40E_SUCCESS; + struct i40e_aq_set_phy_config config; + struct i40e_vsi *vsi = np->vsi; + struct i40e_pf *pf = vsi->back; + struct i40e_hw *hw = &pf->hw; ++ int status = I40E_SUCCESS; + __le16 eee_capability; + + /* Deny parameters we don't support */ +--- a/drivers/net/ethernet/intel/i40e/i40e_hmc.c ++++ b/drivers/net/ethernet/intel/i40e/i40e_hmc.c +@@ -17,17 +17,17 @@ + * @type: what type of segment descriptor we're manipulating + * @direct_mode_sz: size to alloc in direct mode + **/ +-i40e_status i40e_add_sd_table_entry(struct i40e_hw *hw, +- struct i40e_hmc_info *hmc_info, +- u32 sd_index, +- enum i40e_sd_entry_type type, +- u64 direct_mode_sz) ++int i40e_add_sd_table_entry(struct i40e_hw *hw, ++ struct i40e_hmc_info *hmc_info, ++ u32 sd_index, ++ enum i40e_sd_entry_type type, ++ u64 direct_mode_sz) + { + enum i40e_memory_type mem_type __attribute__((unused)); + struct i40e_hmc_sd_entry *sd_entry; + bool dma_mem_alloc_done = false; ++ int ret_code = I40E_SUCCESS; + struct i40e_dma_mem mem; +- i40e_status ret_code = I40E_SUCCESS; + u64 alloc_len; + + if (NULL == hmc_info->sd_table.sd_entry) { +@@ -106,19 +106,19 @@ exit: + * aligned on 4K boundary and zeroed memory. + * 2. It should be 4K in size. + **/ +-i40e_status i40e_add_pd_table_entry(struct i40e_hw *hw, +- struct i40e_hmc_info *hmc_info, +- u32 pd_index, +- struct i40e_dma_mem *rsrc_pg) ++int i40e_add_pd_table_entry(struct i40e_hw *hw, ++ struct i40e_hmc_info *hmc_info, ++ u32 pd_index, ++ struct i40e_dma_mem *rsrc_pg) + { +- i40e_status ret_code = 0; + struct i40e_hmc_pd_table *pd_table; + struct i40e_hmc_pd_entry *pd_entry; + struct i40e_dma_mem mem; + struct i40e_dma_mem *page = &mem; + u32 sd_idx, rel_pd_idx; +- u64 *pd_addr; ++ int ret_code = 0; + u64 page_desc; ++ u64 *pd_addr; + + if (pd_index / I40E_HMC_PD_CNT_IN_SD >= hmc_info->sd_table.sd_cnt) { + ret_code = I40E_ERR_INVALID_PAGE_DESC_INDEX; +@@ -185,15 +185,15 @@ exit: + * 1. Caller can deallocate the memory used by backing storage after this + * function returns. + **/ +-i40e_status i40e_remove_pd_bp(struct i40e_hw *hw, +- struct i40e_hmc_info *hmc_info, +- u32 idx) ++int i40e_remove_pd_bp(struct i40e_hw *hw, ++ struct i40e_hmc_info *hmc_info, ++ u32 idx) + { +- i40e_status ret_code = 0; + struct i40e_hmc_pd_entry *pd_entry; + struct i40e_hmc_pd_table *pd_table; + struct i40e_hmc_sd_entry *sd_entry; + u32 sd_idx, rel_pd_idx; ++ int ret_code = 0; + u64 *pd_addr; + + /* calculate index */ +@@ -241,11 +241,11 @@ exit: + * @hmc_info: pointer to the HMC configuration information structure + * @idx: the page index + **/ +-i40e_status i40e_prep_remove_sd_bp(struct i40e_hmc_info *hmc_info, +- u32 idx) ++int i40e_prep_remove_sd_bp(struct i40e_hmc_info *hmc_info, ++ u32 idx) + { +- i40e_status ret_code = 0; + struct i40e_hmc_sd_entry *sd_entry; ++ int ret_code = 0; + + /* get the entry and decrease its ref counter */ + sd_entry = &hmc_info->sd_table.sd_entry[idx]; +@@ -269,9 +269,9 @@ exit: + * @idx: the page index + * @is_pf: used to distinguish between VF and PF + **/ +-i40e_status i40e_remove_sd_bp_new(struct i40e_hw *hw, +- struct i40e_hmc_info *hmc_info, +- u32 idx, bool is_pf) ++int i40e_remove_sd_bp_new(struct i40e_hw *hw, ++ struct i40e_hmc_info *hmc_info, ++ u32 idx, bool is_pf) + { + struct i40e_hmc_sd_entry *sd_entry; + +@@ -290,11 +290,11 @@ i40e_status i40e_remove_sd_bp_new(struct + * @hmc_info: pointer to the HMC configuration information structure + * @idx: segment descriptor index to find the relevant page descriptor + **/ +-i40e_status i40e_prep_remove_pd_page(struct i40e_hmc_info *hmc_info, +- u32 idx) ++int i40e_prep_remove_pd_page(struct i40e_hmc_info *hmc_info, ++ u32 idx) + { +- i40e_status ret_code = 0; + struct i40e_hmc_sd_entry *sd_entry; ++ int ret_code = 0; + + sd_entry = &hmc_info->sd_table.sd_entry[idx]; + +@@ -318,9 +318,9 @@ exit: + * @idx: segment descriptor index to find the relevant page descriptor + * @is_pf: used to distinguish between VF and PF + **/ +-i40e_status i40e_remove_pd_page_new(struct i40e_hw *hw, +- struct i40e_hmc_info *hmc_info, +- u32 idx, bool is_pf) ++int i40e_remove_pd_page_new(struct i40e_hw *hw, ++ struct i40e_hmc_info *hmc_info, ++ u32 idx, bool is_pf) + { + struct i40e_hmc_sd_entry *sd_entry; + +--- a/drivers/net/ethernet/intel/i40e/i40e_hmc.h ++++ b/drivers/net/ethernet/intel/i40e/i40e_hmc.h +@@ -187,28 +187,28 @@ struct i40e_hmc_info { + /* add one more to the limit to correct our range */ \ + *(pd_limit) += 1; \ + } +-i40e_status i40e_add_sd_table_entry(struct i40e_hw *hw, +- struct i40e_hmc_info *hmc_info, +- u32 sd_index, +- enum i40e_sd_entry_type type, +- u64 direct_mode_sz); + +-i40e_status i40e_add_pd_table_entry(struct i40e_hw *hw, +- struct i40e_hmc_info *hmc_info, +- u32 pd_index, +- struct i40e_dma_mem *rsrc_pg); +-i40e_status i40e_remove_pd_bp(struct i40e_hw *hw, +- struct i40e_hmc_info *hmc_info, +- u32 idx); +-i40e_status i40e_prep_remove_sd_bp(struct i40e_hmc_info *hmc_info, +- u32 idx); +-i40e_status i40e_remove_sd_bp_new(struct i40e_hw *hw, +- struct i40e_hmc_info *hmc_info, +- u32 idx, bool is_pf); +-i40e_status i40e_prep_remove_pd_page(struct i40e_hmc_info *hmc_info, +- u32 idx); +-i40e_status i40e_remove_pd_page_new(struct i40e_hw *hw, +- struct i40e_hmc_info *hmc_info, +- u32 idx, bool is_pf); ++int i40e_add_sd_table_entry(struct i40e_hw *hw, ++ struct i40e_hmc_info *hmc_info, ++ u32 sd_index, ++ enum i40e_sd_entry_type type, ++ u64 direct_mode_sz); ++int i40e_add_pd_table_entry(struct i40e_hw *hw, ++ struct i40e_hmc_info *hmc_info, ++ u32 pd_index, ++ struct i40e_dma_mem *rsrc_pg); ++int i40e_remove_pd_bp(struct i40e_hw *hw, ++ struct i40e_hmc_info *hmc_info, ++ u32 idx); ++int i40e_prep_remove_sd_bp(struct i40e_hmc_info *hmc_info, ++ u32 idx); ++int i40e_remove_sd_bp_new(struct i40e_hw *hw, ++ struct i40e_hmc_info *hmc_info, ++ u32 idx, bool is_pf); ++int i40e_prep_remove_pd_page(struct i40e_hmc_info *hmc_info, ++ u32 idx); ++int i40e_remove_pd_page_new(struct i40e_hw *hw, ++ struct i40e_hmc_info *hmc_info, ++ u32 idx, bool is_pf); + + #endif /* _I40E_HMC_H_ */ +--- a/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c ++++ b/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c +@@ -74,12 +74,12 @@ static u64 i40e_calculate_l2fpm_size(u32 + * Assumptions: + * - HMC Resource Profile has been selected before calling this function. + **/ +-i40e_status i40e_init_lan_hmc(struct i40e_hw *hw, u32 txq_num, +- u32 rxq_num, u32 fcoe_cntx_num, +- u32 fcoe_filt_num) ++int i40e_init_lan_hmc(struct i40e_hw *hw, u32 txq_num, ++ u32 rxq_num, u32 fcoe_cntx_num, ++ u32 fcoe_filt_num) + { + struct i40e_hmc_obj_info *obj, *full_obj; +- i40e_status ret_code = 0; ++ int ret_code = 0; + u64 l2fpm_size; + u32 size_exp; + +@@ -229,11 +229,11 @@ init_lan_hmc_out: + * 1. caller can deallocate the memory used by pd after this function + * returns. + **/ +-static i40e_status i40e_remove_pd_page(struct i40e_hw *hw, +- struct i40e_hmc_info *hmc_info, +- u32 idx) ++static int i40e_remove_pd_page(struct i40e_hw *hw, ++ struct i40e_hmc_info *hmc_info, ++ u32 idx) + { +- i40e_status ret_code = 0; ++ int ret_code = 0; + + if (!i40e_prep_remove_pd_page(hmc_info, idx)) + ret_code = i40e_remove_pd_page_new(hw, hmc_info, idx, true); +@@ -256,11 +256,11 @@ static i40e_status i40e_remove_pd_page(s + * 1. caller can deallocate the memory used by backing storage after this + * function returns. + **/ +-static i40e_status i40e_remove_sd_bp(struct i40e_hw *hw, +- struct i40e_hmc_info *hmc_info, +- u32 idx) ++static int i40e_remove_sd_bp(struct i40e_hw *hw, ++ struct i40e_hmc_info *hmc_info, ++ u32 idx) + { +- i40e_status ret_code = 0; ++ int ret_code = 0; + + if (!i40e_prep_remove_sd_bp(hmc_info, idx)) + ret_code = i40e_remove_sd_bp_new(hw, hmc_info, idx, true); +@@ -276,15 +276,15 @@ static i40e_status i40e_remove_sd_bp(str + * This will allocate memory for PDs and backing pages and populate + * the sd and pd entries. + **/ +-static i40e_status i40e_create_lan_hmc_object(struct i40e_hw *hw, +- struct i40e_hmc_lan_create_obj_info *info) ++static int i40e_create_lan_hmc_object(struct i40e_hw *hw, ++ struct i40e_hmc_lan_create_obj_info *info) + { +- i40e_status ret_code = 0; + struct i40e_hmc_sd_entry *sd_entry; + u32 pd_idx1 = 0, pd_lmt1 = 0; + u32 pd_idx = 0, pd_lmt = 0; + bool pd_error = false; + u32 sd_idx, sd_lmt; ++ int ret_code = 0; + u64 sd_size; + u32 i, j; + +@@ -435,13 +435,13 @@ exit: + * - This function will be called after i40e_init_lan_hmc() and before + * any LAN/FCoE HMC objects can be created. + **/ +-i40e_status i40e_configure_lan_hmc(struct i40e_hw *hw, +- enum i40e_hmc_model model) ++int i40e_configure_lan_hmc(struct i40e_hw *hw, ++ enum i40e_hmc_model model) + { + struct i40e_hmc_lan_create_obj_info info; +- i40e_status ret_code = 0; + u8 hmc_fn_id = hw->hmc.hmc_fn_id; + struct i40e_hmc_obj_info *obj; ++ int ret_code = 0; + + /* Initialize part of the create object info struct */ + info.hmc_info = &hw->hmc; +@@ -520,13 +520,13 @@ configure_lan_hmc_out: + * caller should deallocate memory allocated previously for + * book-keeping information about PDs and backing storage. + **/ +-static i40e_status i40e_delete_lan_hmc_object(struct i40e_hw *hw, +- struct i40e_hmc_lan_delete_obj_info *info) ++static int i40e_delete_lan_hmc_object(struct i40e_hw *hw, ++ struct i40e_hmc_lan_delete_obj_info *info) + { +- i40e_status ret_code = 0; + struct i40e_hmc_pd_table *pd_table; + u32 pd_idx, pd_lmt, rel_pd_idx; + u32 sd_idx, sd_lmt; ++ int ret_code = 0; + u32 i, j; + + if (NULL == info) { +@@ -632,10 +632,10 @@ exit: + * This must be called by drivers as they are shutting down and being + * removed from the OS. + **/ +-i40e_status i40e_shutdown_lan_hmc(struct i40e_hw *hw) ++int i40e_shutdown_lan_hmc(struct i40e_hw *hw) + { + struct i40e_hmc_lan_delete_obj_info info; +- i40e_status ret_code; ++ int ret_code; + + info.hmc_info = &hw->hmc; + info.rsrc_type = I40E_HMC_LAN_FULL; +@@ -915,9 +915,9 @@ static void i40e_write_qword(u8 *hmc_bit + * @context_bytes: pointer to the context bit array (DMA memory) + * @hmc_type: the type of HMC resource + **/ +-static i40e_status i40e_clear_hmc_context(struct i40e_hw *hw, +- u8 *context_bytes, +- enum i40e_hmc_lan_rsrc_type hmc_type) ++static int i40e_clear_hmc_context(struct i40e_hw *hw, ++ u8 *context_bytes, ++ enum i40e_hmc_lan_rsrc_type hmc_type) + { + /* clean the bit array */ + memset(context_bytes, 0, (u32)hw->hmc.hmc_obj[hmc_type].size); +@@ -931,9 +931,9 @@ static i40e_status i40e_clear_hmc_contex + * @ce_info: a description of the struct to be filled + * @dest: the struct to be filled + **/ +-static i40e_status i40e_set_hmc_context(u8 *context_bytes, +- struct i40e_context_ele *ce_info, +- u8 *dest) ++static int i40e_set_hmc_context(u8 *context_bytes, ++ struct i40e_context_ele *ce_info, ++ u8 *dest) + { + int f; + +@@ -973,18 +973,18 @@ static i40e_status i40e_set_hmc_context( + * base pointer. This function is used for LAN Queue contexts. + **/ + static +-i40e_status i40e_hmc_get_object_va(struct i40e_hw *hw, u8 **object_base, +- enum i40e_hmc_lan_rsrc_type rsrc_type, +- u32 obj_idx) ++int i40e_hmc_get_object_va(struct i40e_hw *hw, u8 **object_base, ++ enum i40e_hmc_lan_rsrc_type rsrc_type, ++ u32 obj_idx) + { + struct i40e_hmc_info *hmc_info = &hw->hmc; + u32 obj_offset_in_sd, obj_offset_in_pd; + struct i40e_hmc_sd_entry *sd_entry; + struct i40e_hmc_pd_entry *pd_entry; + u32 pd_idx, pd_lmt, rel_pd_idx; +- i40e_status ret_code = 0; + u64 obj_offset_in_fpm; + u32 sd_idx, sd_lmt; ++ int ret_code = 0; + + if (NULL == hmc_info) { + ret_code = I40E_ERR_BAD_PTR; +@@ -1042,11 +1042,11 @@ exit: + * @hw: the hardware struct + * @queue: the queue we care about + **/ +-i40e_status i40e_clear_lan_tx_queue_context(struct i40e_hw *hw, +- u16 queue) ++int i40e_clear_lan_tx_queue_context(struct i40e_hw *hw, ++ u16 queue) + { +- i40e_status err; + u8 *context_bytes; ++ int err; + + err = i40e_hmc_get_object_va(hw, &context_bytes, + I40E_HMC_LAN_TX, queue); +@@ -1062,12 +1062,12 @@ i40e_status i40e_clear_lan_tx_queue_cont + * @queue: the queue we care about + * @s: the struct to be filled + **/ +-i40e_status i40e_set_lan_tx_queue_context(struct i40e_hw *hw, +- u16 queue, +- struct i40e_hmc_obj_txq *s) ++int i40e_set_lan_tx_queue_context(struct i40e_hw *hw, ++ u16 queue, ++ struct i40e_hmc_obj_txq *s) + { +- i40e_status err; + u8 *context_bytes; ++ int err; + + err = i40e_hmc_get_object_va(hw, &context_bytes, + I40E_HMC_LAN_TX, queue); +@@ -1083,11 +1083,11 @@ i40e_status i40e_set_lan_tx_queue_contex + * @hw: the hardware struct + * @queue: the queue we care about + **/ +-i40e_status i40e_clear_lan_rx_queue_context(struct i40e_hw *hw, +- u16 queue) ++int i40e_clear_lan_rx_queue_context(struct i40e_hw *hw, ++ u16 queue) + { +- i40e_status err; + u8 *context_bytes; ++ int err; + + err = i40e_hmc_get_object_va(hw, &context_bytes, + I40E_HMC_LAN_RX, queue); +@@ -1103,12 +1103,12 @@ i40e_status i40e_clear_lan_rx_queue_cont + * @queue: the queue we care about + * @s: the struct to be filled + **/ +-i40e_status i40e_set_lan_rx_queue_context(struct i40e_hw *hw, +- u16 queue, +- struct i40e_hmc_obj_rxq *s) ++int i40e_set_lan_rx_queue_context(struct i40e_hw *hw, ++ u16 queue, ++ struct i40e_hmc_obj_rxq *s) + { +- i40e_status err; + u8 *context_bytes; ++ int err; + + err = i40e_hmc_get_object_va(hw, &context_bytes, + I40E_HMC_LAN_RX, queue); +--- a/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h ++++ b/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h +@@ -137,22 +137,22 @@ struct i40e_hmc_lan_delete_obj_info { + u32 count; + }; + +-i40e_status i40e_init_lan_hmc(struct i40e_hw *hw, u32 txq_num, +- u32 rxq_num, u32 fcoe_cntx_num, +- u32 fcoe_filt_num); +-i40e_status i40e_configure_lan_hmc(struct i40e_hw *hw, +- enum i40e_hmc_model model); +-i40e_status i40e_shutdown_lan_hmc(struct i40e_hw *hw); ++int i40e_init_lan_hmc(struct i40e_hw *hw, u32 txq_num, ++ u32 rxq_num, u32 fcoe_cntx_num, ++ u32 fcoe_filt_num); ++int i40e_configure_lan_hmc(struct i40e_hw *hw, ++ enum i40e_hmc_model model); ++int i40e_shutdown_lan_hmc(struct i40e_hw *hw); + +-i40e_status i40e_clear_lan_tx_queue_context(struct i40e_hw *hw, +- u16 queue); +-i40e_status i40e_set_lan_tx_queue_context(struct i40e_hw *hw, +- u16 queue, +- struct i40e_hmc_obj_txq *s); +-i40e_status i40e_clear_lan_rx_queue_context(struct i40e_hw *hw, +- u16 queue); +-i40e_status i40e_set_lan_rx_queue_context(struct i40e_hw *hw, +- u16 queue, +- struct i40e_hmc_obj_rxq *s); ++int i40e_clear_lan_tx_queue_context(struct i40e_hw *hw, ++ u16 queue); ++int i40e_set_lan_tx_queue_context(struct i40e_hw *hw, ++ u16 queue, ++ struct i40e_hmc_obj_txq *s); ++int i40e_clear_lan_rx_queue_context(struct i40e_hw *hw, ++ u16 queue); ++int i40e_set_lan_rx_queue_context(struct i40e_hw *hw, ++ u16 queue, ++ struct i40e_hmc_obj_rxq *s); + + #endif /* _I40E_LAN_HMC_H_ */ +--- a/drivers/net/ethernet/intel/i40e/i40e_main.c ++++ b/drivers/net/ethernet/intel/i40e/i40e_main.c +@@ -1691,7 +1691,7 @@ static int i40e_set_mac(struct net_devic + spin_unlock_bh(&vsi->mac_filter_hash_lock); + + if (vsi->type == I40E_VSI_MAIN) { +- i40e_status ret; ++ int ret; + + ret = i40e_aq_mac_address_write(hw, I40E_AQC_WRITE_TYPE_LAA_WOL, + addr->sa_data, NULL); +@@ -2222,7 +2222,7 @@ void i40e_aqc_del_filters(struct i40e_vs + int num_del, int *retval) + { + struct i40e_hw *hw = &vsi->back->hw; +- i40e_status aq_ret; ++ int aq_ret; + int aq_err; + + aq_ret = i40e_aq_remove_macvlan(hw, vsi->seid, list, num_del, NULL); +@@ -2295,13 +2295,13 @@ void i40e_aqc_add_filters(struct i40e_vs + * + * Returns status indicating success or failure; + **/ +-static i40e_status ++static int + i40e_aqc_broadcast_filter(struct i40e_vsi *vsi, const char *vsi_name, + struct i40e_mac_filter *f) + { + bool enable = f->state == I40E_FILTER_NEW; + struct i40e_hw *hw = &vsi->back->hw; +- i40e_status aq_ret; ++ int aq_ret; + + if (f->vlan == I40E_VLAN_ANY) { + aq_ret = i40e_aq_set_vsi_broadcast(hw, +@@ -2340,7 +2340,7 @@ static int i40e_set_promiscuous(struct i + { + struct i40e_vsi *vsi = pf->vsi[pf->lan_vsi]; + struct i40e_hw *hw = &pf->hw; +- i40e_status aq_ret; ++ int aq_ret; + + if (vsi->type == I40E_VSI_MAIN && + pf->lan_veb != I40E_NO_VEB && +@@ -2413,12 +2413,12 @@ int i40e_sync_vsi_filters(struct i40e_vs + unsigned int vlan_filters = 0; + char vsi_name[16] = "PF"; + int filter_list_len = 0; +- i40e_status aq_ret = 0; + u32 changed_flags = 0; + struct hlist_node *h; + struct i40e_pf *pf; + int num_add = 0; + int num_del = 0; ++ int aq_ret = 0; + int retval = 0; + u16 cmd_flags; + int list_size; +@@ -2833,7 +2833,7 @@ int i40e_ioctl(struct net_device *netdev + void i40e_vlan_stripping_enable(struct i40e_vsi *vsi) + { + struct i40e_vsi_context ctxt; +- i40e_status ret; ++ int ret; + + /* Don't modify stripping options if a port VLAN is active */ + if (vsi->info.pvid) +@@ -2867,7 +2867,7 @@ void i40e_vlan_stripping_enable(struct i + void i40e_vlan_stripping_disable(struct i40e_vsi *vsi) + { + struct i40e_vsi_context ctxt; +- i40e_status ret; ++ int ret; + + /* Don't modify stripping options if a port VLAN is active */ + if (vsi->info.pvid) +@@ -3107,7 +3107,7 @@ static void i40e_restore_vlan(struct i40 + int i40e_vsi_add_pvid(struct i40e_vsi *vsi, u16 vid) + { + struct i40e_vsi_context ctxt; +- i40e_status ret; ++ int ret; + + vsi->info.valid_sections = cpu_to_le16(I40E_AQ_VSI_PROP_VLAN_VALID); + vsi->info.pvid = cpu_to_le16(vid); +@@ -3284,8 +3284,8 @@ static int i40e_configure_tx_ring(struct + u16 pf_q = vsi->base_queue + ring->queue_index; + struct i40e_hw *hw = &vsi->back->hw; + struct i40e_hmc_obj_txq tx_ctx; +- i40e_status err = 0; + u32 qtx_ctl = 0; ++ int err = 0; + + if (ring_is_xdp(ring)) + ring->xsk_pool = i40e_xsk_pool(ring); +@@ -3409,7 +3409,7 @@ static int i40e_configure_rx_ring(struct + u16 pf_q = vsi->base_queue + ring->queue_index; + struct i40e_hw *hw = &vsi->back->hw; + struct i40e_hmc_obj_rxq rx_ctx; +- i40e_status err = 0; ++ int err = 0; + bool ok; + int ret; + +@@ -5389,8 +5389,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; +- i40e_status ret; + u32 tc_bw_max; ++ int ret; + int i; + + /* Get the VSI level BW configuration */ +@@ -5450,7 +5450,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; +- i40e_status ret; ++ int ret; + int i; + + /* There is no need to reset BW when mqprio mode is on. */ +@@ -6168,7 +6168,7 @@ static int i40e_channel_config_bw(struct + u8 *bw_share) + { + struct i40e_aqc_configure_vsi_tc_bw_data bw_data; +- i40e_status ret; ++ int ret; + int i; + + memset(&bw_data, 0, sizeof(bw_data)); +@@ -6204,9 +6204,9 @@ static int i40e_channel_config_tx_ring(s + struct i40e_vsi *vsi, + struct i40e_channel *ch) + { +- i40e_status ret; +- int i; + u8 bw_share[I40E_MAX_TRAFFIC_CLASS] = {0}; ++ int ret; ++ int i; + + /* Enable ETS TCs with equal BW Share for now across all VSIs */ + for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++) { +@@ -7280,15 +7280,15 @@ static void i40e_vsi_reinit_locked(struc + * @pf: board private structure + * @is_up: whether the link state should be forced up or down + **/ +-static i40e_status i40e_force_link_state(struct i40e_pf *pf, bool is_up) ++static int i40e_force_link_state(struct i40e_pf *pf, bool is_up) + { + struct i40e_aq_get_phy_abilities_resp abilities; + struct i40e_aq_set_phy_config config = {0}; + bool non_zero_phy_type = is_up; + struct i40e_hw *hw = &pf->hw; +- i40e_status err; + u64 mask; + u8 speed; ++ int err; + + /* Card might've been put in an unstable state by other drivers + * and applications, which causes incorrect speed values being +@@ -7521,11 +7521,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. + **/ +-static i40e_status i40e_del_macvlan_filter(struct i40e_hw *hw, u16 seid, +- const u8 *macaddr, int *aq_err) ++static int i40e_del_macvlan_filter(struct i40e_hw *hw, u16 seid, ++ const u8 *macaddr, int *aq_err) + { + struct i40e_aqc_remove_macvlan_element_data element; +- i40e_status status; ++ int status; + + memset(&element, 0, sizeof(element)); + ether_addr_copy(element.mac_addr, macaddr); +@@ -7547,12 +7547,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. + **/ +-static i40e_status i40e_add_macvlan_filter(struct i40e_hw *hw, u16 seid, +- const u8 *macaddr, int *aq_err) ++static int i40e_add_macvlan_filter(struct i40e_hw *hw, u16 seid, ++ const u8 *macaddr, int *aq_err) + { + struct i40e_aqc_add_macvlan_element_data element; +- i40e_status status; + u16 cmd_flags = 0; ++ int status; + + ether_addr_copy(element.mac_addr, macaddr); + element.vlan_tag = 0; +@@ -9750,8 +9750,8 @@ static void i40e_link_event(struct i40e_ + { + struct i40e_vsi *vsi = pf->vsi[pf->lan_vsi]; + u8 new_link_speed, old_link_speed; +- i40e_status status; + bool new_link, old_link; ++ int status; + #ifdef CONFIG_I40E_DCB + int err; + #endif /* CONFIG_I40E_DCB */ +@@ -9962,9 +9962,9 @@ static void i40e_clean_adminq_subtask(st + struct i40e_arq_event_info event; + struct i40e_hw *hw = &pf->hw; + u16 pending, i = 0; +- i40e_status ret; + u16 opcode; + u32 oldval; ++ int ret; + u32 val; + + /* Do not run clean AQ when PF reset fails */ +@@ -10443,7 +10443,7 @@ static int i40e_rebuild_cloud_filters(st + struct i40e_cloud_filter *cfilter; + struct i40e_pf *pf = vsi->back; + struct hlist_node *node; +- i40e_status ret; ++ int ret; + + /* Add cloud filters back if they exist */ + hlist_for_each_entry_safe(cfilter, node, &pf->cloud_filter_list, +@@ -10478,7 +10478,7 @@ static int i40e_rebuild_cloud_filters(st + static int i40e_rebuild_channels(struct i40e_vsi *vsi) + { + struct i40e_channel *ch, *ch_tmp; +- i40e_status ret; ++ int ret; + + if (list_empty(&vsi->ch_list)) + return 0; +@@ -10554,7 +10554,7 @@ static void i40e_clean_xps_state(struct + static void i40e_prep_for_reset(struct i40e_pf *pf) + { + struct i40e_hw *hw = &pf->hw; +- i40e_status ret = 0; ++ int ret = 0; + u32 v; + + clear_bit(__I40E_RESET_INTR_RECEIVED, pf->state); +@@ -10659,7 +10659,7 @@ static void i40e_get_oem_version(struct + static int i40e_reset(struct i40e_pf *pf) + { + struct i40e_hw *hw = &pf->hw; +- i40e_status ret; ++ int ret; + + ret = i40e_pf_reset(hw); + if (ret) { +@@ -10684,7 +10684,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; +- i40e_status ret; ++ int ret; + u32 val; + int v; + +@@ -12375,11 +12375,11 @@ int i40e_reconfig_rss_queues(struct i40e + * i40e_get_partition_bw_setting - Retrieve BW settings for this PF partition + * @pf: board private structure + **/ +-i40e_status i40e_get_partition_bw_setting(struct i40e_pf *pf) ++int i40e_get_partition_bw_setting(struct i40e_pf *pf) + { +- i40e_status status; + bool min_valid, max_valid; + u32 max_bw, min_bw; ++ int status; + + status = i40e_read_bw_from_alt_ram(&pf->hw, &max_bw, &min_bw, + &min_valid, &max_valid); +@@ -12398,10 +12398,10 @@ i40e_status i40e_get_partition_bw_settin + * i40e_set_partition_bw_setting - Set BW settings for this PF partition + * @pf: board private structure + **/ +-i40e_status i40e_set_partition_bw_setting(struct i40e_pf *pf) ++int i40e_set_partition_bw_setting(struct i40e_pf *pf) + { + struct i40e_aqc_configure_partition_bw_data bw_data; +- i40e_status status; ++ int status; + + memset(&bw_data, 0, sizeof(bw_data)); + +@@ -12420,12 +12420,12 @@ i40e_status i40e_set_partition_bw_settin + * i40e_commit_partition_bw_setting - Commit BW settings for this PF partition + * @pf: board private structure + **/ +-i40e_status i40e_commit_partition_bw_setting(struct i40e_pf *pf) ++int i40e_commit_partition_bw_setting(struct i40e_pf *pf) + { + /* Commit temporary BW setting to permanent NVM image */ + enum i40e_admin_queue_err last_aq_status; +- i40e_status ret; + u16 nvm_word; ++ int ret; + + if (pf->hw.partition_id != 1) { + dev_info(&pf->pdev->dev, +@@ -12513,7 +12513,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 +- i40e_status read_status = I40E_SUCCESS; ++ int read_status = I40E_SUCCESS; + u16 sr_emp_sr_settings_ptr = 0; + u16 features_enable = 0; + u16 link_behavior = 0; +@@ -12865,7 +12865,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; +- i40e_status ret; ++ int ret; + + type = ti->type == UDP_TUNNEL_TYPE_VXLAN ? I40E_AQC_TUNNEL_TYPE_VXLAN : + I40E_AQC_TUNNEL_TYPE_NGE; +@@ -12889,7 +12889,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; +- i40e_status ret; ++ int ret; + + ret = i40e_aq_del_udp_tunnel(hw, ti->hw_priv, NULL); + if (ret) { +@@ -15261,13 +15261,12 @@ static bool i40e_check_recovery_mode(str + * + * Return 0 on success, negative on failure. + **/ +-static i40e_status i40e_pf_loop_reset(struct i40e_pf *pf) ++static int i40e_pf_loop_reset(struct i40e_pf *pf) + { + /* wait max 10 seconds for PF reset to succeed */ + const unsigned long time_end = jiffies + 10 * HZ; +- + struct i40e_hw *hw = &pf->hw; +- i40e_status ret; ++ int ret; + + ret = i40e_pf_reset(hw); + while (ret != I40E_SUCCESS && time_before(jiffies, time_end)) { +@@ -15313,9 +15312,9 @@ static bool i40e_check_fw_empr(struct i4 + * Return 0 if NIC is healthy or negative value when there are issues + * with resets + **/ +-static i40e_status i40e_handle_resets(struct i40e_pf *pf) ++static int i40e_handle_resets(struct i40e_pf *pf) + { +- const i40e_status pfr = i40e_pf_loop_reset(pf); ++ const int pfr = i40e_pf_loop_reset(pf); + const bool is_empr = i40e_check_fw_empr(pf); + + if (is_empr || pfr != I40E_SUCCESS) +@@ -15454,13 +15453,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; +- i40e_status status; + #endif /* CONFIG_I40E_DCB */ + struct i40e_pf *pf; + struct i40e_hw *hw; + static u16 pfs_found; + u16 wol_nvm_bits; + u16 link_status; ++#ifdef CONFIG_I40E_DCB ++ int status; ++#endif /* CONFIG_I40E_DCB */ + int err; + u32 val; + u32 i; +@@ -16067,7 +16068,7 @@ static void i40e_remove(struct pci_dev * + { + struct i40e_pf *pf = pci_get_drvdata(pdev); + struct i40e_hw *hw = &pf->hw; +- i40e_status ret_code; ++ int ret_code; + int i; + + i40e_dbg_pf_exit(pf); +@@ -16315,9 +16316,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_status ret; + u8 mac_addr[6]; + u16 flags = 0; ++ int ret; + + /* Get current MAC address in case it's an LAA */ + if (pf->vsi[pf->lan_vsi] && pf->vsi[pf->lan_vsi]->netdev) { +--- a/drivers/net/ethernet/intel/i40e/i40e_nvm.c ++++ b/drivers/net/ethernet/intel/i40e/i40e_nvm.c +@@ -13,10 +13,10 @@ + * in this file) as an equivalent of the FLASH part mapped into the SR. + * We are accessing FLASH always thru the Shadow RAM. + **/ +-i40e_status i40e_init_nvm(struct i40e_hw *hw) ++int i40e_init_nvm(struct i40e_hw *hw) + { + struct i40e_nvm_info *nvm = &hw->nvm; +- i40e_status ret_code = 0; ++ int ret_code = 0; + u32 fla, gens; + u8 sr_size; + +@@ -52,12 +52,12 @@ i40e_status i40e_init_nvm(struct i40e_hw + * This function will request NVM ownership for reading + * via the proper Admin Command. + **/ +-i40e_status 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) + { +- i40e_status ret_code = 0; + u64 gtime, timeout; + u64 time_left = 0; ++ int ret_code = 0; + + if (hw->nvm.blank_nvm_mode) + goto i40e_i40e_acquire_nvm_exit; +@@ -111,7 +111,7 @@ i40e_i40e_acquire_nvm_exit: + **/ + void i40e_release_nvm(struct i40e_hw *hw) + { +- i40e_status ret_code = I40E_SUCCESS; ++ int ret_code = I40E_SUCCESS; + u32 total_delay = 0; + + if (hw->nvm.blank_nvm_mode) +@@ -138,9 +138,9 @@ void i40e_release_nvm(struct i40e_hw *hw + * + * Polls the SRCTL Shadow RAM register done bit. + **/ +-static i40e_status i40e_poll_sr_srctl_done_bit(struct i40e_hw *hw) ++static int i40e_poll_sr_srctl_done_bit(struct i40e_hw *hw) + { +- i40e_status ret_code = I40E_ERR_TIMEOUT; ++ int ret_code = I40E_ERR_TIMEOUT; + u32 srctl, wait_cnt; + + /* Poll the I40E_GLNVM_SRCTL until the done bit is set */ +@@ -165,10 +165,10 @@ static i40e_status i40e_poll_sr_srctl_do + * + * Reads one 16 bit word from the Shadow RAM using the GLNVM_SRCTL register. + **/ +-static i40e_status i40e_read_nvm_word_srctl(struct i40e_hw *hw, u16 offset, +- u16 *data) ++static int i40e_read_nvm_word_srctl(struct i40e_hw *hw, u16 offset, ++ u16 *data) + { +- i40e_status ret_code = I40E_ERR_TIMEOUT; ++ int ret_code = I40E_ERR_TIMEOUT; + u32 sr_reg; + + if (offset >= hw->nvm.sr_size) { +@@ -216,13 +216,13 @@ read_nvm_exit: + * + * Writes a 16 bit words buffer to the Shadow RAM using the admin command. + **/ +-static i40e_status i40e_read_nvm_aq(struct i40e_hw *hw, +- u8 module_pointer, u32 offset, +- u16 words, void *data, +- bool last_command) ++static int i40e_read_nvm_aq(struct i40e_hw *hw, ++ u8 module_pointer, u32 offset, ++ u16 words, void *data, ++ bool last_command) + { +- i40e_status ret_code = I40E_ERR_NVM; + struct i40e_asq_cmd_details cmd_details; ++ int ret_code = I40E_ERR_NVM; + + memset(&cmd_details, 0, sizeof(cmd_details)); + cmd_details.wb_desc = &hw->nvm_wb_desc; +@@ -264,10 +264,10 @@ static i40e_status i40e_read_nvm_aq(stru + * + * Reads one 16 bit word from the Shadow RAM using the AdminQ + **/ +-static i40e_status i40e_read_nvm_word_aq(struct i40e_hw *hw, u16 offset, +- u16 *data) ++static int i40e_read_nvm_word_aq(struct i40e_hw *hw, u16 offset, ++ u16 *data) + { +- i40e_status ret_code = I40E_ERR_TIMEOUT; ++ int ret_code = I40E_ERR_TIMEOUT; + + ret_code = i40e_read_nvm_aq(hw, 0x0, offset, 1, data, true); + *data = le16_to_cpu(*(__le16 *)data); +@@ -286,8 +286,8 @@ static i40e_status i40e_read_nvm_word_aq + * Do not use this function except in cases where the nvm lock is already + * taken via i40e_acquire_nvm(). + **/ +-static i40e_status __i40e_read_nvm_word(struct i40e_hw *hw, +- u16 offset, u16 *data) ++static int __i40e_read_nvm_word(struct i40e_hw *hw, ++ u16 offset, u16 *data) + { + if (hw->flags & I40E_HW_FLAG_AQ_SRCTL_ACCESS_ENABLE) + return i40e_read_nvm_word_aq(hw, offset, data); +@@ -303,10 +303,10 @@ static i40e_status __i40e_read_nvm_word( + * + * Reads one 16 bit word from the Shadow RAM. + **/ +-i40e_status i40e_read_nvm_word(struct i40e_hw *hw, u16 offset, +- u16 *data) ++int i40e_read_nvm_word(struct i40e_hw *hw, u16 offset, ++ u16 *data) + { +- i40e_status ret_code = 0; ++ int ret_code = 0; + + if (hw->flags & I40E_HW_FLAG_NVM_READ_REQUIRES_LOCK) + ret_code = i40e_acquire_nvm(hw, I40E_RESOURCE_READ); +@@ -330,17 +330,17 @@ i40e_status i40e_read_nvm_word(struct i4 + * @words_data_size: Words to read from NVM + * @data_ptr: Pointer to memory location where resulting buffer will be stored + **/ +-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_module_data(struct i40e_hw *hw, ++ u8 module_ptr, ++ u16 module_offset, ++ u16 data_offset, ++ u16 words_data_size, ++ u16 *data_ptr) + { +- i40e_status status; + u16 specific_ptr = 0; + u16 ptr_value = 0; + u32 offset = 0; ++ int status; + + if (module_ptr != 0) { + status = i40e_read_nvm_word(hw, module_ptr, &ptr_value); +@@ -406,10 +406,10 @@ enum i40e_status_code i40e_read_nvm_modu + * method. The buffer read is preceded by the NVM ownership take + * and followed by the release. + **/ +-static i40e_status i40e_read_nvm_buffer_srctl(struct i40e_hw *hw, u16 offset, +- u16 *words, u16 *data) ++static int i40e_read_nvm_buffer_srctl(struct i40e_hw *hw, u16 offset, ++ u16 *words, u16 *data) + { +- i40e_status ret_code = 0; ++ int ret_code = 0; + u16 index, word; + + /* Loop thru the selected region */ +@@ -437,13 +437,13 @@ static i40e_status i40e_read_nvm_buffer_ + * method. The buffer read is preceded by the NVM ownership take + * and followed by the release. + **/ +-static i40e_status i40e_read_nvm_buffer_aq(struct i40e_hw *hw, u16 offset, +- u16 *words, u16 *data) ++static int i40e_read_nvm_buffer_aq(struct i40e_hw *hw, u16 offset, ++ u16 *words, u16 *data) + { +- i40e_status ret_code; +- u16 read_size; + bool last_cmd = false; + u16 words_read = 0; ++ u16 read_size; ++ int ret_code; + u16 i = 0; + + do { +@@ -493,9 +493,9 @@ read_nvm_buffer_aq_exit: + * Reads 16 bit words (data buffer) from the SR using the i40e_read_nvm_srrd() + * method. + **/ +-static i40e_status __i40e_read_nvm_buffer(struct i40e_hw *hw, +- u16 offset, u16 *words, +- u16 *data) ++static int __i40e_read_nvm_buffer(struct i40e_hw *hw, ++ u16 offset, u16 *words, ++ u16 *data) + { + if (hw->flags & I40E_HW_FLAG_AQ_SRCTL_ACCESS_ENABLE) + return i40e_read_nvm_buffer_aq(hw, offset, words, data); +@@ -514,10 +514,10 @@ static i40e_status __i40e_read_nvm_buffe + * method. The buffer read is preceded by the NVM ownership take + * and followed by the release. + **/ +-i40e_status 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) + { +- i40e_status ret_code = 0; ++ int ret_code = 0; + + if (hw->flags & I40E_HW_FLAG_AQ_SRCTL_ACCESS_ENABLE) { + ret_code = i40e_acquire_nvm(hw, I40E_RESOURCE_READ); +@@ -544,12 +544,12 @@ i40e_status i40e_read_nvm_buffer(struct + * + * Writes a 16 bit words buffer to the Shadow RAM using the admin command. + **/ +-static i40e_status i40e_write_nvm_aq(struct i40e_hw *hw, u8 module_pointer, +- u32 offset, u16 words, void *data, +- bool last_command) ++static int i40e_write_nvm_aq(struct i40e_hw *hw, u8 module_pointer, ++ u32 offset, u16 words, void *data, ++ bool last_command) + { +- i40e_status ret_code = I40E_ERR_NVM; + struct i40e_asq_cmd_details cmd_details; ++ int ret_code = I40E_ERR_NVM; + + memset(&cmd_details, 0, sizeof(cmd_details)); + cmd_details.wb_desc = &hw->nvm_wb_desc; +@@ -594,14 +594,14 @@ static i40e_status i40e_write_nvm_aq(str + * is customer specific and unknown. Therefore, this function skips all maximum + * possible size of VPD (1kB). + **/ +-static i40e_status i40e_calc_nvm_checksum(struct i40e_hw *hw, +- u16 *checksum) ++static int i40e_calc_nvm_checksum(struct i40e_hw *hw, ++ u16 *checksum) + { +- i40e_status ret_code; + struct i40e_virt_mem vmem; + u16 pcie_alt_module = 0; + u16 checksum_local = 0; + u16 vpd_module = 0; ++ int ret_code; + u16 *data; + u16 i = 0; + +@@ -675,11 +675,11 @@ i40e_calc_nvm_checksum_exit: + * on ARQ completion event reception by caller. + * This function will commit SR to NVM. + **/ +-i40e_status i40e_update_nvm_checksum(struct i40e_hw *hw) ++int i40e_update_nvm_checksum(struct i40e_hw *hw) + { +- i40e_status ret_code; +- u16 checksum; + __le16 le_sum; ++ int ret_code; ++ u16 checksum; + + ret_code = i40e_calc_nvm_checksum(hw, &checksum); + le_sum = cpu_to_le16(checksum); +@@ -698,12 +698,12 @@ i40e_status i40e_update_nvm_checksum(str + * Performs checksum calculation and validates the NVM SW checksum. If the + * caller does not need checksum, the value can be NULL. + **/ +-i40e_status i40e_validate_nvm_checksum(struct i40e_hw *hw, +- u16 *checksum) ++int i40e_validate_nvm_checksum(struct i40e_hw *hw, ++ u16 *checksum) + { +- i40e_status ret_code = 0; +- u16 checksum_sr = 0; + u16 checksum_local = 0; ++ u16 checksum_sr = 0; ++ int ret_code = 0; + + /* We must acquire the NVM lock in order to correctly synchronize the + * NVM accesses across multiple PFs. Without doing so it is possible +@@ -732,36 +732,36 @@ i40e_status i40e_validate_nvm_checksum(s + return ret_code; + } + +-static i40e_status i40e_nvmupd_state_init(struct i40e_hw *hw, +- struct i40e_nvm_access *cmd, +- u8 *bytes, int *perrno); +-static i40e_status i40e_nvmupd_state_reading(struct i40e_hw *hw, +- struct i40e_nvm_access *cmd, +- u8 *bytes, int *perrno); +-static i40e_status i40e_nvmupd_state_writing(struct i40e_hw *hw, +- struct i40e_nvm_access *cmd, +- u8 *bytes, int *errno); ++static int i40e_nvmupd_state_init(struct i40e_hw *hw, ++ struct i40e_nvm_access *cmd, ++ u8 *bytes, int *perrno); ++static int i40e_nvmupd_state_reading(struct i40e_hw *hw, ++ struct i40e_nvm_access *cmd, ++ u8 *bytes, int *perrno); ++static int i40e_nvmupd_state_writing(struct i40e_hw *hw, ++ struct i40e_nvm_access *cmd, ++ u8 *bytes, int *errno); + static enum i40e_nvmupd_cmd i40e_nvmupd_validate_command(struct i40e_hw *hw, + struct i40e_nvm_access *cmd, + int *perrno); +-static i40e_status i40e_nvmupd_nvm_erase(struct i40e_hw *hw, +- struct i40e_nvm_access *cmd, +- int *perrno); +-static i40e_status i40e_nvmupd_nvm_write(struct i40e_hw *hw, +- struct i40e_nvm_access *cmd, +- u8 *bytes, int *perrno); +-static i40e_status i40e_nvmupd_nvm_read(struct i40e_hw *hw, +- struct i40e_nvm_access *cmd, +- u8 *bytes, int *perrno); +-static i40e_status i40e_nvmupd_exec_aq(struct i40e_hw *hw, +- struct i40e_nvm_access *cmd, +- u8 *bytes, int *perrno); +-static i40e_status i40e_nvmupd_get_aq_result(struct i40e_hw *hw, +- struct i40e_nvm_access *cmd, +- u8 *bytes, int *perrno); +-static i40e_status i40e_nvmupd_get_aq_event(struct i40e_hw *hw, +- struct i40e_nvm_access *cmd, +- u8 *bytes, int *perrno); ++static int i40e_nvmupd_nvm_erase(struct i40e_hw *hw, ++ struct i40e_nvm_access *cmd, ++ int *perrno); ++static int i40e_nvmupd_nvm_write(struct i40e_hw *hw, ++ struct i40e_nvm_access *cmd, ++ u8 *bytes, int *perrno); ++static int i40e_nvmupd_nvm_read(struct i40e_hw *hw, ++ struct i40e_nvm_access *cmd, ++ u8 *bytes, int *perrno); ++static int i40e_nvmupd_exec_aq(struct i40e_hw *hw, ++ struct i40e_nvm_access *cmd, ++ u8 *bytes, int *perrno); ++static int i40e_nvmupd_get_aq_result(struct i40e_hw *hw, ++ struct i40e_nvm_access *cmd, ++ u8 *bytes, int *perrno); ++static int i40e_nvmupd_get_aq_event(struct i40e_hw *hw, ++ struct i40e_nvm_access *cmd, ++ u8 *bytes, int *perrno); + static inline u8 i40e_nvmupd_get_module(u32 val) + { + return (u8)(val & I40E_NVM_MOD_PNT_MASK); +@@ -806,12 +806,12 @@ static const char * const i40e_nvm_updat + * + * Dispatches command depending on what update state is current + **/ +-i40e_status i40e_nvmupd_command(struct i40e_hw *hw, +- struct i40e_nvm_access *cmd, +- u8 *bytes, int *perrno) ++int i40e_nvmupd_command(struct i40e_hw *hw, ++ struct i40e_nvm_access *cmd, ++ u8 *bytes, int *perrno) + { +- i40e_status status; + enum i40e_nvmupd_cmd upd_cmd; ++ int status; + + /* assume success */ + *perrno = 0; +@@ -922,12 +922,12 @@ i40e_status i40e_nvmupd_command(struct i + * Process legitimate commands of the Init state and conditionally set next + * state. Reject all other commands. + **/ +-static i40e_status i40e_nvmupd_state_init(struct i40e_hw *hw, +- struct i40e_nvm_access *cmd, +- u8 *bytes, int *perrno) ++static int i40e_nvmupd_state_init(struct i40e_hw *hw, ++ struct i40e_nvm_access *cmd, ++ u8 *bytes, int *perrno) + { +- i40e_status status = 0; + enum i40e_nvmupd_cmd upd_cmd; ++ int status = 0; + + upd_cmd = i40e_nvmupd_validate_command(hw, cmd, perrno); + +@@ -1061,12 +1061,12 @@ static i40e_status i40e_nvmupd_state_ini + * NVM ownership is already held. Process legitimate commands and set any + * change in state; reject all other commands. + **/ +-static i40e_status i40e_nvmupd_state_reading(struct i40e_hw *hw, +- struct i40e_nvm_access *cmd, +- u8 *bytes, int *perrno) ++static int i40e_nvmupd_state_reading(struct i40e_hw *hw, ++ struct i40e_nvm_access *cmd, ++ u8 *bytes, int *perrno) + { +- i40e_status status = 0; + enum i40e_nvmupd_cmd upd_cmd; ++ int status = 0; + + upd_cmd = i40e_nvmupd_validate_command(hw, cmd, perrno); + +@@ -1103,13 +1103,13 @@ static i40e_status i40e_nvmupd_state_rea + * NVM ownership is already held. Process legitimate commands and set any + * change in state; reject all other commands + **/ +-static i40e_status i40e_nvmupd_state_writing(struct i40e_hw *hw, +- struct i40e_nvm_access *cmd, +- u8 *bytes, int *perrno) ++static int i40e_nvmupd_state_writing(struct i40e_hw *hw, ++ struct i40e_nvm_access *cmd, ++ u8 *bytes, int *perrno) + { +- i40e_status status = 0; + enum i40e_nvmupd_cmd upd_cmd; + bool retry_attempt = false; ++ int status = 0; + + upd_cmd = i40e_nvmupd_validate_command(hw, cmd, perrno); + +@@ -1186,8 +1186,8 @@ retry: + */ + if (status && (hw->aq.asq_last_status == I40E_AQ_RC_EBUSY) && + !retry_attempt) { +- i40e_status old_status = status; + u32 old_asq_status = hw->aq.asq_last_status; ++ int old_status = status; + u32 gtime; + + gtime = rd32(hw, I40E_GLVFGEN_TIMER); +@@ -1369,17 +1369,17 @@ static enum i40e_nvmupd_cmd i40e_nvmupd_ + * + * cmd structure contains identifiers and data buffer + **/ +-static i40e_status i40e_nvmupd_exec_aq(struct i40e_hw *hw, +- struct i40e_nvm_access *cmd, +- u8 *bytes, int *perrno) ++static int i40e_nvmupd_exec_aq(struct i40e_hw *hw, ++ struct i40e_nvm_access *cmd, ++ u8 *bytes, int *perrno) + { + struct i40e_asq_cmd_details cmd_details; +- i40e_status status; + struct i40e_aq_desc *aq_desc; + u32 buff_size = 0; + u8 *buff = NULL; + u32 aq_desc_len; + u32 aq_data_len; ++ int status; + + i40e_debug(hw, I40E_DEBUG_NVM, "NVMUPD: %s\n", __func__); + if (cmd->offset == 0xffff) +@@ -1453,9 +1453,9 @@ static i40e_status i40e_nvmupd_exec_aq(s + * + * cmd structure contains identifiers and data buffer + **/ +-static i40e_status i40e_nvmupd_get_aq_result(struct i40e_hw *hw, +- struct i40e_nvm_access *cmd, +- u8 *bytes, int *perrno) ++static int i40e_nvmupd_get_aq_result(struct i40e_hw *hw, ++ struct i40e_nvm_access *cmd, ++ u8 *bytes, int *perrno) + { + u32 aq_total_len; + u32 aq_desc_len; +@@ -1522,9 +1522,9 @@ static i40e_status i40e_nvmupd_get_aq_re + * + * cmd structure contains identifiers and data buffer + **/ +-static i40e_status i40e_nvmupd_get_aq_event(struct i40e_hw *hw, +- struct i40e_nvm_access *cmd, +- u8 *bytes, int *perrno) ++static int i40e_nvmupd_get_aq_event(struct i40e_hw *hw, ++ struct i40e_nvm_access *cmd, ++ u8 *bytes, int *perrno) + { + u32 aq_total_len; + u32 aq_desc_len; +@@ -1556,13 +1556,13 @@ static i40e_status i40e_nvmupd_get_aq_ev + * + * cmd structure contains identifiers and data buffer + **/ +-static i40e_status i40e_nvmupd_nvm_read(struct i40e_hw *hw, +- struct i40e_nvm_access *cmd, +- u8 *bytes, int *perrno) ++static int i40e_nvmupd_nvm_read(struct i40e_hw *hw, ++ struct i40e_nvm_access *cmd, ++ u8 *bytes, int *perrno) + { + struct i40e_asq_cmd_details cmd_details; +- i40e_status status; + u8 module, transaction; ++ int status; + bool last; + + transaction = i40e_nvmupd_get_transaction(cmd->config); +@@ -1595,13 +1595,13 @@ static i40e_status i40e_nvmupd_nvm_read( + * + * module, offset, data_size and data are in cmd structure + **/ +-static i40e_status i40e_nvmupd_nvm_erase(struct i40e_hw *hw, +- struct i40e_nvm_access *cmd, +- int *perrno) ++static int i40e_nvmupd_nvm_erase(struct i40e_hw *hw, ++ struct i40e_nvm_access *cmd, ++ int *perrno) + { +- i40e_status status = 0; + struct i40e_asq_cmd_details cmd_details; + u8 module, transaction; ++ int status = 0; + bool last; + + transaction = i40e_nvmupd_get_transaction(cmd->config); +@@ -1635,14 +1635,14 @@ static i40e_status i40e_nvmupd_nvm_erase + * + * module, offset, data_size and data are in cmd structure + **/ +-static i40e_status i40e_nvmupd_nvm_write(struct i40e_hw *hw, +- struct i40e_nvm_access *cmd, +- u8 *bytes, int *perrno) ++static int i40e_nvmupd_nvm_write(struct i40e_hw *hw, ++ struct i40e_nvm_access *cmd, ++ u8 *bytes, int *perrno) + { +- i40e_status status = 0; + struct i40e_asq_cmd_details cmd_details; + u8 module, transaction; + u8 preservation_flags; ++ int status = 0; + bool last; + + transaction = i40e_nvmupd_get_transaction(cmd->config); +--- a/drivers/net/ethernet/intel/i40e/i40e_osdep.h ++++ b/drivers/net/ethernet/intel/i40e/i40e_osdep.h +@@ -56,5 +56,4 @@ do { \ + (h)->bus.func, ##__VA_ARGS__); \ + } while (0) + +-typedef enum i40e_status_code i40e_status; + #endif /* _I40E_OSDEP_H_ */ +--- a/drivers/net/ethernet/intel/i40e/i40e_prototype.h ++++ b/drivers/net/ethernet/intel/i40e/i40e_prototype.h +@@ -16,17 +16,17 @@ + */ + + /* adminq functions */ +-i40e_status i40e_init_adminq(struct i40e_hw *hw); ++int i40e_init_adminq(struct i40e_hw *hw); + void i40e_shutdown_adminq(struct i40e_hw *hw); + void i40e_adminq_init_ring_data(struct i40e_hw *hw); +-i40e_status i40e_clean_arq_element(struct i40e_hw *hw, +- struct i40e_arq_event_info *e, +- u16 *events_pending); +-i40e_status i40e_asq_send_command(struct i40e_hw *hw, +- struct i40e_aq_desc *desc, +- void *buff, /* can be NULL */ +- u16 buff_size, +- struct i40e_asq_cmd_details *cmd_details); ++int i40e_clean_arq_element(struct i40e_hw *hw, ++ struct i40e_arq_event_info *e, ++ u16 *events_pending); ++int i40e_asq_send_command(struct i40e_hw *hw, ++ struct i40e_aq_desc *desc, ++ void *buff, /* can be NULL */ ++ u16 buff_size, ++ struct i40e_asq_cmd_details *cmd_details); + + /* debug function for adminq */ + void i40e_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, +@@ -34,313 +34,269 @@ 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); +-i40e_status i40e_aq_queue_shutdown(struct i40e_hw *hw, bool unloading); ++int i40e_aq_queue_shutdown(struct i40e_hw *hw, bool unloading); + const char *i40e_aq_str(struct i40e_hw *hw, enum i40e_admin_queue_err aq_err); + +-i40e_status i40e_aq_get_rss_lut(struct i40e_hw *hw, u16 seid, +- bool pf_lut, u8 *lut, u16 lut_size); +-i40e_status i40e_aq_set_rss_lut(struct i40e_hw *hw, u16 seid, +- bool pf_lut, u8 *lut, u16 lut_size); +-i40e_status i40e_aq_get_rss_key(struct i40e_hw *hw, +- u16 seid, +- struct i40e_aqc_get_set_rss_key_data *key); +-i40e_status i40e_aq_set_rss_key(struct i40e_hw *hw, +- u16 seid, +- struct i40e_aqc_get_set_rss_key_data *key); ++int i40e_aq_get_rss_lut(struct i40e_hw *hw, u16 seid, ++ bool pf_lut, u8 *lut, u16 lut_size); ++int i40e_aq_set_rss_lut(struct i40e_hw *hw, u16 seid, ++ bool pf_lut, u8 *lut, u16 lut_size); ++int i40e_aq_get_rss_key(struct i40e_hw *hw, u16 seid, ++ struct i40e_aqc_get_set_rss_key_data *key); ++int i40e_aq_set_rss_key(struct i40e_hw *hw, u16 seid, ++ struct i40e_aqc_get_set_rss_key_data *key); + + u32 i40e_led_get(struct i40e_hw *hw); + void i40e_led_set(struct i40e_hw *hw, u32 mode, bool blink); +-i40e_status i40e_led_set_phy(struct i40e_hw *hw, bool on, +- u16 led_addr, u32 mode); +-i40e_status i40e_led_get_phy(struct i40e_hw *hw, u16 *led_addr, +- u16 *val); +-i40e_status i40e_blink_phy_link_led(struct i40e_hw *hw, +- u32 time, u32 interval); ++int i40e_led_set_phy(struct i40e_hw *hw, bool on, u16 led_addr, u32 mode); ++int i40e_led_get_phy(struct i40e_hw *hw, u16 *led_addr, u16 *val); ++int i40e_blink_phy_link_led(struct i40e_hw *hw, u32 time, u32 interval); + + /* admin send queue commands */ + +-i40e_status i40e_aq_get_firmware_version(struct i40e_hw *hw, +- u16 *fw_major_version, u16 *fw_minor_version, +- u32 *fw_build, +- u16 *api_major_version, u16 *api_minor_version, +- struct i40e_asq_cmd_details *cmd_details); +-i40e_status i40e_aq_debug_write_register(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); +-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_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, +- struct i40e_asq_cmd_details *cmd_details); +-i40e_status i40e_aq_set_link_restart_an(struct i40e_hw *hw, +- bool enable_link, +- struct i40e_asq_cmd_details *cmd_details); +-i40e_status i40e_aq_get_link_info(struct i40e_hw *hw, +- bool enable_lse, struct i40e_link_status *link, +- struct i40e_asq_cmd_details *cmd_details); +-i40e_status i40e_aq_set_local_advt_reg(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_get_firmware_version(struct i40e_hw *hw, ++ u16 *fw_major_version, u16 *fw_minor_version, ++ u32 *fw_build, ++ u16 *api_major_version, u16 *api_minor_version, ++ struct i40e_asq_cmd_details *cmd_details); ++int i40e_aq_debug_write_register(struct i40e_hw *hw, 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, ++ 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); ++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_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, ++ struct i40e_asq_cmd_details *cmd_details); ++int i40e_aq_set_link_restart_an(struct i40e_hw *hw, bool enable_link, ++ struct i40e_asq_cmd_details *cmd_details); ++int i40e_aq_get_link_info(struct i40e_hw *hw, bool enable_lse, ++ struct i40e_link_status *link, ++ struct i40e_asq_cmd_details *cmd_details); ++int i40e_aq_set_local_advt_reg(struct i40e_hw *hw, u64 advt_reg, ++ struct i40e_asq_cmd_details *cmd_details); ++int i40e_aq_send_driver_version(struct i40e_hw *hw, + struct i40e_driver_version *dv, + struct i40e_asq_cmd_details *cmd_details); +-i40e_status i40e_aq_add_vsi(struct i40e_hw *hw, +- struct i40e_vsi_context *vsi_ctx, +- struct i40e_asq_cmd_details *cmd_details); +-i40e_status i40e_aq_set_vsi_broadcast(struct i40e_hw *hw, +- u16 vsi_id, bool set_filter, +- struct i40e_asq_cmd_details *cmd_details); +-i40e_status 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); +-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); +-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); +-i40e_status i40e_aq_set_vsi_vlan_promisc(struct i40e_hw *hw, +- u16 seid, bool enable, +- struct i40e_asq_cmd_details *cmd_details); +-i40e_status i40e_aq_get_vsi_params(struct i40e_hw *hw, +- struct i40e_vsi_context *vsi_ctx, +- struct i40e_asq_cmd_details *cmd_details); +-i40e_status i40e_aq_update_vsi_params(struct i40e_hw *hw, +- struct i40e_vsi_context *vsi_ctx, +- struct i40e_asq_cmd_details *cmd_details); +-i40e_status i40e_aq_add_veb(struct i40e_hw *hw, u16 uplink_seid, +- u16 downlink_seid, u8 enabled_tc, +- bool default_port, u16 *pveb_seid, +- bool enable_stats, +- struct i40e_asq_cmd_details *cmd_details); +-i40e_status i40e_aq_get_veb_parameters(struct i40e_hw *hw, +- u16 veb_seid, u16 *switch_id, bool *floating, +- u16 *statistic_index, u16 *vebs_used, +- 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); ++int i40e_aq_set_vsi_vlan_promisc(struct i40e_hw *hw, ++ u16 seid, bool enable, ++ struct i40e_asq_cmd_details *cmd_details); ++int i40e_aq_get_vsi_params(struct i40e_hw *hw, ++ struct i40e_vsi_context *vsi_ctx, ++ struct i40e_asq_cmd_details *cmd_details); ++int i40e_aq_update_vsi_params(struct i40e_hw *hw, ++ struct i40e_vsi_context *vsi_ctx, ++ struct i40e_asq_cmd_details *cmd_details); ++int i40e_aq_add_veb(struct i40e_hw *hw, u16 uplink_seid, ++ u16 downlink_seid, u8 enabled_tc, ++ bool default_port, u16 *pveb_seid, ++ bool enable_stats, ++ struct i40e_asq_cmd_details *cmd_details); ++int i40e_aq_get_veb_parameters(struct i40e_hw *hw, ++ u16 veb_seid, u16 *switch_id, bool *floating, ++ u16 *statistic_index, u16 *vebs_used, ++ u16 *vebs_free, ++ struct i40e_asq_cmd_details *cmd_details); ++int i40e_aq_add_macvlan(struct i40e_hw *hw, u16 vsi_id, + struct i40e_aqc_add_macvlan_element_data *mv_list, + u16 count, struct i40e_asq_cmd_details *cmd_details); +-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 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, +- u16 *rule_id, u16 *rules_used, u16 *rules_free); +-i40e_status i40e_aq_delete_mirrorrule(struct i40e_hw *hw, u16 sw_seid, +- u16 rule_type, u16 rule_id, u16 count, __le16 *mr_list, +- struct i40e_asq_cmd_details *cmd_details, +- u16 *rules_used, u16 *rules_free); +- +-i40e_status i40e_aq_send_msg_to_vf(struct i40e_hw *hw, u16 vfid, +- u32 v_opcode, u32 v_retval, u8 *msg, u16 msglen, +- struct i40e_asq_cmd_details *cmd_details); +-i40e_status 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); +-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_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_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, ++ u16 *rule_id, u16 *rules_used, u16 *rules_free); ++int i40e_aq_delete_mirrorrule(struct i40e_hw *hw, u16 sw_seid, ++ u16 rule_type, u16 rule_id, u16 count, __le16 *mr_list, ++ struct i40e_asq_cmd_details *cmd_details, ++ u16 *rules_used, u16 *rules_free); ++ ++int i40e_aq_send_msg_to_vf(struct i40e_hw *hw, u16 vfid, ++ u32 v_opcode, u32 v_retval, u8 *msg, u16 msglen, ++ 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); +-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_update_nvm(struct i40e_hw *hw, u8 module_pointer, +- u32 offset, u16 length, void *data, +- bool last_command, u8 preservation_flags, +- struct i40e_asq_cmd_details *cmd_details); +-i40e_status i40e_aq_rearrange_nvm(struct i40e_hw *hw, +- u8 rearrange_nvm, +- struct i40e_asq_cmd_details *cmd_details); +-i40e_status i40e_aq_get_lldp_mib(struct i40e_hw *hw, u8 bridge_type, +- 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 +-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 +-i40e_aq_restore_lldp(struct i40e_hw *hw, u8 *setting, bool restore, ++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 sdp_number, u64 *timeout, ++ struct i40e_asq_cmd_details *cmd_details); ++int i40e_aq_release_resource(struct i40e_hw *hw, ++ enum i40e_aq_resources_ids resource, u8 sdp_number, ++ struct i40e_asq_cmd_details *cmd_details); ++int 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_stop_lldp(struct i40e_hw *hw, bool shutdown_agent, +- bool persist, +- struct i40e_asq_cmd_details *cmd_details); +-i40e_status i40e_aq_set_dcb_parameters(struct i40e_hw *hw, +- bool dcb_enable, +- struct i40e_asq_cmd_details +- *cmd_details); +-i40e_status i40e_aq_start_lldp(struct i40e_hw *hw, bool persist, ++int 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); ++int 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); ++int i40e_aq_update_nvm(struct i40e_hw *hw, u8 module_pointer, ++ u32 offset, u16 length, void *data, ++ bool last_command, u8 preservation_flags, ++ struct i40e_asq_cmd_details *cmd_details); ++int i40e_aq_rearrange_nvm(struct i40e_hw *hw, u8 rearrange_nvm, ++ struct i40e_asq_cmd_details *cmd_details); ++int i40e_aq_get_lldp_mib(struct i40e_hw *hw, u8 bridge_type, ++ u8 mib_type, void *buff, u16 buff_size, ++ u16 *local_len, u16 *remote_len, ++ struct i40e_asq_cmd_details *cmd_details); ++int i40e_aq_set_lldp_mib(struct i40e_hw *hw, u8 mib_type, ++ void *buff, u16 buff_size, ++ struct i40e_asq_cmd_details *cmd_details); ++int i40e_aq_cfg_lldp_mib_change_event(struct i40e_hw *hw, ++ bool enable_update, ++ struct i40e_asq_cmd_details *cmd_details); ++int i40e_aq_restore_lldp(struct i40e_hw *hw, u8 *setting, bool restore, ++ struct i40e_asq_cmd_details *cmd_details); ++int i40e_aq_stop_lldp(struct i40e_hw *hw, bool shutdown_agent, bool persist, ++ 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); +-i40e_status 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_add_udp_tunnel(struct i40e_hw *hw, +- u16 udp_port, u8 protocol_index, +- u8 *filter_index, +- struct i40e_asq_cmd_details *cmd_details); +-i40e_status i40e_aq_del_udp_tunnel(struct i40e_hw *hw, u8 index, +- struct i40e_asq_cmd_details *cmd_details); +-i40e_status i40e_aq_delete_element(struct i40e_hw *hw, u16 seid, +- struct i40e_asq_cmd_details *cmd_details); +-i40e_status i40e_aq_mac_address_write(struct i40e_hw *hw, +- 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, ++ struct i40e_asq_cmd_details *cmd_details); ++int i40e_aq_del_udp_tunnel(struct i40e_hw *hw, u8 index, ++ struct i40e_asq_cmd_details *cmd_details); ++int i40e_aq_delete_element(struct i40e_hw *hw, u16 seid, ++ struct i40e_asq_cmd_details *cmd_details); ++int i40e_aq_mac_address_write(struct i40e_hw *hw, u16 flags, u8 *mac_addr, ++ struct i40e_asq_cmd_details *cmd_details); ++int i40e_aq_config_vsi_bw_limit(struct i40e_hw *hw, + u16 seid, u16 credit, u8 max_credit, + struct i40e_asq_cmd_details *cmd_details); +-i40e_status i40e_aq_dcb_updated(struct i40e_hw *hw, +- struct i40e_asq_cmd_details *cmd_details); +-i40e_status 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); +-i40e_status i40e_aq_config_vsi_tc_bw(struct i40e_hw *hw, u16 seid, +- struct i40e_aqc_configure_vsi_tc_bw_data *bw_data, ++int i40e_aq_dcb_updated(struct i40e_hw *hw, + struct i40e_asq_cmd_details *cmd_details); +-i40e_status 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); +-i40e_status 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); +-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_asq_cmd_details *cmd_details); +-i40e_status 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); +-i40e_status 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); +-i40e_status 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); +-i40e_status i40e_aq_query_switch_comp_bw_config(struct i40e_hw *hw, +- u16 seid, ++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, 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); +-i40e_status i40e_aq_resume_port_tx(struct i40e_hw *hw, +- struct i40e_asq_cmd_details *cmd_details); +-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 +-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 +-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 +-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 +-i40e_aq_suspend_port_tx(struct i40e_hw *hw, u16 seid, +- 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 i40e_aq_add_cloud_filters_bb(struct i40e_hw *hw, u16 seid, ++ struct i40e_aqc_cloud_filters_element_bb *filters, ++ u8 filter_count); ++int i40e_aq_add_cloud_filters(struct i40e_hw *hw, u16 vsi, ++ struct i40e_aqc_cloud_filters_element_data *filters, ++ u8 filter_count); ++int i40e_aq_rem_cloud_filters(struct i40e_hw *hw, u16 vsi, ++ struct i40e_aqc_cloud_filters_element_data *filters, ++ u8 filter_count); ++int i40e_aq_rem_cloud_filters_bb(struct i40e_hw *hw, u16 seid, ++ struct i40e_aqc_cloud_filters_element_bb *filters, ++ u8 filter_count); ++int i40e_read_lldp_cfg(struct i40e_hw *hw, struct i40e_lldp_variables *lldp_cfg); ++int i40e_aq_suspend_port_tx(struct i40e_hw *hw, u16 seid, ++ struct i40e_asq_cmd_details *cmd_details); + /* i40e_common */ +-i40e_status i40e_init_shared_code(struct i40e_hw *hw); +-i40e_status i40e_pf_reset(struct i40e_hw *hw); ++int i40e_init_shared_code(struct i40e_hw *hw); ++int i40e_pf_reset(struct i40e_hw *hw); + void i40e_clear_hw(struct i40e_hw *hw); + void i40e_clear_pxe_mode(struct i40e_hw *hw); +-i40e_status i40e_get_link_status(struct i40e_hw *hw, bool *link_up); +-i40e_status i40e_update_link_info(struct i40e_hw *hw); +-i40e_status i40e_get_mac_addr(struct i40e_hw *hw, u8 *mac_addr); +-i40e_status i40e_read_bw_from_alt_ram(struct i40e_hw *hw, +- u32 *max_bw, u32 *min_bw, bool *min_valid, +- bool *max_valid); +-i40e_status 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); +-i40e_status i40e_get_port_mac_addr(struct i40e_hw *hw, u8 *mac_addr); +-i40e_status i40e_read_pba_string(struct i40e_hw *hw, u8 *pba_num, +- u32 pba_num_size); +-i40e_status i40e_validate_mac_addr(u8 *mac_addr); ++int i40e_get_link_status(struct i40e_hw *hw, bool *link_up); ++int i40e_update_link_info(struct i40e_hw *hw); ++int i40e_get_mac_addr(struct i40e_hw *hw, u8 *mac_addr); ++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_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_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_init_nvm(struct i40e_hw *hw); +-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); + 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); +-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_validate_nvm_checksum(struct i40e_hw *hw, +- u16 *checksum); +-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_update_nvm_checksum(struct i40e_hw *hw); ++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 *); + 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); + void i40e_set_pci_config_data(struct i40e_hw *hw, u16 link_status); + +-i40e_status i40e_set_mac_type(struct i40e_hw *hw); ++int i40e_set_mac_type(struct i40e_hw *hw); + + extern struct i40e_rx_ptype_decoded i40e_ptype_lookup[]; + +@@ -389,41 +345,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_status i40e_vf_reset(struct i40e_hw *hw); +-i40e_status i40e_aq_send_msg_to_pf(struct i40e_hw *hw, +- enum virtchnl_ops v_opcode, +- i40e_status v_retval, +- u8 *msg, u16 msglen, +- struct i40e_asq_cmd_details *cmd_details); +-i40e_status i40e_set_filter_control(struct i40e_hw *hw, +- struct i40e_filter_control_settings *settings); +-i40e_status i40e_aq_add_rem_control_packet_filter(struct i40e_hw *hw, +- u8 *mac_addr, u16 ethtype, u16 flags, +- u16 vsi_seid, u16 queue, bool is_add, +- struct i40e_control_filter_stats *stats, +- struct i40e_asq_cmd_details *cmd_details); +-i40e_status i40e_aq_debug_dump(struct i40e_hw *hw, u8 cluster_id, +- u8 table_id, u32 start_index, u16 buff_size, +- void *buff, u16 *ret_buff_size, +- u8 *ret_next_table, u32 *ret_next_index, +- struct i40e_asq_cmd_details *cmd_details); ++int i40e_vf_reset(struct i40e_hw *hw); ++int i40e_aq_send_msg_to_pf(struct i40e_hw *hw, ++ enum virtchnl_ops v_opcode, ++ int v_retval, ++ u8 *msg, u16 msglen, ++ struct i40e_asq_cmd_details *cmd_details); ++int i40e_set_filter_control(struct i40e_hw *hw, ++ struct i40e_filter_control_settings *settings); ++int i40e_aq_add_rem_control_packet_filter(struct i40e_hw *hw, ++ u8 *mac_addr, u16 ethtype, u16 flags, ++ u16 vsi_seid, u16 queue, bool is_add, ++ struct i40e_control_filter_stats *stats, ++ struct i40e_asq_cmd_details *cmd_details); ++int i40e_aq_debug_dump(struct i40e_hw *hw, u8 cluster_id, ++ u8 table_id, u32 start_index, u16 buff_size, ++ void *buff, u16 *ret_buff_size, ++ u8 *ret_next_table, u32 *ret_next_index, ++ struct i40e_asq_cmd_details *cmd_details); + void i40e_add_filter_to_drop_tx_flow_control_frames(struct i40e_hw *hw, + u16 vsi_seid); +-i40e_status i40e_aq_rx_ctl_read_register(struct i40e_hw *hw, +- u32 reg_addr, u32 *reg_val, +- struct i40e_asq_cmd_details *cmd_details); ++int i40e_aq_rx_ctl_read_register(struct i40e_hw *hw, ++ u32 reg_addr, u32 *reg_val, ++ struct i40e_asq_cmd_details *cmd_details); + u32 i40e_read_rx_ctl(struct i40e_hw *hw, u32 reg_addr); +-i40e_status i40e_aq_rx_ctl_write_register(struct i40e_hw *hw, +- u32 reg_addr, u32 reg_val, +- struct i40e_asq_cmd_details *cmd_details); ++int i40e_aq_rx_ctl_write_register(struct i40e_hw *hw, ++ u32 reg_addr, u32 reg_val, ++ struct i40e_asq_cmd_details *cmd_details); + void i40e_write_rx_ctl(struct i40e_hw *hw, u32 reg_addr, u32 reg_val); +-enum i40e_status_code ++int + i40e_aq_set_phy_register_ext(struct i40e_hw *hw, + u8 phy_select, u8 dev_addr, bool page_change, + bool set_mdio, u8 mdio_num, + u32 reg_addr, u32 reg_val, + struct i40e_asq_cmd_details *cmd_details); +-enum i40e_status_code ++int + 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, +@@ -436,43 +392,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) + +-i40e_status i40e_read_phy_register_clause22(struct i40e_hw *hw, +- u16 reg, u8 phy_addr, u16 *value); +-i40e_status i40e_write_phy_register_clause22(struct i40e_hw *hw, +- u16 reg, u8 phy_addr, u16 value); +-i40e_status i40e_read_phy_register_clause45(struct i40e_hw *hw, +- u8 page, u16 reg, u8 phy_addr, u16 *value); +-i40e_status i40e_write_phy_register_clause45(struct i40e_hw *hw, +- u8 page, u16 reg, u8 phy_addr, u16 value); +-i40e_status i40e_read_phy_register(struct i40e_hw *hw, u8 page, u16 reg, +- u8 phy_addr, u16 *value); +-i40e_status i40e_write_phy_register(struct i40e_hw *hw, u8 page, u16 reg, +- u8 phy_addr, u16 value); ++int i40e_read_phy_register_clause22(struct i40e_hw *hw, ++ u16 reg, u8 phy_addr, u16 *value); ++int i40e_write_phy_register_clause22(struct i40e_hw *hw, ++ u16 reg, u8 phy_addr, u16 value); ++int i40e_read_phy_register_clause45(struct i40e_hw *hw, ++ u8 page, u16 reg, u8 phy_addr, u16 *value); ++int i40e_write_phy_register_clause45(struct i40e_hw *hw, ++ u8 page, u16 reg, u8 phy_addr, u16 value); ++int i40e_read_phy_register(struct i40e_hw *hw, u8 page, u16 reg, ++ u8 phy_addr, u16 *value); ++int i40e_write_phy_register(struct i40e_hw *hw, u8 page, u16 reg, ++ u8 phy_addr, u16 value); + u8 i40e_get_phy_address(struct i40e_hw *hw, u8 dev_num); +-i40e_status i40e_blink_phy_link_led(struct i40e_hw *hw, +- u32 time, u32 interval); +-i40e_status i40e_aq_write_ddp(struct i40e_hw *hw, void *buff, +- u16 buff_size, u32 track_id, +- u32 *error_offset, u32 *error_info, +- struct i40e_asq_cmd_details * +- cmd_details); +-i40e_status i40e_aq_get_ddp_list(struct i40e_hw *hw, void *buff, +- u16 buff_size, u8 flags, +- struct i40e_asq_cmd_details * +- cmd_details); ++int i40e_blink_phy_link_led(struct i40e_hw *hw, ++ u32 time, u32 interval); ++int i40e_aq_write_ddp(struct i40e_hw *hw, void *buff, ++ u16 buff_size, u32 track_id, ++ u32 *error_offset, u32 *error_info, ++ struct i40e_asq_cmd_details * ++ cmd_details); ++int i40e_aq_get_ddp_list(struct i40e_hw *hw, void *buff, ++ u16 buff_size, u8 flags, ++ struct i40e_asq_cmd_details * ++ cmd_details); + struct i40e_generic_seg_header * + i40e_find_segment_in_package(u32 segment_type, + struct i40e_package_header *pkg_header); + struct i40e_profile_section_header * + i40e_find_section_in_profile(u32 section_type, + struct i40e_profile_segment *profile); +-enum i40e_status_code ++int + i40e_write_profile(struct i40e_hw *hw, struct i40e_profile_segment *i40e_seg, + u32 track_id); +-enum i40e_status_code ++int + i40e_rollback_profile(struct i40e_hw *hw, struct i40e_profile_segment *i40e_seg, + u32 track_id); +-enum i40e_status_code ++int + i40e_add_pinfo_to_list(struct i40e_hw *hw, + struct i40e_profile_segment *profile, + u8 *profile_info_sec, u32 track_id); +--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c ++++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +@@ -17,7 +17,7 @@ + **/ + static void i40e_vc_vf_broadcast(struct i40e_pf *pf, + enum virtchnl_ops v_opcode, +- i40e_status v_retval, u8 *msg, ++ int v_retval, u8 *msg, + u16 msglen) + { + struct i40e_hw *hw = &pf->hw; +@@ -1246,13 +1246,13 @@ err: + * @vl: List of VLANs - apply filter for given VLANs + * @num_vlans: Number of elements in @vl + **/ +-static i40e_status ++static int + i40e_set_vsi_promisc(struct i40e_vf *vf, u16 seid, bool multi_enable, + bool unicast_enable, s16 *vl, u16 num_vlans) + { +- i40e_status aq_ret, aq_tmp = 0; + struct i40e_pf *pf = vf->pf; + struct i40e_hw *hw = &pf->hw; ++ int aq_ret, aq_tmp = 0; + int i; + + /* No VLAN to set promisc on, set on VSI */ +@@ -1339,13 +1339,13 @@ i40e_set_vsi_promisc(struct i40e_vf *vf, + * Called from the VF to configure the promiscuous mode of + * VF vsis and from the VF reset path to reset promiscuous mode. + **/ +-static i40e_status i40e_config_vf_promiscuous_mode(struct i40e_vf *vf, +- u16 vsi_id, +- bool allmulti, +- bool alluni) ++static int i40e_config_vf_promiscuous_mode(struct i40e_vf *vf, ++ u16 vsi_id, ++ bool allmulti, ++ bool alluni) + { +- i40e_status aq_ret = I40E_SUCCESS; + struct i40e_pf *pf = vf->pf; ++ int aq_ret = I40E_SUCCESS; + struct i40e_vsi *vsi; + u16 num_vlans; + s16 *vl; +@@ -1955,7 +1955,7 @@ static int i40e_vc_send_msg_to_vf(struct + struct i40e_pf *pf; + struct i40e_hw *hw; + int abs_vf_id; +- i40e_status aq_ret; ++ int aq_ret; + + /* validate the request */ + if (!vf || vf->vf_id >= vf->pf->num_alloc_vfs) +@@ -1987,7 +1987,7 @@ static int i40e_vc_send_msg_to_vf(struct + **/ + static int i40e_vc_send_resp_to_vf(struct i40e_vf *vf, + enum virtchnl_ops opcode, +- i40e_status retval) ++ int retval) + { + return i40e_vc_send_msg_to_vf(vf, opcode, retval, NULL, 0); + } +@@ -2091,9 +2091,9 @@ static int i40e_vc_get_vf_resources_msg( + { + struct virtchnl_vf_resource *vfres = NULL; + struct i40e_pf *pf = vf->pf; +- i40e_status aq_ret = 0; + struct i40e_vsi *vsi; + int num_vsis = 1; ++ int aq_ret = 0; + size_t len = 0; + int ret; + +@@ -2221,9 +2221,9 @@ static int i40e_vc_config_promiscuous_mo + struct virtchnl_promisc_info *info = + (struct virtchnl_promisc_info *)msg; + struct i40e_pf *pf = vf->pf; +- i40e_status aq_ret = 0; + bool allmulti = false; + bool alluni = false; ++ int aq_ret = 0; + + if (!i40e_sync_vf_state(vf, I40E_VF_STATE_ACTIVE)) { + aq_ret = I40E_ERR_PARAM; +@@ -2308,10 +2308,10 @@ static int i40e_vc_config_queues_msg(str + struct virtchnl_queue_pair_info *qpi; + u16 vsi_id, vsi_queue_id = 0; + struct i40e_pf *pf = vf->pf; +- i40e_status aq_ret = 0; + int i, j = 0, idx = 0; + struct i40e_vsi *vsi; + u16 num_qps_all = 0; ++ int aq_ret = 0; + + if (!i40e_sync_vf_state(vf, I40E_VF_STATE_ACTIVE)) { + aq_ret = I40E_ERR_PARAM; +@@ -2458,8 +2458,8 @@ static int i40e_vc_config_irq_map_msg(st + struct virtchnl_irq_map_info *irqmap_info = + (struct virtchnl_irq_map_info *)msg; + struct virtchnl_vector_map *map; ++ int aq_ret = 0; + u16 vsi_id; +- i40e_status aq_ret = 0; + int i; + + if (!i40e_sync_vf_state(vf, I40E_VF_STATE_ACTIVE)) { +@@ -2574,7 +2574,7 @@ static int i40e_vc_enable_queues_msg(str + struct virtchnl_queue_select *vqs = + (struct virtchnl_queue_select *)msg; + struct i40e_pf *pf = vf->pf; +- i40e_status aq_ret = 0; ++ int aq_ret = 0; + int i; + + if (!test_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states)) { +@@ -2632,7 +2632,7 @@ static int i40e_vc_disable_queues_msg(st + struct virtchnl_queue_select *vqs = + (struct virtchnl_queue_select *)msg; + struct i40e_pf *pf = vf->pf; +- i40e_status aq_ret = 0; ++ int aq_ret = 0; + + if (!i40e_sync_vf_state(vf, I40E_VF_STATE_ACTIVE)) { + aq_ret = I40E_ERR_PARAM; +@@ -2783,7 +2783,7 @@ static int i40e_vc_get_stats_msg(struct + (struct virtchnl_queue_select *)msg; + struct i40e_pf *pf = vf->pf; + struct i40e_eth_stats stats; +- i40e_status aq_ret = 0; ++ int aq_ret = 0; + struct i40e_vsi *vsi; + + memset(&stats, 0, sizeof(struct i40e_eth_stats)); +@@ -2902,7 +2902,7 @@ static int i40e_vc_add_mac_addr_msg(stru + (struct virtchnl_ether_addr_list *)msg; + struct i40e_pf *pf = vf->pf; + struct i40e_vsi *vsi = NULL; +- i40e_status ret = 0; ++ int ret = 0; + int i; + + if (!i40e_sync_vf_state(vf, I40E_VF_STATE_ACTIVE) || +@@ -2974,7 +2974,7 @@ static int i40e_vc_del_mac_addr_msg(stru + bool was_unimac_deleted = false; + struct i40e_pf *pf = vf->pf; + struct i40e_vsi *vsi = NULL; +- i40e_status ret = 0; ++ int ret = 0; + int i; + + if (!i40e_sync_vf_state(vf, I40E_VF_STATE_ACTIVE) || +@@ -3047,7 +3047,7 @@ static int i40e_vc_add_vlan_msg(struct i + (struct virtchnl_vlan_filter_list *)msg; + struct i40e_pf *pf = vf->pf; + struct i40e_vsi *vsi = NULL; +- i40e_status aq_ret = 0; ++ int aq_ret = 0; + int i; + + if ((vf->num_vlan >= I40E_VC_MAX_VLAN_PER_VF) && +@@ -3118,7 +3118,7 @@ static int i40e_vc_remove_vlan_msg(struc + (struct virtchnl_vlan_filter_list *)msg; + struct i40e_pf *pf = vf->pf; + struct i40e_vsi *vsi = NULL; +- i40e_status aq_ret = 0; ++ int aq_ret = 0; + int i; + + if (!i40e_sync_vf_state(vf, I40E_VF_STATE_ACTIVE) || +@@ -3174,7 +3174,7 @@ static int i40e_vc_iwarp_msg(struct i40e + { + struct i40e_pf *pf = vf->pf; + int abs_vf_id = vf->vf_id + pf->hw.func_caps.vf_base_id; +- i40e_status aq_ret = 0; ++ int aq_ret = 0; + + if (!test_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states) || + !test_bit(I40E_VF_STATE_IWARPENA, &vf->vf_states)) { +@@ -3203,7 +3203,7 @@ static int i40e_vc_iwarp_qvmap_msg(struc + { + struct virtchnl_iwarp_qvlist_info *qvlist_info = + (struct virtchnl_iwarp_qvlist_info *)msg; +- i40e_status aq_ret = 0; ++ int aq_ret = 0; + + if (!test_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states) || + !test_bit(I40E_VF_STATE_IWARPENA, &vf->vf_states)) { +@@ -3239,7 +3239,7 @@ static int i40e_vc_config_rss_key(struct + (struct virtchnl_rss_key *)msg; + struct i40e_pf *pf = vf->pf; + struct i40e_vsi *vsi = NULL; +- i40e_status aq_ret = 0; ++ int aq_ret = 0; + + if (!i40e_sync_vf_state(vf, I40E_VF_STATE_ACTIVE) || + !i40e_vc_isvalid_vsi_id(vf, vrk->vsi_id) || +@@ -3269,7 +3269,7 @@ static int i40e_vc_config_rss_lut(struct + (struct virtchnl_rss_lut *)msg; + struct i40e_pf *pf = vf->pf; + struct i40e_vsi *vsi = NULL; +- i40e_status aq_ret = 0; ++ int aq_ret = 0; + u16 i; + + if (!i40e_sync_vf_state(vf, I40E_VF_STATE_ACTIVE) || +@@ -3304,7 +3304,7 @@ static int i40e_vc_get_rss_hena(struct i + { + struct virtchnl_rss_hena *vrh = NULL; + struct i40e_pf *pf = vf->pf; +- i40e_status aq_ret = 0; ++ int aq_ret = 0; + int len = 0; + + if (!i40e_sync_vf_state(vf, I40E_VF_STATE_ACTIVE)) { +@@ -3341,7 +3341,7 @@ static int i40e_vc_set_rss_hena(struct i + (struct virtchnl_rss_hena *)msg; + struct i40e_pf *pf = vf->pf; + struct i40e_hw *hw = &pf->hw; +- i40e_status aq_ret = 0; ++ int aq_ret = 0; + + if (!i40e_sync_vf_state(vf, I40E_VF_STATE_ACTIVE)) { + aq_ret = I40E_ERR_PARAM; +@@ -3365,8 +3365,8 @@ err: + **/ + static int i40e_vc_enable_vlan_stripping(struct i40e_vf *vf, u8 *msg) + { +- i40e_status aq_ret = 0; + struct i40e_vsi *vsi; ++ int aq_ret = 0; + + if (!i40e_sync_vf_state(vf, I40E_VF_STATE_ACTIVE)) { + aq_ret = I40E_ERR_PARAM; +@@ -3391,8 +3391,8 @@ err: + **/ + static int i40e_vc_disable_vlan_stripping(struct i40e_vf *vf, u8 *msg) + { +- i40e_status aq_ret = 0; + struct i40e_vsi *vsi; ++ int aq_ret = 0; + + if (!i40e_sync_vf_state(vf, I40E_VF_STATE_ACTIVE)) { + aq_ret = I40E_ERR_PARAM; +@@ -3618,7 +3618,7 @@ static int i40e_vc_del_cloud_filter(stru + struct i40e_pf *pf = vf->pf; + struct i40e_vsi *vsi = NULL; + struct hlist_node *node; +- i40e_status aq_ret = 0; ++ int aq_ret = 0; + int i, ret; + + if (!i40e_sync_vf_state(vf, I40E_VF_STATE_ACTIVE)) { +@@ -3749,7 +3749,7 @@ static int i40e_vc_add_cloud_filter(stru + struct i40e_cloud_filter *cfilter = NULL; + struct i40e_pf *pf = vf->pf; + struct i40e_vsi *vsi = NULL; +- i40e_status aq_ret = 0; ++ int aq_ret = 0; + int i, ret; + + if (!i40e_sync_vf_state(vf, I40E_VF_STATE_ACTIVE)) { +@@ -3858,7 +3858,7 @@ static int i40e_vc_add_qch_msg(struct i4 + struct i40e_pf *pf = vf->pf; + struct i40e_link_status *ls = &pf->hw.phy.link_info; + int i, adq_request_qps = 0; +- i40e_status aq_ret = 0; ++ int aq_ret = 0; + u64 speed = 0; + + if (!i40e_sync_vf_state(vf, I40E_VF_STATE_ACTIVE)) { +@@ -3970,7 +3970,7 @@ err: + static int i40e_vc_del_qch_msg(struct i40e_vf *vf, u8 *msg) + { + struct i40e_pf *pf = vf->pf; +- i40e_status aq_ret = 0; ++ int aq_ret = 0; + + if (!i40e_sync_vf_state(vf, I40E_VF_STATE_ACTIVE)) { + aq_ret = I40E_ERR_PARAM; diff --git a/queue-5.15/series b/queue-5.15/series index 4d2534ea8d5..522d2ce4be2 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -1,3 +1,8 @@ ata-ahci-fix-enum-constants-for-gcc-13.patch gcc-plugins-reorganize-gimple-includes-for-gcc-13.patch remove-the-sx8-block-driver.patch +sfc-gcc13-synchronize-ef100_enqueue_skb-s-return-type.patch +i40e-remove-string-printing-for-i40e_status.patch +i40e-use-int-for-i40e_status.patch +i40e-fix-build-warning-in-ice_fltr_add_mac_to_list.patch +bonding-gcc13-synchronize-bond_-a-t-lb_xmit-types.patch diff --git a/queue-5.15/sfc-gcc13-synchronize-ef100_enqueue_skb-s-return-type.patch b/queue-5.15/sfc-gcc13-synchronize-ef100_enqueue_skb-s-return-type.patch new file mode 100644 index 00000000000..dcd2645a159 --- /dev/null +++ b/queue-5.15/sfc-gcc13-synchronize-ef100_enqueue_skb-s-return-type.patch @@ -0,0 +1,40 @@ +From 3319dbb3e755398f254c3daa04b9030197137efe Mon Sep 17 00:00:00 2001 +From: "Jiri Slaby (SUSE)" +Date: Mon, 31 Oct 2022 12:44:40 +0100 +Subject: sfc (gcc13): synchronize ef100_enqueue_skb()'s return type + +From: Jiri Slaby (SUSE) + +commit 3319dbb3e755398f254c3daa04b9030197137efe upstream. + +ef100_enqueue_skb() generates a valid warning with gcc-13: + drivers/net/ethernet/sfc/ef100_tx.c:370:5: error: conflicting types for 'ef100_enqueue_skb' due to enum/integer mismatch; have 'int(struct efx_tx_queue *, struct sk_buff *)' + drivers/net/ethernet/sfc/ef100_tx.h:25:13: note: previous declaration of 'ef100_enqueue_skb' with type 'netdev_tx_t(struct efx_tx_queue *, struct sk_buff *)' + +I.e. the type of the ef100_enqueue_skb()'s return value in the declaration is +int, while the definition spells enum netdev_tx_t. Synchronize them to the +latter. + +Cc: Martin Liska +Cc: Edward Cree +Cc: Martin Habets +Signed-off-by: Jiri Slaby (SUSE) +Link: https://lore.kernel.org/r/20221031114440.10461-1-jirislaby@kernel.org +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/sfc/ef100_tx.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/net/ethernet/sfc/ef100_tx.c ++++ b/drivers/net/ethernet/sfc/ef100_tx.c +@@ -349,7 +349,8 @@ void ef100_ev_tx(struct efx_channel *cha + * Returns 0 on success, error code otherwise. In case of an error this + * function will free the SKB. + */ +-int ef100_enqueue_skb(struct efx_tx_queue *tx_queue, struct sk_buff *skb) ++netdev_tx_t ef100_enqueue_skb(struct efx_tx_queue *tx_queue, ++ struct sk_buff *skb) + { + unsigned int old_insert_count = tx_queue->insert_count; + struct efx_nic *efx = tx_queue->efx;