From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MWCrw-0002kl-TQ for qemu-devel@nongnu.org; Wed, 29 Jul 2009 13:23:13 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MWCrs-0002hx-2b for qemu-devel@nongnu.org; Wed, 29 Jul 2009 13:23:12 -0400 Received: from [199.232.76.173] (port=33404 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MWCrr-0002hn-SL for qemu-devel@nongnu.org; Wed, 29 Jul 2009 13:23:07 -0400 Received: from mail.windriver.com ([147.11.1.11]:59573 helo=mail.wrs.com) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MWCrr-00014K-0q for qemu-devel@nongnu.org; Wed, 29 Jul 2009 13:23:07 -0400 Received: from ALA-MAIL03.corp.ad.wrs.com (ala-mail03 [147.11.57.144]) by mail.wrs.com (8.13.6/8.13.6) with ESMTP id n6THN5FJ008285 for ; Wed, 29 Jul 2009 10:23:05 -0700 (PDT) Received: from unknown-46-211 (IDENT:U2FsdGVkX18QC2b1x9fKPovIllfnBJuCVtq/j9mwi1k@[147.11.46.211]) by huisne.wrs.com (8.9.1/8.9.1) with ESMTP id KAA19061 for ; Wed, 29 Jul 2009 10:23:04 -0700 (PDT) From: Bill Paul Date: Wed, 29 Jul 2009 10:22:55 -0700 MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200907291023.02372.wpaul@windriver.com> Subject: [Qemu-devel] [PATCH] e1000.c doesn't properly emulate EERD and ICS registers List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Once again, the emulation of the EERD and ICS registers in e1000.c is incorrect. Nobody has noticed this before because none of the Intel-written e1000 drivers use these registers, and all of the independently written open source drivers copy Intel's example, so they don't use them either. Regardless, these registers are documented in the programmer's manuals, and their emulated behavior doesn't match the verified behavior of real hardware, so any software that does use them doesn't function correctly. -Bill Signed-off-by: Bill Paul --- diff --git a/hw/e1000.c b/hw/e1000.c index 9bc4442..b0542d7 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -154,6 +154,7 @@ set_interrupt_cause(E1000State *s, int index, uint32_t val) if (val) val |= E1000_ICR_INT_ASSERTED; 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); } @@ -286,10 +287,14 @@ flash_eerd_read(E1000State *s, int x) { unsigned int index, r = s->mac_reg[EERD] & ~E1000_EEPROM_RW_REG_START; + if ((s->mac_reg[EERD] & E1000_EEPROM_RW_REG_START) == 0) + return (s->mac_reg[EERD]); + if ((index = r >> E1000_EEPROM_RW_ADDR_SHIFT) > EEPROM_CHECKSUM_REG) - return 0; - return (s->eeprom_data[index] << E1000_EEPROM_RW_REG_DATA) | - E1000_EEPROM_RW_REG_DONE | r; + return (E1000_EEPROM_RW_REG_DONE | r); + + return ((s->eeprom_data[index] << E1000_EEPROM_RW_REG_DATA) | + E1000_EEPROM_RW_REG_DONE | r); } static void @@ -780,7 +785,7 @@ static uint32_t (*macreg_readops[])(E1000State *, int) = { getreg(WUFC), getreg(TDT), getreg(CTRL), getreg(LEDCTL), getreg(MANC), getreg(MDIC), getreg(SWSM), getreg(STATUS), getreg(TORL), getreg(TOTL), getreg(IMS), getreg(TCTL), - getreg(RDH), getreg(RDT), getreg(VET), + getreg(RDH), getreg(RDT), getreg(VET), getreg(ICS), [TOTH] = mac_read_clr8, [TORH] = mac_read_clr8, [GPRC] = mac_read_clr4, [GPTC] = mac_read_clr4, [TPR] = mac_read_clr4, [TPT] = mac_read_clr4,