From: Jan Kiszka Date: Sun, 1 Apr 2018 21:17:55 +0000 (+0200) Subject: e1000e: Do not auto-clear ICR bits which aren't set in EIAC X-Git-Tag: v3.0.0-rc0~87^2~1 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=2285a00c113469bb3e750ca4921cdb7baaae9e25;p=thirdparty%2Fqemu.git e1000e: Do not auto-clear ICR bits which aren't set in EIAC 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 Signed-off-by: Jason Wang --- diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index c93c4661edd..950489160a2 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)) {