lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 091/102] dma-direct: dont check swiotlb=force in dma_direct_map_resource
    Date
    From: Christoph Hellwig <hch@lst.de>

    [ Upstream commit 4268ac6ae5870af10a7417b22990d615f72f77e2 ]

    When mapping resources we can't just use swiotlb ram for bounce
    buffering. Switch to a direct dma_capable check instead.

    Fixes: cfced786969c ("dma-mapping: remove the default map_resource implementation")
    Reported-by: Robin Murphy <robin.murphy@arm.com>
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
    Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    kernel/dma/direct.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
    index 8402b29c280f5..867fd72cb2605 100644
    --- a/kernel/dma/direct.c
    +++ b/kernel/dma/direct.c
    @@ -375,7 +375,7 @@ dma_addr_t dma_direct_map_resource(struct device *dev, phys_addr_t paddr,
    {
    dma_addr_t dma_addr = paddr;

    - if (unlikely(!dma_direct_possible(dev, dma_addr, size))) {
    + if (unlikely(!dma_capable(dev, dma_addr, size))) {
    report_addr(dev, dma_addr, size);
    return DMA_MAPPING_ERROR;
    }
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 10:43    [W:4.195 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site