From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M7nQH-0000Vo-7P for qemu-devel@nongnu.org; Sat, 23 May 2009 05:21:45 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M7nQC-0000RB-Iy for qemu-devel@nongnu.org; Sat, 23 May 2009 05:21:44 -0400 Received: from [199.232.76.173] (port=42234 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M7nQC-0000Qu-62 for qemu-devel@nongnu.org; Sat, 23 May 2009 05:21:40 -0400 Received: from mo-p00-ob.rzone.de ([81.169.146.162]:36236) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1M7nQB-0005rc-MT for qemu-devel@nongnu.org; Sat, 23 May 2009 05:21:39 -0400 From: Kevin Wolf Date: Sat, 23 May 2009 11:21:33 +0200 Message-Id: <1243070493-5214-1-git-send-email-mail@kevin-wolf.de> Subject: [Qemu-devel] [PATCH] e1000: Ignore reset command List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf When a reset is requested, the current e1000 emulation never clears the reset bit which may cause a driver to hang. This patch masks the reset bit out when setting the control registert, so the reset is immediately completed. Signed-off-by: Kevin Wolf --- hw/e1000.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/hw/e1000.c b/hw/e1000.c index c5eb546..2665792 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -190,6 +190,13 @@ rxbufsize(uint32_t v) } static void +set_ctrl(E1000State *s, int index, uint32_t val) +{ + /* RST is self clearing */ + s->mac_reg[CTRL] = val & ~E1000_CTRL_RST; +} + +static void set_rx_control(E1000State *s, int index, uint32_t val) { s->mac_reg[RCTL] = val; @@ -783,12 +790,12 @@ enum { NREADOPS = ARRAY_SIZE(macreg_readops) }; static void (*macreg_writeops[])(E1000State *, int, uint32_t) = { putreg(PBA), putreg(EERD), putreg(SWSM), putreg(WUFC), putreg(TDBAL), putreg(TDBAH), putreg(TXDCTL), putreg(RDBAH), - putreg(RDBAL), putreg(LEDCTL), putreg(CTRL), putreg(VET), + putreg(RDBAL), putreg(LEDCTL), putreg(VET), [TDLEN] = set_dlen, [RDLEN] = set_dlen, [TCTL] = set_tctl, [TDT] = set_tctl, [MDIC] = set_mdic, [ICS] = 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, + [EECD] = set_eecd, [RCTL] = set_rx_control, [CTRL] = set_ctrl, [RA ... RA+31] = &mac_writereg, [MTA ... MTA+127] = &mac_writereg, [VFTA ... VFTA+127] = &mac_writereg, -- 1.6.0.2