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

Commit 92d18a68 authored by Gavin Shan's avatar Gavin Shan Committed by Alex Williamson
Browse files

drivers/vfio: Fix EEH build error 



The VFIO related components could be built as dynamic modules.
Unfortunately, CONFIG_EEH can't be configured to "m". The patch
fixes the build errors when configuring VFIO related components
as dynamic modules as follows:

  CC [M]  drivers/vfio/vfio_iommu_spapr_tce.o
In file included from drivers/vfio/vfio.c:33:0:
include/linux/vfio.h:101:43: warning: ‘struct pci_dev’ declared \
inside parameter list [enabled by default]
   :
  WRAP    arch/powerpc/boot/zImage.pseries
  WRAP    arch/powerpc/boot/zImage.maple
  WRAP    arch/powerpc/boot/zImage.pmac
  WRAP    arch/powerpc/boot/zImage.epapr
  MODPOST 1818 modules
ERROR: ".vfio_spapr_iommu_eeh_ioctl" [drivers/vfio/vfio_iommu_spapr_tce.ko]\
undefined!
ERROR: ".vfio_spapr_pci_eeh_open" [drivers/vfio/pci/vfio-pci.ko] undefined!
ERROR: ".vfio_spapr_pci_eeh_release" [drivers/vfio/pci/vfio-pci.ko] undefined!

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

drivers/vfio/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -8,11 +8,17 @@ config VFIO_IOMMU_SPAPR_TCE 
	depends on VFIO && SPAPR_TCE_IOMMU

	default n



config VFIO_SPAPR_EEH

	tristate

	depends on EEH && VFIO_IOMMU_SPAPR_TCE

	default n



menuconfig VFIO

	tristate "VFIO Non-Privileged userspace driver framework"

	depends on IOMMU_API

	select VFIO_IOMMU_TYPE1 if X86

	select VFIO_IOMMU_SPAPR_TCE if (PPC_POWERNV || PPC_PSERIES)

	select VFIO_SPAPR_EEH if (PPC_POWERNV || PPC_PSERIES)

	select ANON_INODES

	help

	  VFIO provides a framework for secure userspace device drivers.

drivers/vfio/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_VFIO) += vfio.o

obj-$(CONFIG_VFIO_IOMMU_TYPE1) += vfio_iommu_type1.o

obj-$(CONFIG_VFIO_IOMMU_SPAPR_TCE) += vfio_iommu_spapr_tce.o

obj-$(CONFIG_EEH) += vfio_spapr_eeh.o

obj-$(CONFIG_VFIO_SPAPR_EEH) += vfio_spapr_eeh.o

obj-$(CONFIG_VFIO_PCI) += pci/

drivers/vfio/vfio_spapr_eeh.c

+3 −0
Original line number Diff line number Diff line
@@ -18,11 +18,13 @@ int vfio_spapr_pci_eeh_open(struct pci_dev *pdev) 
{

	return eeh_dev_open(pdev);

}

EXPORT_SYMBOL_GPL(vfio_spapr_pci_eeh_open);



void vfio_spapr_pci_eeh_release(struct pci_dev *pdev)

{

	eeh_dev_release(pdev);

}

EXPORT_SYMBOL_GPL(vfio_spapr_pci_eeh_release);



long vfio_spapr_iommu_eeh_ioctl(struct iommu_group *group,

				unsigned int cmd, unsigned long arg)
@@ -85,3 +87,4 @@ long vfio_spapr_iommu_eeh_ioctl(struct iommu_group *group, 


	return ret;

}

EXPORT_SYMBOL(vfio_spapr_iommu_eeh_ioctl);

include/linux/vfio.h

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ extern int vfio_external_user_iommu_id(struct vfio_group *group); 
extern long vfio_external_check_extension(struct vfio_group *group,

					  unsigned long arg);



struct pci_dev;

#ifdef CONFIG_EEH

extern int vfio_spapr_pci_eeh_open(struct pci_dev *pdev);

extern void vfio_spapr_pci_eeh_release(struct pci_dev *pdev);