diff options
| author | Will Deacon <[email protected]> | 2019-12-19 12:03:43 +0000 |
|---|---|---|
| committer | Joerg Roedel <[email protected]> | 2019-12-23 14:06:05 +0100 |
| commit | 4312cf7f16c8d43e154bf2a6eea6d1e9347c922c (patch) | |
| tree | 8bdde98ecc35de251d4283d80f1006067f71a3ff | |
| parent | 386dce2788eef626aaaa6a3ca32809ea7904581b (diff) | |
drivers/iommu: Allow IOMMU bus ops to be unregistered
'bus_set_iommu()' allows IOMMU drivers to register their ops for a given
bus type. Unfortunately, it then doesn't allow them to be removed, which
is necessary for modular drivers to shutdown cleanly so that they can be
reloaded later on.
Allow 'bus_set_iommu()' to take a NULL 'ops' argument, which clear the
ops pointer for the selected bus_type.
Signed-off-by: Will Deacon <[email protected]>
Tested-by: John Garry <[email protected]> # smmu v3
Reviewed-by: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Joerg Roedel <[email protected]>
| -rw-r--r-- | drivers/iommu/iommu.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 32ceda1d5031..ffe6f685ceae 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -1558,6 +1558,11 @@ int bus_set_iommu(struct bus_type *bus, const struct iommu_ops *ops) { int err; + if (ops == NULL) { + bus->iommu_ops = NULL; + return 0; + } + if (bus->iommu_ops != NULL) return -EBUSY; |