Attachment 666693 Details for Bug 874406 – hack to deal with RXT0 set_ics calls that have IMS=0

[patch] hack to deal with RXT0 set_ics calls that have IMS=0

hack2.patch (text/plain), 1.47 KB, created by Andrew Jones on 2012-12-20 14:22:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Jones

Created: 2012-12-20 14:22:08 UTC

Size: 1.47 KB

patch

obsolete

>diff --git a/hw/e1000.c b/hw/e1000.c
>index ec3a7c4..33107e6 100644
>--- a/hw/e1000.c
>+++ b/hw/e1000.c
>@@ -235,8 +235,22 @@ set_interrupt_cause(E1000State *s, int index, uint32_t val)
> static void
> set_ics(E1000State *s, int index, uint32_t val)
> {
>-    DBGOUT(INTERRUPT, "set_ics %x, ICR %x, IMR %x\n", val, s->mac_reg[ICR],
>-        s->mac_reg[IMS]);
>+    DBGOUT(INTERRUPT, "set_ics %x, ICR %x, IMR %x (allowed)\n", val,
>+        s->mac_reg[ICR], s->mac_reg[IMS]);
>+    set_interrupt_cause(s, 0, val | s->mac_reg[ICR]);
>+}
>+
>+static void
>+mmio_set_ics(E1000State *s, int index, uint32_t val)
>+{
>+//    DBGOUT(INTERRUPT, "set_ics %x, ICR %x, IMR %x (%s)\n", val,
>+    DBGOUT(GENERAL, "set_ics %x, ICR %x, IMR %x (%s)\n", val,
>+        s->mac_reg[ICR], s->mac_reg[IMS],
>+        s->mac_reg[IMS] ? "allowed" : "disallowed");
>+
>+    if (!s->mac_reg[IMS])
>+        val = 0;
>+
>     set_interrupt_cause(s, 0, val | s->mac_reg[ICR]);
> }
> 
>@@ -999,7 +1013,7 @@ static void (*macreg_writeops[])(E1000State *, int, uint32_t) = {
>     putreg(TDBAL),	putreg(TDBAH),	putreg(TXDCTL),	putreg(RDBAH),
>     putreg(RDBAL),	putreg(LEDCTL), putreg(VET),
>     [TDLEN] = set_dlen,	[RDLEN] = set_dlen,	[TCTL] = set_tctl,
>-    [TDT] = set_tctl,	[MDIC] = set_mdic,	[ICS] = set_ics,
>+    [TDT] = set_tctl,	[MDIC] = set_mdic,	[ICS] = mmio_set_ics,
>     [TDH] = set_16bit,	[RDH] = set_16bit,	[RDT] = set_rdt,
>     [IMC] = set_imc,	[IMS] = set_ims,	[ICR] = set_icr,
>     [EECD] = set_eecd,	[RCTL] = set_rx_control, [CTRL] = set_ctrl,

Actions: View | Diff

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