Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b936c96 authored by Alexey Kardashevskiy's avatar Alexey Kardashevskiy Committed by Alex Williamson
Browse files

drivers/vfio: Enable VFIO if EEH is not supported 



The existing vfio_pci_open() fails upon error returned from
vfio_spapr_pci_eeh_open(), which breaks POWER7's P5IOC2 PHB
support which this patch brings back.

The patch fixes the issue by dropping the return value of
vfio_spapr_pci_eeh_open().

Signed-off-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: default avatarGavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent 89a2edd6

drivers/vfio/pci/vfio_pci.c

+1 −5
Original line number Diff line number Diff line
@@ -200,11 +200,7 @@ static int vfio_pci_open(void *device_data) 
		if (ret)

			goto error;



		ret = vfio_spapr_pci_eeh_open(vdev->pdev);

		if (ret) {

			vfio_pci_disable(vdev);

			goto error;

		}

		vfio_spapr_pci_eeh_open(vdev->pdev);

	}

	vdev->refcnt++;

error:

drivers/vfio/vfio_spapr_eeh.c

+2 −2
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ 
#define DRIVER_DESC	"VFIO IOMMU SPAPR EEH"



/* We might build address mapping here for "fast" path later */

int vfio_spapr_pci_eeh_open(struct pci_dev *pdev)

void vfio_spapr_pci_eeh_open(struct pci_dev *pdev)

{

	return eeh_dev_open(pdev);

	eeh_dev_open(pdev);

}

EXPORT_SYMBOL_GPL(vfio_spapr_pci_eeh_open);

include/linux/vfio.h

+2 −3
Original line number Diff line number Diff line
@@ -100,15 +100,14 @@ extern long vfio_external_check_extension(struct vfio_group *group, 


struct pci_dev;

#ifdef CONFIG_EEH

extern int vfio_spapr_pci_eeh_open(struct pci_dev *pdev);

extern void vfio_spapr_pci_eeh_open(struct pci_dev *pdev);

extern void vfio_spapr_pci_eeh_release(struct pci_dev *pdev);

extern long vfio_spapr_iommu_eeh_ioctl(struct iommu_group *group,

				       unsigned int cmd,

				       unsigned long arg);

#else

static inline int vfio_spapr_pci_eeh_open(struct pci_dev *pdev)

static inline void vfio_spapr_pci_eeh_open(struct pci_dev *pdev)

{

	return 0;

}



static inline void vfio_spapr_pci_eeh_release(struct pci_dev *pdev)