kernel: bump 5.15 to 5.15.72

[openwrt/staging/noltari.git] / target / linux / generic / backport-5.15 / 775-v6.0-01-net-ethernet-stmicro-stmmac-move-queue-reset-to-dedi.patch

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 c93bc3b77d961a6721b7f4c2422612fd9f5263e2..b6b94ba6c25197fceec9994210ba77a7e824bb55 100644 (file)
--- 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,8 +62,8 @@ 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
-               goto init_error;
+@@ -3766,6 +3757,8 @@ static int stmmac_open(struct net_device
+               }
        }
  
 +      stmmac_reset_queues_param(priv);
@@ -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
+@@ -6409,6 +6402,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
+@@ -6470,6 +6464,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)
+@@ -7387,6 +7382,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
+@@ -7397,22 +7411,11 @@ static void stmmac_reset_queues_param(st
        u32 tx_cnt = priv->plat->tx_queues_to_use;
        u32 queue;