net: stmmac: add helper to get hardware transmit descriptor

Provide a helper to get the hardware transmit descriptor that takes
account of whether extended format and TBS are being used, returning
the base struct dma_desc pointer. This avoids multiple instances where
these tests are open coded.

We need to update dwmac4_display_ring() to cope the passed head
pointer always pointing at the struct dma_desc by using
dma_desc_to_edesc() to convert it to struct dma_edesc. This is the
only stmmac_display_ring() implementation that this affects.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1w1LWe-0000000DGSj-0KtE@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/descs.h b/drivers/net/ethernet/stmicro/stmmac/descs.h
index e62e2ebcf2733e5db7903dda5422b56dd54ab938..846007cc245f0fd2c38f845330c42095bd3ab9d1 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/descs.h
+++ b/drivers/net/ethernet/stmicro/stmmac/descs.h
@@ -173,6 +173,8 @@ struct dma_edesc {
        struct dma_desc basic;
 };
 
+#define dma_desc_to_edesc(x) container_of(x, struct dma_edesc, basic)
+
 /* Transmit checksum insertion control */
 #define        TX_CIC_FULL     3       /* Include IP header and pseudoheader */
 

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
index 1bbf02504dad26b9abda5bf39909a26197ae5a1d..d5c003f3fbbc7f764c2c87290e2a4af20bec3121 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
@@ -427,7 +427,7 @@ static void dwmac4_display_ring(void *head, unsigned int size, bool rx,
                        extp++;
                }
        } else if (desc_size == sizeof(struct dma_edesc)) {
-               struct dma_edesc *ep = (struct dma_edesc *)head;
+               struct dma_edesc *ep = dma_desc_to_edesc(head);
 
                for (i = 0; i < size; i++) {
                        dma_addr = dma_rx_phy + i * sizeof(*ep);

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index dacca3189a63ccd5d627b311e9b4af817d52bc5f..419ac4cac94e0cdf0e162733d3661739846fe7ff 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -362,6 +362,18 @@ static inline u32 stmmac_tx_avail(struct stmmac_priv *priv, u32 queue)
                          priv->dma_conf.dma_tx_size);
 }
 
+static struct dma_desc *stmmac_get_tx_desc(struct stmmac_priv *priv,
+                                          struct stmmac_tx_queue *tx_q,
+                                          unsigned int index)
+{
+       if (priv->extend_desc)
+               return &tx_q->dma_etx[index].basic;
+       else if (tx_q->tbs & STMMAC_TBS_AVAIL)
+               return &tx_q->dma_entx[index].basic;
+       else
+               return &tx_q->dma_tx[index];
+}
+
 static size_t stmmac_get_rx_desc_size(struct stmmac_priv *priv)
 {
        if (priv->extend_desc)
@@ -1489,16 +1501,14 @@ static void stmmac_display_tx_rings(struct stmmac_priv *priv,
 
                pr_info("\tTX Queue %d rings\n", queue);
 
-               if (priv->extend_desc) {
-                       head_tx = (void *)tx_q->dma_etx;
+               if (priv->extend_desc)
                        desc_size = sizeof(struct dma_extended_desc);
-               } else if (tx_q->tbs & STMMAC_TBS_AVAIL) {
-                       head_tx = (void *)tx_q->dma_entx;
+               else if (tx_q->tbs & STMMAC_TBS_AVAIL)
                        desc_size = sizeof(struct dma_edesc);
-               } else {
-                       head_tx = (void *)tx_q->dma_tx;
+               else
                        desc_size = sizeof(struct dma_desc);
-               }
+
+               head_tx = stmmac_get_tx_desc(priv, tx_q, 0);
 
                stmmac_display_ring(priv, head_tx, dma_conf->dma_tx_size, false,
                                    tx_q->dma_tx_phy, desc_size);
@@ -1587,13 +1597,7 @@ static void stmmac_clear_tx_descriptors(struct stmmac_priv *priv,
                int last = (i == (dma_conf->dma_tx_size - 1));
                struct dma_desc *p;
 
-               if (priv->extend_desc)
-                       p = &tx_q->dma_etx[i].basic;
-               else if (tx_q->tbs & STMMAC_TBS_AVAIL)
-                       p = &tx_q->dma_entx[i].basic;
-               else
-                       p = &tx_q->dma_tx[i];
-
+               p = stmmac_get_tx_desc(priv, tx_q, i);
                stmmac_init_tx_desc(priv, p, priv->mode, last);
        }
 }
@@ -2021,13 +2025,7 @@ static int __init_dma_tx_desc_rings(struct stmmac_priv *priv,
        for (i = 0; i < dma_conf->dma_tx_size; i++) {
                struct dma_desc *p;
 
-               if (priv->extend_desc)
-                       p = &((tx_q->dma_etx + i)->basic);
-               else if (tx_q->tbs & STMMAC_TBS_AVAIL)
-                       p = &((tx_q->dma_entx + i)->basic);
-               else
-                       p = tx_q->dma_tx + i;
-
+               p = stmmac_get_tx_desc(priv, tx_q, i);
                stmmac_clear_desc(priv, p);
                stmmac_set_tx_skb_dma_entry(tx_q, i, 0, 0, false);
 
@@ -2730,13 +2728,7 @@ static bool stmmac_xdp_xmit_zc(struct stmmac_priv *priv, u32 queue, u32 budget)
                        continue;
                }
 
-               if (likely(priv->extend_desc))
-                       tx_desc = (struct dma_desc *)(tx_q->dma_etx + entry);
-               else if (tx_q->tbs & STMMAC_TBS_AVAIL)
-                       tx_desc = &tx_q->dma_entx[entry].basic;
-               else
-                       tx_desc = tx_q->dma_tx + entry;
-
+               tx_desc = stmmac_get_tx_desc(priv, tx_q, entry);
                dma_addr = xsk_buff_raw_get_dma(pool, xdp_desc.addr);
                meta = xsk_buff_get_metadata(pool, xdp_desc.addr);
                xsk_buff_raw_dma_sync_for_device(pool, dma_addr, xdp_desc.len);
@@ -2863,13 +2855,7 @@ static int stmmac_tx_clean(struct stmmac_priv *priv, int budget, u32 queue,
                        skb = NULL;
                }
 
-               if (priv->extend_desc)
-                       p = (struct dma_desc *)(tx_q->dma_etx + entry);
-               else if (tx_q->tbs & STMMAC_TBS_AVAIL)
-                       p = &tx_q->dma_entx[entry].basic;
-               else
-                       p = tx_q->dma_tx + entry;
-
+               p = stmmac_get_tx_desc(priv, tx_q, entry);
                status = stmmac_tx_status(priv, &priv->xstats, p, priv->ioaddr);
                /* Check if the descriptor is owned by the DMA */
                if (unlikely(status & tx_dma_own))
@@ -4776,13 +4762,7 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)
                csum_insertion = !csum_insertion;
        }
 
-       if (likely(priv->extend_desc))
-               desc = (struct dma_desc *)(tx_q->dma_etx + entry);
-       else if (tx_q->tbs & STMMAC_TBS_AVAIL)
-               desc = &tx_q->dma_entx[entry].basic;
-       else
-               desc = tx_q->dma_tx + entry;
-
+       desc = stmmac_get_tx_desc(priv, tx_q, entry);
        first = desc;
 
        if (has_vlan)
@@ -4807,12 +4787,7 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)
                entry = STMMAC_GET_ENTRY(entry, priv->dma_conf.dma_tx_size);
                WARN_ON(tx_q->tx_skbuff[entry]);
 
-               if (likely(priv->extend_desc))
-                       desc = (struct dma_desc *)(tx_q->dma_etx + entry);
-               else if (tx_q->tbs & STMMAC_TBS_AVAIL)
-                       desc = &tx_q->dma_entx[entry].basic;
-               else
-                       desc = tx_q->dma_tx + entry;
+               desc = stmmac_get_tx_desc(priv, tx_q, entry);
 
                des = skb_frag_dma_map(priv->device, frag, 0, len,
                                       DMA_TO_DEVICE);
@@ -4853,13 +4828,7 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)
                set_ic = false;
 
        if (set_ic) {
-               if (likely(priv->extend_desc))
-                       desc = &tx_q->dma_etx[entry].basic;
-               else if (tx_q->tbs & STMMAC_TBS_AVAIL)
-                       desc = &tx_q->dma_entx[entry].basic;
-               else
-                       desc = &tx_q->dma_tx[entry];
-
+               desc = stmmac_get_tx_desc(priv, tx_q, entry);
                tx_q->tx_count_frames = 0;
                stmmac_set_tx_ic(priv, desc);
        }
@@ -5127,13 +5096,7 @@ static int stmmac_xdp_xmit_xdpf(struct stmmac_priv *priv, int queue,
                return STMMAC_XDP_CONSUMED;
        }
 
-       if (likely(priv->extend_desc))
-               tx_desc = (struct dma_desc *)(tx_q->dma_etx + entry);
-       else if (tx_q->tbs & STMMAC_TBS_AVAIL)
-               tx_desc = &tx_q->dma_entx[entry].basic;
-       else
-               tx_desc = tx_q->dma_tx + entry;
-
+       tx_desc = stmmac_get_tx_desc(priv, tx_q, entry);
        if (dma_map) {
                dma_addr = dma_map_single(priv->device, xdpf->data,
                                          xdpf->len, DMA_TO_DEVICE);