david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

e1000: introduce helpers to manipulate link status

Browse Source 
This patch introduces helpers to change link status bit for phy/mac
register. This would help to reduce code duplication and would be used
by following patches.

Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Jason Wang 2012-03-22 18:02:07 +08:00 committed by Michael S. Tsirkin
parent 93e37d7690
commit 71aadd3cd2
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hw/e1000.c
View File

@ -142,6 +142,20 @@ enum {
defreg(VET), defreg(VET),
}; };
static void
e1000_link_down(E1000State *s)
{
s->mac_reg[STATUS] &= ~E1000_STATUS_LU;
s->phy_reg[PHY_STATUS] &= ~MII_SR_LINK_STATUS;
}
static void
e1000_link_up(E1000State *s)
{
s->mac_reg[STATUS] |= E1000_STATUS_LU;
s->phy_reg[PHY_STATUS] |= MII_SR_LINK_STATUS;
}
enum { PHY_R = 1, PHY_W = 2, PHY_RW = PHY_R | PHY_W }; enum { PHY_R = 1, PHY_W = 2, PHY_RW = PHY_R | PHY_W };
static const char phy_regcap[0x20] = { static const char phy_regcap[0x20] = {
[PHY_STATUS] = PHY_R, [M88E1000_EXT_PHY_SPEC_CTRL] = PHY_RW, [PHY_STATUS] = PHY_R, [M88E1000_EXT_PHY_SPEC_CTRL] = PHY_RW,
@ -228,8 +242,7 @@ static void e1000_reset(void *opaque)
memset(&d->tx, 0, sizeof d->tx); memset(&d->tx, 0, sizeof d->tx);
if (d->nic->nc.link_down) { if (d->nic->nc.link_down) {
d->mac_reg[STATUS] &= ~E1000_STATUS_LU; e1000_link_down(d);
d->phy_reg[PHY_STATUS] &= ~MII_SR_LINK_STATUS;
} }
} }
@ -675,11 +688,9 @@ e1000_set_link_status(VLANClientState *nc)
uint32_t old_status = s->mac_reg[STATUS]; uint32_t old_status = s->mac_reg[STATUS];
if (nc->link_down) { if (nc->link_down) {
s->mac_reg[STATUS] &= ~E1000_STATUS_LU; e1000_link_down(s);
s->phy_reg[PHY_STATUS] &= ~MII_SR_LINK_STATUS;
} else { } else {
s->mac_reg[STATUS] |= E1000_STATUS_LU; e1000_link_up(s);
s->phy_reg[PHY_STATUS] |= MII_SR_LINK_STATUS;
} }
if (s->mac_reg[STATUS] != old_status) if (s->mac_reg[STATUS] != old_status)