Commit 20601c45 authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Alex Williamson

vfio: Remove CONFIG_VFIO_SPAPR_EEH

We don't need a kconfig symbol for this, just directly test CONFIG_EEH in
the few places that need it.
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/4-v5-fc5346cacfd4+4c482-vfio_modules_jgg@nvidia.comSigned-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent e276e258
...@@ -20,11 +20,6 @@ config VFIO_IOMMU_SPAPR_TCE ...@@ -20,11 +20,6 @@ config VFIO_IOMMU_SPAPR_TCE
depends on SPAPR_TCE_IOMMU depends on SPAPR_TCE_IOMMU
default VFIO default VFIO
config VFIO_SPAPR_EEH
tristate
depends on EEH && VFIO_IOMMU_SPAPR_TCE
default VFIO
config VFIO_VIRQFD config VFIO_VIRQFD
tristate tristate
select EVENTFD select EVENTFD
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include <linux/vgaarb.h> #include <linux/vgaarb.h>
#include <linux/nospec.h> #include <linux/nospec.h>
#include <linux/sched/mm.h> #include <linux/sched/mm.h>
#if IS_ENABLED(CONFIG_VFIO_SPAPR_EEH) #if IS_ENABLED(CONFIG_EEH)
#include <asm/eeh.h> #include <asm/eeh.h>
#endif #endif
...@@ -689,7 +689,7 @@ void vfio_pci_core_close_device(struct vfio_device *core_vdev) ...@@ -689,7 +689,7 @@ void vfio_pci_core_close_device(struct vfio_device *core_vdev)
vdev->sriov_pf_core_dev->vf_token->users--; vdev->sriov_pf_core_dev->vf_token->users--;
mutex_unlock(&vdev->sriov_pf_core_dev->vf_token->lock); mutex_unlock(&vdev->sriov_pf_core_dev->vf_token->lock);
} }
#if IS_ENABLED(CONFIG_VFIO_SPAPR_EEH) #if IS_ENABLED(CONFIG_EEH)
eeh_dev_release(vdev->pdev); eeh_dev_release(vdev->pdev);
#endif #endif
vfio_pci_core_disable(vdev); vfio_pci_core_disable(vdev);
...@@ -710,7 +710,7 @@ EXPORT_SYMBOL_GPL(vfio_pci_core_close_device); ...@@ -710,7 +710,7 @@ EXPORT_SYMBOL_GPL(vfio_pci_core_close_device);
void vfio_pci_core_finish_enable(struct vfio_pci_core_device *vdev) void vfio_pci_core_finish_enable(struct vfio_pci_core_device *vdev)
{ {
vfio_pci_probe_mmaps(vdev); vfio_pci_probe_mmaps(vdev);
#if IS_ENABLED(CONFIG_VFIO_SPAPR_EEH) #if IS_ENABLED(CONFIG_EEH)
eeh_dev_open(vdev->pdev); eeh_dev_open(vdev->pdev);
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment