lkml.org 
[lkml]   [2018]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 130/173] mmc: sdhci-of-esdhc: set proper dma mask for ls104x chips
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Laurentiu Tudor <laurentiu.tudor@nxp.com>

    [ Upstream commit 5552d7ad596c3fea953f40fef74170ce0760c04d ]

    SDHCI controller in ls1043a and ls1046a generate 40-bit wide addresses
    when doing DMA. Make sure that the corresponding dma mask is correctly
    configured.

    Context: when enabling smmu on these chips the following problem is
    encountered: the smmu input address size is 48 bits so the dma mappings
    for sdhci end up 48-bit wide. However, on these chips sdhci only use
    40-bits of that address size when doing dma.
    So you end up with a 48-bit address translation in smmu but the device
    generates transactions with clipped 40-bit addresses, thus smmu context
    faults are triggered. Setting up the correct dma mask fixes this
    situation.

    Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
    Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/mmc/host/sdhci-of-esdhc.c | 6 ++++++
    1 file changed, 6 insertions(+)

    --- a/drivers/mmc/host/sdhci-of-esdhc.c
    +++ b/drivers/mmc/host/sdhci-of-esdhc.c
    @@ -22,6 +22,7 @@
    #include <linux/sys_soc.h>
    #include <linux/clk.h>
    #include <linux/ktime.h>
    +#include <linux/dma-mapping.h>
    #include <linux/mmc/host.h>
    #include "sdhci-pltfm.h"
    #include "sdhci-esdhc.h"
    @@ -427,6 +428,11 @@ static void esdhc_of_adma_workaround(str
    static int esdhc_of_enable_dma(struct sdhci_host *host)
    {
    u32 value;
    + struct device *dev = mmc_dev(host->mmc);
    +
    + if (of_device_is_compatible(dev->of_node, "fsl,ls1043a-esdhc") ||
    + of_device_is_compatible(dev->of_node, "fsl,ls1046a-esdhc"))
    + dma_set_mask_and_coherent(dev, DMA_BIT_MASK(40));

    value = sdhci_readl(host, ESDHC_DMA_SYSCTL);
    value |= ESDHC_DMA_SNOOP;

    \
     
     \ /
      Last update: 2018-09-24 14:54    [W:4.241 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site