[PATCH] drm/amdgpu: Disable GPU reset on SRIOV before remove pci.

[Christian König]

Am 24.10.22 um 22:21 schrieb Gavin Wan:
>    The change of the commit f5c7e7797060 ("Adjust removal control
>    flow for smu v13_0_2") brought a bug on SRIOV envrionment. It
>    caused unloading amdgpu failed on Guest VM. The reason is that
>    the VF FLR was requested while unloading amdgpu driver, but the
>    VF FLR of SRIOV sequence is wrong while removing PCI device.
>
>    Fixes: f5c7e7797060 ("drm/amdgpu: Adjust removal control flow
>           for smu v13_0_2")

The Fixes line should look like a Signed-off-by or Acked-by line.

>
> Acked-by: Alex Deucher <alexander.deucher at amd.com>
> Signed-off-by: Gavin Wan <Gavin.Wan at amd.com>
> Change-Id: I1ff8dcbffd85d7f3d8267d660fd8292423d2f70f

The lines with : are noted in chronological order.

E.g. in this case that should be:

Signed-off-by: ....
Fixes: ...
Acked-by: ...
...



> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> index 16f6a313335e..ab0c856c13b0 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> @@ -2187,7 +2187,8 @@ amdgpu_pci_remove(struct pci_dev *pdev)
>   		pm_runtime_forbid(dev->dev);
>   	}
>   
> -	if (adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0, 2)) {
> +	if ((adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0, 2)) &&

Please drop the extra () as long as you don't want to explicitly have an 
assignment inside an "if", "for" or "while".

Regards,
Christian.

> +			!amdgpu_sriov_vf(adev)) {
>   		bool need_to_reset_gpu = false;
>   
>   		if (adev->gmc.xgmi.num_physical_nodes > 1) {