aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorJason Wang <jasowang@redhat.com>2012-03-22 18:02:07 +0800
committerMichael S. Tsirkin <mst@redhat.com>2012-04-25 10:53:48 +0300
commit71aadd3cd2b2f8bd3113a08a12d4a06d48b6c39c (patch)
tree89cf025d4a811445418a2141920cd10bfab9318b /hw
parent93e37d769074bebfd04c6704b7a7ae92736876e3 (diff)
downloadqemu-71aadd3cd2b2f8bd3113a08a12d4a06d48b6c39c.zip
qemu-71aadd3cd2b2f8bd3113a08a12d4a06d48b6c39c.tar.gz
qemu-71aadd3cd2b2f8bd3113a08a12d4a06d48b6c39c.tar.bz2
e1000: introduce helpers to manipulate link status
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>
Diffstat (limited to 'hw')
-rw-r--r--hw/e1000.c23
1 files changed, 17 insertions, 6 deletions
diff --git a/hw/e1000.c b/hw/e1000.c
index 4a09e39..6abec60 100644
--- a/hw/e1000.c
+++ b/hw/e1000.c
@@ -142,6 +142,20 @@ enum {
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 };
static const char phy_regcap[0x20] = {
[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);
if (d->nic->nc.link_down) {
- d->mac_reg[STATUS] &= ~E1000_STATUS_LU;
- d->phy_reg[PHY_STATUS] &= ~MII_SR_LINK_STATUS;
+ e1000_link_down(d);
}
}
@@ -675,11 +688,9 @@ e1000_set_link_status(VLANClientState *nc)
uint32_t old_status = s->mac_reg[STATUS];
if (nc->link_down) {
- s->mac_reg[STATUS] &= ~E1000_STATUS_LU;
- s->phy_reg[PHY_STATUS] &= ~MII_SR_LINK_STATUS;
+ e1000_link_down(s);
} else {
- s->mac_reg[STATUS] |= E1000_STATUS_LU;
- s->phy_reg[PHY_STATUS] |= MII_SR_LINK_STATUS;
+ e1000_link_up(s);
}
if (s->mac_reg[STATUS] != old_status)