From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49545) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbQAT-0003ec-3b for qemu-devel@nongnu.org; Mon, 04 Jun 2012 01:49:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SbQAR-0004Vu-93 for qemu-devel@nongnu.org; Mon, 04 Jun 2012 01:49:28 -0400 Received: from e32.co.us.ibm.com ([32.97.110.150]:43127) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbQAR-0004Vn-2Z for qemu-devel@nongnu.org; Mon, 04 Jun 2012 01:49:27 -0400 Received: from /spool/local by e32.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sun, 3 Jun 2012 23:49:20 -0600 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id E3E9619D8048 for ; Mon, 4 Jun 2012 05:48:21 +0000 (WET) Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q545mMhB174144 for ; Sun, 3 Jun 2012 23:48:22 -0600 Received: from d03av03.boulder.ibm.com (loopback [127.0.0.1]) by d03av03.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q545mMco015157 for ; Sun, 3 Jun 2012 23:48:22 -0600 Message-ID: <4FCC4C23.9020007@us.ibm.com> Date: Mon, 04 Jun 2012 13:48:19 +0800 From: Anthony Liguori MIME-Version: 1.0 References: <20120510083717.45992.7495.stgit@amd-6168-8-1.englab.nay.redhat.com> In-Reply-To: <20120510083717.45992.7495.stgit@amd-6168-8-1.englab.nay.redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] Revert "rtl8139: do the network/host communication only in normal operating mode" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jason Wang Cc: mst@redhat.com, qemu-devel@nongnu.org, avi@redhat.com On 05/10/2012 04:37 PM, Jason Wang wrote: > This reverts commit ff71f2e8cacefae99179993204172bc65e4303df. This is because > the linux 8139cp driver would leave the card in "Config Register Write Enable" > mode after the eeprom were read or write ( which is unexpected in the spec > ). Also a physical 8139 card can still DMA into host memory in modes other than > Normal mode, so we need revert this commit to align with the behavior of > physical card. > > The issue of 8139cp driver should be fixed in linux seperately. > > Signed-off-by: Jason Wang Applied. Thanks. Regards, Anthony Liguori > --- > hw/rtl8139.c | 9 --------- > 1 files changed, 0 insertions(+), 9 deletions(-) > > diff --git a/hw/rtl8139.c b/hw/rtl8139.c > index eb22d04..2413bc3 100644 > --- a/hw/rtl8139.c > +++ b/hw/rtl8139.c > @@ -791,9 +791,6 @@ static int rtl8139_can_receive(VLANClientState *nc) > return 1; > if (!rtl8139_receiver_enabled(s)) > return 1; > - /* network/host communication happens only in normal mode */ > - if ((s->Cfg9346& Chip9346_op_mask) != Cfg9346_Normal) > - return 0; > > if (rtl8139_cp_receiver_enabled(s)) { > /* ??? Flow control not implemented in c+ mode. > @@ -836,12 +833,6 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_ > return -1; > } > > - /* check whether we are in normal mode */ > - if ((s->Cfg9346& Chip9346_op_mask) != Cfg9346_Normal) { > - DPRINTF("not in normal op mode\n"); > - return -1; > - } > - > /* XXX: check this */ > if (s->RxConfig& AcceptAllPhys) { > /* promiscuous: receive all */ > > >