net: ipa: track allocated transactions with an ID

Transactions for a channel are now managed in an array, with a free
transaction ID indicating which is the next one free.

Add another transaction ID field to track the first element in the
array that has been allocated.  Advance it when a transaction is
committed (because that is when that transaction leaves allocated
state).

Temporarily add warnings that verify that the first allocated
transaction tracked by the ID matches the first element on the
allocated list, both when allocating and committing a transaction.

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

diff --git a/drivers/net/ipa/gsi.h b/drivers/net/ipa/gsi.h
index 4a88aec7e7d92a1b68229e5ab81723bbe23e896c..6bbbda6f27eae277d7bb27dc1795d5c7b43bdb30 100644 (file)
--- a/drivers/net/ipa/gsi.h
+++ b/drivers/net/ipa/gsi.h
@@ -84,6 +84,7 @@ struct gsi_trans_info {
        atomic_t tre_avail;             /* TREs available for allocation */
 
        u16 free_id;                    /* first free trans in array */
+       u16 allocated_id;               /* first allocated transaction */
        struct gsi_trans *trans;        /* transaction array */
        struct gsi_trans **map;         /* TRE -> transaction map */
 

diff --git a/drivers/net/ipa/gsi_trans.c b/drivers/net/ipa/gsi_trans.c
index 9775e50d0423fdf2a7ccbca97b2405deaae99700..d84400e13487fc460830222968a01404f67f7b56 100644 (file)
--- a/drivers/net/ipa/gsi_trans.c
+++ b/drivers/net/ipa/gsi_trans.c
@@ -246,12 +246,26 @@ static void gsi_trans_move_committed(struct gsi_trans *trans)
 {
        struct gsi_channel *channel = &trans->gsi->channel[trans->channel_id];
        struct gsi_trans_info *trans_info = &channel->trans_info;
+       u16 trans_index;
 
        spin_lock_bh(&trans_info->spinlock);
 
        list_move_tail(&trans->links, &trans_info->committed);
 
+       trans = list_first_entry_or_null(&trans_info->alloc,
+                                        struct gsi_trans, links);
+
        spin_unlock_bh(&trans_info->spinlock);
+
+       /* This allocated transaction is now committed */
+       trans_info->allocated_id++;
+
+       if (trans) {
+               trans_index = trans_info->allocated_id % channel->tre_count;
+               WARN_ON(trans != &trans_info->trans[trans_index]);
+       } else {
+               WARN_ON(trans_info->allocated_id != trans_info->free_id);
+       }
 }
 
 /* Move transactions from the committed list to the pending list */
@@ -378,8 +392,14 @@ struct gsi_trans *gsi_channel_trans_alloc(struct gsi *gsi, u32 channel_id,
 
        list_add_tail(&trans->links, &trans_info->alloc);
 
+       trans = list_first_entry(&trans_info->alloc, struct gsi_trans, links);
+
        spin_unlock_bh(&trans_info->spinlock);
 
+       WARN_ON(trans_info->allocated_id == trans_info->free_id);
+       trans_index = trans_info->allocated_id % channel->tre_count;
+       WARN_ON(trans != &trans_info->trans[trans_index]);
+
        return trans;
 }
 
@@ -408,7 +428,10 @@ void gsi_trans_free(struct gsi_trans *trans)
        if (!last)
                return;
 
-       if (trans->used_count)
+       /* Unused transactions are allocated but never committed */
+       if (!trans->used_count)
+               trans_info->allocated_id++;
+       else
                ipa_gsi_trans_release(trans);
 
        /* Releasing the reserved TREs implicitly frees the sgl[] and
@@ -744,7 +767,8 @@ int gsi_channel_trans_init(struct gsi *gsi, u32 channel_id)
                                    GFP_KERNEL);
        if (!trans_info->trans)
                return -ENOMEM;
-       trans_info->free_id = 0;        /* modulo channel->tre_count */
+       trans_info->free_id = 0;        /* all modulo channel->tre_count */
+       trans_info->allocated_id = 0;
 
        /* A completion event contains a pointer to the TRE that caused
         * the event (which will be the last one used by the transaction).