[openwrt/openwrt] kernel: bump 5.15 to 5.15.69
LEDE Commits
lede-commits at lists.infradead.org
Thu Sep 22 03:47:16 PDT 2022
ynezz pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/37a0cae33e94ec5822945d0c6a7c74600b4f4ade
commit 37a0cae33e94ec5822945d0c6a7c74600b4f4ade
Author: John Audia <therealgraysky at proton.me>
AuthorDate: Tue Sep 20 15:34:17 2022 -0400
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 at proton.me>
---
include/kernel-5.15 | 4 +-
...rder-PHY-initialization-with-MTU-setup-in.patch | 4 +-
...ge-rtnl_lock-sections-in-dsa_slave_create.patch | 2 +-
...vide-switch-operations-for-tracking-the-m.patch | 6 +-
...t-stmicro-stmmac-move-queue-reset-to-dedi.patch | 16 +-
...t-stmicro-stmmac-first-disable-all-queues.patch | 4 +-
...t-stmicro-stmmac-move-dma-conf-to-dedicat.patch | 194 ++++++++++-----------
...t-stmicro-stmmac-generate-stmmac-dma-conf.patch | 114 ++++++------
...t-stmicro-stmmac-permit-MTU-change-with-i.patch | 4 +-
9 files changed, 174 insertions(+), 174 deletions(-)
diff --git a/include/kernel-5.15 b/include/kernel-5.15
index 8aaf057ce4..1d10e56bb2 100644
--- a/include/kernel-5.15
+++ b/include/kernel-5.15
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .68
-LINUX_KERNEL_HASH-5.15.68 = 17bbb3cb5c9ba18583b6679cc28f828aec49c72abbfc6fbde310b0cb17218b7e
+LINUX_VERSION-5.15 = .69
+LINUX_KERNEL_HASH-5.15.69 = e32839ca761e5251f25708f7939b37b101d28fc29515a97bfc0c838a21efdf34
diff --git a/target/linux/generic/backport-5.15/765-v5.17-01-net-next-net-dsa-reorder-PHY-initialization-with-MTU-setup-in.patch b/target/linux/generic/backport-5.15/765-v5.17-01-net-next-net-dsa-reorder-PHY-initialization-with-MTU-setup-in.patch
index 1786bf0345..77cf63b809 100644
--- a/target/linux/generic/backport-5.15/765-v5.17-01-net-next-net-dsa-reorder-PHY-initialization-with-MTU-setup-in.patch
+++ b/target/linux/generic/backport-5.15/765-v5.17-01-net-next-net-dsa-reorder-PHY-initialization-with-MTU-setup-in.patch
@@ -22,7 +22,7 @@ Signed-off-by: David S. Miller <davem at davemloft.net>
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
-@@ -1986,13 +1986,6 @@ int dsa_slave_create(struct dsa_port *po
+@@ -1977,13 +1977,6 @@ int dsa_slave_create(struct dsa_port *po
port->slave = slave_dev;
dsa_slave_setup_tagger(slave_dev);
@@ -36,7 +36,7 @@ Signed-off-by: David S. Miller <davem at davemloft.net>
netif_carrier_off(slave_dev);
ret = dsa_slave_phy_setup(slave_dev);
-@@ -2004,6 +1997,13 @@ int dsa_slave_create(struct dsa_port *po
+@@ -1995,6 +1988,13 @@ int dsa_slave_create(struct dsa_port *po
}
rtnl_lock();
diff --git a/target/linux/generic/backport-5.15/765-v5.17-02-net-next-net-dsa-merge-rtnl_lock-sections-in-dsa_slave_create.patch b/target/linux/generic/backport-5.15/765-v5.17-02-net-next-net-dsa-merge-rtnl_lock-sections-in-dsa_slave_create.patch
index c2493a08fd..50aa5d8f0d 100644
--- a/target/linux/generic/backport-5.15/765-v5.17-02-net-next-net-dsa-merge-rtnl_lock-sections-in-dsa_slave_create.patch
+++ b/target/linux/generic/backport-5.15/765-v5.17-02-net-next-net-dsa-merge-rtnl_lock-sections-in-dsa_slave_create.patch
@@ -16,7 +16,7 @@ Signed-off-by: David S. Miller <davem at davemloft.net>
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
-@@ -1997,14 +1997,12 @@ int dsa_slave_create(struct dsa_port *po
+@@ -1988,14 +1988,12 @@ int dsa_slave_create(struct dsa_port *po
}
rtnl_lock();
diff --git a/target/linux/generic/backport-5.15/766-v5.18-01-net-dsa-provide-switch-operations-for-tracking-the-m.patch b/target/linux/generic/backport-5.15/766-v5.18-01-net-dsa-provide-switch-operations-for-tracking-the-m.patch
index d73b745586..7c6a3a3f8d 100644
--- a/target/linux/generic/backport-5.15/766-v5.18-01-net-dsa-provide-switch-operations-for-tracking-the-m.patch
+++ b/target/linux/generic/backport-5.15/766-v5.18-01-net-dsa-provide-switch-operations-for-tracking-the-m.patch
@@ -68,7 +68,7 @@ Signed-off-by: David S. Miller <davem at davemloft.net>
static inline bool dsa_is_unused_port(struct dsa_switch *ds, int p)
{
return dsa_to_port(ds, p)->type == DSA_PORT_TYPE_UNUSED;
-@@ -916,6 +926,13 @@ struct dsa_switch_ops {
+@@ -949,6 +959,13 @@ struct dsa_switch_ops {
int (*tag_8021q_vlan_add)(struct dsa_switch *ds, int port, u16 vid,
u16 flags);
int (*tag_8021q_vlan_del)(struct dsa_switch *ds, int port, u16 vid);
@@ -175,7 +175,7 @@ Signed-off-by: David S. Miller <davem at davemloft.net>
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
-@@ -2320,6 +2320,36 @@ static int dsa_slave_netdevice_event(str
+@@ -2311,6 +2311,36 @@ static int dsa_slave_netdevice_event(str
err = dsa_port_lag_change(dp, info->lower_state_info);
return notifier_from_errno(err);
}
@@ -212,7 +212,7 @@ Signed-off-by: David S. Miller <davem at davemloft.net>
case NETDEV_GOING_DOWN: {
struct dsa_port *dp, *cpu_dp;
struct dsa_switch_tree *dst;
-@@ -2331,6 +2361,8 @@ static int dsa_slave_netdevice_event(str
+@@ -2322,6 +2352,8 @@ static int dsa_slave_netdevice_event(str
cpu_dp = dev->dsa_ptr;
dst = cpu_dp->ds->dst;
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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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;
diff --git a/target/linux/generic/backport-5.15/775-v6.0-02-net-ethernet-stmicro-stmmac-first-disable-all-queues.patch b/target/linux/generic/backport-5.15/775-v6.0-02-net-ethernet-stmicro-stmmac-first-disable-all-queues.patch
index e73422636c..2b148ff290 100644
--- a/target/linux/generic/backport-5.15/775-v6.0-02-net-ethernet-stmicro-stmmac-first-disable-all-queues.patch
+++ b/target/linux/generic/backport-5.15/775-v6.0-02-net-ethernet-stmicro-stmmac-first-disable-all-queues.patch
@@ -17,7 +17,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -3808,8 +3808,6 @@ static int stmmac_release(struct net_dev
+@@ -3809,8 +3809,6 @@ static int stmmac_release(struct net_dev
struct stmmac_priv *priv = netdev_priv(dev);
u32 chan;
@@ -26,7 +26,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
if (device_may_wakeup(priv->device))
phylink_speed_down(priv->phylink, false);
/* Stop and disconnect the PHY */
-@@ -3821,6 +3819,8 @@ static int stmmac_release(struct net_dev
+@@ -3822,6 +3820,8 @@ static int stmmac_release(struct net_dev
for (chan = 0; chan < priv->plat->tx_queues_to_use; chan++)
hrtimer_cancel(&priv->tx_queue[chan].txtimer);
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 5cb2663c82..980d821cf5 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
@@ -189,7 +189,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
if (tx_q->dirty_tx != tx_q->cur_tx)
return -EBUSY; /* still unfinished work */
-@@ -1293,7 +1293,7 @@ static void stmmac_display_rx_rings(stru
+@@ -1294,7 +1294,7 @@ static void stmmac_display_rx_rings(stru
/* Display RX rings */
for (queue = 0; queue < rx_cnt; queue++) {
@@ -198,7 +198,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
pr_info("\tRX Queue %u rings\n", queue);
-@@ -1306,7 +1306,7 @@ static void stmmac_display_rx_rings(stru
+@@ -1307,7 +1307,7 @@ static void stmmac_display_rx_rings(stru
}
/* Display RX ring */
@@ -207,7 +207,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
rx_q->dma_rx_phy, desc_size);
}
}
-@@ -1320,7 +1320,7 @@ static void stmmac_display_tx_rings(stru
+@@ -1321,7 +1321,7 @@ static void stmmac_display_tx_rings(stru
/* Display TX rings */
for (queue = 0; queue < tx_cnt; queue++) {
@@ -216,7 +216,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
pr_info("\tTX Queue %d rings\n", queue);
-@@ -1335,7 +1335,7 @@ static void stmmac_display_tx_rings(stru
+@@ -1336,7 +1336,7 @@ static void stmmac_display_tx_rings(stru
desc_size = sizeof(struct dma_desc);
}
@@ -225,7 +225,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
tx_q->dma_tx_phy, desc_size);
}
}
-@@ -1376,21 +1376,21 @@ static int stmmac_set_bfsize(int mtu, in
+@@ -1377,21 +1377,21 @@ static int stmmac_set_bfsize(int mtu, in
*/
static void stmmac_clear_rx_descriptors(struct stmmac_priv *priv, u32 queue)
{
@@ -253,7 +253,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
}
/**
-@@ -1402,12 +1402,12 @@ static void stmmac_clear_rx_descriptors(
+@@ -1403,12 +1403,12 @@ static void stmmac_clear_rx_descriptors(
*/
static void stmmac_clear_tx_descriptors(struct stmmac_priv *priv, u32 queue)
{
@@ -269,7 +269,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
struct dma_desc *p;
if (priv->extend_desc)
-@@ -1455,7 +1455,7 @@ static void stmmac_clear_descriptors(str
+@@ -1456,7 +1456,7 @@ static void stmmac_clear_descriptors(str
static int stmmac_init_rx_buffers(struct stmmac_priv *priv, struct dma_desc *p,
int i, gfp_t flags, u32 queue)
{
@@ -278,7 +278,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
struct stmmac_rx_buffer *buf = &rx_q->buf_pool[i];
if (!buf->page) {
-@@ -1480,7 +1480,7 @@ static int stmmac_init_rx_buffers(struct
+@@ -1481,7 +1481,7 @@ static int stmmac_init_rx_buffers(struct
buf->addr = page_pool_get_dma_addr(buf->page) + buf->page_offset;
stmmac_set_desc_addr(priv, p, buf->addr);
@@ -287,7 +287,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
stmmac_init_desc3(priv, p);
return 0;
-@@ -1494,7 +1494,7 @@ static int stmmac_init_rx_buffers(struct
+@@ -1495,7 +1495,7 @@ static int stmmac_init_rx_buffers(struct
*/
static void stmmac_free_rx_buffer(struct stmmac_priv *priv, u32 queue, int i)
{
@@ -296,7 +296,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
struct stmmac_rx_buffer *buf = &rx_q->buf_pool[i];
if (buf->page)
-@@ -1514,7 +1514,7 @@ static void stmmac_free_rx_buffer(struct
+@@ -1515,7 +1515,7 @@ static void stmmac_free_rx_buffer(struct
*/
static void stmmac_free_tx_buffer(struct stmmac_priv *priv, u32 queue, int i)
{
@@ -305,7 +305,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
if (tx_q->tx_skbuff_dma[i].buf &&
tx_q->tx_skbuff_dma[i].buf_type != STMMAC_TXBUF_T_XDP_TX) {
-@@ -1559,17 +1559,17 @@ static void dma_free_rx_skbufs(struct st
+@@ -1560,17 +1560,17 @@ static void dma_free_rx_skbufs(struct st
{
int i;
@@ -326,7 +326,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
struct dma_desc *p;
int ret;
-@@ -1596,10 +1596,10 @@ static int stmmac_alloc_rx_buffers(struc
+@@ -1597,10 +1597,10 @@ static int stmmac_alloc_rx_buffers(struc
*/
static void dma_free_rx_xskbufs(struct stmmac_priv *priv, u32 queue)
{
@@ -339,7 +339,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
struct stmmac_rx_buffer *buf = &rx_q->buf_pool[i];
if (!buf->xdp)
-@@ -1612,10 +1612,10 @@ static void dma_free_rx_xskbufs(struct s
+@@ -1613,10 +1613,10 @@ static void dma_free_rx_xskbufs(struct s
static int stmmac_alloc_rx_buffers_zc(struct stmmac_priv *priv, u32 queue)
{
@@ -352,7 +352,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
struct stmmac_rx_buffer *buf;
dma_addr_t dma_addr;
struct dma_desc *p;
-@@ -1658,7 +1658,7 @@ static struct xsk_buff_pool *stmmac_get_
+@@ -1659,7 +1659,7 @@ static struct xsk_buff_pool *stmmac_get_
*/
static int __init_dma_rx_desc_rings(struct stmmac_priv *priv, u32 queue, gfp_t flags)
{
@@ -361,7 +361,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
int ret;
netif_dbg(priv, probe, priv->dev,
-@@ -1704,11 +1704,11 @@ static int __init_dma_rx_desc_rings(stru
+@@ -1705,11 +1705,11 @@ static int __init_dma_rx_desc_rings(stru
if (priv->extend_desc)
stmmac_mode_init(priv, rx_q->dma_erx,
rx_q->dma_rx_phy,
@@ -375,7 +375,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
}
return 0;
-@@ -1735,7 +1735,7 @@ static int init_dma_rx_desc_rings(struct
+@@ -1736,7 +1736,7 @@ static int init_dma_rx_desc_rings(struct
err_init_rx_buffers:
while (queue >= 0) {
@@ -384,7 +384,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
if (rx_q->xsk_pool)
dma_free_rx_xskbufs(priv, queue);
-@@ -1764,7 +1764,7 @@ err_init_rx_buffers:
+@@ -1765,7 +1765,7 @@ err_init_rx_buffers:
*/
static int __init_dma_tx_desc_rings(struct stmmac_priv *priv, u32 queue)
{
@@ -393,7 +393,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
int i;
netif_dbg(priv, probe, priv->dev,
-@@ -1776,16 +1776,16 @@ static int __init_dma_tx_desc_rings(stru
+@@ -1777,16 +1777,16 @@ static int __init_dma_tx_desc_rings(stru
if (priv->extend_desc)
stmmac_mode_init(priv, tx_q->dma_etx,
tx_q->dma_tx_phy,
@@ -413,7 +413,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
struct dma_desc *p;
if (priv->extend_desc)
-@@ -1855,12 +1855,12 @@ static int init_dma_desc_rings(struct ne
+@@ -1856,12 +1856,12 @@ static int init_dma_desc_rings(struct ne
*/
static void dma_free_tx_skbufs(struct stmmac_priv *priv, u32 queue)
{
@@ -428,7 +428,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
stmmac_free_tx_buffer(priv, queue, i);
if (tx_q->xsk_pool && tx_q->xsk_frames_done) {
-@@ -1890,7 +1890,7 @@ static void stmmac_free_tx_skbufs(struct
+@@ -1891,7 +1891,7 @@ static void stmmac_free_tx_skbufs(struct
*/
static void __free_dma_rx_desc_resources(struct stmmac_priv *priv, u32 queue)
{
@@ -437,7 +437,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
/* Release the DMA RX socket buffers */
if (rx_q->xsk_pool)
-@@ -1903,11 +1903,11 @@ static void __free_dma_rx_desc_resources
+@@ -1904,11 +1904,11 @@ static void __free_dma_rx_desc_resources
/* Free DMA regions of consistent memory previously allocated */
if (!priv->extend_desc)
@@ -451,7 +451,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
sizeof(struct dma_extended_desc),
rx_q->dma_erx, rx_q->dma_rx_phy);
-@@ -1936,7 +1936,7 @@ static void free_dma_rx_desc_resources(s
+@@ -1937,7 +1937,7 @@ static void free_dma_rx_desc_resources(s
*/
static void __free_dma_tx_desc_resources(struct stmmac_priv *priv, u32 queue)
{
@@ -460,7 +460,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
size_t size;
void *addr;
-@@ -1954,7 +1954,7 @@ static void __free_dma_tx_desc_resources
+@@ -1955,7 +1955,7 @@ static void __free_dma_tx_desc_resources
addr = tx_q->dma_tx;
}
@@ -469,7 +469,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
dma_free_coherent(priv->device, size, addr, tx_q->dma_tx_phy);
-@@ -1983,7 +1983,7 @@ static void free_dma_tx_desc_resources(s
+@@ -1984,7 +1984,7 @@ static void free_dma_tx_desc_resources(s
*/
static int __alloc_dma_rx_desc_resources(struct stmmac_priv *priv, u32 queue)
{
@@ -478,7 +478,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
struct stmmac_channel *ch = &priv->channel[queue];
bool xdp_prog = stmmac_xdp_is_enabled(priv);
struct page_pool_params pp_params = { 0 };
-@@ -1995,8 +1995,8 @@ static int __alloc_dma_rx_desc_resources
+@@ -1996,8 +1996,8 @@ static int __alloc_dma_rx_desc_resources
rx_q->priv_data = priv;
pp_params.flags = PP_FLAG_DMA_MAP | PP_FLAG_DMA_SYNC_DEV;
@@ -489,7 +489,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
pp_params.order = ilog2(num_pages);
pp_params.nid = dev_to_node(priv->device);
pp_params.dev = priv->device;
-@@ -2011,7 +2011,7 @@ static int __alloc_dma_rx_desc_resources
+@@ -2012,7 +2012,7 @@ static int __alloc_dma_rx_desc_resources
return ret;
}
@@ -498,7 +498,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
sizeof(*rx_q->buf_pool),
GFP_KERNEL);
if (!rx_q->buf_pool)
-@@ -2019,7 +2019,7 @@ static int __alloc_dma_rx_desc_resources
+@@ -2020,7 +2020,7 @@ static int __alloc_dma_rx_desc_resources
if (priv->extend_desc) {
rx_q->dma_erx = dma_alloc_coherent(priv->device,
@@ -507,7 +507,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
sizeof(struct dma_extended_desc),
&rx_q->dma_rx_phy,
GFP_KERNEL);
-@@ -2028,7 +2028,7 @@ static int __alloc_dma_rx_desc_resources
+@@ -2029,7 +2029,7 @@ static int __alloc_dma_rx_desc_resources
} else {
rx_q->dma_rx = dma_alloc_coherent(priv->device,
@@ -516,7 +516,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
sizeof(struct dma_desc),
&rx_q->dma_rx_phy,
GFP_KERNEL);
-@@ -2085,20 +2085,20 @@ err_dma:
+@@ -2086,20 +2086,20 @@ err_dma:
*/
static int __alloc_dma_tx_desc_resources(struct stmmac_priv *priv, u32 queue)
{
@@ -540,7 +540,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
sizeof(struct sk_buff *),
GFP_KERNEL);
if (!tx_q->tx_skbuff)
-@@ -2111,7 +2111,7 @@ static int __alloc_dma_tx_desc_resources
+@@ -2112,7 +2112,7 @@ static int __alloc_dma_tx_desc_resources
else
size = sizeof(struct dma_desc);
@@ -549,7 +549,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
addr = dma_alloc_coherent(priv->device, size,
&tx_q->dma_tx_phy, GFP_KERNEL);
-@@ -2355,7 +2355,7 @@ static void stmmac_dma_operation_mode(st
+@@ -2356,7 +2356,7 @@ static void stmmac_dma_operation_mode(st
/* configure all channels */
for (chan = 0; chan < rx_channels_count; chan++) {
@@ -558,7 +558,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
u32 buf_size;
qmode = priv->plat->rx_queues_cfg[chan].mode_to_use;
-@@ -2370,7 +2370,7 @@ static void stmmac_dma_operation_mode(st
+@@ -2371,7 +2371,7 @@ static void stmmac_dma_operation_mode(st
chan);
} else {
stmmac_set_dma_bfsize(priv, priv->ioaddr,
@@ -567,7 +567,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
chan);
}
}
-@@ -2386,7 +2386,7 @@ static void stmmac_dma_operation_mode(st
+@@ -2387,7 +2387,7 @@ static void stmmac_dma_operation_mode(st
static bool stmmac_xdp_xmit_zc(struct stmmac_priv *priv, u32 queue, u32 budget)
{
struct netdev_queue *nq = netdev_get_tx_queue(priv->dev, queue);
@@ -576,7 +576,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
struct xsk_buff_pool *pool = tx_q->xsk_pool;
unsigned int entry = tx_q->cur_tx;
struct dma_desc *tx_desc = NULL;
-@@ -2461,7 +2461,7 @@ static bool stmmac_xdp_xmit_zc(struct st
+@@ -2462,7 +2462,7 @@ static bool stmmac_xdp_xmit_zc(struct st
stmmac_enable_dma_transmission(priv, priv->ioaddr);
@@ -585,7 +585,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
entry = tx_q->cur_tx;
}
-@@ -2487,7 +2487,7 @@ static bool stmmac_xdp_xmit_zc(struct st
+@@ -2488,7 +2488,7 @@ static bool stmmac_xdp_xmit_zc(struct st
*/
static int stmmac_tx_clean(struct stmmac_priv *priv, int budget, u32 queue)
{
@@ -594,7 +594,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
unsigned int bytes_compl = 0, pkts_compl = 0;
unsigned int entry, xmits = 0, count = 0;
-@@ -2500,7 +2500,7 @@ static int stmmac_tx_clean(struct stmmac
+@@ -2501,7 +2501,7 @@ static int stmmac_tx_clean(struct stmmac
entry = tx_q->dirty_tx;
/* Try to clean all TX complete frame in 1 shot */
@@ -603,7 +603,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
struct xdp_frame *xdpf;
struct sk_buff *skb;
struct dma_desc *p;
-@@ -2600,7 +2600,7 @@ static int stmmac_tx_clean(struct stmmac
+@@ -2601,7 +2601,7 @@ static int stmmac_tx_clean(struct stmmac
stmmac_release_tx_desc(priv, p, priv->mode);
@@ -612,7 +612,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
}
tx_q->dirty_tx = entry;
-@@ -2665,7 +2665,7 @@ static int stmmac_tx_clean(struct stmmac
+@@ -2666,7 +2666,7 @@ static int stmmac_tx_clean(struct stmmac
*/
static void stmmac_tx_err(struct stmmac_priv *priv, u32 chan)
{
@@ -621,7 +621,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
netif_tx_stop_queue(netdev_get_tx_queue(priv->dev, chan));
-@@ -2732,8 +2732,8 @@ static int stmmac_napi_check(struct stmm
+@@ -2733,8 +2733,8 @@ static int stmmac_napi_check(struct stmm
{
int status = stmmac_dma_interrupt_status(priv, priv->ioaddr,
&priv->xstats, chan, dir);
@@ -632,7 +632,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
struct stmmac_channel *ch = &priv->channel[chan];
struct napi_struct *rx_napi;
struct napi_struct *tx_napi;
-@@ -2909,7 +2909,7 @@ static int stmmac_init_dma_engine(struct
+@@ -2910,7 +2910,7 @@ static int stmmac_init_dma_engine(struct
/* DMA RX Channel Configuration */
for (chan = 0; chan < rx_channels_count; chan++) {
@@ -641,7 +641,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
stmmac_init_rx_chan(priv, priv->ioaddr, priv->plat->dma_cfg,
rx_q->dma_rx_phy, chan);
-@@ -2923,7 +2923,7 @@ static int stmmac_init_dma_engine(struct
+@@ -2924,7 +2924,7 @@ static int stmmac_init_dma_engine(struct
/* DMA TX Channel Configuration */
for (chan = 0; chan < tx_channels_count; chan++) {
@@ -650,7 +650,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
stmmac_init_tx_chan(priv, priv->ioaddr, priv->plat->dma_cfg,
tx_q->dma_tx_phy, chan);
-@@ -2938,7 +2938,7 @@ static int stmmac_init_dma_engine(struct
+@@ -2939,7 +2939,7 @@ static int stmmac_init_dma_engine(struct
static void stmmac_tx_timer_arm(struct stmmac_priv *priv, u32 queue)
{
@@ -659,7 +659,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
hrtimer_start(&tx_q->txtimer,
STMMAC_COAL_TIMER(priv->tx_coal_timer[queue]),
-@@ -2988,7 +2988,7 @@ static void stmmac_init_coalesce(struct
+@@ -2989,7 +2989,7 @@ static void stmmac_init_coalesce(struct
u32 chan;
for (chan = 0; chan < tx_channel_count; chan++) {
@@ -668,7 +668,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
priv->tx_coal_frames[chan] = STMMAC_TX_FRAMES;
priv->tx_coal_timer[chan] = STMMAC_COAL_TX_TIMER;
-@@ -3010,12 +3010,12 @@ static void stmmac_set_rings_length(stru
+@@ -3011,12 +3011,12 @@ static void stmmac_set_rings_length(stru
/* set TX ring length */
for (chan = 0; chan < tx_channels_count; chan++)
stmmac_set_tx_ring_len(priv, priv->ioaddr,
@@ -683,7 +683,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
}
/**
-@@ -3350,7 +3350,7 @@ static int stmmac_hw_setup(struct net_de
+@@ -3351,7 +3351,7 @@ static int stmmac_hw_setup(struct net_de
/* Enable TSO */
if (priv->tso) {
for (chan = 0; chan < tx_cnt; chan++) {
@@ -692,7 +692,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
/* TSO and TBS cannot co-exist */
if (tx_q->tbs & STMMAC_TBS_AVAIL)
-@@ -3372,7 +3372,7 @@ static int stmmac_hw_setup(struct net_de
+@@ -3373,7 +3373,7 @@ static int stmmac_hw_setup(struct net_de
/* TBS */
for (chan = 0; chan < tx_cnt; chan++) {
@@ -701,7 +701,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
int enable = tx_q->tbs & STMMAC_TBS_AVAIL;
stmmac_enable_tbs(priv, priv->ioaddr, enable, chan);
-@@ -3416,7 +3416,7 @@ static void stmmac_free_irq(struct net_d
+@@ -3417,7 +3417,7 @@ static void stmmac_free_irq(struct net_d
for (j = irq_idx - 1; j >= 0; j--) {
if (priv->tx_irq[j] > 0) {
irq_set_affinity_hint(priv->tx_irq[j], NULL);
@@ -710,7 +710,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
}
}
irq_idx = priv->plat->rx_queues_to_use;
-@@ -3425,7 +3425,7 @@ static void stmmac_free_irq(struct net_d
+@@ -3426,7 +3426,7 @@ static void stmmac_free_irq(struct net_d
for (j = irq_idx - 1; j >= 0; j--) {
if (priv->rx_irq[j] > 0) {
irq_set_affinity_hint(priv->rx_irq[j], NULL);
@@ -719,7 +719,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
}
}
-@@ -3558,7 +3558,7 @@ static int stmmac_request_irq_multi_msi(
+@@ -3559,7 +3559,7 @@ static int stmmac_request_irq_multi_msi(
sprintf(int_name, "%s:%s-%d", dev->name, "rx", i);
ret = request_irq(priv->rx_irq[i],
stmmac_msi_intr_rx,
@@ -728,7 +728,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
if (unlikely(ret < 0)) {
netdev_err(priv->dev,
"%s: alloc rx-%d MSI %d (error: %d)\n",
-@@ -3581,7 +3581,7 @@ static int stmmac_request_irq_multi_msi(
+@@ -3582,7 +3582,7 @@ static int stmmac_request_irq_multi_msi(
sprintf(int_name, "%s:%s-%d", dev->name, "tx", i);
ret = request_irq(priv->tx_irq[i],
stmmac_msi_intr_tx,
@@ -737,7 +737,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
if (unlikely(ret < 0)) {
netdev_err(priv->dev,
"%s: alloc tx-%d MSI %d (error: %d)\n",
-@@ -3712,21 +3712,21 @@ static int stmmac_open(struct net_device
+@@ -3713,21 +3713,21 @@ static int stmmac_open(struct net_device
bfsize = 0;
if (bfsize < BUF_SIZE_16KiB)
@@ -766,7 +766,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
int tbs_en = priv->plat->tx_queues_cfg[chan].tbs_en;
/* Setup per-TXQ tbs flag before TX descriptor alloc */
-@@ -3775,7 +3775,7 @@ irq_error:
+@@ -3776,7 +3776,7 @@ irq_error:
phylink_stop(priv->phylink);
for (chan = 0; chan < priv->plat->tx_queues_to_use; chan++)
@@ -775,7 +775,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
stmmac_hw_teardown(dev);
init_error:
-@@ -3817,7 +3817,7 @@ static int stmmac_release(struct net_dev
+@@ -3818,7 +3818,7 @@ static int stmmac_release(struct net_dev
stmmac_disable_all_queues(priv);
for (chan = 0; chan < priv->plat->tx_queues_to_use; chan++)
@@ -784,7 +784,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
netif_tx_disable(dev);
-@@ -3877,7 +3877,7 @@ static bool stmmac_vlan_insert(struct st
+@@ -3878,7 +3878,7 @@ static bool stmmac_vlan_insert(struct st
return false;
stmmac_set_tx_owner(priv, p);
@@ -793,7 +793,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
return true;
}
-@@ -3895,7 +3895,7 @@ static bool stmmac_vlan_insert(struct st
+@@ -3896,7 +3896,7 @@ static bool stmmac_vlan_insert(struct st
static void stmmac_tso_allocator(struct stmmac_priv *priv, dma_addr_t des,
int total_len, bool last_segment, u32 queue)
{
@@ -802,7 +802,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
struct dma_desc *desc;
u32 buff_size;
int tmp_len;
-@@ -3906,7 +3906,7 @@ static void stmmac_tso_allocator(struct
+@@ -3907,7 +3907,7 @@ static void stmmac_tso_allocator(struct
dma_addr_t curr_addr;
tx_q->cur_tx = STMMAC_GET_ENTRY(tx_q->cur_tx,
@@ -811,7 +811,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
WARN_ON(tx_q->tx_skbuff[tx_q->cur_tx]);
if (tx_q->tbs & STMMAC_TBS_AVAIL)
-@@ -3934,7 +3934,7 @@ static void stmmac_tso_allocator(struct
+@@ -3935,7 +3935,7 @@ static void stmmac_tso_allocator(struct
static void stmmac_flush_tx_descriptors(struct stmmac_priv *priv, int queue)
{
@@ -820,7 +820,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
int desc_size;
if (likely(priv->extend_desc))
-@@ -3996,7 +3996,7 @@ static netdev_tx_t stmmac_tso_xmit(struc
+@@ -3997,7 +3997,7 @@ static netdev_tx_t stmmac_tso_xmit(struc
dma_addr_t des;
int i;
@@ -829,7 +829,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
first_tx = tx_q->cur_tx;
/* Compute header lengths */
-@@ -4036,7 +4036,7 @@ static netdev_tx_t stmmac_tso_xmit(struc
+@@ -4037,7 +4037,7 @@ static netdev_tx_t stmmac_tso_xmit(struc
stmmac_set_mss(priv, mss_desc, mss);
tx_q->mss = mss;
tx_q->cur_tx = STMMAC_GET_ENTRY(tx_q->cur_tx,
@@ -838,7 +838,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
WARN_ON(tx_q->tx_skbuff[tx_q->cur_tx]);
}
-@@ -4148,7 +4148,7 @@ static netdev_tx_t stmmac_tso_xmit(struc
+@@ -4149,7 +4149,7 @@ static netdev_tx_t stmmac_tso_xmit(struc
* ndo_start_xmit will fill this descriptor the next time it's
* called and stmmac_tx_clean may clean up to this descriptor.
*/
@@ -847,7 +847,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
if (unlikely(stmmac_tx_avail(priv, queue) <= (MAX_SKB_FRAGS + 1))) {
netif_dbg(priv, hw, priv->dev, "%s: stop transmitted packets\n",
-@@ -4236,7 +4236,7 @@ static netdev_tx_t stmmac_xmit(struct sk
+@@ -4237,7 +4237,7 @@ static netdev_tx_t stmmac_xmit(struct sk
int entry, first_tx;
dma_addr_t des;
@@ -856,7 +856,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
first_tx = tx_q->cur_tx;
if (priv->tx_path_in_lpi_mode && priv->eee_sw_timer_en)
-@@ -4299,7 +4299,7 @@ static netdev_tx_t stmmac_xmit(struct sk
+@@ -4300,7 +4300,7 @@ static netdev_tx_t stmmac_xmit(struct sk
int len = skb_frag_size(frag);
bool last_segment = (i == (nfrags - 1));
@@ -865,7 +865,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
WARN_ON(tx_q->tx_skbuff[entry]);
if (likely(priv->extend_desc))
-@@ -4370,7 +4370,7 @@ static netdev_tx_t stmmac_xmit(struct sk
+@@ -4371,7 +4371,7 @@ static netdev_tx_t stmmac_xmit(struct sk
* ndo_start_xmit will fill this descriptor the next time it's
* called and stmmac_tx_clean may clean up to this descriptor.
*/
@@ -874,7 +874,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
tx_q->cur_tx = entry;
if (netif_msg_pktdata(priv)) {
-@@ -4485,7 +4485,7 @@ static void stmmac_rx_vlan(struct net_de
+@@ -4486,7 +4486,7 @@ static void stmmac_rx_vlan(struct net_de
*/
static inline void stmmac_rx_refill(struct stmmac_priv *priv, u32 queue)
{
@@ -883,7 +883,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
int dirty = stmmac_rx_dirty(priv, queue);
unsigned int entry = rx_q->dirty_rx;
-@@ -4535,7 +4535,7 @@ static inline void stmmac_rx_refill(stru
+@@ -4536,7 +4536,7 @@ static inline void stmmac_rx_refill(stru
dma_wmb();
stmmac_set_rx_owner(priv, p, use_rx_wd);
@@ -892,7 +892,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
}
rx_q->dirty_rx = entry;
rx_q->rx_tail_addr = rx_q->dma_rx_phy +
-@@ -4563,12 +4563,12 @@ static unsigned int stmmac_rx_buf1_len(s
+@@ -4564,12 +4564,12 @@ static unsigned int stmmac_rx_buf1_len(s
/* First descriptor, not last descriptor and not split header */
if (status & rx_not_ls)
@@ -907,7 +907,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
}
static unsigned int stmmac_rx_buf2_len(struct stmmac_priv *priv,
-@@ -4584,7 +4584,7 @@ static unsigned int stmmac_rx_buf2_len(s
+@@ -4585,7 +4585,7 @@ static unsigned int stmmac_rx_buf2_len(s
/* Not last descriptor */
if (status & rx_not_ls)
@@ -916,7 +916,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
plen = stmmac_get_rx_frame_len(priv, p, coe);
-@@ -4595,7 +4595,7 @@ static unsigned int stmmac_rx_buf2_len(s
+@@ -4596,7 +4596,7 @@ static unsigned int stmmac_rx_buf2_len(s
static int stmmac_xdp_xmit_xdpf(struct stmmac_priv *priv, int queue,
struct xdp_frame *xdpf, bool dma_map)
{
@@ -925,7 +925,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
unsigned int entry = tx_q->cur_tx;
struct dma_desc *tx_desc;
dma_addr_t dma_addr;
-@@ -4658,7 +4658,7 @@ static int stmmac_xdp_xmit_xdpf(struct s
+@@ -4659,7 +4659,7 @@ static int stmmac_xdp_xmit_xdpf(struct s
stmmac_enable_dma_transmission(priv, priv->ioaddr);
@@ -934,7 +934,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
tx_q->cur_tx = entry;
return STMMAC_XDP_TX;
-@@ -4832,7 +4832,7 @@ static void stmmac_dispatch_skb_zc(struc
+@@ -4833,7 +4833,7 @@ static void stmmac_dispatch_skb_zc(struc
static bool stmmac_rx_refill_zc(struct stmmac_priv *priv, u32 queue, u32 budget)
{
@@ -943,7 +943,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
unsigned int entry = rx_q->dirty_rx;
struct dma_desc *rx_desc = NULL;
bool ret = true;
-@@ -4875,7 +4875,7 @@ static bool stmmac_rx_refill_zc(struct s
+@@ -4876,7 +4876,7 @@ static bool stmmac_rx_refill_zc(struct s
dma_wmb();
stmmac_set_rx_owner(priv, rx_desc, use_rx_wd);
@@ -952,7 +952,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
}
if (rx_desc) {
-@@ -4890,7 +4890,7 @@ static bool stmmac_rx_refill_zc(struct s
+@@ -4891,7 +4891,7 @@ static bool stmmac_rx_refill_zc(struct s
static int stmmac_rx_zc(struct stmmac_priv *priv, int limit, u32 queue)
{
@@ -961,7 +961,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
unsigned int count = 0, error = 0, len = 0;
int dirty = stmmac_rx_dirty(priv, queue);
unsigned int next_entry = rx_q->cur_rx;
-@@ -4912,7 +4912,7 @@ static int stmmac_rx_zc(struct stmmac_pr
+@@ -4913,7 +4913,7 @@ static int stmmac_rx_zc(struct stmmac_pr
desc_size = sizeof(struct dma_desc);
}
@@ -970,7 +970,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
rx_q->dma_rx_phy, desc_size);
}
while (count < limit) {
-@@ -4959,7 +4959,7 @@ read_again:
+@@ -4960,7 +4960,7 @@ read_again:
/* Prefetch the next RX descriptor */
rx_q->cur_rx = STMMAC_GET_ENTRY(rx_q->cur_rx,
@@ -979,7 +979,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
next_entry = rx_q->cur_rx;
if (priv->extend_desc)
-@@ -5080,7 +5080,7 @@ read_again:
+@@ -5081,7 +5081,7 @@ read_again:
*/
static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue)
{
@@ -988,7 +988,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
struct stmmac_channel *ch = &priv->channel[queue];
unsigned int count = 0, error = 0, len = 0;
int status = 0, coe = priv->hw->rx_csum;
-@@ -5093,7 +5093,7 @@ static int stmmac_rx(struct stmmac_priv
+@@ -5094,7 +5094,7 @@ static int stmmac_rx(struct stmmac_priv
int buf_sz;
dma_dir = page_pool_get_dma_dir(rx_q->page_pool);
@@ -997,7 +997,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
if (netif_msg_rx_status(priv)) {
void *rx_head;
-@@ -5107,7 +5107,7 @@ static int stmmac_rx(struct stmmac_priv
+@@ -5108,7 +5108,7 @@ static int stmmac_rx(struct stmmac_priv
desc_size = sizeof(struct dma_desc);
}
@@ -1006,7 +1006,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
rx_q->dma_rx_phy, desc_size);
}
while (count < limit) {
-@@ -5151,7 +5151,7 @@ read_again:
+@@ -5152,7 +5152,7 @@ read_again:
break;
rx_q->cur_rx = STMMAC_GET_ENTRY(rx_q->cur_rx,
@@ -1015,7 +1015,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
next_entry = rx_q->cur_rx;
if (priv->extend_desc)
-@@ -5285,7 +5285,7 @@ read_again:
+@@ -5286,7 +5286,7 @@ read_again:
buf1_len, dma_dir);
skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags,
buf->page, buf->page_offset, buf1_len,
@@ -1024,7 +1024,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
/* Data payload appended into SKB */
page_pool_release_page(rx_q->page_pool, buf->page);
-@@ -5297,7 +5297,7 @@ read_again:
+@@ -5298,7 +5298,7 @@ read_again:
buf2_len, dma_dir);
skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags,
buf->sec_page, 0, buf2_len,
@@ -1033,7 +1033,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
/* Data payload appended into SKB */
page_pool_release_page(rx_q->page_pool, buf->sec_page);
-@@ -5739,11 +5739,13 @@ static irqreturn_t stmmac_safety_interru
+@@ -5740,11 +5740,13 @@ static irqreturn_t stmmac_safety_interru
static irqreturn_t stmmac_msi_intr_tx(int irq, void *data)
{
struct stmmac_tx_queue *tx_q = (struct stmmac_tx_queue *)data;
@@ -1048,7 +1048,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
if (unlikely(!data)) {
netdev_err(priv->dev, "%s: invalid dev pointer\n", __func__);
-@@ -5783,10 +5785,12 @@ static irqreturn_t stmmac_msi_intr_tx(in
+@@ -5784,10 +5786,12 @@ static irqreturn_t stmmac_msi_intr_tx(in
static irqreturn_t stmmac_msi_intr_rx(int irq, void *data)
{
struct stmmac_rx_queue *rx_q = (struct stmmac_rx_queue *)data;
@@ -1062,7 +1062,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
if (unlikely(!data)) {
netdev_err(priv->dev, "%s: invalid dev pointer\n", __func__);
-@@ -5817,10 +5821,10 @@ static void stmmac_poll_controller(struc
+@@ -5818,10 +5822,10 @@ static void stmmac_poll_controller(struc
if (priv->plat->multi_msi_en) {
for (i = 0; i < priv->plat->rx_queues_to_use; i++)
@@ -1075,7 +1075,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
} else {
disable_irq(dev->irq);
stmmac_interrupt(dev->irq, dev);
-@@ -6001,34 +6005,34 @@ static int stmmac_rings_status_show(stru
+@@ -6002,34 +6006,34 @@ static int stmmac_rings_status_show(stru
return 0;
for (queue = 0; queue < rx_count; queue++) {
@@ -1116,7 +1116,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
}
}
-@@ -6369,7 +6373,7 @@ void stmmac_disable_rx_queue(struct stmm
+@@ -6370,7 +6374,7 @@ void stmmac_disable_rx_queue(struct stmm
void stmmac_enable_rx_queue(struct stmmac_priv *priv, u32 queue)
{
@@ -1125,7 +1125,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
struct stmmac_channel *ch = &priv->channel[queue];
unsigned long flags;
u32 buf_size;
-@@ -6406,7 +6410,7 @@ void stmmac_enable_rx_queue(struct stmma
+@@ -6407,7 +6411,7 @@ void stmmac_enable_rx_queue(struct stmma
rx_q->queue_index);
} else {
stmmac_set_dma_bfsize(priv, priv->ioaddr,
@@ -1134,7 +1134,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
rx_q->queue_index);
}
-@@ -6432,7 +6436,7 @@ void stmmac_disable_tx_queue(struct stmm
+@@ -6433,7 +6437,7 @@ void stmmac_disable_tx_queue(struct stmm
void stmmac_enable_tx_queue(struct stmmac_priv *priv, u32 queue)
{
@@ -1143,7 +1143,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
struct stmmac_channel *ch = &priv->channel[queue];
unsigned long flags;
int ret;
-@@ -6479,7 +6483,7 @@ void stmmac_xdp_release(struct net_devic
+@@ -6480,7 +6484,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 at kernel.org>
/* Free the IRQ lines */
stmmac_free_irq(dev, REQ_IRQ_ERR_ALL, 0);
-@@ -6538,7 +6542,7 @@ int stmmac_xdp_open(struct net_device *d
+@@ -6539,7 +6543,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 at kernel.org>
stmmac_init_rx_chan(priv, priv->ioaddr, priv->plat->dma_cfg,
rx_q->dma_rx_phy, chan);
-@@ -6556,7 +6560,7 @@ int stmmac_xdp_open(struct net_device *d
+@@ -6557,7 +6561,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 at kernel.org>
rx_q->queue_index);
}
-@@ -6565,7 +6569,7 @@ int stmmac_xdp_open(struct net_device *d
+@@ -6566,7 +6570,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 at kernel.org>
stmmac_init_tx_chan(priv, priv->ioaddr, priv->plat->dma_cfg,
tx_q->dma_tx_phy, chan);
-@@ -6598,7 +6602,7 @@ int stmmac_xdp_open(struct net_device *d
+@@ -6599,7 +6603,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 at kernel.org>
stmmac_hw_teardown(dev);
init_error:
-@@ -6625,8 +6629,8 @@ int stmmac_xsk_wakeup(struct net_device
+@@ -6626,8 +6630,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 at kernel.org>
ch = &priv->channel[queue];
if (!rx_q->xsk_pool && !tx_q->xsk_pool)
-@@ -6882,8 +6886,8 @@ int stmmac_reinit_ringparam(struct net_d
+@@ -6883,8 +6887,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 at kernel.org>
if (netif_running(dev))
ret = stmmac_open(dev);
-@@ -7329,7 +7333,7 @@ int stmmac_suspend(struct device *dev)
+@@ -7330,7 +7334,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 at kernel.org>
if (priv->eee_enabled) {
priv->tx_path_in_lpi_mode = false;
-@@ -7380,7 +7384,7 @@ EXPORT_SYMBOL_GPL(stmmac_suspend);
+@@ -7381,7 +7385,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 at kernel.org>
rx_q->cur_rx = 0;
rx_q->dirty_rx = 0;
-@@ -7388,7 +7392,7 @@ static void stmmac_reset_rx_queue(struct
+@@ -7389,7 +7393,7 @@ static void stmmac_reset_rx_queue(struct
static void stmmac_reset_tx_queue(struct stmmac_priv *priv, u32 queue)
{
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 c8544fcda3..be5643df7f 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
@@ -17,7 +17,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -1284,7 +1284,8 @@ static int stmmac_phy_setup(struct stmma
+@@ -1285,7 +1285,8 @@ static int stmmac_phy_setup(struct stmma
return 0;
}
@@ -27,7 +27,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
{
u32 rx_cnt = priv->plat->rx_queues_to_use;
unsigned int desc_size;
-@@ -1293,7 +1294,7 @@ static void stmmac_display_rx_rings(stru
+@@ -1294,7 +1295,7 @@ static void stmmac_display_rx_rings(stru
/* Display RX rings */
for (queue = 0; queue < rx_cnt; queue++) {
@@ -36,7 +36,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
pr_info("\tRX Queue %u rings\n", queue);
-@@ -1306,12 +1307,13 @@ static void stmmac_display_rx_rings(stru
+@@ -1307,12 +1308,13 @@ static void stmmac_display_rx_rings(stru
}
/* Display RX ring */
@@ -52,7 +52,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
{
u32 tx_cnt = priv->plat->tx_queues_to_use;
unsigned int desc_size;
-@@ -1320,7 +1322,7 @@ static void stmmac_display_tx_rings(stru
+@@ -1321,7 +1323,7 @@ static void stmmac_display_tx_rings(stru
/* Display TX rings */
for (queue = 0; queue < tx_cnt; queue++) {
@@ -61,7 +61,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
pr_info("\tTX Queue %d rings\n", queue);
-@@ -1335,18 +1337,19 @@ static void stmmac_display_tx_rings(stru
+@@ -1336,18 +1338,19 @@ static void stmmac_display_tx_rings(stru
desc_size = sizeof(struct dma_desc);
}
@@ -85,7 +85,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
}
static int stmmac_set_bfsize(int mtu, int bufsize)
-@@ -1370,44 +1373,50 @@ static int stmmac_set_bfsize(int mtu, in
+@@ -1371,44 +1374,50 @@ static int stmmac_set_bfsize(int mtu, in
/**
* stmmac_clear_rx_descriptors - clear RX descriptors
* @priv: driver private structure
@@ -147,7 +147,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
struct dma_desc *p;
if (priv->extend_desc)
-@@ -1424,10 +1433,12 @@ static void stmmac_clear_tx_descriptors(
+@@ -1425,10 +1434,12 @@ static void stmmac_clear_tx_descriptors(
/**
* stmmac_clear_descriptors - clear descriptors
* @priv: driver private structure
@@ -161,7 +161,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
{
u32 rx_queue_cnt = priv->plat->rx_queues_to_use;
u32 tx_queue_cnt = priv->plat->tx_queues_to_use;
-@@ -1435,16 +1446,17 @@ static void stmmac_clear_descriptors(str
+@@ -1436,16 +1447,17 @@ static void stmmac_clear_descriptors(str
/* Clear the RX descriptors */
for (queue = 0; queue < rx_queue_cnt; queue++)
@@ -181,7 +181,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
* @p: descriptor pointer
* @i: descriptor index
* @flags: gfp flag
-@@ -1452,10 +1464,12 @@ static void stmmac_clear_descriptors(str
+@@ -1453,10 +1465,12 @@ static void stmmac_clear_descriptors(str
* Description: this function is called to allocate a receive buffer, perform
* the DMA mapping and init the descriptor.
*/
@@ -196,7 +196,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
struct stmmac_rx_buffer *buf = &rx_q->buf_pool[i];
if (!buf->page) {
-@@ -1480,7 +1494,7 @@ static int stmmac_init_rx_buffers(struct
+@@ -1481,7 +1495,7 @@ static int stmmac_init_rx_buffers(struct
buf->addr = page_pool_get_dma_addr(buf->page) + buf->page_offset;
stmmac_set_desc_addr(priv, p, buf->addr);
@@ -205,7 +205,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
stmmac_init_desc3(priv, p);
return 0;
-@@ -1489,12 +1503,13 @@ static int stmmac_init_rx_buffers(struct
+@@ -1490,12 +1504,13 @@ static int stmmac_init_rx_buffers(struct
/**
* stmmac_free_rx_buffer - free RX dma buffers
* @priv: private structure
@@ -222,7 +222,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
struct stmmac_rx_buffer *buf = &rx_q->buf_pool[i];
if (buf->page)
-@@ -1509,12 +1524,15 @@ static void stmmac_free_rx_buffer(struct
+@@ -1510,12 +1525,15 @@ static void stmmac_free_rx_buffer(struct
/**
* stmmac_free_tx_buffer - free RX dma buffers
* @priv: private structure
@@ -240,7 +240,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
if (tx_q->tx_skbuff_dma[i].buf &&
tx_q->tx_skbuff_dma[i].buf_type != STMMAC_TXBUF_T_XDP_TX) {
-@@ -1553,23 +1571,28 @@ static void stmmac_free_tx_buffer(struct
+@@ -1554,23 +1572,28 @@ static void stmmac_free_tx_buffer(struct
/**
* dma_free_rx_skbufs - free RX dma buffers
* @priv: private structure
@@ -276,7 +276,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
struct dma_desc *p;
int ret;
-@@ -1578,7 +1601,7 @@ static int stmmac_alloc_rx_buffers(struc
+@@ -1579,7 +1602,7 @@ static int stmmac_alloc_rx_buffers(struc
else
p = rx_q->dma_rx + i;
@@ -285,7 +285,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
queue);
if (ret)
return ret;
-@@ -1592,14 +1615,17 @@ static int stmmac_alloc_rx_buffers(struc
+@@ -1593,14 +1616,17 @@ static int stmmac_alloc_rx_buffers(struc
/**
* dma_free_rx_xskbufs - free RX dma buffers from XSK pool
* @priv: private structure
@@ -306,7 +306,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
struct stmmac_rx_buffer *buf = &rx_q->buf_pool[i];
if (!buf->xdp)
-@@ -1610,12 +1636,14 @@ static void dma_free_rx_xskbufs(struct s
+@@ -1611,12 +1637,14 @@ static void dma_free_rx_xskbufs(struct s
}
}
@@ -324,7 +324,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
struct stmmac_rx_buffer *buf;
dma_addr_t dma_addr;
struct dma_desc *p;
-@@ -1650,22 +1678,25 @@ static struct xsk_buff_pool *stmmac_get_
+@@ -1651,22 +1679,25 @@ static struct xsk_buff_pool *stmmac_get_
/**
* __init_dma_rx_desc_rings - init the RX descriptor ring (per queue)
* @priv: driver private structure
@@ -353,7 +353,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
xdp_rxq_info_unreg_mem_model(&rx_q->xdp_rxq);
-@@ -1692,9 +1723,9 @@ static int __init_dma_rx_desc_rings(stru
+@@ -1693,9 +1724,9 @@ static int __init_dma_rx_desc_rings(stru
/* RX XDP ZC buffer pool may not be populated, e.g.
* xdpsock TX-only.
*/
@@ -365,7 +365,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
if (ret < 0)
return -ENOMEM;
}
-@@ -1704,17 +1735,19 @@ static int __init_dma_rx_desc_rings(stru
+@@ -1705,17 +1736,19 @@ static int __init_dma_rx_desc_rings(stru
if (priv->extend_desc)
stmmac_mode_init(priv, rx_q->dma_erx,
rx_q->dma_rx_phy,
@@ -388,7 +388,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
{
struct stmmac_priv *priv = netdev_priv(dev);
u32 rx_count = priv->plat->rx_queues_to_use;
-@@ -1726,7 +1759,7 @@ static int init_dma_rx_desc_rings(struct
+@@ -1727,7 +1760,7 @@ static int init_dma_rx_desc_rings(struct
"SKB addresses:\nskb\t\tskb data\tdma data\n");
for (queue = 0; queue < rx_count; queue++) {
@@ -397,7 +397,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
if (ret)
goto err_init_rx_buffers;
}
-@@ -1735,12 +1768,12 @@ static int init_dma_rx_desc_rings(struct
+@@ -1736,12 +1769,12 @@ static int init_dma_rx_desc_rings(struct
err_init_rx_buffers:
while (queue >= 0) {
@@ -413,7 +413,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
rx_q->buf_alloc_num = 0;
rx_q->xsk_pool = NULL;
-@@ -1757,14 +1790,17 @@ err_init_rx_buffers:
+@@ -1758,14 +1791,17 @@ err_init_rx_buffers:
/**
* __init_dma_tx_desc_rings - init the TX descriptor ring (per queue)
* @priv: driver private structure
@@ -434,7 +434,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
int i;
netif_dbg(priv, probe, priv->dev,
-@@ -1776,16 +1812,16 @@ static int __init_dma_tx_desc_rings(stru
+@@ -1777,16 +1813,16 @@ static int __init_dma_tx_desc_rings(stru
if (priv->extend_desc)
stmmac_mode_init(priv, tx_q->dma_etx,
tx_q->dma_tx_phy,
@@ -454,7 +454,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
struct dma_desc *p;
if (priv->extend_desc)
-@@ -1807,7 +1843,8 @@ static int __init_dma_tx_desc_rings(stru
+@@ -1808,7 +1844,8 @@ static int __init_dma_tx_desc_rings(stru
return 0;
}
@@ -464,7 +464,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
{
struct stmmac_priv *priv = netdev_priv(dev);
u32 tx_queue_cnt;
-@@ -1816,7 +1853,7 @@ static int init_dma_tx_desc_rings(struct
+@@ -1817,7 +1854,7 @@ static int init_dma_tx_desc_rings(struct
tx_queue_cnt = priv->plat->tx_queues_to_use;
for (queue = 0; queue < tx_queue_cnt; queue++)
@@ -473,7 +473,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
return 0;
}
-@@ -1824,26 +1861,29 @@ static int init_dma_tx_desc_rings(struct
+@@ -1825,26 +1862,29 @@ static int init_dma_tx_desc_rings(struct
/**
* init_dma_desc_rings - init the RX/TX descriptor rings
* @dev: net device structure
@@ -508,7 +508,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
return ret;
}
-@@ -1851,17 +1891,20 @@ static int init_dma_desc_rings(struct ne
+@@ -1852,17 +1892,20 @@ static int init_dma_desc_rings(struct ne
/**
* dma_free_tx_skbufs - free TX dma buffers
* @priv: private structure
@@ -533,7 +533,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
if (tx_q->xsk_pool && tx_q->xsk_frames_done) {
xsk_tx_completed(tx_q->xsk_pool, tx_q->xsk_frames_done);
-@@ -1880,34 +1923,37 @@ static void stmmac_free_tx_skbufs(struct
+@@ -1881,34 +1924,37 @@ static void stmmac_free_tx_skbufs(struct
u32 queue;
for (queue = 0; queue < tx_queue_cnt; queue++)
@@ -578,7 +578,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
sizeof(struct dma_extended_desc),
rx_q->dma_erx, rx_q->dma_rx_phy);
-@@ -1919,29 +1965,33 @@ static void __free_dma_rx_desc_resources
+@@ -1920,29 +1966,33 @@ static void __free_dma_rx_desc_resources
page_pool_destroy(rx_q->page_pool);
}
@@ -617,7 +617,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
if (priv->extend_desc) {
size = sizeof(struct dma_extended_desc);
-@@ -1954,7 +2004,7 @@ static void __free_dma_tx_desc_resources
+@@ -1955,7 +2005,7 @@ static void __free_dma_tx_desc_resources
addr = tx_q->dma_tx;
}
@@ -626,7 +626,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
dma_free_coherent(priv->device, size, addr, tx_q->dma_tx_phy);
-@@ -1962,28 +2012,32 @@ static void __free_dma_tx_desc_resources
+@@ -1963,28 +2013,32 @@ static void __free_dma_tx_desc_resources
kfree(tx_q->tx_skbuff);
}
@@ -663,7 +663,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
struct stmmac_channel *ch = &priv->channel[queue];
bool xdp_prog = stmmac_xdp_is_enabled(priv);
struct page_pool_params pp_params = { 0 };
-@@ -1995,8 +2049,8 @@ static int __alloc_dma_rx_desc_resources
+@@ -1996,8 +2050,8 @@ static int __alloc_dma_rx_desc_resources
rx_q->priv_data = priv;
pp_params.flags = PP_FLAG_DMA_MAP | PP_FLAG_DMA_SYNC_DEV;
@@ -674,7 +674,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
pp_params.order = ilog2(num_pages);
pp_params.nid = dev_to_node(priv->device);
pp_params.dev = priv->device;
-@@ -2011,7 +2065,7 @@ static int __alloc_dma_rx_desc_resources
+@@ -2012,7 +2066,7 @@ static int __alloc_dma_rx_desc_resources
return ret;
}
@@ -683,7 +683,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
sizeof(*rx_q->buf_pool),
GFP_KERNEL);
if (!rx_q->buf_pool)
-@@ -2019,7 +2073,7 @@ static int __alloc_dma_rx_desc_resources
+@@ -2020,7 +2074,7 @@ static int __alloc_dma_rx_desc_resources
if (priv->extend_desc) {
rx_q->dma_erx = dma_alloc_coherent(priv->device,
@@ -692,7 +692,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
sizeof(struct dma_extended_desc),
&rx_q->dma_rx_phy,
GFP_KERNEL);
-@@ -2028,7 +2082,7 @@ static int __alloc_dma_rx_desc_resources
+@@ -2029,7 +2083,7 @@ static int __alloc_dma_rx_desc_resources
} else {
rx_q->dma_rx = dma_alloc_coherent(priv->device,
@@ -701,7 +701,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
sizeof(struct dma_desc),
&rx_q->dma_rx_phy,
GFP_KERNEL);
-@@ -2053,7 +2107,8 @@ static int __alloc_dma_rx_desc_resources
+@@ -2054,7 +2108,8 @@ static int __alloc_dma_rx_desc_resources
return 0;
}
@@ -711,7 +711,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
{
u32 rx_count = priv->plat->rx_queues_to_use;
u32 queue;
-@@ -2061,7 +2116,7 @@ static int alloc_dma_rx_desc_resources(s
+@@ -2062,7 +2117,7 @@ static int alloc_dma_rx_desc_resources(s
/* RX queues buffers and DMA */
for (queue = 0; queue < rx_count; queue++) {
@@ -720,7 +720,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
if (ret)
goto err_dma;
}
-@@ -2069,7 +2124,7 @@ static int alloc_dma_rx_desc_resources(s
+@@ -2070,7 +2125,7 @@ static int alloc_dma_rx_desc_resources(s
return 0;
err_dma:
@@ -729,7 +729,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
return ret;
}
-@@ -2077,28 +2132,31 @@ err_dma:
+@@ -2078,28 +2133,31 @@ err_dma:
/**
* __alloc_dma_tx_desc_resources - alloc TX resources (per queue).
* @priv: private structure
@@ -765,7 +765,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
sizeof(struct sk_buff *),
GFP_KERNEL);
if (!tx_q->tx_skbuff)
-@@ -2111,7 +2169,7 @@ static int __alloc_dma_tx_desc_resources
+@@ -2112,7 +2170,7 @@ static int __alloc_dma_tx_desc_resources
else
size = sizeof(struct dma_desc);
@@ -774,7 +774,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
addr = dma_alloc_coherent(priv->device, size,
&tx_q->dma_tx_phy, GFP_KERNEL);
-@@ -2128,7 +2186,8 @@ static int __alloc_dma_tx_desc_resources
+@@ -2129,7 +2187,8 @@ static int __alloc_dma_tx_desc_resources
return 0;
}
@@ -784,7 +784,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
{
u32 tx_count = priv->plat->tx_queues_to_use;
u32 queue;
-@@ -2136,7 +2195,7 @@ static int alloc_dma_tx_desc_resources(s
+@@ -2137,7 +2196,7 @@ static int alloc_dma_tx_desc_resources(s
/* TX queues buffers and DMA */
for (queue = 0; queue < tx_count; queue++) {
@@ -793,7 +793,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
if (ret)
goto err_dma;
}
-@@ -2144,27 +2203,29 @@ static int alloc_dma_tx_desc_resources(s
+@@ -2145,27 +2204,29 @@ static int alloc_dma_tx_desc_resources(s
return 0;
err_dma:
@@ -827,7 +827,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
return ret;
}
-@@ -2172,16 +2233,18 @@ static int alloc_dma_desc_resources(stru
+@@ -2173,16 +2234,18 @@ static int alloc_dma_desc_resources(stru
/**
* free_dma_desc_resources - free dma desc resources
* @priv: private structure
@@ -849,7 +849,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
}
/**
-@@ -2670,8 +2733,8 @@ static void stmmac_tx_err(struct stmmac_
+@@ -2671,8 +2734,8 @@ static void stmmac_tx_err(struct stmmac_
netif_tx_stop_queue(netdev_get_tx_queue(priv->dev, chan));
stmmac_stop_tx_dma(priv, chan);
@@ -860,7 +860,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
stmmac_reset_tx_queue(priv, chan);
stmmac_init_tx_chan(priv, priv->ioaddr, priv->plat->dma_cfg,
tx_q->dma_tx_phy, chan);
-@@ -3668,19 +3731,93 @@ static int stmmac_request_irq(struct net
+@@ -3669,19 +3732,93 @@ static int stmmac_request_irq(struct net
}
/**
@@ -957,7 +957,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
u32 chan;
int ret;
-@@ -3707,45 +3844,10 @@ static int stmmac_open(struct net_device
+@@ -3708,45 +3845,10 @@ static int stmmac_open(struct net_device
memset(&priv->xstats, 0, sizeof(struct stmmac_extra_stats));
priv->xstats.threshold = tc;
@@ -1005,7 +1005,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
stmmac_reset_queues_param(priv);
-@@ -3779,14 +3881,28 @@ irq_error:
+@@ -3780,14 +3882,28 @@ irq_error:
stmmac_hw_teardown(dev);
init_error:
@@ -1036,7 +1036,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
static void stmmac_fpe_stop_wq(struct stmmac_priv *priv)
{
set_bit(__FPE_REMOVING, &priv->fpe_task_state);
-@@ -3833,7 +3949,7 @@ static int stmmac_release(struct net_dev
+@@ -3834,7 +3950,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 at kernel.org>
/* Disable the MAC Rx/Tx */
stmmac_mac_set(priv, priv->ioaddr, false);
-@@ -6368,7 +6484,7 @@ void stmmac_disable_rx_queue(struct stmm
+@@ -6369,7 +6485,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 at kernel.org>
}
void stmmac_enable_rx_queue(struct stmmac_priv *priv, u32 queue)
-@@ -6379,21 +6495,21 @@ void stmmac_enable_rx_queue(struct stmma
+@@ -6380,21 +6496,21 @@ void stmmac_enable_rx_queue(struct stmma
u32 buf_size;
int ret;
@@ -1080,7 +1080,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
stmmac_init_rx_chan(priv, priv->ioaddr, priv->plat->dma_cfg,
rx_q->dma_rx_phy, rx_q->queue_index);
-@@ -6431,7 +6547,7 @@ void stmmac_disable_tx_queue(struct stmm
+@@ -6432,7 +6548,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 at kernel.org>
}
void stmmac_enable_tx_queue(struct stmmac_priv *priv, u32 queue)
-@@ -6441,21 +6557,21 @@ void stmmac_enable_tx_queue(struct stmma
+@@ -6442,21 +6558,21 @@ void stmmac_enable_tx_queue(struct stmma
unsigned long flags;
int ret;
@@ -1115,7 +1115,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
stmmac_init_tx_chan(priv, priv->ioaddr, priv->plat->dma_cfg,
tx_q->dma_tx_phy, tx_q->queue_index);
-@@ -6492,7 +6608,7 @@ void stmmac_xdp_release(struct net_devic
+@@ -6493,7 +6609,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 at kernel.org>
/* Disable the MAC Rx/Tx */
stmmac_mac_set(priv, priv->ioaddr, false);
-@@ -6517,14 +6633,14 @@ int stmmac_xdp_open(struct net_device *d
+@@ -6518,14 +6634,14 @@ int stmmac_xdp_open(struct net_device *d
u32 chan;
int ret;
@@ -1141,7 +1141,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
if (ret < 0) {
netdev_err(dev, "%s: DMA descriptors initialization failed\n",
__func__);
-@@ -6606,7 +6722,7 @@ irq_error:
+@@ -6607,7 +6723,7 @@ irq_error:
stmmac_hw_teardown(dev);
init_error:
@@ -1150,7 +1150,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
dma_desc_error:
return ret;
}
-@@ -7475,7 +7591,7 @@ int stmmac_resume(struct device *dev)
+@@ -7476,7 +7592,7 @@ int stmmac_resume(struct device *dev)
stmmac_reset_queues_param(priv);
stmmac_free_tx_skbufs(priv);
diff --git a/target/linux/generic/backport-5.15/775-v6.0-05-net-ethernet-stmicro-stmmac-permit-MTU-change-with-i.patch b/target/linux/generic/backport-5.15/775-v6.0-05-net-ethernet-stmicro-stmmac-permit-MTU-change-with-i.patch
index c5b332878e..536c7334ec 100644
--- a/target/linux/generic/backport-5.15/775-v6.0-05-net-ethernet-stmicro-stmmac-permit-MTU-change-with-i.patch
+++ b/target/linux/generic/backport-5.15/775-v6.0-05-net-ethernet-stmicro-stmmac-permit-MTU-change-with-i.patch
@@ -19,7 +19,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -5597,18 +5597,15 @@ static int stmmac_change_mtu(struct net_
+@@ -5598,18 +5598,15 @@ static int stmmac_change_mtu(struct net_
{
struct stmmac_priv *priv = netdev_priv(dev);
int txfifosz = priv->plat->tx_fifo_size;
@@ -40,7 +40,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
if (stmmac_xdp_is_enabled(priv) && new_mtu > ETH_DATA_LEN) {
netdev_dbg(priv->dev, "Jumbo frames not supported for XDP\n");
return -EINVAL;
-@@ -5620,8 +5617,29 @@ static int stmmac_change_mtu(struct net_
+@@ -5621,8 +5618,29 @@ static int stmmac_change_mtu(struct net_
if ((txfifosz < new_mtu) || (new_mtu > BUF_SIZE_16KiB))
return -EINVAL;
More information about the lede-commits
mailing list