be3ce63822
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.36 Remove upstream patches: generic/backport-6.12/780-09-v6.13-r8169-add-support-for-RTL8125D.patch[1] generic/backport-6.12/781-04-v6.13-net-phy-realtek-merge-the-drivers-for-internal-NBase.patch[2] generic/backport-6.12/781-05-v6.13-net-phy-realtek-add-RTL8125D-internal-PHY.patch[3] All other patches are automatically refreshed. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.36&id=37cb5967bd2513416398ff1a87a5ee2e63270b00 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.36&id=5eb0b10eea271e2e1f7d4fa1a6af6c09b2ecc4f5 [3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.36&id=5d479182d4ccde76df830a72927b3bdaafd142bf Signed-off-by: Shiji Yang <yangshiji66@outlook.com> Tested-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/19317 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
From 690e2d40fe645e86dcd0ac265038426676473e19 Mon Sep 17 00:00:00 2001
|
|
From: Matteo Croce <technoboy85@gmail.com>
|
|
Date: Fri, 21 May 2021 03:26:38 +0200
|
|
Subject: [PATCH 1011/1021] 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
|
|
@@ -1459,7 +1459,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;
|
|
@@ -4789,7 +4789,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;
|