lkml.org 
[lkml]   [2019]   [Nov]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 140/220] dmaengine: rcar-dmac: set scatter/gather max segment size
    Date
    From: Wolfram Sang <wsa+renesas@sang-engineering.com>

    [ Upstream commit 97d49c59e219acac576e16293a6b8cb99302f62f ]

    Fix warning when running with CONFIG_DMA_API_DEBUG_SG=y by allocating a
    device_dma_parameters structure and filling in the max segment size.

    Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/dma/sh/rcar-dmac.c | 3 +++
    1 file changed, 3 insertions(+)

    diff --git a/drivers/dma/sh/rcar-dmac.c b/drivers/dma/sh/rcar-dmac.c
    index 041ce864097e4..80ff95f75199f 100644
    --- a/drivers/dma/sh/rcar-dmac.c
    +++ b/drivers/dma/sh/rcar-dmac.c
    @@ -198,6 +198,7 @@ struct rcar_dmac {
    struct dma_device engine;
    struct device *dev;
    void __iomem *iomem;
    + struct device_dma_parameters parms;

    unsigned int n_channels;
    struct rcar_dmac_chan *channels;
    @@ -1814,6 +1815,8 @@ static int rcar_dmac_probe(struct platform_device *pdev)

    dmac->dev = &pdev->dev;
    platform_set_drvdata(pdev, dmac);
    + dmac->dev->dma_parms = &dmac->parms;
    + dma_set_max_seg_size(dmac->dev, RCAR_DMATCR_MASK);
    dma_set_mask_and_coherent(dmac->dev, DMA_BIT_MASK(40));

    ret = rcar_dmac_parse_of(&pdev->dev, dmac);
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-11-22 12:03    [W:4.056 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site