提交 d5ba1842 编写于 作者: J Jan Sokolowski 提交者: Tony Nguyen

i40e: use ERR_PTR error print in i40e messages

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: NJan Sokolowski <jan.sokolowski@intel.com>
Tested-by: Gurucharan G <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: NTony Nguyen <anthony.l.nguyen@intel.com>
上级 5180ff13
...@@ -686,8 +686,8 @@ static int i40e_client_update_vsi_ctxt(struct i40e_info *ldev, ...@@ -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, ...@@ -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));
} }
......
...@@ -135,8 +135,8 @@ static int i40e_dcbnl_ieee_setets(struct net_device *netdev, ...@@ -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, ...@@ -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, ...@@ -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, ...@@ -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;
} }
......
...@@ -1455,8 +1455,8 @@ static int i40e_set_link_ksettings(struct net_device *netdev, ...@@ -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, ...@@ -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) ...@@ -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) ...@@ -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) ...@@ -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, ...@@ -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 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags) ...@@ -5362,8 +5362,8 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags)
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 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags) ...@@ -5435,8 +5435,8 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags)
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;
......
...@@ -1429,8 +1429,8 @@ static int i40e_nvmupd_exec_aq(struct i40e_hw *hw, ...@@ -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;
......
...@@ -1265,9 +1265,9 @@ i40e_set_vsi_promisc(struct i40e_vf *vf, u16 seid, bool multi_enable, ...@@ -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, ...@@ -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, ...@@ -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, ...@@ -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) ...@@ -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) ...@@ -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) ...@@ -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;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册