diff options
author | Alexey Kardashevskiy <aik@ozlabs.ru> | 2014-08-08 12:39:16 -0400 |
---|---|---|
committer | Alex Williamson <alex.williamson@redhat.com> | 2014-08-08 12:39:16 -0400 |
commit | 9b936c960f22954bfb89f2fefd8f96916bb42908 (patch) | |
tree | 2aa14e34174866e259a9336b02682ec9b2844225 /include/linux/vfio.h | |
parent | 89a2edd62fe5983fa8648f8a3c3cd025c6aea584 (diff) |
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: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Diffstat (limited to 'include/linux/vfio.h')
-rw-r--r-- | include/linux/vfio.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/vfio.h b/include/linux/vfio.h index 224128a96b7f..d3204115f15d 100644 --- a/include/linux/vfio.h +++ b/include/linux/vfio.h | |||
@@ -100,15 +100,14 @@ extern long vfio_external_check_extension(struct vfio_group *group, | |||
100 | 100 | ||
101 | struct pci_dev; | 101 | struct pci_dev; |
102 | #ifdef CONFIG_EEH | 102 | #ifdef CONFIG_EEH |
103 | extern int vfio_spapr_pci_eeh_open(struct pci_dev *pdev); | 103 | extern void vfio_spapr_pci_eeh_open(struct pci_dev *pdev); |
104 | extern void vfio_spapr_pci_eeh_release(struct pci_dev *pdev); | 104 | extern void vfio_spapr_pci_eeh_release(struct pci_dev *pdev); |
105 | extern long vfio_spapr_iommu_eeh_ioctl(struct iommu_group *group, | 105 | extern long vfio_spapr_iommu_eeh_ioctl(struct iommu_group *group, |
106 | unsigned int cmd, | 106 | unsigned int cmd, |
107 | unsigned long arg); | 107 | unsigned long arg); |
108 | #else | 108 | #else |
109 | static inline int vfio_spapr_pci_eeh_open(struct pci_dev *pdev) | 109 | static inline void vfio_spapr_pci_eeh_open(struct pci_dev *pdev) |
110 | { | 110 | { |
111 | return 0; | ||
112 | } | 111 | } |
113 | 112 | ||
114 | static inline void vfio_spapr_pci_eeh_release(struct pci_dev *pdev) | 113 | static inline void vfio_spapr_pci_eeh_release(struct pci_dev *pdev) |