haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

MAC DBDMA: store register values in native endianness

Browse source 
Store the register values in native endianness, by dropping all the
endianness conversion functions, and converting the endianness in
dbdma_readl/dbdma_writel instead.

Also guard the endianness conversion with TARGET_WORDS_BIGENDIAN to
simulate the backward connection of the bus.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Aurelien Jarno 2009-12-24 01:00:41 +01:00
parent c84bd4f104
commit ad674e53b5
1 changed files with 46 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
hw/mac_dbdma.c
View file

@ -184,19 +184,19 @@ static void dump_dbdma_cmd(dbdma_cmd *cmd)
static void dbdma_cmdptr_load(DBDMA_channel *ch) static void dbdma_cmdptr_load(DBDMA_channel *ch)
{ {
DBDMA_DPRINTF("dbdma_cmdptr_load 0x%08x\n", DBDMA_DPRINTF("dbdma_cmdptr_load 0x%08x\n",
be32_to_cpu(ch->regs[DBDMA_CMDPTR_LO])); ch->regs[DBDMA_CMDPTR_LO]);
cpu_physical_memory_read(be32_to_cpu(ch->regs[DBDMA_CMDPTR_LO]), cpu_physical_memory_read(ch->regs[DBDMA_CMDPTR_LO],
(uint8_t*)&ch->current, sizeof(dbdma_cmd)); (uint8_t*)&ch->current, sizeof(dbdma_cmd));
} }
static void dbdma_cmdptr_save(DBDMA_channel *ch) static void dbdma_cmdptr_save(DBDMA_channel *ch)
{ {
DBDMA_DPRINTF("dbdma_cmdptr_save 0x%08x\n", DBDMA_DPRINTF("dbdma_cmdptr_save 0x%08x\n",
be32_to_cpu(ch->regs[DBDMA_CMDPTR_LO])); ch->regs[DBDMA_CMDPTR_LO]);
DBDMA_DPRINTF("xfer_status 0x%08x res_count 0x%04x\n", DBDMA_DPRINTF("xfer_status 0x%08x res_count 0x%04x\n",
le16_to_cpu(ch->current.xfer_status), le16_to_cpu(ch->current.xfer_status),
le16_to_cpu(ch->current.res_count)); le16_to_cpu(ch->current.res_count));
cpu_physical_memory_write(be32_to_cpu(ch->regs[DBDMA_CMDPTR_LO]), cpu_physical_memory_write(ch->regs[DBDMA_CMDPTR_LO],
(uint8_t*)&ch->current, sizeof(dbdma_cmd)); (uint8_t*)&ch->current, sizeof(dbdma_cmd));
} }
@ -204,8 +204,8 @@ static void kill_channel(DBDMA_channel *ch)
{ {
DBDMA_DPRINTF("kill_channel\n"); DBDMA_DPRINTF("kill_channel\n");
ch->regs[DBDMA_STATUS] |= cpu_to_be32(DEAD); ch->regs[DBDMA_STATUS] |= DEAD;
ch->regs[DBDMA_STATUS] &= cpu_to_be32(~ACTIVE); ch->regs[DBDMA_STATUS] &= ~ACTIVE;
qemu_irq_raise(ch->irq); qemu_irq_raise(ch->irq);
} }
@ -230,10 +230,10 @@ static void conditional_interrupt(DBDMA_channel *ch)
return; return;
} }
status = be32_to_cpu(ch->regs[DBDMA_STATUS]) & DEVSTAT; status = ch->regs[DBDMA_STATUS] & DEVSTAT;
sel_mask = (be32_to_cpu(ch->regs[DBDMA_INTR_SEL]) >> 16) & 0x0f; sel_mask = (ch->regs[DBDMA_INTR_SEL] >> 16) & 0x0f;
sel_value = be32_to_cpu(ch->regs[DBDMA_INTR_SEL]) & 0x0f; sel_value = ch->regs[DBDMA_INTR_SEL] & 0x0f;
cond = (status & sel_mask) == (sel_value & sel_mask); cond = (status & sel_mask) == (sel_value & sel_mask);
@ -268,10 +268,10 @@ static int conditional_wait(DBDMA_channel *ch)
return 1; return 1;
} }
status = be32_to_cpu(ch->regs[DBDMA_STATUS]) & DEVSTAT; status = ch->regs[DBDMA_STATUS] & DEVSTAT;
sel_mask = (be32_to_cpu(ch->regs[DBDMA_WAIT_SEL]) >> 16) & 0x0f; sel_mask = (ch->regs[DBDMA_WAIT_SEL] >> 16) & 0x0f;
sel_value = be32_to_cpu(ch->regs[DBDMA_WAIT_SEL]) & 0x0f; sel_value = ch->regs[DBDMA_WAIT_SEL] & 0x0f;
cond = (status & sel_mask) == (sel_value & sel_mask); cond = (status & sel_mask) == (sel_value & sel_mask);
@ -292,10 +292,10 @@ static void next(DBDMA_channel *ch)
{ {
uint32_t cp; uint32_t cp;
ch->regs[DBDMA_STATUS] &= cpu_to_be32(~BT); ch->regs[DBDMA_STATUS] &= ~BT;
cp = be32_to_cpu(ch->regs[DBDMA_CMDPTR_LO]); cp = ch->regs[DBDMA_CMDPTR_LO];
ch->regs[DBDMA_CMDPTR_LO] = cpu_to_be32(cp + sizeof(dbdma_cmd)); ch->regs[DBDMA_CMDPTR_LO] = cp + sizeof(dbdma_cmd);
dbdma_cmdptr_load(ch); dbdma_cmdptr_load(ch);
} }
@ -304,7 +304,7 @@ static void branch(DBDMA_channel *ch)
dbdma_cmd *current = &ch->current; dbdma_cmd *current = &ch->current;
ch->regs[DBDMA_CMDPTR_LO] = current->cmd_dep; ch->regs[DBDMA_CMDPTR_LO] = current->cmd_dep;
ch->regs[DBDMA_STATUS] |= cpu_to_be32(BT); ch->regs[DBDMA_STATUS] |= BT;
dbdma_cmdptr_load(ch); dbdma_cmdptr_load(ch);
} }
@ -331,10 +331,10 @@ static void conditional_branch(DBDMA_channel *ch)
return; return;
} }
status = be32_to_cpu(ch->regs[DBDMA_STATUS]) & DEVSTAT; status = ch->regs[DBDMA_STATUS] & DEVSTAT;
sel_mask = (be32_to_cpu(ch->regs[DBDMA_BRANCH_SEL]) >> 16) & 0x0f; sel_mask = (ch->regs[DBDMA_BRANCH_SEL] >> 16) & 0x0f;
sel_value = be32_to_cpu(ch->regs[DBDMA_BRANCH_SEL]) & 0x0f; sel_value = ch->regs[DBDMA_BRANCH_SEL] & 0x0f;
cond = (status & sel_mask) == (sel_value & sel_mask); cond = (status & sel_mask) == (sel_value & sel_mask);
@ -365,19 +365,19 @@ static void dbdma_end(DBDMA_io *io)
if (conditional_wait(ch)) if (conditional_wait(ch))
goto wait; goto wait;
current->xfer_status = cpu_to_le16(be32_to_cpu(ch->regs[DBDMA_STATUS])); current->xfer_status = cpu_to_le16(ch->regs[DBDMA_STATUS]);
current->res_count = cpu_to_le16(be32_to_cpu(io->len)); current->res_count = cpu_to_le16(io->len);
dbdma_cmdptr_save(ch); dbdma_cmdptr_save(ch);
if (io->is_last) if (io->is_last)
ch->regs[DBDMA_STATUS] &= cpu_to_be32(~FLUSH); ch->regs[DBDMA_STATUS] &= ~FLUSH;
conditional_interrupt(ch); conditional_interrupt(ch);
conditional_branch(ch); conditional_branch(ch);
wait: wait:
ch->processing = 0; ch->processing = 0;
if ((ch->regs[DBDMA_STATUS] & cpu_to_be32(RUN)) && if ((ch->regs[DBDMA_STATUS] & RUN) &&
(ch->regs[DBDMA_STATUS] & cpu_to_be32(ACTIVE))) (ch->regs[DBDMA_STATUS] & ACTIVE))
channel_run(ch); channel_run(ch);
} }
@ -456,9 +456,9 @@ static void load_word(DBDMA_channel *ch, int key, uint32_t addr,
if (conditional_wait(ch)) if (conditional_wait(ch))
goto wait; goto wait;
current->xfer_status = cpu_to_le16(be32_to_cpu(ch->regs[DBDMA_STATUS])); current->xfer_status = cpu_to_le16(ch->regs[DBDMA_STATUS]);
dbdma_cmdptr_save(ch); dbdma_cmdptr_save(ch);
ch->regs[DBDMA_STATUS] &= cpu_to_be32(~FLUSH); ch->regs[DBDMA_STATUS] &= ~FLUSH;
conditional_interrupt(ch); conditional_interrupt(ch);
next(ch); next(ch);
@ -494,9 +494,9 @@ static void store_word(DBDMA_channel *ch, int key, uint32_t addr,
if (conditional_wait(ch)) if (conditional_wait(ch))
goto wait; goto wait;
current->xfer_status = cpu_to_le16(be32_to_cpu(ch->regs[DBDMA_STATUS])); current->xfer_status = cpu_to_le16(ch->regs[DBDMA_STATUS]);
dbdma_cmdptr_save(ch); dbdma_cmdptr_save(ch);
ch->regs[DBDMA_STATUS] &= cpu_to_be32(~FLUSH); ch->regs[DBDMA_STATUS] &= ~FLUSH;
conditional_interrupt(ch); conditional_interrupt(ch);
next(ch); next(ch);
@ -512,7 +512,7 @@ static void nop(DBDMA_channel *ch)
if (conditional_wait(ch)) if (conditional_wait(ch))
goto wait; goto wait;
current->xfer_status = cpu_to_le16(be32_to_cpu(ch->regs[DBDMA_STATUS])); current->xfer_status = cpu_to_le16(ch->regs[DBDMA_STATUS]);
dbdma_cmdptr_save(ch); dbdma_cmdptr_save(ch);
conditional_interrupt(ch); conditional_interrupt(ch);
@ -524,7 +524,7 @@ wait:
static void stop(DBDMA_channel *ch) static void stop(DBDMA_channel *ch)
{ {
ch->regs[DBDMA_STATUS] &= cpu_to_be32(~(ACTIVE|DEAD|FLUSH)); ch->regs[DBDMA_STATUS] &= ~(ACTIVE|DEAD|FLUSH);
/* the stop command does not increment command pointer */ /* the stop command does not increment command pointer */
} }
@ -541,7 +541,7 @@ static void channel_run(DBDMA_channel *ch)
/* clear WAKE flag at command fetch */ /* clear WAKE flag at command fetch */
ch->regs[DBDMA_STATUS] &= cpu_to_be32(~WAKE); ch->regs[DBDMA_STATUS] &= ~WAKE;
cmd = le16_to_cpu(current->command) & COMMAND_MASK; cmd = le16_to_cpu(current->command) & COMMAND_MASK;
@ -618,7 +618,7 @@ static void DBDMA_run (DBDMA_channel *ch)
int channel; int channel;
for (channel = 0; channel < DBDMA_CHANNELS; channel++, ch++) { for (channel = 0; channel < DBDMA_CHANNELS; channel++, ch++) {
uint32_t status = be32_to_cpu(ch->regs[DBDMA_STATUS]); uint32_t status = ch->regs[DBDMA_STATUS];
if (!ch->processing && (status & RUN) && (status & ACTIVE)) if (!ch->processing && (status & RUN) && (status & ACTIVE))
channel_run(ch); channel_run(ch);
} }
@ -660,12 +660,12 @@ dbdma_control_write(DBDMA_channel *ch)
uint16_t mask, value; uint16_t mask, value;
uint32_t status; uint32_t status;
mask = (be32_to_cpu(ch->regs[DBDMA_CONTROL]) >> 16) & 0xffff; mask = (ch->regs[DBDMA_CONTROL] >> 16) & 0xffff;
value = be32_to_cpu(ch->regs[DBDMA_CONTROL]) & 0xffff; value = ch->regs[DBDMA_CONTROL] & 0xffff;
value &= (RUN | PAUSE | FLUSH | WAKE | DEVSTAT); value &= (RUN | PAUSE | FLUSH | WAKE | DEVSTAT);
status = be32_to_cpu(ch->regs[DBDMA_STATUS]); status = ch->regs[DBDMA_STATUS];
status = (value & mask) | (status & ~mask); status = (value & mask) | (status & ~mask);
@ -677,14 +677,14 @@ dbdma_control_write(DBDMA_channel *ch)
} }
if (status & PAUSE) if (status & PAUSE)
status &= ~ACTIVE; status &= ~ACTIVE;
if ((be32_to_cpu(ch->regs[DBDMA_STATUS]) & RUN) && !(status & RUN)) { if ((ch->regs[DBDMA_STATUS] & RUN) && !(status & RUN)) {
/* RUN is cleared */ /* RUN is cleared */
status &= ~(ACTIVE|DEAD); status &= ~(ACTIVE|DEAD);
} }
DBDMA_DPRINTF(" status 0x%08x\n", status); DBDMA_DPRINTF(" status 0x%08x\n", status);
ch->regs[DBDMA_STATUS] = cpu_to_be32(status); ch->regs[DBDMA_STATUS] = status;
if (status & ACTIVE) if (status & ACTIVE)
qemu_bh_schedule(dbdma_bh); qemu_bh_schedule(dbdma_bh);
@ -703,10 +703,14 @@ static void dbdma_writel (void *opaque,
DBDMA_DPRINTF("channel 0x%x reg 0x%x\n", DBDMA_DPRINTF("channel 0x%x reg 0x%x\n",
(uint32_t)addr >> DBDMA_CHANNEL_SHIFT, reg); (uint32_t)addr >> DBDMA_CHANNEL_SHIFT, reg);
#ifdef TARGET_WORDS_BIGENDIAN
value = bswap32(value);
#endif
/* cmdptr cannot be modified if channel is RUN or ACTIVE */ /* cmdptr cannot be modified if channel is RUN or ACTIVE */
if (reg == DBDMA_CMDPTR_LO && if (reg == DBDMA_CMDPTR_LO &&
(ch->regs[DBDMA_STATUS] & cpu_to_be32(RUN | ACTIVE))) (ch->regs[DBDMA_STATUS] & (RUN | ACTIVE)))
return; return;
ch->regs[reg] = value; ch->regs[reg] = value;
@ -717,7 +721,7 @@ static void dbdma_writel (void *opaque,
break; break;
case DBDMA_CMDPTR_LO: case DBDMA_CMDPTR_LO:
/* 16-byte aligned */ /* 16-byte aligned */
ch->regs[DBDMA_CMDPTR_LO] &= cpu_to_be32(~0xf); ch->regs[DBDMA_CMDPTR_LO] &= ~0xf;
dbdma_cmdptr_load(ch); dbdma_cmdptr_load(ch);
break; break;
case DBDMA_STATUS: case DBDMA_STATUS:
@ -782,6 +786,9 @@ static uint32_t dbdma_readl (void *opaque, target_phys_addr_t addr)
break; break;
} }
#ifdef TARGET_WORDS_BIGENDIAN
value = bswap32(value);
#endif
return value; return value;
} }