[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/4] hw/sd/sdhci: Stop multiple transfers when block count is cle
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 1/4] hw/sd/sdhci: Stop multiple transfers when block count is cleared |
Date: |
Thu, 3 Sep 2020 19:28:03 +0200 |
Clearing BlockCount stops multiple transfers.
See "SD Host Controller Simplified Specification Version 2.00":
- 2.2.3. Block Count Register (Offset 006h)
- Table 2-8 : Determination of Transfer Type
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/sd/sdhci.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index ecbf84e9d3f..703357e94a7 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -728,6 +728,12 @@ static void sdhci_do_adma(SDHCIState *s)
ADMADescr dscr = {};
int i;
+ if (s->trnmod & SDHC_TRNS_BLK_CNT_EN && !s->blkcnt) {
+ /* Stop Multiple Transfer */
+ sdhci_end_transfer(s);
+ return;
+ }
+
for (i = 0; i < SDHC_ADMA_DESCS_PER_DELAY; ++i) {
s->admaerr &= ~SDHC_ADMAERR_LENGTH_MISMATCH;
@@ -753,7 +759,6 @@ static void sdhci_do_adma(SDHCIState *s)
switch (dscr.attr & SDHC_ADMA_ATTR_ACT_MASK) {
case SDHC_ADMA_ATTR_ACT_TRAN: /* data transfer */
-
if (s->trnmod & SDHC_TRNS_READ) {
while (length) {
if (s->data_count == 0) {
--
2.26.2
- [PATCH 0/4] hw/sd/sdhci: Strengthen multiple DMA transfers, Philippe Mathieu-Daudé, 2020/09/03
- [PATCH 1/4] hw/sd/sdhci: Stop multiple transfers when block count is cleared,
Philippe Mathieu-Daudé <=
- [PATCH 2/4] hw/sd/sdhci: Resume pending DMA transfers on MMIO accesses, Philippe Mathieu-Daudé, 2020/09/03
- [PATCH 3/4] hw/sd/sdhci: Let sdhci_update_irq() return if IRQ was delivered, Philippe Mathieu-Daudé, 2020/09/03
- [PATCH 4/4] hw/sd/sdhci: Yield if interrupt delivered during multiple transfer, Philippe Mathieu-Daudé, 2020/09/03
- Re: [PATCH 0/4] hw/sd/sdhci: Strengthen multiple DMA transfers, Philippe Mathieu-Daudé, 2020/09/10
- Re: [PATCH 0/4] hw/sd/sdhci: Strengthen multiple DMA transfers, Alexander Bulekov, 2020/09/10
- Re: [PATCH 0/4] hw/sd/sdhci: Strengthen multiple DMA transfers, Philippe Mathieu-Daudé, 2020/09/18