[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 6/7] hw/sd: sdhci: Limit block size only when SDHC_BLKSIZE registe
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 6/7] hw/sd: sdhci: Limit block size only when SDHC_BLKSIZE register is writable |
Date: |
Mon, 22 Mar 2021 18:16:09 +0100 |
From: Bin Meng <bmeng.cn@gmail.com>
The codes to limit the maximum block size is only necessary when
SDHC_BLKSIZE register is writable.
Tested-by: Alexander Bulekov <alxndr@bu.edu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Message-Id: <20210303122639.20004-5-bmeng.cn@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/sd/sdhci.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index 7a2003b28b3..d0c8e293c0b 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -1142,15 +1142,15 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val,
unsigned size)
if (!TRANSFERRING_DATA(s->prnsts)) {
MASKED_WRITE(s->blksize, mask, extract32(value, 0, 12));
MASKED_WRITE(s->blkcnt, mask >> 16, value >> 16);
- }
- /* Limit block size to the maximum buffer size */
- if (extract32(s->blksize, 0, 12) > s->buf_maxsz) {
- qemu_log_mask(LOG_GUEST_ERROR, "%s: Size 0x%x is larger than "
- "the maximum buffer 0x%x\n", __func__, s->blksize,
- s->buf_maxsz);
+ /* Limit block size to the maximum buffer size */
+ if (extract32(s->blksize, 0, 12) > s->buf_maxsz) {
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: Size 0x%x is larger than "
+ "the maximum buffer 0x%x\n", __func__,
s->blksize,
+ s->buf_maxsz);
- s->blksize = deposit32(s->blksize, 0, 12, s->buf_maxsz);
+ s->blksize = deposit32(s->blksize, 0, 12, s->buf_maxsz);
+ }
}
break;
--
2.26.2
- [PULL 0/7] SD/MMC patches for 2021-03-21, Philippe Mathieu-Daudé, 2021/03/22
- [PULL 1/7] hw/sd: sd: Fix build error when DEBUG_SD is on, Philippe Mathieu-Daudé, 2021/03/22
- [PULL 2/7] hw/sd: sd: Actually perform the erase operation, Philippe Mathieu-Daudé, 2021/03/22
- [PULL 3/7] hw/sd: sdhci: Don't transfer any data when command time out, Philippe Mathieu-Daudé, 2021/03/22
- [PULL 4/7] hw/sd: sdhci: Don't write to SDHC_SYSAD register when transfer is in progress, Philippe Mathieu-Daudé, 2021/03/22
- [PULL 5/7] hw/sd: sdhci: Correctly set the controller status for ADMA, Philippe Mathieu-Daudé, 2021/03/22
- [PULL 6/7] hw/sd: sdhci: Limit block size only when SDHC_BLKSIZE register is writable,
Philippe Mathieu-Daudé <=
- [PULL 7/7] hw/sd: sdhci: Reset the data pointer of s->fifo_buffer[] when a different block size is programmed, Philippe Mathieu-Daudé, 2021/03/22
- Re: [PULL 0/7] SD/MMC patches for 2021-03-21, Peter Maydell, 2021/03/23