diff options
| author | John Audia <therealgraysky@proton.me> | 2022-10-05 06:04:11 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-10-09 22:26:16 +0200 |
| commit | 911012662047ec133bdf4f5e490e0891cb782f3c (patch) | |
| tree | 9ca97402f737bf1ae10b9ac81b0794699a9de42d /target/linux/generic/backport-5.15/775-v6.0-04-net-ethernet-stmicro-stmmac-generate-stmmac-dma-conf.patch | |
| parent | e2da6a0a59a81a4fc0fdffde31abf22ee121e9f5 (diff) | |
| download | upstream-911012662047ec133bdf4f5e490e0891cb782f3c.tar.gz upstream-911012662047ec133bdf4f5e490e0891cb782f3c.tar.bz2 upstream-911012662047ec133bdf4f5e490e0891cb782f3c.zip | |
kernel: bump 5.15 to 5.15.72
Removed upstreamed:
generic/pending-5.15/722-net-mt7531-only-do-PLL-once-after-the-reset.patch[1]
bcm53xx/patches-5.15/082-v6.0-clk-iproc-Do-not-rely-on-node-name-for-correct-PLL-s.patch[2]
All other patches automatically rebased
Build system: x86_64
Build-tested: bcm2711/RPi4B, mt7622/RT3200, mvebu/cortexa72
Run-tested: bcm2711/RPi4B, mt7622/RT3200, mvebu/cortexa72 (RB5009UG+S+IN)
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.72&id=5de02ab84aeca765da0e4d8e999af35325ac67c2
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.72&id=ab5c5787ab5ecdc4a7ea20b4ef542579e1beb49d
Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/generic/backport-5.15/775-v6.0-04-net-ethernet-stmicro-stmmac-generate-stmmac-dma-conf.patch')
| -rw-r--r-- | target/linux/generic/backport-5.15/775-v6.0-04-net-ethernet-stmicro-stmmac-generate-stmmac-dma-conf.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/target/linux/generic/backport-5.15/775-v6.0-04-net-ethernet-stmicro-stmmac-generate-stmmac-dma-conf.patch b/target/linux/generic/backport-5.15/775-v6.0-04-net-ethernet-stmicro-stmmac-generate-stmmac-dma-conf.patch index be5643df7f..0635693d55 100644 --- a/target/linux/generic/backport-5.15/775-v6.0-04-net-ethernet-stmicro-stmmac-generate-stmmac-dma-conf.patch +++ b/target/linux/generic/backport-5.15/775-v6.0-04-net-ethernet-stmicro-stmmac-generate-stmmac-dma-conf.patch @@ -1003,9 +1003,9 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> + buf_sz = dma_conf->dma_buf_sz; + memcpy(&priv->dma_conf, dma_conf, sizeof(*dma_conf)); - stmmac_reset_queues_param(priv); - -@@ -3780,14 +3882,28 @@ irq_error: + if (priv->plat->serdes_powerup) { + ret = priv->plat->serdes_powerup(dev, priv->plat->bsp_priv); +@@ -3789,14 +3891,28 @@ irq_error: stmmac_hw_teardown(dev); init_error: @@ -1036,7 +1036,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> static void stmmac_fpe_stop_wq(struct stmmac_priv *priv) { set_bit(__FPE_REMOVING, &priv->fpe_task_state); -@@ -3834,7 +3950,7 @@ static int stmmac_release(struct net_dev +@@ -3843,7 +3959,7 @@ static int stmmac_release(struct net_dev stmmac_stop_all_dma(priv); /* Release and free the Rx/Tx resources */ @@ -1045,7 +1045,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> /* Disable the MAC Rx/Tx */ stmmac_mac_set(priv, priv->ioaddr, false); -@@ -6369,7 +6485,7 @@ void stmmac_disable_rx_queue(struct stmm +@@ -6382,7 +6498,7 @@ void stmmac_disable_rx_queue(struct stmm spin_unlock_irqrestore(&ch->lock, flags); stmmac_stop_rx_dma(priv, queue); @@ -1054,7 +1054,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> } void stmmac_enable_rx_queue(struct stmmac_priv *priv, u32 queue) -@@ -6380,21 +6496,21 @@ void stmmac_enable_rx_queue(struct stmma +@@ -6393,21 +6509,21 @@ void stmmac_enable_rx_queue(struct stmma u32 buf_size; int ret; @@ -1080,7 +1080,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, rx_q->queue_index); -@@ -6432,7 +6548,7 @@ void stmmac_disable_tx_queue(struct stmm +@@ -6445,7 +6561,7 @@ void stmmac_disable_tx_queue(struct stmm spin_unlock_irqrestore(&ch->lock, flags); stmmac_stop_tx_dma(priv, queue); @@ -1089,7 +1089,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> } void stmmac_enable_tx_queue(struct stmmac_priv *priv, u32 queue) -@@ -6442,21 +6558,21 @@ void stmmac_enable_tx_queue(struct stmma +@@ -6455,21 +6571,21 @@ void stmmac_enable_tx_queue(struct stmma unsigned long flags; int ret; @@ -1115,7 +1115,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, tx_q->queue_index); -@@ -6493,7 +6609,7 @@ void stmmac_xdp_release(struct net_devic +@@ -6506,7 +6622,7 @@ void stmmac_xdp_release(struct net_devic stmmac_stop_all_dma(priv); /* Release and free the Rx/Tx resources */ @@ -1124,7 +1124,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> /* Disable the MAC Rx/Tx */ stmmac_mac_set(priv, priv->ioaddr, false); -@@ -6518,14 +6634,14 @@ int stmmac_xdp_open(struct net_device *d +@@ -6531,14 +6647,14 @@ int stmmac_xdp_open(struct net_device *d u32 chan; int ret; @@ -1141,7 +1141,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> if (ret < 0) { netdev_err(dev, "%s: DMA descriptors initialization failed\n", __func__); -@@ -6607,7 +6723,7 @@ irq_error: +@@ -6620,7 +6736,7 @@ irq_error: stmmac_hw_teardown(dev); init_error: @@ -1150,7 +1150,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> dma_desc_error: return ret; } -@@ -7476,7 +7592,7 @@ int stmmac_resume(struct device *dev) +@@ -7479,7 +7595,7 @@ int stmmac_resume(struct device *dev) stmmac_reset_queues_param(priv); stmmac_free_tx_skbufs(priv); |