52 lines
2.1 KiB
Diff
52 lines
2.1 KiB
Diff
From: Prasad J Pandit <pjp@fedoraproject.org>
|
|
Date: Tue, 28 Feb 2017 12:08:14 +0000
|
|
Subject: [PATCH] sd: sdhci: check transfer mode register in multi block
|
|
transfer
|
|
|
|
In the SDHCI protocol, the transfer mode register value
|
|
is used during multi block transfer to check if block count
|
|
register is enabled and should be updated. Transfer mode
|
|
register could be set such that, block count register would
|
|
not be updated, thus leading to an infinite loop. Add check
|
|
to avoid it.
|
|
|
|
Reported-by: Wjjzhang <wjjzhang@tencent.com>
|
|
Reported-by: Jiang Xin <jiangxin1@huawei.com>
|
|
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
|
|
Message-id: 20170214185225.7994-3-ppandit@redhat.com
|
|
Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
(cherry picked from commit 6e86d90352adf6cb08295255220295cf23c4286e)
|
|
---
|
|
hw/sd/sdhci.c | 10 +++++-----
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
|
|
index 5bd5ab6319..a9c744b50a 100644
|
|
--- a/hw/sd/sdhci.c
|
|
+++ b/hw/sd/sdhci.c
|
|
@@ -486,6 +486,11 @@ static void sdhci_sdma_transfer_multi_blocks(SDHCIState *s)
|
|
uint32_t boundary_chk = 1 << (((s->blksize & 0xf000) >> 12) + 12);
|
|
uint32_t boundary_count = boundary_chk - (s->sdmasysad % boundary_chk);
|
|
|
|
+ if (!(s->trnmod & SDHC_TRNS_BLK_CNT_EN) || !s->blkcnt) {
|
|
+ qemu_log_mask(LOG_UNIMP, "infinite transfer is not supported\n");
|
|
+ return;
|
|
+ }
|
|
+
|
|
/* XXX: Some sd/mmc drivers (for example, u-boot-slp) do not account for
|
|
* possible stop at page boundary if initial address is not page aligned,
|
|
* allow them to work properly */
|
|
@@ -797,11 +802,6 @@ static void sdhci_data_transfer(void *opaque)
|
|
if (s->trnmod & SDHC_TRNS_DMA) {
|
|
switch (SDHC_DMA_TYPE(s->hostctl)) {
|
|
case SDHC_CTRL_SDMA:
|
|
- if ((s->trnmod & SDHC_TRNS_MULTI) &&
|
|
- (!(s->trnmod & SDHC_TRNS_BLK_CNT_EN) || s->blkcnt == 0)) {
|
|
- break;
|
|
- }
|
|
-
|
|
if ((s->blkcnt == 1) || !(s->trnmod & SDHC_TRNS_MULTI)) {
|
|
sdhci_sdma_transfer_single_block(s);
|
|
} else {
|