Commit cab3c825 authored by Kevin Wolf's avatar Kevin Wolf Committed by Anthony Liguori
Browse files

e1000: Ignore reset command 



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: default avatarKevin Wolf <mail@kevin-wolf.de>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 8cf07dcb

hw/e1000.c

+9 −2
Original line number Diff line number Diff line
@@ -189,6 +189,13 @@ rxbufsize(uint32_t v) 
    return 2048;

}



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)

{
@@ -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,