aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.4
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-08-09 10:47:18 -0400
committerDavid Bauer <mail@david-bauer.net>2021-08-14 20:25:19 +0200
commit02e2723ef317c65b6ddfc70144b10f9936cfc2af (patch)
treec2017456408e825752128c8c122f52437d940d7b /target/linux/bcm27xx/patches-5.4
parent1235e2ee3bcfb678043a0b95ff1a6d4867af2561 (diff)
downloadupstream-02e2723ef317c65b6ddfc70144b10f9936cfc2af.tar.gz
upstream-02e2723ef317c65b6ddfc70144b10f9936cfc2af.tar.bz2
upstream-02e2723ef317c65b6ddfc70144b10f9936cfc2af.zip
kernel: bump 5.4 to 5.4.139
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')
-rw-r--r--target/linux/bcm27xx/patches-5.4/950-0003-smsx95xx-fix-crimes-against-truesize.patch4
-rw-r--r--target/linux/bcm27xx/patches-5.4/950-0004-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch2
-rw-r--r--target/linux/bcm27xx/patches-5.4/950-0005-Allow-mac-address-to-be-set-in-smsc95xx.patch4
-rw-r--r--target/linux/bcm27xx/patches-5.4/950-0208-bcmgenet-Better-coalescing-parameter-defaults.patch2
-rw-r--r--target/linux/bcm27xx/patches-5.4/950-0336-drm-v3d-The-third-IRQ-is-optional.patch2
-rw-r--r--target/linux/bcm27xx/patches-5.4/950-0973-net-bcmgenet-Reset-RBUF-on-first-open.patch2
6 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0003-smsx95xx-fix-crimes-against-truesize.patch b/target/linux/bcm27xx/patches-5.4/950-0003-smsx95xx-fix-crimes-against-truesize.patch
index 2355037880..fc27f60b09 100644
--- a/target/linux/bcm27xx/patches-5.4/950-0003-smsx95xx-fix-crimes-against-truesize.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0003-smsx95xx-fix-crimes-against-truesize.patch
@@ -25,7 +25,7 @@ Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
u32 *data, int in_pm)
{
-@@ -1964,7 +1968,8 @@ static int smsc95xx_rx_fixup(struct usbn
+@@ -1965,7 +1969,8 @@ static int smsc95xx_rx_fixup(struct usbn
if (dev->net->features & NETIF_F_RXCSUM)
smsc95xx_rx_csum_offload(skb);
skb_trim(skb, skb->len - 4); /* remove fcs */
@@ -35,7 +35,7 @@ Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
return 1;
}
-@@ -1982,7 +1987,8 @@ static int smsc95xx_rx_fixup(struct usbn
+@@ -1983,7 +1988,8 @@ static int smsc95xx_rx_fixup(struct usbn
if (dev->net->features & NETIF_F_RXCSUM)
smsc95xx_rx_csum_offload(ax_skb);
skb_trim(ax_skb, ax_skb->len - 4); /* remove fcs */
diff --git a/target/linux/bcm27xx/patches-5.4/950-0004-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch b/target/linux/bcm27xx/patches-5.4/950-0004-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch
index 90a0c15345..2a0e7736ae 100644
--- a/target/linux/bcm27xx/patches-5.4/950-0004-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0004-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch
@@ -22,7 +22,7 @@ See: http://forum.kodi.tv/showthread.php?tid=285288
static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
u32 *data, int in_pm)
{
-@@ -1095,13 +1099,13 @@ static int smsc95xx_reset(struct usbnet
+@@ -1096,13 +1100,13 @@ static int smsc95xx_reset(struct usbnet
if (!turbo_mode) {
burst_cap = 0;
diff --git a/target/linux/bcm27xx/patches-5.4/950-0005-Allow-mac-address-to-be-set-in-smsc95xx.patch b/target/linux/bcm27xx/patches-5.4/950-0005-Allow-mac-address-to-be-set-in-smsc95xx.patch
index 47f6e97e1a..ba12276b9b 100644
--- a/target/linux/bcm27xx/patches-5.4/950-0005-Allow-mac-address-to-be-set-in-smsc95xx.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0005-Allow-mac-address-to-be-set-in-smsc95xx.patch
@@ -82,8 +82,8 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
+
static void smsc95xx_init_mac_address(struct usbnet *dev)
{
- const u8 *mac_addr;
-@@ -928,6 +980,10 @@ static void smsc95xx_init_mac_address(st
+ u8 mac_addr[ETH_ALEN];
+@@ -929,6 +981,10 @@ static void smsc95xx_init_mac_address(st
}
}
diff --git a/target/linux/bcm27xx/patches-5.4/950-0208-bcmgenet-Better-coalescing-parameter-defaults.patch b/target/linux/bcm27xx/patches-5.4/950-0208-bcmgenet-Better-coalescing-parameter-defaults.patch
index b245fbbbfd..6ab928ed33 100644
--- a/target/linux/bcm27xx/patches-5.4/950-0208-bcmgenet-Better-coalescing-parameter-defaults.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0208-bcmgenet-Better-coalescing-parameter-defaults.patch
@@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
/* Disable rate control for now */
bcmgenet_tdma_ring_writel(priv, index, flow_period_val,
TDMA_FLOW_PERIOD);
-@@ -3574,9 +3574,12 @@ static int bcmgenet_probe(struct platfor
+@@ -3575,9 +3575,12 @@ static int bcmgenet_probe(struct platfor
netif_set_real_num_rx_queues(priv->dev, priv->hw_params->rx_queues + 1);
/* Set default coalescing parameters */
diff --git a/target/linux/bcm27xx/patches-5.4/950-0336-drm-v3d-The-third-IRQ-is-optional.patch b/target/linux/bcm27xx/patches-5.4/950-0336-drm-v3d-The-third-IRQ-is-optional.patch
index 2f9eb20add..edb4ede525 100644
--- a/target/linux/bcm27xx/patches-5.4/950-0336-drm-v3d-The-third-IRQ-is-optional.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0336-drm-v3d-The-third-IRQ-is-optional.patch
@@ -13,7 +13,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
-@@ -3475,7 +3475,7 @@ static int bcmgenet_probe(struct platfor
+@@ -3476,7 +3476,7 @@ static int bcmgenet_probe(struct platfor
priv = netdev_priv(dev);
priv->irq0 = platform_get_irq(pdev, 0);
priv->irq1 = platform_get_irq(pdev, 1);
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 706244f5c8..6cf8a7c927 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
@@ -59,7 +59,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
/* Reinitialize TDMA and RDMA and SW housekeeping */
ret = bcmgenet_init_dma(priv);
-@@ -3665,7 +3673,7 @@ static int bcmgenet_resume(struct device
+@@ -3666,7 +3674,7 @@ static int bcmgenet_resume(struct device
bcmgenet_power_up(priv, GENET_POWER_WOL_MAGIC);
/* Disable RX/TX DMA and flush TX queues */