[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 20/27] e1000e: Fix CTRL_EXT.EIAME behavior
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 20/27] e1000e: Fix CTRL_EXT.EIAME behavior |
Date: |
Mon, 26 Sep 2016 16:59:28 +0800 |
From: Dmitry Fleytman <address@hidden>
CTRL_EXT.EIAME bit controls clearing of IAM bits,
but current code clears IMS bits instead.
See spec. 10.2.2.5 Extended Device Control Register.
Signed-off-by: Dmitry Fleytman <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
hw/net/e1000e_core.c | 4 ++--
hw/net/trace-events | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c
index e8d50f6..a198a88 100644
--- a/hw/net/e1000e_core.c
+++ b/hw/net/e1000e_core.c
@@ -2008,8 +2008,8 @@ e1000e_msix_notify_one(E1000ECore *core, uint32_t cause,
uint32_t int_cfg)
}
if (core->mac[CTRL_EXT] & E1000_CTRL_EXT_EIAME) {
- trace_e1000e_irq_ims_clear_eiame(core->mac[IAM], cause);
- e1000e_clear_ims_bits(core, core->mac[IAM] & cause);
+ trace_e1000e_irq_iam_clear_eiame(core->mac[IAM], cause);
+ core->mac[IAM] &= ~cause;
}
trace_e1000e_irq_icr_clear_eiac(core->mac[ICR], core->mac[EIAC]);
diff --git a/hw/net/trace-events b/hw/net/trace-events
index 47ab14a..1a5c909 100644
--- a/hw/net/trace-events
+++ b/hw/net/trace-events
@@ -223,7 +223,7 @@ e1000e_irq_icr_read_entry(uint32_t icr) "Starting ICR read.
Current ICR: 0x%x"
e1000e_irq_icr_read_exit(uint32_t icr) "Ending ICR read. Current ICR: 0x%x"
e1000e_irq_icr_clear_zero_ims(void) "Clearing ICR on read due to zero IMS"
e1000e_irq_icr_clear_iame(void) "Clearing ICR on read due to IAME"
-e1000e_irq_ims_clear_eiame(uint32_t iam, uint32_t cause) "Clearing IMS due to
EIAME, IAM: 0x%X, cause: 0x%X"
+e1000e_irq_iam_clear_eiame(uint32_t iam, uint32_t cause) "Clearing IMS due to
EIAME, IAM: 0x%X, cause: 0x%X"
e1000e_irq_icr_clear_eiac(uint32_t icr, uint32_t eiac) "Clearing ICR bits due
to EIAC, ICR: 0x%X, EIAC: 0x%X"
e1000e_irq_ims_clear_set_imc(uint32_t val) "Clearing IMS bits due to IMC write
0x%x"
e1000e_irq_fire_delayed_interrupts(void) "Firing delayed interrupts"
--
2.7.4
- [Qemu-devel] [PULL 10/27] filter-rewriter: introduce filter-rewriter initialization, (continued)
- [Qemu-devel] [PULL 10/27] filter-rewriter: introduce filter-rewriter initialization, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 11/27] filter-rewriter: track connection and parse packet, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 12/27] filter-rewriter: rewrite tcp packet to keep secondary connection, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 13/27] MAINTAINERS: add maintainer for COLO-proxy, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 14/27] docs: Add documentation for COLO-proxy, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 15/27] e1000: fix buliding complaint, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 16/27] tap: Allow specifying a bridge, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 18/27] e1000e: Flush all receive queues on receive enable, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 17/27] net: limit allocation in nc_sendv_compat, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 19/27] e1000e: Flush receive queues on link up, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 20/27] e1000e: Fix CTRL_EXT.EIAME behavior,
Jason Wang <=
- [Qemu-devel] [PULL 23/27] e1000e: Fix spurious RX TCP ACK interrupts, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 21/27] e1000e: Fix PBACLR implementation, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 24/27] e1000e: Fix EIAC register implementation, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 22/27] e1000e: Fix OTHER interrupts processing for MSI-X, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 26/27] mcf_fec: fix error in qemu_send_packet argument, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 25/27] net: mcf: limit buffer descriptor count, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 27/27] imx_fec: fix error in qemu_send_packet argument, Jason Wang, 2016/09/26
- Re: [Qemu-devel] [PULL 00/27] Net patches, Peter Maydell, 2016/09/26