diff options
| author | John Audia <therealgraysky@proton.me> | 2022-11-26 06:51:56 -0500 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-11-27 13:18:29 +0100 |
| commit | 590aa0ca515b3d9da06fe11d65f43d0dcf5b9cad (patch) | |
| tree | b8d0c8571b36a5029c9d3c82d2cb7f5a68986ac4 /target/linux/generic/backport-5.15/775-v6.0-03-net-ethernet-stmicro-stmmac-move-dma-conf-to-dedicat.patch | |
| parent | 6640c788feadbdde9ac80a66e6b24802ae021bd5 (diff) | |
| download | upstream-590aa0ca515b3d9da06fe11d65f43d0dcf5b9cad.tar.gz upstream-590aa0ca515b3d9da06fe11d65f43d0dcf5b9cad.tar.bz2 upstream-590aa0ca515b3d9da06fe11d65f43d0dcf5b9cad.zip | |
kernel: bump 5.15 to 5.15.80
Manually rebase:
pending-5.15/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch
ath79/patches-5.15/910-unaligned_access_hacks.patch
All other patches automatically rebased
Build system: x86_64
Build-tested: bcm2711/RPi4B
Run-tested: bcm2711/RPi4B
Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/generic/backport-5.15/775-v6.0-03-net-ethernet-stmicro-stmmac-move-dma-conf-to-dedicat.patch')
| -rw-r--r-- | target/linux/generic/backport-5.15/775-v6.0-03-net-ethernet-stmicro-stmmac-move-dma-conf-to-dedicat.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/target/linux/generic/backport-5.15/775-v6.0-03-net-ethernet-stmicro-stmmac-move-dma-conf-to-dedicat.patch b/target/linux/generic/backport-5.15/775-v6.0-03-net-ethernet-stmicro-stmmac-move-dma-conf-to-dedicat.patch index ec3607feeb..5cfb14aaab 100644 --- a/target/linux/generic/backport-5.15/775-v6.0-03-net-ethernet-stmicro-stmmac-move-dma-conf-to-dedicat.patch +++ b/target/linux/generic/backport-5.15/775-v6.0-03-net-ethernet-stmicro-stmmac-move-dma-conf-to-dedicat.patch @@ -1143,7 +1143,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> struct stmmac_channel *ch = &priv->channel[queue]; unsigned long flags; int ret; -@@ -6493,7 +6497,7 @@ void stmmac_xdp_release(struct net_devic +@@ -6496,7 +6500,7 @@ void stmmac_xdp_release(struct net_devic stmmac_disable_all_queues(priv); for (chan = 0; chan < priv->plat->tx_queues_to_use; chan++) @@ -1152,7 +1152,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> /* Free the IRQ lines */ stmmac_free_irq(dev, REQ_IRQ_ERR_ALL, 0); -@@ -6552,7 +6556,7 @@ int stmmac_xdp_open(struct net_device *d +@@ -6555,7 +6559,7 @@ int stmmac_xdp_open(struct net_device *d /* DMA RX Channel Configuration */ for (chan = 0; chan < rx_cnt; chan++) { @@ -1161,7 +1161,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> stmmac_init_rx_chan(priv, priv->ioaddr, priv->plat->dma_cfg, rx_q->dma_rx_phy, chan); -@@ -6570,7 +6574,7 @@ int stmmac_xdp_open(struct net_device *d +@@ -6573,7 +6577,7 @@ int stmmac_xdp_open(struct net_device *d rx_q->queue_index); } else { stmmac_set_dma_bfsize(priv, priv->ioaddr, @@ -1170,7 +1170,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> rx_q->queue_index); } -@@ -6579,7 +6583,7 @@ int stmmac_xdp_open(struct net_device *d +@@ -6582,7 +6586,7 @@ int stmmac_xdp_open(struct net_device *d /* DMA TX Channel Configuration */ for (chan = 0; chan < tx_cnt; chan++) { @@ -1179,7 +1179,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); -@@ -6612,7 +6616,7 @@ int stmmac_xdp_open(struct net_device *d +@@ -6615,7 +6619,7 @@ int stmmac_xdp_open(struct net_device *d irq_error: for (chan = 0; chan < priv->plat->tx_queues_to_use; chan++) @@ -1188,7 +1188,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> stmmac_hw_teardown(dev); init_error: -@@ -6639,8 +6643,8 @@ int stmmac_xsk_wakeup(struct net_device +@@ -6642,8 +6646,8 @@ int stmmac_xsk_wakeup(struct net_device queue >= priv->plat->tx_queues_to_use) return -EINVAL; @@ -1199,7 +1199,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> ch = &priv->channel[queue]; if (!rx_q->xsk_pool && !tx_q->xsk_pool) -@@ -6896,8 +6900,8 @@ int stmmac_reinit_ringparam(struct net_d +@@ -6899,8 +6903,8 @@ int stmmac_reinit_ringparam(struct net_d if (netif_running(dev)) stmmac_release(dev); @@ -1210,7 +1210,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> if (netif_running(dev)) ret = stmmac_open(dev); -@@ -7333,7 +7337,7 @@ int stmmac_suspend(struct device *dev) +@@ -7336,7 +7340,7 @@ int stmmac_suspend(struct device *dev) stmmac_disable_all_queues(priv); for (chan = 0; chan < priv->plat->tx_queues_to_use; chan++) @@ -1219,7 +1219,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> if (priv->eee_enabled) { priv->tx_path_in_lpi_mode = false; -@@ -7384,7 +7388,7 @@ EXPORT_SYMBOL_GPL(stmmac_suspend); +@@ -7387,7 +7391,7 @@ EXPORT_SYMBOL_GPL(stmmac_suspend); static void stmmac_reset_rx_queue(struct stmmac_priv *priv, u32 queue) { @@ -1228,7 +1228,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> rx_q->cur_rx = 0; rx_q->dirty_rx = 0; -@@ -7392,7 +7396,7 @@ static void stmmac_reset_rx_queue(struct +@@ -7395,7 +7399,7 @@ static void stmmac_reset_rx_queue(struct static void stmmac_reset_tx_queue(struct stmmac_priv *priv, u32 queue) { |