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

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.com


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

drivers/vfio/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -20,11 +20,6 @@ config VFIO_IOMMU_SPAPR_TCE 
	depends on SPAPR_TCE_IOMMU

	default VFIO



config VFIO_SPAPR_EEH

	tristate

	depends on EEH && VFIO_IOMMU_SPAPR_TCE

	default VFIO



config VFIO_VIRQFD

	tristate

	select EVENTFD

drivers/vfio/pci/vfio_pci_core.c

+3 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <linux/vgaarb.h>

#include <linux/nospec.h>

#include <linux/sched/mm.h>

#if IS_ENABLED(CONFIG_VFIO_SPAPR_EEH)

#if IS_ENABLED(CONFIG_EEH)

#include <asm/eeh.h>

#endif
@@ -689,7 +689,7 @@ void vfio_pci_core_close_device(struct vfio_device *core_vdev) 
		vdev->sriov_pf_core_dev->vf_token->users--;

		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);

#endif

	vfio_pci_core_disable(vdev);
@@ -710,7 +710,7 @@ EXPORT_SYMBOL_GPL(vfio_pci_core_close_device); 
void vfio_pci_core_finish_enable(struct vfio_pci_core_device *vdev)

{

	vfio_pci_probe_mmaps(vdev);

#if IS_ENABLED(CONFIG_VFIO_SPAPR_EEH)

#if IS_ENABLED(CONFIG_EEH)

	eeh_dev_open(vdev->pdev);

#endif