[PATCH 2/9] drm/xe: Stop setting drvdata to NULL

[Cavitt, Jonathan]

-----Original Message-----
From: Intel-xe <intel-xe-bounces at lists.freedesktop.org> On Behalf Of Lucas De Marchi
Sent: Friday, February 14, 2025 1:23 PM
To: intel-xe at lists.freedesktop.org
Cc: De Marchi, Lucas <lucas.demarchi at intel.com>
Subject: [PATCH 2/9] drm/xe: Stop setting drvdata to NULL
> 
> PCI subsystem is not supposed to call the remove() function when probe
> fails and doesn't need a protection for that. The only places checking
> for NULL drvdata, is on 2 sysfs files and they shouldn't be needed since
> the files are removed and reads on open fds just return an error.
> 
> For this protection the core driver implementation in
> drivers/base/dd.c:device_unbind_cleanup() already sets it to NULL, after
> the release of dev resources.
> 
> Remove the setting to NULL so it's possible to obtain the xe pointer
> from callbacks like the component unbind from device_unbind_cleanup(),
> i.e. after xe_pci_remove() already finished.
> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>

Looks good to me.  I see that we still have code paths in
pdev_to_xe_device that would cause it to return NULL in some cases,
but if you're certain that we'd never hit those cases with the removal
of the remove() function, then I'll take that at face value.
Reviewed-by: Jonathan Cavitt <jonathan.cavitt at intel.com>
-Jonathan Cavitt

> ---
>  drivers/gpu/drm/xe/xe_device_sysfs.c       | 6 ------
>  drivers/gpu/drm/xe/xe_pci.c                | 7 +------
>  drivers/gpu/drm/xe/xe_survivability_mode.c | 1 -
>  3 files changed, 1 insertion(+), 13 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_device_sysfs.c b/drivers/gpu/drm/xe/xe_device_sysfs.c
> index 7375937934fae..7efbd4c52791c 100644
> --- a/drivers/gpu/drm/xe/xe_device_sysfs.c
> +++ b/drivers/gpu/drm/xe/xe_device_sysfs.c
> @@ -32,9 +32,6 @@ vram_d3cold_threshold_show(struct device *dev,
>  	struct xe_device *xe = pdev_to_xe_device(pdev);
>  	int ret;
>  
> -	if (!xe)
> -		return -EINVAL;
> -
>  	xe_pm_runtime_get(xe);
>  	ret = sysfs_emit(buf, "%d\n", xe->d3cold.vram_threshold);
>  	xe_pm_runtime_put(xe);
> @@ -51,9 +48,6 @@ vram_d3cold_threshold_store(struct device *dev, struct device_attribute *attr,
>  	u32 vram_d3cold_threshold;
>  	int ret;
>  
> -	if (!xe)
> -		return -EINVAL;
> -
>  	ret = kstrtou32(buff, 0, &vram_d3cold_threshold);
>  	if (ret)
>  		return ret;
> diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
> index 70b697fde5b96..41ec6825b9bcc 100644
> --- a/drivers/gpu/drm/xe/xe_pci.c
> +++ b/drivers/gpu/drm/xe/xe_pci.c
> @@ -770,11 +770,7 @@ static int xe_info_init(struct xe_device *xe,
>  
>  static void xe_pci_remove(struct pci_dev *pdev)
>  {
> -	struct xe_device *xe;
> -
> -	xe = pdev_to_xe_device(pdev);
> -	if (!xe) /* driver load aborted, nothing to cleanup */
> -		return;
> +	struct xe_device *xe = pdev_to_xe_device(pdev);
>  
>  	if (IS_SRIOV_PF(xe))
>  		xe_pci_sriov_configure(pdev, 0);
> @@ -784,7 +780,6 @@ static void xe_pci_remove(struct pci_dev *pdev)
>  
>  	xe_device_remove(xe);
>  	xe_pm_runtime_fini(xe);
> -	pci_set_drvdata(pdev, NULL);
>  }
>  
>  /*
> diff --git a/drivers/gpu/drm/xe/xe_survivability_mode.c b/drivers/gpu/drm/xe/xe_survivability_mode.c
> index 02b4eadf84079..04a341606a7c5 100644
> --- a/drivers/gpu/drm/xe/xe_survivability_mode.c
> +++ b/drivers/gpu/drm/xe/xe_survivability_mode.c
> @@ -202,7 +202,6 @@ void xe_survivability_mode_remove(struct xe_device *xe)
>  	sysfs_remove_file(&dev->kobj, &dev_attr_survivability_mode.attr);
>  	xe_heci_gsc_fini(xe);
>  	kfree(survivability->info);
> -	pci_set_drvdata(pdev, NULL);
>  }
>  
>  /**
> -- 
> 2.48.1
> 
>