diff options
| author | John Audia <therealgraysky@proton.me> | 2023-02-01 15:37:19 -0500 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-02-03 09:34:32 +0100 |
| commit | 59fe39f6fcf1407a53ec54cb54d1e27dfa0beca5 (patch) | |
| tree | 0c8ec0b8c56830dbbd04311b8656f5b4403fb3b7 /target/linux/generic/backport-5.15/775-v6.0-01-net-ethernet-stmicro-stmmac-move-queue-reset-to-dedi.patch | |
| parent | acd8e94d20eea746f8fd01d0603bf46ef1d494af (diff) | |
| download | upstream-59fe39f6fcf1407a53ec54cb54d1e27dfa0beca5.tar.gz upstream-59fe39f6fcf1407a53ec54cb54d1e27dfa0beca5.tar.bz2 upstream-59fe39f6fcf1407a53ec54cb54d1e27dfa0beca5.zip | |
kernel: bump 5.15 to 5.15.91
Manually rebased:
pending-5.15/103-kbuild-export-SUBARCH.patch
All other patches automatically rebased.
Build system: x86_64
Build-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-ubootmod
Run-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-ubootmod
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 521bad896a..92e08bb4e3 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); -@@ -1705,9 +1708,6 @@ static int __init_dma_rx_desc_rings(stru +@@ -1710,9 +1713,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) -@@ -1813,12 +1813,6 @@ static int __init_dma_tx_desc_rings(stru +@@ -1818,12 +1818,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; } -@@ -2687,10 +2681,7 @@ static void stmmac_tx_err(struct stmmac_ +@@ -2692,10 +2686,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); -@@ -3774,6 +3765,8 @@ static int stmmac_open(struct net_device +@@ -3779,6 +3770,8 @@ static int stmmac_open(struct net_device } } @@ -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__); -@@ -6417,6 +6410,7 @@ void stmmac_enable_rx_queue(struct stmma +@@ -6422,6 +6415,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, -@@ -6478,6 +6472,7 @@ void stmmac_enable_tx_queue(struct stmma +@@ -6483,6 +6477,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, -@@ -7400,6 +7395,25 @@ int stmmac_suspend(struct device *dev) +@@ -7405,6 +7400,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 -@@ -7410,22 +7424,11 @@ static void stmmac_reset_queues_param(st +@@ -7415,22 +7429,11 @@ static void stmmac_reset_queues_param(st u32 tx_cnt = priv->plat->tx_queues_to_use; u32 queue; |