Re: [PATCH 3/5] drm/xe/configfs: Always return consistent max_vfs value

["Piotr Piórkowski" <piotr.piorkowski@intel.com>]

Michal Wajdeczko <michal.wajdeczko@intel.com> wrote on śro [2026-sty-21 22:42:14 +0100]:
> The max_vfs parameter used by the Xe driver has its default value
> definition, but it could be altered by the module parameter or by
> the device specific configfs attribute.
> 
> To avoid mistakes or code duplication, always rely on the configfs
> helper (or stub), which will provide necessary fallback if needed.
> 
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
> ---
>  drivers/gpu/drm/xe/xe_configfs.c | 3 ++-
>  drivers/gpu/drm/xe/xe_configfs.h | 8 +++++++-
>  drivers/gpu/drm/xe/xe_sriov_pf.c | 4 +---
>  3 files changed, 10 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_configfs.c b/drivers/gpu/drm/xe/xe_configfs.c
> index 9f6251b1008b..a823b0bd4ebb 100644
> --- a/drivers/gpu/drm/xe/xe_configfs.c
> +++ b/drivers/gpu/drm/xe/xe_configfs.c
> @@ -15,6 +15,7 @@
>  
>  #include "instructions/xe_mi_commands.h"
>  #include "xe_configfs.h"
> +#include "xe_defaults.h"
>  #include "xe_gt_types.h"
>  #include "xe_hw_engine_types.h"
>  #include "xe_module.h"
> @@ -280,7 +281,7 @@ static const struct xe_config_device device_defaults = {
>  	.survivability_mode = false,
>  	.enable_psmi = false,
>  	.sriov = {
> -		.max_vfs = UINT_MAX,
> +		.max_vfs = XE_DEFAULT_MAX_VFS,
>  	},
>  };
>  
> diff --git a/drivers/gpu/drm/xe/xe_configfs.h b/drivers/gpu/drm/xe/xe_configfs.h
> index 510888354a7c..e0a555b871b3 100644
> --- a/drivers/gpu/drm/xe/xe_configfs.h
> +++ b/drivers/gpu/drm/xe/xe_configfs.h
> @@ -9,6 +9,7 @@
>  #include <linux/types.h>
>  
>  #include "xe_hw_engine_types.h"
> +#include "xe_module.h"
>  
>  struct pci_dev;
>  
> @@ -41,7 +42,12 @@ static inline u32 xe_configfs_get_ctx_restore_mid_bb(struct pci_dev *pdev, enum
>  						     const u32 **cs) { return 0; }
>  static inline u32 xe_configfs_get_ctx_restore_post_bb(struct pci_dev *pdev, enum xe_engine_class,
>  						      const u32 **cs) { return 0; }
> -static inline unsigned int xe_configfs_get_max_vfs(struct pci_dev *pdev) { return UINT_MAX; }
> +#ifdef CONFIG_PCI_IOV
> +static inline unsigned int xe_configfs_get_max_vfs(struct pci_dev *pdev)
> +{
> +	return xe_modparam.max_vfs;
> +}
> +#endif
>  #endif
>  
>  #endif
> diff --git a/drivers/gpu/drm/xe/xe_sriov_pf.c b/drivers/gpu/drm/xe/xe_sriov_pf.c
> index 6ce3c58e003c..33bd754d138f 100644
> --- a/drivers/gpu/drm/xe/xe_sriov_pf.c
> +++ b/drivers/gpu/drm/xe/xe_sriov_pf.c
> @@ -22,9 +22,7 @@
>  
>  static unsigned int wanted_max_vfs(struct xe_device *xe)
>  {
> -	if (IS_ENABLED(CONFIG_CONFIGFS_FS))
> -		return xe_configfs_get_max_vfs(to_pci_dev(xe->drm.dev));
> -	return xe_modparam.max_vfs;
> +	return xe_configfs_get_max_vfs(to_pci_dev(xe->drm.dev));
>  }
>  
>  static int pf_reduce_totalvfs(struct xe_device *xe, int limit)

Reviewed-by: Piotr Piórkowski <piotr.piorkowski@intel.com>

> -- 
> 2.47.1
> 

--