| Message ID | 1481658281-24243-1-git-send-email-hpoussin@reactos.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 2016年12月14日 03:44, Hervé Poussineau wrote: > According to datasheet: > "[Bit 15 of Basic Mode Control Register] sets the status and control registers > of the PHY (register 0062-0074) in a default state. This bit is self-clearing. > 1 = software reset; 0 = normal operation." > > This fixes the netcard detection failure in Minoca OS. > > Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> > --- > hw/net/rtl8139.c | 34 +++++++++++++++++++++------------- > 1 file changed, 21 insertions(+), 13 deletions(-) > > diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c > index f05e59c..671c7e4 100644 > --- a/hw/net/rtl8139.c > +++ b/hw/net/rtl8139.c > @@ -1205,6 +1205,20 @@ static void rtl8139_reset_rxring(RTL8139State *s, uint32_t bufferSize) > s->RxBufAddr = 0; > } > > +static void rtl8139_reset_phy(RTL8139State *s) > +{ > + s->BasicModeStatus = 0x7809; > + s->BasicModeStatus |= 0x0020; /* autonegotiation completed */ > + /* preserve link state */ > + s->BasicModeStatus |= qemu_get_queue(s->nic)->link_down ? 0 : 0x04; > + > + s->NWayAdvert = 0x05e1; /* all modes, full duplex */ > + s->NWayLPAR = 0x05e1; /* all modes, full duplex */ > + s->NWayExpansion = 0x0001; /* autonegotiation supported */ > + > + s->CSCR = CSCR_F_LINK_100 | CSCR_HEART_BIT | CSCR_LD; > +} > + > static void rtl8139_reset(DeviceState *d) > { > RTL8139State *s = RTL8139(d); > @@ -1256,25 +1270,14 @@ static void rtl8139_reset(DeviceState *d) > s->Config3 = 0x1; /* fast back-to-back compatible */ > s->Config5 = 0x0; > > - s->CSCR = CSCR_F_LINK_100 | CSCR_HEART_BIT | CSCR_LD; > - > s->CpCmd = 0x0; /* reset C+ mode */ > s->cplus_enabled = 0; > > - > // s->BasicModeCtrl = 0x3100; // 100Mbps, full duplex, autonegotiation > // s->BasicModeCtrl = 0x2100; // 100Mbps, full duplex > s->BasicModeCtrl = 0x1000; // autonegotiation > > - s->BasicModeStatus = 0x7809; > - //s->BasicModeStatus |= 0x0040; /* UTP medium */ > - s->BasicModeStatus |= 0x0020; /* autonegotiation completed */ > - /* preserve link state */ > - s->BasicModeStatus |= qemu_get_queue(s->nic)->link_down ? 0 : 0x04; > - > - s->NWayAdvert = 0x05e1; /* all modes, full duplex */ > - s->NWayLPAR = 0x05e1; /* all modes, full duplex */ > - s->NWayExpansion = 0x0001; /* autonegotiation supported */ > + rtl8139_reset_phy(s); > > /* also reset timer and disable timer interrupt */ > s->TCTR = 0; > @@ -1469,7 +1472,7 @@ static void rtl8139_BasicModeCtrl_write(RTL8139State *s, uint32_t val) > DPRINTF("BasicModeCtrl register write(w) val=0x%04x\n", val); > > /* mask unwritable bits */ > - uint32_t mask = 0x4cff; > + uint32_t mask = 0xccff; > > if (1 || !rtl8139_config_writable(s)) > { > @@ -1479,6 +1482,11 @@ static void rtl8139_BasicModeCtrl_write(RTL8139State *s, uint32_t val) > mask |= 0x0100; > } > > + if (val & 0x8000) { > + /* Reset PHY */ > + rtl8139_reset_phy(s); > + } > + > val = SET_MASKED(val, mask, s->BasicModeCtrl); > > s->BasicModeCtrl = val; Applied to -net. Thanks
diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index f05e59c..671c7e4 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -1205,6 +1205,20 @@ static void rtl8139_reset_rxring(RTL8139State *s, uint32_t bufferSize) s->RxBufAddr = 0; } +static void rtl8139_reset_phy(RTL8139State *s) +{ + s->BasicModeStatus = 0x7809; + s->BasicModeStatus |= 0x0020; /* autonegotiation completed */ + /* preserve link state */ + s->BasicModeStatus |= qemu_get_queue(s->nic)->link_down ? 0 : 0x04; + + s->NWayAdvert = 0x05e1; /* all modes, full duplex */ + s->NWayLPAR = 0x05e1; /* all modes, full duplex */ + s->NWayExpansion = 0x0001; /* autonegotiation supported */ + + s->CSCR = CSCR_F_LINK_100 | CSCR_HEART_BIT | CSCR_LD; +} + static void rtl8139_reset(DeviceState *d) { RTL8139State *s = RTL8139(d); @@ -1256,25 +1270,14 @@ static void rtl8139_reset(DeviceState *d) s->Config3 = 0x1; /* fast back-to-back compatible */ s->Config5 = 0x0; - s->CSCR = CSCR_F_LINK_100 | CSCR_HEART_BIT | CSCR_LD; - s->CpCmd = 0x0; /* reset C+ mode */ s->cplus_enabled = 0; - // s->BasicModeCtrl = 0x3100; // 100Mbps, full duplex, autonegotiation // s->BasicModeCtrl = 0x2100; // 100Mbps, full duplex s->BasicModeCtrl = 0x1000; // autonegotiation - s->BasicModeStatus = 0x7809; - //s->BasicModeStatus |= 0x0040; /* UTP medium */ - s->BasicModeStatus |= 0x0020; /* autonegotiation completed */ - /* preserve link state */ - s->BasicModeStatus |= qemu_get_queue(s->nic)->link_down ? 0 : 0x04; - - s->NWayAdvert = 0x05e1; /* all modes, full duplex */ - s->NWayLPAR = 0x05e1; /* all modes, full duplex */ - s->NWayExpansion = 0x0001; /* autonegotiation supported */ + rtl8139_reset_phy(s); /* also reset timer and disable timer interrupt */ s->TCTR = 0; @@ -1469,7 +1472,7 @@ static void rtl8139_BasicModeCtrl_write(RTL8139State *s, uint32_t val) DPRINTF("BasicModeCtrl register write(w) val=0x%04x\n", val); /* mask unwritable bits */ - uint32_t mask = 0x4cff; + uint32_t mask = 0xccff; if (1 || !rtl8139_config_writable(s)) { @@ -1479,6 +1482,11 @@ static void rtl8139_BasicModeCtrl_write(RTL8139State *s, uint32_t val) mask |= 0x0100; } + if (val & 0x8000) { + /* Reset PHY */ + rtl8139_reset_phy(s); + } + val = SET_MASKED(val, mask, s->BasicModeCtrl); s->BasicModeCtrl = val;
According to datasheet: "[Bit 15 of Basic Mode Control Register] sets the status and control registers of the PHY (register 0062-0074) in a default state. This bit is self-clearing. 1 = software reset; 0 = normal operation." This fixes the netcard detection failure in Minoca OS. Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> --- hw/net/rtl8139.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-)