diff options
| author | John Audia <therealgraysky@proton.me> | 2022-09-20 15:34:17 -0400 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2022-09-22 12:46:55 +0200 |
| commit | 37a0cae33e94ec5822945d0c6a7c74600b4f4ade (patch) | |
| tree | 6bcae5766e3666da86830530c5e308b8af128b26 /target/linux/generic/backport-5.15/775-v6.0-01-net-ethernet-stmicro-stmmac-move-queue-reset-to-dedi.patch | |
| parent | eff4f8b2f0a2900c945c21c8183d1faa0ac35ec1 (diff) | |
| download | upstream-37a0cae33e94ec5822945d0c6a7c74600b4f4ade.tar.gz upstream-37a0cae33e94ec5822945d0c6a7c74600b4f4ade.tar.bz2 upstream-37a0cae33e94ec5822945d0c6a7c74600b4f4ade.zip | |
kernel: bump 5.15 to 5.15.69
All patches automatically rebased
Build system: x86_64
Build-tested: bcm2711/RPi4B, mt7622/RT3200
Run-tested: bcm2711/RPi4B, mt7622/RT3200
Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/generic/backport-5.15/775-v6.0-01-net-ethernet-stmicro-stmmac-move-queue-reset-to-dedi.patch')
| -rw-r--r-- | target/linux/generic/backport-5.15/775-v6.0-01-net-ethernet-stmicro-stmmac-move-queue-reset-to-dedi.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/generic/backport-5.15/775-v6.0-01-net-ethernet-stmicro-stmmac-move-queue-reset-to-dedi.patch b/target/linux/generic/backport-5.15/775-v6.0-01-net-ethernet-stmicro-stmmac-move-queue-reset-to-dedi.patch index c93bc3b77d..d6b7dcfbeb 100644 --- a/target/linux/generic/backport-5.15/775-v6.0-01-net-ethernet-stmicro-stmmac-move-queue-reset-to-dedi.patch +++ b/target/linux/generic/backport-5.15/775-v6.0-01-net-ethernet-stmicro-stmmac-move-queue-reset-to-dedi.patch @@ -27,7 +27,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> static void stmmac_tx_timer_arm(struct stmmac_priv *priv, u32 queue); static void stmmac_flush_tx_descriptors(struct stmmac_priv *priv, int queue); -@@ -1696,9 +1699,6 @@ static int __init_dma_rx_desc_rings(stru +@@ -1697,9 +1700,6 @@ static int __init_dma_rx_desc_rings(stru return -ENOMEM; } @@ -37,7 +37,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> /* Setup the chained descriptor addresses */ if (priv->mode == STMMAC_CHAIN_MODE) { if (priv->extend_desc) -@@ -1804,12 +1804,6 @@ static int __init_dma_tx_desc_rings(stru +@@ -1805,12 +1805,6 @@ static int __init_dma_tx_desc_rings(stru tx_q->tx_skbuff[i] = NULL; } @@ -50,7 +50,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> return 0; } -@@ -2678,10 +2672,7 @@ static void stmmac_tx_err(struct stmmac_ +@@ -2679,10 +2673,7 @@ static void stmmac_tx_err(struct stmmac_ stmmac_stop_tx_dma(priv, chan); dma_free_tx_skbufs(priv, chan); stmmac_clear_tx_descriptors(priv, chan); @@ -62,7 +62,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> stmmac_init_tx_chan(priv, priv->ioaddr, priv->plat->dma_cfg, tx_q->dma_tx_phy, chan); stmmac_start_tx_dma(priv, chan); -@@ -3756,6 +3747,8 @@ static int stmmac_open(struct net_device +@@ -3757,6 +3748,8 @@ static int stmmac_open(struct net_device goto init_error; } @@ -71,7 +71,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> ret = stmmac_hw_setup(dev, true); if (ret < 0) { netdev_err(priv->dev, "%s: Hw setup failed\n", __func__); -@@ -6395,6 +6388,7 @@ void stmmac_enable_rx_queue(struct stmma +@@ -6396,6 +6389,7 @@ void stmmac_enable_rx_queue(struct stmma return; } @@ -79,7 +79,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> stmmac_clear_rx_descriptors(priv, queue); stmmac_init_rx_chan(priv, priv->ioaddr, priv->plat->dma_cfg, -@@ -6456,6 +6450,7 @@ void stmmac_enable_tx_queue(struct stmma +@@ -6457,6 +6451,7 @@ void stmmac_enable_tx_queue(struct stmma return; } @@ -87,7 +87,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> stmmac_clear_tx_descriptors(priv, queue); stmmac_init_tx_chan(priv, priv->ioaddr, priv->plat->dma_cfg, -@@ -7383,6 +7378,25 @@ int stmmac_suspend(struct device *dev) +@@ -7384,6 +7379,25 @@ int stmmac_suspend(struct device *dev) } EXPORT_SYMBOL_GPL(stmmac_suspend); @@ -113,7 +113,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> /** * stmmac_reset_queues_param - reset queue parameters * @priv: device pointer -@@ -7393,22 +7407,11 @@ static void stmmac_reset_queues_param(st +@@ -7394,22 +7408,11 @@ static void stmmac_reset_queues_param(st u32 tx_cnt = priv->plat->tx_queues_to_use; u32 queue; |