gwj / at91sam9263 · Commits

Commit b1332393cdd7d023de8f1f8aa136ee7866a18968

Authored by Bill Paul
Committed by Anthony Liguori
1 parent 21c9f4cd

e1000.c doesn't properly emulate EERD and ICS registers 

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 <wpaul@windriver.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Inline Side-by-side
Showing 1 changed file with 9 additions and 4 deletions
hw/e1000.c
  View file @b133239
... ... @@ -154,6 +154,7 @@ set_interrupt_cause(E1000State *s, int index, uint32_t val)
154 154 if (val)
155 155 val |= E1000_ICR_INT_ASSERTED;
156 156 s->mac_reg[ICR] = val;
  157 + s->mac_reg[ICS] = val;
157 158 qemu_set_irq(s->dev.irq[0], (s->mac_reg[IMS] & s->mac_reg[ICR]) != 0);
158 159 }
159 160  
... ... @@ -286,10 +287,14 @@ flash_eerd_read(E1000State *s, int x)
286 287 {
287 288 unsigned int index, r = s->mac_reg[EERD] & ~E1000_EEPROM_RW_REG_START;
288 289  
  290 + if ((s->mac_reg[EERD] & E1000_EEPROM_RW_REG_START) == 0)
  291 + return (s->mac_reg[EERD]);
  292 +
289 293 if ((index = r >> E1000_EEPROM_RW_ADDR_SHIFT) > EEPROM_CHECKSUM_REG)
290   - return 0;
291   - return (s->eeprom_data[index] << E1000_EEPROM_RW_REG_DATA) |
292   - E1000_EEPROM_RW_REG_DONE | r;
  294 + return (E1000_EEPROM_RW_REG_DONE | r);
  295 +
  296 + return ((s->eeprom_data[index] << E1000_EEPROM_RW_REG_DATA) |
  297 + E1000_EEPROM_RW_REG_DONE | r);
293 298 }
294 299  
295 300 static void
... ... @@ -780,7 +785,7 @@ static uint32_t (*macreg_readops[])(E1000State *, int) = {
780 785 getreg(WUFC), getreg(TDT), getreg(CTRL), getreg(LEDCTL),
781 786 getreg(MANC), getreg(MDIC), getreg(SWSM), getreg(STATUS),
782 787 getreg(TORL), getreg(TOTL), getreg(IMS), getreg(TCTL),
783   - getreg(RDH), getreg(RDT), getreg(VET),
  788 + getreg(RDH), getreg(RDT), getreg(VET), getreg(ICS),
784 789  
785 790 [TOTH] = mac_read_clr8, [TORH] = mac_read_clr8, [GPRC] = mac_read_clr4,
786 791 [GPTC] = mac_read_clr4, [TPR] = mac_read_clr4, [TPT] = mac_read_clr4,
... ...