Message ID | 20170208064212.25307-3-ppandit@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Tue, Feb 7, 2017 at 10:42 PM, P J P <ppandit@redhat.com> wrote: > From: Prasad J Pandit <pjp@fedoraproject.org> > > In sdhci_write invoke multi block transfer if it is enabled > in the transfer mode register 's->trnmod'. > > Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org> > --- > hw/sd/sdhci.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c > index cf400c8..532ef87 100644 > --- a/hw/sd/sdhci.c > +++ b/hw/sd/sdhci.c > @@ -1022,7 +1022,11 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) > /* Writing to last byte of sdmasysad might trigger transfer */ > if (!(mask & 0xFF000000) && TRANSFERRING_DATA(s->prnsts) && s->blkcnt && > s->blksize && SDHC_DMA_TYPE(s->hostctl) == SDHC_CTRL_SDMA) { > - sdhci_sdma_transfer_multi_blocks(s); > + if (!(s->trnmod & SDHC_TRNS_MULTI)) { You should test if true first. Thanks, Alistair > + sdhci_sdma_transfer_single_block(s); > + } else { > + sdhci_sdma_transfer_multi_blocks(s); > + } > } > break; > case SDHC_BLKSIZE: > -- > 2.9.3 >
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index cf400c8..532ef87 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1022,7 +1022,11 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) /* Writing to last byte of sdmasysad might trigger transfer */ if (!(mask & 0xFF000000) && TRANSFERRING_DATA(s->prnsts) && s->blkcnt && s->blksize && SDHC_DMA_TYPE(s->hostctl) == SDHC_CTRL_SDMA) { - sdhci_sdma_transfer_multi_blocks(s); + if (!(s->trnmod & SDHC_TRNS_MULTI)) { + sdhci_sdma_transfer_single_block(s); + } else { + sdhci_sdma_transfer_multi_blocks(s); + } } break; case SDHC_BLKSIZE: