hw/sd/sdhci: Factor sdhci_sdma_transfer() out
PATCH 1/1 hw/sd/sdhci: Factor sdhci_sdma_transfer() out
Factor sdhci_sdma_transfer() out of sdhci_data_transfer(). Re-use it in sdhci_write(), so we don't try to run multi block transfer for a single block.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>
--- hw/sd/sdhci.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
hw/sd/sdhci.c +11 -11
@@ -694,6 +694,15 @@ static void sdhci_sdma_transfer_single_block(SDHCIState *s)sdhci_end_transfer (s); } +static void sdhci_sdma_transfer (SDHCIState *s) +{ +if ((s->blkcnt ==1 ) || !(s->trnmod &SDHC_TRNS_MULTI )) { +sdhci_sdma_transfer_single_block (s); + }else { +sdhci_sdma_transfer_multi_blocks (s); + } +} + typedef struct ADMADescr { hwaddr addr; uint16_t length;
@@ -925,12 +934,7 @@ static void sdhci_data_transfer(void *opaque)if (s->trnmod &SDHC_TRNS_DMA ) {switch (SDHC_DMA_TYPE (s->hostctl1)) {case SDHC_CTRL_SDMA : -if ((s->blkcnt ==1 ) || !(s->trnmod &SDHC_TRNS_MULTI )) { -sdhci_sdma_transfer_single_block (s); - }else { -sdhci_sdma_transfer_multi_blocks (s); - } - +sdhci_sdma_transfer (s);break ;case SDHC_CTRL_ADMA1_32 :if (!(s->capareg &R_SDHC_CAPAB_ADMA1_MASK )) {
@@ -1174,11 +1178,7 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val, unsigned size)if (!(mask &0xFF000000 ) && s->blkcnt && (s->blksize &BLOCK_SIZE_MASK ) &&SDHC_DMA_TYPE (s->hostctl1) ==SDHC_CTRL_SDMA ) { -if (s->trnmod &SDHC_TRNS_MULTI ) { -sdhci_sdma_transfer_multi_blocks (s); - }else { -sdhci_sdma_transfer_single_block (s); - } +sdhci_sdma_transfer (s); } }break ;
Signature · 1 line
2.47.1
Am 9. Januar 2025 12:20:29 UTC schrieb "Philippe Mathieu-Daudé" <[email protected]>:
Quoted 5 lines
Factor
sdhci_sdma_transfer()out ofsdhci_data_transfer(). Re-use it insdhci_write(), so we don't try to run multi block transfer for a single block.Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Reviewed-by Bernhard Beschow <[email protected]>
Quoted 51 lines
---
hw/sd/sdhci.c| 22 +++++++++++-----------1 file changed, 11 insertions(+), 11 deletions(-)hw/sd/sdhci.c +11
-11@@ -694,6 +694,15 @@ static void sdhci_sdma_transfer_single_block(SDHCIState *s)sdhci_end_transfer (s); } +static void sdhci_sdma_transfer (SDHCIState *s) +{ +if ((s->blkcnt ==1 ) || !(s->trnmod &SDHC_TRNS_MULTI )) { +sdhci_sdma_transfer_single_block (s); + }else { +sdhci_sdma_transfer_multi_blocks (s); + } +} + typedef struct ADMADescr { hwaddr addr; uint16_t length;@@ -925,12 +934,7 @@ static void sdhci_data_transfer(void *opaque)if (s->trnmod &SDHC_TRNS_DMA ) {switch (SDHC_DMA_TYPE (s->hostctl1)) {case SDHC_CTRL_SDMA : -if ((s->blkcnt ==1 ) || !(s->trnmod &SDHC_TRNS_MULTI )) { -sdhci_sdma_transfer_single_block (s); - }else { -sdhci_sdma_transfer_multi_blocks (s); - } - +sdhci_sdma_transfer (s);break ;case SDHC_CTRL_ADMA1_32 :if (!(s->capareg &R_SDHC_CAPAB_ADMA1_MASK )) {@@ -1174,11 +1178,7 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val, unsigned size)if (!(mask &0xFF000000 ) && s->blkcnt && (s->blksize &BLOCK_SIZE_MASK ) &&SDHC_DMA_TYPE (s->hostctl1) ==SDHC_CTRL_SDMA ) { -if (s->trnmod &SDHC_TRNS_MULTI ) { -sdhci_sdma_transfer_multi_blocks (s); - }else { -sdhci_sdma_transfer_single_block (s); - } +sdhci_sdma_transfer (s); } }break ;