[PATCH v6 10/11] drm/xe/configfs: Only allow configurations for supported devices

[Rodrigo Vivi]

On Thu, Jul 31, 2025 at 09:33:38PM +0200, Michal Wajdeczko wrote:
> Since we already lookup for the real PCI device before we allow
> to create its directory config, we might also check if the found
> device matches our driver PCI ID list. This will prevent creation
> of the directory configs for the unsupported devices.
> 
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
> Cc: Lucas De Marchi <lucas.demarchi at intel.com>
> Cc: John Harrison <John.C.Harrison at Intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>

Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>

> ---
> v2: rebased
> v3: don't use -ECANCELED, print message instead (Rodrigo, John)
> ---
>  drivers/gpu/drm/xe/xe_configfs.c | 19 +++++++++++++++++++
>  1 file changed, 19 insertions(+)
> 
> diff --git a/drivers/gpu/drm/xe/xe_configfs.c b/drivers/gpu/drm/xe/xe_configfs.c
> index 5f145ccdf535..0e2da7907afc 100644
> --- a/drivers/gpu/drm/xe/xe_configfs.c
> +++ b/drivers/gpu/drm/xe/xe_configfs.c
> @@ -275,11 +275,22 @@ static const struct config_item_type xe_config_device_type = {
>  	.ct_owner	= THIS_MODULE,
>  };
>  
> +static const struct xe_device_desc *xe_match_desc(struct pci_dev *pdev)
> +{
> +	struct device_driver *driver = driver_find("xe", &pci_bus_type);
> +	struct pci_driver *drv = to_pci_driver(driver);
> +	const struct pci_device_id *ids = drv ? drv->id_table : NULL;
> +	const struct pci_device_id *found = pci_match_id(ids, pdev);
> +
> +	return found ? (const void *)found->driver_data : NULL;
> +}
> +
>  static struct config_group *xe_config_make_device_group(struct config_group *group,
>  							const char *name)
>  {
>  	unsigned int domain, bus, slot, function;
>  	struct xe_config_group_device *dev;
> +	const struct xe_device_desc *match;
>  	struct pci_dev *pdev;
>  	char canonical[16];
>  	int ret;
> @@ -297,8 +308,16 @@ static struct config_group *xe_config_make_device_group(struct config_group *gro
>  	pdev = pci_get_domain_bus_and_slot(domain, bus, PCI_DEVFN(slot, function));
>  	if (!pdev)
>  		return ERR_PTR(-ENODEV);
> +
> +	match = xe_match_desc(pdev);
> +	if (!match)
> +		pci_info(pdev, "xe driver does not support configuration of this device\n");
> +
>  	pci_dev_put(pdev);
>  
> +	if (!match)
> +		return ERR_PTR(-ENOENT);
> +
>  	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
>  	if (!dev)
>  		return ERR_PTR(-ENOMEM);
> -- 
> 2.47.1
>