From 089d8dcbc696e89df938f3aab5d57af79662c571 Mon Sep 17 00:00:00 2001 From: Xiao Wang Date: Fri, 10 Aug 2012 09:03:47 -0300 Subject: [RHEL6 qemu-kvm PATCH 7/9] e1000: introduce helpers to manipulate link status RH-Author: Xiao Wang Message-id: <1344589429-3229-8-git-send-email-jasowang@redhat.com> Patchwork-id: 40681 O-Subject: [RHEL6.4 qemu-kvm 7/9] e1000: introduce helpers to manipulate link status Bugzilla: 607510 819915 RH-Acked-by: Michael S. Tsirkin RH-Acked-by: Alex Williamson RH-Acked-by: Vlad Yasevich Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=607510 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 Signed-off-by: Michael S. Tsirkin (cherry picked from commit 71aadd3cd2b2f8bd3113a08a12d4a06d48b6c39c) --- hw/e1000.c | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) Signed-off-by: Eduardo Habkost --- hw/e1000.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/hw/e1000.c b/hw/e1000.c index 38bcde2..0c50e1d 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -137,6 +137,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, @@ -231,8 +245,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); } } @@ -659,11 +672,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) -- 1.7.11.2