Commit 19cce2c6 authored by Anirudh Venkataramanan's avatar Anirudh Venkataramanan Committed by Jeff Kirsher
Browse files

ice: Make print statements more compact 



Formatting strings in print function calls (like dev_info, dev_err, etc.)
can exceed 80 columns without making checkpatch unhappy. So remove
newlines where applicable and make print statements more compact.

Signed-off-by: default avatarAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 9a946843

drivers/net/ethernet/intel/ice/ice_base.c

+8 −14
Original line number Diff line number Diff line
@@ -405,8 +405,7 @@ int ice_setup_rx_ctx(struct ice_ring *ring) 
	/* Absolute queue number out of 2K needs to be passed */

	err = ice_write_rxq_ctx(hw, &rlan_ctx, pf_q);

	if (err) {

		dev_err(ice_pf_to_dev(vsi->back),

			"Failed to set LAN Rx queue context for absolute Rx queue %d error: %d\n",

		dev_err(ice_pf_to_dev(vsi->back), "Failed to set LAN Rx queue context for absolute Rx queue %d error: %d\n",

			pf_q, err);

		return -EIO;

	}
@@ -428,8 +427,7 @@ int ice_setup_rx_ctx(struct ice_ring *ring) 
	      ice_alloc_rx_bufs_slow_zc(ring, ICE_DESC_UNUSED(ring)) :

	      ice_alloc_rx_bufs(ring, ICE_DESC_UNUSED(ring));

	if (err)

		dev_info(ice_pf_to_dev(vsi->back),

			 "Failed allocate some buffers on %sRx ring %d (pf_q %d)\n",

		dev_info(ice_pf_to_dev(vsi->back), "Failed allocate some buffers on %sRx ring %d (pf_q %d)\n",

			 ring->xsk_umem ? "UMEM enabled " : "",

			 ring->q_index, pf_q);
@@ -490,8 +488,7 @@ int ice_vsi_ctrl_rx_ring(struct ice_vsi *vsi, bool ena, u16 rxq_idx) 
	/* wait for the change to finish */

	ret = ice_pf_rxq_wait(pf, pf_q, ena);

	if (ret)

		dev_err(ice_pf_to_dev(pf),

			"VSI idx %d Rx ring %d %sable timeout\n",

		dev_err(ice_pf_to_dev(pf), "VSI idx %d Rx ring %d %sable timeout\n",

			vsi->idx, pf_q, (ena ? "en" : "dis"));



	return ret;
@@ -648,8 +645,7 @@ ice_vsi_cfg_txq(struct ice_vsi *vsi, struct ice_ring *ring, 
	status = ice_ena_vsi_txq(vsi->port_info, vsi->idx, tc, ring->q_handle,

				 1, qg_buf, buf_len, NULL);

	if (status) {

		dev_err(ice_pf_to_dev(pf),

			"Failed to set LAN Tx queue context, error: %d\n",

		dev_err(ice_pf_to_dev(pf), "Failed to set LAN Tx queue context, error: %d\n",

			status);

		return -ENODEV;

	}
@@ -815,14 +811,12 @@ ice_vsi_stop_tx_ring(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src, 
	 * queues at the hardware level anyway.

	 */

	if (status == ICE_ERR_RESET_ONGOING) {

		dev_dbg(ice_pf_to_dev(vsi->back),

			"Reset in progress. LAN Tx queues already disabled\n");

		dev_dbg(ice_pf_to_dev(vsi->back), "Reset in progress. LAN Tx queues already disabled\n");

	} else if (status == ICE_ERR_DOES_NOT_EXIST) {

		dev_dbg(ice_pf_to_dev(vsi->back),

			"LAN Tx queues do not exist, nothing to disable\n");

		dev_dbg(ice_pf_to_dev(vsi->back), "LAN Tx queues do not exist, nothing to disable\n");

	} else if (status) {

		dev_err(ice_pf_to_dev(vsi->back),

			"Failed to disable LAN Tx queues, error: %d\n", status);

		dev_err(ice_pf_to_dev(vsi->back), "Failed to disable LAN Tx queues, error: %d\n",

			status);

		return -ENODEV;

	}

drivers/net/ethernet/intel/ice/ice_dcb_lib.c

+3 −4
Original line number Diff line number Diff line
@@ -577,8 +577,7 @@ int ice_init_pf_dcb(struct ice_pf *pf, bool locked) 
		goto dcb_init_err;

	}



	dev_info(dev,

		 "DCB is enabled in the hardware, max number of TCs supported on this port are %d\n",

	dev_info(dev, "DCB is enabled in the hardware, max number of TCs supported on this port are %d\n",

		 pf->hw.func_caps.common_cap.maxtc);

	if (err) {

		struct ice_vsi *pf_vsi;
@@ -588,8 +587,8 @@ int ice_init_pf_dcb(struct ice_pf *pf, bool locked) 
		clear_bit(ICE_FLAG_FW_LLDP_AGENT, pf->flags);

		err = ice_dcb_sw_dflt_cfg(pf, true, locked);

		if (err) {

			dev_err(dev,

				"Failed to set local DCB config %d\n", err);

			dev_err(dev, "Failed to set local DCB config %d\n",

				err);

			err = -EIO;

			goto dcb_init_err;

		}

drivers/net/ethernet/intel/ice/ice_dcb_nl.c

+4 −6
Original line number Diff line number Diff line
@@ -297,8 +297,7 @@ ice_dcbnl_get_pfc_cfg(struct net_device *netdev, int prio, u8 *setting) 
		return;



	*setting = (pi->local_dcbx_cfg.pfc.pfcena >> prio) & 0x1;

	dev_dbg(ice_pf_to_dev(pf),

		"Get PFC Config up=%d, setting=%d, pfcenable=0x%x\n",

	dev_dbg(ice_pf_to_dev(pf), "Get PFC Config up=%d, setting=%d, pfcenable=0x%x\n",

		prio, *setting, pi->local_dcbx_cfg.pfc.pfcena);

}
@@ -418,8 +417,8 @@ ice_dcbnl_get_pg_tc_cfg_tx(struct net_device *netdev, int prio, 
		return;



	*pgid = pi->local_dcbx_cfg.etscfg.prio_table[prio];

	dev_dbg(ice_pf_to_dev(pf),

		"Get PG config prio=%d tc=%d\n", prio, *pgid);

	dev_dbg(ice_pf_to_dev(pf), "Get PG config prio=%d tc=%d\n", prio,

		*pgid);

}



/**
@@ -882,8 +881,7 @@ ice_dcbnl_vsi_del_app(struct ice_vsi *vsi, 
	sapp.protocol = app->prot_id;

	sapp.priority = app->priority;

	err = ice_dcbnl_delapp(vsi->netdev, &sapp);

	dev_dbg(ice_pf_to_dev(vsi->back),

		"Deleting app for VSI idx=%d err=%d sel=%d proto=0x%x, prio=%d\n",

	dev_dbg(ice_pf_to_dev(vsi->back), "Deleting app for VSI idx=%d err=%d sel=%d proto=0x%x, prio=%d\n",

		vsi->idx, err, app->selector, app->prot_id, app->priority);

}

drivers/net/ethernet/intel/ice/ice_ethtool.c

+14 −28
Original line number Diff line number Diff line
@@ -374,8 +374,7 @@ static int ice_reg_pattern_test(struct ice_hw *hw, u32 reg, u32 mask) 
		val = rd32(hw, reg);

		if (val == pattern)

			continue;

		dev_err(dev,

			"%s: reg pattern test failed - reg 0x%08x pat 0x%08x val 0x%08x\n"

		dev_err(dev, "%s: reg pattern test failed - reg 0x%08x pat 0x%08x val 0x%08x\n"

			, __func__, reg, pattern, val);

		return 1;

	}
@@ -383,8 +382,7 @@ static int ice_reg_pattern_test(struct ice_hw *hw, u32 reg, u32 mask) 
	wr32(hw, reg, orig_val);

	val = rd32(hw, reg);

	if (val != orig_val) {

		dev_err(dev,

			"%s: reg restore test failed - reg 0x%08x orig 0x%08x val 0x%08x\n"

		dev_err(dev, "%s: reg restore test failed - reg 0x%08x orig 0x%08x val 0x%08x\n"

			, __func__, reg, orig_val, val);

		return 1;

	}
@@ -802,8 +800,7 @@ ice_self_test(struct net_device *netdev, struct ethtool_test *eth_test, 
		set_bit(__ICE_TESTING, pf->state);



		if (ice_active_vfs(pf)) {

			dev_warn(dev,

				 "Please take active VFs and Netqueues offline and restart the adapter before running NIC diagnostics\n");

			dev_warn(dev, "Please take active VFs and Netqueues offline and restart the adapter before running NIC diagnostics\n");

			data[ICE_ETH_TEST_REG] = 1;

			data[ICE_ETH_TEST_EEPROM] = 1;

			data[ICE_ETH_TEST_INTR] = 1;
@@ -1211,8 +1208,7 @@ static int ice_set_priv_flags(struct net_device *netdev, u32 flags) 
			 * events to respond to.

			 */

			if (status)

				dev_info(dev,

					 "Failed to unreg for LLDP events\n");

				dev_info(dev, "Failed to unreg for LLDP events\n");



			/* The AQ call to stop the FW LLDP agent will generate

			 * an error if the agent is already stopped.
@@ -1267,8 +1263,7 @@ static int ice_set_priv_flags(struct net_device *netdev, u32 flags) 
			/* Register for MIB change events */

			status = ice_cfg_lldp_mib_change(&pf->hw, true);

			if (status)

				dev_dbg(dev,

					"Fail to enable MIB change events\n");

				dev_dbg(dev, "Fail to enable MIB change events\n");

		}

	}

	if (test_bit(ICE_FLAG_LEGACY_RX, change_flags)) {
@@ -1761,8 +1756,7 @@ ice_get_settings_link_up(struct ethtool_link_ksettings *ks, 
		ks->base.speed = SPEED_100;

		break;

	default:

		netdev_info(netdev,

			    "WARNING: Unrecognized link_speed (0x%x).\n",

		netdev_info(netdev, "WARNING: Unrecognized link_speed (0x%x).\n",

			    link_info->link_speed);

		break;

	}
@@ -2578,13 +2572,11 @@ ice_set_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring) 


	new_tx_cnt = ALIGN(ring->tx_pending, ICE_REQ_DESC_MULTIPLE);

	if (new_tx_cnt != ring->tx_pending)

		netdev_info(netdev,

			    "Requested Tx descriptor count rounded up to %d\n",

		netdev_info(netdev, "Requested Tx descriptor count rounded up to %d\n",

			    new_tx_cnt);

	new_rx_cnt = ALIGN(ring->rx_pending, ICE_REQ_DESC_MULTIPLE);

	if (new_rx_cnt != ring->rx_pending)

		netdev_info(netdev,

			    "Requested Rx descriptor count rounded up to %d\n",

		netdev_info(netdev, "Requested Rx descriptor count rounded up to %d\n",

			    new_rx_cnt);



	/* if nothing to do return success */
@@ -3451,8 +3443,7 @@ ice_set_rc_coalesce(enum ice_container_type c_type, struct ethtool_coalesce *ec, 
		if (ec->rx_coalesce_usecs_high > ICE_MAX_INTRL ||

		    (ec->rx_coalesce_usecs_high &&

		     ec->rx_coalesce_usecs_high < pf->hw.intrl_gran)) {

			netdev_info(vsi->netdev,

				    "Invalid value, %s-usecs-high valid values are 0 (disabled), %d-%d\n",

			netdev_info(vsi->netdev, "Invalid value, %s-usecs-high valid values are 0 (disabled), %d-%d\n",

				    c_type_str, pf->hw.intrl_gran,

				    ICE_MAX_INTRL);

			return -EINVAL;
@@ -3470,8 +3461,7 @@ ice_set_rc_coalesce(enum ice_container_type c_type, struct ethtool_coalesce *ec, 
		break;

	case ICE_TX_CONTAINER:

		if (ec->tx_coalesce_usecs_high) {

			netdev_info(vsi->netdev,

				    "setting %s-usecs-high is not supported\n",

			netdev_info(vsi->netdev, "setting %s-usecs-high is not supported\n",

				    c_type_str);

			return -EINVAL;

		}
@@ -3488,23 +3478,20 @@ ice_set_rc_coalesce(enum ice_container_type c_type, struct ethtool_coalesce *ec, 


	itr_setting = rc->itr_setting & ~ICE_ITR_DYNAMIC;

	if (coalesce_usecs != itr_setting && use_adaptive_coalesce) {

		netdev_info(vsi->netdev,

			    "%s interrupt throttling cannot be changed if adaptive-%s is enabled\n",

		netdev_info(vsi->netdev, "%s interrupt throttling cannot be changed if adaptive-%s is enabled\n",

			    c_type_str, c_type_str);

		return -EINVAL;

	}



	if (coalesce_usecs > ICE_ITR_MAX) {

		netdev_info(vsi->netdev,

			    "Invalid value, %s-usecs range is 0-%d\n",

		netdev_info(vsi->netdev, "Invalid value, %s-usecs range is 0-%d\n",

			    c_type_str, ICE_ITR_MAX);

		return -EINVAL;

	}



	/* hardware only supports an ITR granularity of 2us */

	if (coalesce_usecs % 2 != 0) {

		netdev_info(vsi->netdev,

			    "Invalid value, %s-usecs must be even\n",

		netdev_info(vsi->netdev, "Invalid value, %s-usecs must be even\n",

			    c_type_str);

		return -EINVAL;

	}
@@ -3745,8 +3732,7 @@ ice_get_module_info(struct net_device *netdev, 
		}

		break;

	default:

		netdev_warn(netdev,

			    "SFF Module Type not recognized.\n");

		netdev_warn(netdev, "SFF Module Type not recognized.\n");

		return -EINVAL;

	}

	return 0;

drivers/net/ethernet/intel/ice/ice_lib.c

+12 −24
Original line number Diff line number Diff line
@@ -117,8 +117,7 @@ static void ice_vsi_set_num_desc(struct ice_vsi *vsi) 
		vsi->num_tx_desc = ICE_DFLT_NUM_TX_DESC;

		break;

	default:

		dev_dbg(ice_pf_to_dev(vsi->back),

			"Not setting number of Tx/Rx descriptors for VSI type %d\n",

		dev_dbg(ice_pf_to_dev(vsi->back), "Not setting number of Tx/Rx descriptors for VSI type %d\n",

			vsi->type);

		break;

	}
@@ -929,8 +928,7 @@ static int ice_vsi_setup_vector_base(struct ice_vsi *vsi) 
	vsi->base_vector = ice_get_res(pf, pf->irq_tracker, num_q_vectors,

				       vsi->idx);

	if (vsi->base_vector < 0) {

		dev_err(dev,

			"Failed to get tracking for %d vectors for VSI %d, err=%d\n",

		dev_err(dev, "Failed to get tracking for %d vectors for VSI %d, err=%d\n",

			num_q_vectors, vsi->vsi_num, vsi->base_vector);

		return -ENOENT;

	}
@@ -1392,12 +1390,10 @@ int ice_vsi_kill_vlan(struct ice_vsi *vsi, u16 vid) 


	status = ice_remove_vlan(&pf->hw, &tmp_add_list);

	if (status == ICE_ERR_DOES_NOT_EXIST) {

		dev_dbg(dev,

			"Failed to remove VLAN %d on VSI %i, it does not exist, status: %d\n",

		dev_dbg(dev, "Failed to remove VLAN %d on VSI %i, it does not exist, status: %d\n",

			vid, vsi->vsi_num, status);

	} else if (status) {

		dev_err(dev,

			"Error removing VLAN %d on vsi %i error: %d\n",

		dev_err(dev, "Error removing VLAN %d on vsi %i error: %d\n",

			vid, vsi->vsi_num, status);

		err = -EIO;

	}
@@ -1453,8 +1449,7 @@ int ice_vsi_cfg_rxqs(struct ice_vsi *vsi) 


		err = ice_setup_rx_ctx(vsi->rx_rings[i]);

		if (err) {

			dev_err(ice_pf_to_dev(vsi->back),

				"ice_setup_rx_ctx failed for RxQ %d, err %d\n",

			dev_err(ice_pf_to_dev(vsi->back), "ice_setup_rx_ctx failed for RxQ %d, err %d\n",

				i, err);

			return err;

		}
@@ -1834,8 +1829,7 @@ ice_vsi_set_q_vectors_reg_idx(struct ice_vsi *vsi) 
		struct ice_q_vector *q_vector = vsi->q_vectors[i];



		if (!q_vector) {

			dev_err(ice_pf_to_dev(vsi->back),

				"Failed to set reg_idx on q_vector %d VSI %d\n",

			dev_err(ice_pf_to_dev(vsi->back), "Failed to set reg_idx on q_vector %d VSI %d\n",

				i, vsi->vsi_num);

			goto clear_reg_idx;

		}
@@ -1898,8 +1892,7 @@ ice_vsi_add_rem_eth_mac(struct ice_vsi *vsi, bool add_rule) 
		status = ice_remove_eth_mac(&pf->hw, &tmp_add_list);



	if (status)

		dev_err(dev,

			"Failure Adding or Removing Ethertype on VSI %i error: %d\n",

		dev_err(dev, "Failure Adding or Removing Ethertype on VSI %i error: %d\n",

			vsi->vsi_num, status);



	ice_free_fltr_list(dev, &tmp_add_list);
@@ -2384,8 +2377,7 @@ ice_get_res(struct ice_pf *pf, struct ice_res_tracker *res, u16 needed, u16 id) 
		return -EINVAL;



	if (!needed || needed > res->num_entries || id >= ICE_RES_VALID_BIT) {

		dev_err(ice_pf_to_dev(pf),

			"param err: needed=%d, num_entries = %d id=0x%04x\n",

		dev_err(ice_pf_to_dev(pf), "param err: needed=%d, num_entries = %d id=0x%04x\n",

			needed, res->num_entries, id);

		return -EINVAL;

	}
@@ -2764,8 +2756,7 @@ int ice_vsi_rebuild(struct ice_vsi *vsi, bool init_vsi) 
	status = ice_cfg_vsi_lan(vsi->port_info, vsi->idx, vsi->tc_cfg.ena_tc,

				 max_txqs);

	if (status) {

		dev_err(ice_pf_to_dev(pf),

			"VSI %d failed lan queue config, error %d\n",

		dev_err(ice_pf_to_dev(pf), "VSI %d failed lan queue config, error %d\n",

			vsi->vsi_num, status);

		if (init_vsi) {

			ret = -EIO;
@@ -3023,16 +3014,14 @@ int ice_set_dflt_vsi(struct ice_sw *sw, struct ice_vsi *vsi) 


	/* another VSI is already the default VSI for this switch */

	if (ice_is_dflt_vsi_in_use(sw)) {

		dev_err(dev,

			"Default forwarding VSI %d already in use, disable it and try again\n",

		dev_err(dev, "Default forwarding VSI %d already in use, disable it and try again\n",

			sw->dflt_vsi->vsi_num);

		return -EEXIST;

	}



	status = ice_cfg_dflt_vsi(&vsi->back->hw, vsi->idx, true, ICE_FLTR_RX);

	if (status) {

		dev_err(dev,

			"Failed to set VSI %d as the default forwarding VSI, error %d\n",

		dev_err(dev, "Failed to set VSI %d as the default forwarding VSI, error %d\n",

			vsi->vsi_num, status);

		return -EIO;

	}
@@ -3071,8 +3060,7 @@ int ice_clear_dflt_vsi(struct ice_sw *sw) 
	status = ice_cfg_dflt_vsi(&dflt_vsi->back->hw, dflt_vsi->idx, false,

				  ICE_FLTR_RX);

	if (status) {

		dev_err(dev,

			"Failed to clear the default forwarding VSI %d, error %d\n",

		dev_err(dev, "Failed to clear the default forwarding VSI %d, error %d\n",

			dflt_vsi->vsi_num, status);

		return -EIO;

	}