From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MgLwg-0002Pa-Ve for qemu-devel@nongnu.org; Wed, 26 Aug 2009 13:06:03 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MgLwZ-0002GN-Ly for qemu-devel@nongnu.org; Wed, 26 Aug 2009 13:06:00 -0400 Received: from [199.232.76.173] (port=45782 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MgLwZ-0002FI-05 for qemu-devel@nongnu.org; Wed, 26 Aug 2009 13:05:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37633) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MgLwY-0000Y1-Ag for qemu-devel@nongnu.org; Wed, 26 Aug 2009 13:05:54 -0400 From: Glauber Costa Date: Wed, 26 Aug 2009 09:05:42 -0400 Message-Id: <1251291946-25821-9-git-send-email-glommer@redhat.com> In-Reply-To: <1251291946-25821-8-git-send-email-glommer@redhat.com> References: <1251291946-25821-1-git-send-email-glommer@redhat.com> <1251291946-25821-2-git-send-email-glommer@redhat.com> <1251291946-25821-3-git-send-email-glommer@redhat.com> <1251291946-25821-4-git-send-email-glommer@redhat.com> <1251291946-25821-5-git-send-email-glommer@redhat.com> <1251291946-25821-6-git-send-email-glommer@redhat.com> <1251291946-25821-7-git-send-email-glommer@redhat.com> <1251291946-25821-8-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH 08/12] 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 Cc: aliguori@us.ibm.com, Bill Paul From: Bill Paul 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 Signed-off-by: Anthony Liguori Signed-off-by: Glauber Costa --- hw/e1000.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/hw/e1000.c b/hw/e1000.c index 76fa159..c55007a 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -155,6 +155,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); } @@ -287,10 +288,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 @@ -779,7 +784,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, -- 1.6.2.2