Commit af3ab3f9 authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Alex Williamson
Browse files

vfio/mdev: Remove CONFIG_VFIO_MDEV_DEVICE 



For some reason the vfio_mdev shim mdev_driver has its own module and
kconfig. As the next patch requires access to it from mdev.ko merge the
two modules together and remove VFIO_MDEV_DEVICE.

A later patch deletes this driver entirely.

Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: default avatarKirti Wankhede <kwankhede@nvidia.com>
Link: https://lore.kernel.org/r/20210617142218.1877096-7-hch@lst.de


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

Documentation/s390/vfio-ap.rst

+0 −1
Original line number Diff line number Diff line
@@ -514,7 +514,6 @@ These are the steps: 
   * S390_AP_IOMMU

   * VFIO

   * VFIO_MDEV

   * VFIO_MDEV_DEVICE

   * KVM



   If using make menuconfig select the following to build the vfio_ap module::

arch/s390/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -768,7 +768,7 @@ config VFIO_CCW 
config VFIO_AP

	def_tristate n

	prompt "VFIO support for AP devices"

	depends on S390_AP_IOMMU && VFIO_MDEV_DEVICE && KVM

	depends on S390_AP_IOMMU && VFIO_MDEV && KVM

	depends on ZCRYPT

	help

		This driver grants access to Adjunct Processor (AP) devices

drivers/gpu/drm/i915/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ config DRM_I915_GVT_KVMGT 
	tristate "Enable KVM/VFIO support for Intel GVT-g"

	depends on DRM_I915_GVT

	depends on KVM

	depends on VFIO_MDEV && VFIO_MDEV_DEVICE

	depends on VFIO_MDEV

	default n

	help

	  Choose this option if you want to enable KVMGT support for

drivers/vfio/mdev/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -9,10 +9,3 @@ config VFIO_MDEV 
	  See Documentation/driver-api/vfio-mediated-device.rst for more details.



	  If you don't know what do here, say N.
 


config VFIO_MDEV_DEVICE

	tristate "VFIO driver for Mediated devices"

	depends on VFIO && VFIO_MDEV

	default n

	help

	  VFIO based driver for Mediated devices.

drivers/vfio/mdev/Makefile

+1 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only



mdev-y := mdev_core.o mdev_sysfs.o mdev_driver.o

mdev-y := mdev_core.o mdev_sysfs.o mdev_driver.o vfio_mdev.o



obj-$(CONFIG_VFIO_MDEV) += mdev.o
 
obj-$(CONFIG_VFIO_MDEV_DEVICE) += vfio_mdev.o