From nobody Thu Nov 13 21:53:50 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1583292242; cv=none; d=zohomail.com; s=zohoarc; b=geb2YKy4fHBFFvMBg2iuPtEan8Bj0uV834xk/hXC3Lk4pgxi9i3umPXyyr+pCTj17VkXw08O5M/elBXcbhUiqcgg7CJrwvPMVvS02vdzf6Ftm22cuwJztt0Ip4/wPGQFavEXJcRlqqBc0m7ge5JL2fgWX9rxzpUHnK/dY69y0ZM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583292242; h=Content-Type:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=c365NWZ5JcePd+zKn8cZVuHn6ZvsU7J+w8HyRAijNHE=; b=cl9NqXrAjJmyh5VKGiB/jiH/7I4gad/Iz3v5Xc4F3mD3aKeFlYdUuu9dZXFXUf8h/z7DtoF+IFDTEY9pFSxXJz8RTxHpk6pWvwCGzhJZkWw7l2Lx/206FAxDByl2NUX5aibVFfTCXEneYZWaVK+XN1mlJfqRzh9aku3yUfhwoC8= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1583292242023864.1755856149534; Tue, 3 Mar 2020 19:24:02 -0800 (PST) Received: from localhost ([::1]:56820 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Kdb-00012q-Hj for importer@patchew.org; Tue, 03 Mar 2020 22:23:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37615) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Kcq-0000Vu-RV for qemu-devel@nongnu.org; Tue, 03 Mar 2020 22:23:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9Kcp-0001do-Rv for qemu-devel@nongnu.org; Tue, 03 Mar 2020 22:23:12 -0500 Received: from kvm5.telegraphics.com.au ([98.124.60.144]:46184) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1j9Kcp-0001Xm-Nf for qemu-devel@nongnu.org; Tue, 03 Mar 2020 22:23:11 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by kvm5.telegraphics.com.au (Postfix) with ESMTP id 79D522A49D; Tue, 3 Mar 2020 22:23:07 -0500 (EST) Date: Wed, 4 Mar 2020 14:23:05 +1100 (AEDT) From: Finn Thain To: Jason Wang Subject: [PATCH] dp8393x: Mask EOL bit from descriptor addresses, take 2 Message-ID: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 98.124.60.144 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: peter.maydell@linaro.org, qemu-devel@nongnu.org, Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" A portion of a recent patch got lost due to a merge snafu. That patch is now commit 88f632fbb1 ("dp8393x: Mask EOL bit from descriptor addresses"). This patch restores the portion that got lost. Signed-off-by: Finn Thain Reviewed-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/net/dp8393x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index 8a3504d962..81fc13ee9f 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -525,8 +525,8 @@ static void dp8393x_do_transmit_packets(dp8393xState *s) * (4 + 3 * s->regs[SONIC_TFC]), MEMTXATTRS_UNSPECIFIED, s->data, size); - s->regs[SONIC_CTDA] =3D dp8393x_get(s, width, 0) & ~0x1; - if (dp8393x_get(s, width, 0) & SONIC_DESC_EOL) { + s->regs[SONIC_CTDA] =3D dp8393x_get(s, width, 0); + if (s->regs[SONIC_CTDA] & SONIC_DESC_EOL) { /* EOL detected */ break; } --=20 2.24.1