net: sparx5: use FDMA library for adding DCB's in the tx path

Use the fdma_dcb_add() function to add DCB's in the tx path. This gets
rid of the open-coding of nextptr and dataptr handling and leaves it to
the library.

Also, make sure the fdma indexes are advanced using: fdma_dcb_advance(),
so that the correct nextptr and dataptr offsets are retrieved.

Signed-off-by: Daniel Machon <daniel.machon@microchip.com>
Reviewed-by: Steen Hegelund <Steen.Hegelund@microchip.com>
Reviewed-by: Jens Emil Schulz Østergaard <jensemil.schulzostergaard@microchip.com>
Reviewed-by: Horatiu Vultur <horatiu.vultur@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_fdma.c b/drivers/net/ethernet/microchip/sparx5/sparx5_fdma.c
index 8f721f7671ce744006a5f55dd2b6f78ee820b1e0..4fc52140752a1d6141c077f3f7039d8ddc05cefb 100644 (file)
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_fdma.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_fdma.c
@@ -231,48 +231,27 @@ static int sparx5_fdma_napi_callback(struct napi_struct *napi, int weight)
        return counter;
 }
 
-static struct fdma_dcb *sparx5_fdma_next_dcb(struct sparx5_tx *tx,
-                                            struct fdma_dcb *dcb)
-{
-       struct fdma_dcb *next_dcb;
-       struct fdma *fdma = &tx->fdma;
-
-       next_dcb = dcb;
-       next_dcb++;
-       /* Handle wrap-around */
-       if ((unsigned long)next_dcb >=
-           ((unsigned long)fdma->dcbs + fdma->n_dcbs * sizeof(*dcb)))
-               next_dcb = fdma->dcbs;
-       return next_dcb;
-}
-
 int sparx5_fdma_xmit(struct sparx5 *sparx5, u32 *ifh, struct sk_buff *skb)
 {
        struct sparx5_tx *tx = &sparx5->tx;
        struct fdma *fdma = &tx->fdma;
        static bool first_time = true;
-       struct fdma_dcb *next_dcb_hw;
-       struct fdma_db *db_hw;
        struct sparx5_db *db;
 
-       next_dcb_hw = sparx5_fdma_next_dcb(tx, fdma->last_dcb);
-       db_hw = &next_dcb_hw->db[0];
-       if (!(db_hw->status & FDMA_DCB_STATUS_DONE))
+       fdma_dcb_advance(fdma);
+       if (!fdma_db_is_done(fdma_db_get(fdma, fdma->dcb_index, 0)))
                return -EINVAL;
        db = list_first_entry(&tx->db_list, struct sparx5_db, list);
-       list_move_tail(&db->list, &tx->db_list);
-       next_dcb_hw->nextptr = FDMA_DCB_INVALID_DATA;
-       fdma->last_dcb->nextptr = fdma->dma +
-               ((unsigned long)next_dcb_hw -
-               (unsigned long)fdma->dcbs);
-       fdma->last_dcb = next_dcb_hw;
        memset(db->cpu_addr, 0, FDMA_XTR_BUFFER_SIZE);
        memcpy(db->cpu_addr, ifh, IFH_LEN * 4);
        memcpy(db->cpu_addr + IFH_LEN * 4, skb->data, skb->len);
-       db_hw->status = FDMA_DCB_STATUS_SOF |
-                       FDMA_DCB_STATUS_EOF |
-                       FDMA_DCB_STATUS_BLOCKO(0) |
-                       FDMA_DCB_STATUS_BLOCKL(skb->len + IFH_LEN * 4 + 4);
+
+       fdma_dcb_add(fdma, fdma->dcb_index, 0,
+                    FDMA_DCB_STATUS_SOF |
+                    FDMA_DCB_STATUS_EOF |
+                    FDMA_DCB_STATUS_BLOCKO(0) |
+                    FDMA_DCB_STATUS_BLOCKL(skb->len + IFH_LEN * 4 + 4));
+
        if (first_time) {
                sparx5_fdma_tx_activate(sparx5, tx);
                first_time = false;