mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dp8393x: Mask EOL bit from descriptor addresses

Browse Source 
The Least Significant bit of a descriptor address register is used as
an EOL flag. It has to be masked when the register value is to be used
as an actual address for copying memory around. But when the registers
are to be updated the EOL bit should not be masked.

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Tested-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Finn Thain 2020-01-20 09:59:21 +11:00 committed by Jason Wang
parent e0175b7163
commit 88f632fbb1
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/net/dp8393x.c
View File

@ -145,6 +145,9 @@ do { printf("sonic ERROR: %s: " fmt, __func__ , ## __VA_ARGS__); } while (0)
#define SONIC_ISR_PINT 0x0800 #define SONIC_ISR_PINT 0x0800
#define SONIC_ISR_LCD 0x1000 #define SONIC_ISR_LCD 0x1000
#define SONIC_DESC_EOL 0x0001
#define SONIC_DESC_ADDR 0xFFFE
#define TYPE_DP8393X "dp8393x" #define TYPE_DP8393X "dp8393x"
#define DP8393X(obj) OBJECT_CHECK(dp8393xState, (obj), TYPE_DP8393X) #define DP8393X(obj) OBJECT_CHECK(dp8393xState, (obj), TYPE_DP8393X)
@ -197,7 +200,8 @@ static uint32_t dp8393x_crba(dp8393xState *s)
static uint32_t dp8393x_crda(dp8393xState *s) static uint32_t dp8393x_crda(dp8393xState *s)
{ {
return (s->regs[SONIC_URDA] << 16) | s->regs[SONIC_CRDA]; return (s->regs[SONIC_URDA] << 16) |
(s->regs[SONIC_CRDA] & SONIC_DESC_ADDR);
} }
static uint32_t dp8393x_rbwc(dp8393xState *s) static uint32_t dp8393x_rbwc(dp8393xState *s)
@ -217,7 +221,8 @@ static uint32_t dp8393x_tsa(dp8393xState *s)
static uint32_t dp8393x_ttda(dp8393xState *s) static uint32_t dp8393x_ttda(dp8393xState *s)
{ {
return (s->regs[SONIC_UTDA] << 16) | s->regs[SONIC_TTDA]; return (s->regs[SONIC_UTDA] << 16) |
(s->regs[SONIC_TTDA] & SONIC_DESC_ADDR);
} }
static uint32_t dp8393x_wt(dp8393xState *s) static uint32_t dp8393x_wt(dp8393xState *s)
@ -509,7 +514,7 @@ static void dp8393x_do_transmit_packets(dp8393xState *s)
MEMTXATTRS_UNSPECIFIED, s->data, MEMTXATTRS_UNSPECIFIED, s->data,
size); size);
s->regs[SONIC_CTDA] = dp8393x_get(s, width, 0) & ~0x1; s->regs[SONIC_CTDA] = dp8393x_get(s, width, 0) & ~0x1;
if (dp8393x_get(s, width, 0) & 0x1) { if (dp8393x_get(s, width, 0) & SONIC_DESC_EOL) {
/* EOL detected */ /* EOL detected */
break; break;
} }
@ -765,13 +770,13 @@ static ssize_t dp8393x_receive(NetClientState *nc, const uint8_t * buf,
/* XXX: Check byte ordering */ /* XXX: Check byte ordering */
/* Check for EOL */ /* Check for EOL */
if (s->regs[SONIC_LLFA] & 0x1) { if (s->regs[SONIC_LLFA] & SONIC_DESC_EOL) {
/* Are we still in resource exhaustion? */ /* Are we still in resource exhaustion? */
size = sizeof(uint16_t) * 1 * width; size = sizeof(uint16_t) * 1 * width;
address = dp8393x_crda(s) + sizeof(uint16_t) * 5 * width; address = dp8393x_crda(s) + sizeof(uint16_t) * 5 * width;
address_space_read(&s->as, address, MEMTXATTRS_UNSPECIFIED, address_space_read(&s->as, address, MEMTXATTRS_UNSPECIFIED,
s->data, size); s->data, size);
if (dp8393x_get(s, width, 0) & 0x1) { if (dp8393x_get(s, width, 0) & SONIC_DESC_EOL) {
/* Still EOL ; stop reception */ /* Still EOL ; stop reception */
return -1; return -1;
} else { } else {
@ -831,7 +836,7 @@ static ssize_t dp8393x_receive(NetClientState *nc, const uint8_t * buf,
dp8393x_crda(s) + sizeof(uint16_t) * 5 * width, dp8393x_crda(s) + sizeof(uint16_t) * 5 * width,
MEMTXATTRS_UNSPECIFIED, s->data, size); MEMTXATTRS_UNSPECIFIED, s->data, size);
s->regs[SONIC_LLFA] = dp8393x_get(s, width, 0); s->regs[SONIC_LLFA] = dp8393x_get(s, width, 0);
if (s->regs[SONIC_LLFA] & 0x1) { if (s->regs[SONIC_LLFA] & SONIC_DESC_EOL) {
/* EOL detected */ /* EOL detected */
s->regs[SONIC_ISR] |= SONIC_ISR_RDE; s->regs[SONIC_ISR] |= SONIC_ISR_RDE;
} else { } else {