Commit f14cc3b1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'vfio-v4.11-rc1' of git://github.com/awilliam/linux-vfio 

Pull VFIO updates from Alex Williamson:

 - Kconfig fixes for SPAPR_TCE_IOMMU=n (Michael Ellerman)

 - Module softdep rather than request_module to simplify usage from
   initrd (Alex Williamson)

 - Comment typo fix (Changbin Du)

* tag 'vfio-v4.11-rc1' of git://github.com/awilliam/linux-vfio:
  vfio: fix a typo in comment of function vfio_pin_pages
  vfio: Replace module request with softdep
  vfio/mdev: Use a module softdep for vfio_mdev
  vfio: Fix build break when SPAPR_TCE_IOMMU=n
parents 5bcbe22c d9d84780

drivers/vfio/Kconfig

+2 −4
Original line number Diff line number Diff line
@@ -6,12 +6,12 @@ config VFIO_IOMMU_TYPE1 
config VFIO_IOMMU_SPAPR_TCE

	tristate

	depends on VFIO && SPAPR_TCE_IOMMU

	default n

	default VFIO



config VFIO_SPAPR_EEH

	tristate

	depends on EEH && VFIO_IOMMU_SPAPR_TCE

	default n

	default VFIO



config VFIO_VIRQFD

	tristate
@@ -22,8 +22,6 @@ menuconfig VFIO 
	tristate "VFIO Non-Privileged userspace driver framework"

	depends on IOMMU_API

	select VFIO_IOMMU_TYPE1 if (X86 || S390 || ARM_SMMU || ARM_SMMU_V3)

	select VFIO_IOMMU_SPAPR_TCE if (PPC_POWERNV || PPC_PSERIES)

	select VFIO_SPAPR_EEH if (PPC_POWERNV || PPC_PSERIES)

	select ANON_INODES

	help

	  VFIO provides a framework for secure userspace device drivers.

drivers/vfio/mdev/mdev_core.c

+2 −12
Original line number Diff line number Diff line
@@ -422,18 +422,7 @@ int mdev_device_remove(struct device *dev, bool force_remove) 


static int __init mdev_init(void)

{

	int ret;



	ret = mdev_bus_register();



	/*

	 * Attempt to load known vfio_mdev.  This gives us a working environment

	 * without the user needing to explicitly load vfio_mdev driver.

	 */

	if (!ret)

		request_module_nowait("vfio_mdev");



	return ret;

	return mdev_bus_register();

}



static void __exit mdev_exit(void)
@@ -451,3 +440,4 @@ MODULE_VERSION(DRIVER_VERSION); 
MODULE_LICENSE("GPL v2");

MODULE_AUTHOR(DRIVER_AUTHOR);

MODULE_DESCRIPTION(DRIVER_DESC);

MODULE_SOFTDEP("post: vfio_mdev");

drivers/vfio/vfio.c

+2 −9
Original line number Diff line number Diff line
@@ -1917,7 +1917,7 @@ EXPORT_SYMBOL(vfio_set_irqs_validate_and_prepare); 
 * Pin a set of guest PFNs and return their associated host PFNs for local

 * domain only.

 * @dev [in]     : device

 * @user_pfn [in]: array of user/guest PFNs to be unpinned.

 * @user_pfn [in]: array of user/guest PFNs to be pinned.

 * @npage [in]   : count of elements in user_pfn array.  This count should not

 *		   be greater VFIO_PIN_PAGES_MAX_ENTRIES.

 * @prot [in]    : protection flags
@@ -2250,14 +2250,6 @@ static int __init vfio_init(void) 


	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

	vfio_register_iommu_driver(&vfio_noiommu_ops);

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

MODULE_ALIAS_MISCDEV(VFIO_MINOR);

MODULE_ALIAS("devname:vfio/vfio");

MODULE_SOFTDEP("post: vfio_iommu_type1 vfio_iommu_spapr_tce");

CRA Git | Maintained and supported by SUSTech CRA and CCSE