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 13/34] iommu: Export bus_iommu_probe() and make is safe for re-probing
    Date
    From: Joerg Roedel <jroedel@suse.de>

    Add a check to the bus_iommu_probe() call-path to make sure it ignores
    devices which have already been successfully probed. Then export the
    bus_iommu_probe() function so it can be used by IOMMU drivers.

    Signed-off-by: Joerg Roedel <jroedel@suse.de>
    ---
    drivers/iommu/iommu.c | 6 +++++-
    include/linux/iommu.h | 1 +
    2 files changed, 6 insertions(+), 1 deletion(-)

    diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
    index 844613850595..cf25c1e48830 100644
    --- a/drivers/iommu/iommu.c
    +++ b/drivers/iommu/iommu.c
    @@ -1615,6 +1615,10 @@ static int probe_iommu_group(struct device *dev, void *data)
    if (!dev_iommu_get(dev))
    return -ENOMEM;

    + /* Device is probed already if in a group */
    + if (iommu_group_get(dev) != NULL)
    + return 0;
    +
    if (!try_module_get(ops->owner)) {
    ret = -EINVAL;
    goto err_free_dev_iommu;
    @@ -1783,7 +1787,7 @@ static int iommu_group_create_direct_mappings(struct iommu_group *group)
    iommu_do_create_direct_mappings);
    }

    -static int bus_iommu_probe(struct bus_type *bus)
    +int bus_iommu_probe(struct bus_type *bus)
    {
    const struct iommu_ops *ops = bus->iommu_ops;
    int ret;
    diff --git a/include/linux/iommu.h b/include/linux/iommu.h
    index 30170d191e5e..fea1622408ad 100644
    --- a/include/linux/iommu.h
    +++ b/include/linux/iommu.h
    @@ -445,6 +445,7 @@ static inline void iommu_iotlb_gather_init(struct iommu_iotlb_gather *gather)
    #define IOMMU_GROUP_NOTIFY_UNBOUND_DRIVER 6 /* Post Driver unbind */

    extern int bus_set_iommu(struct bus_type *bus, const struct iommu_ops *ops);
    +extern int bus_iommu_probe(struct bus_type *bus);
    extern bool iommu_present(struct bus_type *bus);
    extern bool iommu_capable(struct bus_type *bus, enum iommu_cap cap);
    extern struct iommu_domain *iommu_domain_alloc(struct bus_type *bus);
    --
    2.17.1
    \
     
     \ /
      Last update: 2020-04-07 20:40    [W:4.250 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site