qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Amos Kong <akong@redhat.com>
To: qemu-devel@nongnu.org
Cc: jasowang@redhat.com, mst@redhat.com, Amos Kong <akong@redhat.com>,
	stefanha@linux.vnet.ibm.com, aliguori@us.ibm.com
Subject: [Qemu-devel] [PATCH v2] rtl8139: implement 8139cp link status
Date: Thu, 13 Sep 2012 16:51:39 +0800	[thread overview]
Message-ID: <1347526299-27407-1-git-send-email-akong@redhat.com> (raw)
In-Reply-To: <504DA1A9.2000908@redhat.com>

From: Jason Wang <jasowang@redhat.com>

Add a link status chang callback and change the link status bit in BMSR
& MSR accordingly. Tested in Linux/Windows guests.

The link status bit of MediaStatus is infered from BasicModeStatus,
they are reverse. 

Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Amos Kong <akong@redhat.com>
---
v2: don't add MediaState in RTL8139State to avoid migration trouble
---
 hw/rtl8139.c |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/hw/rtl8139.c b/hw/rtl8139.c
index 844f1b8..fa949ca 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,
@@ -3007,7 +3007,7 @@ static uint32_t rtl8139_io_readb(void *opaque, uint8_t addr)
             break;
 
         case MediaStatus:
-            ret = 0xd0;
+            ret = 0xd0 | ~(s->BasicModeStatus & 0x0004);
             DPRINTF("MediaStatus read 0x%x\n", ret);
             break;
 
@@ -3453,12 +3453,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)
-- 
1.7.1

  parent reply	other threads:[~2012-09-13  8:51 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-10  7:59 [Qemu-devel] [PATCH] rtl8139: implement 8139cp link status Amos Kong
2012-09-10  8:15 ` Jason Wang
2012-09-13  8:48   ` Jason Wang
2012-09-13  8:51   ` Amos Kong [this message]
2012-09-13 12:29     ` [Qemu-devel] [PATCH v2] " Stefan Hajnoczi
2012-09-14  1:34       ` Amos Kong
2012-09-14  7:30         ` Stefan Hajnoczi
2012-09-14  9:01           ` Jason Wang
2012-09-14  2:16   ` [Qemu-devel] [PATCH v3] " Amos Kong
2012-09-14  8:36     ` Paolo Bonzini
2012-09-14  9:20       ` Amos Kong
2012-09-17  2:25   ` [Qemu-devel] [PATCH v4 0/3] net: fix " Amos Kong
2012-09-17  2:44     ` Jason Wang
2012-09-17  2:25   ` [Qemu-devel] [PATCH v4 1/3] rtl8139: implement 8139cp " Amos Kong
2012-09-27  9:30     ` Stefan Hajnoczi
2012-09-17  2:25   ` [Qemu-devel] [PATCH v4 2/3] e1000: update nc.link_down in e1000_post_load() Amos Kong
2012-09-17  2:25   ` [Qemu-devel] [PATCH v4 3/3] update nc.link_down in virtio_net_load() Amos Kong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1347526299-27407-1-git-send-email-akong@redhat.com \
    --to=akong@redhat.com \
    --cc=aliguori@us.ibm.com \
    --cc=jasowang@redhat.com \
    --cc=mst@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@linux.vnet.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).