git: 036522d3b97f - stable/14 - igb: Match Tx descriptor control to iflib
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 22 Aug 2026 00:50:08 UTC
The branch stable/14 has been updated by kbowling:
URL: https://cgit.FreeBSD.org/src/commit/?id=036522d3b97fc3cb165524d85e697d2219219225
commit 036522d3b97fc3cb165524d85e697d2219219225
Author: Kevin Bowling <kbowling@FreeBSD.org>
AuthorDate: 2026-08-08 11:29:44 +0000
Commit: Kevin Bowling <kbowling@FreeBSD.org>
CommitDate: 2026-08-22 00:50:00 +0000
igb: Match Tx descriptor control to iflib
iflib requests transmit completion status only on selected descriptors.
Program a zero writeback threshold so igb hardware honors those sparse
RS bits instead of writing back every descriptor in threshold-sized
batches.
Use the existing family specific prefetch threshold: eight descriptors
on most controllers and 20 on I354, with a host threshold of one. These
values match the Intel-derived Linux and DPDK drivers. Their nonzero
writeback settings are not appropriate here because those drivers set
RS on every packet.
A zero writeback threshold also avoids depending on interrupt timer
flushes affected by 82576 specification update erratum 26. Remove the
old IGB_TX_WTHRESH macro as well. It has had no callers since the iflib
conversion, so its 82575 conditional no longer implements any policy.
(cherry picked from commit fddc393d93169b428fe64e9513ee463b5154b62a)
---
sys/dev/e1000/if_em.c | 41 +++++++++++++++++++++++++++++++++--------
sys/dev/e1000/if_em.h | 7 +++----
2 files changed, 36 insertions(+), 12 deletions(-)
diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c
index 5603d63e480b..13187ea210cf 100644
--- a/sys/dev/e1000/if_em.c
+++ b/sys/dev/e1000/if_em.c
@@ -3747,6 +3747,36 @@ em_legacy_txdctl(struct e1000_hw *hw)
return (txdctl);
}
+static u32
+igb_txdctl(struct e1000_hw *hw)
+{
+ u32 pthresh;
+
+ switch (hw->mac.type) {
+ case e1000_i354:
+ pthresh = I354_TX_PTHRESH;
+ break;
+ case e1000_82575:
+ case e1000_82576:
+ case e1000_82580:
+ case e1000_i350:
+ case e1000_i210:
+ case e1000_i211:
+ case e1000_vfadapt:
+ case e1000_vfadapt_i350:
+ pthresh = IGB_TX_PTHRESH;
+ break;
+ default:
+ KASSERT(0, ("%s: unsupported MAC type %d", __func__,
+ hw->mac.type));
+ pthresh = IGB_TX_PTHRESH;
+ break;
+ }
+
+ return (pthresh | (IGB_TX_HTHRESH << 8) |
+ E1000_TXDCTL_QUEUE_ENABLE);
+}
+
/*********************************************************************
*
* Enable transmit unit.
@@ -3797,15 +3827,10 @@ em_initialize_transmit_unit(if_ctx_t ctx)
E1000_READ_REG(hw, E1000_TDBAL(i)),
E1000_READ_REG(hw, E1000_TDLEN(i)));
- if (hw->mac.type < igb_mac_min) {
+ if (hw->mac.type < igb_mac_min)
txdctl = em_legacy_txdctl(hw);
- } else {
- txdctl = 0;
- txdctl |= 0x1f; /* PTHRESH */
- txdctl |= 1 << 8; /* HTHRESH */
- txdctl |= 1 << 16; /* WTHRESH */
- txdctl |= E1000_TXDCTL_QUEUE_ENABLE;
- }
+ else
+ txdctl = igb_txdctl(hw);
E1000_WRITE_REG(hw, E1000_TXDCTL(i), txdctl);
}
diff --git a/sys/dev/e1000/if_em.h b/sys/dev/e1000/if_em.h
index d504f86ad390..4873eb330e87 100644
--- a/sys/dev/e1000/if_em.h
+++ b/sys/dev/e1000/if_em.h
@@ -316,10 +316,9 @@
#define IGB_RX_WTHRESH ((hw->mac.type == e1000_82576 && \
(sc->intr_type == IFLIB_INTR_MSIX)) ? 1 : 4)
-#define IGB_TX_PTHRESH ((hw->mac.type == e1000_i354) ? 20 : 8)
-#define IGB_TX_HTHRESH 1
-#define IGB_TX_WTHRESH ((hw->mac.type != e1000_82575 && \
- sc->intr_type == IFLIB_INTR_MSIX) ? 1 : 16)
+#define IGB_TX_PTHRESH 8
+#define I354_TX_PTHRESH 20
+#define IGB_TX_HTHRESH 1
/*
* TDBA/RDBA should be aligned on 16 byte boundary. But TDLEN/RDLEN should be