diff options
| author | Peter Crosthwaite <peter.crosthwaite@xilinx.com> | 2013-06-03 17:17:44 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2013-06-03 17:17:44 +0100 |
| commit | dcdb4cd8507d93ecad10ae54b28d9609453c0312 (patch) | |
| tree | 44431b7b5db4451c9dc668c3d292684b337f92ae /hw/sd | |
| parent | 656f416c65d8ddbfd17500676865f0ac8f960801 (diff) | |
| download | qemu-dcdb4cd8507d93ecad10ae54b28d9609453c0312.zip qemu-dcdb4cd8507d93ecad10ae54b28d9609453c0312.tar.gz qemu-dcdb4cd8507d93ecad10ae54b28d9609453c0312.tar.bz2 | |
sd/sdhci: Fix Buffer Write Ready interrupt
This interrupt is not risen after the last block is written to sd. It
is mutually exclusive with the end of transfer conditions. Fix.
Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: Igor Mitsyanko <i.mitsyanko@gmail.com>
Message-id: 7ca9fd3e03ce1bec94aff08f607c15a0ec3d3371.1369370934.git.peter.crosthwaite@xilinx.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/sd')
| -rw-r--r-- | hw/sd/sdhci.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 0a84540..ea510b5 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -405,15 +405,14 @@ static void sdhci_write_block_to_card(SDHCIState *s) /* Next data can be written through BUFFER DATORT register */ s->prnsts |= SDHC_SPACE_AVAILABLE; - if (s->norintstsen & SDHC_NISEN_WBUFRDY) { - s->norintsts |= SDHC_NIS_WBUFRDY; - } /* Finish transfer if that was the last block of data */ if ((s->trnmod & SDHC_TRNS_MULTI) == 0 || ((s->trnmod & SDHC_TRNS_MULTI) && (s->trnmod & SDHC_TRNS_BLK_CNT_EN) && (s->blkcnt == 0))) { SDHCI_GET_CLASS(s)->end_data_transfer(s); + } else if (s->norintstsen & SDHC_NISEN_WBUFRDY) { + s->norintsts |= SDHC_NIS_WBUFRDY; } /* Generate Block Gap Event if requested and if not the last block */ |