net: stmmac: rename STMMAC_GET_ENTRY() -> STMMAC_NEXT_ENTRY()

[ Upstream commit 6b4286e0550814cdc4b897f881ec1fa8b0313227 ]

STMMAC_GET_ENTRY() doesn't describe what this macro is doing - it is
incrementing the provided index for the circular array of descriptors.
Replace "GET" with "NEXT" as this better describes the action here.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1w2vba-0000000DbWo-1oL5@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Stable-dep-of: 0bb05e6adfa9 ("net: stmmac: Prevent NULL deref when RX memory exhausted")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/chain_mode.c b/drivers/net/ethernet/stmicro/stmmac/chain_mode.c
index 37f9417c7c0e04f4342393e142d5b55516407d0f..fc04a23342cfc714414f0273c183513c4c925668 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/chain_mode.c
+++ b/drivers/net/ethernet/stmicro/stmmac/chain_mode.c
@@ -47,7 +47,7 @@ static int jumbo_frm(struct stmmac_tx_queue *tx_q, struct sk_buff *skb,
 
        while (len != 0) {
                tx_q->tx_skbuff[entry] = NULL;
-               entry = STMMAC_GET_ENTRY(entry, priv->dma_conf.dma_tx_size);
+               entry = STMMAC_NEXT_ENTRY(entry, priv->dma_conf.dma_tx_size);
                desc = tx_q->dma_tx + entry;
 
                if (len > bmax) {

diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h
index d26e8a06302243fdfd59585330b006e915b38e03..bd0fb5142d663d1261f055820b7db0a113adc236 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/common.h
+++ b/drivers/net/ethernet/stmicro/stmmac/common.h
@@ -63,7 +63,7 @@ static inline bool dwmac_is_xmac(enum dwmac_core_type core_type)
 #define DMA_MIN_RX_SIZE                64
 #define DMA_MAX_RX_SIZE                1024
 #define DMA_DEFAULT_RX_SIZE    512
-#define STMMAC_GET_ENTRY(x, size)      ((x + 1) & (size - 1))
+#define STMMAC_NEXT_ENTRY(x, size)     ((x + 1) & (size - 1))
 
 #undef FRAME_FILTER_DEBUG
 /* #define FRAME_FILTER_DEBUG */

diff --git a/drivers/net/ethernet/stmicro/stmmac/ring_mode.c b/drivers/net/ethernet/stmicro/stmmac/ring_mode.c
index 382d94a3b97209a3787122aa17537985aa55f4e8..78fc6aa5bbe954436d53c3b05a7323bc009987a5 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/ring_mode.c
+++ b/drivers/net/ethernet/stmicro/stmmac/ring_mode.c
@@ -51,7 +51,7 @@ static int jumbo_frm(struct stmmac_tx_queue *tx_q, struct sk_buff *skb,
                stmmac_prepare_tx_desc(priv, desc, 1, bmax, csum,
                                STMMAC_RING_MODE, 0, false, skb->len);
                tx_q->tx_skbuff[entry] = NULL;
-               entry = STMMAC_GET_ENTRY(entry, priv->dma_conf.dma_tx_size);
+               entry = STMMAC_NEXT_ENTRY(entry, priv->dma_conf.dma_tx_size);
 
                if (priv->extend_desc)
                        desc = (struct dma_desc *)(tx_q->dma_etx + entry);

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 13d3cac056bea5c3bbb120f81599f32e0f8a65d1..aa0bf1335ed34d534488ebb3f744e04471b5a3d3 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -2744,7 +2744,7 @@ static bool stmmac_xdp_xmit_zc(struct stmmac_priv *priv, u32 queue, u32 budget)
                xsk_tx_metadata_to_compl(meta,
                                         &tx_q->tx_skbuff_dma[entry].xsk_meta);
 
-               tx_q->cur_tx = STMMAC_GET_ENTRY(tx_q->cur_tx, priv->dma_conf.dma_tx_size);
+               tx_q->cur_tx = STMMAC_NEXT_ENTRY(tx_q->cur_tx, priv->dma_conf.dma_tx_size);
                entry = tx_q->cur_tx;
        }
        u64_stats_update_begin(&txq_stats->napi_syncp);
@@ -2915,7 +2915,7 @@ static int stmmac_tx_clean(struct stmmac_priv *priv, int budget, u32 queue,
 
                stmmac_release_tx_desc(priv, p, priv->mode);
 
-               entry = STMMAC_GET_ENTRY(entry, priv->dma_conf.dma_tx_size);
+               entry = STMMAC_NEXT_ENTRY(entry, priv->dma_conf.dma_tx_size);
        }
        tx_q->dirty_tx = entry;
 
@@ -4258,7 +4258,7 @@ static bool stmmac_vlan_insert(struct stmmac_priv *priv, struct sk_buff *skb,
                return false;
 
        stmmac_set_tx_owner(priv, p);
-       tx_q->cur_tx = STMMAC_GET_ENTRY(tx_q->cur_tx, priv->dma_conf.dma_tx_size);
+       tx_q->cur_tx = STMMAC_NEXT_ENTRY(tx_q->cur_tx, priv->dma_conf.dma_tx_size);
        return true;
 }
 
@@ -4286,7 +4286,7 @@ static void stmmac_tso_allocator(struct stmmac_priv *priv, dma_addr_t des,
        while (tmp_len > 0) {
                dma_addr_t curr_addr;
 
-               tx_q->cur_tx = STMMAC_GET_ENTRY(tx_q->cur_tx,
+               tx_q->cur_tx = STMMAC_NEXT_ENTRY(tx_q->cur_tx,
                                                priv->dma_conf.dma_tx_size);
                WARN_ON(tx_q->tx_skbuff[tx_q->cur_tx]);
 
@@ -4437,7 +4437,7 @@ static netdev_tx_t stmmac_tso_xmit(struct sk_buff *skb, struct net_device *dev)
 
                stmmac_set_mss(priv, mss_desc, mss);
                tx_q->mss = mss;
-               tx_q->cur_tx = STMMAC_GET_ENTRY(tx_q->cur_tx,
+               tx_q->cur_tx = STMMAC_NEXT_ENTRY(tx_q->cur_tx,
                                                priv->dma_conf.dma_tx_size);
                WARN_ON(tx_q->tx_skbuff[tx_q->cur_tx]);
        }
@@ -4541,7 +4541,7 @@ static netdev_tx_t stmmac_tso_xmit(struct sk_buff *skb, struct net_device *dev)
         * ndo_start_xmit will fill this descriptor the next time it's
         * called and stmmac_tx_clean may clean up to this descriptor.
         */
-       tx_q->cur_tx = STMMAC_GET_ENTRY(tx_q->cur_tx, priv->dma_conf.dma_tx_size);
+       tx_q->cur_tx = STMMAC_NEXT_ENTRY(tx_q->cur_tx, priv->dma_conf.dma_tx_size);
 
        if (unlikely(stmmac_tx_avail(priv, queue) <= (MAX_SKB_FRAGS + 1))) {
                netif_dbg(priv, hw, priv->dev, "%s: stop transmitted packets\n",
@@ -4751,7 +4751,7 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)
                int len = skb_frag_size(frag);
                bool last_segment = (i == (nfrags - 1));
 
-               entry = STMMAC_GET_ENTRY(entry, priv->dma_conf.dma_tx_size);
+               entry = STMMAC_NEXT_ENTRY(entry, priv->dma_conf.dma_tx_size);
                WARN_ON(tx_q->tx_skbuff[entry]);
 
                if (likely(priv->extend_desc))
@@ -4821,7 +4821,7 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)
         * ndo_start_xmit will fill this descriptor the next time it's
         * called and stmmac_tx_clean may clean up to this descriptor.
         */
-       entry = STMMAC_GET_ENTRY(entry, priv->dma_conf.dma_tx_size);
+       entry = STMMAC_NEXT_ENTRY(entry, priv->dma_conf.dma_tx_size);
        tx_q->cur_tx = entry;
 
        if (netif_msg_pktdata(priv)) {
@@ -4990,7 +4990,7 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv, u32 queue)
                dma_wmb();
                stmmac_set_rx_owner(priv, p, use_rx_wd);
 
-               entry = STMMAC_GET_ENTRY(entry, priv->dma_conf.dma_rx_size);
+               entry = STMMAC_NEXT_ENTRY(entry, priv->dma_conf.dma_rx_size);
        }
        rx_q->dirty_rx = entry;
        rx_q->rx_tail_addr = rx_q->dma_rx_phy +
@@ -5140,7 +5140,7 @@ static int stmmac_xdp_xmit_xdpf(struct stmmac_priv *priv, int queue,
 
        stmmac_enable_dma_transmission(priv, priv->ioaddr, queue);
 
-       entry = STMMAC_GET_ENTRY(entry, priv->dma_conf.dma_tx_size);
+       entry = STMMAC_NEXT_ENTRY(entry, priv->dma_conf.dma_tx_size);
        tx_q->cur_tx = entry;
 
        return STMMAC_XDP_TX;
@@ -5374,7 +5374,7 @@ static bool stmmac_rx_refill_zc(struct stmmac_priv *priv, u32 queue, u32 budget)
                dma_wmb();
                stmmac_set_rx_owner(priv, rx_desc, use_rx_wd);
 
-               entry = STMMAC_GET_ENTRY(entry, priv->dma_conf.dma_rx_size);
+               entry = STMMAC_NEXT_ENTRY(entry, priv->dma_conf.dma_rx_size);
        }
 
        if (rx_desc) {
@@ -5469,7 +5469,7 @@ read_again:
                        break;
 
                /* Prefetch the next RX descriptor */
-               rx_q->cur_rx = STMMAC_GET_ENTRY(rx_q->cur_rx,
+               rx_q->cur_rx = STMMAC_NEXT_ENTRY(rx_q->cur_rx,
                                                priv->dma_conf.dma_rx_size);
                next_entry = rx_q->cur_rx;
 
@@ -5665,7 +5665,7 @@ read_again:
                if (unlikely(status & dma_own))
                        break;
 
-               rx_q->cur_rx = STMMAC_GET_ENTRY(rx_q->cur_rx,
+               rx_q->cur_rx = STMMAC_NEXT_ENTRY(rx_q->cur_rx,
                                                priv->dma_conf.dma_rx_size);
                next_entry = rx_q->cur_rx;