Commit 044588b9 authored by Edward Cree's avatar Edward Cree Committed by David S. Miller
Browse files

sfc: define inner/outer csum offload TXQ types 



Nothing yet creates inner csum TXQs; just change all references to
 EFX_TXQ_TYPE_OFFLOAD to the new EFX_TXQ_TYPE_OUTER_CSUM.

Signed-off-by: default avatarEdward Cree <ecree@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 12804793

drivers/net/ethernet/sfc/ef10.c

+2 −2
Original line number Diff line number Diff line
@@ -2146,7 +2146,7 @@ static int efx_ef10_irq_test_generate(struct efx_nic *efx) 


static int efx_ef10_tx_probe(struct efx_tx_queue *tx_queue)

{

	tx_queue->type = tx_queue->label & EFX_TXQ_TYPE_OFFLOAD;

	tx_queue->type = tx_queue->label & EFX_TXQ_TYPE_OUTER_CSUM;

	return efx_nic_alloc_buffer(tx_queue->efx, &tx_queue->txd.buf,

				    (tx_queue->ptr_mask + 1) *

				    sizeof(efx_qword_t),
@@ -2255,7 +2255,7 @@ static u32 efx_ef10_tso_versions(struct efx_nic *efx) 


static void efx_ef10_tx_init(struct efx_tx_queue *tx_queue)

{

	bool csum_offload = tx_queue->type & EFX_TXQ_TYPE_OFFLOAD;

	bool csum_offload = tx_queue->type & EFX_TXQ_TYPE_OUTER_CSUM;

	struct efx_channel *channel = tx_queue->channel;

	struct efx_nic *efx = tx_queue->efx;

	struct efx_ef10_nic_data *nic_data;

drivers/net/ethernet/sfc/farch.c

+2 −2
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ int efx_farch_tx_probe(struct efx_tx_queue *tx_queue) 
	struct efx_nic *efx = tx_queue->efx;

	unsigned entries;



	tx_queue->type = ((tx_queue->label & 1) ? EFX_TXQ_TYPE_OFFLOAD : 0) |

	tx_queue->type = ((tx_queue->label & 1) ? EFX_TXQ_TYPE_OUTER_CSUM : 0) |

			 ((tx_queue->label & 2) ? EFX_TXQ_TYPE_HIGHPRI : 0);

	entries = tx_queue->ptr_mask + 1;

	return efx_alloc_special_buffer(efx, &tx_queue->txd,
@@ -381,7 +381,7 @@ int efx_farch_tx_probe(struct efx_tx_queue *tx_queue) 


void efx_farch_tx_init(struct efx_tx_queue *tx_queue)

{

	int csum = tx_queue->type & EFX_TXQ_TYPE_OFFLOAD;

	int csum = tx_queue->type & EFX_TXQ_TYPE_OUTER_CSUM;

	struct efx_nic *efx = tx_queue->efx;

	efx_oword_t reg;

drivers/net/ethernet/sfc/mcdi_functions.c

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ int efx_mcdi_tx_init(struct efx_tx_queue *tx_queue, bool tso_v2) 
{

	MCDI_DECLARE_BUF(inbuf, MC_CMD_INIT_TXQ_IN_LEN(EFX_MAX_DMAQ_SIZE * 8 /

						       EFX_BUF_SIZE));

	bool csum_offload = tx_queue->type & EFX_TXQ_TYPE_OFFLOAD;

	bool csum_offload = tx_queue->type & EFX_TXQ_TYPE_OUTER_CSUM;

	size_t entries = tx_queue->txd.buf.len / EFX_BUF_SIZE;

	struct efx_channel *channel = tx_queue->channel;

	struct efx_nic *efx = tx_queue->efx;

drivers/net/ethernet/sfc/net_driver.h

+5 −3
Original line number Diff line number Diff line
@@ -63,9 +63,11 @@ 
 * queues. */

#define EFX_MAX_TX_TC		2

#define EFX_MAX_CORE_TX_QUEUES	(EFX_MAX_TX_TC * EFX_MAX_CHANNELS)

#define EFX_TXQ_TYPE_OFFLOAD	1	/* flag */

#define EFX_TXQ_TYPE_HIGHPRI	2	/* flag */

#define EFX_TXQ_TYPES		4

#define EFX_TXQ_TYPE_OUTER_CSUM	1	/* Outer checksum offload */

#define EFX_TXQ_TYPE_INNER_CSUM	2	/* Inner checksum offload */

#define EFX_TXQ_TYPE_HIGHPRI	4	/* High-priority (for TC) */

#define EFX_TXQ_TYPES		8

/* HIGHPRI is Siena-only, and INNER_CSUM is EF10, so no need for both */

#define EFX_MAX_TXQ_PER_CHANNEL	4

#define EFX_MAX_TX_QUEUES	(EFX_MAX_TXQ_PER_CHANNEL * EFX_MAX_CHANNELS)

drivers/net/ethernet/sfc/ptp.c

+1 −1
Original line number Diff line number Diff line
@@ -1081,9 +1081,9 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings) 
/* Transmit a PTP packet via the dedicated hardware timestamped queue. */

static void efx_ptp_xmit_skb_queue(struct efx_nic *efx, struct sk_buff *skb)

{

	u8 type = skb->ip_summed == CHECKSUM_PARTIAL ? EFX_TXQ_TYPE_OUTER_CSUM : 0;

	struct efx_ptp_data *ptp_data = efx->ptp_data;

	struct efx_tx_queue *tx_queue;

	u8 type = skb->ip_summed == CHECKSUM_PARTIAL ? EFX_TXQ_TYPE_OFFLOAD : 0;



	tx_queue = efx_channel_get_tx_queue(ptp_data->channel, type);

	if (tx_queue && tx_queue->timestamping) {