50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
From 4b19800a747e124fed795b013c743c0297fff241 Mon Sep 17 00:00:00 2001
|
|
From: Xiao Wang <jasowang@redhat.com>
|
|
Date: Thu, 16 Aug 2018 08:17:06 +0100
|
|
Subject: [PATCH 1/4] e1000e: Do not auto-clear ICR bits which aren't set in
|
|
EIAC
|
|
|
|
RH-Author: Xiao Wang <jasowang@redhat.com>
|
|
Message-id: <1534407427-44794-2-git-send-email-jasowang@redhat.com>
|
|
Patchwork-id: 81854
|
|
O-Subject: [RHEL-8.0 qemu-kvm PATCH 1/2] e1000e: Do not auto-clear ICR bits which aren't set in EIAC
|
|
Bugzilla: 1596024
|
|
RH-Acked-by: wexu@redhat.com
|
|
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
|
From: Jan Kiszka <jan.kiszka@siemens.com>
|
|
|
|
The spec does not justify clearing of any E1000_ICR_OTHER_CAUSES when
|
|
E1000_ICR_OTHER is set in EIAC. In fact, removing this code fixes the
|
|
issue the Linux driver runs into since 4aea7a5c5e94 ("e1000e: Avoid
|
|
receiver overrun interrupt bursts") and was worked around by
|
|
745d0bd3af99 ("e1000e: Remove Other from EIAC").
|
|
|
|
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
|
|
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
|
(cherry picked from commit 2285a00c113469bb3e750ca4921cdb7baaae9e25)
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
hw/net/e1000e_core.c | 4 ----
|
|
1 file changed, 4 deletions(-)
|
|
|
|
diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c
|
|
index c93c466..9504891 100644
|
|
--- a/hw/net/e1000e_core.c
|
|
+++ b/hw/net/e1000e_core.c
|
|
@@ -2022,10 +2022,6 @@ e1000e_msix_notify_one(E1000ECore *core, uint32_t cause, uint32_t int_cfg)
|
|
|
|
effective_eiac = core->mac[EIAC] & cause;
|
|
|
|
- if (effective_eiac == E1000_ICR_OTHER) {
|
|
- effective_eiac |= E1000_ICR_OTHER_CAUSES;
|
|
- }
|
|
-
|
|
core->mac[ICR] &= ~effective_eiac;
|
|
|
|
if (!(core->mac[CTRL_EXT] & E1000_CTRL_EXT_IAME)) {
|
|
--
|
|
1.8.3.1
|
|
|