Commit 4e0f28e9 authored by Alex Elder's avatar Alex Elder Committed by David S. Miller
Browse files

net: ipa: introduce gsi_trans_tx_committed() 



Create a new function that encapsulates recording information needed
for TX channel statistics when a transaction is committed.

Record the accumulated length in the transaction before the call
(for both RX and TX), so it can be used when updating TX statistics.

Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3eeabea6

drivers/net/ipa/gsi.c

+11 −0
Original line number Diff line number Diff line
@@ -991,6 +991,17 @@ void gsi_resume(struct gsi *gsi) 
	enable_irq(gsi->irq);

}



void gsi_trans_tx_committed(struct gsi_trans *trans)

{

	struct gsi_channel *channel = &trans->gsi->channel[trans->channel_id];



	trans->trans_count = channel->trans_count;

	trans->byte_count = channel->byte_count;



	channel->trans_count++;

	channel->byte_count += trans->len;

}



void gsi_trans_tx_queued(struct gsi_trans *trans)

{

	u32 channel_id = trans->channel_id;

drivers/net/ipa/gsi_private.h

+9 −0
Original line number Diff line number Diff line
@@ -104,6 +104,15 @@ void gsi_channel_doorbell(struct gsi_channel *channel); 
 */

void *gsi_ring_virt(struct gsi_ring *ring, u32 index);



/**

 * gsi_trans_tx_committed() - Record bytes committed for transmit

 * @trans:	TX endpoint transaction being committed

 *

 * Report that a TX transaction has been committed.  It updates some

 * statistics used to manage transmit rates.

 */

void gsi_trans_tx_committed(struct gsi_trans *trans);



/**

 * gsi_trans_tx_queued() - Report a queued TX channel transaction

 * @trans:	Transaction being passed to hardware

drivers/net/ipa/gsi_trans.c

+3 −8
Original line number Diff line number Diff line
@@ -586,14 +586,9 @@ static void __gsi_trans_commit(struct gsi_trans *trans, bool ring_db) 
	}

	tre_ring->index += trans->used_count;



	if (channel->toward_ipa) {

		/* We record TX bytes when they are sent */

	trans->len = byte_count;

		trans->trans_count = channel->trans_count;

		trans->byte_count = channel->byte_count;

		channel->trans_count++;

		channel->byte_count += byte_count;

	}

	if (channel->toward_ipa)

		gsi_trans_tx_committed(trans);



	/* Associate the last TRE with the transaction */

	gsi_channel_trans_map(channel, tre_ring->index - 1, trans);

drivers/net/ipa/gsi_trans.h

+4 −3
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ struct gsi_trans_pool; 
 * @cancelled:	If set by the core code, transaction was cancelled

 * @rsvd_count:	Number of TREs reserved for this transaction

 * @used_count:	Number of TREs *used* (could be less than rsvd_count)

 * @len:	Total # of transfer bytes represented in sgl[] (set by core)

 * @len:	Number of bytes sent or received by the transaction

 * @data:	Preserved but not touched by the core transaction code

 * @cmd_opcode:	Array of command opcodes (command channel only)

 * @sgl:	An array of scatter/gather entries managed by core code
@@ -45,8 +45,9 @@ struct gsi_trans_pool; 
 * @byte_count:	TX channel byte count recorded when transaction committed

 * @trans_count: Channel transaction count when committed (for BQL accounting)

 *

 * The size used for some fields in this structure were chosen to ensure

 * the full structure size is no larger than 128 bytes.

 * The @len field is set when the transaction is committed.  For RX

 * transactions it is updated later to reflect the actual number of bytes

 * received.

 */

struct gsi_trans {

	struct list_head links;		/* gsi_channel lists */