lkml.org 
[lkml]   [2016]   [Jan]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.2.y-ckt 048/268] mmc: sdhci: Fix DMA descriptor with zero data length
    Date
    4.2.8-ckt3 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Adrian Hunter <adrian.hunter@intel.com>

    commit 347ea32dc118326c4f2636928239a29d192cc9b8 upstream.

    SDHCI has built-in DMA called ADMA2. ADMA2 uses a descriptor
    table to define DMA scatter-gather. Each desciptor can specify
    a data length up to 65536 bytes, however the length field is
    only 16-bits so zero means 65536. Consequently, putting zero
    when the size is zero must not be allowed. This patch fixes
    one case where zero data length could be set inadvertently.

    The problem happens because unaligned data gets split and the
    code did not consider that the remaining aligned portion might
    be zero length. That case really only happens for SDIO because
    SD and eMMC cards transfer blocks that are invariably sector-
    aligned. For SDIO, access to function registers is done by
    data transfer (CMD53) when the register is bigger than 1 byte.
    Generally registers are 4 bytes but 2-byte registers are possible.
    So DMA of 4 bytes or less can happen. When 32-bit DMA is used,
    the data alignment must be 4, so 4-byte transfers won't casue a
    problem, but a 2-byte transfer could. However with the introduction
    of 64-bit DMA, the data alignment for 64-bit DMA was made 8 bytes,
    so all 4-byte transfers not on 8-byte boundaries get "split" into
    a 4-byte chunk and a 0-byte chunk, thereby hitting the bug.

    In fact, a closer look at the SDHCI specs indicates that only the
    descriptor table requires 8-byte alignment for 64-bit DMA. That
    will be dealt with in a separate patch, but the potential for a
    2-byte access remains, so this fix is needed anyway.

    Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
    Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/mmc/host/sdhci.c | 9 ++++++---
    1 file changed, 6 insertions(+), 3 deletions(-)

    diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
    index b0c915a..1c4343d 100644
    --- a/drivers/mmc/host/sdhci.c
    +++ b/drivers/mmc/host/sdhci.c
    @@ -541,9 +541,12 @@ static int sdhci_adma_table_pre(struct sdhci_host *host,

    BUG_ON(len > 65536);

    - /* tran, valid */
    - sdhci_adma_write_desc(host, desc, addr, len, ADMA2_TRAN_VALID);
    - desc += host->desc_sz;
    + if (len) {
    + /* tran, valid */
    + sdhci_adma_write_desc(host, desc, addr, len,
    + ADMA2_TRAN_VALID);
    + desc += host->desc_sz;
    + }

    /*
    * If this triggers then we have a calculation bug
    --
    1.9.1
    \
     
     \ /
      Last update: 2016-01-27 23:21    [W:3.543 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site