From patchwork Thu May 10 08:37:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 158226 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 CED26B6FB4 for ; Thu, 10 May 2012 18:43:03 +1000 (EST) Received: from localhost ([::1]:42507 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSOxg-00040d-UE for incoming@patchwork.ozlabs.org; Thu, 10 May 2012 04:43:00 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33974) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSOxV-0003i8-Aa for qemu-devel@nongnu.org; Thu, 10 May 2012 04:42:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SSOxQ-0003tz-Mw for qemu-devel@nongnu.org; Thu, 10 May 2012 04:42:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26124) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSOxQ-0003tr-Ez for qemu-devel@nongnu.org; Thu, 10 May 2012 04:42:44 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q4A8ggsx023546 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 10 May 2012 04:42:42 -0400 Received: from amd-6168-8-1.englab.nay.redhat.com (amd-6168-8-1.englab.nay.redhat.com [10.66.104.52]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q4A8ge41024893; Thu, 10 May 2012 04:42:41 -0400 To: aliguori@us.ibm.com, qemu-devel@nongnu.org, avi@redhat.com From: Jason Wang Date: Thu, 10 May 2012 16:37:22 +0800 Message-ID: <20120510083717.45992.7495.stgit@amd-6168-8-1.englab.nay.redhat.com> User-Agent: StGit/0.16-1-g60c4 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: mst@redhat.com Subject: [Qemu-devel] [PATCH] Revert "rtl8139: do the network/host communication only in normal operating mode" 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 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 --- 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 */