From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09E1FC3F2D2 for ; Mon, 2 Mar 2020 07:51:00 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C8C36246A1 for ; Mon, 2 Mar 2020 07:50:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="MbzL3vIF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C8C36246A1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56130 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8fqs-0006BU-TI for qemu-devel@archiver.kernel.org; Mon, 02 Mar 2020 02:50:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60260) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8fhc-0004it-Hr for qemu-devel@nongnu.org; Mon, 02 Mar 2020 02:41:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8fhb-0003lQ-Eg for qemu-devel@nongnu.org; Mon, 02 Mar 2020 02:41:24 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:31331 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j8fhb-0003l0-7C for qemu-devel@nongnu.org; Mon, 02 Mar 2020 02:41:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583134882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ngv8J/eu4jYSej5X2ep9xhbT/ICki9cwCdKASiCwgIU=; b=MbzL3vIFRjbY3kgF0e4e8yTGkO5G9GuFe1CMnEoiz5ch+LffRA5T/SUiL60fl3Sqcd6eTz qAbGBkcH7mB5xbUrT6viveRV9F1SOklYFD5R+QwQoDLN5WnzC1OkWBKZJQa//7LIQwvYs6 7Tzbr6C/Jt9GTxwZViBrqGl4Jo+Ys4Q= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-218-RiE6xxWWOM6r47BMhnDGcg-1; Mon, 02 Mar 2020 02:41:18 -0500 X-MC-Unique: RiE6xxWWOM6r47BMhnDGcg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 460E6107ACC9; Mon, 2 Mar 2020 07:41:17 +0000 (UTC) Received: from jason-ThinkPad-T430s.redhat.com (ovpn-12-58.pek2.redhat.com [10.72.12.58]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B50560BF3; Mon, 2 Mar 2020 07:41:15 +0000 (UTC) From: Jason Wang To: peter.maydell@linaro.org Subject: [PULL 15/23] e1000e: Avoid hw_error if legacy mode used Date: Mon, 2 Mar 2020 15:40:28 +0800 Message-Id: <1583134836-23991-16-git-send-email-jasowang@redhat.com> In-Reply-To: <1583134836-23991-1-git-send-email-jasowang@redhat.com> References: <1583134836-23991-1-git-send-email-jasowang@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yuri Benditovich , Jason Wang , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Yuri Benditovich https://bugzilla.redhat.com/show_bug.cgi?id=3D1787142 The emulation issues hw_error if PSRCTL register is written, for example, with zero value. Such configuration does not present any problem when DTYP bits of RCTL register define legacy format of transfer descriptors. Current commit discards check for BSIZE0 and BSIZE1 when legacy mode used. Acked-by: Dmitry Fleytman Signed-off-by: Yuri Benditovich Signed-off-by: Jason Wang --- hw/net/e1000e_core.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index 9b76f82..d110c5a 100644 --- a/hw/net/e1000e_core.c +++ b/hw/net/e1000e_core.c @@ -2813,12 +2813,15 @@ e1000e_set_eitr(E1000ECore *core, int index, uint32= _t val) static void e1000e_set_psrctl(E1000ECore *core, int index, uint32_t val) { - if ((val & E1000_PSRCTL_BSIZE0_MASK) =3D=3D 0) { - hw_error("e1000e: PSRCTL.BSIZE0 cannot be zero"); - } + if (core->mac[RCTL] & E1000_RCTL_DTYP_MASK) { + + if ((val & E1000_PSRCTL_BSIZE0_MASK) =3D=3D 0) { + hw_error("e1000e: PSRCTL.BSIZE0 cannot be zero"); + } =20 - if ((val & E1000_PSRCTL_BSIZE1_MASK) =3D=3D 0) { - hw_error("e1000e: PSRCTL.BSIZE1 cannot be zero"); + if ((val & E1000_PSRCTL_BSIZE1_MASK) =3D=3D 0) { + hw_error("e1000e: PSRCTL.BSIZE1 cannot be zero"); + } } =20 core->mac[PSRCTL] =3D val; --=20 2.5.0