Commit c5bddecb authored by Alex Elder's avatar Alex Elder Committed by David S. Miller

net: ipa: rework gsi_channel_tx_update()

Rename gsi_channel_tx_update() to be gsi_trans_tx_completed(), and
pass it just the transaction pointer, deriving the channel from the
transaction.  Update the comments above the function to provide a
more concise description of how statistics for TX endpoints are
maintained and used.
Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dbad2fa7
...@@ -1021,40 +1021,36 @@ void gsi_trans_tx_queued(struct gsi_trans *trans) ...@@ -1021,40 +1021,36 @@ void gsi_trans_tx_queued(struct gsi_trans *trans)
} }
/** /**
* gsi_channel_tx_update() - Report completed TX transfers * gsi_trans_tx_completed() - Report completed TX transactions
* @channel: Channel that has completed transmitting packets * @trans: TX channel transaction that has completed
* @trans: Last transation known to be complete
* *
* Compute the number of transactions and bytes that have been transferred * Report that a transaction on a TX channel has completed. At the time a
* over a TX channel since the given transaction was committed. Report this * transaction is committed, we record *in the transaction* its channel's
* information to the network stack. * committed transaction and byte counts. Transactions are completed in
* order, and the difference between the channel's byte/transaction count
* when the transaction was committed and when it completes tells us
* exactly how much data has been transferred while the transaction was
* pending.
* *
* At the time a transaction is committed, we record its channel's * We report this information to the network stack, which uses it to manage
* committed transaction and byte counts *in the transaction*. * the rate at which data is sent to hardware.
* Completions are signaled by the hardware with an interrupt, and
* we can determine the latest completed transaction at that time.
*
* The difference between the byte/transaction count recorded in
* the transaction and the count last time we recorded a completion
* tells us exactly how much data has been transferred between
* completions.
*
* Calling this each time we learn of a newly-completed transaction
* allows us to provide accurate information to the network stack
* about how much work has been completed by the hardware at a given
* point in time.
*/ */
static void static void gsi_trans_tx_completed(struct gsi_trans *trans)
gsi_channel_tx_update(struct gsi_channel *channel, struct gsi_trans *trans)
{ {
u64 trans_count = trans->trans_count - channel->compl_trans_count; u32 channel_id = trans->channel_id;
u64 byte_count = trans->byte_count - channel->compl_byte_count; struct gsi *gsi = trans->gsi;
struct gsi_channel *channel;
u32 trans_count;
u32 byte_count;
channel = &gsi->channel[channel_id];
trans_count = trans->trans_count - channel->compl_trans_count;
byte_count = trans->byte_count - channel->compl_byte_count;
channel->compl_trans_count += trans_count; channel->compl_trans_count += trans_count;
channel->compl_byte_count += byte_count; channel->compl_byte_count += byte_count;
ipa_gsi_channel_tx_completed(channel->gsi, gsi_channel_id(channel), ipa_gsi_channel_tx_completed(gsi, channel_id, trans_count, byte_count);
trans_count, byte_count);
} }
/* Channel control interrupt handler */ /* Channel control interrupt handler */
...@@ -1504,7 +1500,7 @@ static struct gsi_trans *gsi_channel_update(struct gsi_channel *channel) ...@@ -1504,7 +1500,7 @@ static struct gsi_trans *gsi_channel_update(struct gsi_channel *channel)
* up the network stack. * up the network stack.
*/ */
if (channel->toward_ipa) if (channel->toward_ipa)
gsi_channel_tx_update(channel, trans); gsi_trans_tx_completed(trans);
else else
gsi_evt_ring_rx_update(evt_ring, index); gsi_evt_ring_rx_update(evt_ring, index);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment