Commit 7cfe9a55 authored by Arthur Kiyanovski's avatar Arthur Kiyanovski Committed by David S. Miller
Browse files

net: ena: rename ena_com_free_desc to make API more uniform 



Rename ena_com_free_desc to ena_com_free_q_entries to match
the LLQ mode.

In non-LLQ mode, an entry in an IO ring corresponds to a
a descriptor. In LLQ mode an entry may correspond to several
descriptors (per LLQ definition).

Signed-off-by: default avatarIgor Chauskin <igorch@amazon.com>
Signed-off-by: default avatarArthur Kiyanovski <akiyano@amazon.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 68f236df

drivers/net/ethernet/amazon/ena/ena_eth_com.h

+3 −3
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static inline void ena_com_unmask_intr(struct ena_com_io_cq *io_cq, 
	writel(intr_reg->intr_control, io_cq->unmask_reg);

}



static inline int ena_com_free_desc(struct ena_com_io_sq *io_sq)

static inline int ena_com_free_q_entries(struct ena_com_io_sq *io_sq)

{

	u16 tail, next_to_comp, cnt;
@@ -114,7 +114,7 @@ static inline bool ena_com_sq_have_enough_space(struct ena_com_io_sq *io_sq, 
	int temp;



	if (io_sq->mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_HOST)

		return ena_com_free_desc(io_sq) >= required_buffers;

		return ena_com_free_q_entries(io_sq) >= required_buffers;



	/* This calculation doesn't need to be 100% accurate. So to reduce

	 * the calculation overhead just Subtract 2 lines from the free descs
@@ -123,7 +123,7 @@ static inline bool ena_com_sq_have_enough_space(struct ena_com_io_sq *io_sq, 
	 */

	temp = required_buffers / io_sq->llq_info.descs_per_entry + 2;



	return ena_com_free_desc(io_sq) > temp;

	return ena_com_free_q_entries(io_sq) > temp;

}



static inline bool ena_com_meta_desc_changed(struct ena_com_io_sq *io_sq,

drivers/net/ethernet/amazon/ena/ena_netdev.c

+2 −3
Original line number Diff line number Diff line
@@ -1691,7 +1691,7 @@ static int ena_clean_rx_irq(struct ena_ring *rx_ring, struct napi_struct *napi, 


	rx_ring->next_to_clean = next_to_clean;



	refill_required = ena_com_free_desc(rx_ring->ena_com_io_sq);

	refill_required = ena_com_free_q_entries(rx_ring->ena_com_io_sq);

	refill_threshold =

		min_t(int, rx_ring->ring_size / ENA_RX_REFILL_THRESH_DIVIDER,

		      ENA_RX_REFILL_THRESH_PACKET);
@@ -3694,8 +3694,7 @@ static void check_for_empty_rx_ring(struct ena_adapter *adapter) 
	for (i = 0; i < adapter->num_io_queues; i++) {

		rx_ring = &adapter->rx_ring[i];



		refill_required =

			ena_com_free_desc(rx_ring->ena_com_io_sq);

		refill_required = ena_com_free_q_entries(rx_ring->ena_com_io_sq);

		if (unlikely(refill_required == (rx_ring->ring_size - 1))) {

			rx_ring->empty_rx_queue++;

CRA Git | Maintained and supported by SUSTech CRA and CCSE