Commit 88865fc4 authored by Karol Kolacinski's avatar Karol Kolacinski Committed by Jeff Kirsher
Browse files

ice: Fix casting issues 



Change min() macros to min_t() which has compare type specified and it
helps avoid precision loss.

In some cases there was precision loss during calls or assignments.
Some fields in structs were unnecessarily large and gave multiple
warnings.

There were also some minor type differences which are now fixed as well as
some cases where a simple cast was needed.

Callers were were passing data that is a u16 to
ice_sched_cfg_node_bw_alloc() but the function was truncating that to a u8.
Fix that by changing the function to take a u16.

Signed-off-by: default avatarKarol Kolacinski <karol.kolacinski@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 0fee3577

drivers/net/ethernet/intel/ice/ice.h

+5 −5
Original line number Diff line number Diff line
@@ -248,8 +248,8 @@ struct ice_vsi { 
	u32 tx_busy;

	u32 rx_buf_failed;

	u32 rx_page_failed;

	int num_q_vectors;

	int base_vector;		/* IRQ base for OS reserved vectors */

	u16 num_q_vectors;

	u16 base_vector;		/* IRQ base for OS reserved vectors */

	enum ice_vsi_type type;

	u16 vsi_num;			/* HW (absolute) index of this VSI */

	u16 idx;			/* software index in pf->vsi[] */
@@ -390,11 +390,11 @@ struct ice_pf { 
	struct mutex tc_mutex;		/* lock to protect TC changes */

	u32 msg_enable;

	u32 hw_csum_rx_error;

	u32 oicr_idx;		/* Other interrupt cause MSIX vector index */

	u32 num_avail_sw_msix;	/* remaining MSIX SW vectors left unclaimed */

	u16 oicr_idx;		/* Other interrupt cause MSIX vector index */

	u16 num_avail_sw_msix;	/* remaining MSIX SW vectors left unclaimed */

	u16 max_pf_txqs;	/* Total Tx queues PF wide */

	u16 max_pf_rxqs;	/* Total Rx queues PF wide */

	u32 num_lan_msix;	/* Total MSIX vectors for base driver */

	u16 num_lan_msix;	/* Total MSIX vectors for base driver */

	u16 num_lan_tx;		/* num LAN Tx queues setup */

	u16 num_lan_rx;		/* num LAN Rx queues setup */

	u16 next_vsi;		/* Next free slot in pf->vsi[] - 0-based! */

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

+14 −10
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ static int __ice_vsi_get_qs_contig(struct ice_qs_cfg *qs_cfg) 


	bitmap_set(qs_cfg->pf_map, offset, qs_cfg->q_count);

	for (i = 0; i < qs_cfg->q_count; i++)

		qs_cfg->vsi_map[i + qs_cfg->vsi_map_offset] = i + offset;

		qs_cfg->vsi_map[i + qs_cfg->vsi_map_offset] = (u16)(i + offset);

	mutex_unlock(qs_cfg->qs_mutex);



	return 0;
@@ -47,7 +47,7 @@ static int __ice_vsi_get_qs_sc(struct ice_qs_cfg *qs_cfg) 
		if (index >= qs_cfg->pf_map_size)

			goto err_scatter;

		set_bit(index, qs_cfg->pf_map);

		qs_cfg->vsi_map[i + qs_cfg->vsi_map_offset] = index;

		qs_cfg->vsi_map[i + qs_cfg->vsi_map_offset] = (u16)index;

	}

	mutex_unlock(qs_cfg->qs_mutex);
@@ -96,7 +96,7 @@ static int ice_pf_rxq_wait(struct ice_pf *pf, int pf_q, bool ena) 
 * We allocate one q_vector and set default value for ITR setting associated

 * with this q_vector. If allocation fails we return -ENOMEM.

 */

static int ice_vsi_alloc_q_vector(struct ice_vsi *vsi, int v_idx)

static int ice_vsi_alloc_q_vector(struct ice_vsi *vsi, u16 v_idx)

{

	struct ice_pf *pf = vsi->back;

	struct ice_q_vector *q_vector;
@@ -376,7 +376,7 @@ int ice_setup_rx_ctx(struct ice_ring *ring) 
	/* Max packet size for this queue - must not be set to a larger value

	 * than 5 x DBUF

	 */

	rlan_ctx.rxmax = min_t(u16, vsi->max_frame,

	rlan_ctx.rxmax = min_t(u32, vsi->max_frame,

			       chain_len * ring->rx_buf_len);



	/* Rx queue threshold in units of 64 */
@@ -453,7 +453,7 @@ int __ice_vsi_get_qs(struct ice_qs_cfg *qs_cfg) 
	if (ret) {

		/* contig failed, so try with scatter approach */

		qs_cfg->mapping_mode = ICE_VSI_MAP_SCATTER;

		qs_cfg->q_count = min_t(u16, qs_cfg->q_count,

		qs_cfg->q_count = min_t(unsigned int, qs_cfg->q_count,

					qs_cfg->scatter_count);

		ret = __ice_vsi_get_qs_sc(qs_cfg);

	}
@@ -526,7 +526,8 @@ int ice_vsi_wait_one_rx_ring(struct ice_vsi *vsi, bool ena, u16 rxq_idx) 
int ice_vsi_alloc_q_vectors(struct ice_vsi *vsi)

{

	struct device *dev = ice_pf_to_dev(vsi->back);

	int v_idx, err;

	u16 v_idx;

	int err;



	if (vsi->q_vectors[0]) {

		dev_dbg(dev, "VSI %d has existing q_vectors\n", vsi->vsi_num);
@@ -562,7 +563,7 @@ err_out: 
void ice_vsi_map_rings_to_vectors(struct ice_vsi *vsi)

{

	int q_vectors = vsi->num_q_vectors;

	int tx_rings_rem, rx_rings_rem;

	u16 tx_rings_rem, rx_rings_rem;

	int v_id;



	/* initially assigning remaining rings count to VSIs num queue value */
@@ -571,10 +572,12 @@ void ice_vsi_map_rings_to_vectors(struct ice_vsi *vsi) 


	for (v_id = 0; v_id < q_vectors; v_id++) {

		struct ice_q_vector *q_vector = vsi->q_vectors[v_id];

		int tx_rings_per_v, rx_rings_per_v, q_id, q_base;

		u8 tx_rings_per_v, rx_rings_per_v;

		u16 q_id, q_base;



		/* Tx rings mapping to vector */

		tx_rings_per_v = DIV_ROUND_UP(tx_rings_rem, q_vectors - v_id);

		tx_rings_per_v = (u8)DIV_ROUND_UP(tx_rings_rem,

						  q_vectors - v_id);

		q_vector->num_ring_tx = tx_rings_per_v;

		q_vector->tx.ring = NULL;

		q_vector->tx.itr_idx = ICE_TX_ITR;
@@ -590,7 +593,8 @@ void ice_vsi_map_rings_to_vectors(struct ice_vsi *vsi) 
		tx_rings_rem -= tx_rings_per_v;



		/* Rx rings mapping to vector */

		rx_rings_per_v = DIV_ROUND_UP(rx_rings_rem, q_vectors - v_id);

		rx_rings_per_v = (u8)DIV_ROUND_UP(rx_rings_rem,

						  q_vectors - v_id);

		q_vector->num_ring_rx = rx_rings_per_v;

		q_vector->rx.ring = NULL;

		q_vector->rx.itr_idx = ICE_RX_ITR;

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

+1 −1
Original line number Diff line number Diff line
@@ -1128,7 +1128,7 @@ ice_clean_rq_elem(struct ice_hw *hw, struct ice_ctl_q_info *cq, 
	}

	memcpy(&e->desc, desc, sizeof(e->desc));

	datalen = le16_to_cpu(desc->datalen);

	e->msg_len = min(datalen, e->buf_len);

	e->msg_len = min_t(u16, datalen, e->buf_len);

	if (e->msg_buf && e->msg_len)

		memcpy(e->msg_buf, cq->rq.r.rq_bi[desc_idx].va, e->msg_len);

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

+3 −3
Original line number Diff line number Diff line
@@ -2609,7 +2609,7 @@ ice_set_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring) 
	struct ice_vsi *vsi = np->vsi;

	struct ice_pf *pf = vsi->back;

	int i, timeout = 50, err = 0;

	u32 new_rx_cnt, new_tx_cnt;

	u16 new_rx_cnt, new_tx_cnt;



	if (ring->tx_pending > ICE_MAX_NUM_DESC ||

	    ring->tx_pending < ICE_MIN_NUM_DESC ||
@@ -2661,8 +2661,8 @@ ice_set_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring) 
		if (ice_is_xdp_ena_vsi(vsi))

			for (i = 0; i < vsi->num_xdp_txq; i++)

				vsi->xdp_rings[i]->count = new_tx_cnt;

		vsi->num_tx_desc = new_tx_cnt;

		vsi->num_rx_desc = new_rx_cnt;

		vsi->num_tx_desc = (u16)new_tx_cnt;

		vsi->num_rx_desc = (u16)new_rx_cnt;

		netdev_dbg(netdev, "Link is down, descriptor count change happens when link is brought up\n");

		goto done;

	}

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

+7 −6
Original line number Diff line number Diff line
@@ -1694,7 +1694,7 @@ ice_create_tunnel(struct ice_hw *hw, enum ice_tunnel_type type, u16 port) 
	 */

	ice_set_key((u8 *)&sect_rx->tcam[0].key, sizeof(sect_rx->tcam[0].key),

		    (u8 *)&port, NULL, NULL, NULL,

		    offsetof(struct ice_boost_key_value, hv_dst_port_key),

		    (u16)offsetof(struct ice_boost_key_value, hv_dst_port_key),

		    sizeof(sect_rx->tcam[0].key.key.hv_dst_port_key));



	/* exact copy of entry to Tx section entry */
@@ -2329,9 +2329,10 @@ ice_find_prof_id(struct ice_hw *hw, enum ice_block blk, 
		 struct ice_fv_word *fv, u8 *prof_id)

{

	struct ice_es *es = &hw->blk[blk].es;

	u16 off, i;

	u16 off;

	u8 i;



	for (i = 0; i < es->count; i++) {

	for (i = 0; i < (u8)es->count; i++) {

		off = i * es->fvw;



		if (memcmp(&es->t[off], fv, es->fvw * sizeof(*fv)))
@@ -3461,7 +3462,7 @@ ice_add_prof(struct ice_hw *hw, enum ice_block blk, u64 id, u8 ptypes[], 
	DECLARE_BITMAP(ptgs_used, ICE_XLT1_CNT);

	struct ice_prof_map *prof;

	enum ice_status status;

	u32 byte = 0;

	u8 byte = 0;

	u8 prof_id;



	bitmap_zero(ptgs_used, ICE_XLT1_CNT);
@@ -3496,7 +3497,7 @@ ice_add_prof(struct ice_hw *hw, enum ice_block blk, u64 id, u8 ptypes[], 


	/* build list of ptgs */

	while (bytes && prof->ptg_cnt < ICE_MAX_PTG_PER_PROFILE) {

		u32 bit;

		u8 bit;



		if (!ptypes[byte]) {

			bytes--;
@@ -3530,7 +3531,7 @@ ice_add_prof(struct ice_hw *hw, enum ice_block blk, u64 id, u8 ptypes[], 
				break;



			/* nothing left in byte, then exit */

			m = ~((1 << (bit + 1)) - 1);

			m = ~(u8)((1 << (bit + 1)) - 1);

			if (!(ptypes[byte] & m))

				break;

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE