From patchwork Fri Sep 14 02:16:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amos Kong X-Patchwork-Id: 183775 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3448A2C0092 for ; Fri, 14 Sep 2012 12:15:45 +1000 (EST) Received: from localhost ([::1]:53269 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TCLRX-0000OT-Jd for incoming@patchwork.ozlabs.org; Thu, 13 Sep 2012 22:15:43 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44060) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TCLRQ-0000OO-St for qemu-devel@nongnu.org; Thu, 13 Sep 2012 22:15:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TCLRP-0000Zp-Mu for qemu-devel@nongnu.org; Thu, 13 Sep 2012 22:15:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:21374) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TCLRP-0000Zg-EM for qemu-devel@nongnu.org; Thu, 13 Sep 2012 22:15:35 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q8E2FWhR016002 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 13 Sep 2012 22:15:32 -0400 Received: from dhcp-8-167.nay.redhat.com ([10.66.7.126]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q8E2FSdu007894; Thu, 13 Sep 2012 22:15:29 -0400 From: Amos Kong To: qemu-devel@nongnu.org Date: Fri, 14 Sep 2012 10:16:06 +0800 Message-Id: <1347588966-20350-1-git-send-email-akong@redhat.com> In-Reply-To: <504DA1A9.2000908@redhat.com> References: <504DA1A9.2000908@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: jasowang@redhat.com, mst@redhat.com, Amos Kong , stefanha@linux.vnet.ibm.com, aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH v3] rtl8139: implement 8139cp link status X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jason Wang Add a link status chang callback and change the link status bit in BMSR & MSR accordingly. Tested in Linux/Windows guests. The LinkDown bit of MediaStatus is inverse with link status. Signed-off-by: Jason Wang Signed-off-by: Amos Kong --- v2: don't add MediaState in RTL8139State to avoid trouble v3: adding an enum MediaStatusBits --- hw/rtl8139.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/hw/rtl8139.c b/hw/rtl8139.c index 844f1b8..02d571f 100644 --- a/hw/rtl8139.c +++ b/hw/rtl8139.c @@ -167,7 +167,7 @@ enum IntrStatusBits { PCIErr = 0x8000, PCSTimeout = 0x4000, RxFIFOOver = 0x40, - RxUnderrun = 0x20, + RxUnderrun = 0x20, /* Packet Underrun / Link Change */ RxOverflow = 0x10, TxErr = 0x08, TxOK = 0x04, @@ -274,6 +274,18 @@ enum Config3Bits { Cfg3_GNTSel = (1 << 7), /* 1 = delay 1 clock from PCI GNT signal */ }; +/* Bits in MediaStatus */ +enum MediaStatusBits { + MSR_RXPF = (1 << 0), /* Receive Pause Flag */ + MSR_TXPF = (1 << 1), /* Transmit Pause Flag */ + MSR_LinkDown = (1 << 2), /* Inverse of Link Status */ + MSR_Speed_10 = (1 << 3), /* Media Speed */ + MSR_Aux_Status = (1 << 4), /* Aux. Power Present Status */ + MSR_Reserved = (1 << 5), /* Reserved */ + MSR_RXFCE = (1 << 6), /* Rx Flow Control Enable */ + MSR_TXFCE = (1 << 7), /* Tx Flow Control Enable */ +}; + /* Bits in Config4 */ enum Config4Bits { LWPTN = (1 << 2), /* not on 8139, 8139A */ @@ -3007,7 +3019,8 @@ static uint32_t rtl8139_io_readb(void *opaque, uint8_t addr) break; case MediaStatus: - ret = 0xd0; + /* The LinkDown bit of MediaStatus is inverse with link status */ + ret = 0xd0 | (s->nic->nc.link_down ? MSR_LinkDown : 0); DPRINTF("MediaStatus read 0x%x\n", ret); break; @@ -3453,12 +3466,27 @@ static void pci_rtl8139_uninit(PCIDevice *dev) qemu_del_net_client(&s->nic->nc); } +static void rtl8139_set_link_status(NetClientState *nc) +{ + RTL8139State *s = DO_UPCAST(NICState, nc, nc)->opaque; + + if (nc->link_down) { + s->BasicModeStatus &= ~0x0004; + } else { + s->BasicModeStatus |= 0x0004; + } + + s->IntrStatus |= RxUnderrun; + rtl8139_update_irq(s); +} + static NetClientInfo net_rtl8139_info = { .type = NET_CLIENT_OPTIONS_KIND_NIC, .size = sizeof(NICState), .can_receive = rtl8139_can_receive, .receive = rtl8139_receive, .cleanup = rtl8139_cleanup, + .link_status_changed = rtl8139_set_link_status, }; static int pci_rtl8139_init(PCIDevice *dev)