[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v4 2/4] sd: sdhci: check transfer mode register
From: |
Alistair Francis |
Subject: |
Re: [Qemu-devel] [PATCH v4 2/4] sd: sdhci: check transfer mode register in multi block transfer |
Date: |
Tue, 14 Feb 2017 11:13:08 -0800 |
On Tue, Feb 14, 2017 at 10:52 AM, P J P <address@hidden> wrote:
> From: Prasad J Pandit <address@hidden>
>
> 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 <address@hidden>
> Reported-by: Jiang Xin <address@hidden>
> Signed-off-by: Prasad J Pandit <address@hidden>
Didn't I already review this?
Can you please make sure to attach all tags from previous patches to
future patches?
Thanks,
Alistair
> ---
> 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 cf647fa..f8220c0 100644
> --- a/hw/sd/sdhci.c
> +++ b/hw/sd/sdhci.c
> @@ -487,6 +487,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 */
> @@ -798,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 {
> --
> 2.9.3
>
[Qemu-devel] [PATCH v4 3/4] sd: sdhci: conditionally invoke multi block transfer, P J P, 2017/02/14
[Qemu-devel] [PATCH v4 4/4] sd: sdhci: Remove block count enable check in single block transfers, P J P, 2017/02/14
Re: [Qemu-devel] [PATCH v4 0/4] sd: sdhci: correct transfer mode register usage, Peter Maydell, 2017/02/17