Attachment 668921 Details for Bug 874406 – this is a simple hack: after reset, disable rxt0 interrupts until RDT is set

[patch] this is a simple hack: after reset, disable rxt0 interrupts until RDT is set

rxt0.patch (text/plain), 1.22 KB, created by Michael S. Tsirkin on 2012-12-25 13:44:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael S. Tsirkin

Created: 2012-12-25 13:44:59 UTC

Size: 1.22 KB

patch

obsolete

>diff --git a/hw/e1000.c b/hw/e1000.c
>index 92fb00a..0507c0f 100644
>--- a/hw/e1000.c
>+++ b/hw/e1000.c
>@@ -129,6 +129,8 @@ typedef struct E1000State_st {
>     } eecd_state;
> 
>     QEMUTimer *autoneg_timer;
>+
>+    uint16_t intmask;
> } E1000State;
> 
> #define	defreg(x)	x = (E1000_##x>>2)
>@@ -231,7 +233,7 @@ set_interrupt_cause(E1000State *s, int index, uint32_t val)
>     }
>     s->mac_reg[ICR] = val;
>     s->mac_reg[ICS] = val;
>-    qemu_set_irq(s->dev.irq[0], (s->mac_reg[IMS] & s->mac_reg[ICR]) != 0);
>+    qemu_set_irq(s->dev.irq[0], s->mac_reg[IMS] & s->mac_reg[ICR] & s->intmask);
> }
> 
> static void
>@@ -290,6 +292,7 @@ static void e1000_reset(void *opaque)
>         d->mac_reg[RA] |= macaddr[i] << (8 * i);
>         d->mac_reg[RA + 1] |= (i < 2) ? macaddr[i + 4] << (8 * i) : 0;
>     }
>+    d->intmask = ~E1000_ICR_RXT0;
> }
> 
> static void
>@@ -943,6 +946,11 @@ mac_writereg(E1000State *s, int index, uint32_t val)
> static void
> set_rdt(E1000State *s, int index, uint32_t val)
> {
>+    s->intmask |= E1000_ICR_RXT0;
>+    if (s->mac_reg[IMS] & s->mac_reg[ICR] & E1000_ICR_RXT0) {
>+        qemu_set_irq(s->dev.irq[0], 1);
>+    }
>+
>     s->mac_reg[index] = val & 0xffff;
>     if (e1000_has_rxbufs(s, 1)) {
>         qemu_flush_queued_packets(&s->nic->nc);

Actions: View | Diff

Attachments on bug 874406: 646184 | 646186 | 650223 | 659288 | 662579 | 662580 | 662581 | 666693 | 668921 | 675644