298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 14:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

kernel: bump 5.4 to 5.4.192 (#9386)

Browse Source 
Signed-off-by: José Hwong <josehwong@hotmail.com>
This commit is contained in:
José Hwong 2022-05-11 12:38:55 +08:00 committed by GitHub
parent 3516c9aa8a
commit 0b8b34215f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-5.4
View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.4 = .191 LINUX_VERSION-5.4 = .192
LINUX_KERNEL_HASH-5.4.191 = 288ca85fcdad18e950ccbe3d640594ee36d5aac226321ed935076fadb0cc0a3a LINUX_KERNEL_HASH-5.4.192 = 32482e1152fb07b126180a374f5f7d14601bd13a50ab8cbb75465aa998da9e93

4
target/linux/bcm27xx/patches-5.4/950-0208-bcmgenet-Better-coalescing-parameter-defaults.patch
View File

@ -18,7 +18,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -2150,7 +2150,7 @@ static void bcmgenet_init_tx_ring(struct @@ -2157,7 +2157,7 @@ static void bcmgenet_init_tx_ring(struct
bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_PROD_INDEX); bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_PROD_INDEX);
bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_CONS_INDEX); bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_CONS_INDEX);
@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
/* Disable rate control for now */ /* Disable rate control for now */
bcmgenet_tdma_ring_writel(priv, index, flow_period_val, bcmgenet_tdma_ring_writel(priv, index, flow_period_val,
TDMA_FLOW_PERIOD); TDMA_FLOW_PERIOD);
@@ -3577,9 +3577,12 @@ static int bcmgenet_probe(struct platfor @@ -3584,9 +3584,12 @@ static int bcmgenet_probe(struct platfor
netif_set_real_num_rx_queues(priv->dev, priv->hw_params->rx_queues + 1); netif_set_real_num_rx_queues(priv->dev, priv->hw_params->rx_queues + 1);
/* Set default coalescing parameters */ /* Set default coalescing parameters */

4
target/linux/bcm27xx/patches-5.4/950-0219-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch
View File

@ -15,7 +15,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
--- a/drivers/usb/host/xhci.c --- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c
@@ -1472,6 +1472,103 @@ command_cleanup: @@ -1483,6 +1483,103 @@ command_cleanup:
} }
/* /*
@ -119,7 +119,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
* non-error returns are a promise to giveback() the urb later * non-error returns are a promise to giveback() the urb later
* we drop ownership so next owner (or urb unlink) can get it * we drop ownership so next owner (or urb unlink) can get it
*/ */
@@ -5373,6 +5470,7 @@ static const struct hc_driver xhci_hc_dr @@ -5384,6 +5481,7 @@ static const struct hc_driver xhci_hc_dr
.endpoint_reset = xhci_endpoint_reset, .endpoint_reset = xhci_endpoint_reset,
.check_bandwidth = xhci_check_bandwidth, .check_bandwidth = xhci_check_bandwidth,
.reset_bandwidth = xhci_reset_bandwidth, .reset_bandwidth = xhci_reset_bandwidth,

2
target/linux/bcm27xx/patches-5.4/950-0292-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch
View File

@ -38,7 +38,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
static inline void bcmgenet_writel(u32 value, void __iomem *offset) static inline void bcmgenet_writel(u32 value, void __iomem *offset)
{ {
/* MIPS chips strapped for BE will automagically configure the /* MIPS chips strapped for BE will automagically configure the
@@ -1996,6 +2000,11 @@ static void reset_umac(struct bcmgenet_p @@ -2003,6 +2007,11 @@ static void reset_umac(struct bcmgenet_p
bcmgenet_rbuf_ctrl_set(priv, 0); bcmgenet_rbuf_ctrl_set(priv, 0);
udelay(10); udelay(10);

2
target/linux/bcm27xx/patches-5.4/950-0336-drm-v3d-The-third-IRQ-is-optional.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -3476,7 +3476,7 @@ static int bcmgenet_probe(struct platfor @@ -3483,7 +3483,7 @@ static int bcmgenet_probe(struct platfor
priv = netdev_priv(dev); priv = netdev_priv(dev);
priv->irq0 = platform_get_irq(pdev, 0); priv->irq0 = platform_get_irq(pdev, 0);
priv->irq1 = platform_get_irq(pdev, 1); priv->irq1 = platform_get_irq(pdev, 1);

8
target/linux/bcm27xx/patches-5.4/950-0973-net-bcmgenet-Reset-RBUF-on-first-open.patch
View File

@ -24,7 +24,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -2791,7 +2791,7 @@ static void bcmgenet_set_hw_addr(struct @@ -2798,7 +2798,7 @@ static void bcmgenet_set_hw_addr(struct
} }
/* Returns a reusable dma control register value */ /* Returns a reusable dma control register value */
@ -33,7 +33,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
{ {
unsigned int i; unsigned int i;
u32 reg; u32 reg;
@@ -2816,6 +2816,14 @@ static u32 bcmgenet_dma_disable(struct b @@ -2823,6 +2823,14 @@ static u32 bcmgenet_dma_disable(struct b
udelay(10); udelay(10);
bcmgenet_umac_writel(priv, 0, UMAC_TX_FLUSH); bcmgenet_umac_writel(priv, 0, UMAC_TX_FLUSH);
@ -48,7 +48,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
return dma_ctrl; return dma_ctrl;
} }
@@ -2911,8 +2919,8 @@ static int bcmgenet_open(struct net_devi @@ -2918,8 +2926,8 @@ static int bcmgenet_open(struct net_devi
bcmgenet_set_hw_addr(priv, dev->dev_addr); bcmgenet_set_hw_addr(priv, dev->dev_addr);
@ -59,7 +59,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
/* Reinitialize TDMA and RDMA and SW housekeeping */ /* Reinitialize TDMA and RDMA and SW housekeeping */
ret = bcmgenet_init_dma(priv); ret = bcmgenet_init_dma(priv);
@@ -3668,7 +3676,7 @@ static int bcmgenet_resume(struct device @@ -3675,7 +3683,7 @@ static int bcmgenet_resume(struct device
bcmgenet_power_up(priv, GENET_POWER_WOL_MAGIC); bcmgenet_power_up(priv, GENET_POWER_WOL_MAGIC);
/* Disable RX/TX DMA and flush TX queues */ /* Disable RX/TX DMA and flush TX queues */

2
target/linux/bcm4908/patches-5.4/072-v5.12-0002-net-broadcom-bcm4908enet-add-BCM4908-controller-driv.patch
View File

@ -24,7 +24,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -3208,6 +3208,15 @@ F: Documentation/devicetree/bindings/mip @@ -3207,6 +3207,15 @@ F: Documentation/devicetree/bindings/mip
F: arch/mips/bcm47xx/* F: arch/mips/bcm47xx/*
F: arch/mips/include/asm/mach-bcm47xx/* F: arch/mips/include/asm/mach-bcm47xx/*

2
target/linux/bcm4908/patches-5.4/073-v5.12-0001-dt-bindings-net-rename-BCM4908-Ethernet-binding.patch
View File

@ -117,7 +117,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
+ }; + };
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -3213,7 +3213,7 @@ M: Rafał Miłecki <rafal@milecki.pl> @@ -3212,7 +3212,7 @@ M: Rafał Miłecki <rafal@milecki.pl>
M: bcm-kernel-feedback-list@broadcom.com M: bcm-kernel-feedback-list@broadcom.com
L: netdev@vger.kernel.org L: netdev@vger.kernel.org
S: Maintained S: Maintained

2
target/linux/bcm4908/patches-5.4/073-v5.12-0003-net-broadcom-rename-BCM4908-driver-update-DT-binding.patch
View File

@ -24,7 +24,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -3214,7 +3214,7 @@ M: bcm-kernel-feedback-list@broadcom.com @@ -3213,7 +3213,7 @@ M: bcm-kernel-feedback-list@broadcom.com
L: netdev@vger.kernel.org L: netdev@vger.kernel.org
S: Maintained S: Maintained
F: Documentation/devicetree/bindings/net/brcm,bcm4908-enet.yaml F: Documentation/devicetree/bindings/net/brcm,bcm4908-enet.yaml

8
target/linux/bcm4908/patches-5.4/074-v5.13-0001-net-broadcom-bcm4908_enet-read-MAC-from-OF.patch
View File

@ -33,15 +33,13 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
int err; int err;
netdev = devm_alloc_etherdev(dev, sizeof(*enet)); netdev = devm_alloc_etherdev(dev, sizeof(*enet));
@@ -647,7 +649,11 @@ static int bcm4908_enet_probe(struct pla @@ -647,7 +649,9 @@ static int bcm4908_enet_probe(struct pla
return err; return err;
SET_NETDEV_DEV(netdev, &pdev->dev); SET_NETDEV_DEV(netdev, &pdev->dev);
- eth_hw_addr_random(netdev); - eth_hw_addr_random(netdev);
+ mac = of_get_mac_address(dev->of_node); + of_get_mac_address(dev->of_node, netdev->dev_addr);
+ if (!IS_ERR(mac)) + if (!is_valid_ether_addr(netdev->dev_addr))
+ ether_addr_copy(netdev->dev_addr, mac);
+ else
+ eth_hw_addr_random(netdev); + eth_hw_addr_random(netdev);
netdev->netdev_ops = &bcm4908_enet_netdev_ops; netdev->netdev_ops = &bcm4908_enet_netdev_ops;
netdev->min_mtu = ETH_ZLEN; netdev->min_mtu = ETH_ZLEN;

6
target/linux/bcm4908/patches-5.4/074-v5.13-0003-net-broadcom-bcm4908_enet-support-TX-interrupt.patch
View File

@ -269,7 +269,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static int bcm4908_enet_change_mtu(struct net_device *netdev, int new_mtu) static int bcm4908_enet_change_mtu(struct net_device *netdev, int new_mtu)
{ {
struct bcm4908_enet *enet = netdev_priv(netdev); struct bcm4908_enet *enet = netdev_priv(netdev);
@@ -641,6 +705,8 @@ static int bcm4908_enet_probe(struct pla @@ -642,6 +706,8 @@ static int bcm4908_enet_probe(struct pla
if (netdev->irq < 0) if (netdev->irq < 0)
return netdev->irq; return netdev->irq;
@ -278,7 +278,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
dma_set_coherent_mask(dev, DMA_BIT_MASK(32)); dma_set_coherent_mask(dev, DMA_BIT_MASK(32));
err = bcm4908_enet_dma_alloc(enet); err = bcm4908_enet_dma_alloc(enet);
@@ -655,7 +721,8 @@ static int bcm4908_enet_probe(struct pla @@ -656,7 +722,8 @@ static int bcm4908_enet_probe(struct pla
netdev->min_mtu = ETH_ZLEN; netdev->min_mtu = ETH_ZLEN;
netdev->mtu = ETH_DATA_LEN; netdev->mtu = ETH_DATA_LEN;
netdev->max_mtu = ENET_MTU_MAX; netdev->max_mtu = ENET_MTU_MAX;
@ -288,7 +288,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
err = register_netdev(netdev); err = register_netdev(netdev);
if (err) { if (err) {
@@ -673,7 +740,8 @@ static int bcm4908_enet_remove(struct pl @@ -674,7 +741,8 @@ static int bcm4908_enet_remove(struct pl
struct bcm4908_enet *enet = platform_get_drvdata(pdev); struct bcm4908_enet *enet = platform_get_drvdata(pdev);
unregister_netdev(enet->netdev); unregister_netdev(enet->netdev);

2
target/linux/bcm4908/patches-5.4/082-v5.12-0002-soc-bcm-add-PM-driver-for-Broadcom-s-PMB.patch
View File

@ -24,7 +24,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -3415,6 +3415,16 @@ L: linux-mips@vger.kernel.org @@ -3414,6 +3414,16 @@ L: linux-mips@vger.kernel.org
S: Maintained S: Maintained
F: drivers/firmware/broadcom/* F: drivers/firmware/broadcom/*

8
target/linux/generic/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
View File

@ -1236,7 +1236,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
@@ -395,7 +395,7 @@ static int socfpga_dwmac_probe(struct pl @@ -397,7 +397,7 @@ static int socfpga_dwmac_probe(struct pl
if (ret) if (ret)
return ret; return ret;
@ -1833,7 +1833,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
} }
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -3444,10 +3444,11 @@ static int bcmgenet_probe(struct platfor @@ -3451,10 +3451,11 @@ static int bcmgenet_probe(struct platfor
const struct of_device_id *of_id = NULL; const struct of_device_id *of_id = NULL;
struct bcmgenet_priv *priv; struct bcmgenet_priv *priv;
struct net_device *dev; struct net_device *dev;
@ -1846,7 +1846,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Up to GENET_MAX_MQ_CNT + 1 TX queues and RX queues */ /* Up to GENET_MAX_MQ_CNT + 1 TX queues and RX queues */
dev = alloc_etherdev_mqs(sizeof(*priv), GENET_MAX_MQ_CNT + 1, dev = alloc_etherdev_mqs(sizeof(*priv), GENET_MAX_MQ_CNT + 1,
@@ -3474,14 +3475,15 @@ static int bcmgenet_probe(struct platfor @@ -3481,14 +3482,15 @@ static int bcmgenet_probe(struct platfor
} }
if (dn) { if (dn) {
@ -1865,7 +1865,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
} }
priv->base = devm_platform_ioremap_resource(pdev, 0); priv->base = devm_platform_ioremap_resource(pdev, 0);
@@ -3494,7 +3496,6 @@ static int bcmgenet_probe(struct platfor @@ -3501,7 +3503,6 @@ static int bcmgenet_probe(struct platfor
SET_NETDEV_DEV(dev, &pdev->dev); SET_NETDEV_DEV(dev, &pdev->dev);
dev_set_drvdata(&pdev->dev, dev); dev_set_drvdata(&pdev->dev, dev);