VisionFive2 Linux kernel

author: Matteo Croce <mcroce@microsoft.com> 2021-05-21 03:26:38 +0200 committer: Emil Renner Berthing <kernel@esmil.dk> 2021-09-12 14:35:03 +0200 commit: d6224a4368ebc6fee29261471af0a1dd721c6bdc parent: b22e6945d324409d0d8156b7ba800a032d3ad850

Commit Summary:

net: stmmac: use GFP_DMA32

Diffstat:

1 file changed, 8 insertions, 4 deletions

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index a5285a8a9eae..c061b4037784 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -1431,14 +1431,16 @@ static int stmmac_init_rx_buffers(struct stmmac_priv *priv, struct dma_desc *p,
 	struct stmmac_rx_buffer *buf = &rx_q->buf_pool[i];
 
 	if (!buf->page) {
-		buf->page = page_pool_dev_alloc_pages(rx_q->page_pool);
+		buf->page = page_pool_alloc_pages(rx_q->page_pool,
+						  GFP_ATOMIC | __GFP_NOWARN | GFP_DMA32);
 		if (!buf->page)
 			return -ENOMEM;
 		buf->page_offset = stmmac_rx_offset(priv);
 	}
 
 	if (priv->sph && !buf->sec_page) {
-		buf->sec_page = page_pool_dev_alloc_pages(rx_q->page_pool);
+		buf->sec_page = page_pool_alloc_pages(rx_q->page_pool,
+						      GFP_ATOMIC | __GFP_NOWARN | GFP_DMA32);
 		if (!buf->sec_page)
 			return -ENOMEM;
 
@@ -4452,13 +4454,15 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv, u32 queue)
 			p = rx_q->dma_rx + entry;
 
 		if (!buf->page) {
-			buf->page = page_pool_dev_alloc_pages(rx_q->page_pool);
+			buf->page = page_pool_alloc_pages(rx_q->page_pool,
+							  GFP_ATOMIC | __GFP_NOWARN | GFP_DMA32);
 			if (!buf->page)
 				break;
 		}
 
 		if (priv->sph && !buf->sec_page) {
-			buf->sec_page = page_pool_dev_alloc_pages(rx_q->page_pool);
+			buf->sec_page = page_pool_alloc_pages(rx_q->page_pool,
+							      GFP_ATOMIC | __GFP_NOWARN | GFP_DMA32);
 			if (!buf->sec_page)
 				break;