lkml.org 
[lkml]   [2016]   [Jun]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 5/8] iommu/rockchip: Prepare to support generic DMA mapping
    Date
    From: Shunqian Zheng <zhengsq@rock-chips.com>

    Set geometry for allocated domains and fix .domain_alloc() callback to
    work with IOMMU_DOMAIN_DMA domain type, which is used for implicit
    domains on ARM64.

    Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
    Signed-off-by: Tomasz Figa <tfiga@chromium.org>
    ---
    drivers/iommu/rockchip-iommu.c | 16 +++++++++++-----
    1 file changed, 11 insertions(+), 5 deletions(-)

    diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
    index 0551146..d5fd074 100644
    --- a/drivers/iommu/rockchip-iommu.c
    +++ b/drivers/iommu/rockchip-iommu.c
    @@ -888,7 +888,7 @@ static struct iommu_domain *rk_iommu_domain_alloc(unsigned type)
    struct platform_device *pdev;
    struct device *iommu_dev;

    - if (type != IOMMU_DOMAIN_UNMANAGED)
    + if (type != IOMMU_DOMAIN_UNMANAGED && type != IOMMU_DOMAIN_DMA)
    return NULL;

    /* Register a pdev per domain, so DMA API can base on this *dev
    @@ -905,8 +905,8 @@ static struct iommu_domain *rk_iommu_domain_alloc(unsigned type)

    rk_domain->pdev = pdev;

    - /* To init the iovad which is required by iommu_dma_init_domain() */
    - if (iommu_get_dma_cookie(&rk_domain->domain))
    + if (type == IOMMU_DOMAIN_DMA &&
    + iommu_get_dma_cookie(&rk_domain->domain))
    goto err_unreg_pdev;

    /*
    @@ -932,12 +932,17 @@ static struct iommu_domain *rk_iommu_domain_alloc(unsigned type)
    spin_lock_init(&rk_domain->dt_lock);
    INIT_LIST_HEAD(&rk_domain->iommus);

    + rk_domain->domain.geometry.aperture_start = 0;
    + rk_domain->domain.geometry.aperture_end = DMA_BIT_MASK(32);
    + rk_domain->domain.geometry.force_aperture = true;
    +
    return &rk_domain->domain;

    err_free_dt:
    free_page((unsigned long)rk_domain->dt);
    err_put_cookie:
    - iommu_put_dma_cookie(&rk_domain->domain);
    + if (type == IOMMU_DOMAIN_DMA)
    + iommu_put_dma_cookie(&rk_domain->domain);
    err_unreg_pdev:
    platform_device_unregister(pdev);

    @@ -966,7 +971,8 @@ static void rk_iommu_domain_free(struct iommu_domain *domain)
    SPAGE_SIZE, DMA_TO_DEVICE);
    free_page((unsigned long)rk_domain->dt);

    - iommu_put_dma_cookie(&rk_domain->domain);
    + if (domain->type == IOMMU_DOMAIN_DMA)
    + iommu_put_dma_cookie(&rk_domain->domain);

    platform_device_unregister(rk_domain->pdev);
    }
    --
    2.8.0.rc3.226.g39d4020
    \
     
     \ /
      Last update: 2016-06-21 07:21    [W:2.194 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site