diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index f9ac82d2e726..1508cf08f03b 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -1677,6 +1677,40 @@ static bool stmmac_rx_check_buf2_cap(struct stmmac_priv *priv)
return priv->hw->desc && priv->hw->desc->set_sec_addr;
}
+static int stmmac_prepare_rx_buffer(struct stmmac_priv *priv,
+ struct stmmac_rx_queue *rx_q,
+ struct stmmac_rx_buffer *buf,
+ struct dma_desc *p, gfp_t flags)
+{
+ gfp_t gfp = flags;
+
+ if (priv->dma_cap.host_dma_width <= 32)
+ gfp |= GFP_DMA32;
+
+ if (!buf->page) {
+ buf->page = page_pool_alloc_pages(rx_q->page_pool, gfp);
+ if (!buf->page)
+ return -ENOMEM;
+ buf->page_offset = stmmac_rx_offset(priv);
+ }
+
+ if (stmmac_rx_check_buf2_cap(priv) && !buf->sec_page) {
+ buf->sec_page = page_pool_alloc_pages(rx_q->page_pool, gfp);
+ if (!buf->sec_page)
+ return -ENOMEM;
+
+ buf->sec_addr = page_pool_get_dma_addr(buf->sec_page);
+ }
+
+ buf->addr = page_pool_get_dma_addr(buf->page) + buf->page_offset;
+
+ stmmac_set_desc_addr(priv, p, buf->addr);
+ stmmac_set_desc_sec_addr(priv, p, buf->sec_addr,
+ stmmac_rx_check_buf2_cap(priv));
+
+ return 0;
+}
+
/**
* stmmac_init_rx_buffers - init the RX descriptor buffer.
* @priv: driver private structure@@ -1695,32 +1729,100 @@ static int stmmac_init_rx_buffers(struct stmmac_priv *priv,
{
struct stmmac_rx_queue *rx_q = &dma_conf->rx_queue[queue];
struct stmmac_rx_buffer *buf = &rx_q->buf_pool[i];
- gfp_t gfp = flags;
+ int ret;
- if (priv->dma_cap.host_dma_width <= 32)
- gfp |= GFP_DMA32;
+ ret = stmmac_prepare_rx_buffer(priv, rx_q, buf, p, flags);
+ if (ret)
+ return ret;
- if (!buf->page) {
- buf->page = page_pool_alloc_pages(rx_q->page_pool, gfp);
- if (!buf->page)
+ if (dma_conf->dma_buf_sz == BUF_SIZE_16KiB)
+ stmmac_init_desc3(priv, p);
+
+ return 0;
+}
+
+static int stmmac_prepare_rx_buffer_zc(struct stmmac_priv *priv,
+ struct stmmac_rx_queue *rx_q,
+ struct stmmac_rx_buffer *buf,
+ struct dma_desc *p)
+{
+ if (!buf->xdp) {
+ buf->xdp = xsk_buff_alloc(rx_q->xsk_pool);
+ if (!buf->xdp)
return -ENOMEM;
- buf->page_offset = stmmac_rx_offset(priv);
}
- if (stmmac_rx_check_buf2_cap(priv) && !buf->sec_page) {
- buf->sec_page = page_pool_alloc_pages(rx_q->page_pool, gfp);
- if (!buf->sec_page)
- return -ENOMEM;
+ stmmac_set_desc_addr(priv, p, xsk_buff_xdp_get_dma(buf->xdp));
+ stmmac_set_desc_sec_addr(priv, p, 0, false);
- buf->sec_addr = page_pool_get_dma_addr(buf->sec_page);
- stmmac_set_desc_sec_addr(priv, p, buf->sec_addr, true);
+ return 0;
+}
+
+/**
+ * stmmac_reinit_rx_descriptors - restore RX descriptors before restarting DMA
+ * @priv: driver private structure
+ * @dma_conf: DMA configuration
+ * @queue: RX queue index
+ *
+ * Restore addresses overwritten by hardware writeback, retaining attached
+ * buffers and allocating missing page_pool buffers with GFP_KERNEL. Keep
+ * descriptors CPU-owned until addresses and chain pointers are restored.
+ *
+ * For XSK, publish only the contiguous populated prefix. The remainder is
+ * left in the refill region, including any buffers already attached there,
+ * and can be populated by NAPI when userspace supplies more fill buffers.
+ *
+ * Return: 0 on success, or -ENOMEM if a required page cannot be allocated.
+ */
+static int stmmac_reinit_rx_descriptors(struct stmmac_priv *priv,
+ struct stmmac_dma_conf *dma_conf,
+ u32 queue)
+{
+ struct stmmac_rx_queue *rx_q = &dma_conf->rx_queue[queue];
+ struct dma_desc *p;
+ int i, ret;
+
+ for (i = 0; i < dma_conf->dma_rx_size; i++) {
+ p = stmmac_get_rx_desc(priv, rx_q, i);
+ stmmac_clear_rx_owner(priv, p);
}
- buf->addr = page_pool_get_dma_addr(buf->page) + buf->page_offset;
+ rx_q->buf_alloc_num = 0;
+ for (i = 0; i < dma_conf->dma_rx_size; i++) {
+ struct stmmac_rx_buffer *buf = &rx_q->buf_pool[i];
- stmmac_set_desc_addr(priv, p, buf->addr);
- if (dma_conf->dma_buf_sz == BUF_SIZE_16KiB)
- stmmac_init_desc3(priv, p);
+ p = stmmac_get_rx_desc(priv, rx_q, i);
+ if (rx_q->xsk_pool) {
+ ret = stmmac_prepare_rx_buffer_zc(priv, rx_q, buf, p);
+ if (ret)
+ break;
+ } else {
+ ret = stmmac_init_rx_buffers(priv, dma_conf, p, i,
+ GFP_KERNEL, queue);
+ if (ret)
+ return ret;
+ }
+ rx_q->buf_alloc_num++;
+ }
+
+ /* Hardware timestamp writeback may have overwritten chain pointers. */
+ if (priv->descriptor_mode == STMMAC_CHAIN_MODE) {
+ void *des = priv->extend_desc ? (void *)rx_q->dma_erx :
+ (void *)rx_q->dma_rx;
+
+ stmmac_mode_init(priv, des, rx_q->dma_rx_phy,
+ dma_conf->dma_rx_size, priv->extend_desc);
+ }
+
+ rx_q->rx_count_frames = 0;
+ stmmac_reset_rx_queue(priv, queue);
+
+ /* Initialize control fields and publish ownership only after restoring
+ * addresses and chain pointers. DMA is stopped; initialization also
+ * clears OWN again for the unpopulated XSK suffix before DMA restarts.
+ */
+ dma_wmb();
+ stmmac_clear_rx_descriptors(priv, dma_conf, queue);
return 0;
}@@ -2157,16 +2259,37 @@ static void dma_free_tx_skbufs(struct stmmac_priv *priv,
}
/**
- * stmmac_free_tx_skbufs - free TX skb buffers
- * @priv: private structure
+ * stmmac_resume_descriptors - prepare TX and RX rings before restarting DMA
+ * @priv: driver private structure
+ *
+ * Release outstanding TX buffers before initializing each TX ring. Restore
+ * RX buffer addresses before initializing RX descriptors and their ownership.
+ * All DMA channels must be stopped throughout this operation.
+ *
+ * Return: 0 on success, or a negative errno if RX restoration fails.
*/
-static void stmmac_free_tx_skbufs(struct stmmac_priv *priv)
+static int stmmac_resume_descriptors(struct stmmac_priv *priv)
{
- u8 tx_queue_cnt = priv->plat->tx_queues_to_use;
- u8 queue;
+ struct stmmac_dma_conf *dma_conf = &priv->dma_conf;
+ u32 queue;
+ int ret;
- for (queue = 0; queue < tx_queue_cnt; queue++)
- dma_free_tx_skbufs(priv, &priv->dma_conf, queue);
+ for (queue = 0; queue < priv->plat->tx_queues_to_use; queue++) {
+ stmmac_reset_tx_queue(priv, queue);
+ dma_free_tx_skbufs(priv, dma_conf, queue);
+ stmmac_clear_tx_descriptors(priv, dma_conf, queue);
+ }
+
+ for (queue = 0; queue < priv->plat->rx_queues_to_use; queue++) {
+ ret = stmmac_reinit_rx_descriptors(priv, dma_conf, queue);
+ if (ret) {
+ netdev_err(priv->dev, "Failed to restore RX queue %u: %d\n",
+ queue, ret);
+ return ret;
+ }
+ }
+
+ return 0;
}
/**@@ -5172,10 +5295,6 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv, u32 queue)
struct stmmac_rx_queue *rx_q = &priv->dma_conf.rx_queue[queue];
int dirty = stmmac_rx_dirty(priv, queue);
unsigned int entry = rx_q->dirty_rx;
- gfp_t gfp = (GFP_ATOMIC | __GFP_NOWARN);
-
- if (priv->dma_cap.host_dma_width <= 32)
- gfp |= GFP_DMA32;
while (dirty-- > 0) {
struct stmmac_rx_buffer *buf = &rx_q->buf_pool[entry];@@ -5184,25 +5303,9 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv, u32 queue)
p = stmmac_get_rx_desc(priv, rx_q, entry);
- if (!buf->page) {
- buf->page = page_pool_alloc_pages(rx_q->page_pool, gfp);
- if (!buf->page)
- break;
- }
-
- if (stmmac_rx_check_buf2_cap(priv) && !buf->sec_page) {
- buf->sec_page = page_pool_alloc_pages(rx_q->page_pool, gfp);
- if (!buf->sec_page)
- break;
-
- buf->sec_addr = page_pool_get_dma_addr(buf->sec_page);
- }
-
- buf->addr = page_pool_get_dma_addr(buf->page) + buf->page_offset;
-
- stmmac_set_desc_addr(priv, p, buf->addr);
- stmmac_set_desc_sec_addr(priv, p, buf->sec_addr,
- stmmac_rx_check_buf2_cap(priv));
+ if (stmmac_prepare_rx_buffer(priv, rx_q, buf, p,
+ GFP_ATOMIC | __GFP_NOWARN))
+ break;
stmmac_refill_desc3(priv, rx_q, p);
use_rx_wd = !stmmac_rx_need_ic(priv, rx_q, queue);@@ -5609,22 +5712,15 @@ static bool stmmac_rx_refill_zc(struct stmmac_priv *priv, u32 queue, u32 budget)
while (budget-- > 0) {
struct stmmac_rx_buffer *buf = &rx_q->buf_pool[entry];
- dma_addr_t dma_addr;
+ struct dma_desc *p = stmmac_get_rx_desc(priv, rx_q, entry);
bool use_rx_wd;
- if (!buf->xdp) {
- buf->xdp = xsk_buff_alloc(rx_q->xsk_pool);
- if (!buf->xdp) {
- ret = false;
- break;
- }
+ if (stmmac_prepare_rx_buffer_zc(priv, rx_q, buf, p)) {
+ ret = false;
+ break;
}
- rx_desc = stmmac_get_rx_desc(priv, rx_q, entry);
-
- dma_addr = xsk_buff_xdp_get_dma(buf->xdp);
- stmmac_set_desc_addr(priv, rx_desc, dma_addr);
- stmmac_set_desc_sec_addr(priv, rx_desc, 0, false);
+ rx_desc = p;
stmmac_refill_desc3(priv, rx_q, rx_desc);
use_rx_wd = !stmmac_rx_need_ic(priv, rx_q, queue);@@ -8563,10 +8659,9 @@ int stmmac_resume(struct device *dev)
mutex_lock(&priv->lock);
- stmmac_reset_queues_param(priv);
-
- stmmac_free_tx_skbufs(priv);
- stmmac_clear_descriptors(priv, &priv->dma_conf);
+ ret = stmmac_resume_descriptors(priv);
+ if (ret)
+ goto error_unlock;
ret = stmmac_hw_setup(ndev);
if (ret < 0) {--
2.34.1