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().
Unified · Split
| @@ -200,11 +200,7 @@ static int vfio_pci_open(void *device_data) · 199 unmodified lines | |||
| 200 | if (ret) | 200 | if (ret) |
| 201 | goto error; | 201 | goto error; |
| 202 | 202 | ||
| 203 | ret = vfio_spapr_pci_eeh_open(vdev->pdev); | 203 | vfio_spapr_pci_eeh_open(vdev->pdev); |
| 204 | if (ret) { | ||
| 205 | vfio_pci_disable(vdev); | ||
| 206 | goto error; | ||
| 207 | } | ||
| 208 | } | 204 | } |
| 209 | vdev->refcnt++; | 205 | vdev->refcnt++; |
| 210 | error: | 206 | error: |
| @@ -19,9 +19,9 @@ · 18 unmodified lines | |||
| 19 | #define DRIVER_DESC "VFIO IOMMU SPAPR EEH" | 19 | #define DRIVER_DESC "VFIO IOMMU SPAPR EEH" |
| 20 | 20 | ||
| 21 | /* We might build address mapping here for "fast" path later */ | 21 | /* We might build address mapping here for "fast" path later */ |
| 22 | int vfio_spapr_pci_eeh_open(struct pci_dev *pdev) | 22 | void vfio_spapr_pci_eeh_open(struct pci_dev *pdev) |
| 23 | { | 23 | { |
| 24 | return eeh_dev_open(pdev); | 24 | eeh_dev_open(pdev); |
| 25 | } | 25 | } |
| 26 | EXPORT_SYMBOL_GPL(vfio_spapr_pci_eeh_open); | 26 | EXPORT_SYMBOL_GPL(vfio_spapr_pci_eeh_open); |
| 27 | 27 | ||
| @@ -100,15 +100,14 @@ extern long vfio_external_check_extension(struct vfio_group *group, · 99 unmodified lines | |||
| 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) |