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: Alex Elder <elder@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ipa/gsi.c b/drivers/net/ipa/gsi.c
index 5b446d2a07c8a88d652ab650347903f07b03810b..1091ac23567d588637d30ec3df77e6abb5e31b4e 100644 (file)
--- a/drivers/net/ipa/gsi.c
+++ b/drivers/net/ipa/gsi.c
@@ -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;

diff --git a/drivers/net/ipa/gsi_private.h b/drivers/net/ipa/gsi_private.h
index 56450a1899074db81ada7703bb92fa7b53d20f5e..74cbc287fc7158388e3e0047a908ab6b47bf0f1f 100644 (file)
--- a/drivers/net/ipa/gsi_private.h
+++ b/drivers/net/ipa/gsi_private.h
@@ -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

diff --git a/drivers/net/ipa/gsi_trans.c b/drivers/net/ipa/gsi_trans.c
index 986857eb39296d1b5d8cfd1817e32be521d4964e..a110be72f70b670ee7c2bc9b5384a2ced9f4f308 100644 (file)
--- a/drivers/net/ipa/gsi_trans.c
+++ b/drivers/net/ipa/gsi_trans.c
@@ -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;
-       }
+       trans->len = 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);

diff --git a/drivers/net/ipa/gsi_trans.h b/drivers/net/ipa/gsi_trans.h
index b5f80250ca006c1619a1275894f2b03d4afde0b8..7084507830c21d18375c03d60dadc15fd9b9b557 100644 (file)
--- a/drivers/net/ipa/gsi_trans.h
+++ b/drivers/net/ipa/gsi_trans.h
@@ -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 */