487ca61f91
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.61 Manually rebased: bcm27xx/patches-6.6/950-0998-i2c-designware-Add-support-for-bus-clear-feature.patch All other patches automatically rebased. Build system: x86/64 Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Run-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/16959 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
From 980f1e9ef19d472e72c36e142db7fb4e224f0f3e Mon Sep 17 00:00:00 2001
|
|
From: Matteo Croce <technoboy85@gmail.com>
|
|
Date: Fri, 21 May 2021 03:26:38 +0200
|
|
Subject: [PATCH 1009/1024] net: stmmac: use GFP_DMA32
|
|
|
|
Signed-off-by: Matteo Croce <mcroce@microsoft.com>
|
|
---
|
|
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
|
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
|
@@ -1434,7 +1434,7 @@ static int stmmac_init_rx_buffers(struct
|
|
{
|
|
struct stmmac_rx_queue *rx_q = &dma_conf->rx_queue[queue];
|
|
struct stmmac_rx_buffer *buf = &rx_q->buf_pool[i];
|
|
- gfp_t gfp = (GFP_ATOMIC | __GFP_NOWARN);
|
|
+ gfp_t gfp = (GFP_ATOMIC | __GFP_NOWARN | GFP_DMA32);
|
|
|
|
if (priv->dma_cap.host_dma_width <= 32)
|
|
gfp |= GFP_DMA32;
|
|
@@ -4686,7 +4686,7 @@ static inline void stmmac_rx_refill(stru
|
|
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);
|
|
+ gfp_t gfp = (GFP_ATOMIC | __GFP_NOWARN | GFP_DMA32);
|
|
|
|
if (priv->dma_cap.host_dma_width <= 32)
|
|
gfp |= GFP_DMA32;
|