Commit d5ba1842 authored by Jan Sokolowski's avatar Jan Sokolowski Committed by Tony Nguyen
Browse files

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: default avatarJan Sokolowski <jan.sokolowski@intel.com>
Tested-by: Gurucharan G <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 5180ff13

drivers/net/ethernet/intel/i40e/i40e_client.c

+4 −4
Original line number Diff line number Diff line
@@ -686,8 +686,8 @@ static int i40e_client_update_vsi_ctxt(struct i40e_info *ldev, 
	ctxt.flags = I40E_AQ_VSI_TYPE_PF;

	if (err) {

		dev_info(&pf->pdev->dev,

			 "couldn't get PF vsi config, err %d aq_err %s\n",

			 err,

			 "couldn't get PF vsi config, err %pe aq_err %s\n",

			 ERR_PTR(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(struct i40e_info *ldev, 
		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 %d aq_err %s\n",

				 err,

				 "update VSI ctxt for PE failed, err %pe aq_err %s\n",

				 ERR_PTR(err),

				 i40e_aq_str(&pf->hw,

					     pf->hw.aq.asq_last_status));

		}

drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c

+8 −8
Original line number Diff line number Diff line
@@ -135,8 +135,8 @@ static int i40e_dcbnl_ieee_setets(struct net_device *netdev, 
	ret = i40e_hw_dcb_config(pf, &pf->tmp_cfg);

	if (ret) {

		dev_info(&pf->pdev->dev,

			 "Failed setting DCB ETS configuration err %d aq_err %s\n",

			 ret,

			 "Failed setting DCB ETS configuration err %pe aq_err %s\n",

			 ERR_PTR(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 net_device *netdev, 
	ret = i40e_hw_dcb_config(pf, &pf->tmp_cfg);

	if (ret) {

		dev_info(&pf->pdev->dev,

			 "Failed setting DCB PFC configuration err %d aq_err %s\n",

			 ret,

			 "Failed setting DCB PFC configuration err %pe aq_err %s\n",

			 ERR_PTR(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 net_device *netdev, 
	ret = i40e_hw_dcb_config(pf, &pf->tmp_cfg);

	if (ret) {

		dev_info(&pf->pdev->dev,

			 "Failed setting DCB configuration err %d aq_err %s\n",

			 ret,

			 "Failed setting DCB configuration err %pe aq_err %s\n",

			 ERR_PTR(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 net_device *netdev, 
	ret = i40e_hw_dcb_config(pf, &pf->tmp_cfg);

	if (ret) {

		dev_info(&pf->pdev->dev,

			 "Failed setting DCB configuration err %d aq_err %s\n",

			 ret,

			 "Failed setting DCB configuration err %pe aq_err %s\n",

			 ERR_PTR(ret),

			 i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));

		return -EINVAL;

	}

drivers/net/ethernet/intel/i40e/i40e_ethtool.c

+20 −20
Original line number Diff line number Diff line
@@ -1455,8 +1455,8 @@ static int i40e_set_link_ksettings(struct net_device *netdev, 
		status = i40e_aq_set_phy_config(hw, &config, NULL);

		if (status) {

			netdev_info(netdev,

				    "Set phy config failed, err %d aq_err %s\n",

				    status,

				    "Set phy config failed, err %pe aq_err %s\n",

				    ERR_PTR(status),

				    i40e_aq_str(hw, hw->aq.asq_last_status));

			err = -EAGAIN;

			goto done;
@@ -1465,8 +1465,8 @@ static int i40e_set_link_ksettings(struct net_device *netdev, 
		status = i40e_update_link_info(hw);

		if (status)

			netdev_dbg(netdev,

				   "Updating link info failed with err %d aq_err %s\n",

				   status,

				   "Updating link info failed with err %pe aq_err %s\n",

				   ERR_PTR(status),

				   i40e_aq_str(hw, hw->aq.asq_last_status));



	} 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);

		if (status) {

			netdev_info(netdev,

				    "Set phy config failed, err %d aq_err %s\n",

				    status,

				    "Set phy config failed, err %pe aq_err %s\n",

				    ERR_PTR(status),

				    i40e_aq_str(hw, hw->aq.asq_last_status));

			err = -EAGAIN;

			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.)

			 */

			netdev_dbg(netdev,

				   "Updating link info failed with err %d aq_err %s\n",

				   status,

				   "Updating link info failed with err %pe aq_err %s\n",

				   ERR_PTR(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);

	if (ret) {

		netdev_info(netdev, "link restart failed, err %d aq_err %s\n",

			    ret,

		netdev_info(netdev, "link restart failed, err %pe aq_err %s\n",

			    ERR_PTR(ret),

			    i40e_aq_str(hw, hw->aq.asq_last_status));

		return -EIO;

	}
@@ -1755,20 +1755,20 @@ static int i40e_set_pauseparam(struct net_device *netdev, 
	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 %d aq_err %s\n",

			    status,

		netdev_info(netdev, "Set fc failed on the get_phy_capabilities call with err %pe aq_err %s\n",

			    ERR_PTR(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 %d aq_err %s\n",

			    status,

		netdev_info(netdev, "Set fc failed on the set_phy_config call with err %pe aq_err %s\n",

			    ERR_PTR(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 %d aq_err %s\n",

			    status,

		netdev_info(netdev, "Set fc failed on the get_link_info call with err %pe aq_err %s\n",

			    ERR_PTR(status),

			    i40e_aq_str(hw, hw->aq.asq_last_status));

		err = -EAGAIN;

	}
@@ -5362,8 +5362,8 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags) 
						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 %d aq_err %s\n",

				 ret,

				 "couldn't set switch config bits, err %pe aq_err %s\n",

				 ERR_PTR(ret),

				 i40e_aq_str(&pf->hw,

					     pf->hw.aq.asq_last_status));

			/* not a fatal problem, just keep going */
@@ -5435,8 +5435,8 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags) 
					return -EBUSY;

				default:

					dev_warn(&pf->pdev->dev,

						 "Starting FW LLDP agent failed: error: %d, %s\n",

						 status,

						 "Starting FW LLDP agent failed: error: %pe, %s\n",

						 ERR_PTR(status),

						 i40e_aq_str(&pf->hw,

							     adq_err));

					return -EINVAL;

drivers/net/ethernet/intel/i40e/i40e_main.c

+150 −149

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/intel/i40e/i40e_nvm.c

+2 −2
Original line number Diff line number Diff line
@@ -1429,8 +1429,8 @@ static int i40e_nvmupd_exec_aq(struct i40e_hw *hw, 
				       buff_size, &cmd_details);

	if (status) {

		i40e_debug(hw, I40E_DEBUG_NVM,

			   "%s err %d aq_err %s\n",

			   __func__, status,

			   "%s err %pe aq_err %s\n",

			   __func__, ERR_PTR(status),

			   i40e_aq_str(hw, hw->aq.asq_last_status));

		*perrno = i40e_aq_rc_to_posix(status, hw->aq.asq_last_status);

		return status;