Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ca582fd authored by Alex Williamson's avatar Alex Williamson
Browse files

vfio: Replace module request with softdep 



Rather than doing a module request from within the init function, add
a soft dependency on the available IOMMU backend drivers.  This makes
the dependency visible to userspace when picking modules for the
ram disk.

Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent f790eb57

drivers/vfio/vfio.c

+1 −8
Original line number Original line Diff line number Diff line
@@ -2250,14 +2250,6 @@ static int __init vfio_init(void) 




	pr_info(DRIVER_DESC " version: " DRIVER_VERSION "\n");

	pr_info(DRIVER_DESC " version: " DRIVER_VERSION "\n");





	/*

	 * Attempt to load known iommu-drivers.  This gives us a working

	 * environment without the user needing to explicitly load iommu

	 * drivers.

	 */

	request_module_nowait("vfio_iommu_type1");

	request_module_nowait("vfio_iommu_spapr_tce");



#ifdef CONFIG_VFIO_NOIOMMU

#ifdef CONFIG_VFIO_NOIOMMU

	vfio_register_iommu_driver(&vfio_noiommu_ops);

	vfio_register_iommu_driver(&vfio_noiommu_ops);

#endif

#endif
@@ -2297,3 +2289,4 @@ MODULE_AUTHOR(DRIVER_AUTHOR); 
MODULE_DESCRIPTION(DRIVER_DESC);

MODULE_DESCRIPTION(DRIVER_DESC);

MODULE_ALIAS_MISCDEV(VFIO_MINOR);

MODULE_ALIAS_MISCDEV(VFIO_MINOR);

MODULE_ALIAS("devname:vfio/vfio");

MODULE_ALIAS("devname:vfio/vfio");

MODULE_SOFTDEP("post: vfio_iommu_type1 vfio_iommu_spapr_tce");