Commit 5757cc7c authored by Tony Nguyen's avatar Tony Nguyen Committed by Jeff Kirsher
Browse files

ice: Rename build_ctob to ice_build_ctob 



To make the function easier to identify as being part of the ice driver,
prepend ice to the function name.

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 c522d1f6

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

+6 −5
Original line number Original line Diff line number Diff line
@@ -1680,7 +1680,8 @@ ice_tx_map(struct ice_ring *tx_ring, struct ice_tx_buf *first, 
		 */

		 */

		while (unlikely(size > ICE_MAX_DATA_PER_TXD)) {

		while (unlikely(size > ICE_MAX_DATA_PER_TXD)) {

			tx_desc->cmd_type_offset_bsz =

			tx_desc->cmd_type_offset_bsz =

				build_ctob(td_cmd, td_offset, max_data, td_tag);

				ice_build_ctob(td_cmd, td_offset, max_data,

					       td_tag);





			tx_desc++;

			tx_desc++;

			i++;

			i++;
@@ -1700,7 +1701,7 @@ ice_tx_map(struct ice_ring *tx_ring, struct ice_tx_buf *first, 
		if (likely(!data_len))

		if (likely(!data_len))

			break;

			break;





		tx_desc->cmd_type_offset_bsz = build_ctob(td_cmd, td_offset,

		tx_desc->cmd_type_offset_bsz = ice_build_ctob(td_cmd, td_offset,

							      size, td_tag);

							      size, td_tag);





		tx_desc++;

		tx_desc++;
@@ -1732,8 +1733,8 @@ ice_tx_map(struct ice_ring *tx_ring, struct ice_tx_buf *first, 




	/* write last descriptor with RS and EOP bits */

	/* write last descriptor with RS and EOP bits */

	td_cmd |= (u64)ICE_TXD_LAST_DESC_CMD;

	td_cmd |= (u64)ICE_TXD_LAST_DESC_CMD;

	tx_desc->cmd_type_offset_bsz = build_ctob(td_cmd, td_offset, size,

	tx_desc->cmd_type_offset_bsz =

						  td_tag);

			ice_build_ctob(td_cmd, td_offset, size, td_tag);





	/* Force memory writes to complete before letting h/w know there

	/* Force memory writes to complete before letting h/w know there

	 * are new descriptors to fetch.

	 * are new descriptors to fetch.

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -232,7 +232,7 @@ int ice_xmit_xdp_ring(void *data, u16 size, struct ice_ring *xdp_ring) 




	tx_desc = ICE_TX_DESC(xdp_ring, i);

	tx_desc = ICE_TX_DESC(xdp_ring, i);

	tx_desc->buf_addr = cpu_to_le64(dma);

	tx_desc->buf_addr = cpu_to_le64(dma);

	tx_desc->cmd_type_offset_bsz = build_ctob(ICE_TXD_LAST_DESC_CMD, 0,

	tx_desc->cmd_type_offset_bsz = ice_build_ctob(ICE_TXD_LAST_DESC_CMD, 0,

						      size, 0);

						      size, 0);





	/* Make certain all of the status bits have been updated

	/* Make certain all of the status bits have been updated

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -22,7 +22,7 @@ ice_test_staterr(union ice_32b_rx_flex_desc *rx_desc, const u16 stat_err_bits) 
}

}





static inline __le64

static inline __le64

build_ctob(u64 td_cmd, u64 td_offset, unsigned int size, u64 td_tag)

ice_build_ctob(u64 td_cmd, u64 td_offset, unsigned int size, u64 td_tag)

{

{

	return cpu_to_le64(ICE_TX_DESC_DTYPE_DATA |

	return cpu_to_le64(ICE_TX_DESC_DTYPE_DATA |

			   (td_cmd    << ICE_TXD_QW1_CMD_S) |

			   (td_cmd    << ICE_TXD_QW1_CMD_S) |

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -988,8 +988,8 @@ static bool ice_xmit_zc(struct ice_ring *xdp_ring, int budget) 




		tx_desc = ICE_TX_DESC(xdp_ring, xdp_ring->next_to_use);

		tx_desc = ICE_TX_DESC(xdp_ring, xdp_ring->next_to_use);

		tx_desc->buf_addr = cpu_to_le64(dma);

		tx_desc->buf_addr = cpu_to_le64(dma);

		tx_desc->cmd_type_offset_bsz = build_ctob(ICE_TXD_LAST_DESC_CMD,

		tx_desc->cmd_type_offset_bsz =

							  0, desc.len, 0);

			ice_build_ctob(ICE_TXD_LAST_DESC_CMD, 0, desc.len, 0);





		xdp_ring->next_to_use++;

		xdp_ring->next_to_use++;

		if (xdp_ring->next_to_use == xdp_ring->count)

		if (xdp_ring->next_to_use == xdp_ring->count)

CRA Git | Maintained and supported by SUSTech CRA and CCSE