IGB EITR registers have counter fields which reflect the current ITR
and LLI counter values, as well as a bit to enable LLI moderation,
and a bit to write the register without modifying the counter fields.
Implement the EITR Moderation Counter (aka EITR counter), and counter
ignore bit. The EITR counter is the time remaining in the interrupt
moderation delay which is implemented as a QEMU timer.
Log an unimp message if software tries to enable LLI moderation.
Add a note about the problem with reloading timers after migration.
Signed-off-by: Nicholas Piggin <npig...@gmail.com>
---
hw/net/igb_regs.h | 8 +++++--
hw/net/igb_core.c | 54 ++++++++++++++++++++++++++++++++++++++++-------
2 files changed, 52 insertions(+), 10 deletions(-)
diff --git a/hw/net/igb_regs.h b/hw/net/igb_regs.h
index 1ed5ee5039a..b612248264a 100644
--- a/hw/net/igb_regs.h
+++ b/hw/net/igb_regs.h
@@ -321,8 +321,12 @@ union e1000_adv_rx_desc {
#define E1000_EICR_TX_QUEUE3 0x00000800 /* Tx Queue 3 Interrupt */
#define E1000_EICR_OTHER 0x80000000 /* Interrupt Cause Active */
-/* Extended Interrupt Cause Set */
-/* E1000_EITR_CNT_IGNR is only for 82576 and newer */
+/* Extended Interrupt Throttle */
+/* These are only for 82576 and newer */
+#define E1000_EITR_INTERVAL 0x00007FFC
+#define E1000_EITR_LLI_EN 0x00008000
+#define E1000_EITR_LLI_CNT 0x001F0000
+#define E1000_EITR_ITR_CNT 0x7FE00000
#define E1000_EITR_CNT_IGNR 0x80000000 /* Don't reset counters on write */
#define E1000_TSYNCTXCTL_VALID 0x00000001 /* tx timestamp valid */
diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c
index 8fcc872a7c0..3ae3e53530b 100644
--- a/hw/net/igb_core.c
+++ b/hw/net/igb_core.c
@@ -140,12 +140,8 @@ static void igb_msix_notify(IGBCore *core, unsigned int
cause)
}
static inline void
-igb_intrmgr_rearm_timer(IGBIntrDelayTimer *timer)
+igb_intrmgr_arm_timer(IGBIntrDelayTimer *timer, int64_t delay_ns)
{
- int64_t delay_ns =
- (int64_t)((timer->core->mac[timer->delay_reg] & 0x7FFC) >> 2) *
- timer->delay_resolution_ns;
-
trace_e1000e_irq_rearm_timer(timer->delay_reg << 2, delay_ns);
timer_mod(timer->timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + delay_ns);
@@ -153,6 +149,16 @@ igb_intrmgr_rearm_timer(IGBIntrDelayTimer *timer)
timer->running = true;
}
+static inline void
+igb_intrmgr_rearm_timer(IGBIntrDelayTimer *timer)
+{
+ uint32_t interval = (timer->core->mac[timer->delay_reg] &
+ E1000_EITR_INTERVAL) >> 2;
+ int64_t delay_ns = (int64_t)interval * timer->delay_resolution_ns;
+
+ igb_intrmgr_arm_timer(timer, delay_ns);
+}
+
static void
igb_intmgr_timer_resume(IGBIntrDelayTimer *timer)
{
@@ -2881,7 +2887,21 @@ igb_mac_swsm_read(IGBCore *core, int index)
static uint32_t
igb_mac_eitr_read(IGBCore *core, int index)
{
- return core->mac[index - EITR0];
+ uint32_t eitr_num = index - EITR0;
+ uint32_t val = core->mac[eitr_num];
+ IGBIntrDelayTimer *timer = &core->eitr[eitr_num];
+
+ if (timer->running) { /* timer is pending, find time remaining */
+ int64_t remains = timer_expire_time_ns(timer->timer) -
+ qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
+ if (remains > 0) {
+ uint32_t cnt; /* CNT is the most significant 10 of 12 bits */
+ cnt = remains / timer->delay_resolution_ns;
+ val |= ((cnt >> 2) << 21) & E1000_EITR_ITR_CNT;
+ }
+ }
+
+ return val;
}
static uint32_t igb_mac_vfmailbox_read(IGBCore *core, int index)
@@ -3047,7 +3067,23 @@ igb_set_eitr(IGBCore *core, int index, uint32_t val)
trace_igb_irq_eitr_set(eitr_num, val);
- core->mac[index] = val & 0x7FFE;
+ if (val & (E1000_EITR_LLI_EN | E1000_EITR_LLI_CNT)) {
+ qemu_log_mask(LOG_UNIMP, "%s: LLI moderation not supported,
ignoring\n",
+ __func__);
+ }
+
+ if (!(val & E1000_EITR_CNT_IGNR)) {
+ IGBIntrDelayTimer *timer = &core->eitr[eitr_num];
+ uint32_t itr_cnt = (val & E1000_EITR_ITR_CNT) >> 21;
+ /* CNT is the most significant 10 of 12 bits */
+ uint64_t ns = (itr_cnt << 2) * timer->delay_resolution_ns;
+
+ igb_intrmgr_arm_timer(timer, ns);
+ }
+
+ val &= E1000_EITR_INTERVAL | E1000_EITR_LLI_EN;
+
+ core->mac[index] = val;
}
static void
@@ -4553,7 +4589,9 @@ igb_core_post_load(IGBCore *core)
/*
* we need to restart intrmgr timers, as an older version of
- * QEMU can have stopped them before migration
+ * QEMU can have stopped them before migration.
+ * XXX: re-setting timers with fresh values breaks deterministic
+ * replay.
*/
igb_intrmgr_resume(core);
igb_autoneg_resume(core);
--
2.47.1
