Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 9b936c960f22954bfb89f2fefd8f96916bb42908

Authored by Alexey Kardashevskiy
Committed by Alex Williamson
1 parent 89a2edd62f
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

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>

Showing 3 changed files with 5 additions and 10 deletions Side-by-side Diff

drivers/vfio/pci/vfio_pci.c
Diff comments   View file @ 9b936c9
... ... @@ -200,11 +200,7 @@
200 200 if (ret)
201 201 goto error;
202 202  
203   - ret = vfio_spapr_pci_eeh_open(vdev->pdev);
204   - if (ret) {
205   - vfio_pci_disable(vdev);
206   - goto error;
207   - }
  203 + vfio_spapr_pci_eeh_open(vdev->pdev);
208 204 }
209 205 vdev->refcnt++;
210 206 error:
drivers/vfio/vfio_spapr_eeh.c
Diff comments   View file @ 9b936c9
... ... @@ -19,9 +19,9 @@
19 19 #define DRIVER_DESC "VFIO IOMMU SPAPR EEH"
20 20  
21 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 26 EXPORT_SYMBOL_GPL(vfio_spapr_pci_eeh_open);
27 27  
include/linux/vfio.h
Diff comments   View file @ 9b936c9
... ... @@ -100,15 +100,14 @@
100 100  
101 101 struct pci_dev;
102 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 104 extern void vfio_spapr_pci_eeh_release(struct pci_dev *pdev);
105 105 extern long vfio_spapr_iommu_eeh_ioctl(struct iommu_group *group,
106 106 unsigned int cmd,
107 107 unsigned long arg);
108 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 113 static inline void vfio_spapr_pci_eeh_release(struct pci_dev *pdev)