Commit 4312cf7f authored Dec 19, 2019 by Will Deacon Committed by Joerg Roedel Dec 23, 2019

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 <will@kernel.org>
Tested-by: John Garry <john.garry@huawei.com> # smmu v3
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Joerg Roedel <jroedel@suse.de>

parent 386dce27

drivers/iommu/iommu.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -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;

Admin message