aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-19 16:13:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

i40e: use ERR_PTR error print in i40e messages

Browse Source 
In i40e_status removal patches, i40e_status conversion
to strings was removed in order to easily refactor
the code to use standard errornums. This however made it
more difficult for read error logs.

Use %pe formatter to print error messages in human-readable
format.

Signed-off-by: Jan Sokolowski <jan.sokolowski@intel.com>
Tested-by: Gurucharan G <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
This commit is contained in:
Jan Sokolowski
2023-01-09 15:11:20 +01:00
committed by Tony Nguyen
parent 5180ff1364
commit d5ba18423f
6 changed files with 198 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/intel/i40e/i40e_client.c
View File

@@ -686,8 +686,8 @@ static int i40e_client_update_vsi_ctxt(struct i40e_info *ldev,
ctxt.flags = I40E_AQ_VSI_TYPE_PF; ctxt.flags = I40E_AQ_VSI_TYPE_PF;
if (err) { if (err) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"couldn't get PF vsi config, err %d aq_err %s\n", "couldn't get PF vsi config, err %pe aq_err %s\n",
err, ERR_PTR(err),
i40e_aq_str(&pf->hw, i40e_aq_str(&pf->hw,
pf->hw.aq.asq_last_status)); pf->hw.aq.asq_last_status));
return -ENOENT; return -ENOENT;
@@ -714,8 +714,8 @@ static int i40e_client_update_vsi_ctxt(struct i40e_info *ldev,
err = i40e_aq_update_vsi_params(&vsi->back->hw, &ctxt, NULL); err = i40e_aq_update_vsi_params(&vsi->back->hw, &ctxt, NULL);
if (err) { if (err) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"update VSI ctxt for PE failed, err %d aq_err %s\n", "update VSI ctxt for PE failed, err %pe aq_err %s\n",
err, ERR_PTR(err),
i40e_aq_str(&pf->hw, i40e_aq_str(&pf->hw,
pf->hw.aq.asq_last_status)); pf->hw.aq.asq_last_status));
} }

16
drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c
View File

@@ -135,8 +135,8 @@ static int i40e_dcbnl_ieee_setets(struct net_device *netdev,
ret = i40e_hw_dcb_config(pf, &pf->tmp_cfg); ret = i40e_hw_dcb_config(pf, &pf->tmp_cfg);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"Failed setting DCB ETS configuration err %d aq_err %s\n", "Failed setting DCB ETS configuration err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
return -EINVAL; return -EINVAL;
} }
@@ -174,8 +174,8 @@ static int i40e_dcbnl_ieee_setpfc(struct net_device *netdev,
ret = i40e_hw_dcb_config(pf, &pf->tmp_cfg); ret = i40e_hw_dcb_config(pf, &pf->tmp_cfg);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"Failed setting DCB PFC configuration err %d aq_err %s\n", "Failed setting DCB PFC configuration err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
return -EINVAL; return -EINVAL;
} }
@@ -225,8 +225,8 @@ static int i40e_dcbnl_ieee_setapp(struct net_device *netdev,
ret = i40e_hw_dcb_config(pf, &pf->tmp_cfg); ret = i40e_hw_dcb_config(pf, &pf->tmp_cfg);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"Failed setting DCB configuration err %d aq_err %s\n", "Failed setting DCB configuration err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
return -EINVAL; return -EINVAL;
} }
@@ -290,8 +290,8 @@ static int i40e_dcbnl_ieee_delapp(struct net_device *netdev,
ret = i40e_hw_dcb_config(pf, &pf->tmp_cfg); ret = i40e_hw_dcb_config(pf, &pf->tmp_cfg);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"Failed setting DCB configuration err %d aq_err %s\n", "Failed setting DCB configuration err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
return -EINVAL; return -EINVAL;
} }

40
drivers/net/ethernet/intel/i40e/i40e_ethtool.c
View File

@@ -1455,8 +1455,8 @@ static int i40e_set_link_ksettings(struct net_device *netdev,
status = i40e_aq_set_phy_config(hw, &config, NULL); status = i40e_aq_set_phy_config(hw, &config, NULL);
if (status) { if (status) {
netdev_info(netdev, netdev_info(netdev,
"Set phy config failed, err %d aq_err %s\n", "Set phy config failed, err %pe aq_err %s\n",
status, ERR_PTR(status),
i40e_aq_str(hw, hw->aq.asq_last_status)); i40e_aq_str(hw, hw->aq.asq_last_status));
err = -EAGAIN; err = -EAGAIN;
goto done; goto done;
@@ -1465,8 +1465,8 @@ static int i40e_set_link_ksettings(struct net_device *netdev,
status = i40e_update_link_info(hw); status = i40e_update_link_info(hw);
if (status) if (status)
netdev_dbg(netdev, netdev_dbg(netdev,
"Updating link info failed with err %d aq_err %s\n", "Updating link info failed with err %pe aq_err %s\n",
status, ERR_PTR(status),
i40e_aq_str(hw, hw->aq.asq_last_status)); i40e_aq_str(hw, hw->aq.asq_last_status));
} else { } else {
@@ -1517,8 +1517,8 @@ static int i40e_set_fec_cfg(struct net_device *netdev, u8 fec_cfg)
status = i40e_aq_set_phy_config(hw, &config, NULL); status = i40e_aq_set_phy_config(hw, &config, NULL);
if (status) { if (status) {
netdev_info(netdev, netdev_info(netdev,
"Set phy config failed, err %d aq_err %s\n", "Set phy config failed, err %pe aq_err %s\n",
status, ERR_PTR(status),
i40e_aq_str(hw, hw->aq.asq_last_status)); i40e_aq_str(hw, hw->aq.asq_last_status));
err = -EAGAIN; err = -EAGAIN;
goto done; goto done;
@@ -1531,8 +1531,8 @@ static int i40e_set_fec_cfg(struct net_device *netdev, u8 fec_cfg)
* (e.g. no physical connection etc.) * (e.g. no physical connection etc.)
*/ */
netdev_dbg(netdev, netdev_dbg(netdev,
"Updating link info failed with err %d aq_err %s\n", "Updating link info failed with err %pe aq_err %s\n",
status, ERR_PTR(status),
i40e_aq_str(hw, hw->aq.asq_last_status)); i40e_aq_str(hw, hw->aq.asq_last_status));
} }
@@ -1638,8 +1638,8 @@ static int i40e_nway_reset(struct net_device *netdev)
ret = i40e_aq_set_link_restart_an(hw, link_up, NULL); ret = i40e_aq_set_link_restart_an(hw, link_up, NULL);
if (ret) { if (ret) {
netdev_info(netdev, "link restart failed, err %d aq_err %s\n", netdev_info(netdev, "link restart failed, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(hw, hw->aq.asq_last_status)); i40e_aq_str(hw, hw->aq.asq_last_status));
return -EIO; return -EIO;
} }
@@ -1755,20 +1755,20 @@ static int i40e_set_pauseparam(struct net_device *netdev,
status = i40e_set_fc(hw, &aq_failures, link_up); status = i40e_set_fc(hw, &aq_failures, link_up);
if (aq_failures & I40E_SET_FC_AQ_FAIL_GET) { if (aq_failures & I40E_SET_FC_AQ_FAIL_GET) {
netdev_info(netdev, "Set fc failed on the get_phy_capabilities call with err %d aq_err %s\n", netdev_info(netdev, "Set fc failed on the get_phy_capabilities call with err %pe aq_err %s\n",
status, ERR_PTR(status),
i40e_aq_str(hw, hw->aq.asq_last_status)); i40e_aq_str(hw, hw->aq.asq_last_status));
err = -EAGAIN; err = -EAGAIN;
} }
if (aq_failures & I40E_SET_FC_AQ_FAIL_SET) { if (aq_failures & I40E_SET_FC_AQ_FAIL_SET) {
netdev_info(netdev, "Set fc failed on the set_phy_config call with err %d aq_err %s\n", netdev_info(netdev, "Set fc failed on the set_phy_config call with err %pe aq_err %s\n",
status, ERR_PTR(status),
i40e_aq_str(hw, hw->aq.asq_last_status)); i40e_aq_str(hw, hw->aq.asq_last_status));
err = -EAGAIN; err = -EAGAIN;
} }
if (aq_failures & I40E_SET_FC_AQ_FAIL_UPDATE) { if (aq_failures & I40E_SET_FC_AQ_FAIL_UPDATE) {
netdev_info(netdev, "Set fc failed on the get_link_info call with err %d aq_err %s\n", netdev_info(netdev, "Set fc failed on the get_link_info call with err %pe aq_err %s\n",
status, ERR_PTR(status),
i40e_aq_str(hw, hw->aq.asq_last_status)); i40e_aq_str(hw, hw->aq.asq_last_status));
err = -EAGAIN; err = -EAGAIN;
} }
@@ -5362,8 +5362,8 @@ flags_complete:
0, NULL); 0, NULL);
if (ret && pf->hw.aq.asq_last_status != I40E_AQ_RC_ESRCH) { if (ret && pf->hw.aq.asq_last_status != I40E_AQ_RC_ESRCH) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"couldn't set switch config bits, err %d aq_err %s\n", "couldn't set switch config bits, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, i40e_aq_str(&pf->hw,
pf->hw.aq.asq_last_status)); pf->hw.aq.asq_last_status));
/* not a fatal problem, just keep going */ /* not a fatal problem, just keep going */
@@ -5435,8 +5435,8 @@ flags_complete:
return -EBUSY; return -EBUSY;
default: default:
dev_warn(&pf->pdev->dev, dev_warn(&pf->pdev->dev,
"Starting FW LLDP agent failed: error: %d, %s\n", "Starting FW LLDP agent failed: error: %pe, %s\n",
status, ERR_PTR(status),
i40e_aq_str(&pf->hw, i40e_aq_str(&pf->hw,
adq_err)); adq_err));
return -EINVAL; return -EINVAL;

299
drivers/net/ethernet/intel/i40e/i40e_main.c
View File

@@ -1822,8 +1822,8 @@ static int i40e_set_mac(struct net_device *netdev, void *p)
ret = i40e_aq_mac_address_write(hw, I40E_AQC_WRITE_TYPE_LAA_WOL, ret = i40e_aq_mac_address_write(hw, I40E_AQC_WRITE_TYPE_LAA_WOL,
addr->sa_data, NULL); addr->sa_data, NULL);
if (ret) if (ret)
netdev_info(netdev, "Ignoring error from firmware on LAA update, status %d, AQ ret %s\n", netdev_info(netdev, "Ignoring error from firmware on LAA update, status %pe, AQ ret %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(hw, hw->aq.asq_last_status)); i40e_aq_str(hw, hw->aq.asq_last_status));
} }
@@ -1854,8 +1854,8 @@ static int i40e_config_rss_aq(struct i40e_vsi *vsi, const u8 *seed,
ret = i40e_aq_set_rss_key(hw, vsi->id, seed_dw); ret = i40e_aq_set_rss_key(hw, vsi->id, seed_dw);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"Cannot set RSS key, err %d aq_err %s\n", "Cannot set RSS key, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(hw, hw->aq.asq_last_status)); i40e_aq_str(hw, hw->aq.asq_last_status));
return ret; return ret;
} }
@@ -1866,8 +1866,8 @@ static int i40e_config_rss_aq(struct i40e_vsi *vsi, const u8 *seed,
ret = i40e_aq_set_rss_lut(hw, vsi->id, pf_lut, lut, lut_size); ret = i40e_aq_set_rss_lut(hw, vsi->id, pf_lut, lut, lut_size);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"Cannot set RSS lut, err %d aq_err %s\n", "Cannot set RSS lut, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(hw, hw->aq.asq_last_status)); i40e_aq_str(hw, hw->aq.asq_last_status));
return ret; return ret;
} }
@@ -2358,8 +2358,8 @@ void i40e_aqc_del_filters(struct i40e_vsi *vsi, const char *vsi_name,
if (aq_ret && !(aq_status == I40E_AQ_RC_ENOENT)) { if (aq_ret && !(aq_status == I40E_AQ_RC_ENOENT)) {
*retval = -EIO; *retval = -EIO;
dev_info(&vsi->back->pdev->dev, dev_info(&vsi->back->pdev->dev,
"ignoring delete macvlan error on %s, err %d, aq_err %s\n", "ignoring delete macvlan error on %s, err %pe, aq_err %s\n",
vsi_name, aq_ret, vsi_name, ERR_PTR(aq_ret),
i40e_aq_str(hw, aq_status)); i40e_aq_str(hw, aq_status));
} }
} }
@@ -2488,8 +2488,8 @@ static int i40e_set_promiscuous(struct i40e_pf *pf, bool promisc)
NULL); NULL);
if (aq_ret) { if (aq_ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"Set default VSI failed, err %d, aq_err %s\n", "Set default VSI failed, err %pe, aq_err %s\n",
aq_ret, ERR_PTR(aq_ret),
i40e_aq_str(hw, hw->aq.asq_last_status)); i40e_aq_str(hw, hw->aq.asq_last_status));
} }
} else { } else {
@@ -2500,8 +2500,8 @@ static int i40e_set_promiscuous(struct i40e_pf *pf, bool promisc)
true); true);
if (aq_ret) { if (aq_ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"set unicast promisc failed, err %d, aq_err %s\n", "set unicast promisc failed, err %pe, aq_err %s\n",
aq_ret, ERR_PTR(aq_ret),
i40e_aq_str(hw, hw->aq.asq_last_status)); i40e_aq_str(hw, hw->aq.asq_last_status));
} }
aq_ret = i40e_aq_set_vsi_multicast_promiscuous( aq_ret = i40e_aq_set_vsi_multicast_promiscuous(
@@ -2510,8 +2510,8 @@ static int i40e_set_promiscuous(struct i40e_pf *pf, bool promisc)
promisc, NULL); promisc, NULL);
if (aq_ret) { if (aq_ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"set multicast promisc failed, err %d, aq_err %s\n", "set multicast promisc failed, err %pe, aq_err %s\n",
aq_ret, ERR_PTR(aq_ret),
i40e_aq_str(hw, hw->aq.asq_last_status)); i40e_aq_str(hw, hw->aq.asq_last_status));
} }
} }
@@ -2814,9 +2814,9 @@ int i40e_sync_vsi_filters(struct i40e_vsi *vsi)
retval = i40e_aq_rc_to_posix(aq_ret, retval = i40e_aq_rc_to_posix(aq_ret,
hw->aq.asq_last_status); hw->aq.asq_last_status);
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"set multi promisc failed on %s, err %d aq_err %s\n", "set multi promisc failed on %s, err %pe aq_err %s\n",
vsi_name, vsi_name,
aq_ret, ERR_PTR(aq_ret),
i40e_aq_str(hw, hw->aq.asq_last_status)); i40e_aq_str(hw, hw->aq.asq_last_status));
} else { } else {
dev_info(&pf->pdev->dev, "%s allmulti mode.\n", dev_info(&pf->pdev->dev, "%s allmulti mode.\n",
@@ -2834,10 +2834,10 @@ int i40e_sync_vsi_filters(struct i40e_vsi *vsi)
retval = i40e_aq_rc_to_posix(aq_ret, retval = i40e_aq_rc_to_posix(aq_ret,
hw->aq.asq_last_status); hw->aq.asq_last_status);
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"Setting promiscuous %s failed on %s, err %d aq_err %s\n", "Setting promiscuous %s failed on %s, err %pe aq_err %s\n",
cur_promisc ? "on" : "off", cur_promisc ? "on" : "off",
vsi_name, vsi_name,
aq_ret, ERR_PTR(aq_ret),
i40e_aq_str(hw, hw->aq.asq_last_status)); i40e_aq_str(hw, hw->aq.asq_last_status));
} }
} }
@@ -2985,8 +2985,8 @@ void i40e_vlan_stripping_enable(struct i40e_vsi *vsi)
ret = i40e_aq_update_vsi_params(&vsi->back->hw, &ctxt, NULL); ret = i40e_aq_update_vsi_params(&vsi->back->hw, &ctxt, NULL);
if (ret) { if (ret) {
dev_info(&vsi->back->pdev->dev, dev_info(&vsi->back->pdev->dev,
"update vlan stripping failed, err %d aq_err %s\n", "update vlan stripping failed, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&vsi->back->hw, i40e_aq_str(&vsi->back->hw,
vsi->back->hw.aq.asq_last_status)); vsi->back->hw.aq.asq_last_status));
} }
@@ -3020,8 +3020,8 @@ void i40e_vlan_stripping_disable(struct i40e_vsi *vsi)
ret = i40e_aq_update_vsi_params(&vsi->back->hw, &ctxt, NULL); ret = i40e_aq_update_vsi_params(&vsi->back->hw, &ctxt, NULL);
if (ret) { if (ret) {
dev_info(&vsi->back->pdev->dev, dev_info(&vsi->back->pdev->dev,
"update vlan stripping failed, err %d aq_err %s\n", "update vlan stripping failed, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&vsi->back->hw, i40e_aq_str(&vsi->back->hw,
vsi->back->hw.aq.asq_last_status)); vsi->back->hw.aq.asq_last_status));
} }
@@ -3265,8 +3265,8 @@ int i40e_vsi_add_pvid(struct i40e_vsi *vsi, u16 vid)
ret = i40e_aq_update_vsi_params(&vsi->back->hw, &ctxt, NULL); ret = i40e_aq_update_vsi_params(&vsi->back->hw, &ctxt, NULL);
if (ret) { if (ret) {
dev_info(&vsi->back->pdev->dev, dev_info(&vsi->back->pdev->dev,
"add pvid failed, err %d aq_err %s\n", "add pvid failed, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&vsi->back->hw, i40e_aq_str(&vsi->back->hw,
vsi->back->hw.aq.asq_last_status)); vsi->back->hw.aq.asq_last_status));
return -ENOENT; return -ENOENT;
@@ -5533,8 +5533,8 @@ static int i40e_vsi_get_bw_info(struct i40e_vsi *vsi)
ret = i40e_aq_query_vsi_bw_config(hw, vsi->seid, &bw_config, NULL); ret = i40e_aq_query_vsi_bw_config(hw, vsi->seid, &bw_config, NULL);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"couldn't get PF vsi bw config, err %d aq_err %s\n", "couldn't get PF vsi bw config, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
return -EINVAL; return -EINVAL;
} }
@@ -5544,8 +5544,8 @@ static int i40e_vsi_get_bw_info(struct i40e_vsi *vsi)
NULL); NULL);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"couldn't get PF vsi ets bw config, err %d aq_err %s\n", "couldn't get PF vsi ets bw config, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
return -EINVAL; return -EINVAL;
} }
@@ -5734,8 +5734,8 @@ int i40e_update_adq_vsi_queues(struct i40e_vsi *vsi, int vsi_offset)
ret = i40e_aq_update_vsi_params(hw, &ctxt, NULL); ret = i40e_aq_update_vsi_params(hw, &ctxt, NULL);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, "Update vsi config failed, err %d aq_err %s\n", dev_info(&pf->pdev->dev, "Update vsi config failed, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(hw, hw->aq.asq_last_status)); i40e_aq_str(hw, hw->aq.asq_last_status));
return ret; return ret;
} }
@@ -5790,8 +5790,8 @@ static int i40e_vsi_config_tc(struct i40e_vsi *vsi, u8 enabled_tc)
&bw_config, NULL); &bw_config, NULL);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"Failed querying vsi bw info, err %d aq_err %s\n", "Failed querying vsi bw info, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(hw, hw->aq.asq_last_status)); i40e_aq_str(hw, hw->aq.asq_last_status));
goto out; goto out;
} }
@@ -5857,8 +5857,8 @@ static int i40e_vsi_config_tc(struct i40e_vsi *vsi, u8 enabled_tc)
ret = i40e_aq_update_vsi_params(hw, &ctxt, NULL); ret = i40e_aq_update_vsi_params(hw, &ctxt, NULL);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"Update vsi tc config failed, err %d aq_err %s\n", "Update vsi tc config failed, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(hw, hw->aq.asq_last_status)); i40e_aq_str(hw, hw->aq.asq_last_status));
goto out; goto out;
} }
@@ -5870,8 +5870,8 @@ static int i40e_vsi_config_tc(struct i40e_vsi *vsi, u8 enabled_tc)
ret = i40e_vsi_get_bw_info(vsi); ret = i40e_vsi_get_bw_info(vsi);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"Failed updating vsi bw info, err %d aq_err %s\n", "Failed updating vsi bw info, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(hw, hw->aq.asq_last_status)); i40e_aq_str(hw, hw->aq.asq_last_status));
goto out; goto out;
} }
@@ -5962,8 +5962,8 @@ int i40e_set_bw_limit(struct i40e_vsi *vsi, u16 seid, u64 max_tx_rate)
I40E_MAX_BW_INACTIVE_ACCUM, NULL); I40E_MAX_BW_INACTIVE_ACCUM, NULL);
if (ret) if (ret)
dev_err(&pf->pdev->dev, dev_err(&pf->pdev->dev,
"Failed set tx rate (%llu Mbps) for vsi->seid %u, err %d aq_err %s\n", "Failed set tx rate (%llu Mbps) for vsi->seid %u, err %pe aq_err %s\n",
max_tx_rate, seid, ret, max_tx_rate, seid, ERR_PTR(ret),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
return ret; return ret;
} }
@@ -6038,8 +6038,8 @@ static void i40e_remove_queue_channels(struct i40e_vsi *vsi)
last_aq_status = pf->hw.aq.asq_last_status; last_aq_status = pf->hw.aq.asq_last_status;
if (ret) if (ret)
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"Failed to delete cloud filter, err %d aq_err %s\n", "Failed to delete cloud filter, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, last_aq_status)); i40e_aq_str(&pf->hw, last_aq_status));
kfree(cfilter); kfree(cfilter);
} }
@@ -6173,8 +6173,8 @@ static int i40e_vsi_reconfig_rss(struct i40e_vsi *vsi, u16 rss_size)
ret = i40e_config_rss(vsi, seed, lut, vsi->rss_table_size); ret = i40e_config_rss(vsi, seed, lut, vsi->rss_table_size);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"Cannot set RSS lut, err %d aq_err %s\n", "Cannot set RSS lut, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(hw, hw->aq.asq_last_status)); i40e_aq_str(hw, hw->aq.asq_last_status));
kfree(lut); kfree(lut);
return ret; return ret;
@@ -6272,8 +6272,8 @@ static int i40e_add_channel(struct i40e_pf *pf, u16 uplink_seid,
ret = i40e_aq_add_vsi(hw, &ctxt, NULL); ret = i40e_aq_add_vsi(hw, &ctxt, NULL);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"add new vsi failed, err %d aq_err %s\n", "add new vsi failed, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, i40e_aq_str(&pf->hw,
pf->hw.aq.asq_last_status)); pf->hw.aq.asq_last_status));
return -ENOENT; return -ENOENT;
@@ -6518,8 +6518,8 @@ static int i40e_validate_and_set_switch_mode(struct i40e_vsi *vsi)
mode, NULL); mode, NULL);
if (ret && hw->aq.asq_last_status != I40E_AQ_RC_ESRCH) if (ret && hw->aq.asq_last_status != I40E_AQ_RC_ESRCH)
dev_err(&pf->pdev->dev, dev_err(&pf->pdev->dev,
"couldn't set switch config bits, err %d aq_err %s\n", "couldn't set switch config bits, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(hw, i40e_aq_str(hw,
hw->aq.asq_last_status)); hw->aq.asq_last_status));
@@ -6719,8 +6719,8 @@ int i40e_veb_config_tc(struct i40e_veb *veb, u8 enabled_tc)
&bw_data, NULL); &bw_data, NULL);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"VEB bw config failed, err %d aq_err %s\n", "VEB bw config failed, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
goto out; goto out;
} }
@@ -6729,8 +6729,8 @@ int i40e_veb_config_tc(struct i40e_veb *veb, u8 enabled_tc)
ret = i40e_veb_get_bw_info(veb); ret = i40e_veb_get_bw_info(veb);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"Failed getting veb bw config, err %d aq_err %s\n", "Failed getting veb bw config, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
} }
@@ -6813,8 +6813,8 @@ static int i40e_resume_port_tx(struct i40e_pf *pf)
ret = i40e_aq_resume_port_tx(hw, NULL); ret = i40e_aq_resume_port_tx(hw, NULL);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"Resume Port Tx failed, err %d aq_err %s\n", "Resume Port Tx failed, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
/* Schedule PF reset to recover */ /* Schedule PF reset to recover */
set_bit(__I40E_PF_RESET_REQUESTED, pf->state); set_bit(__I40E_PF_RESET_REQUESTED, pf->state);
@@ -6838,8 +6838,8 @@ static int i40e_suspend_port_tx(struct i40e_pf *pf)
ret = i40e_aq_suspend_port_tx(hw, pf->mac_seid, NULL); ret = i40e_aq_suspend_port_tx(hw, pf->mac_seid, NULL);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"Suspend Port Tx failed, err %d aq_err %s\n", "Suspend Port Tx failed, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
/* Schedule PF reset to recover */ /* Schedule PF reset to recover */
set_bit(__I40E_PF_RESET_REQUESTED, pf->state); set_bit(__I40E_PF_RESET_REQUESTED, pf->state);
@@ -6878,8 +6878,8 @@ static int i40e_hw_set_dcb_config(struct i40e_pf *pf,
ret = i40e_set_dcb_config(&pf->hw); ret = i40e_set_dcb_config(&pf->hw);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"Set DCB Config failed, err %d aq_err %s\n", "Set DCB Config failed, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
goto out; goto out;
} }
@@ -6995,8 +6995,8 @@ int i40e_hw_dcb_config(struct i40e_pf *pf, struct i40e_dcbx_config *new_cfg)
i40e_aqc_opc_modify_switching_comp_ets, NULL); i40e_aqc_opc_modify_switching_comp_ets, NULL);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"Modify Port ETS failed, err %d aq_err %s\n", "Modify Port ETS failed, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
goto out; goto out;
} }
@@ -7033,8 +7033,8 @@ int i40e_hw_dcb_config(struct i40e_pf *pf, struct i40e_dcbx_config *new_cfg)
ret = i40e_aq_dcb_updated(&pf->hw, NULL); ret = i40e_aq_dcb_updated(&pf->hw, NULL);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"DCB Updated failed, err %d aq_err %s\n", "DCB Updated failed, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
goto out; goto out;
} }
@@ -7117,8 +7117,8 @@ int i40e_dcb_sw_default_config(struct i40e_pf *pf)
i40e_aqc_opc_enable_switching_comp_ets, NULL); i40e_aqc_opc_enable_switching_comp_ets, NULL);
if (err) { if (err) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"Enable Port ETS failed, err %d aq_err %s\n", "Enable Port ETS failed, err %pe aq_err %s\n",
err, ERR_PTR(err),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
err = -ENOENT; err = -ENOENT;
goto out; goto out;
@@ -7197,8 +7197,8 @@ static int i40e_init_pf_dcb(struct i40e_pf *pf)
pf->flags |= I40E_FLAG_DISABLE_FW_LLDP; pf->flags |= I40E_FLAG_DISABLE_FW_LLDP;
} else { } else {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"Query for DCB configuration failed, err %d aq_err %s\n", "Query for DCB configuration failed, err %pe aq_err %s\n",
err, ERR_PTR(err),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
} }
@@ -7436,8 +7436,8 @@ static int i40e_force_link_state(struct i40e_pf *pf, bool is_up)
NULL); NULL);
if (err) { if (err) {
dev_err(&pf->pdev->dev, dev_err(&pf->pdev->dev,
"failed to get phy cap., ret = %d last_status = %s\n", "failed to get phy cap., ret = %pe last_status = %s\n",
err, ERR_PTR(err),
i40e_aq_str(hw, hw->aq.asq_last_status)); i40e_aq_str(hw, hw->aq.asq_last_status));
return err; return err;
} }
@@ -7448,8 +7448,8 @@ static int i40e_force_link_state(struct i40e_pf *pf, bool is_up)
NULL); NULL);
if (err) { if (err) {
dev_err(&pf->pdev->dev, dev_err(&pf->pdev->dev,
"failed to get phy cap., ret = %d last_status = %s\n", "failed to get phy cap., ret = %pe last_status = %s\n",
err, ERR_PTR(err),
i40e_aq_str(hw, hw->aq.asq_last_status)); i40e_aq_str(hw, hw->aq.asq_last_status));
return err; return err;
} }
@@ -7493,8 +7493,8 @@ static int i40e_force_link_state(struct i40e_pf *pf, bool is_up)
if (err) { if (err) {
dev_err(&pf->pdev->dev, dev_err(&pf->pdev->dev,
"set phy config ret = %d last_status = %s\n", "set phy config ret = %pe last_status = %s\n",
err, ERR_PTR(err),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
return err; return err;
} }
@@ -7834,8 +7834,8 @@ static int i40e_fwd_ring_up(struct i40e_vsi *vsi, struct net_device *vdev,
rx_ring->netdev = NULL; rx_ring->netdev = NULL;
} }
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"Error adding mac filter on macvlan err %d, aq_err %s\n", "Error adding mac filter on macvlan err %pe, aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(hw, aq_err)); i40e_aq_str(hw, aq_err));
netdev_err(vdev, "L2fwd offload disabled to L2 filter error\n"); netdev_err(vdev, "L2fwd offload disabled to L2 filter error\n");
} }
@@ -7907,8 +7907,8 @@ static int i40e_setup_macvlans(struct i40e_vsi *vsi, u16 macvlan_cnt, u16 qcnt,
ret = i40e_aq_update_vsi_params(hw, &ctxt, NULL); ret = i40e_aq_update_vsi_params(hw, &ctxt, NULL);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"Update vsi tc config failed, err %d aq_err %s\n", "Update vsi tc config failed, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(hw, hw->aq.asq_last_status)); i40e_aq_str(hw, hw->aq.asq_last_status));
return ret; return ret;
} }
@@ -8123,8 +8123,8 @@ static void i40e_fwd_del(struct net_device *netdev, void *vdev)
ch->fwd = NULL; ch->fwd = NULL;
} else { } else {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"Error deleting mac filter on macvlan err %d, aq_err %s\n", "Error deleting mac filter on macvlan err %pe, aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(hw, aq_err)); i40e_aq_str(hw, aq_err));
} }
break; break;
@@ -8875,7 +8875,8 @@ static int i40e_delete_clsflower(struct i40e_vsi *vsi,
kfree(filter); kfree(filter);
if (err) { if (err) {
dev_err(&pf->pdev->dev, dev_err(&pf->pdev->dev,
"Failed to delete cloud filter, err %d\n", err); "Failed to delete cloud filter, err %pe\n",
ERR_PTR(err));
return i40e_aq_rc_to_posix(err, pf->hw.aq.asq_last_status); return i40e_aq_rc_to_posix(err, pf->hw.aq.asq_last_status);
} }
@@ -9437,8 +9438,8 @@ static int i40e_handle_lldp_event(struct i40e_pf *pf,
pf->flags &= ~I40E_FLAG_DCB_CAPABLE; pf->flags &= ~I40E_FLAG_DCB_CAPABLE;
} else { } else {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"Failed querying DCB configuration data from firmware, err %d aq_err %s\n", "Failed querying DCB configuration data from firmware, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, i40e_aq_str(&pf->hw,
pf->hw.aq.asq_last_status)); pf->hw.aq.asq_last_status));
} }
@@ -10264,8 +10265,8 @@ static void i40e_enable_pf_switch_lb(struct i40e_pf *pf)
ret = i40e_aq_get_vsi_params(&pf->hw, &ctxt, NULL); ret = i40e_aq_get_vsi_params(&pf->hw, &ctxt, NULL);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"couldn't get PF vsi config, err %d aq_err %s\n", "couldn't get PF vsi config, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
return; return;
} }
@@ -10276,8 +10277,8 @@ static void i40e_enable_pf_switch_lb(struct i40e_pf *pf)
ret = i40e_aq_update_vsi_params(&vsi->back->hw, &ctxt, NULL); ret = i40e_aq_update_vsi_params(&vsi->back->hw, &ctxt, NULL);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"update vsi switch failed, err %d aq_err %s\n", "update vsi switch failed, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
} }
} }
@@ -10300,8 +10301,8 @@ static void i40e_disable_pf_switch_lb(struct i40e_pf *pf)
ret = i40e_aq_get_vsi_params(&pf->hw, &ctxt, NULL); ret = i40e_aq_get_vsi_params(&pf->hw, &ctxt, NULL);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"couldn't get PF vsi config, err %d aq_err %s\n", "couldn't get PF vsi config, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
return; return;
} }
@@ -10312,8 +10313,8 @@ static void i40e_disable_pf_switch_lb(struct i40e_pf *pf)
ret = i40e_aq_update_vsi_params(&vsi->back->hw, &ctxt, NULL); ret = i40e_aq_update_vsi_params(&vsi->back->hw, &ctxt, NULL);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"update vsi switch failed, err %d aq_err %s\n", "update vsi switch failed, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
} }
} }
@@ -10457,8 +10458,8 @@ static int i40e_get_capabilities(struct i40e_pf *pf,
buf_len = data_size; buf_len = data_size;
} else if (pf->hw.aq.asq_last_status != I40E_AQ_RC_OK || err) { } else if (pf->hw.aq.asq_last_status != I40E_AQ_RC_OK || err) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"capability discovery failed, err %d aq_err %s\n", "capability discovery failed, err %pe aq_err %s\n",
err, ERR_PTR(err),
i40e_aq_str(&pf->hw, i40e_aq_str(&pf->hw,
pf->hw.aq.asq_last_status)); pf->hw.aq.asq_last_status));
return -ENODEV; return -ENODEV;
@@ -10595,8 +10596,8 @@ static int i40e_rebuild_cloud_filters(struct i40e_vsi *vsi, u16 seid)
if (ret) { if (ret) {
dev_dbg(&pf->pdev->dev, dev_dbg(&pf->pdev->dev,
"Failed to rebuild cloud filter, err %d aq_err %s\n", "Failed to rebuild cloud filter, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, i40e_aq_str(&pf->hw,
pf->hw.aq.asq_last_status)); pf->hw.aq.asq_last_status));
return ret; return ret;
@@ -10836,8 +10837,8 @@ static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired)
/* rebuild the basics for the AdminQ, HMC, and initial HW switch */ /* rebuild the basics for the AdminQ, HMC, and initial HW switch */
ret = i40e_init_adminq(&pf->hw); ret = i40e_init_adminq(&pf->hw);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, "Rebuild AdminQ failed, err %d aq_err %s\n", dev_info(&pf->pdev->dev, "Rebuild AdminQ failed, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
goto clear_recovery; goto clear_recovery;
} }
@@ -10948,8 +10949,8 @@ static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired)
I40E_AQ_EVENT_MEDIA_NA | I40E_AQ_EVENT_MEDIA_NA |
I40E_AQ_EVENT_MODULE_QUAL_FAIL), NULL); I40E_AQ_EVENT_MODULE_QUAL_FAIL), NULL);
if (ret) if (ret)
dev_info(&pf->pdev->dev, "set phy mask fail, err %d aq_err %s\n", dev_info(&pf->pdev->dev, "set phy mask fail, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
/* Rebuild the VSIs and VEBs that existed before reset. /* Rebuild the VSIs and VEBs that existed before reset.
@@ -11052,8 +11053,8 @@ static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired)
msleep(75); msleep(75);
ret = i40e_aq_set_link_restart_an(&pf->hw, true, NULL); ret = i40e_aq_set_link_restart_an(&pf->hw, true, NULL);
if (ret) if (ret)
dev_info(&pf->pdev->dev, "link restart failed, err %d aq_err %s\n", dev_info(&pf->pdev->dev, "link restart failed, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, i40e_aq_str(&pf->hw,
pf->hw.aq.asq_last_status)); pf->hw.aq.asq_last_status));
} }
@@ -11081,9 +11082,9 @@ static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired)
ret = i40e_set_promiscuous(pf, pf->cur_promisc); ret = i40e_set_promiscuous(pf, pf->cur_promisc);
if (ret) if (ret)
dev_warn(&pf->pdev->dev, dev_warn(&pf->pdev->dev,
"Failed to restore promiscuous setting: %s, err %d aq_err %s\n", "Failed to restore promiscuous setting: %s, err %pe aq_err %s\n",
pf->cur_promisc ? "on" : "off", pf->cur_promisc ? "on" : "off",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
i40e_reset_all_vfs(pf, true); i40e_reset_all_vfs(pf, true);
@@ -12217,8 +12218,8 @@ static int i40e_get_rss_aq(struct i40e_vsi *vsi, const u8 *seed,
(struct i40e_aqc_get_set_rss_key_data *)seed); (struct i40e_aqc_get_set_rss_key_data *)seed);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"Cannot get RSS key, err %d aq_err %s\n", "Cannot get RSS key, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, i40e_aq_str(&pf->hw,
pf->hw.aq.asq_last_status)); pf->hw.aq.asq_last_status));
return ret; return ret;
@@ -12231,8 +12232,8 @@ static int i40e_get_rss_aq(struct i40e_vsi *vsi, const u8 *seed,
ret = i40e_aq_get_rss_lut(hw, vsi->id, pf_lut, lut, lut_size); ret = i40e_aq_get_rss_lut(hw, vsi->id, pf_lut, lut, lut_size);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"Cannot get RSS lut, err %d aq_err %s\n", "Cannot get RSS lut, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, i40e_aq_str(&pf->hw,
pf->hw.aq.asq_last_status)); pf->hw.aq.asq_last_status));
return ret; return ret;
@@ -12572,8 +12573,8 @@ int i40e_commit_partition_bw_setting(struct i40e_pf *pf)
last_aq_status = pf->hw.aq.asq_last_status; last_aq_status = pf->hw.aq.asq_last_status;
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"Cannot acquire NVM for read access, err %d aq_err %s\n", "Cannot acquire NVM for read access, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, last_aq_status)); i40e_aq_str(&pf->hw, last_aq_status));
goto bw_commit_out; goto bw_commit_out;
} }
@@ -12589,8 +12590,8 @@ int i40e_commit_partition_bw_setting(struct i40e_pf *pf)
last_aq_status = pf->hw.aq.asq_last_status; last_aq_status = pf->hw.aq.asq_last_status;
i40e_release_nvm(&pf->hw); i40e_release_nvm(&pf->hw);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, "NVM read error, err %d aq_err %s\n", dev_info(&pf->pdev->dev, "NVM read error, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, last_aq_status)); i40e_aq_str(&pf->hw, last_aq_status));
goto bw_commit_out; goto bw_commit_out;
} }
@@ -12603,8 +12604,8 @@ int i40e_commit_partition_bw_setting(struct i40e_pf *pf)
last_aq_status = pf->hw.aq.asq_last_status; last_aq_status = pf->hw.aq.asq_last_status;
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"Cannot acquire NVM for write access, err %d aq_err %s\n", "Cannot acquire NVM for write access, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, last_aq_status)); i40e_aq_str(&pf->hw, last_aq_status));
goto bw_commit_out; goto bw_commit_out;
} }
@@ -12623,8 +12624,8 @@ int i40e_commit_partition_bw_setting(struct i40e_pf *pf)
i40e_release_nvm(&pf->hw); i40e_release_nvm(&pf->hw);
if (ret) if (ret)
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"BW settings NOT SAVED, err %d aq_err %s\n", "BW settings NOT SAVED, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, last_aq_status)); i40e_aq_str(&pf->hw, last_aq_status));
bw_commit_out: bw_commit_out:
@@ -12678,8 +12679,8 @@ static bool i40e_is_total_port_shutdown_enabled(struct i40e_pf *pf)
err_nvm: err_nvm:
dev_warn(&pf->pdev->dev, dev_warn(&pf->pdev->dev,
"total-port-shutdown feature is off due to read nvm error: %d\n", "total-port-shutdown feature is off due to read nvm error: %pe\n",
read_status); ERR_PTR(read_status));
return ret; return ret;
} }
@@ -13032,8 +13033,8 @@ static int i40e_udp_tunnel_set_port(struct net_device *netdev,
ret = i40e_aq_add_udp_tunnel(hw, ntohs(ti->port), type, &filter_index, ret = i40e_aq_add_udp_tunnel(hw, ntohs(ti->port), type, &filter_index,
NULL); NULL);
if (ret) { if (ret) {
netdev_info(netdev, "add UDP port failed, err %d aq_err %s\n", netdev_info(netdev, "add UDP port failed, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(hw, hw->aq.asq_last_status)); i40e_aq_str(hw, hw->aq.asq_last_status));
return -EIO; return -EIO;
} }
@@ -13052,8 +13053,8 @@ static int i40e_udp_tunnel_unset_port(struct net_device *netdev,
ret = i40e_aq_del_udp_tunnel(hw, ti->hw_priv, NULL); ret = i40e_aq_del_udp_tunnel(hw, ti->hw_priv, NULL);
if (ret) { if (ret) {
netdev_info(netdev, "delete UDP port failed, err %d aq_err %s\n", netdev_info(netdev, "delete UDP port failed, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(hw, hw->aq.asq_last_status)); i40e_aq_str(hw, hw->aq.asq_last_status));
return -EIO; return -EIO;
} }
@@ -13940,8 +13941,8 @@ static int i40e_add_vsi(struct i40e_vsi *vsi)
ctxt.flags = I40E_AQ_VSI_TYPE_PF; ctxt.flags = I40E_AQ_VSI_TYPE_PF;
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"couldn't get PF vsi config, err %d aq_err %s\n", "couldn't get PF vsi config, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, i40e_aq_str(&pf->hw,
pf->hw.aq.asq_last_status)); pf->hw.aq.asq_last_status));
return -ENOENT; return -ENOENT;
@@ -13990,8 +13991,8 @@ static int i40e_add_vsi(struct i40e_vsi *vsi)
ret = i40e_aq_update_vsi_params(hw, &ctxt, NULL); ret = i40e_aq_update_vsi_params(hw, &ctxt, NULL);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"update vsi failed, err %d aq_err %s\n", "update vsi failed, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, i40e_aq_str(&pf->hw,
pf->hw.aq.asq_last_status)); pf->hw.aq.asq_last_status));
ret = -ENOENT; ret = -ENOENT;
@@ -14013,9 +14014,9 @@ static int i40e_add_vsi(struct i40e_vsi *vsi)
* message and continue * message and continue
*/ */
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"failed to configure TCs for main VSI tc_map 0x%08x, err %d aq_err %s\n", "failed to configure TCs for main VSI tc_map 0x%08x, err %pe aq_err %s\n",
enabled_tc, enabled_tc,
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, i40e_aq_str(&pf->hw,
pf->hw.aq.asq_last_status)); pf->hw.aq.asq_last_status));
} }
@@ -14109,8 +14110,8 @@ static int i40e_add_vsi(struct i40e_vsi *vsi)
ret = i40e_aq_add_vsi(hw, &ctxt, NULL); ret = i40e_aq_add_vsi(hw, &ctxt, NULL);
if (ret) { if (ret) {
dev_info(&vsi->back->pdev->dev, dev_info(&vsi->back->pdev->dev,
"add vsi failed, err %d aq_err %s\n", "add vsi failed, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, i40e_aq_str(&pf->hw,
pf->hw.aq.asq_last_status)); pf->hw.aq.asq_last_status));
ret = -ENOENT; ret = -ENOENT;
@@ -14141,8 +14142,8 @@ static int i40e_add_vsi(struct i40e_vsi *vsi)
ret = i40e_vsi_get_bw_info(vsi); ret = i40e_vsi_get_bw_info(vsi);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"couldn't get vsi bw info, err %d aq_err %s\n", "couldn't get vsi bw info, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
/* VSI is already added so not tearing that up */ /* VSI is already added so not tearing that up */
ret = 0; ret = 0;
@@ -14588,8 +14589,8 @@ static int i40e_veb_get_bw_info(struct i40e_veb *veb)
&bw_data, NULL); &bw_data, NULL);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"query veb bw config failed, err %d aq_err %s\n", "query veb bw config failed, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, hw->aq.asq_last_status)); i40e_aq_str(&pf->hw, hw->aq.asq_last_status));
goto out; goto out;
} }
@@ -14598,8 +14599,8 @@ static int i40e_veb_get_bw_info(struct i40e_veb *veb)
&ets_data, NULL); &ets_data, NULL);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"query veb bw ets config failed, err %d aq_err %s\n", "query veb bw ets config failed, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, hw->aq.asq_last_status)); i40e_aq_str(&pf->hw, hw->aq.asq_last_status));
goto out; goto out;
} }
@@ -14795,8 +14796,8 @@ static int i40e_add_veb(struct i40e_veb *veb, struct i40e_vsi *vsi)
/* get a VEB from the hardware */ /* get a VEB from the hardware */
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"couldn't add VEB, err %d aq_err %s\n", "couldn't add VEB, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
return -EPERM; return -EPERM;
} }
@@ -14806,16 +14807,16 @@ static int i40e_add_veb(struct i40e_veb *veb, struct i40e_vsi *vsi)
&veb->stats_idx, NULL, NULL, NULL); &veb->stats_idx, NULL, NULL, NULL);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"couldn't get VEB statistics idx, err %d aq_err %s\n", "couldn't get VEB statistics idx, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
return -EPERM; return -EPERM;
} }
ret = i40e_veb_get_bw_info(veb); ret = i40e_veb_get_bw_info(veb);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"couldn't get VEB bw info, err %d aq_err %s\n", "couldn't get VEB bw info, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
i40e_aq_delete_element(&pf->hw, veb->seid, NULL); i40e_aq_delete_element(&pf->hw, veb->seid, NULL);
return -ENOENT; return -ENOENT;
@@ -15071,8 +15072,8 @@ static int i40e_setup_pf_switch(struct i40e_pf *pf, bool reinit, bool lock_acqui
ret = i40e_fetch_switch_configuration(pf, false); ret = i40e_fetch_switch_configuration(pf, false);
if (ret) { if (ret) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"couldn't fetch switch config, err %d aq_err %s\n", "couldn't fetch switch config, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
return ret; return ret;
} }
@@ -15098,8 +15099,8 @@ static int i40e_setup_pf_switch(struct i40e_pf *pf, bool reinit, bool lock_acqui
NULL); NULL);
if (ret && pf->hw.aq.asq_last_status != I40E_AQ_RC_ESRCH) { if (ret && pf->hw.aq.asq_last_status != I40E_AQ_RC_ESRCH) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"couldn't set switch config bits, err %d aq_err %s\n", "couldn't set switch config bits, err %pe aq_err %s\n",
ret, ERR_PTR(ret),
i40e_aq_str(&pf->hw, i40e_aq_str(&pf->hw,
pf->hw.aq.asq_last_status)); pf->hw.aq.asq_last_status));
/* not a fatal problem, just keep going */ /* not a fatal problem, just keep going */
@@ -16002,8 +16003,8 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
I40E_AQ_EVENT_MEDIA_NA | I40E_AQ_EVENT_MEDIA_NA |
I40E_AQ_EVENT_MODULE_QUAL_FAIL), NULL); I40E_AQ_EVENT_MODULE_QUAL_FAIL), NULL);
if (err) if (err)
dev_info(&pf->pdev->dev, "set phy mask fail, err %d aq_err %s\n", dev_info(&pf->pdev->dev, "set phy mask fail, err %pe aq_err %s\n",
err, ERR_PTR(err),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
/* Reconfigure hardware for allowing smaller MSS in the case /* Reconfigure hardware for allowing smaller MSS in the case
@@ -16021,8 +16022,8 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
msleep(75); msleep(75);
err = i40e_aq_set_link_restart_an(&pf->hw, true, NULL); err = i40e_aq_set_link_restart_an(&pf->hw, true, NULL);
if (err) if (err)
dev_info(&pf->pdev->dev, "link restart failed, err %d aq_err %s\n", dev_info(&pf->pdev->dev, "link restart failed, err %pe aq_err %s\n",
err, ERR_PTR(err),
i40e_aq_str(&pf->hw, i40e_aq_str(&pf->hw,
pf->hw.aq.asq_last_status)); pf->hw.aq.asq_last_status));
} }
@@ -16154,8 +16155,8 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
/* get the requested speeds from the fw */ /* get the requested speeds from the fw */
err = i40e_aq_get_phy_capabilities(hw, false, false, &abilities, NULL); err = i40e_aq_get_phy_capabilities(hw, false, false, &abilities, NULL);
if (err) if (err)
dev_dbg(&pf->pdev->dev, "get requested speeds ret = %d last_status = %s\n", dev_dbg(&pf->pdev->dev, "get requested speeds ret = %pe last_status = %s\n",
err, ERR_PTR(err),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
pf->hw.phy.link_info.requested_speeds = abilities.link_speed; pf->hw.phy.link_info.requested_speeds = abilities.link_speed;
@@ -16165,8 +16166,8 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
/* get the supported phy types from the fw */ /* get the supported phy types from the fw */
err = i40e_aq_get_phy_capabilities(hw, false, true, &abilities, NULL); err = i40e_aq_get_phy_capabilities(hw, false, true, &abilities, NULL);
if (err) if (err)
dev_dbg(&pf->pdev->dev, "get supported phy types ret = %d last_status = %s\n", dev_dbg(&pf->pdev->dev, "get supported phy types ret = %pe last_status = %s\n",
err, ERR_PTR(err),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
/* make sure the MFS hasn't been set lower than the default */ /* make sure the MFS hasn't been set lower than the default */

4
drivers/net/ethernet/intel/i40e/i40e_nvm.c
View File

@@ -1429,8 +1429,8 @@ static int i40e_nvmupd_exec_aq(struct i40e_hw *hw,
buff_size, &cmd_details); buff_size, &cmd_details);
if (status) { if (status) {
i40e_debug(hw, I40E_DEBUG_NVM, i40e_debug(hw, I40E_DEBUG_NVM,
"%s err %d aq_err %s\n", "%s err %pe aq_err %s\n",
__func__, status, __func__, ERR_PTR(status),
i40e_aq_str(hw, hw->aq.asq_last_status)); i40e_aq_str(hw, hw->aq.asq_last_status));
*perrno = i40e_aq_rc_to_posix(status, hw->aq.asq_last_status); *perrno = i40e_aq_rc_to_posix(status, hw->aq.asq_last_status);
return status; return status;

28
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
View File

@@ -1265,9 +1265,9 @@ i40e_set_vsi_promisc(struct i40e_vf *vf, u16 seid, bool multi_enable,
int aq_err = pf->hw.aq.asq_last_status; int aq_err = pf->hw.aq.asq_last_status;
dev_err(&pf->pdev->dev, dev_err(&pf->pdev->dev,
"VF %d failed to set multicast promiscuous mode err %d aq_err %s\n", "VF %d failed to set multicast promiscuous mode err %pe aq_err %s\n",
vf->vf_id, vf->vf_id,
aq_ret, ERR_PTR(aq_ret),
i40e_aq_str(&pf->hw, aq_err)); i40e_aq_str(&pf->hw, aq_err));
return aq_ret; return aq_ret;
@@ -1281,9 +1281,9 @@ i40e_set_vsi_promisc(struct i40e_vf *vf, u16 seid, bool multi_enable,
int aq_err = pf->hw.aq.asq_last_status; int aq_err = pf->hw.aq.asq_last_status;
dev_err(&pf->pdev->dev, dev_err(&pf->pdev->dev,
"VF %d failed to set unicast promiscuous mode err %d aq_err %s\n", "VF %d failed to set unicast promiscuous mode err %pe aq_err %s\n",
vf->vf_id, vf->vf_id,
aq_ret, ERR_PTR(aq_ret),
i40e_aq_str(&pf->hw, aq_err)); i40e_aq_str(&pf->hw, aq_err));
} }
@@ -1298,9 +1298,9 @@ i40e_set_vsi_promisc(struct i40e_vf *vf, u16 seid, bool multi_enable,
int aq_err = pf->hw.aq.asq_last_status; int aq_err = pf->hw.aq.asq_last_status;
dev_err(&pf->pdev->dev, dev_err(&pf->pdev->dev,
"VF %d failed to set multicast promiscuous mode err %d aq_err %s\n", "VF %d failed to set multicast promiscuous mode err %pe aq_err %s\n",
vf->vf_id, vf->vf_id,
aq_ret, ERR_PTR(aq_ret),
i40e_aq_str(&pf->hw, aq_err)); i40e_aq_str(&pf->hw, aq_err));
if (!aq_tmp) if (!aq_tmp)
@@ -1314,9 +1314,9 @@ i40e_set_vsi_promisc(struct i40e_vf *vf, u16 seid, bool multi_enable,
int aq_err = pf->hw.aq.asq_last_status; int aq_err = pf->hw.aq.asq_last_status;
dev_err(&pf->pdev->dev, dev_err(&pf->pdev->dev,
"VF %d failed to set unicast promiscuous mode err %d aq_err %s\n", "VF %d failed to set unicast promiscuous mode err %pe aq_err %s\n",
vf->vf_id, vf->vf_id,
aq_ret, ERR_PTR(aq_ret),
i40e_aq_str(&pf->hw, aq_err)); i40e_aq_str(&pf->hw, aq_err));
if (!aq_tmp) if (!aq_tmp)
@@ -3616,8 +3616,8 @@ static void i40e_del_all_cloud_filters(struct i40e_vf *vf)
ret = i40e_add_del_cloud_filter(vsi, cfilter, false); ret = i40e_add_del_cloud_filter(vsi, cfilter, false);
if (ret) if (ret)
dev_err(&pf->pdev->dev, dev_err(&pf->pdev->dev,
"VF %d: Failed to delete cloud filter, err %d aq_err %s\n", "VF %d: Failed to delete cloud filter, err %pe aq_err %s\n",
vf->vf_id, ret, vf->vf_id, ERR_PTR(ret),
i40e_aq_str(&pf->hw, i40e_aq_str(&pf->hw,
pf->hw.aq.asq_last_status)); pf->hw.aq.asq_last_status));
@@ -3719,8 +3719,8 @@ static int i40e_vc_del_cloud_filter(struct i40e_vf *vf, u8 *msg)
ret = i40e_add_del_cloud_filter(vsi, &cfilter, false); ret = i40e_add_del_cloud_filter(vsi, &cfilter, false);
if (ret) { if (ret) {
dev_err(&pf->pdev->dev, dev_err(&pf->pdev->dev,
"VF %d: Failed to delete cloud filter, err %d aq_err %s\n", "VF %d: Failed to delete cloud filter, err %pe aq_err %s\n",
vf->vf_id, ret, vf->vf_id, ERR_PTR(ret),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
goto err; goto err;
} }
@@ -3853,8 +3853,8 @@ static int i40e_vc_add_cloud_filter(struct i40e_vf *vf, u8 *msg)
ret = i40e_add_del_cloud_filter(vsi, cfilter, true); ret = i40e_add_del_cloud_filter(vsi, cfilter, true);
if (ret) { if (ret) {
dev_err(&pf->pdev->dev, dev_err(&pf->pdev->dev,
"VF %d: Failed to add cloud filter, err %d aq_err %s\n", "VF %d: Failed to add cloud filter, err %pe aq_err %s\n",
vf->vf_id, ret, vf->vf_id, ERR_PTR(ret),
i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status)); i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));
goto err_free; goto err_free;
} }