igb_avb patch for Linux 5.10.x
Posted by Anonymous on Tue 21st Dec 2021 09:33
raw | new post
modification of post by Anonymous (view diff)

diff -r -u igb_avb/kmod/igb_ethtool.c igb_avb/kmod/igb_ethtool.c
--- igb_avb/kmod/igb_ethtool.c  2021-11-16 08:33:42.829986006 +0100
+++ igb_avb/kmod/igb_ethtool.c  2021-12-21 10:21:39.807901702 +0100
@@ -3144,6 +3144,7 @@

 #endif /* ETHTOOL_SCHANNELS */
 static const struct ethtool_ops igb_ethtool_ops = {
+       .supported_coalesce_params = ETHTOOL_COALESCE_USECS,
        .get_drvinfo            = igb_get_drvinfo,
        .get_regs_len           = igb_get_regs_len,
        .get_regs               = igb_get_regs,
diff -r -u igb_avb/kmod/igb_main.c igb_avb/kmod/igb_main.c
--- igb_avb/kmod/igb_main.c     2021-11-17 09:30:40.616405653 +0100
+++ igb_avb/kmod/igb_main.c     2021-12-21 10:21:39.811901636 +0100
@@ -5566,7 +5566,7 @@
        tx_desc->read.olinfo_status = cpu_to_le32(olinfo_status);
 }

-static void igb_tx_map(struct igb_ring *tx_ring,
+static int igb_tx_map(struct igb_ring *tx_ring,
                       struct igb_tx_buffer *first,
                       const u8 hdr_len)
 {
@@ -5679,7 +5679,7 @@
         */
        mmiowb();

-       return;
+       return 0;

 dma_error:
        dev_err(tx_ring->dev, "TX DMA map failed\n");
@@ -5696,6 +5696,7 @@
        }

        tx_ring->next_to_use = i;
+       return -1;
 }

 static int __igb_maybe_stop_tx(struct igb_ring *tx_ring, const u16 size)
@@ -7411,12 +7412,11 @@
                        break;

                /* prevent any other reads prior to eop_desc */
-#if 0
-               read_barrier_depends();
-#else
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0)
                smp_rmb();
+#else
+               read_barrier_depends();
 #endif
-
                /* if DD is not set pending work has not been completed */
                if (!(eop_desc->wb.status & cpu_to_le32(E1000_TXD_STAT_DD)))
                        break;

                if (!(eop_desc->wb.status & cpu_to_le32(E1000_TXD_STAT_DD)))