[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 13/13] dp8393x: Correctly advance RRP
|
From: |
Finn Thain |
|
Subject: |
[PATCH v2 13/13] dp8393x: Correctly advance RRP |
|
Date: |
Fri, 20 Dec 2019 15:17:46 +1100 |
The last entry in the RRA is at the address given by the REA register.
The address wrap-around logic is off-by-one entry. The last resource
never gets used and RRP can jump over the RWP. The guest driver fails
badly because the SONIC starts re-using old buffer addresses. Fix this.
Signed-off-by: Finn Thain <address@hidden>
---
hw/net/dp8393x.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c
index bd92fa28f6..92a30f9f69 100644
--- a/hw/net/dp8393x.c
+++ b/hw/net/dp8393x.c
@@ -340,7 +340,7 @@ static void dp8393x_do_read_rra(dp8393xState *s)
s->regs[SONIC_RRP] += size;
/* Handle wrap */
- if (s->regs[SONIC_RRP] == s->regs[SONIC_REA]) {
+ if (s->regs[SONIC_RRP] == s->regs[SONIC_REA] + size) {
s->regs[SONIC_RRP] = s->regs[SONIC_RSA];
}
--
2.23.0
- [PATCH v2 05/13] dp8393x: Clear RRRA command register bit only when appropriate, (continued)
- [PATCH v2 05/13] dp8393x: Clear RRRA command register bit only when appropriate, Finn Thain, 2019/12/19
- [PATCH v2 08/13] dp8393x: Don't clobber packet checksum, Finn Thain, 2019/12/19
- [PATCH v2 09/13] dp8393x: Use long-word-aligned RRA pointers in 32-bit mode, Finn Thain, 2019/12/19
- [PATCH v2 03/13] dp8393x: Have dp8393x_receive() return the packet size, Finn Thain, 2019/12/19
- [PATCH v2 06/13] dp8393x: Implement packet size limit and RBAE interrupt, Finn Thain, 2019/12/19
- [PATCH v2 10/13] dp8393x: Pad frames to word or long word boundary, Finn Thain, 2019/12/19
- [PATCH v2 07/13] dp8393x: Don't stop reception upon RBE interrupt assertion, Finn Thain, 2019/12/19
- [PATCH v2 11/13] dp8393x: Clear descriptor in_use field when necessary, Finn Thain, 2019/12/19
- [PATCH v2 12/13] dp8393x: Always update RRA pointers and sequence numbers, Finn Thain, 2019/12/19
- [PATCH v2 01/13] dp8393x: Mask EOL bit from descriptor addresses, Finn Thain, 2019/12/19
- [PATCH v2 13/13] dp8393x: Correctly advance RRP,
Finn Thain <=
- Re: [PATCH v2 00/13] Fixes for DP8393X SONIC device emulation, Laurent Vivier, 2019/12/20