| Message ID | 20201102180120.25319-1-fred.gao@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v3] vfio/pci: Bypass IGD init in case of -ENODEV | expand |
On Tue, 3 Nov 2020 02:01:20 +0800 Fred Gao <fred.gao@intel.com> wrote: > Bypass the IGD initialization when -ENODEV returns, > that should be the case if opregion is not available for IGD > or within discrete graphics device's option ROM, > or host/lpc bridge is not found. > > Then use of -ENODEV here means no special device resources found > which needs special care for VFIO, but we still allow other normal > device resource access. > > Cc: Zhenyu Wang <zhenyuw@linux.intel.com> > Cc: Xiong Zhang <xiong.y.zhang@intel.com> > Cc: Hang Yuan <hang.yuan@linux.intel.com> > Cc: Stuart Summers <stuart.summers@intel.com> > Signed-off-by: Fred Gao <fred.gao@intel.com> > --- > drivers/vfio/pci/vfio_pci.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to vfio for-linus branch for v5.10. Thanks, Alex > > diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c > index f634c81998bb..c88cf9937469 100644 > --- a/drivers/vfio/pci/vfio_pci.c > +++ b/drivers/vfio/pci/vfio_pci.c > @@ -341,7 +341,7 @@ static int vfio_pci_enable(struct vfio_pci_device *vdev) > pdev->vendor == PCI_VENDOR_ID_INTEL && > IS_ENABLED(CONFIG_VFIO_PCI_IGD)) { > ret = vfio_pci_igd_init(vdev); > - if (ret) { > + if (ret && ret != -ENODEV) { > pci_warn(pdev, "Failed to setup Intel IGD regions\n"); > goto disable_exit; > }
diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c index f634c81998bb..c88cf9937469 100644 --- a/drivers/vfio/pci/vfio_pci.c +++ b/drivers/vfio/pci/vfio_pci.c @@ -341,7 +341,7 @@ static int vfio_pci_enable(struct vfio_pci_device *vdev) pdev->vendor == PCI_VENDOR_ID_INTEL && IS_ENABLED(CONFIG_VFIO_PCI_IGD)) { ret = vfio_pci_igd_init(vdev); - if (ret) { + if (ret && ret != -ENODEV) { pci_warn(pdev, "Failed to setup Intel IGD regions\n"); goto disable_exit; }
Bypass the IGD initialization when -ENODEV returns, that should be the case if opregion is not available for IGD or within discrete graphics device's option ROM, or host/lpc bridge is not found. Then use of -ENODEV here means no special device resources found which needs special care for VFIO, but we still allow other normal device resource access. Cc: Zhenyu Wang <zhenyuw@linux.intel.com> Cc: Xiong Zhang <xiong.y.zhang@intel.com> Cc: Hang Yuan <hang.yuan@linux.intel.com> Cc: Stuart Summers <stuart.summers@intel.com> Signed-off-by: Fred Gao <fred.gao@intel.com> --- drivers/vfio/pci/vfio_pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)