From nobody Mon Feb 9 12:28:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) client-ip=209.85.128.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1625939402; cv=none; d=zohomail.com; s=zohoarc; b=WbBSF8kSRmJdom6OcDUlUUNK3qO8E8aejIG8o+Le7jFtO3vKhz8MYzY6Fq55Ry7STL6saE2oqdCXS3hp09SEDj+ngttQHlnZPv+rML/RF2xfn2nx58xoGNoxz4Z56uv9tlf7RhtO3ObAI0SUqMFrkAhfTQsp9j7RIEa9SlXjpfo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625939402; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3MSEzATk19r9ft3099Sl+079BzMi8xPFVuglcUqce0A=; b=ljwGCl8yWQq/KI4bn8yh8moFtiKHNTqIc5rFm/rOSui2Ha1tsut/d3Adcwxbbt296NU4qZX1knTyVcfMj7roAvHdx3Ef1N43ArI8vD61KEeTwbrOHPiS4+wBWIfIz/xfrKFILy/XkmIYdcYYJY2ug8OAeTzn1Mlx1ZQjJ1AgtJs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.zohomail.com with SMTPS id 1625939402973937.8659317070824; Sat, 10 Jul 2021 10:50:02 -0700 (PDT) Received: by mail-wm1-f53.google.com with SMTP id a5-20020a7bc1c50000b02901e3bbe0939bso8361044wmj.0 for ; Sat, 10 Jul 2021 10:50:02 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id d24sm15256012wmb.42.2021.07.10.10.50.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jul 2021 10:50:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3MSEzATk19r9ft3099Sl+079BzMi8xPFVuglcUqce0A=; b=qJkguGvVzi7FEApAaAcgwMnwJaM9Vpjt04icrlx4661EiitfEp6IsvHs7EzpBBdWAe IELhp0gF+CbsDnasAJsvaoK+kV0creI2ZzfCUT/SfLVqEIlcu30ME25zMnZLUAKOr/0A 9FnmzCwnUOrd4ILHwzrb9Tx9Knc+glaW/3Q4jlNErjKsyeRNGk5xte6+WQwWOQfhN6vN 45xZM4GFdW2hRZ1Gh18poxesxaMaTWv6jrKEa15tCdWsDddo3Ed3M1hgcBuQ9wG1ICg9 wso3biWogGNuAD0hccDE5CLNrQUCRGWG71Ljq9cxnfUnPWoyyOYJm5bIRyfRJEt5sAyM eYEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=3MSEzATk19r9ft3099Sl+079BzMi8xPFVuglcUqce0A=; b=IXJDbvoHZ0Y8A93p4azX6walq9NWcb7HqpgEP14JA2CEbQqSHQf0XP94scu4rvG1rG dUg+0njMc6dgrxhKepSpb8uwAhyiFTKalhR4CaMWJSX0aUo8cGVB7VwHg4Gigf01t7e3 ee7nrlB161binVhRJUsGmTHa0hEAed3Sp0L+XOufS+bdRVk+BELFq9sgTAPCRK4QdcUm EEZummC/GTKaKBmAc/GO9xua9u9hz/v2529eO6yebwHYjACnzAZ/doOFeiVOYjwA//VH LYct4mcStRd5UqBTFSO1+OvydFHwEfYT4W4IDtpOUxNSsZhrOm6xUH0cj/8QHaJ2cUHz lZww== X-Gm-Message-State: AOAM533UgOQs1v5ScbJAxFf5Hw5VUbmO71pJHVcPLy5UsCRJekZNxyet JDb516i1/stRIUsu2Bf4iYo= X-Google-Smtp-Source: ABdhPJz8LMWAQ6yp3Yim3aNFMwk23UJNcecX/C8uTCr1uKeSJ7ArKDW72RZysUefPQOSM/Il/TWdGQ== X-Received: by 2002:a1c:f616:: with SMTP id w22mr5401227wmc.73.1625939401220; Sat, 10 Jul 2021 10:50:01 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Finn Thain , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Laurent Vivier , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 1/8] dp8393x: Replace address_space_rw(is_write=1) by address_space_write() Date: Sat, 10 Jul 2021 19:49:47 +0200 Message-Id: <20210710174954.2577195-2-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210710174954.2577195-1-f4bug@amsat.org> References: <20210710174954.2577195-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1625939404544100001 Replace address_space_rw(is_write=3D1) by address_space_write() and remove pointless cast. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Mark Cave-Ayland Tested-by: Finn Thain --- hw/net/dp8393x.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index 11810c9b600..9118364aa33 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -816,8 +816,8 @@ static ssize_t dp8393x_receive(NetClientState *nc, cons= t uint8_t * buf, 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); + address_space_write(&s->as, address, MEMTXATTRS_UNSPECIFIED, + s->data, size); =20 /* Move to next descriptor */ s->regs[SONIC_CRDA] =3D s->regs[SONIC_LLFA]; @@ -846,8 +846,8 @@ static ssize_t dp8393x_receive(NetClientState *nc, cons= t uint8_t * buf, /* Pad short packets to keep pointers aligned */ if (rx_len < padded_len) { size =3D padded_len - rx_len; - address_space_rw(&s->as, address, MEMTXATTRS_UNSPECIFIED, - (uint8_t *)"\xFF\xFF\xFF", size, 1); + address_space_write(&s->as, address, MEMTXATTRS_UNSPECIFIED, + "\xFF\xFF\xFF", size); address +=3D size; } =20 --=20 2.31.1 From nobody Mon Feb 9 12:28:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) client-ip=209.85.128.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1625939407; cv=none; d=zohomail.com; s=zohoarc; b=hBianxsjczWNGy0oSWDmL3+K/c4PAvxXof46wtz7nZJXeMK7VDTb/o2wPW8w4h/82/IBzoHbnTUDR7pXiaaQHBIbTWdrhGFUYvrkm9sWSfjNrrMDVBKns/bxw76zf8GLqneRmShQpHnto1Xv0Enzp+Dt2jzGf8GLqvTZChBRUjI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625939407; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OnSonEZdAMgv0aONQbUfGaAXbR6YWaPB0S2D+r1jukM=; b=U59MVASTFve881A0OjVtitGzwY5vJo+Javnsad8/uurRlssHZy6vwshMBCn06JKQCR4mnTnkteW43pHHunpaFqiwUxGJhO3RuLbFBfdc9m5wOkiBjOd1FjxbulhNWJ7f15J6Y2774kMtGFVdMC4U9yVL66fxUMzmW4Z/2I1lvj8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mx.zohomail.com with SMTPS id 1625939407708217.3838422202963; Sat, 10 Jul 2021 10:50:07 -0700 (PDT) Received: by mail-wm1-f41.google.com with SMTP id h18-20020a05600c3512b029020e4ceb9588so11169079wmq.5 for ; Sat, 10 Jul 2021 10:50:07 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id g15sm7866921wmh.16.2021.07.10.10.50.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jul 2021 10:50:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OnSonEZdAMgv0aONQbUfGaAXbR6YWaPB0S2D+r1jukM=; b=bZVzkoFdIKPsmi4LXDL9nm+DY/R6KRKO4Pe4y7t811z5Lapd22HSyksWVPjTCX0zE9 kNTG1f0kIFxTiyo60KWy1KxC18TUCdhuPPiLgrpLpag3H8dCwTvZQzuhjwexmZA3WeEZ uoImFZjIIrX0xTMQynfNNOLqvqnSqshaJgoOTxBNnT7NjqyLdtksacTq0LYTGqCFuYHi 0Ks25apQrt8Ex8eWkAU73kY8u1v1+X702fv2zMHZFqdp5PtRuCX43UOlwp/sg3BLXnzY 3Xbmxdey23SRcmNaaK8W44kgWF0K3gkQRLurMTWk26kjvFQRccwQ0PRA6fM1kw37UMG3 KSxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=OnSonEZdAMgv0aONQbUfGaAXbR6YWaPB0S2D+r1jukM=; b=YQaWPeK3nkbz5uVNYLfs/0lPIy1IMD+D+DBMjtcCGyJzy8YX1IXegJBIGM7Y5qfVQQ 9+P11I05joLtzqt6D0XDn9PEuBYh9cHlM4oaVWbyeul5IT0BMSyYfVajdS5HSOKKPIHd hL7yuLf/pZJH8XtU72QGoXYP1HwKHypa100F3Nh24HZlAVs7Gbv/XMxmtaGasjkWZzLk jL1bOWuZIscDDY31yGlAIfAw1YYBb7rnEnulDj/6NGxKBvIdHYb6AU1I4iQECRCOBZdR WoUa3tUox+2IK8FBRs/XSe5Bm5pe0jijXC0vD4q3EaJPxRFbQU9RRzQeMHOt/TnuJCM4 h3Wg== X-Gm-Message-State: AOAM531L8D0dvTjvWWMgbBl7+5LdSI0lCKrCVhejkJePMdieAMw5JIwE PSyFm+pDTkiTFJT2Kd/IE8A= X-Google-Smtp-Source: ABdhPJwsCWKkD+rtfvgcVIfDUEfXmvZUujjJzkRAMgG/86WZ0Uxxs4oYdLhcNQaf3AUUu0/PpDI1Ew== X-Received: by 2002:a1c:e91a:: with SMTP id q26mr5455816wmc.170.1625939405974; Sat, 10 Jul 2021 10:50:05 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Finn Thain , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Laurent Vivier , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 2/8] dp8393x: Replace 0x40 magic value by SONIC_REG16_COUNT definition Date: Sat, 10 Jul 2021 19:49:48 +0200 Message-Id: <20210710174954.2577195-3-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210710174954.2577195-1-f4bug@amsat.org> References: <20210710174954.2577195-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1625939408840100001 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Mark Cave-Ayland Tested-by: Finn Thain --- hw/net/dp8393x.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index 9118364aa33..d1e147a82a6 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -85,6 +85,7 @@ static const char *reg_names[] =3D { #define SONIC_MPT 0x2e #define SONIC_MDT 0x2f #define SONIC_DCR2 0x3f +#define SONIC_REG_COUNT 0x40 =20 #define SONIC_CR_HTX 0x0001 #define SONIC_CR_TXP 0x0002 @@ -158,7 +159,7 @@ struct dp8393xState { =20 /* Registers */ uint8_t cam[16][6]; - uint16_t regs[0x40]; + uint16_t regs[SONIC_REG_COUNT]; =20 /* Temporaries */ uint8_t tx_buffer[0x10000]; @@ -972,7 +973,7 @@ static void dp8393x_realize(DeviceState *dev, Error **e= rrp) =20 address_space_init(&s->as, s->dma_mr, "dp8393x"); memory_region_init_io(&s->mmio, OBJECT(dev), &dp8393x_ops, s, - "dp8393x-regs", 0x40 << s->it_shift); + "dp8393x-regs", SONIC_REG_COUNT << s->it_shift); =20 s->nic =3D qemu_new_nic(&net_dp83932_info, &s->conf, object_get_typename(OBJECT(dev)), dev->id, s); @@ -987,7 +988,7 @@ static const VMStateDescription vmstate_dp8393x =3D { .minimum_version_id =3D 0, .fields =3D (VMStateField []) { VMSTATE_BUFFER_UNSAFE(cam, dp8393xState, 0, 16 * 6), - VMSTATE_UINT16_ARRAY(regs, dp8393xState, 0x40), + VMSTATE_UINT16_ARRAY(regs, dp8393xState, SONIC_REG_COUNT), VMSTATE_END_OF_LIST() } }; --=20 2.31.1 From nobody Mon Feb 9 12:28:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) client-ip=209.85.128.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1625939412; cv=none; d=zohomail.com; s=zohoarc; b=bITm0vOgGOc6JRGcWpFDCeizdAZGnIBD0l5b0DtfP7HecINvWxLsfK17ajD1Kk5LM8wqJDX3YXitirLQN+5mdje4aDnCxmuk2iLE0NafU8tAlwrsRTveQgq8XFOUJ5bSmaS5xW11Np1U17CDuRrXZnOZD6z+eRQPvBWO8L6TaKo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625939412; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=izSRG2tyrDqESEW+p/9utSApKbWpeVw0/SDAskwXqso=; b=GAaQgap6KO/aXjp+zvfitLetoVqcxm2U+iCwBLePq3qUXAj4T64HZNCfPpOKDLSOON8vDjuC3gLulGYRvLTldWnpbyxTLlgzQOZm3KOOFssWiRRvyQqOo49rWoNc5t/f9+BCIqaSU1vT6I9cQT8jYHC/eHo2ZQkUcVgmk0w8SYg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.zohomail.com with SMTPS id 1625939412609639.747575286439; Sat, 10 Jul 2021 10:50:12 -0700 (PDT) Received: by mail-wm1-f50.google.com with SMTP id k31-20020a05600c1c9fb029021727d66d33so6852692wms.0 for ; Sat, 10 Jul 2021 10:50:12 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id x1sm16027744wmc.0.2021.07.10.10.50.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jul 2021 10:50:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=izSRG2tyrDqESEW+p/9utSApKbWpeVw0/SDAskwXqso=; b=icTi5a2zU1Tx+OdROmytvK6VKdOtH11JksmFVqDjFZfLuLOAYVtpBAb7ysG6AaCfwh SXfRhtwOrnA7axiFc6DgJv0ddfbwBWtKLkQsNHM7VbAcSfob8dHwAvJVQK7yxnhqOaNl kGmD45WnZc33ZUfcARxMwOU4IssD9UsnP842CZeYDXKmZVn+sCXsMgvB5uW2gToLNDrO w2ihfKrdlixCkay8JcYJAjaFvEyyiU49kzTdvoGLBHijdXVfrEZ7cML5IqOCgyepBFUS fIYbNacE281XSNVX6/6h/r2ZFafyIZHw0GjglfKudCBI541KJi4bPrwPb9EiuhSEvehq GILA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=izSRG2tyrDqESEW+p/9utSApKbWpeVw0/SDAskwXqso=; b=H28nxtrujP/VhMe22z2Eg7dUocvhfk/G1DaFgQYoS1nJ8NBj7rZJ2tgljTxHQrupd/ bt+SP1ueK8ItVZs9EoZBgLZC7p/E0D4lilq+IV+O53adiLOJo9v6Gc8dfABuwWnqq9Gw Lz3QVJnYA9WzBZIFRnjO1JqCmsvMWmEApWrxtANK1fNSS4pV4HnOX3wt1okcFDqG1R9u lba2QWpdQ7/0FgKmtL0QZrPiVVRPwRLrDn2L9hY/CIm+8x1DsEUqEADI8Y3lrOxfG4dF uCAgEAOUuVStN7QKBhQWIERV5Y2LRmBCjHQ9YLv/VJRLd5IMSqVrSkWaqKVA53kyGcJl JuSg== X-Gm-Message-State: AOAM5328np/hdln2m/C3I3LzeuBErRWXSuDSBZpHw8tTsK+Rhd4lwXd4 g6FbgC/jUgxxmV8z+np/a/0= X-Google-Smtp-Source: ABdhPJyGSpdM52mgcEE3TktasARn6yRUmSU5l2hrFHL8xeRswUAOTcng4fRxyhdwmBUmaX2YpjI+Qg== X-Received: by 2002:a05:600c:2dd0:: with SMTP id e16mr7399840wmh.85.1625939410837; Sat, 10 Jul 2021 10:50:10 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Finn Thain , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Laurent Vivier , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 3/8] dp8393x: Only shift the device registers mapping by 1 bit Date: Sat, 10 Jul 2021 19:49:49 +0200 Message-Id: <20210710174954.2577195-4-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210710174954.2577195-1-f4bug@amsat.org> References: <20210710174954.2577195-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1625939413068100001 The SONIC device only allows 16/32-bit accesses. From the machine view (from the bus), it is only shifted by 1 bit. Another bit is shifted, but it is an implementation detail of the QEMU model. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Finn Thain --- hw/m68k/q800.c | 2 +- hw/mips/jazz.c | 2 +- hw/net/dp8393x.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c index 6817c8b5d1a..d78edfe40e8 100644 --- a/hw/m68k/q800.c +++ b/hw/m68k/q800.c @@ -316,7 +316,7 @@ static void q800_init(MachineState *machine) =20 dev =3D qdev_new("dp8393x"); qdev_set_nic_properties(dev, &nd_table[0]); - qdev_prop_set_uint8(dev, "it_shift", 2); + qdev_prop_set_uint8(dev, "it_shift", 1); qdev_prop_set_bit(dev, "big_endian", true); object_property_set_link(OBJECT(dev), "dma_mr", OBJECT(get_system_memory()), &error_abort); diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index d6183e18821..7f8680a189d 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -295,7 +295,7 @@ static void mips_jazz_init(MachineState *machine, =20 dev =3D qdev_new("dp8393x"); qdev_set_nic_properties(dev, nd); - qdev_prop_set_uint8(dev, "it_shift", 2); + qdev_prop_set_uint8(dev, "it_shift", 1); qdev_prop_set_bit(dev, "big_endian", big_endian > 0); object_property_set_link(OBJECT(dev), "dma_mr", OBJECT(rc4030_dma_mr), &error_abort); diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index d1e147a82a6..64f3b0fc3ea 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -971,6 +971,8 @@ static void dp8393x_realize(DeviceState *dev, Error **e= rrp) { dp8393xState *s =3D DP8393X(dev); =20 + s->it_shift +=3D 1; /* Registers are 16-bit wide */ + address_space_init(&s->as, s->dma_mr, "dp8393x"); memory_region_init_io(&s->mmio, OBJECT(dev), &dp8393x_ops, s, "dp8393x-regs", SONIC_REG_COUNT << s->it_shift); --=20 2.31.1 From nobody Mon Feb 9 12:28:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) client-ip=209.85.128.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1625939417; cv=none; d=zohomail.com; s=zohoarc; b=UcJObveOZ8BsewNtpqq4V0xFop8K3Vdyat+9VXH0l1HSTe2U0jmwentWqWEpv0jztzCjvVRV6Ka1YYthvDmsle7jz128o/DPpTmXMM2QJwKFQzLGqZm3hiDjXs+2IS3RvS8WUrqQTYPY0PCa491C4vZpWc/pouhEeGktQnnGMLw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625939417; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CWAixGIxVGdCcoOFXprLiDFiOT2nZU8Gslz26fZe7xM=; b=dkidciAkV4s2+FzZTi3uqLAj2hiExJ8WyPEBYsvzF+c7a/0ysfc6yev9dh4QRkWgFkiKK4ooSn0baiSJHkurGOhP337pdDVqqYo8qH6oEZDmReYOTuKM5i64gMkKL8a3bYxdlmDz2f1yNjVXExNadjntECmBsShcu9uB2ZIOSFI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mx.zohomail.com with SMTPS id 1625939417164779.4676273953329; Sat, 10 Jul 2021 10:50:17 -0700 (PDT) Received: by mail-wm1-f54.google.com with SMTP id u8-20020a7bcb080000b02901e44e9caa2aso8330896wmj.4 for ; Sat, 10 Jul 2021 10:50:16 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id y23sm8187264wmi.28.2021.07.10.10.50.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jul 2021 10:50:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CWAixGIxVGdCcoOFXprLiDFiOT2nZU8Gslz26fZe7xM=; b=INVRephP3Lc9ijmI19dLyrVmP+d7/pxbmF7j8sILJAGNQHXPmfR3mdlq6s309/TZEN MEP7BJgI3PIjZtL0MPQvaGeJlnCqMJVCtQCnwsIG6HxP8w3BIAbOCkNh9YETG8zxLHXu GyptU7ZOTtl/j1jlRqDisYIBtdIsa0Mermet04rheYBakkmE3/OALFlOpfJMxBfHXJ8C wdCZb/pIYyeSy8IWWhciU8xUW2sG2hiFrkCBHkVbeQIK3c9dm4kErdD/kIcKMlYbYa/c tUaFy9bBkO2OJSV3aooR1nePEg6uSm+RTpnWrjyPXBu69LRt/V4UOBlzpEbbAIrQJz0A eCzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=CWAixGIxVGdCcoOFXprLiDFiOT2nZU8Gslz26fZe7xM=; b=RfWrRc14hjoiMoxrAhnB0SDF3Z73LLnR/P67DSw7iBjzcdgAAfOyhshX7yDBp9kE+o 4ujjnAT2eTAliTzM0J9miLmlvEh2Tg72tLp5nWXmymWqwPqQSoORpKjyWhbFhREaIwp1 5eEy2SIwVLqO0vDcnY+G8FMQbn7QrlS6s4m6ip5UDKqDw2uUPkaerMVHTBPg3LvqSjQ8 6aIamriHQSyjowJZ/DLED5MLA7nfyvQFJLLkTwMHTsXW6fIwD+Q/OTP5uM6UuSpjwIkg yxt/E+Gww/q0aurctyNRc3eWmqBRwoBl7QaxhmtESeHmRsMWgw/U0fnbhHArLPizZQHr jX6Q== X-Gm-Message-State: AOAM5327+FuFHV/f4cq56MGeKg1cwT9FtamygW7eNDABwnQb6IfeUzOk r3vMnihr5Zyge9nEWVBv93w= X-Google-Smtp-Source: ABdhPJwKK58PGWSEaoSxfdBOhWkWLKPbdaGKIu071fj2ug8XFo/OIJa5xlNx0V8L88XhmCMZ2lsZQA== X-Received: by 2002:a1c:2782:: with SMTP id n124mr5556181wmn.114.1625939415462; Sat, 10 Jul 2021 10:50:15 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Finn Thain , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Laurent Vivier , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 4/8] dp8393x: Store CAM registers as 16-bit Date: Sat, 10 Jul 2021 19:49:50 +0200 Message-Id: <20210710174954.2577195-5-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210710174954.2577195-1-f4bug@amsat.org> References: <20210710174954.2577195-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1625939419191100001 Per the DP83932C datasheet from July 1995: 4.0 SONIC Registers 4.1 THE CAM UNIT The Content Addressable Memory (CAM) consists of sixteen 48-bit entries for complete address filtering of network packets. Each entry corresponds to a 48-bit destination address that is user programmable and can contain any combination of Multicast or Physical addresses. Each entry is partitioned into three 16-bit CAM cells accessible through CAM Address Ports (CAP 2, CAP 1 and CAP 0) with CAP0 corresponding to the least significant 16 bits of the Destination Address and CAP2 corresponding to the most significant bits. Store the CAM registers as 16-bit as it simplifies the code. There is no change in the migration stream. Co-developed-by: Philippe Mathieu-Daud=C3=A9 Co-developed-by: Mark Cave-Ayland Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Mark Cave-Ayland Tested-by: Finn Thain --- Missing: Signed-off-by: Mark Cave-Ayland --- hw/net/dp8393x.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index 64f3b0fc3ea..2c3047c8688 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -158,7 +158,7 @@ struct dp8393xState { MemoryRegion mmio; =20 /* Registers */ - uint8_t cam[16][6]; + uint16_t cam[16][3]; uint16_t regs[SONIC_REG_COUNT]; =20 /* Temporaries */ @@ -281,15 +281,13 @@ static void dp8393x_do_load_cam(dp8393xState *s) address_space_read(&s->as, dp8393x_cdp(s), MEMTXATTRS_UNSPECIFIED, s->data, size); index =3D dp8393x_get(s, width, 0) & 0xf; - s->cam[index][0] =3D dp8393x_get(s, width, 1) & 0xff; - s->cam[index][1] =3D dp8393x_get(s, width, 1) >> 8; - s->cam[index][2] =3D dp8393x_get(s, width, 2) & 0xff; - s->cam[index][3] =3D dp8393x_get(s, width, 2) >> 8; - s->cam[index][4] =3D dp8393x_get(s, width, 3) & 0xff; - s->cam[index][5] =3D dp8393x_get(s, width, 3) >> 8; - trace_dp8393x_load_cam(index, s->cam[index][0], s->cam[index][1], - s->cam[index][2], s->cam[index][3], - s->cam[index][4], s->cam[index][5]); + s->cam[index][0] =3D dp8393x_get(s, width, 1); + s->cam[index][1] =3D dp8393x_get(s, width, 2); + s->cam[index][2] =3D dp8393x_get(s, width, 3); + trace_dp8393x_load_cam(index, + s->cam[index][0] >> 8, s->cam[index][0] & 0= xff, + s->cam[index][1] >> 8, s->cam[index][1] & 0= xff, + s->cam[index][2] >> 8, s->cam[index][2] & 0= xff); /* Move to next entry */ s->regs[SONIC_CDC]--; s->regs[SONIC_CDP] +=3D size; @@ -592,8 +590,7 @@ static uint64_t dp8393x_read(void *opaque, hwaddr addr,= unsigned int size) case SONIC_CAP1: case SONIC_CAP0: if (s->regs[SONIC_CR] & SONIC_CR_RST) { - val =3D s->cam[s->regs[SONIC_CEP] & 0xf][2 * (SONIC_CAP0 - reg= ) + 1] << 8; - val |=3D s->cam[s->regs[SONIC_CEP] & 0xf][2 * (SONIC_CAP0 - re= g)]; + val =3D s->cam[s->regs[SONIC_CEP] & 0xf][SONIC_CAP0 - reg]; } break; /* All other registers have no special contraints */ @@ -989,7 +986,7 @@ static const VMStateDescription vmstate_dp8393x =3D { .version_id =3D 0, .minimum_version_id =3D 0, .fields =3D (VMStateField []) { - VMSTATE_BUFFER_UNSAFE(cam, dp8393xState, 0, 16 * 6), + VMSTATE_BUFFER_UNSAFE(cam, dp8393xState, 0, 16 * 3 * 2), VMSTATE_UINT16_ARRAY(regs, dp8393xState, SONIC_REG_COUNT), VMSTATE_END_OF_LIST() } --=20 2.31.1 From nobody Mon Feb 9 12:28:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) client-ip=209.85.128.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1625939421; cv=none; d=zohomail.com; s=zohoarc; b=WnfXj8kmXT1wJh6+9d9J/QfyO2gQNNP68w7R4ghQDzuZf2O0jCwpr7y+ohNgDF+SfF++7cVsggqp9fFRibxZzMCYqRgxb/QFpAw716ZsMjFcBJZZWMgT0nO7VnsWwOA6SLcW8WwkcIehvvZ2KLJa8H6iG2v4h36VZhR/BNcYpWc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625939421; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FBaYKuMwOAsdEnFh/yLoGMJg5cvtO0jj+espTWV86dg=; b=RV0XAqBCdVWpQbfsaquNi9VcunAQGkZskXQMmNQWsd9dbnE1nsJpUYSy6LP/uHGoeSebSyjG53Jwoss+wX2PnqI6UVLebFltuo1DC8oXk6yhwxZ2sWET1MYyirjSRd28fiQ3dj1hRy9ozCraihoijkIFhGk0qg3A6rbcJVNvPbw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.zohomail.com with SMTPS id 1625939421807288.2080641300919; Sat, 10 Jul 2021 10:50:21 -0700 (PDT) Received: by mail-wm1-f43.google.com with SMTP id l18-20020a1ced120000b029014c1adff1edso11149527wmh.4 for ; Sat, 10 Jul 2021 10:50:21 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id e15sm8864203wrp.29.2021.07.10.10.50.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jul 2021 10:50:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FBaYKuMwOAsdEnFh/yLoGMJg5cvtO0jj+espTWV86dg=; b=XJE4r2v1dchxOZGfZ9icN57YDwiHJ8dajG9yxOy4FEGizjzbMkH5yd/qIWY3J1dU4w 8XCRm1PskS1PxNxsWRMpyieD7yRonpQtAvvMoitfHxt2rpcTUE5DqHXTpPVka+T/A1wb QSs4VCVIJIjCKQzGZy0rObVKfXTnGtIw5cTkfiiC11xomswjJ5iTlBgT9m1KovMtIA8n ch0yjQf4dQGAHAXMsPkAwzeV1JlHXl0q+t3vJVRtEJbeyXkq6sqCWsuW0Y0V2Se/Z1Wp UNSpTPdYWXtIW/mOuFuqpeoDEeQjL7pkk9sA+2jvZa4iYb2bFm5Wo1MTAoFonflRJCgp minA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=FBaYKuMwOAsdEnFh/yLoGMJg5cvtO0jj+espTWV86dg=; b=CMMSgBITlt10PZVcfH6OzLC6bJ86GXCxC/hUhMpVjL3Lr6cqD8K/cKF/FyL1FjSSsh f43BoHgibqmpv9/s+ABkyEAVw2NyTe9qSK72Z3HCIxKtn2+40wofJrYjJ8kkecfKBlyo VCiUqqI8TOzywtNOmA4iAMl463WakiRBaYIRfWW9KvF3ypsd7CnMB4HpRivBwjSDPhBP RD3Q9vg0MPLeXk35VnLm+B5kcz2rp8V/MWs/2n+BoOks+X194QYDbIf/VF+WkNkzF3b3 f2fh/IjnmdjdVUOVAcggTJvy7moASkq9mGWnWjPPuzfUlDz13ClkFTPZ2LLG42zR35L4 4hzQ== X-Gm-Message-State: AOAM533Xdrt+Hlxc6nouPuHO1RzxfvwCf9wePEiOj8VjSI9veVuK0G4g eRKfIOcmhi9FHmrJHVie+tQ= X-Google-Smtp-Source: ABdhPJwYc48illHoB99lCfxjKCI1pjIB1smAMdA7AGPR3lKnJnHqhPNVpMor/zSofaS53TUaSpATjQ== X-Received: by 2002:a05:600c:1c8b:: with SMTP id k11mr5352467wms.41.1625939420044; Sat, 10 Jul 2021 10:50:20 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Finn Thain , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Laurent Vivier , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 5/8] dp8393x: Migrate registers as array of uint16 Date: Sat, 10 Jul 2021 19:49:51 +0200 Message-Id: <20210710174954.2577195-6-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210710174954.2577195-1-f4bug@amsat.org> References: <20210710174954.2577195-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1625939423361100001 The CAM registers are now arrays of 3 uint16_t. We can avoid using the VMSTATE_BUFFER_UNSAFE() macro by using VMSTATE_UINT16_2DARRAY() which is more appropriate. Suggested-by: Mark Cave-Ayland Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Mark Cave-Ayland Tested-by: Finn Thain --- hw/net/dp8393x.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index 2c3047c8688..68516241a1f 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -983,10 +983,10 @@ static void dp8393x_realize(DeviceState *dev, Error *= *errp) =20 static const VMStateDescription vmstate_dp8393x =3D { .name =3D "dp8393x", - .version_id =3D 0, - .minimum_version_id =3D 0, + .version_id =3D 1, + .minimum_version_id =3D 1, .fields =3D (VMStateField []) { - VMSTATE_BUFFER_UNSAFE(cam, dp8393xState, 0, 16 * 3 * 2), + VMSTATE_UINT16_2DARRAY(cam, dp8393xState, 16, 3), VMSTATE_UINT16_ARRAY(regs, dp8393xState, SONIC_REG_COUNT), VMSTATE_END_OF_LIST() } --=20 2.31.1 From nobody Mon Feb 9 12:28:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) client-ip=209.85.128.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1625939426; cv=none; d=zohomail.com; s=zohoarc; b=EDgfGgqsOcPHJHquaEsK+05BtVumHPbriMRV3+Cls3BAs8vTcg5RrFWxhbmjp2SqdJtxPBIWTVWe+i84hdvLUrPXHI3/CdAM0jdf8/R+aLYmbThYPppADe4LpwxdMvfThQVMiWrC2q9dhmptJUWpINIjiYEHhj0QrtbdMzt57tY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625939426; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/obS4D9S1SVl/D1Gz5H05yYD8WjZiqBnh+MqRwzyFeE=; b=DeLrfrS169qMJbOPqACdBvxU91FV4WzkNHbANn/Tuv9T+YlsW1ICi8rNRz7Wy5cnAMq33XJW9CcGv+cma+qSCjdANhdrcsdDTX+Zv0FLWN/guyQttMS7Clv7sGvV2Z8YT2ibivLj5OHMn8rjVAq5bt8klUjX22vNBn1+WvaE18M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.zohomail.com with SMTPS id 1625939426371754.0071534248606; Sat, 10 Jul 2021 10:50:26 -0700 (PDT) Received: by mail-wm1-f44.google.com with SMTP id b14-20020a1c1b0e0000b02901fc3a62af78so11134321wmb.3 for ; Sat, 10 Jul 2021 10:50:25 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id s1sm15119821wmj.8.2021.07.10.10.50.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jul 2021 10:50:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/obS4D9S1SVl/D1Gz5H05yYD8WjZiqBnh+MqRwzyFeE=; b=ONQm5DuZKNWFIKs1ApOW92WPxR/ne7lRhXX1nihqtGI0omt0fCWGu1j0MdEsnmt1dw U/awm3nyqvVIGuf0nzXev+FDhEiEh/SwNZ3UWS1I69Kmix5aWxn5kRmwJTM07az/Rvbz O3WowUY66yOGnrYwrvuEVgIj4O+xCDsNMmkjBha3rVz7KRRq9QVeti4oNc0MejUfb9A0 bYStRhX8vVYumsDbRXUJExQ2ImiqgwcepHzcF/gegZ4HkIFlIentPPnH76OEnN6+b6oe uVBnwB/MHSJPEVXyIkOgvaU5ZQu6X5EGNnLolTcz7Khkb+fA5DAi6oOYNPwKCjdXHGNv GW+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=/obS4D9S1SVl/D1Gz5H05yYD8WjZiqBnh+MqRwzyFeE=; b=PnDnLafb6Vr1tBWVrbce0e3yGTGfJXaDYxERvSaWXrYB8mUM+b0E/xAWtGzGfa6Svu hW97Ze2VLHou1RIyvnffgW6CkVgm6H08zDRdmsC/4ghqEAZmkPgc4HFirX9jVhhqOJ62 73aymsr1lPw2knl1BO980QMMvySKyXPsAuXiJt2N5G59lEH4bQVUEOhtklgBPGuRtjb9 t6AirWwemOvTNBhvlchbYx/E4jBGaGdDLE+B/Iq1Hmo28jk/wOCz2Ga90Is7+E1ZPM9m eBIzsllu5RZE49fScBkATSkf8Oxgl0rHPnQJK2lK0T8HxHdBaCwgomC10JsdVixMM57I 620Q== X-Gm-Message-State: AOAM532I8Vj3j1xgVotE2BFMsmRz7yYJPolIoJL+M49nNrEsxoAJphdU VrvIe1NkzmDFuiLVByVu+L8= X-Google-Smtp-Source: ABdhPJyd+p4z1ZoIjgYJYtRXgIQig3nmiulzJj/z8lTLw3mhNtMMA/Fgcd0qU5GU2r/bw9lpSYBNCg== X-Received: by 2002:a05:600c:4f8a:: with SMTP id n10mr5266550wmq.11.1625939424691; Sat, 10 Jul 2021 10:50:24 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Finn Thain , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Laurent Vivier , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 6/8] dp8393x: Store CRC using device configured endianess Date: Sat, 10 Jul 2021 19:49:52 +0200 Message-Id: <20210710174954.2577195-7-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210710174954.2577195-1-f4bug@amsat.org> References: <20210710174954.2577195-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1625939427586100001 Little-Endian CRC is dubious. The datasheet does not specify it being little-endian. Use big-endian access when the device is configured in such endianess. (This is a theoretical bug fix.) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Finn Thain --- hw/net/dp8393x.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index 68516241a1f..ac93412f70b 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -827,7 +827,7 @@ static ssize_t dp8393x_receive(NetClientState *nc, cons= t uint8_t * buf, s->regs[SONIC_TRBA0] =3D s->regs[SONIC_CRBA0]; =20 /* Calculate the ethernet checksum */ - checksum =3D cpu_to_le32(crc32(0, buf, pkt_size)); + checksum =3D crc32(0, buf, pkt_size); =20 /* Put packet into RBA */ trace_dp8393x_receive_packet(dp8393x_crba(s)); @@ -837,8 +837,13 @@ static ssize_t dp8393x_receive(NetClientState *nc, con= st uint8_t * buf, address +=3D pkt_size; =20 /* Put frame checksum into RBA */ - address_space_write(&s->as, address, MEMTXATTRS_UNSPECIFIED, - &checksum, sizeof(checksum)); + if (s->big_endian) { + address_space_stl_be(&s->as, address, checksum, + MEMTXATTRS_UNSPECIFIED, NULL); + } else { + address_space_stl_le(&s->as, address, checksum, + MEMTXATTRS_UNSPECIFIED, NULL); + } address +=3D sizeof(checksum); =20 /* Pad short packets to keep pointers aligned */ --=20 2.31.1 From nobody Mon Feb 9 12:28:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1625939431; cv=none; d=zohomail.com; s=zohoarc; b=UZ3zzL85ridkQCYCLxkXzYiRdDM/UuEYAHIDTXUX+/esqq1+WXN3sRhExKSE9LFP8zBZNcqxJ+PeTXLqqfKPP36oajZYNhMMus02ry3gZDz0/jXi4wetH9tAlLxvMGDH90MIiGKU5blLP+Yt0cXbAgn73jWfTRNzYkkwjNmMpHg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625939431; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fpejGWoz5Nmfd87EjGAxFcydJ+NMlbDRUhwnif2uZFA=; b=fajmBQYrhoUh05JJRfBsyqG2yf+cvVsJOrF1kOYOQrOqYVRWEngrIy/iCBBCSBS2Xvo87ER5ioQNHn3Dcq2xadxUEXHLD+04Xys7ov+lg72L1yrrLJkG+oGOblDyufMT9u/WlmtovLmWe5W/m5BtNxFoCayDqj6VF4tzoRtKcVU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 162593943102455.37872318309678; Sat, 10 Jul 2021 10:50:31 -0700 (PDT) Received: by mail-wr1-f43.google.com with SMTP id v5so17241293wrt.3 for ; Sat, 10 Jul 2021 10:50:30 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id q5sm7828247wmc.0.2021.07.10.10.50.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jul 2021 10:50:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fpejGWoz5Nmfd87EjGAxFcydJ+NMlbDRUhwnif2uZFA=; b=JPC2FjB6u3xg2xnMJxiN8yVOA+Ax4QSWVn3VTzvt7vq3OqzsLp9N/yGTopoqWI/lO/ fxnO7YyI0fbEvKIqRPg4K5M69wYX0pEHwMc2oOJK7qyqUlCFSnAXTH2va/cFHvQOKLj0 q2+dt96VP2K7lbh87/7q4mec7euNogVdQC0zlL+9iKeV/flfeyfSmL9RpphRE76BN/im GE1y27Mfg0JeEeOPR3re4cDt0VBrRA+/sMeQxMb7kpjacfxNJ39jaaRsnOwmOTpL1mOU 9pzyhu1VCmBL+ue/epWCHzew9ryZpU675DmSB+hqlQvn3ZdrogUdFQNp4pfr7/Zt4Qx4 /PJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=fpejGWoz5Nmfd87EjGAxFcydJ+NMlbDRUhwnif2uZFA=; b=WDXNDnvP0awwqOVvb5KkuJGJ4H6KBTbLjJ3uVeNhDrPnA+eDEj9CMT+et2gddayoQv cdZ/W8O5HVsXwkgsnLXMYSZNz/T/MeoYV2YhaoWNWvvUX77uIj4mimeOvdDmF3Ic6fmj mDWoI6SvC7B+Js8vAalKu8NbLSKvcqPQY8FRHFLm9aN4IIm+VTWW9PwQZwkJaYW23I9w NRfQcpeVnWosK7nwXcZq/dIOYeS4QIxAvB6X5WnbGsHd+JC8rUpd+EJm6YSdqfG95Ye2 hytoxtfVVEbWg2w+EUAloziMxTPYJC5tp1NVKAb3RydFgrcAsHyeaGtKARJMbgPvsRT+ RydQ== X-Gm-Message-State: AOAM530FiY3dKXfQIyTVfP5tyjpNri7y+1UiNlZvNXD4Wape6BugMU+C StvHkCYK6X4CiozpY5ibOR8= X-Google-Smtp-Source: ABdhPJw+53icMTa+wpdA8ZutG87A+aNjv8BbSKnNfQ+ouOrAmbjJFA6v5oI/ywY2odSaPA8cSo+DUg== X-Received: by 2002:a5d:6189:: with SMTP id j9mr24865434wru.196.1625939429212; Sat, 10 Jul 2021 10:50:29 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Finn Thain , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Laurent Vivier , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [NOTFORMERGE PATCH v3 7/8] dp8393x: Rewrite dp8393x_get() / dp8393x_put() Date: Sat, 10 Jul 2021 19:49:53 +0200 Message-Id: <20210710174954.2577195-8-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210710174954.2577195-1-f4bug@amsat.org> References: <20210710174954.2577195-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1625939431779100001 Instead of accessing N registers via a single address_space API call using a temporary buffer (stored in the device state) and updating each register, move the address_space call in the register put/get. The load/store and word size checks are moved to put/get too. This simplifies a bit, making the code easier to read. Co-developed-by: Philippe Mathieu-Daud=C3=A9 Co-developed-by: Mark Cave-Ayland Signed-off-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Finn Thain Tested-by: Mark Cave-Ayland --- Missing: Signed-off-by: Mark Cave-Ayland --- hw/net/dp8393x.c | 160 +++++++++++++++++++---------------------------- 1 file changed, 63 insertions(+), 97 deletions(-) diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index ac93412f70b..a9224a5bc88 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -163,7 +163,6 @@ struct dp8393xState { =20 /* Temporaries */ uint8_t tx_buffer[0x10000]; - uint16_t data[12]; int loopback_packet; =20 /* Memory access */ @@ -220,34 +219,48 @@ static uint32_t dp8393x_wt(dp8393xState *s) return s->regs[SONIC_WT1] << 16 | s->regs[SONIC_WT0]; } =20 -static uint16_t dp8393x_get(dp8393xState *s, int width, int offset) +static uint16_t dp8393x_get(dp8393xState *s, hwaddr addr, int offset) { + const MemTxAttrs attrs =3D MEMTXATTRS_UNSPECIFIED; uint16_t val; =20 - if (s->big_endian) { - val =3D be16_to_cpu(s->data[offset * width + width - 1]); + if (s->regs[SONIC_DCR] & SONIC_DCR_DW) { + addr +=3D offset << 2; + if (s->big_endian) { + val =3D address_space_ldl_be(&s->as, addr, attrs, NULL); + } else { + val =3D address_space_ldl_le(&s->as, addr, attrs, NULL); + } } else { - val =3D le16_to_cpu(s->data[offset * width]); + addr +=3D offset << 1; + if (s->big_endian) { + val =3D address_space_lduw_be(&s->as, addr, attrs, NULL); + } else { + val =3D address_space_lduw_le(&s->as, addr, attrs, NULL); + } } + return val; } =20 -static void dp8393x_put(dp8393xState *s, int width, int offset, - uint16_t val) +static void dp8393x_put(dp8393xState *s, + hwaddr addr, int offset, uint16_t val) { - if (s->big_endian) { - if (width =3D=3D 2) { - s->data[offset * 2] =3D 0; - s->data[offset * 2 + 1] =3D cpu_to_be16(val); + const MemTxAttrs attrs =3D MEMTXATTRS_UNSPECIFIED; + + if (s->regs[SONIC_DCR] & SONIC_DCR_DW) { + addr +=3D offset << 2; + if (s->big_endian) { + address_space_stl_be(&s->as, addr, val, attrs, NULL); } else { - s->data[offset] =3D cpu_to_be16(val); + address_space_stl_le(&s->as, addr, val, attrs, NULL); } } else { - if (width =3D=3D 2) { - s->data[offset * 2] =3D cpu_to_le16(val); - s->data[offset * 2 + 1] =3D 0; + addr +=3D offset << 1; + if (s->big_endian) { + address_space_stw_be(&s->as, addr, val, attrs, NULL); } else { - s->data[offset] =3D cpu_to_le16(val); + address_space_stw_le(&s->as, addr, val, attrs, NULL); } } } @@ -278,12 +291,10 @@ static void dp8393x_do_load_cam(dp8393xState *s) =20 while (s->regs[SONIC_CDC] & 0x1f) { /* Fill current entry */ - address_space_read(&s->as, dp8393x_cdp(s), - MEMTXATTRS_UNSPECIFIED, s->data, size); - index =3D dp8393x_get(s, width, 0) & 0xf; - s->cam[index][0] =3D dp8393x_get(s, width, 1); - s->cam[index][1] =3D dp8393x_get(s, width, 2); - s->cam[index][2] =3D dp8393x_get(s, width, 3); + index =3D dp8393x_get(s, dp8393x_cdp(s), 0) & 0xf; + s->cam[index][0] =3D dp8393x_get(s, dp8393x_cdp(s), 1); + s->cam[index][1] =3D dp8393x_get(s, dp8393x_cdp(s), 2); + s->cam[index][2] =3D dp8393x_get(s, dp8393x_cdp(s), 3); trace_dp8393x_load_cam(index, s->cam[index][0] >> 8, s->cam[index][0] & 0= xff, s->cam[index][1] >> 8, s->cam[index][1] & 0= xff, @@ -294,9 +305,7 @@ static void dp8393x_do_load_cam(dp8393xState *s) } =20 /* Read CAM enable */ - address_space_read(&s->as, dp8393x_cdp(s), - MEMTXATTRS_UNSPECIFIED, s->data, size); - s->regs[SONIC_CE] =3D dp8393x_get(s, width, 0); + s->regs[SONIC_CE] =3D dp8393x_get(s, dp8393x_cdp(s), 0); trace_dp8393x_load_cam_done(s->regs[SONIC_CE]); =20 /* Done */ @@ -312,14 +321,12 @@ static void dp8393x_do_read_rra(dp8393xState *s) /* Read memory */ width =3D (s->regs[SONIC_DCR] & SONIC_DCR_DW) ? 2 : 1; size =3D sizeof(uint16_t) * 4 * width; - address_space_read(&s->as, dp8393x_rrp(s), - MEMTXATTRS_UNSPECIFIED, s->data, size); =20 /* Update SONIC registers */ - s->regs[SONIC_CRBA0] =3D dp8393x_get(s, width, 0); - s->regs[SONIC_CRBA1] =3D dp8393x_get(s, width, 1); - s->regs[SONIC_RBWC0] =3D dp8393x_get(s, width, 2); - s->regs[SONIC_RBWC1] =3D dp8393x_get(s, width, 3); + s->regs[SONIC_CRBA0] =3D dp8393x_get(s, dp8393x_rrp(s), 0); + s->regs[SONIC_CRBA1] =3D dp8393x_get(s, dp8393x_rrp(s), 1); + s->regs[SONIC_RBWC0] =3D dp8393x_get(s, dp8393x_rrp(s), 2); + s->regs[SONIC_RBWC1] =3D dp8393x_get(s, dp8393x_rrp(s), 3); trace_dp8393x_read_rra_regs(s->regs[SONIC_CRBA0], s->regs[SONIC_CRBA1], s->regs[SONIC_RBWC0], s->regs[SONIC_RBWC1]= ); =20 @@ -415,28 +422,22 @@ static void dp8393x_do_receiver_disable(dp8393xState = *s) static void dp8393x_do_transmit_packets(dp8393xState *s) { NetClientState *nc =3D qemu_get_queue(s->nic); - int width, size; int tx_len, len; uint16_t i; =20 - width =3D (s->regs[SONIC_DCR] & SONIC_DCR_DW) ? 2 : 1; - while (1) { /* Read memory */ - size =3D sizeof(uint16_t) * 6 * width; s->regs[SONIC_TTDA] =3D s->regs[SONIC_CTDA]; trace_dp8393x_transmit_packet(dp8393x_ttda(s)); - address_space_read(&s->as, dp8393x_ttda(s) + sizeof(uint16_t) * wi= dth, - MEMTXATTRS_UNSPECIFIED, s->data, size); tx_len =3D 0; =20 /* Update registers */ - s->regs[SONIC_TCR] =3D dp8393x_get(s, width, 0) & 0xf000; - s->regs[SONIC_TPS] =3D dp8393x_get(s, width, 1); - s->regs[SONIC_TFC] =3D dp8393x_get(s, width, 2); - s->regs[SONIC_TSA0] =3D dp8393x_get(s, width, 3); - s->regs[SONIC_TSA1] =3D dp8393x_get(s, width, 4); - s->regs[SONIC_TFS] =3D dp8393x_get(s, width, 5); + s->regs[SONIC_TCR] =3D dp8393x_get(s, dp8393x_ttda(s), 1) & 0xf000; + s->regs[SONIC_TPS] =3D dp8393x_get(s, dp8393x_ttda(s), 2); + s->regs[SONIC_TFC] =3D dp8393x_get(s, dp8393x_ttda(s), 3); + s->regs[SONIC_TSA0] =3D dp8393x_get(s, dp8393x_ttda(s), 4); + s->regs[SONIC_TSA1] =3D dp8393x_get(s, dp8393x_ttda(s), 5); + s->regs[SONIC_TFS] =3D dp8393x_get(s, dp8393x_ttda(s), 6); =20 /* Handle programmable interrupt */ if (s->regs[SONIC_TCR] & SONIC_TCR_PINT) { @@ -458,15 +459,12 @@ static void dp8393x_do_transmit_packets(dp8393xState = *s) i++; if (i !=3D s->regs[SONIC_TFC]) { /* Read next fragment details */ - size =3D sizeof(uint16_t) * 3 * width; - address_space_read(&s->as, - dp8393x_ttda(s) - + sizeof(uint16_t) * width * (4 + 3 * i= ), - MEMTXATTRS_UNSPECIFIED, s->data, - size); - s->regs[SONIC_TSA0] =3D dp8393x_get(s, width, 0); - s->regs[SONIC_TSA1] =3D dp8393x_get(s, width, 1); - s->regs[SONIC_TFS] =3D dp8393x_get(s, width, 2); + s->regs[SONIC_TSA0] =3D dp8393x_get(s, dp8393x_ttda(s), + 4 + 3 * i); + s->regs[SONIC_TSA1] =3D dp8393x_get(s, dp8393x_ttda(s), + 5 + 3 * i); + s->regs[SONIC_TFS] =3D dp8393x_get(s, dp8393x_ttda(s), + 6 + 3 * i); } } =20 @@ -499,22 +497,12 @@ static void dp8393x_do_transmit_packets(dp8393xState = *s) s->regs[SONIC_TCR] |=3D SONIC_TCR_PTX; =20 /* Write status */ - dp8393x_put(s, width, 0, - s->regs[SONIC_TCR] & 0x0fff); /* status */ - size =3D sizeof(uint16_t) * width; - address_space_write(&s->as, dp8393x_ttda(s), - MEMTXATTRS_UNSPECIFIED, s->data, size); + dp8393x_put(s, dp8393x_ttda(s), 0, s->regs[SONIC_TCR] & 0x0fff); =20 if (!(s->regs[SONIC_CR] & SONIC_CR_HTX)) { /* Read footer of packet */ - size =3D sizeof(uint16_t) * width; - address_space_read(&s->as, - dp8393x_ttda(s) - + sizeof(uint16_t) * width - * (4 + 3 * s->regs[SONIC_TFC]), - MEMTXATTRS_UNSPECIFIED, s->data, - size); - s->regs[SONIC_CTDA] =3D dp8393x_get(s, width, 0); + s->regs[SONIC_CTDA] =3D dp8393x_get(s, dp8393x_ttda(s), + 4 + 3 * s->regs[SONIC_TFC]); if (s->regs[SONIC_CTDA] & SONIC_DESC_EOL) { /* EOL detected */ break; @@ -762,7 +750,7 @@ static ssize_t dp8393x_receive(NetClientState *nc, cons= t uint8_t * buf, dp8393xState *s =3D qemu_get_nic_opaque(nc); int packet_type; uint32_t available, address; - int width, rx_len, padded_len; + int rx_len, padded_len; uint32_t checksum; int size; =20 @@ -775,10 +763,8 @@ static ssize_t dp8393x_receive(NetClientState *nc, con= st uint8_t * buf, =20 rx_len =3D pkt_size + sizeof(checksum); if (s->regs[SONIC_DCR] & SONIC_DCR_DW) { - width =3D 2; padded_len =3D ((rx_len - 1) | 3) + 1; } else { - width =3D 1; padded_len =3D ((rx_len - 1) | 1) + 1; } =20 @@ -799,11 +785,7 @@ static ssize_t dp8393x_receive(NetClientState *nc, con= st uint8_t * buf, /* Check for EOL */ if (s->regs[SONIC_LLFA] & SONIC_DESC_EOL) { /* Are we still in resource exhaustion? */ - size =3D sizeof(uint16_t) * 1 * width; - address =3D dp8393x_crda(s) + sizeof(uint16_t) * 5 * width; - address_space_read(&s->as, address, MEMTXATTRS_UNSPECIFIED, - s->data, size); - s->regs[SONIC_LLFA] =3D dp8393x_get(s, width, 0); + s->regs[SONIC_LLFA] =3D dp8393x_get(s, dp8393x_crda(s), 5); if (s->regs[SONIC_LLFA] & SONIC_DESC_EOL) { /* Still EOL ; stop reception */ return -1; @@ -811,11 +793,7 @@ static ssize_t dp8393x_receive(NetClientState *nc, con= st uint8_t * buf, /* Link has been updated by host */ =20 /* 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_write(&s->as, address, MEMTXATTRS_UNSPECIFIED, - s->data, size); + dp8393x_put(s, dp8393x_crda(s), 6, 0x0000); =20 /* Move to next descriptor */ s->regs[SONIC_CRDA] =3D s->regs[SONIC_LLFA]; @@ -874,32 +852,20 @@ static ssize_t dp8393x_receive(NetClientState *nc, co= nst uint8_t * buf, =20 /* Write status to memory */ trace_dp8393x_receive_write_status(dp8393x_crda(s)); - dp8393x_put(s, width, 0, s->regs[SONIC_RCR]); /* status */ - dp8393x_put(s, width, 1, rx_len); /* byte count */ - dp8393x_put(s, width, 2, s->regs[SONIC_TRBA0]); /* pkt_ptr0 */ - dp8393x_put(s, width, 3, s->regs[SONIC_TRBA1]); /* pkt_ptr1 */ - dp8393x_put(s, width, 4, s->regs[SONIC_RSC]); /* seq_no */ - size =3D sizeof(uint16_t) * 5 * width; - address_space_write(&s->as, dp8393x_crda(s), - MEMTXATTRS_UNSPECIFIED, - s->data, size); + dp8393x_put(s, dp8393x_crda(s), 0, s->regs[SONIC_RCR]); /* status */ + dp8393x_put(s, dp8393x_crda(s), 1, rx_len); /* byte count */ + dp8393x_put(s, dp8393x_crda(s), 2, s->regs[SONIC_TRBA0]); /* pkt_ptr0 = */ + dp8393x_put(s, dp8393x_crda(s), 3, s->regs[SONIC_TRBA1]); /* pkt_ptr1 = */ + dp8393x_put(s, dp8393x_crda(s), 4, s->regs[SONIC_RSC]); /* seq_no */ =20 /* Check link field */ - size =3D sizeof(uint16_t) * width; - address_space_read(&s->as, - dp8393x_crda(s) + sizeof(uint16_t) * 5 * width, - MEMTXATTRS_UNSPECIFIED, s->data, size); - s->regs[SONIC_LLFA] =3D dp8393x_get(s, width, 0); + s->regs[SONIC_LLFA] =3D dp8393x_get(s, dp8393x_crda(s), 5); if (s->regs[SONIC_LLFA] & SONIC_DESC_EOL) { /* EOL detected */ s->regs[SONIC_ISR] |=3D SONIC_ISR_RDE; } else { /* 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_write(&s->as, address, MEMTXATTRS_UNSPECIFIED, - s->data, size); + dp8393x_put(s, dp8393x_crda(s), 6, 0x0000); =20 /* Move to next descriptor */ s->regs[SONIC_CRDA] =3D s->regs[SONIC_LLFA]; --=20 2.31.1 From nobody Mon Feb 9 12:28:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) client-ip=209.85.221.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1625939435; cv=none; d=zohomail.com; s=zohoarc; b=iNcmrq7nQE4sYyqDC34YPpPoXuglw7xfg5sb/VWDg+w99bfJAhEyyf6USLCkKYzrcjnz+dM1YFaugGPL/fIsWRhqTyypcx5QHV0itoXHTo3XUWBNgjbJDEtUyldHwHKtLThX1YVbl0mBre8Q/J7gLH6TElcGW8ORZ092Je65sSI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625939435; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=y5KSWA1vpNfd6M+9kKkYOA/X1eCKYfSslffBBwebk8k=; b=RTqfJvhd7Dh4RkfYHzqMCQoK7SrOU3cMwWx583tenkjCpMrgTihh0YLcfRUpLghCmFJBGByqbBnUnjoIw+Xcvu1Mx3WH2Wij+1+vuxVjbCocKoUNqNhSXHDMj8ihf2pkY6JTQKOC80A6QhHDXiO1WDZhXTpDGc0W29B76jLIVyI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.zohomail.com with SMTPS id 1625939435826395.28037244764664; Sat, 10 Jul 2021 10:50:35 -0700 (PDT) Received: by mail-wr1-f47.google.com with SMTP id a13so17225078wrf.10 for ; Sat, 10 Jul 2021 10:50:35 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id x8sm1465068wrt.93.2021.07.10.10.50.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jul 2021 10:50:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=y5KSWA1vpNfd6M+9kKkYOA/X1eCKYfSslffBBwebk8k=; b=u42PE4D/A64yM3hVVOsKQ6T9Ox3DEH4QSxhPeKCdkKcJ5CV8jm4xpopXdCyDxiciQn l0BoezHDLZRRCZC9jh0d6r4Hawepz5MSXWQaPbWUW2ww4NV6JssMhRosFtugUMEM3gBK gtw29zXQAjb0w2MmATHWsrGncWPLlws/B6EWqZpIItFZ821bN+CcSL/WPx0osecu0d8k B2cKFfNWHJtX9lvqVn442gtoK8OK5+Z7A5/8Y5WNvz+vflUYgAbMMg5r6x46IdSgSJaW Hr/Z9fZBiaxAsQ/TidCKnWii3HAv/tRe2x7U1ndGHOiuJHkm7KHZ7aOkVq1+r5umAWsd 5AJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=y5KSWA1vpNfd6M+9kKkYOA/X1eCKYfSslffBBwebk8k=; b=fHR3a8aZXmC//Bd8e3F5C0yXSswwFFQJazTA7Xx7OaZTxvHnV7Gd4ocIvLvNT2kIei sP/JK4+dKRYcwN3bYg+Sh+rWDDXOOlZO4fv1SU4G04uFdsz8r5DGxWxuMMFhZvuvXt++ C9H+zg0JX8NGie4nPQsb26Blxp+xaIHOgm6aZ/+jW0LhK3lszFZ+/6kZFMFEENexiolK BBgTHY2V7emV9X/pbhO6KZ1T52WczcAexAF2Pj0d0TASj1713z6ucUZbcPfMzzbkCnhy 2CsWhyM27uRsoP8lhcXII4Nil1UcymNDNbWnID9R95kS0iw03NuEkMWB12KS4DgKdCK5 up/Q== X-Gm-Message-State: AOAM531UCO6lhfSSKERwKmue4XSpb2gzxfNE7c6x9blr+nDl7A4RdniR QGOliXTwJjZ9pNARfxHKOC8= X-Google-Smtp-Source: ABdhPJzHusJlhsRGpTqFNpxpqY9393zpSLuZAKBdsFH0AdwK8KmCcY1fnZ64NcHMbizOeT+hXu+eMw== X-Received: by 2002:adf:dc8b:: with SMTP id r11mr50164893wrj.363.1625939434077; Sat, 10 Jul 2021 10:50:34 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Finn Thain , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Laurent Vivier , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [NOTFORMERGE PATCH v3 8/8] dp8393x: don't force 32-bit register access Date: Sat, 10 Jul 2021 19:49:54 +0200 Message-Id: <20210710174954.2577195-9-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210710174954.2577195-1-f4bug@amsat.org> References: <20210710174954.2577195-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1625939438276100001 From: Mark Cave-Ayland Commit 3fe9a838ec "dp8393x: Always use 32-bit accesses" set .impl.min_acces= s_size and .impl.max_access_size to 4 to try and fix the Linux jazzsonic driver wh= ich uses 32-bit accesses. The problem with forcing the register access to 32-bit in this way is that = since the dp8393x uses 16-bit registers, a manual endian swap is required for devices= on big endian machines with 32-bit accesses. For both access sizes and machine endians the QEMU memory API can do the ri= ght thing automatically: all that is needed is to set .impl.min_access_size to 2 to d= eclare that the dp8393x implements 16-bit registers. Normally .impl.max_access_size should also be set to 2, however that doesn'= t quite work in this case since the register stride is specified using a (dynamic) = it_shift property which is applied during the MMIO access itself. The effect of this= is that for a 32-bit access the memory API performs 2 x 16-bit accesses, but the us= e of it_shift within the MMIO access itself causes the register value to be repe= ated in both the top 16-bits and bottom 16-bits. The Linux jazzsonic driver expects the = stride to be zero-extended up to access size and therefore fails to correctly detect the= dp8393x device due to the extra data in the top 16-bits. The solution here is to remove .impl.max_access_size so that the memory API= will correctly zero-extend the 16-bit registers to the access size up to and inc= luding it_shift. Since it_shift is never greater than 2 than this will always do t= he right thing for both 16-bit and 32-bit accesses regardless of the machine endian,= allowing the manual endian swap code to be removed. Signed-off-by: Mark Cave-Ayland Fixes: 3fe9a838ec ("dp8393x: Always use 32-bit accesses") Message-Id: <20210705214929.17222-2-mark.cave-ayland@ilande.co.uk> Signed-off-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Finn Thain --- hw/net/dp8393x.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index a9224a5bc88..71c82a07c23 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -588,15 +588,14 @@ static uint64_t dp8393x_read(void *opaque, hwaddr add= r, unsigned int size) =20 trace_dp8393x_read(reg, reg_names[reg], val, size); =20 - return s->big_endian ? val << 16 : val; + return val; } =20 -static void dp8393x_write(void *opaque, hwaddr addr, uint64_t data, +static void dp8393x_write(void *opaque, hwaddr addr, uint64_t val, unsigned int size) { dp8393xState *s =3D opaque; int reg =3D addr >> s->it_shift; - uint32_t val =3D s->big_endian ? data >> 16 : data; =20 trace_dp8393x_write(reg, reg_names[reg], val, size); =20 @@ -677,11 +676,16 @@ static void dp8393x_write(void *opaque, hwaddr addr, = uint64_t data, } } =20 +/* + * Since .impl.max_access_size is effectively controlled by the it_shift + * property, leave it unspecified for now to allow the memory API to + * correctly zero extend the 16-bit register values to the access size up = to and + * including it_shift. + */ static const MemoryRegionOps dp8393x_ops =3D { .read =3D dp8393x_read, .write =3D dp8393x_write, - .impl.min_access_size =3D 4, - .impl.max_access_size =3D 4, + .impl.min_access_size =3D 2, .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 --=20 2.31.1