On 12/4/2025 10:41 AM, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> The Makefile logic for building xe_sriov_vfio.o was added incorrectly,
> as setting CONFIG_XE_VFIO_PCI=m means it doesn't get included into a
> built-in xe driver:
>
> ERROR: modpost: "xe_sriov_vfio_stop_copy_enter"
> [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
> ERROR: modpost: "xe_sriov_vfio_stop_copy_exit"
> [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
> ERROR: modpost: "xe_sriov_vfio_suspend_device"
> [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
> ERROR: modpost: "xe_sriov_vfio_wait_flr_done"
> [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
> ERROR: modpost: "xe_sriov_vfio_error" [drivers/vfio/pci/xe/xe-vfio-pci.ko]
> undefined!
> ERROR: modpost: "xe_sriov_vfio_resume_data_enter"
> [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
> ERROR: modpost: "xe_sriov_vfio_resume_device"
> [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
> ERROR: modpost: "xe_sriov_vfio_resume_data_exit"
> [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
> ERROR: modpost: "xe_sriov_vfio_data_write"
> [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
> ERROR: modpost: "xe_sriov_vfio_migration_supported"
> [drivers/vfio/pci/xe/xe-vfio-pci.ko] undefined!
> WARNING: modpost: suppressed 3 unresolved symbol warnings because there were
> too many)
>
> Check for CONFIG_XE_VFIO_PCI being enabled in the Makefile to decide whether
> to
> include the the object instead.
>
> Fixes: 17f22465c5a5 ("drm/xe/pf: Export helpers for VFIO")
> Signed-off-by: Arnd Bergmann <[email protected]>
Reviewed-by: Michal Wajdeczko <[email protected]>
> ---
> drivers/gpu/drm/xe/Makefile | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
> index dfc2ded01455..e5f3c2ec9e9a 100644
> --- a/drivers/gpu/drm/xe/Makefile
> +++ b/drivers/gpu/drm/xe/Makefile
> @@ -185,8 +185,8 @@ xe-$(CONFIG_PCI_IOV) += \
> xe_sriov_pf_sysfs.o \
> xe_tile_sriov_pf_debugfs.o
>
> -ifeq ($(CONFIG_PCI_IOV),y)
> - xe-$(CONFIG_XE_VFIO_PCI) += xe_sriov_vfio.o
> +ifdef CONFIG_XE_VFIO_PCI
> + xe-$(CONFIG_PCI_IOV) += xe_sriov_vfio.o
> endif
>
> # include helpers for tests even when XE is built-in
