From nobody Sun Feb 8 21:32:37 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=1576815854; cv=none; d=zohomail.com; s=zohoarc; b=eb0rrkyD06nZ9Ec75Dnmk6XctuGM2qArkNeyOnzc/yDzXbYsQzZqwsDpVNNF/HJJ5KkKw/GOJIRjj9epcTGnV2kZyHNxQOv6C5gza2KBVjcXfnsh940tqUVkz613NlUjedlvtGzlbb9G25jIc3nIF35J8WBsRKaOhwIIF6iYIO8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576815854; 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=sM9ixUkQ9UNHxLnffShgKxs4FwTuK3fwVWXo3FKa8ww=; b=YPf8nNwEdX15goyRMI9cev/FYyuDUsako2Og9aAyBXVlJumEaowgH9Hyp2reJBDsJgkKY4Q5LhnGiQqSECVAwfPIzOi0cw8DBIkOz083MXAlj+Wp1KtalaU+OLwRpMSLIlMjG5H5m62bqNy6BWuCwYMvQ9cRdel17YfVoSdPSPQ= 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 1576815854693374.0049046123996; Thu, 19 Dec 2019 20:24:14 -0800 (PST) Received: from localhost ([::1]:50514 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ii9pl-00034Z-15 for importer@patchew.org; Thu, 19 Dec 2019 23:24:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55693) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ii9ng-0008TI-4H for qemu-devel@nongnu.org; Thu, 19 Dec 2019 23:22:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ii9ne-0001yi-E5 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 23:22:03 -0500 Received: from kvm5.telegraphics.com.au ([98.124.60.144]:34416) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ii9ne-0001xK-6E; Thu, 19 Dec 2019 23:22:02 -0500 Received: by kvm5.telegraphics.com.au (Postfix, from userid 502) id EE6062829C; Thu, 19 Dec 2019 23:22:01 -0500 (EST) To: Jason Wang , qemu-devel@nongnu.org Message-Id: In-Reply-To: References: From: Finn Thain Subject: [PATCH v2 02/13] dp8393x: Clean up endianness hacks Date: Fri, 20 Dec 2019 15:17:46 +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" The in_use field is no different to the other words handled using dp8393x_put() and dp8393x_get(). Use the same technique for in_use that is used everywhere else. Signed-off-by: Finn Thain --- Changed since v1: - Use existing 'address' variable rather than declare a new one. Laurent tells me that this 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"). Both of those patches look wrong to me because they both pass the wrong byte count to address_space_rw(). It's possible that those patches were needed to work around some kind of bug elsewhere, for example, an off-by-one result from dp8393x_crda(). The preceding patch in this series might help there. --- 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 1957bd391e..b2cc768d9b 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -765,8 +765,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? */ @@ -836,15 +834,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 */ + address =3D dp8393x_crda(s) + sizeof(uint16_t) * 6 * width; + size =3D sizeof(uint16_t) * 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.23.0