Commit 0f1cbf94 authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Alexander Gordeev
Browse files

s390/iommu: get rid of S390_CCW_IOMMU and S390_AP_IOMMU 



These don't do anything anymore, the only user of the symbol was
VFIO_CCW/AP which already "depends on VFIO" and VFIO itself selects
IOMMU_API.

When this was added VFIO was wrongly doing "depends on IOMMU_API" which
required some contortions like this to ensure IOMMU_API was turned on.

Reviewed-by: default avatarEric Farman <farman@linux.ibm.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/0-v2-eb322ce2e547+188f-rm_iommu_ccw_jgg@nvidia.com


Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
parent e534167c

Documentation/s390/vfio-ap.rst

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

   * S390

   * ZCRYPT

   * S390_AP_IOMMU

   * VFIO

   * KVM

arch/s390/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -708,7 +708,6 @@ config EADM_SCH 
config VFIO_CCW

	def_tristate n

	prompt "Support for VFIO-CCW subchannels"

	depends on S390_CCW_IOMMU

	depends on VFIO

	select VFIO_MDEV

	help
@@ -720,7 +719,7 @@ config VFIO_CCW 
config VFIO_AP

	def_tristate n

	prompt "VFIO support for AP devices"

	depends on S390_AP_IOMMU && KVM

	depends on KVM

	depends on VFIO

	depends on ZCRYPT

	select VFIO_MDEV

arch/s390/configs/debug_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -591,8 +591,6 @@ CONFIG_VIRTIO_BALLOON=m 
CONFIG_VIRTIO_INPUT=y

CONFIG_VHOST_NET=m

CONFIG_VHOST_VSOCK=m

CONFIG_S390_CCW_IOMMU=y

CONFIG_S390_AP_IOMMU=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

arch/s390/configs/defconfig

+0 −2
Original line number Diff line number Diff line
@@ -580,8 +580,6 @@ CONFIG_VIRTIO_BALLOON=m 
CONFIG_VIRTIO_INPUT=y

CONFIG_VHOST_NET=m

CONFIG_VHOST_VSOCK=m

CONFIG_S390_CCW_IOMMU=y

CONFIG_S390_AP_IOMMU=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

drivers/iommu/Kconfig

+0 −16
Original line number Diff line number Diff line
@@ -417,22 +417,6 @@ config S390_IOMMU 
	help

	  Support for the IOMMU API for s390 PCI devices.



config S390_CCW_IOMMU

	bool "S390 CCW IOMMU Support"

	depends on S390 && CCW || COMPILE_TEST

	select IOMMU_API

	help

	  Enables bits of IOMMU API required by VFIO. The iommu_ops

	  is not implemented as it is not necessary for VFIO.



config S390_AP_IOMMU

	bool "S390 AP IOMMU Support"

	depends on S390 && ZCRYPT || COMPILE_TEST

	select IOMMU_API

	help

	  Enables bits of IOMMU API required by VFIO. The iommu_ops

	  is not implemented as it is not necessary for VFIO.



config MTK_IOMMU

	tristate "MediaTek IOMMU Support"

	depends on ARCH_MEDIATEK || COMPILE_TEST