hw/sd: Use sdbus_write_data() instead of sdbus_write_byte when possible
Use the recently added sdbus_write_data() to write multiple bytes at once, instead of looping calling sdbus_write_byte(). Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20200814092346.21825-6-f4bug@amsat.org>
This commit is contained in:
parent
e35c343dd9
commit
62a21be60f
|
@ -333,10 +333,7 @@ static uint32_t allwinner_sdhost_process_desc(AwSdHostState *s,
|
||||||
if (is_write) {
|
if (is_write) {
|
||||||
cpu_physical_memory_read((desc->addr & DESC_SIZE_MASK) + num_done,
|
cpu_physical_memory_read((desc->addr & DESC_SIZE_MASK) + num_done,
|
||||||
buf, buf_bytes);
|
buf, buf_bytes);
|
||||||
|
sdbus_write_data(&s->sdbus, buf, buf_bytes);
|
||||||
for (uint32_t i = 0; i < buf_bytes; i++) {
|
|
||||||
sdbus_write_byte(&s->sdbus, buf[i]);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Read from SD bus */
|
/* Read from SD bus */
|
||||||
} else {
|
} else {
|
||||||
|
@ -548,6 +545,7 @@ static void allwinner_sdhost_write(void *opaque, hwaddr offset,
|
||||||
uint64_t value, unsigned size)
|
uint64_t value, unsigned size)
|
||||||
{
|
{
|
||||||
AwSdHostState *s = AW_SDHOST(opaque);
|
AwSdHostState *s = AW_SDHOST(opaque);
|
||||||
|
uint32_t u32;
|
||||||
|
|
||||||
trace_allwinner_sdhost_write(offset, value, size);
|
trace_allwinner_sdhost_write(offset, value, size);
|
||||||
|
|
||||||
|
@ -654,11 +652,9 @@ static void allwinner_sdhost_write(void *opaque, hwaddr offset,
|
||||||
s->startbit_detect = value;
|
s->startbit_detect = value;
|
||||||
break;
|
break;
|
||||||
case REG_SD_FIFO: /* Read/Write FIFO */
|
case REG_SD_FIFO: /* Read/Write FIFO */
|
||||||
sdbus_write_byte(&s->sdbus, value & 0xff);
|
u32 = cpu_to_le32(value);
|
||||||
sdbus_write_byte(&s->sdbus, (value >> 8) & 0xff);
|
sdbus_write_data(&s->sdbus, &u32, sizeof(u32));
|
||||||
sdbus_write_byte(&s->sdbus, (value >> 16) & 0xff);
|
allwinner_sdhost_update_transfer_cnt(s, sizeof(u32));
|
||||||
sdbus_write_byte(&s->sdbus, (value >> 24) & 0xff);
|
|
||||||
allwinner_sdhost_update_transfer_cnt(s, sizeof(uint32_t));
|
|
||||||
allwinner_sdhost_auto_stop(s);
|
allwinner_sdhost_auto_stop(s);
|
||||||
allwinner_sdhost_update_irq(s);
|
allwinner_sdhost_update_irq(s);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -181,6 +181,7 @@ static void memcard_write(void *opaque, hwaddr addr, uint64_t value,
|
||||||
unsigned size)
|
unsigned size)
|
||||||
{
|
{
|
||||||
MilkymistMemcardState *s = opaque;
|
MilkymistMemcardState *s = opaque;
|
||||||
|
uint32_t val32;
|
||||||
|
|
||||||
trace_milkymist_memcard_memory_write(addr, value);
|
trace_milkymist_memcard_memory_write(addr, value);
|
||||||
|
|
||||||
|
@ -209,10 +210,8 @@ static void memcard_write(void *opaque, hwaddr addr, uint64_t value,
|
||||||
if (!s->enabled) {
|
if (!s->enabled) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
sdbus_write_byte(&s->sdbus, (value >> 24) & 0xff);
|
val32 = cpu_to_be32(value);
|
||||||
sdbus_write_byte(&s->sdbus, (value >> 16) & 0xff);
|
sdbus_write_data(&s->sdbus, &val32, sizeof(val32));
|
||||||
sdbus_write_byte(&s->sdbus, (value >> 8) & 0xff);
|
|
||||||
sdbus_write_byte(&s->sdbus, value & 0xff);
|
|
||||||
break;
|
break;
|
||||||
case R_ENABLE:
|
case R_ENABLE:
|
||||||
s->regs[addr] = value;
|
s->regs[addr] = value;
|
||||||
|
|
|
@ -496,8 +496,6 @@ static uint32_t sdhci_read_dataport(SDHCIState *s, unsigned size)
|
||||||
/* Write data from host controller FIFO to card */
|
/* Write data from host controller FIFO to card */
|
||||||
static void sdhci_write_block_to_card(SDHCIState *s)
|
static void sdhci_write_block_to_card(SDHCIState *s)
|
||||||
{
|
{
|
||||||
int index = 0;
|
|
||||||
|
|
||||||
if (s->prnsts & SDHC_SPACE_AVAILABLE) {
|
if (s->prnsts & SDHC_SPACE_AVAILABLE) {
|
||||||
if (s->norintstsen & SDHC_NISEN_WBUFRDY) {
|
if (s->norintstsen & SDHC_NISEN_WBUFRDY) {
|
||||||
s->norintsts |= SDHC_NIS_WBUFRDY;
|
s->norintsts |= SDHC_NIS_WBUFRDY;
|
||||||
|
@ -514,9 +512,7 @@ static void sdhci_write_block_to_card(SDHCIState *s)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (index = 0; index < (s->blksize & BLOCK_SIZE_MASK); index++) {
|
sdbus_write_data(&s->sdbus, s->fifo_buffer, s->blksize & BLOCK_SIZE_MASK);
|
||||||
sdbus_write_byte(&s->sdbus, s->fifo_buffer[index]);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Next data can be written through BUFFER DATORT register */
|
/* Next data can be written through BUFFER DATORT register */
|
||||||
s->prnsts |= SDHC_SPACE_AVAILABLE;
|
s->prnsts |= SDHC_SPACE_AVAILABLE;
|
||||||
|
@ -641,9 +637,7 @@ static void sdhci_sdma_transfer_multi_blocks(SDHCIState *s)
|
||||||
&s->fifo_buffer[begin], s->data_count - begin);
|
&s->fifo_buffer[begin], s->data_count - begin);
|
||||||
s->sdmasysad += s->data_count - begin;
|
s->sdmasysad += s->data_count - begin;
|
||||||
if (s->data_count == block_size) {
|
if (s->data_count == block_size) {
|
||||||
for (n = 0; n < block_size; n++) {
|
sdbus_write_data(&s->sdbus, s->fifo_buffer, block_size);
|
||||||
sdbus_write_byte(&s->sdbus, s->fifo_buffer[n]);
|
|
||||||
}
|
|
||||||
s->data_count = 0;
|
s->data_count = 0;
|
||||||
if (s->trnmod & SDHC_TRNS_BLK_CNT_EN) {
|
if (s->trnmod & SDHC_TRNS_BLK_CNT_EN) {
|
||||||
s->blkcnt--;
|
s->blkcnt--;
|
||||||
|
@ -678,9 +672,7 @@ static void sdhci_sdma_transfer_single_block(SDHCIState *s)
|
||||||
dma_memory_write(s->dma_as, s->sdmasysad, s->fifo_buffer, datacnt);
|
dma_memory_write(s->dma_as, s->sdmasysad, s->fifo_buffer, datacnt);
|
||||||
} else {
|
} else {
|
||||||
dma_memory_read(s->dma_as, s->sdmasysad, s->fifo_buffer, datacnt);
|
dma_memory_read(s->dma_as, s->sdmasysad, s->fifo_buffer, datacnt);
|
||||||
for (n = 0; n < datacnt; n++) {
|
sdbus_write_data(&s->sdbus, s->fifo_buffer, datacnt);
|
||||||
sdbus_write_byte(&s->sdbus, s->fifo_buffer[n]);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
s->blkcnt--;
|
s->blkcnt--;
|
||||||
|
|
||||||
|
@ -814,9 +806,7 @@ static void sdhci_do_adma(SDHCIState *s)
|
||||||
s->data_count - begin);
|
s->data_count - begin);
|
||||||
dscr.addr += s->data_count - begin;
|
dscr.addr += s->data_count - begin;
|
||||||
if (s->data_count == block_size) {
|
if (s->data_count == block_size) {
|
||||||
for (n = 0; n < block_size; n++) {
|
sdbus_write_data(&s->sdbus, s->fifo_buffer, block_size);
|
||||||
sdbus_write_byte(&s->sdbus, s->fifo_buffer[n]);
|
|
||||||
}
|
|
||||||
s->data_count = 0;
|
s->data_count = 0;
|
||||||
if (s->trnmod & SDHC_TRNS_BLK_CNT_EN) {
|
if (s->trnmod & SDHC_TRNS_BLK_CNT_EN) {
|
||||||
s->blkcnt--;
|
s->blkcnt--;
|
||||||
|
|
Loading…
Reference in a new issue