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: Eric Farman <farman@linux.ibm.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/0-v2-eb322ce2e547+188f-rm_iommu_ccw_jgg@nvidia.com
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>

diff --git a/Documentation/s390/vfio-ap.rst b/Documentation/s390/vfio-ap.rst
index d46e98c7c1ec6cabe1316c7122cea4a33933927f..bb3f4c4e288563dc1ca850b8f7f86b7b7347a56e 100644 (file)
--- a/Documentation/s390/vfio-ap.rst
+++ b/Documentation/s390/vfio-ap.rst
@@ -551,7 +551,6 @@ These are the steps:
    * IOMMU_SUPPORT
    * S390
    * ZCRYPT
-   * S390_AP_IOMMU
    * VFIO
    * KVM
 

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 886948a6105bf3f35fbf98eb4067f2d6c3782f49..6dab9c1be508b9138ef7dde50db6db2ef9ff5a3a 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -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

diff --git a/arch/s390/configs/debug_defconfig b/arch/s390/configs/debug_defconfig
index 1b68156f20403e09d255328f5728b937d772fa2c..be3bf03bf361850d9a0abd5cdb6644878ebec6a4 100644 (file)
--- a/arch/s390/configs/debug_defconfig
+++ b/arch/s390/configs/debug_defconfig
@@ -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

diff --git a/arch/s390/configs/defconfig b/arch/s390/configs/defconfig
index b0643283bbdd8c0a19074b9ae2ed53eda7f1ee49..769c7eed8b6ac67f01ac781b6eac7721c21ce3b8 100644 (file)
--- a/arch/s390/configs/defconfig
+++ b/arch/s390/configs/defconfig
@@ -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

diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index db98c3f86e8c8b87f4c9c7e45b1f1b775f72c2f0..6de900776e24a6ebe27391b733b422ab29612a1c 100644 (file)
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -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