dp8393x: manage big endian bus
This is needed by Quadra 800, this card can run on little-endian or big-endian bus. Signed-off-by: Laurent Vivier <laurent@vivier.eu> Tested-by: Hervé Poussineau <hpoussin@reactos.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Hervé Poussineau <hpoussin@reactos.org> Message-Id: <20191026164546.30020-5-laurent@vivier.eu>
This commit is contained in:
parent
74d71ea16b
commit
be92084198
@ -153,6 +153,7 @@ typedef struct dp8393xState {
|
||||
|
||||
/* Hardware */
|
||||
uint8_t it_shift;
|
||||
bool big_endian;
|
||||
qemu_irq irq;
|
||||
#ifdef DEBUG_SONIC
|
||||
int irq_level;
|
||||
@ -223,6 +224,29 @@ static uint32_t dp8393x_wt(dp8393xState *s)
|
||||
return s->regs[SONIC_WT1] << 16 | s->regs[SONIC_WT0];
|
||||
}
|
||||
|
||||
static uint16_t dp8393x_get(dp8393xState *s, int width, uint16_t *base,
|
||||
int offset)
|
||||
{
|
||||
uint16_t val;
|
||||
|
||||
if (s->big_endian) {
|
||||
val = be16_to_cpu(base[offset * width + width - 1]);
|
||||
} else {
|
||||
val = le16_to_cpu(base[offset * width]);
|
||||
}
|
||||
return val;
|
||||
}
|
||||
|
||||
static void dp8393x_put(dp8393xState *s, int width, uint16_t *base, int offset,
|
||||
uint16_t val)
|
||||
{
|
||||
if (s->big_endian) {
|
||||
base[offset * width + width - 1] = cpu_to_be16(val);
|
||||
} else {
|
||||
base[offset * width] = cpu_to_le16(val);
|
||||
}
|
||||
}
|
||||
|
||||
static void dp8393x_update_irq(dp8393xState *s)
|
||||
{
|
||||
int level = (s->regs[SONIC_IMR] & s->regs[SONIC_ISR]) ? 1 : 0;
|
||||
@ -254,12 +278,12 @@ static void dp8393x_do_load_cam(dp8393xState *s)
|
||||
/* Fill current entry */
|
||||
address_space_rw(&s->as, dp8393x_cdp(s),
|
||||
MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size, 0);
|
||||
s->cam[index][0] = data[1 * width] & 0xff;
|
||||
s->cam[index][1] = data[1 * width] >> 8;
|
||||
s->cam[index][2] = data[2 * width] & 0xff;
|
||||
s->cam[index][3] = data[2 * width] >> 8;
|
||||
s->cam[index][4] = data[3 * width] & 0xff;
|
||||
s->cam[index][5] = data[3 * width] >> 8;
|
||||
s->cam[index][0] = dp8393x_get(s, width, data, 1) & 0xff;
|
||||
s->cam[index][1] = dp8393x_get(s, width, data, 1) >> 8;
|
||||
s->cam[index][2] = dp8393x_get(s, width, data, 2) & 0xff;
|
||||
s->cam[index][3] = dp8393x_get(s, width, data, 2) >> 8;
|
||||
s->cam[index][4] = dp8393x_get(s, width, data, 3) & 0xff;
|
||||
s->cam[index][5] = dp8393x_get(s, width, data, 3) >> 8;
|
||||
DPRINTF("load cam[%d] with %02x%02x%02x%02x%02x%02x\n", 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]);
|
||||
@ -272,7 +296,7 @@ static void dp8393x_do_load_cam(dp8393xState *s)
|
||||
/* Read CAM enable */
|
||||
address_space_rw(&s->as, dp8393x_cdp(s),
|
||||
MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size, 0);
|
||||
s->regs[SONIC_CE] = data[0 * width];
|
||||
s->regs[SONIC_CE] = dp8393x_get(s, width, data, 0);
|
||||
DPRINTF("load cam done. cam enable mask 0x%04x\n", s->regs[SONIC_CE]);
|
||||
|
||||
/* Done */
|
||||
@ -293,10 +317,10 @@ static void dp8393x_do_read_rra(dp8393xState *s)
|
||||
MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size, 0);
|
||||
|
||||
/* Update SONIC registers */
|
||||
s->regs[SONIC_CRBA0] = data[0 * width];
|
||||
s->regs[SONIC_CRBA1] = data[1 * width];
|
||||
s->regs[SONIC_RBWC0] = data[2 * width];
|
||||
s->regs[SONIC_RBWC1] = data[3 * width];
|
||||
s->regs[SONIC_CRBA0] = dp8393x_get(s, width, data, 0);
|
||||
s->regs[SONIC_CRBA1] = dp8393x_get(s, width, data, 1);
|
||||
s->regs[SONIC_RBWC0] = dp8393x_get(s, width, data, 2);
|
||||
s->regs[SONIC_RBWC1] = dp8393x_get(s, width, data, 3);
|
||||
DPRINTF("CRBA0/1: 0x%04x/0x%04x, RBWC0/1: 0x%04x/0x%04x\n",
|
||||
s->regs[SONIC_CRBA0], s->regs[SONIC_CRBA1],
|
||||
s->regs[SONIC_RBWC0], s->regs[SONIC_RBWC1]);
|
||||
@ -411,12 +435,12 @@ static void dp8393x_do_transmit_packets(dp8393xState *s)
|
||||
tx_len = 0;
|
||||
|
||||
/* Update registers */
|
||||
s->regs[SONIC_TCR] = data[0 * width] & 0xf000;
|
||||
s->regs[SONIC_TPS] = data[1 * width];
|
||||
s->regs[SONIC_TFC] = data[2 * width];
|
||||
s->regs[SONIC_TSA0] = data[3 * width];
|
||||
s->regs[SONIC_TSA1] = data[4 * width];
|
||||
s->regs[SONIC_TFS] = data[5 * width];
|
||||
s->regs[SONIC_TCR] = dp8393x_get(s, width, data, 0) & 0xf000;
|
||||
s->regs[SONIC_TPS] = dp8393x_get(s, width, data, 1);
|
||||
s->regs[SONIC_TFC] = dp8393x_get(s, width, data, 2);
|
||||
s->regs[SONIC_TSA0] = dp8393x_get(s, width, data, 3);
|
||||
s->regs[SONIC_TSA1] = dp8393x_get(s, width, data, 4);
|
||||
s->regs[SONIC_TFS] = dp8393x_get(s, width, data, 5);
|
||||
|
||||
/* Handle programmable interrupt */
|
||||
if (s->regs[SONIC_TCR] & SONIC_TCR_PINT) {
|
||||
@ -442,9 +466,9 @@ static void dp8393x_do_transmit_packets(dp8393xState *s)
|
||||
address_space_rw(&s->as,
|
||||
dp8393x_ttda(s) + sizeof(uint16_t) * (4 + 3 * i) * width,
|
||||
MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size, 0);
|
||||
s->regs[SONIC_TSA0] = data[0 * width];
|
||||
s->regs[SONIC_TSA1] = data[1 * width];
|
||||
s->regs[SONIC_TFS] = data[2 * width];
|
||||
s->regs[SONIC_TSA0] = dp8393x_get(s, width, data, 0);
|
||||
s->regs[SONIC_TSA1] = dp8393x_get(s, width, data, 1);
|
||||
s->regs[SONIC_TFS] = dp8393x_get(s, width, data, 2);
|
||||
}
|
||||
}
|
||||
|
||||
@ -471,7 +495,8 @@ static void dp8393x_do_transmit_packets(dp8393xState *s)
|
||||
s->regs[SONIC_TCR] |= SONIC_TCR_PTX;
|
||||
|
||||
/* Write status */
|
||||
data[0 * width] = s->regs[SONIC_TCR] & 0x0fff; /* status */
|
||||
dp8393x_put(s, width, data, 0,
|
||||
s->regs[SONIC_TCR] & 0x0fff); /* status */
|
||||
size = sizeof(uint16_t) * width;
|
||||
address_space_rw(&s->as,
|
||||
dp8393x_ttda(s),
|
||||
@ -485,8 +510,8 @@ static void dp8393x_do_transmit_packets(dp8393xState *s)
|
||||
sizeof(uint16_t) *
|
||||
(4 + 3 * s->regs[SONIC_TFC]) * width,
|
||||
MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size, 0);
|
||||
s->regs[SONIC_CTDA] = data[0 * width] & ~0x1;
|
||||
if (data[0 * width] & 0x1) {
|
||||
s->regs[SONIC_CTDA] = dp8393x_get(s, width, data, 0) & ~0x1;
|
||||
if (dp8393x_get(s, width, data, 0) & 0x1) {
|
||||
/* EOL detected */
|
||||
break;
|
||||
}
|
||||
@ -749,7 +774,7 @@ static ssize_t dp8393x_receive(NetClientState *nc, const uint8_t * buf,
|
||||
address = dp8393x_crda(s) + sizeof(uint16_t) * 5 * width;
|
||||
address_space_rw(&s->as, address, MEMTXATTRS_UNSPECIFIED,
|
||||
(uint8_t *)data, size, 0);
|
||||
if (data[0 * width] & 0x1) {
|
||||
if (dp8393x_get(s, width, data, 0) & 0x1) {
|
||||
/* Still EOL ; stop reception */
|
||||
return -1;
|
||||
} else {
|
||||
@ -793,11 +818,11 @@ static ssize_t dp8393x_receive(NetClientState *nc, const uint8_t * buf,
|
||||
|
||||
/* Write status to memory */
|
||||
DPRINTF("Write status at %08x\n", dp8393x_crda(s));
|
||||
data[0 * width] = s->regs[SONIC_RCR]; /* status */
|
||||
data[1 * width] = rx_len; /* byte count */
|
||||
data[2 * width] = s->regs[SONIC_TRBA0]; /* pkt_ptr0 */
|
||||
data[3 * width] = s->regs[SONIC_TRBA1]; /* pkt_ptr1 */
|
||||
data[4 * width] = s->regs[SONIC_RSC]; /* seq_no */
|
||||
dp8393x_put(s, width, data, 0, s->regs[SONIC_RCR]); /* status */
|
||||
dp8393x_put(s, width, data, 1, rx_len); /* byte count */
|
||||
dp8393x_put(s, width, data, 2, s->regs[SONIC_TRBA0]); /* pkt_ptr0 */
|
||||
dp8393x_put(s, width, data, 3, s->regs[SONIC_TRBA1]); /* pkt_ptr1 */
|
||||
dp8393x_put(s, width, data, 4, s->regs[SONIC_RSC]); /* seq_no */
|
||||
size = sizeof(uint16_t) * 5 * width;
|
||||
address_space_rw(&s->as, dp8393x_crda(s),
|
||||
MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size, 1);
|
||||
@ -806,12 +831,12 @@ static ssize_t dp8393x_receive(NetClientState *nc, const uint8_t * buf,
|
||||
size = sizeof(uint16_t) * width;
|
||||
address_space_rw(&s->as, dp8393x_crda(s) + sizeof(uint16_t) * 5 * width,
|
||||
MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, size, 0);
|
||||
s->regs[SONIC_LLFA] = data[0 * width];
|
||||
s->regs[SONIC_LLFA] = dp8393x_get(s, width, data, 0);
|
||||
if (s->regs[SONIC_LLFA] & 0x1) {
|
||||
/* EOL detected */
|
||||
s->regs[SONIC_ISR] |= SONIC_ISR_RDE;
|
||||
} else {
|
||||
data[0 * width] = 0; /* in_use */
|
||||
dp8393x_put(s, width, data, 0, 0); /* in_use */
|
||||
address_space_rw(&s->as, dp8393x_crda(s) + sizeof(uint16_t) * 6 * width,
|
||||
MEMTXATTRS_UNSPECIFIED, (uint8_t *)data, sizeof(uint16_t), 1);
|
||||
s->regs[SONIC_CRDA] = s->regs[SONIC_LLFA];
|
||||
@ -924,6 +949,7 @@ static Property dp8393x_properties[] = {
|
||||
DEFINE_NIC_PROPERTIES(dp8393xState, conf),
|
||||
DEFINE_PROP_PTR("dma_mr", dp8393xState, dma_mr),
|
||||
DEFINE_PROP_UINT8("it_shift", dp8393xState, it_shift, 0),
|
||||
DEFINE_PROP_BOOL("big_endian", dp8393xState, big_endian, false),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user