lkml.org 
[lkml]   [2020]   [Apr]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC PATCH 26/34] iommu/rockchip: Convert to probe/release_device() call-backs
    Date
    From: Joerg Roedel <jroedel@suse.de>

    Convert the Rockchip IOMMU driver to use the probe_device() and
    release_device() call-backs of iommu_ops, so that the iommu core code
    does the group and sysfs setup.

    Signed-off-by: Joerg Roedel <jroedel@suse.de>
    ---
    drivers/iommu/rockchip-iommu.c | 26 +++++++-------------------
    1 file changed, 7 insertions(+), 19 deletions(-)

    diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
    index b33cdd5aad81..d25c2486ca07 100644
    --- a/drivers/iommu/rockchip-iommu.c
    +++ b/drivers/iommu/rockchip-iommu.c
    @@ -1054,40 +1054,28 @@ static void rk_iommu_domain_free(struct iommu_domain *domain)
    kfree(rk_domain);
    }

    -static int rk_iommu_add_device(struct device *dev)
    +static struct iommu_device *rk_iommu_probe_device(struct device *dev)
    {
    - struct iommu_group *group;
    - struct rk_iommu *iommu;
    struct rk_iommudata *data;
    + struct rk_iommu *iommu;

    data = dev->archdata.iommu;
    if (!data)
    - return -ENODEV;
    + return ERR_PTR(-ENODEV);

    iommu = rk_iommu_from_dev(dev);

    - group = iommu_group_get_for_dev(dev);
    - if (IS_ERR(group))
    - return PTR_ERR(group);
    - iommu_group_put(group);
    -
    - iommu_device_link(&iommu->iommu, dev);
    data->link = device_link_add(dev, iommu->dev,
    DL_FLAG_STATELESS | DL_FLAG_PM_RUNTIME);

    - return 0;
    + return &iommu->iommu;
    }

    -static void rk_iommu_remove_device(struct device *dev)
    +static void rk_iommu_release_device(struct device *dev)
    {
    - struct rk_iommu *iommu;
    struct rk_iommudata *data = dev->archdata.iommu;

    - iommu = rk_iommu_from_dev(dev);
    -
    device_link_del(data->link);
    - iommu_device_unlink(&iommu->iommu, dev);
    - iommu_group_remove_device(dev);
    }

    static struct iommu_group *rk_iommu_device_group(struct device *dev)
    @@ -1126,8 +1114,8 @@ static const struct iommu_ops rk_iommu_ops = {
    .detach_dev = rk_iommu_detach_device,
    .map = rk_iommu_map,
    .unmap = rk_iommu_unmap,
    - .add_device = rk_iommu_add_device,
    - .remove_device = rk_iommu_remove_device,
    + .probe_device = rk_iommu_probe_device,
    + .release_device = rk_iommu_release_device,
    .iova_to_phys = rk_iommu_iova_to_phys,
    .device_group = rk_iommu_device_group,
    .pgsize_bitmap = RK_IOMMU_PGSIZE_BITMAP,
    --
    2.17.1
    \
     
     \ /
      Last update: 2020-04-07 20:39    [W:4.081 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site