Skip to content

Commit 0210be4

Browse files
Russell King (Oracle)gregkh
Russell King (Oracle)
authored and
gregkh
committed
net: stmmac: rename STMMAC_GET_ENTRY() -> STMMAC_NEXT_ENTRY()
[ Upstream commit 6b4286e ] 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: 0bb05e6 ("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>
1 parent b8f12d9 commit 0210be4

4 files changed

Lines changed: 16 additions & 16 deletions

File tree

‎drivers/net/ethernet/stmicro/stmmac/chain_mode.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ static int jumbo_frm(struct stmmac_tx_queue *tx_q, struct sk_buff *skb,
4747

4848
while (len != 0) {
4949
tx_q->tx_skbuff[entry] = NULL;
50-
entry = STMMAC_GET_ENTRY(entry, priv->dma_conf.dma_tx_size);
50+
entry = STMMAC_NEXT_ENTRY(entry, priv->dma_conf.dma_tx_size);
5151
desc = tx_q->dma_tx + entry;
5252

5353
if (len > bmax) {

‎drivers/net/ethernet/stmicro/stmmac/common.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ static inline bool dwmac_is_xmac(enum dwmac_core_type core_type)
6363
#define DMA_MIN_RX_SIZE 64
6464
#define DMA_MAX_RX_SIZE 1024
6565
#define DMA_DEFAULT_RX_SIZE 512
66-
#define STMMAC_GET_ENTRY(x, size) ((x + 1) & (size - 1))
66+
#define STMMAC_NEXT_ENTRY(x, size) ((x + 1) & (size - 1))
6767

6868
#undef FRAME_FILTER_DEBUG
6969
/* #define FRAME_FILTER_DEBUG */

‎drivers/net/ethernet/stmicro/stmmac/ring_mode.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ static int jumbo_frm(struct stmmac_tx_queue *tx_q, struct sk_buff *skb,
5151
stmmac_prepare_tx_desc(priv, desc, 1, bmax, csum,
5252
STMMAC_RING_MODE, 0, false, skb->len);
5353
tx_q->tx_skbuff[entry] = NULL;
54-
entry = STMMAC_GET_ENTRY(entry, priv->dma_conf.dma_tx_size);
54+
entry = STMMAC_NEXT_ENTRY(entry, priv->dma_conf.dma_tx_size);
5555

5656
if (priv->extend_desc)
5757
desc = (struct dma_desc *)(tx_q->dma_etx + entry);

‎drivers/net/ethernet/stmicro/stmmac/stmmac_main.c‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2744,7 +2744,7 @@ static bool stmmac_xdp_xmit_zc(struct stmmac_priv *priv, u32 queue, u32 budget)
27442744
xsk_tx_metadata_to_compl(meta,
27452745
&tx_q->tx_skbuff_dma[entry].xsk_meta);
27462746

2747-
tx_q->cur_tx = STMMAC_GET_ENTRY(tx_q->cur_tx, priv->dma_conf.dma_tx_size);
2747+
tx_q->cur_tx = STMMAC_NEXT_ENTRY(tx_q->cur_tx, priv->dma_conf.dma_tx_size);
27482748
entry = tx_q->cur_tx;
27492749
}
27502750
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,
29152915

29162916
stmmac_release_tx_desc(priv, p, priv->mode);
29172917

2918-
entry = STMMAC_GET_ENTRY(entry, priv->dma_conf.dma_tx_size);
2918+
entry = STMMAC_NEXT_ENTRY(entry, priv->dma_conf.dma_tx_size);
29192919
}
29202920
tx_q->dirty_tx = entry;
29212921

@@ -4258,7 +4258,7 @@ static bool stmmac_vlan_insert(struct stmmac_priv *priv, struct sk_buff *skb,
42584258
return false;
42594259

42604260
stmmac_set_tx_owner(priv, p);
4261-
tx_q->cur_tx = STMMAC_GET_ENTRY(tx_q->cur_tx, priv->dma_conf.dma_tx_size);
4261+
tx_q->cur_tx = STMMAC_NEXT_ENTRY(tx_q->cur_tx, priv->dma_conf.dma_tx_size);
42624262
return true;
42634263
}
42644264

@@ -4286,7 +4286,7 @@ static void stmmac_tso_allocator(struct stmmac_priv *priv, dma_addr_t des,
42864286
while (tmp_len > 0) {
42874287
dma_addr_t curr_addr;
42884288

4289-
tx_q->cur_tx = STMMAC_GET_ENTRY(tx_q->cur_tx,
4289+
tx_q->cur_tx = STMMAC_NEXT_ENTRY(tx_q->cur_tx,
42904290
priv->dma_conf.dma_tx_size);
42914291
WARN_ON(tx_q->tx_skbuff[tx_q->cur_tx]);
42924292

@@ -4437,7 +4437,7 @@ static netdev_tx_t stmmac_tso_xmit(struct sk_buff *skb, struct net_device *dev)
44374437

44384438
stmmac_set_mss(priv, mss_desc, mss);
44394439
tx_q->mss = mss;
4440-
tx_q->cur_tx = STMMAC_GET_ENTRY(tx_q->cur_tx,
4440+
tx_q->cur_tx = STMMAC_NEXT_ENTRY(tx_q->cur_tx,
44414441
priv->dma_conf.dma_tx_size);
44424442
WARN_ON(tx_q->tx_skbuff[tx_q->cur_tx]);
44434443
}
@@ -4541,7 +4541,7 @@ static netdev_tx_t stmmac_tso_xmit(struct sk_buff *skb, struct net_device *dev)
45414541
* ndo_start_xmit will fill this descriptor the next time it's
45424542
* called and stmmac_tx_clean may clean up to this descriptor.
45434543
*/
4544-
tx_q->cur_tx = STMMAC_GET_ENTRY(tx_q->cur_tx, priv->dma_conf.dma_tx_size);
4544+
tx_q->cur_tx = STMMAC_NEXT_ENTRY(tx_q->cur_tx, priv->dma_conf.dma_tx_size);
45454545

45464546
if (unlikely(stmmac_tx_avail(priv, queue) <= (MAX_SKB_FRAGS + 1))) {
45474547
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)
47514751
int len = skb_frag_size(frag);
47524752
bool last_segment = (i == (nfrags - 1));
47534753

4754-
entry = STMMAC_GET_ENTRY(entry, priv->dma_conf.dma_tx_size);
4754+
entry = STMMAC_NEXT_ENTRY(entry, priv->dma_conf.dma_tx_size);
47554755
WARN_ON(tx_q->tx_skbuff[entry]);
47564756

47574757
if (likely(priv->extend_desc))
@@ -4821,7 +4821,7 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)
48214821
* ndo_start_xmit will fill this descriptor the next time it's
48224822
* called and stmmac_tx_clean may clean up to this descriptor.
48234823
*/
4824-
entry = STMMAC_GET_ENTRY(entry, priv->dma_conf.dma_tx_size);
4824+
entry = STMMAC_NEXT_ENTRY(entry, priv->dma_conf.dma_tx_size);
48254825
tx_q->cur_tx = entry;
48264826

48274827
if (netif_msg_pktdata(priv)) {
@@ -4990,7 +4990,7 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv, u32 queue)
49904990
dma_wmb();
49914991
stmmac_set_rx_owner(priv, p, use_rx_wd);
49924992

4993-
entry = STMMAC_GET_ENTRY(entry, priv->dma_conf.dma_rx_size);
4993+
entry = STMMAC_NEXT_ENTRY(entry, priv->dma_conf.dma_rx_size);
49944994
}
49954995
rx_q->dirty_rx = entry;
49964996
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,
51405140

51415141
stmmac_enable_dma_transmission(priv, priv->ioaddr, queue);
51425142

5143-
entry = STMMAC_GET_ENTRY(entry, priv->dma_conf.dma_tx_size);
5143+
entry = STMMAC_NEXT_ENTRY(entry, priv->dma_conf.dma_tx_size);
51445144
tx_q->cur_tx = entry;
51455145

51465146
return STMMAC_XDP_TX;
@@ -5374,7 +5374,7 @@ static bool stmmac_rx_refill_zc(struct stmmac_priv *priv, u32 queue, u32 budget)
53745374
dma_wmb();
53755375
stmmac_set_rx_owner(priv, rx_desc, use_rx_wd);
53765376

5377-
entry = STMMAC_GET_ENTRY(entry, priv->dma_conf.dma_rx_size);
5377+
entry = STMMAC_NEXT_ENTRY(entry, priv->dma_conf.dma_rx_size);
53785378
}
53795379

53805380
if (rx_desc) {
@@ -5469,7 +5469,7 @@ static int stmmac_rx_zc(struct stmmac_priv *priv, int limit, u32 queue)
54695469
break;
54705470

54715471
/* Prefetch the next RX descriptor */
5472-
rx_q->cur_rx = STMMAC_GET_ENTRY(rx_q->cur_rx,
5472+
rx_q->cur_rx = STMMAC_NEXT_ENTRY(rx_q->cur_rx,
54735473
priv->dma_conf.dma_rx_size);
54745474
next_entry = rx_q->cur_rx;
54755475

@@ -5665,7 +5665,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue)
56655665
if (unlikely(status & dma_own))
56665666
break;
56675667

5668-
rx_q->cur_rx = STMMAC_GET_ENTRY(rx_q->cur_rx,
5668+
rx_q->cur_rx = STMMAC_NEXT_ENTRY(rx_q->cur_rx,
56695669
priv->dma_conf.dma_rx_size);
56705670
next_entry = rx_q->cur_rx;
56715671

0 commit comments

Comments
 (0)