From: Finn Thain <fthain@telegraphics.com.au>
To: Jason Wang <jasowang@redhat.com>, qemu-devel@nongnu.org
Cc: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com>,
Herve Poussineau <hpoussin@reactos.org>,
Laurent Vivier <laurent@vivier.eu>,
qemu-stable@nongnu.org
Subject: [PATCH 04/10] dp8393x: Don't advance RX descriptor twice
Date: Sat, 14 Dec 2019 12:25:57 +1100 [thread overview]
Message-ID: <b38300386380fa2075ad980965033d1218468681.1576286757.git.fthain@telegraphics.com.au> (raw)
In-Reply-To: <cover.1576286757.git.fthain@telegraphics.com.au>
Follow the algorithm given in the National Semiconductor DP83932C
datasheet in sections 3.4.5 and 3.4.6.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
---
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 462f8646e0..49d7d9769e 100644
--- a/hw/net/dp8393x.c
+++ b/hw/net/dp8393x.c
@@ -771,8 +771,6 @@ static ssize_t dp8393x_receive(NetClientState *nc, const uint8_t * buf,
if (dp8393x_get(s, width, 0) & 0x1) {
/* Still EOL ; stop reception */
return -1;
- } else {
- s->regs[SONIC_CRDA] = s->regs[SONIC_LLFA];
}
}
@@ -821,7 +819,7 @@ static ssize_t dp8393x_receive(NetClientState *nc, const uint8_t * buf,
address_space_rw(&s->as, dp8393x_crda(s),
MEMTXATTRS_UNSPECIFIED, (uint8_t *)s->data, size, 1);
- /* Move to next descriptor */
+ /* Check link field */
size = sizeof(uint16_t) * width;
address_space_rw(&s->as, dp8393x_crda(s) + sizeof(uint16_t) * 5 * width,
MEMTXATTRS_UNSPECIFIED, (uint8_t *)s->data, size, 0);
@@ -836,6 +834,8 @@ static ssize_t dp8393x_receive(NetClientState *nc, const uint8_t * buf,
dp8393x_put(s, width, 0, 0);
address_space_rw(&s->as, offset, MEMTXATTRS_UNSPECIFIED,
(uint8_t *)s->data, size, 1);
+
+ /* Move to next descriptor */
s->regs[SONIC_CRDA] = s->regs[SONIC_LLFA];
s->regs[SONIC_ISR] |= SONIC_ISR_PKTRX;
s->regs[SONIC_RSC] = (s->regs[SONIC_RSC] & 0xff00) | (((s->regs[SONIC_RSC] & 0x00ff) + 1) & 0x00ff);
--
2.23.0
next prev parent reply other threads:[~2019-12-14 1:30 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-14 1:25 [PATCH 00/10] Fixes for DP8393X SONIC device emulation Finn Thain
2019-12-14 1:25 ` [PATCH 08/10] dp8393x: Implement packet size limit and RBAE interrupt Finn Thain
2019-12-14 1:25 ` [PATCH 09/10] dp8393x: Don't stop reception upon RBE interrupt assertion Finn Thain
2019-12-14 1:25 ` [PATCH 06/10] dp8393x: Clear RRRA command register bit only when appropriate Finn Thain
2019-12-14 13:31 ` Philippe Mathieu-Daudé
2019-12-14 1:25 ` [PATCH 02/10] dp8393x: Clean up endianness hacks Finn Thain
2019-12-14 1:25 ` [PATCH 05/10] dp8393x: Update LLFA register Finn Thain
2019-12-14 1:25 ` [PATCH 10/10] dp8393x: Don't clobber packet checksum Finn Thain
2019-12-14 13:21 ` Philippe Mathieu-Daudé
2019-12-14 1:25 ` [PATCH 07/10] dp8393x: Implement TBWC0 and TBWC1 registers to restore buffer state Finn Thain
2019-12-14 1:25 ` [PATCH 01/10] dp8393x: Mask EOL bit from descriptor addresses Finn Thain
2019-12-14 13:35 ` Philippe Mathieu-Daudé
2019-12-14 23:21 ` Finn Thain
2019-12-14 1:25 ` Finn Thain [this message]
2019-12-14 1:25 ` [PATCH 03/10] dp8393x: Have dp8393x_receive() return the packet size Finn Thain
2019-12-14 13:26 ` Philippe Mathieu-Daudé
2019-12-14 1:43 ` [PATCH 00/10] Fixes for DP8393X SONIC device emulation no-reply
2019-12-14 2:52 ` Finn Thain
2019-12-14 13:38 ` Philippe Mathieu-Daudé
2019-12-14 13:45 ` Eric Blake
2019-12-14 17:17 ` Aleksandar Markovic
2019-12-14 23:16 ` Finn Thain
2019-12-14 23:32 ` Aleksandar Markovic
2019-12-14 23:35 ` Aleksandar Markovic
2019-12-20 4:24 ` Finn Thain
2019-12-23 17:17 ` Philippe Mathieu-Daudé
2019-12-24 0:12 ` NetBSD/arc on MIPS Magnum, was " Finn Thain
2019-12-24 4:33 ` Finn Thain
2019-12-24 6:53 ` Hervé Poussineau
2020-01-06 22:15 ` Finn Thain
2019-12-16 0:36 ` Finn Thain
2019-12-20 4:21 ` Finn Thain
2019-12-20 11:38 ` Aleksandar Markovic
2019-12-20 12:03 ` Aleksandar Markovic
2019-12-20 12:54 ` Laurent Vivier
2019-12-20 23:22 ` Finn Thain
2019-12-21 12:03 ` Aleksandar Markovic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b38300386380fa2075ad980965033d1218468681.1576286757.git.fthain@telegraphics.com.au \
--to=fthain@telegraphics.com.au \
--cc=aleksandar.rikalo@rt-rk.com \
--cc=hpoussin@reactos.org \
--cc=jasowang@redhat.com \
--cc=laurent@vivier.eu \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).