* [PATCH v2] iommu/s390: Get rid of S390_CCW_IOMMU and S390_AP_IOMMU
@ 2023-05-01 17:11 Jason Gunthorpe
2023-05-15 15:27 ` Alexander Gordeev
0 siblings, 1 reply; 2+ messages in thread
From: Jason Gunthorpe @ 2023-05-01 17:11 UTC (permalink / raw
To: Alexander Gordeev, Tony Krowiak, Christian Borntraeger,
Jonathan Corbet, Vasily Gorbik, Heiko Carstens, iommu,
Jason Herne, Joerg Roedel, linux-doc, linux-s390, Halil Pasic,
Robin Murphy, Sven Schnelle, Will Deacon
Cc: Eric Farman
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>
---
Documentation/s390/vfio-ap.rst | 1 -
arch/s390/Kconfig | 3 +--
arch/s390/configs/debug_defconfig | 2 --
arch/s390/configs/defconfig | 2 --
drivers/iommu/Kconfig | 16 ----------------
5 files changed, 1 insertion(+), 23 deletions(-)
v2:
- Include S390_AP_IOMMU too
v1: https://lore.kernel.org/r/0-v1-11a50d289ac9+b6-rm_iommu_ccw_jgg@nvidia.com
diff --git a/Documentation/s390/vfio-ap.rst b/Documentation/s390/vfio-ap.rst
index d46e98c7c1ec6c..bb3f4c4e288563 100644
--- 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 9809c74e124060..fe3c639d86e002 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -714,7 +714,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
@@ -726,7 +725,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 4ccf66d29fc24b..311d78e01c35d3 100644
--- 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 693297a2e89733..b9b86a3a6cff5f 100644
--- 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 db98c3f86e8c8b..6de900776e24a6 100644
--- 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
base-commit: 70c9fe047a3db21c3d6e0b4cd957fd91c57477fe
--
2.40.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] iommu/s390: Get rid of S390_CCW_IOMMU and S390_AP_IOMMU
2023-05-01 17:11 [PATCH v2] iommu/s390: Get rid of S390_CCW_IOMMU and S390_AP_IOMMU Jason Gunthorpe
@ 2023-05-15 15:27 ` Alexander Gordeev
0 siblings, 0 replies; 2+ messages in thread
From: Alexander Gordeev @ 2023-05-15 15:27 UTC (permalink / raw
To: Jason Gunthorpe
Cc: Tony Krowiak, Christian Borntraeger, Jonathan Corbet,
Vasily Gorbik, Heiko Carstens, iommu, Jason Herne, Joerg Roedel,
linux-doc, linux-s390, Halil Pasic, Robin Murphy, Sven Schnelle,
Will Deacon, Eric Farman
On Mon, May 01, 2023 at 02:11:28PM -0300, Jason Gunthorpe wrote:
> 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>
> ---
> Documentation/s390/vfio-ap.rst | 1 -
> arch/s390/Kconfig | 3 +--
> arch/s390/configs/debug_defconfig | 2 --
> arch/s390/configs/defconfig | 2 --
> drivers/iommu/Kconfig | 16 ----------------
> 5 files changed, 1 insertion(+), 23 deletions(-)
Applied,
Thanks you!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-05-15 15:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-01 17:11 [PATCH v2] iommu/s390: Get rid of S390_CCW_IOMMU and S390_AP_IOMMU Jason Gunthorpe
2023-05-15 15:27 ` Alexander Gordeev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).