update to qemu-2.9.0-rc2

[pve-qemu-kvm.git] / debian / patches / extra / 0003-sd-sdhci-check-transfer-mode-register-in-multi-block.patch

diff --git a/debian/patches/extra/0003-sd-sdhci-check-transfer-mode-register-in-multi-block.patch b/debian/patches/extra/0003-sd-sdhci-check-transfer-mode-register-in-multi-block.patch
deleted file mode 100644 (file)
index 017f55a..0000000
--- a/debian/patches/extra/0003-sd-sdhci-check-transfer-mode-register-in-multi-block.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From da4c6050712be98934918e348aa34a74be0e4e57 Mon Sep 17 00:00:00 2001
-From: Prasad J Pandit <pjp@fedoraproject.org>
-Date: Tue, 31 Jan 2017 17:54:15 +0530
-Subject: [PATCH 3/8] sd: sdhci: check transfer mode register in multi block
- transfer
-
-In SDHCI device emulation 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>
----
- hw/sd/sdhci.c | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
-index 01fbf22..35f953a 100644
---- a/hw/sd/sdhci.c
-+++ b/hw/sd/sdhci.c
-@@ -486,6 +486,12 @@ 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_MULTI)
-+        || !(s->trnmod & SDHC_TRNS_BLK_CNT_EN)
-+        || !s->blkcnt) {
-+        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 +803,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 {
-@@ -1050,7 +1051,7 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val, unsigned size)
-         if (!(s->capareg & SDHC_CAN_DO_DMA)) {
-             value &= ~SDHC_TRNS_DMA;
-         }
--        MASKED_WRITE(s->trnmod, mask, value);
-+        MASKED_WRITE(s->trnmod, mask, value & 0x0037);
-         MASKED_WRITE(s->cmdreg, mask >> 16, value >> 16);
- 
-         /* Writing to the upper byte of CMDREG triggers SD command generation */
--- 
-2.1.4
-