]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net: ipa: call gsi_evt_ring_rx_update() unconditionally
authorAlex Elder <elder@linaro.org>
Wed, 15 Jun 2022 16:59:28 +0000 (11:59 -0500)
committerJakub Kicinski <kuba@kernel.org>
Fri, 17 Jun 2022 03:44:04 +0000 (20:44 -0700)
When an RX transaction completes, we update the trans->len field to
contain the actual number of bytes received.  This is done in a loop
in gsi_evt_ring_rx_update().

Change that function so it checks the data transfer direction
recorded in the transaction, and only updates trans->len for RX
transfers.

Then call it unconditionally.  This means events for TX endpoints
will run through the loop without otherwise doing anything, but
this will change shortly.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ipa/gsi.c

index 2c531ba1af2eb6691aca6d1fe87fc7df9c2529d9..d08f3e73d51fc3053c7c4122932712d72b1bc4cb 100644 (file)
@@ -1392,7 +1392,8 @@ static void gsi_evt_ring_rx_update(struct gsi *gsi, u32 evt_ring_id, u32 index)
                if (!trans)
                        return;
 
-               trans->len = __le16_to_cpu(event->len);
+               if (trans->direction == DMA_FROM_DEVICE)
+                       trans->len = __le16_to_cpu(event->len);
 
                /* Move on to the next event and transaction */
                if (--event_avail)
@@ -1500,8 +1501,7 @@ static struct gsi_trans *gsi_channel_update(struct gsi_channel *channel)
         */
        if (channel->toward_ipa)
                gsi_trans_tx_completed(trans);
-       else
-               gsi_evt_ring_rx_update(gsi, evt_ring_id, index);
+       gsi_evt_ring_rx_update(gsi, evt_ring_id, index);
 
        gsi_trans_move_complete(trans);