From nobody Mon Feb 9 06:49:51 2026 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=1579475862; cv=none; d=zohomail.com; s=zohoarc; b=BOf+PCopU4R3rwMQvgZlUglZMzYexSl7NuoqwMIBl0pHoCCfNw+9jzHqhtuGB6gas4ViFn1ks31lJCdoZVBKEhmVDd9uG6gROUOnT9upXcx5CfzlVWccZsxU1P2T7/ECa2jrGxnyvfdYsu2P0TQ4VRuXqbfCBq8kqCgTUVxXcnQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579475862; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=XPxJe7hnCS4GSOsC+vJKQVHb76bISRzec7YQGqW2BH4=; b=PTWq89D403ZZDSJkJHsSA6RjC7zdmPhbA3cXXLJg+G6OIUInQtaZdj6UWfZEKRaMqn4+4ukmSL8Rw1yS5U3iYb2ou9yW1kjChz/evSQrlI3VTgUmBLrNmL6n6VlDd21ltYtUMwqaQ8dtG7iRFUqLVOCfCPrppxOBi8XzEMB5fXw= 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 1579475862893726.3008978748222; Sun, 19 Jan 2020 15:17:42 -0800 (PST) Received: from localhost ([::1]:54976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itJp7-0000NW-Ls for importer@patchew.org; Sun, 19 Jan 2020 18:17:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55977) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itJfj-0004AU-KB for qemu-devel@nongnu.org; Sun, 19 Jan 2020 18:08:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itJfh-0003mX-E0 for qemu-devel@nongnu.org; Sun, 19 Jan 2020 18:07:59 -0500 Received: from kvm5.telegraphics.com.au ([98.124.60.144]:54652) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1itJfh-0003k6-7O; Sun, 19 Jan 2020 18:07:57 -0500 Received: by kvm5.telegraphics.com.au (Postfix, from userid 502) id 0A10B2991B; Sun, 19 Jan 2020 18:07:55 -0500 (EST) To: Jason Wang , qemu-devel@nongnu.org Message-Id: <9c3243048ebb89a2af674847c0570d0c84cc3e79.1579474761.git.fthain@telegraphics.com.au> In-Reply-To: References: From: Finn Thain Subject: [PATCH v3 03/14] dp8393x: Clean up endianness hacks Date: Mon, 20 Jan 2020 09:59:21 +1100 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: Aleksandar Rikalo , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Laurent Vivier , qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" According to the datasheet, section 3.4.4, "in 32-bit mode ... the SONIC always writes long words". Therefore, use the same technique for the 'in_use' field that is used everywhere else, and write the full long word. Signed-off-by: Finn Thain Tested-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- Changed since v1: - Use existing 'address' variable rather than declare a new one. Laurent tells me that a similar clean-up has been tried before. He referred me to commit c744cf7879 ("dp8393x: fix dp8393x_receive()") and commit 409b52bfe1 ("net/dp8393x: correctly reset in_use field"). I believe the underlying issue has been fixed by the preceding patch, as this no longer breaks NetBSD 5.1. --- hw/net/dp8393x.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index b2fd44bc2f..2d2ace2549 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -776,8 +776,6 @@ static ssize_t dp8393x_receive(NetClientState *nc, cons= t uint8_t * buf, return -1; } =20 - /* XXX: Check byte ordering */ - /* Check for EOL */ if (s->regs[SONIC_LLFA] & SONIC_DESC_EOL) { /* Are we still in resource exhaustion? */ @@ -847,15 +845,12 @@ static ssize_t dp8393x_receive(NetClientState *nc, co= nst uint8_t * buf, /* EOL detected */ s->regs[SONIC_ISR] |=3D SONIC_ISR_RDE; } else { - /* Clear in_use, but it is always 16bit wide */ - int offset =3D dp8393x_crda(s) + sizeof(uint16_t) * 6 * width; - if (s->big_endian && width =3D=3D 2) { - /* we need to adjust the offset of the 16bit field */ - offset +=3D sizeof(uint16_t); - } - s->data[0] =3D 0; - address_space_rw(&s->as, offset, MEMTXATTRS_UNSPECIFIED, - (uint8_t *)s->data, sizeof(uint16_t), 1); + /* Clear in_use */ + size =3D sizeof(uint16_t) * width; + address =3D dp8393x_crda(s) + sizeof(uint16_t) * 6 * width; + dp8393x_put(s, width, 0, 0); + address_space_rw(&s->as, address, MEMTXATTRS_UNSPECIFIED, + (uint8_t *)s->data, size, 1); s->regs[SONIC_CRDA] =3D s->regs[SONIC_LLFA]; s->regs[SONIC_ISR] |=3D SONIC_ISR_PKTRX; s->regs[SONIC_RSC] =3D (s->regs[SONIC_RSC] & 0xff00) | (((s->regs[= SONIC_RSC] & 0x00ff) + 1) & 0x00ff); --=20 2.24.1