diff options
| author | John Audia <graysky@archlinux.us> | 2021-07-25 14:36:53 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-07-31 19:13:00 +0200 |
| commit | 28ef76402671c4166de2d34e52dbc4f46dc08077 (patch) | |
| tree | 5446f5736584ae498e7b7671c837c58035d96dc4 /target/linux/bcm27xx/patches-5.4/950-0973-net-bcmgenet-Reset-RBUF-on-first-open.patch | |
| parent | f038a169a0341f4212997f02de2b280ea1178f9e (diff) | |
| download | upstream-28ef76402671c4166de2d34e52dbc4f46dc08077.tar.gz upstream-28ef76402671c4166de2d34e52dbc4f46dc08077.tar.bz2 upstream-28ef76402671c4166de2d34e52dbc4f46dc08077.zip | |
kernel: bump 5.4 to 5.4.135
All patches automatically rebased.
Build system: x86_64
Build-tested: ipq806x/R7800
Run-tested: ipq806x/R7800
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0973-net-bcmgenet-Reset-RBUF-on-first-open.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0973-net-bcmgenet-Reset-RBUF-on-first-open.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0973-net-bcmgenet-Reset-RBUF-on-first-open.patch b/target/linux/bcm27xx/patches-5.4/950-0973-net-bcmgenet-Reset-RBUF-on-first-open.patch index b7f0ce0cad..60505cf4ed 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0973-net-bcmgenet-Reset-RBUF-on-first-open.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0973-net-bcmgenet-Reset-RBUF-on-first-open.patch @@ -31,9 +31,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> -static u32 bcmgenet_dma_disable(struct bcmgenet_priv *priv) +static u32 bcmgenet_dma_disable(struct bcmgenet_priv *priv, bool flush_rx) { + unsigned int i; u32 reg; - u32 dma_ctrl; -@@ -2809,6 +2809,14 @@ static u32 bcmgenet_dma_disable(struct b +@@ -2815,6 +2815,14 @@ static u32 bcmgenet_dma_disable(struct b udelay(10); bcmgenet_umac_writel(priv, 0, UMAC_TX_FLUSH); @@ -48,7 +48,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> return dma_ctrl; } -@@ -2910,8 +2918,8 @@ static int bcmgenet_open(struct net_devi +@@ -2916,8 +2924,8 @@ static int bcmgenet_open(struct net_devi bcmgenet_ext_writel(priv, reg, EXT_EXT_PWR_MGMT); } @@ -59,7 +59,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> /* Reinitialize TDMA and RDMA and SW housekeeping */ ret = bcmgenet_init_dma(priv); -@@ -3671,7 +3679,7 @@ static int bcmgenet_resume(struct device +@@ -3677,7 +3685,7 @@ static int bcmgenet_resume(struct device bcmgenet_power_up(priv, GENET_POWER_WOL_MAGIC); /* Disable RX/TX DMA and flush TX queues */ |