diff options
| author | John Audia <graysky@archlinux.us> | 2021-07-28 08:29:03 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-07-31 19:13:00 +0200 |
| commit | bd3cb93034ef266190a1a8885d131c85956f6ee2 (patch) | |
| tree | ac7cefc41d82c3722f1932fdb3df828b727d3784 /target/linux/bcm27xx/patches-5.4/950-0973-net-bcmgenet-Reset-RBUF-on-first-open.patch | |
| parent | 28ef76402671c4166de2d34e52dbc4f46dc08077 (diff) | |
| download | upstream-bd3cb93034ef266190a1a8885d131c85956f6ee2.tar.gz upstream-bd3cb93034ef266190a1a8885d131c85956f6ee2.tar.bz2 upstream-bd3cb93034ef266190a1a8885d131c85956f6ee2.zip | |
kernel: bump 5.4 to 5.4.136
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 | 12 |
1 files changed, 6 insertions, 6 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 60505cf4ed..706244f5c8 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 @@ -24,7 +24,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -@@ -2790,7 +2790,7 @@ static void bcmgenet_set_hw_addr(struct +@@ -2791,7 +2791,7 @@ static void bcmgenet_set_hw_addr(struct } /* Returns a reusable dma control register value */ @@ -33,7 +33,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> { unsigned int i; u32 reg; -@@ -2815,6 +2815,14 @@ static u32 bcmgenet_dma_disable(struct b +@@ -2816,6 +2816,14 @@ static u32 bcmgenet_dma_disable(struct b udelay(10); bcmgenet_umac_writel(priv, 0, UMAC_TX_FLUSH); @@ -48,9 +48,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> return dma_ctrl; } -@@ -2916,8 +2924,8 @@ static int bcmgenet_open(struct net_devi - bcmgenet_ext_writel(priv, reg, EXT_EXT_PWR_MGMT); - } +@@ -2911,8 +2919,8 @@ static int bcmgenet_open(struct net_devi + + bcmgenet_set_hw_addr(priv, dev->dev_addr); - /* Disable RX/TX DMA and flush TX queues */ - dma_ctrl = bcmgenet_dma_disable(priv); @@ -59,7 +59,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> /* Reinitialize TDMA and RDMA and SW housekeeping */ ret = bcmgenet_init_dma(priv); -@@ -3677,7 +3685,7 @@ static int bcmgenet_resume(struct device +@@ -3665,7 +3673,7 @@ static int bcmgenet_resume(struct device bcmgenet_power_up(priv, GENET_POWER_WOL_MAGIC); /* Disable RX/TX DMA and flush TX queues */ |