github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-30 18:13:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

net: stmmac: add helper to set receive buffer size

Browse Source 
There are three sites that configure the hardware for the receive
buffer size using the same logic to determine the buffer size.
Add a helper so there is only one copy of this code.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1w1LWT-0000000DGSX-3fxc@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Russell King (Oracle) 2026-03-14 09:43:05 +00:00 committed by Jakub Kicinski
parent 0b3d090314
commit a32734d25d
1 changed files with 21 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
View File

@ -393,6 +393,24 @@ static void stmmac_set_queue_rx_tail_ptr(struct stmmac_priv *priv,
stmmac_set_rx_tail_ptr(priv, priv->ioaddr, rx_tail_addr, chan);
}
static void stmmac_set_queue_rx_buf_size(struct stmmac_priv *priv,
struct stmmac_rx_queue *rx_q,
unsigned int chan)
{
u32 buf_size;
if (rx_q->xsk_pool && rx_q->buf_alloc_num) {
buf_size = xsk_pool_get_rx_frame_size(rx_q->xsk_pool);
stmmac_set_dma_bfsize(priv, priv->ioaddr,
buf_size,
rx_q->queue_index);
} else {
stmmac_set_dma_bfsize(priv, priv->ioaddr,
priv->dma_conf.dma_buf_sz,
rx_q->queue_index);
}
}
/**
* stmmac_rx_dirty - Get RX queue dirty
* @priv: driver private structure
@ -2605,23 +2623,13 @@ static void stmmac_dma_operation_mode(struct stmmac_priv *priv)
/* configure all channels */
for (chan = 0; chan < rx_channels_count; chan++) {
struct stmmac_rx_queue *rx_q = &priv->dma_conf.rx_queue[chan];
u32 buf_size;
qmode = priv->plat->rx_queues_cfg[chan].mode_to_use;
stmmac_dma_rx_mode(priv, priv->ioaddr, rxmode, chan,
rxfifosz, qmode);
if (rx_q->xsk_pool && rx_q->buf_alloc_num) {
buf_size = xsk_pool_get_rx_frame_size(rx_q->xsk_pool);
stmmac_set_dma_bfsize(priv, priv->ioaddr,
buf_size,
chan);
} else {
stmmac_set_dma_bfsize(priv, priv->ioaddr,
priv->dma_conf.dma_buf_sz,
chan);
}
stmmac_set_queue_rx_buf_size(priv, rx_q, chan);
}
for (chan = 0; chan < tx_channels_count; chan++) {
@ -6959,7 +6967,6 @@ void stmmac_enable_rx_queue(struct stmmac_priv *priv, u32 queue)
struct stmmac_rx_queue *rx_q = &priv->dma_conf.rx_queue[queue];
struct stmmac_channel *ch = &priv->channel[queue];
unsigned long flags;
u32 buf_size;
int ret;
ret = __alloc_dma_rx_desc_resources(priv, &priv->dma_conf, queue);
@ -6984,16 +6991,7 @@ void stmmac_enable_rx_queue(struct stmmac_priv *priv, u32 queue)
stmmac_set_queue_rx_tail_ptr(priv, rx_q, rx_q->queue_index,
rx_q->buf_alloc_num);
if (rx_q->xsk_pool && rx_q->buf_alloc_num) {
buf_size = xsk_pool_get_rx_frame_size(rx_q->xsk_pool);
stmmac_set_dma_bfsize(priv, priv->ioaddr,
buf_size,
rx_q->queue_index);
} else {
stmmac_set_dma_bfsize(priv, priv->ioaddr,
priv->dma_conf.dma_buf_sz,
rx_q->queue_index);
}
stmmac_set_queue_rx_buf_size(priv, rx_q, rx_q->queue_index);
stmmac_start_rx_dma(priv, queue);
@ -7096,7 +7094,6 @@ int stmmac_xdp_open(struct net_device *dev)
u8 dma_csr_ch = max(rx_cnt, tx_cnt);
struct stmmac_rx_queue *rx_q;
struct stmmac_tx_queue *tx_q;
u32 buf_size;
bool sph_en;
u8 chan;
int ret;
@ -7136,16 +7133,7 @@ int stmmac_xdp_open(struct net_device *dev)
stmmac_set_queue_rx_tail_ptr(priv, rx_q, chan,
rx_q->buf_alloc_num);
if (rx_q->xsk_pool && rx_q->buf_alloc_num) {
buf_size = xsk_pool_get_rx_frame_size(rx_q->xsk_pool);
stmmac_set_dma_bfsize(priv, priv->ioaddr,
buf_size,
rx_q->queue_index);
} else {
stmmac_set_dma_bfsize(priv, priv->ioaddr,
priv->dma_conf.dma_buf_sz,
rx_q->queue_index);
}
stmmac_set_queue_rx_buf_size(priv, rx_q, chan);
stmmac_enable_sph(priv, priv->ioaddr, sph_en, chan);
}