On 05/21/2013 10:50 AM, peter.crosthwa...@xilinx.com wrote: From: Peter Crosthwaite <peter.crosthwa...@xilinx.com> <peter.crosthwa...@xilinx.com>
The data_count variable was being reset on every transfer, including DMA transfer resumptions. This is incorrect, it should only be set on a new command. Manifests as a bug when using ADMA and there is a timer delay between ADMA frames where the fifo is left in a non empty state. Signed-off-by: Peter Crosthwaite <peter.crosthwa...@xilinx.com> <peter.crosthwa...@xilinx.com> --- hw/sd/sdhci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 91dc9b0..0a84540 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -260,6 +260,7 @@ static void sdhci_send_command(SDHCIState *s) sdhci_update_irq(s); if (s->blksize && (s->cmdreg & SDHC_CMD_DATA_PRESENT)) { + s->data_count = 0; sdhci_do_data_transfer(s); } } @@ -773,7 +774,6 @@ static void sdhci_do_adma(SDHCIState *s) static void sdhci_data_transfer(SDHCIState *s) { SDHCIClass *k = SDHCI_GET_CLASS(s); - s->data_count = 0; if (s->trnmod & SDHC_TRNS_DMA) { switch (SDHC_DMA_TYPE(s->hostctl)) { Reviewed-by: Igor Mitsyanko <i.mitsya...@gmail.com> <i.mitsya...@gmail.com> -- Best wishes, Igor Mitsyanko email: i.mitsya...@gmail.com