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>

diff --git a/include/kernel-5.15 b/include/kernel-5.15
index ab1500f4b2919fd3104330b25817b52cd850fb26..1d1c654c2c60d75c2842c3c3e99a30197a552be4 100644 (file)
--- a/include/kernel-5.15
+++ b/include/kernel-5.15
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .90
-LINUX_KERNEL_HASH-5.15.90 = e6fd430022686753af7516fe7544f96aab379509dc5b7829017bdcd92b393b42
+LINUX_VERSION-5.15 = .91
+LINUX_KERNEL_HASH-5.15.91 = a63c2bb1beb15f1aea9c63cf80559f5b7ab58afd2da2fa5e7670c515ebe1fe80

diff --git a/target/linux/bcm27xx/patches-5.15/950-0040-spi-spidev-Completely-disable-the-spidev-warning.patch b/target/linux/bcm27xx/patches-5.15/950-0040-spi-spidev-Completely-disable-the-spidev-warning.patch
index ff9a6b09a2720ecb61e670ce44c29daf6a50257c..8fa7c55aa6cffb059a08df428efccf8c27c2de2c 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0040-spi-spidev-Completely-disable-the-spidev-warning.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0040-spi-spidev-Completely-disable-the-spidev-warning.patch
@@ -13,7 +13,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 
 --- a/drivers/spi/spidev.c
 +++ b/drivers/spi/spidev.c
-@@ -761,7 +761,7 @@ static int spidev_probe(struct spi_devic
+@@ -759,7 +759,7 @@ static int spidev_probe(struct spi_devic
         * compatible string, it is a Linux implementation thing
         * rather than a description of the hardware.
         */

diff --git a/target/linux/bcm27xx/patches-5.15/950-0163-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch b/target/linux/bcm27xx/patches-5.15/950-0163-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch
index 5ba007744597d0e7f7ff41cff1d15f254744b789..3cd85fe657f2871f6b7918e09d8e1249e77c249b 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0163-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0163-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch
@@ -33,7 +33,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  #define USB_VENDOR_ID_BELKIN          0x050d
  #define USB_DEVICE_ID_FLIP_KVM                0x3201
  
-@@ -1316,6 +1319,9 @@
+@@ -1315,6 +1318,9 @@
  #define USB_VENDOR_ID_XAT     0x2505
  #define USB_DEVICE_ID_XAT_CSR 0x0220
  
@@ -53,7 +53,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
        { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH), HID_QUIRK_MULTI_INPUT },
        { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL },
        { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE2), HID_QUIRK_ALWAYS_POLL },
-@@ -198,6 +199,7 @@ static const struct hid_device_id hid_qu
+@@ -197,6 +198,7 @@ static const struct hid_device_id hid_qu
        { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
        { HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE), HID_QUIRK_MULTI_INPUT },
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_GROUP_AUDIO), HID_QUIRK_NOGET },

diff --git a/target/linux/bcm27xx/patches-5.15/950-0578-spi-spidev-Restore-loading-from-Device-Tree.patch b/target/linux/bcm27xx/patches-5.15/950-0578-spi-spidev-Restore-loading-from-Device-Tree.patch
index 1fb800fee21fc5b139c4b1cc1b304b18e6c9c9cf..e3856fa117c7c51d0a7ec70dff5e3865b510224a 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0578-spi-spidev-Restore-loading-from-Device-Tree.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0578-spi-spidev-Restore-loading-from-Device-Tree.patch
@@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 
 --- a/drivers/spi/spidev.c
 +++ b/drivers/spi/spidev.c
-@@ -680,6 +680,7 @@ static const struct file_operations spid
+@@ -678,6 +678,7 @@ static const struct file_operations spid
  static struct class *spidev_class;
  
  static const struct spi_device_id spidev_spi_ids[] = {

diff --git a/target/linux/generic/backport-5.15/005-v5.17-01-Kbuild-use-Wdeclaration-after-statement.patch b/target/linux/generic/backport-5.15/005-v5.17-01-Kbuild-use-Wdeclaration-after-statement.patch
index ff4c6d7041fbef2380d55e9bc7d38fc2cfcd3000..092addcd5d231826b338f6baad15adb8c4ffd551 100644 (file)
--- a/target/linux/generic/backport-5.15/005-v5.17-01-Kbuild-use-Wdeclaration-after-statement.patch
+++ b/target/linux/generic/backport-5.15/005-v5.17-01-Kbuild-use-Wdeclaration-after-statement.patch
@@ -37,8 +37,8 @@ Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
 
 --- a/Makefile
 +++ b/Makefile
-@@ -432,7 +432,8 @@ HOSTCXX    = g++
- endif
+@@ -433,7 +433,8 @@ endif
+ HOSTPKG_CONFIG        = pkg-config
  
  export KBUILD_USERCFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes \
 -                            -O2 -fomit-frame-pointer -std=gnu89

diff --git a/target/linux/generic/backport-5.15/005-v5.17-02-Kbuild-move-to-std-gnu11.patch b/target/linux/generic/backport-5.15/005-v5.17-02-Kbuild-move-to-std-gnu11.patch
index d22eefb7733bac6781721c600df746e87d278892..3bcf480cb2297b059d321afe649175a1d84964c5 100644 (file)
--- a/target/linux/generic/backport-5.15/005-v5.17-02-Kbuild-move-to-std-gnu11.patch
+++ b/target/linux/generic/backport-5.15/005-v5.17-02-Kbuild-move-to-std-gnu11.patch
@@ -49,7 +49,7 @@ Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
 
 --- a/Makefile
 +++ b/Makefile
-@@ -516,7 +516,7 @@ KBUILD_CFLAGS   := -Wall -Wundef -Werror
+@@ -517,7 +517,7 @@ KBUILD_CFLAGS   := -Wall -Wundef -Werror
                   -fno-strict-aliasing -fno-common -fshort-wchar -fno-PIE \
                   -Werror=implicit-function-declaration -Werror=implicit-int \
                   -Werror=return-type -Wno-format-security \

diff --git a/target/linux/generic/backport-5.15/005-v5.17-03-Kbuild-use-std-gnu11-for-KBUILD_USERCFLAGS.patch b/target/linux/generic/backport-5.15/005-v5.17-03-Kbuild-use-std-gnu11-for-KBUILD_USERCFLAGS.patch
index 198c9e671ab627c2176f2543d1779ae0cdcd84c4..91121b7bacb74400f304a31101fc2ed2a491d2a3 100644 (file)
--- a/target/linux/generic/backport-5.15/005-v5.17-03-Kbuild-use-std-gnu11-for-KBUILD_USERCFLAGS.patch
+++ b/target/linux/generic/backport-5.15/005-v5.17-03-Kbuild-use-std-gnu11-for-KBUILD_USERCFLAGS.patch
@@ -32,8 +32,8 @@ Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
 
 --- a/Makefile
 +++ b/Makefile
-@@ -432,7 +432,7 @@ HOSTCXX    = g++
- endif
+@@ -433,7 +433,7 @@ endif
+ HOSTPKG_CONFIG        = pkg-config
  
  export KBUILD_USERCFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes \
 -                            -O2 -fomit-frame-pointer -std=gnu89 \

diff --git a/target/linux/generic/backport-5.15/020-v6.1-05-mm-multigenerational-lru-mm_struct-list.patch b/target/linux/generic/backport-5.15/020-v6.1-05-mm-multigenerational-lru-mm_struct-list.patch
index 5b5cbe721e0b602fa5d8a237960ef66887e8d1fa..833d3f97f4059e96770545c92bdd09cf4270dad3 100644 (file)
--- a/target/linux/generic/backport-5.15/020-v6.1-05-mm-multigenerational-lru-mm_struct-list.patch
+++ b/target/linux/generic/backport-5.15/020-v6.1-05-mm-multigenerational-lru-mm_struct-list.patch
@@ -287,7 +287,7 @@ Change-Id: I25d9eda8c6bdc7c3653b9f210a159d6c247c81e8
        struct pglist_data *pgdat;
 --- a/kernel/exit.c
 +++ b/kernel/exit.c
-@@ -422,6 +422,7 @@ assign_new_owner:
+@@ -469,6 +469,7 @@ assign_new_owner:
                goto retry;
        }
        WRITE_ONCE(mm->owner, c);

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 521bad896af12483b089b6967dff8d2a211cfab7..92e08bb4e3ef5b2307ec741c9a4806ab66424921 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);
  
-@@ -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;
  

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 ee3b92f06ba60bb9da7ae698a6e1ccaf17267f7d..e3c15061b8d7de3ccb86f82116b725df024ab486 100644 (file)
--- 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@kernel.org>
 
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -3826,8 +3826,6 @@ static int stmmac_release(struct net_dev
+@@ -3831,8 +3831,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@kernel.org>
        if (device_may_wakeup(priv->device))
                phylink_speed_down(priv->phylink, false);
        /* Stop and disconnect the PHY */
-@@ -3839,6 +3837,8 @@ static int stmmac_release(struct net_dev
+@@ -3844,6 +3842,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 e65d8b1960ceeebadd81f1513428eacbd5964539..3903eb05650df2cf63d13aa081a81164f35c8efc 100644 (file)
--- 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@kernel.org>
  
                if (tx_q->dirty_tx != tx_q->cur_tx)
                        return -EBUSY; /* still unfinished work */
-@@ -1302,7 +1302,7 @@ static void stmmac_display_rx_rings(stru
+@@ -1307,7 +1307,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@kernel.org>
  
                pr_info("\tRX Queue %u rings\n", queue);
  
-@@ -1315,7 +1315,7 @@ static void stmmac_display_rx_rings(stru
+@@ -1320,7 +1320,7 @@ static void stmmac_display_rx_rings(stru
                }
  
                /* Display RX ring */
@@ -207,7 +207,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                                    rx_q->dma_rx_phy, desc_size);
        }
  }
-@@ -1329,7 +1329,7 @@ static void stmmac_display_tx_rings(stru
+@@ -1334,7 +1334,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@kernel.org>
  
                pr_info("\tTX Queue %d rings\n", queue);
  
-@@ -1344,7 +1344,7 @@ static void stmmac_display_tx_rings(stru
+@@ -1349,7 +1349,7 @@ static void stmmac_display_tx_rings(stru
                        desc_size = sizeof(struct dma_desc);
                }
  
@@ -225,7 +225,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                                    tx_q->dma_tx_phy, desc_size);
        }
  }
-@@ -1385,21 +1385,21 @@ static int stmmac_set_bfsize(int mtu, in
+@@ -1390,21 +1390,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@kernel.org>
  }
  
  /**
-@@ -1411,12 +1411,12 @@ static void stmmac_clear_rx_descriptors(
+@@ -1416,12 +1416,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@kernel.org>
                struct dma_desc *p;
  
                if (priv->extend_desc)
-@@ -1464,7 +1464,7 @@ static void stmmac_clear_descriptors(str
+@@ -1469,7 +1469,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@kernel.org>
        struct stmmac_rx_buffer *buf = &rx_q->buf_pool[i];
  
        if (!buf->page) {
-@@ -1489,7 +1489,7 @@ static int stmmac_init_rx_buffers(struct
+@@ -1494,7 +1494,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@kernel.org>
                stmmac_init_desc3(priv, p);
  
        return 0;
-@@ -1503,7 +1503,7 @@ static int stmmac_init_rx_buffers(struct
+@@ -1508,7 +1508,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@kernel.org>
        struct stmmac_rx_buffer *buf = &rx_q->buf_pool[i];
  
        if (buf->page)
-@@ -1523,7 +1523,7 @@ static void stmmac_free_rx_buffer(struct
+@@ -1528,7 +1528,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@kernel.org>
  
        if (tx_q->tx_skbuff_dma[i].buf &&
            tx_q->tx_skbuff_dma[i].buf_type != STMMAC_TXBUF_T_XDP_TX) {
-@@ -1568,17 +1568,17 @@ static void dma_free_rx_skbufs(struct st
+@@ -1573,17 +1573,17 @@ static void dma_free_rx_skbufs(struct st
  {
        int i;
  
@@ -326,7 +326,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                struct dma_desc *p;
                int ret;
  
-@@ -1605,10 +1605,10 @@ static int stmmac_alloc_rx_buffers(struc
+@@ -1610,10 +1610,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@kernel.org>
                struct stmmac_rx_buffer *buf = &rx_q->buf_pool[i];
  
                if (!buf->xdp)
-@@ -1621,10 +1621,10 @@ static void dma_free_rx_xskbufs(struct s
+@@ -1626,10 +1626,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@kernel.org>
                struct stmmac_rx_buffer *buf;
                dma_addr_t dma_addr;
                struct dma_desc *p;
-@@ -1667,7 +1667,7 @@ static struct xsk_buff_pool *stmmac_get_
+@@ -1672,7 +1672,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@kernel.org>
        int ret;
  
        netif_dbg(priv, probe, priv->dev,
-@@ -1713,11 +1713,11 @@ static int __init_dma_rx_desc_rings(stru
+@@ -1718,11 +1718,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@kernel.org>
        }
  
        return 0;
-@@ -1744,7 +1744,7 @@ static int init_dma_rx_desc_rings(struct
+@@ -1749,7 +1749,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@kernel.org>
  
                if (rx_q->xsk_pool)
                        dma_free_rx_xskbufs(priv, queue);
-@@ -1773,7 +1773,7 @@ err_init_rx_buffers:
+@@ -1778,7 +1778,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@kernel.org>
        int i;
  
        netif_dbg(priv, probe, priv->dev,
-@@ -1785,16 +1785,16 @@ static int __init_dma_tx_desc_rings(stru
+@@ -1790,16 +1790,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@kernel.org>
                struct dma_desc *p;
  
                if (priv->extend_desc)
-@@ -1864,12 +1864,12 @@ static int init_dma_desc_rings(struct ne
+@@ -1869,12 +1869,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@kernel.org>
                stmmac_free_tx_buffer(priv, queue, i);
  
        if (tx_q->xsk_pool && tx_q->xsk_frames_done) {
-@@ -1899,7 +1899,7 @@ static void stmmac_free_tx_skbufs(struct
+@@ -1904,7 +1904,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@kernel.org>
  
        /* Release the DMA RX socket buffers */
        if (rx_q->xsk_pool)
-@@ -1912,11 +1912,11 @@ static void __free_dma_rx_desc_resources
+@@ -1917,11 +1917,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@kernel.org>
                                  sizeof(struct dma_extended_desc),
                                  rx_q->dma_erx, rx_q->dma_rx_phy);
  
-@@ -1945,7 +1945,7 @@ static void free_dma_rx_desc_resources(s
+@@ -1950,7 +1950,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@kernel.org>
        size_t size;
        void *addr;
  
-@@ -1963,7 +1963,7 @@ static void __free_dma_tx_desc_resources
+@@ -1968,7 +1968,7 @@ static void __free_dma_tx_desc_resources
                addr = tx_q->dma_tx;
        }
  
@@ -469,7 +469,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  
        dma_free_coherent(priv->device, size, addr, tx_q->dma_tx_phy);
  
-@@ -1992,7 +1992,7 @@ static void free_dma_tx_desc_resources(s
+@@ -1997,7 +1997,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@kernel.org>
        struct stmmac_channel *ch = &priv->channel[queue];
        bool xdp_prog = stmmac_xdp_is_enabled(priv);
        struct page_pool_params pp_params = { 0 };
-@@ -2004,8 +2004,8 @@ static int __alloc_dma_rx_desc_resources
+@@ -2009,8 +2009,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@kernel.org>
        pp_params.order = ilog2(num_pages);
        pp_params.nid = dev_to_node(priv->device);
        pp_params.dev = priv->device;
-@@ -2020,7 +2020,7 @@ static int __alloc_dma_rx_desc_resources
+@@ -2025,7 +2025,7 @@ static int __alloc_dma_rx_desc_resources
                return ret;
        }
  
@@ -498,7 +498,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                                 sizeof(*rx_q->buf_pool),
                                 GFP_KERNEL);
        if (!rx_q->buf_pool)
-@@ -2028,7 +2028,7 @@ static int __alloc_dma_rx_desc_resources
+@@ -2033,7 +2033,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@kernel.org>
                                                   sizeof(struct dma_extended_desc),
                                                   &rx_q->dma_rx_phy,
                                                   GFP_KERNEL);
-@@ -2037,7 +2037,7 @@ static int __alloc_dma_rx_desc_resources
+@@ -2042,7 +2042,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@kernel.org>
                                                  sizeof(struct dma_desc),
                                                  &rx_q->dma_rx_phy,
                                                  GFP_KERNEL);
-@@ -2094,20 +2094,20 @@ err_dma:
+@@ -2099,20 +2099,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@kernel.org>
                                  sizeof(struct sk_buff *),
                                  GFP_KERNEL);
        if (!tx_q->tx_skbuff)
-@@ -2120,7 +2120,7 @@ static int __alloc_dma_tx_desc_resources
+@@ -2125,7 +2125,7 @@ static int __alloc_dma_tx_desc_resources
        else
                size = sizeof(struct dma_desc);
  
@@ -549,7 +549,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  
        addr = dma_alloc_coherent(priv->device, size,
                                  &tx_q->dma_tx_phy, GFP_KERNEL);
-@@ -2364,7 +2364,7 @@ static void stmmac_dma_operation_mode(st
+@@ -2369,7 +2369,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@kernel.org>
                u32 buf_size;
  
                qmode = priv->plat->rx_queues_cfg[chan].mode_to_use;
-@@ -2379,7 +2379,7 @@ static void stmmac_dma_operation_mode(st
+@@ -2384,7 +2384,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@kernel.org>
                                              chan);
                }
        }
-@@ -2395,7 +2395,7 @@ static void stmmac_dma_operation_mode(st
+@@ -2400,7 +2400,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@kernel.org>
        struct xsk_buff_pool *pool = tx_q->xsk_pool;
        unsigned int entry = tx_q->cur_tx;
        struct dma_desc *tx_desc = NULL;
-@@ -2470,7 +2470,7 @@ static bool stmmac_xdp_xmit_zc(struct st
+@@ -2475,7 +2475,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@kernel.org>
                entry = tx_q->cur_tx;
        }
  
-@@ -2496,7 +2496,7 @@ static bool stmmac_xdp_xmit_zc(struct st
+@@ -2501,7 +2501,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@kernel.org>
        unsigned int bytes_compl = 0, pkts_compl = 0;
        unsigned int entry, xmits = 0, count = 0;
  
-@@ -2509,7 +2509,7 @@ static int stmmac_tx_clean(struct stmmac
+@@ -2514,7 +2514,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@kernel.org>
                struct xdp_frame *xdpf;
                struct sk_buff *skb;
                struct dma_desc *p;
-@@ -2609,7 +2609,7 @@ static int stmmac_tx_clean(struct stmmac
+@@ -2614,7 +2614,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@kernel.org>
        }
        tx_q->dirty_tx = entry;
  
-@@ -2674,7 +2674,7 @@ static int stmmac_tx_clean(struct stmmac
+@@ -2679,7 +2679,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@kernel.org>
  
        netif_tx_stop_queue(netdev_get_tx_queue(priv->dev, chan));
  
-@@ -2741,8 +2741,8 @@ static int stmmac_napi_check(struct stmm
+@@ -2746,8 +2746,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@kernel.org>
        struct stmmac_channel *ch = &priv->channel[chan];
        struct napi_struct *rx_napi;
        struct napi_struct *tx_napi;
-@@ -2918,7 +2918,7 @@ static int stmmac_init_dma_engine(struct
+@@ -2923,7 +2923,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@kernel.org>
  
                stmmac_init_rx_chan(priv, priv->ioaddr, priv->plat->dma_cfg,
                                    rx_q->dma_rx_phy, chan);
-@@ -2932,7 +2932,7 @@ static int stmmac_init_dma_engine(struct
+@@ -2937,7 +2937,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@kernel.org>
  
                stmmac_init_tx_chan(priv, priv->ioaddr, priv->plat->dma_cfg,
                                    tx_q->dma_tx_phy, chan);
-@@ -2947,7 +2947,7 @@ static int stmmac_init_dma_engine(struct
+@@ -2952,7 +2952,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@kernel.org>
  
        hrtimer_start(&tx_q->txtimer,
                      STMMAC_COAL_TIMER(priv->tx_coal_timer[queue]),
-@@ -2997,7 +2997,7 @@ static void stmmac_init_coalesce(struct
+@@ -3002,7 +3002,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@kernel.org>
  
                priv->tx_coal_frames[chan] = STMMAC_TX_FRAMES;
                priv->tx_coal_timer[chan] = STMMAC_COAL_TX_TIMER;
-@@ -3019,12 +3019,12 @@ static void stmmac_set_rings_length(stru
+@@ -3024,12 +3024,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@kernel.org>
  }
  
  /**
-@@ -3359,7 +3359,7 @@ static int stmmac_hw_setup(struct net_de
+@@ -3364,7 +3364,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@kernel.org>
  
                        /* TSO and TBS cannot co-exist */
                        if (tx_q->tbs & STMMAC_TBS_AVAIL)
-@@ -3381,7 +3381,7 @@ static int stmmac_hw_setup(struct net_de
+@@ -3386,7 +3386,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@kernel.org>
                int enable = tx_q->tbs & STMMAC_TBS_AVAIL;
  
                stmmac_enable_tbs(priv, priv->ioaddr, enable, chan);
-@@ -3425,7 +3425,7 @@ static void stmmac_free_irq(struct net_d
+@@ -3430,7 +3430,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@kernel.org>
                        }
                }
                irq_idx = priv->plat->rx_queues_to_use;
-@@ -3434,7 +3434,7 @@ static void stmmac_free_irq(struct net_d
+@@ -3439,7 +3439,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@kernel.org>
                        }
                }
  
-@@ -3567,7 +3567,7 @@ static int stmmac_request_irq_multi_msi(
+@@ -3572,7 +3572,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@kernel.org>
                if (unlikely(ret < 0)) {
                        netdev_err(priv->dev,
                                   "%s: alloc rx-%d  MSI %d (error: %d)\n",
-@@ -3590,7 +3590,7 @@ static int stmmac_request_irq_multi_msi(
+@@ -3595,7 +3595,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@kernel.org>
                if (unlikely(ret < 0)) {
                        netdev_err(priv->dev,
                                   "%s: alloc tx-%d  MSI %d (error: %d)\n",
-@@ -3721,21 +3721,21 @@ static int stmmac_open(struct net_device
+@@ -3726,21 +3726,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@kernel.org>
                int tbs_en = priv->plat->tx_queues_cfg[chan].tbs_en;
  
                /* Setup per-TXQ tbs flag before TX descriptor alloc */
-@@ -3793,7 +3793,7 @@ irq_error:
+@@ -3798,7 +3798,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@kernel.org>
  
        stmmac_hw_teardown(dev);
  init_error:
-@@ -3835,7 +3835,7 @@ static int stmmac_release(struct net_dev
+@@ -3840,7 +3840,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@kernel.org>
  
        netif_tx_disable(dev);
  
-@@ -3899,7 +3899,7 @@ static bool stmmac_vlan_insert(struct st
+@@ -3904,7 +3904,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@kernel.org>
        return true;
  }
  
-@@ -3917,7 +3917,7 @@ static bool stmmac_vlan_insert(struct st
+@@ -3922,7 +3922,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@kernel.org>
        struct dma_desc *desc;
        u32 buff_size;
        int tmp_len;
-@@ -3928,7 +3928,7 @@ static void stmmac_tso_allocator(struct
+@@ -3933,7 +3933,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@kernel.org>
                WARN_ON(tx_q->tx_skbuff[tx_q->cur_tx]);
  
                if (tx_q->tbs & STMMAC_TBS_AVAIL)
-@@ -3956,7 +3956,7 @@ static void stmmac_tso_allocator(struct
+@@ -3961,7 +3961,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@kernel.org>
        int desc_size;
  
        if (likely(priv->extend_desc))
-@@ -4018,7 +4018,7 @@ static netdev_tx_t stmmac_tso_xmit(struc
+@@ -4023,7 +4023,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@kernel.org>
        first_tx = tx_q->cur_tx;
  
        /* Compute header lengths */
-@@ -4058,7 +4058,7 @@ static netdev_tx_t stmmac_tso_xmit(struc
+@@ -4063,7 +4063,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@kernel.org>
                WARN_ON(tx_q->tx_skbuff[tx_q->cur_tx]);
        }
  
-@@ -4170,7 +4170,7 @@ static netdev_tx_t stmmac_tso_xmit(struc
+@@ -4175,7 +4175,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@kernel.org>
  
        if (unlikely(stmmac_tx_avail(priv, queue) <= (MAX_SKB_FRAGS + 1))) {
                netif_dbg(priv, hw, priv->dev, "%s: stop transmitted packets\n",
-@@ -4258,7 +4258,7 @@ static netdev_tx_t stmmac_xmit(struct sk
+@@ -4263,7 +4263,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@kernel.org>
        first_tx = tx_q->cur_tx;
  
        if (priv->tx_path_in_lpi_mode && priv->eee_sw_timer_en)
-@@ -4321,7 +4321,7 @@ static netdev_tx_t stmmac_xmit(struct sk
+@@ -4326,7 +4326,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@kernel.org>
                WARN_ON(tx_q->tx_skbuff[entry]);
  
                if (likely(priv->extend_desc))
-@@ -4392,7 +4392,7 @@ static netdev_tx_t stmmac_xmit(struct sk
+@@ -4397,7 +4397,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@kernel.org>
        tx_q->cur_tx = entry;
  
        if (netif_msg_pktdata(priv)) {
-@@ -4507,7 +4507,7 @@ static void stmmac_rx_vlan(struct net_de
+@@ -4512,7 +4512,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@kernel.org>
        int dirty = stmmac_rx_dirty(priv, queue);
        unsigned int entry = rx_q->dirty_rx;
  
-@@ -4557,7 +4557,7 @@ static inline void stmmac_rx_refill(stru
+@@ -4562,7 +4562,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@kernel.org>
        }
        rx_q->dirty_rx = entry;
        rx_q->rx_tail_addr = rx_q->dma_rx_phy +
-@@ -4585,12 +4585,12 @@ static unsigned int stmmac_rx_buf1_len(s
+@@ -4590,12 +4590,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@kernel.org>
  }
  
  static unsigned int stmmac_rx_buf2_len(struct stmmac_priv *priv,
-@@ -4606,7 +4606,7 @@ static unsigned int stmmac_rx_buf2_len(s
+@@ -4611,7 +4611,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@kernel.org>
  
        plen = stmmac_get_rx_frame_len(priv, p, coe);
  
-@@ -4617,7 +4617,7 @@ static unsigned int stmmac_rx_buf2_len(s
+@@ -4622,7 +4622,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@kernel.org>
        unsigned int entry = tx_q->cur_tx;
        struct dma_desc *tx_desc;
        dma_addr_t dma_addr;
-@@ -4680,7 +4680,7 @@ static int stmmac_xdp_xmit_xdpf(struct s
+@@ -4685,7 +4685,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@kernel.org>
        tx_q->cur_tx = entry;
  
        return STMMAC_XDP_TX;
-@@ -4854,7 +4854,7 @@ static void stmmac_dispatch_skb_zc(struc
+@@ -4859,7 +4859,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@kernel.org>
        unsigned int entry = rx_q->dirty_rx;
        struct dma_desc *rx_desc = NULL;
        bool ret = true;
-@@ -4897,7 +4897,7 @@ static bool stmmac_rx_refill_zc(struct s
+@@ -4902,7 +4902,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@kernel.org>
        }
  
        if (rx_desc) {
-@@ -4912,7 +4912,7 @@ static bool stmmac_rx_refill_zc(struct s
+@@ -4917,7 +4917,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@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;
-@@ -4934,7 +4934,7 @@ static int stmmac_rx_zc(struct stmmac_pr
+@@ -4939,7 +4939,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@kernel.org>
                                    rx_q->dma_rx_phy, desc_size);
        }
        while (count < limit) {
-@@ -4981,7 +4981,7 @@ read_again:
+@@ -4986,7 +4986,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@kernel.org>
                next_entry = rx_q->cur_rx;
  
                if (priv->extend_desc)
-@@ -5102,7 +5102,7 @@ read_again:
+@@ -5107,7 +5107,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@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;
-@@ -5115,7 +5115,7 @@ static int stmmac_rx(struct stmmac_priv
+@@ -5120,7 +5120,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@kernel.org>
  
        if (netif_msg_rx_status(priv)) {
                void *rx_head;
-@@ -5129,7 +5129,7 @@ static int stmmac_rx(struct stmmac_priv
+@@ -5134,7 +5134,7 @@ static int stmmac_rx(struct stmmac_priv
                        desc_size = sizeof(struct dma_desc);
                }
  
@@ -1006,7 +1006,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                                    rx_q->dma_rx_phy, desc_size);
        }
        while (count < limit) {
-@@ -5173,7 +5173,7 @@ read_again:
+@@ -5178,7 +5178,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@kernel.org>
                next_entry = rx_q->cur_rx;
  
                if (priv->extend_desc)
-@@ -5307,7 +5307,7 @@ read_again:
+@@ -5312,7 +5312,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@kernel.org>
  
                        /* Data payload appended into SKB */
                        page_pool_release_page(rx_q->page_pool, buf->page);
-@@ -5319,7 +5319,7 @@ read_again:
+@@ -5324,7 +5324,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@kernel.org>
  
                        /* Data payload appended into SKB */
                        page_pool_release_page(rx_q->page_pool, buf->sec_page);
-@@ -5761,11 +5761,13 @@ static irqreturn_t stmmac_safety_interru
+@@ -5766,11 +5766,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@kernel.org>
  
        if (unlikely(!data)) {
                netdev_err(priv->dev, "%s: invalid dev pointer\n", __func__);
-@@ -5805,10 +5807,12 @@ static irqreturn_t stmmac_msi_intr_tx(in
+@@ -5810,10 +5812,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@kernel.org>
  
        if (unlikely(!data)) {
                netdev_err(priv->dev, "%s: invalid dev pointer\n", __func__);
-@@ -5839,10 +5843,10 @@ static void stmmac_poll_controller(struc
+@@ -5844,10 +5848,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@kernel.org>
        } else {
                disable_irq(dev->irq);
                stmmac_interrupt(dev->irq, dev);
-@@ -6023,34 +6027,34 @@ static int stmmac_rings_status_show(stru
+@@ -6028,34 +6032,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@kernel.org>
                }
        }
  
-@@ -6391,7 +6395,7 @@ void stmmac_disable_rx_queue(struct stmm
+@@ -6396,7 +6400,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@kernel.org>
        struct stmmac_channel *ch = &priv->channel[queue];
        unsigned long flags;
        u32 buf_size;
-@@ -6428,7 +6432,7 @@ void stmmac_enable_rx_queue(struct stmma
+@@ -6433,7 +6437,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@kernel.org>
                                      rx_q->queue_index);
        }
  
-@@ -6454,7 +6458,7 @@ void stmmac_disable_tx_queue(struct stmm
+@@ -6459,7 +6463,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@kernel.org>
        struct stmmac_channel *ch = &priv->channel[queue];
        unsigned long flags;
        int ret;
-@@ -6504,7 +6508,7 @@ void stmmac_xdp_release(struct net_devic
+@@ -6509,7 +6513,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);
-@@ -6563,7 +6567,7 @@ int stmmac_xdp_open(struct net_device *d
+@@ -6568,7 +6572,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);
-@@ -6581,7 +6585,7 @@ int stmmac_xdp_open(struct net_device *d
+@@ -6586,7 +6590,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);
                }
  
-@@ -6590,7 +6594,7 @@ int stmmac_xdp_open(struct net_device *d
+@@ -6595,7 +6599,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);
-@@ -6623,7 +6627,7 @@ int stmmac_xdp_open(struct net_device *d
+@@ -6628,7 +6632,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:
-@@ -6650,8 +6654,8 @@ int stmmac_xsk_wakeup(struct net_device
+@@ -6655,8 +6659,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)
-@@ -6907,8 +6911,8 @@ int stmmac_reinit_ringparam(struct net_d
+@@ -6912,8 +6916,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);
-@@ -7346,7 +7350,7 @@ int stmmac_suspend(struct device *dev)
+@@ -7351,7 +7355,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;
-@@ -7397,7 +7401,7 @@ EXPORT_SYMBOL_GPL(stmmac_suspend);
+@@ -7402,7 +7406,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;
-@@ -7405,7 +7409,7 @@ static void stmmac_reset_rx_queue(struct
+@@ -7410,7 +7414,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 80c22c34d01535399a6cd6270ec299cb97ad96d1..3dc5297f6599b7b26223c83bb43ab01e60625d8d 100644 (file)
--- 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@kernel.org>
 
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -1293,7 +1293,8 @@ static int stmmac_phy_setup(struct stmma
+@@ -1298,7 +1298,8 @@ static int stmmac_phy_setup(struct stmma
        return 0;
  }
  
@@ -27,7 +27,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  {
        u32 rx_cnt = priv->plat->rx_queues_to_use;
        unsigned int desc_size;
-@@ -1302,7 +1303,7 @@ static void stmmac_display_rx_rings(stru
+@@ -1307,7 +1308,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@kernel.org>
  
                pr_info("\tRX Queue %u rings\n", queue);
  
-@@ -1315,12 +1316,13 @@ static void stmmac_display_rx_rings(stru
+@@ -1320,12 +1321,13 @@ static void stmmac_display_rx_rings(stru
                }
  
                /* Display RX ring */
@@ -52,7 +52,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  {
        u32 tx_cnt = priv->plat->tx_queues_to_use;
        unsigned int desc_size;
-@@ -1329,7 +1331,7 @@ static void stmmac_display_tx_rings(stru
+@@ -1334,7 +1336,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@kernel.org>
  
                pr_info("\tTX Queue %d rings\n", queue);
  
-@@ -1344,18 +1346,19 @@ static void stmmac_display_tx_rings(stru
+@@ -1349,18 +1351,19 @@ static void stmmac_display_tx_rings(stru
                        desc_size = sizeof(struct dma_desc);
                }
  
@@ -85,7 +85,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  }
  
  static int stmmac_set_bfsize(int mtu, int bufsize)
-@@ -1379,44 +1382,50 @@ static int stmmac_set_bfsize(int mtu, in
+@@ -1384,44 +1387,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@kernel.org>
                struct dma_desc *p;
  
                if (priv->extend_desc)
-@@ -1433,10 +1442,12 @@ static void stmmac_clear_tx_descriptors(
+@@ -1438,10 +1447,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@kernel.org>
  {
        u32 rx_queue_cnt = priv->plat->rx_queues_to_use;
        u32 tx_queue_cnt = priv->plat->tx_queues_to_use;
-@@ -1444,16 +1455,17 @@ static void stmmac_clear_descriptors(str
+@@ -1449,16 +1460,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@kernel.org>
   * @p: descriptor pointer
   * @i: descriptor index
   * @flags: gfp flag
-@@ -1461,10 +1473,12 @@ static void stmmac_clear_descriptors(str
+@@ -1466,10 +1478,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@kernel.org>
        struct stmmac_rx_buffer *buf = &rx_q->buf_pool[i];
  
        if (!buf->page) {
-@@ -1489,7 +1503,7 @@ static int stmmac_init_rx_buffers(struct
+@@ -1494,7 +1508,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@kernel.org>
                stmmac_init_desc3(priv, p);
  
        return 0;
-@@ -1498,12 +1512,13 @@ static int stmmac_init_rx_buffers(struct
+@@ -1503,12 +1517,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@kernel.org>
        struct stmmac_rx_buffer *buf = &rx_q->buf_pool[i];
  
        if (buf->page)
-@@ -1518,12 +1533,15 @@ static void stmmac_free_rx_buffer(struct
+@@ -1523,12 +1538,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@kernel.org>
  
        if (tx_q->tx_skbuff_dma[i].buf &&
            tx_q->tx_skbuff_dma[i].buf_type != STMMAC_TXBUF_T_XDP_TX) {
-@@ -1562,23 +1580,28 @@ static void stmmac_free_tx_buffer(struct
+@@ -1567,23 +1585,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@kernel.org>
                struct dma_desc *p;
                int ret;
  
-@@ -1587,7 +1610,7 @@ static int stmmac_alloc_rx_buffers(struc
+@@ -1592,7 +1615,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@kernel.org>
                                             queue);
                if (ret)
                        return ret;
-@@ -1601,14 +1624,17 @@ static int stmmac_alloc_rx_buffers(struc
+@@ -1606,14 +1629,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@kernel.org>
                struct stmmac_rx_buffer *buf = &rx_q->buf_pool[i];
  
                if (!buf->xdp)
-@@ -1619,12 +1645,14 @@ static void dma_free_rx_xskbufs(struct s
+@@ -1624,12 +1650,14 @@ static void dma_free_rx_xskbufs(struct s
        }
  }
  
@@ -324,7 +324,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                struct stmmac_rx_buffer *buf;
                dma_addr_t dma_addr;
                struct dma_desc *p;
-@@ -1659,22 +1687,25 @@ static struct xsk_buff_pool *stmmac_get_
+@@ -1664,22 +1692,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@kernel.org>
  
        xdp_rxq_info_unreg_mem_model(&rx_q->xdp_rxq);
  
-@@ -1701,9 +1732,9 @@ static int __init_dma_rx_desc_rings(stru
+@@ -1706,9 +1737,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@kernel.org>
                if (ret < 0)
                        return -ENOMEM;
        }
-@@ -1713,17 +1744,19 @@ static int __init_dma_rx_desc_rings(stru
+@@ -1718,17 +1749,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@kernel.org>
  {
        struct stmmac_priv *priv = netdev_priv(dev);
        u32 rx_count = priv->plat->rx_queues_to_use;
-@@ -1735,7 +1768,7 @@ static int init_dma_rx_desc_rings(struct
+@@ -1740,7 +1773,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@kernel.org>
                if (ret)
                        goto err_init_rx_buffers;
        }
-@@ -1744,12 +1777,12 @@ static int init_dma_rx_desc_rings(struct
+@@ -1749,12 +1782,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@kernel.org>
  
                rx_q->buf_alloc_num = 0;
                rx_q->xsk_pool = NULL;
-@@ -1766,14 +1799,17 @@ err_init_rx_buffers:
+@@ -1771,14 +1804,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@kernel.org>
        int i;
  
        netif_dbg(priv, probe, priv->dev,
-@@ -1785,16 +1821,16 @@ static int __init_dma_tx_desc_rings(stru
+@@ -1790,16 +1826,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@kernel.org>
                struct dma_desc *p;
  
                if (priv->extend_desc)
-@@ -1816,7 +1852,8 @@ static int __init_dma_tx_desc_rings(stru
+@@ -1821,7 +1857,8 @@ static int __init_dma_tx_desc_rings(stru
        return 0;
  }
  
@@ -464,7 +464,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  {
        struct stmmac_priv *priv = netdev_priv(dev);
        u32 tx_queue_cnt;
-@@ -1825,7 +1862,7 @@ static int init_dma_tx_desc_rings(struct
+@@ -1830,7 +1867,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@kernel.org>
  
        return 0;
  }
-@@ -1833,26 +1870,29 @@ static int init_dma_tx_desc_rings(struct
+@@ -1838,26 +1875,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@kernel.org>
  
        return ret;
  }
-@@ -1860,17 +1900,20 @@ static int init_dma_desc_rings(struct ne
+@@ -1865,17 +1905,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@kernel.org>
  
        if (tx_q->xsk_pool && tx_q->xsk_frames_done) {
                xsk_tx_completed(tx_q->xsk_pool, tx_q->xsk_frames_done);
-@@ -1889,34 +1932,37 @@ static void stmmac_free_tx_skbufs(struct
+@@ -1894,34 +1937,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@kernel.org>
                                  sizeof(struct dma_extended_desc),
                                  rx_q->dma_erx, rx_q->dma_rx_phy);
  
-@@ -1928,29 +1974,33 @@ static void __free_dma_rx_desc_resources
+@@ -1933,29 +1979,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@kernel.org>
  
        if (priv->extend_desc) {
                size = sizeof(struct dma_extended_desc);
-@@ -1963,7 +2013,7 @@ static void __free_dma_tx_desc_resources
+@@ -1968,7 +2018,7 @@ static void __free_dma_tx_desc_resources
                addr = tx_q->dma_tx;
        }
  
@@ -626,7 +626,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  
        dma_free_coherent(priv->device, size, addr, tx_q->dma_tx_phy);
  
-@@ -1971,28 +2021,32 @@ static void __free_dma_tx_desc_resources
+@@ -1976,28 +2026,32 @@ static void __free_dma_tx_desc_resources
        kfree(tx_q->tx_skbuff);
  }
  
@@ -663,7 +663,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
        struct stmmac_channel *ch = &priv->channel[queue];
        bool xdp_prog = stmmac_xdp_is_enabled(priv);
        struct page_pool_params pp_params = { 0 };
-@@ -2004,8 +2058,8 @@ static int __alloc_dma_rx_desc_resources
+@@ -2009,8 +2063,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@kernel.org>
        pp_params.order = ilog2(num_pages);
        pp_params.nid = dev_to_node(priv->device);
        pp_params.dev = priv->device;
-@@ -2020,7 +2074,7 @@ static int __alloc_dma_rx_desc_resources
+@@ -2025,7 +2079,7 @@ static int __alloc_dma_rx_desc_resources
                return ret;
        }
  
@@ -683,7 +683,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                                 sizeof(*rx_q->buf_pool),
                                 GFP_KERNEL);
        if (!rx_q->buf_pool)
-@@ -2028,7 +2082,7 @@ static int __alloc_dma_rx_desc_resources
+@@ -2033,7 +2087,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@kernel.org>
                                                   sizeof(struct dma_extended_desc),
                                                   &rx_q->dma_rx_phy,
                                                   GFP_KERNEL);
-@@ -2037,7 +2091,7 @@ static int __alloc_dma_rx_desc_resources
+@@ -2042,7 +2096,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@kernel.org>
                                                  sizeof(struct dma_desc),
                                                  &rx_q->dma_rx_phy,
                                                  GFP_KERNEL);
-@@ -2062,7 +2116,8 @@ static int __alloc_dma_rx_desc_resources
+@@ -2067,7 +2121,8 @@ static int __alloc_dma_rx_desc_resources
        return 0;
  }
  
@@ -711,7 +711,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  {
        u32 rx_count = priv->plat->rx_queues_to_use;
        u32 queue;
-@@ -2070,7 +2125,7 @@ static int alloc_dma_rx_desc_resources(s
+@@ -2075,7 +2130,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@kernel.org>
                if (ret)
                        goto err_dma;
        }
-@@ -2078,7 +2133,7 @@ static int alloc_dma_rx_desc_resources(s
+@@ -2083,7 +2138,7 @@ static int alloc_dma_rx_desc_resources(s
        return 0;
  
  err_dma:
@@ -729,7 +729,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  
        return ret;
  }
-@@ -2086,28 +2141,31 @@ err_dma:
+@@ -2091,28 +2146,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@kernel.org>
                                  sizeof(struct sk_buff *),
                                  GFP_KERNEL);
        if (!tx_q->tx_skbuff)
-@@ -2120,7 +2178,7 @@ static int __alloc_dma_tx_desc_resources
+@@ -2125,7 +2183,7 @@ static int __alloc_dma_tx_desc_resources
        else
                size = sizeof(struct dma_desc);
  
@@ -774,7 +774,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  
        addr = dma_alloc_coherent(priv->device, size,
                                  &tx_q->dma_tx_phy, GFP_KERNEL);
-@@ -2137,7 +2195,8 @@ static int __alloc_dma_tx_desc_resources
+@@ -2142,7 +2200,8 @@ static int __alloc_dma_tx_desc_resources
        return 0;
  }
  
@@ -784,7 +784,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  {
        u32 tx_count = priv->plat->tx_queues_to_use;
        u32 queue;
-@@ -2145,7 +2204,7 @@ static int alloc_dma_tx_desc_resources(s
+@@ -2150,7 +2209,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@kernel.org>
                if (ret)
                        goto err_dma;
        }
-@@ -2153,27 +2212,29 @@ static int alloc_dma_tx_desc_resources(s
+@@ -2158,27 +2217,29 @@ static int alloc_dma_tx_desc_resources(s
        return 0;
  
  err_dma:
@@ -827,7 +827,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  
        return ret;
  }
-@@ -2181,16 +2242,18 @@ static int alloc_dma_desc_resources(stru
+@@ -2186,16 +2247,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@kernel.org>
  }
  
  /**
-@@ -2679,8 +2742,8 @@ static void stmmac_tx_err(struct stmmac_
+@@ -2684,8 +2747,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@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);
-@@ -3677,19 +3740,93 @@ static int stmmac_request_irq(struct net
+@@ -3682,19 +3745,93 @@ static int stmmac_request_irq(struct net
  }
  
  /**
@@ -957,7 +957,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
        u32 chan;
        int ret;
  
-@@ -3716,45 +3853,10 @@ static int stmmac_open(struct net_device
+@@ -3721,45 +3858,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@kernel.org>
  
        if (priv->plat->serdes_powerup) {
                ret = priv->plat->serdes_powerup(dev, priv->plat->bsp_priv);
-@@ -3797,14 +3899,28 @@ irq_error:
+@@ -3802,14 +3904,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);
-@@ -3851,7 +3967,7 @@ static int stmmac_release(struct net_dev
+@@ -3856,7 +3972,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);
-@@ -6390,7 +6506,7 @@ void stmmac_disable_rx_queue(struct stmm
+@@ -6395,7 +6511,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)
-@@ -6401,21 +6517,21 @@ void stmmac_enable_rx_queue(struct stmma
+@@ -6406,21 +6522,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);
-@@ -6453,7 +6569,7 @@ void stmmac_disable_tx_queue(struct stmm
+@@ -6458,7 +6574,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)
-@@ -6463,21 +6579,21 @@ void stmmac_enable_tx_queue(struct stmma
+@@ -6468,21 +6584,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);
-@@ -6517,7 +6633,7 @@ void stmmac_xdp_release(struct net_devic
+@@ -6522,7 +6638,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);
-@@ -6542,14 +6658,14 @@ int stmmac_xdp_open(struct net_device *d
+@@ -6547,14 +6663,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__);
-@@ -6631,7 +6747,7 @@ irq_error:
+@@ -6636,7 +6752,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;
  }
-@@ -7492,7 +7608,7 @@ int stmmac_resume(struct device *dev)
+@@ -7497,7 +7613,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 d1d8c622fc9401d174043bd3c01951e75977e91f..6ebb527726e4409ae146643f4ad76a4b91cd4493 100644 (file)
--- 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@kernel.org>
 
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -5619,18 +5619,15 @@ static int stmmac_change_mtu(struct net_
+@@ -5624,18 +5624,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@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;
-@@ -5642,8 +5639,29 @@ static int stmmac_change_mtu(struct net_
+@@ -5647,8 +5644,29 @@ static int stmmac_change_mtu(struct net_
        if ((txfifosz < new_mtu) || (new_mtu > BUF_SIZE_16KiB))
                return -EINVAL;
  

diff --git a/target/linux/generic/pending-5.15/103-kbuild-export-SUBARCH.patch b/target/linux/generic/pending-5.15/103-kbuild-export-SUBARCH.patch
index d378dabddabea63d6b4397cf424760838c8a2640..2bedd94642bf1aa8ba470466e9aaa5b5d1483f56 100644 (file)
--- a/target/linux/generic/pending-5.15/103-kbuild-export-SUBARCH.patch
+++ b/target/linux/generic/pending-5.15/103-kbuild-export-SUBARCH.patch
@@ -10,12 +10,12 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/Makefile
 +++ b/Makefile
-@@ -526,7 +526,7 @@ KBUILD_LDFLAGS_MODULE :=
+@@ -527,7 +527,7 @@ KBUILD_LDFLAGS_MODULE :=
  KBUILD_LDFLAGS :=
  CLANG_FLAGS :=
  
--export ARCH SRCARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE LD CC
-+export ARCH SRCARCH SUBARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE LD CC
+-export ARCH SRCARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE LD CC HOSTPKG_CONFIG
++export ARCH SRCARCH SUBARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE LD CC HOSTPKG_CONFIG
  export CPP AR NM STRIP OBJCOPY OBJDUMP READELF PAHOLE RESOLVE_BTFIDS LEX YACC AWK INSTALLKERNEL
  export PERL PYTHON3 CHECK CHECKFLAGS MAKE UTS_MACHINE HOSTCXX
  export KGZIP KBZIP2 KLZOP LZMA LZ4 XZ ZSTD

diff --git a/target/linux/generic/pending-5.15/110-v6.3-0001-spidev-Add-Silicon-Labs-EM3581-device-compatible.patch b/target/linux/generic/pending-5.15/110-v6.3-0001-spidev-Add-Silicon-Labs-EM3581-device-compatible.patch
index f5e0c858b2557b293f077d597b975592faf19d24..5216d6a7068e104677ddf67f3932d1bb64be14b6 100644 (file)
--- a/target/linux/generic/pending-5.15/110-v6.3-0001-spidev-Add-Silicon-Labs-EM3581-device-compatible.patch
+++ b/target/linux/generic/pending-5.15/110-v6.3-0001-spidev-Add-Silicon-Labs-EM3581-device-compatible.patch
@@ -14,7 +14,7 @@ Signed-off-by: Vincent Tremblay <vincent@vtremblay.dev>
 
 --- a/drivers/spi/spidev.c
 +++ b/drivers/spi/spidev.c
-@@ -693,6 +693,7 @@ static const struct spi_device_id spidev
+@@ -691,6 +691,7 @@ static const struct spi_device_id spidev
        { .name = "m53cpld" },
        { .name = "spi-petra" },
        { .name = "spi-authenta" },
@@ -22,7 +22,7 @@ Signed-off-by: Vincent Tremblay <vincent@vtremblay.dev>
        {},
  };
  MODULE_DEVICE_TABLE(spi, spidev_spi_ids);
-@@ -707,6 +708,7 @@ static const struct of_device_id spidev_
+@@ -705,6 +706,7 @@ static const struct of_device_id spidev_
        { .compatible = "menlo,m53cpld" },
        { .compatible = "cisco,spi-petra" },
        { .compatible = "micron,spi-authenta" },

diff --git a/target/linux/generic/pending-5.15/110-v6.3-0002-spidev-Add-Silicon-Labs-SI3210-device-compatible.patch b/target/linux/generic/pending-5.15/110-v6.3-0002-spidev-Add-Silicon-Labs-SI3210-device-compatible.patch
index 575c893d5085966d2752209430b226ee7393f8d7..ffbed0c622bfcfe05d4380cc65dd9293d940cb57 100644 (file)
--- a/target/linux/generic/pending-5.15/110-v6.3-0002-spidev-Add-Silicon-Labs-SI3210-device-compatible.patch
+++ b/target/linux/generic/pending-5.15/110-v6.3-0002-spidev-Add-Silicon-Labs-SI3210-device-compatible.patch
@@ -14,7 +14,7 @@ Signed-off-by: Vincent Tremblay <vincent@vtremblay.dev>
 
 --- a/drivers/spi/spidev.c
 +++ b/drivers/spi/spidev.c
-@@ -694,6 +694,7 @@ static const struct spi_device_id spidev
+@@ -692,6 +692,7 @@ static const struct spi_device_id spidev
        { .name = "spi-petra" },
        { .name = "spi-authenta" },
        { .name = "em3581" },
@@ -22,7 +22,7 @@ Signed-off-by: Vincent Tremblay <vincent@vtremblay.dev>
        {},
  };
  MODULE_DEVICE_TABLE(spi, spidev_spi_ids);
-@@ -709,6 +710,7 @@ static const struct of_device_id spidev_
+@@ -707,6 +708,7 @@ static const struct of_device_id spidev_
        { .compatible = "cisco,spi-petra" },
        { .compatible = "micron,spi-authenta" },
        { .compatible = "silabs,em3581" },

diff --git a/target/linux/generic/pending-5.15/613-netfilter_optional_tcp_window_check.patch b/target/linux/generic/pending-5.15/613-netfilter_optional_tcp_window_check.patch
index 93c52e88429aa21c684b37dadb4fb892aa0a0986..cb3b63cdb1d1b063529475f05c14f76d8bda84ba 100644 (file)
--- a/target/linux/generic/pending-5.15/613-netfilter_optional_tcp_window_check.patch
+++ b/target/linux/generic/pending-5.15/613-netfilter_optional_tcp_window_check.patch
@@ -48,7 +48,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com>
        NF_SYSCTL_CT_PROTO_TCP_IGNORE_INVALID_RST,
        NF_SYSCTL_CT_PROTO_TCP_MAX_RETRANS,
        NF_SYSCTL_CT_PROTO_TIMEOUT_UDP,
-@@ -849,6 +850,14 @@ static struct ctl_table nf_ct_sysctl_tab
+@@ -848,6 +849,14 @@ static struct ctl_table nf_ct_sysctl_tab
                .extra1         = SYSCTL_ZERO,
                .extra2         = SYSCTL_ONE,
        },
@@ -63,7 +63,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com>
        [NF_SYSCTL_CT_PROTO_TCP_IGNORE_INVALID_RST] = {
                .procname       = "nf_conntrack_tcp_ignore_invalid_rst",
                .maxlen         = sizeof(u8),
-@@ -1065,6 +1074,7 @@ static void nf_conntrack_standalone_init
+@@ -1058,6 +1067,7 @@ static void nf_conntrack_standalone_init
  
        XASSIGN(LOOSE, &tn->tcp_loose);
        XASSIGN(LIBERAL, &tn->tcp_be_liberal);

diff --git a/target/linux/generic/pending-5.15/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/target/linux/generic/pending-5.15/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
index bb30f372eb1aa0856e929d88522dcb347a1b2e59..a1899708230da1fa5f5a78714c037d681119ed28 100644 (file)
--- a/target/linux/generic/pending-5.15/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
+++ b/target/linux/generic/pending-5.15/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
@@ -53,7 +53,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  
 --- a/net/ipv4/fib_semantics.c
 +++ b/net/ipv4/fib_semantics.c
-@@ -142,6 +142,10 @@ const struct fib_prop fib_props[RTN_MAX
+@@ -143,6 +143,10 @@ const struct fib_prop fib_props[RTN_MAX
                .error  = -EINVAL,
                .scope  = RT_SCOPE_NOWHERE,
        },

diff --git a/target/linux/ipq807x/patches-5.15/0128-cpufreq-qcom-nvmem-add-support-for-IPQ8074.patch b/target/linux/ipq807x/patches-5.15/0128-cpufreq-qcom-nvmem-add-support-for-IPQ8074.patch
index 0a784f739398000f25b239ae360ed4ae7003702c..49fd4e4cc0b3d61b1797f6f177278fc21ab62114 100644 (file)
--- a/target/linux/ipq807x/patches-5.15/0128-cpufreq-qcom-nvmem-add-support-for-IPQ8074.patch
+++ b/target/linux/ipq807x/patches-5.15/0128-cpufreq-qcom-nvmem-add-support-for-IPQ8074.patch
@@ -21,7 +21,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
 
 --- a/drivers/cpufreq/cpufreq-dt-platdev.c
 +++ b/drivers/cpufreq/cpufreq-dt-platdev.c
-@@ -157,6 +157,7 @@ static const struct of_device_id blockli
+@@ -159,6 +159,7 @@ static const struct of_device_id blockli
        { .compatible = "ti,omap3", },
  
        { .compatible = "qcom,ipq8064", },

diff --git a/target/linux/realtek/patches-5.15/800-net-mdio-support-hardware-assisted-indirect-access.patch b/target/linux/realtek/patches-5.15/800-net-mdio-support-hardware-assisted-indirect-access.patch
index 48674886421555092ecfc241e9702974eabb168a..b31c5e78acca75229e6eba1e78a162919700b801 100644 (file)
--- a/target/linux/realtek/patches-5.15/800-net-mdio-support-hardware-assisted-indirect-access.patch
+++ b/target/linux/realtek/patches-5.15/800-net-mdio-support-hardware-assisted-indirect-access.patch
@@ -32,7 +32,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 
 --- a/drivers/net/phy/mdio_bus.c
 +++ b/drivers/net/phy/mdio_bus.c
-@@ -737,6 +737,32 @@ out:
+@@ -742,6 +742,32 @@ out:
  }
  
  /**
@@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
   * __mdiobus_read - Unlocked version of the mdiobus_read function
   * @bus: the mii_bus struct
   * @addr: the phy address
-@@ -752,7 +778,10 @@ int __mdiobus_read(struct mii_bus *bus,
+@@ -757,7 +783,10 @@ int __mdiobus_read(struct mii_bus *bus,
  
        lockdep_assert_held_once(&bus->mdio_lock);
  
@@ -77,7 +77,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  
        trace_mdio_access(bus, 1, addr, regnum, retval, retval);
        mdiobus_stats_acct(&bus->stats[addr], true, retval);
-@@ -762,6 +791,40 @@ int __mdiobus_read(struct mii_bus *bus,
+@@ -767,6 +796,40 @@ int __mdiobus_read(struct mii_bus *bus,
  EXPORT_SYMBOL(__mdiobus_read);
  
  /**
@@ -118,7 +118,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
   * __mdiobus_write - Unlocked version of the mdiobus_write function
   * @bus: the mii_bus struct
   * @addr: the phy address
-@@ -778,7 +841,10 @@ int __mdiobus_write(struct mii_bus *bus,
+@@ -783,7 +846,10 @@ int __mdiobus_write(struct mii_bus *bus,
  
        lockdep_assert_held_once(&bus->mdio_lock);
  
@@ -130,7 +130,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  
        trace_mdio_access(bus, 0, addr, regnum, val, err);
        mdiobus_stats_acct(&bus->stats[addr], false, err);
-@@ -788,6 +854,39 @@ int __mdiobus_write(struct mii_bus *bus,
+@@ -793,6 +859,39 @@ int __mdiobus_write(struct mii_bus *bus,
  EXPORT_SYMBOL(__mdiobus_write);
  
  /**
@@ -170,7 +170,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
   * __mdiobus_modify_changed - Unlocked version of the mdiobus_modify function
   * @bus: the mii_bus struct
   * @addr: the phy address
-@@ -820,6 +919,43 @@ int __mdiobus_modify_changed(struct mii_
+@@ -825,6 +924,43 @@ int __mdiobus_modify_changed(struct mii_
  EXPORT_SYMBOL_GPL(__mdiobus_modify_changed);
  
  /**
@@ -214,7 +214,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
   * mdiobus_read_nested - Nested version of the mdiobus_read function
   * @bus: the mii_bus struct
   * @addr: the phy address
-@@ -845,6 +981,79 @@ int mdiobus_read_nested(struct mii_bus *
+@@ -850,6 +986,79 @@ int mdiobus_read_nested(struct mii_bus *
  EXPORT_SYMBOL(mdiobus_read_nested);
  
  /**
@@ -294,7 +294,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
   * mdiobus_read - Convenience function for reading a given MII mgmt register
   * @bus: the mii_bus struct
   * @addr: the phy address
-@@ -867,6 +1076,29 @@ int mdiobus_read(struct mii_bus *bus, in
+@@ -872,6 +1081,29 @@ int mdiobus_read(struct mii_bus *bus, in
  EXPORT_SYMBOL(mdiobus_read);
  
  /**
@@ -324,7 +324,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
   * mdiobus_write_nested - Nested version of the mdiobus_write function
   * @bus: the mii_bus struct
   * @addr: the phy address
-@@ -893,6 +1125,33 @@ int mdiobus_write_nested(struct mii_bus
+@@ -898,6 +1130,33 @@ int mdiobus_write_nested(struct mii_bus
  EXPORT_SYMBOL(mdiobus_write_nested);
  
  /**
@@ -358,7 +358,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
   * mdiobus_write - Convenience function for writing a given MII mgmt register
   * @bus: the mii_bus struct
   * @addr: the phy address
-@@ -916,6 +1175,30 @@ int mdiobus_write(struct mii_bus *bus, i
+@@ -921,6 +1180,30 @@ int mdiobus_write(struct mii_bus *bus, i
  EXPORT_SYMBOL(mdiobus_write);
  
  /**
@@ -389,7 +389,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
   * mdiobus_modify - Convenience function for modifying a given mdio device
   *    register
   * @bus: the mii_bus struct
-@@ -937,6 +1220,51 @@ int mdiobus_modify(struct mii_bus *bus,
+@@ -942,6 +1225,51 @@ int mdiobus_modify(struct mii_bus *bus,
  EXPORT_SYMBOL_GPL(mdiobus_modify);
  
  /**