[PATCH] drm/amdgpu: Enable doorbell selfring after resize FB BAR

[Christian König]

Am 25.04.23 um 16:54 schrieb Shane Xiao:
> [Why]
> The selfring doorbell aperture will change when resize FB
> BAR successfully during gmc sw init, we should reorder
> the sequence of enabling doorbell selfring aperture.
>
> [How]
> Move enable_doorbell_selfring_aperture from *_common_hw_init
> to *_common_late_init.
>
> This fixes the potential issue that GPU ring its own
> doorbell when this device is in translated mode when
> iommu is on.
>
> v2: Remove *_enable_doorbell_aperture functions (Christian)
> v3: Add comments to note that why we need enable doorbell
>      selfring late (Christian)
>
> Signed-off-by: Shane Xiao <shane.xiao at amd.com>
> Signed-off-by: Aaron Liu <aaron.liu at amd.com>
> Tested-by: Xiaomeng Hou <Xiaomeng.Hou at amd.com>

Reviewed-by: Christian König <christian.koenig at amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/nv.c    | 23 +++++++++++++----------
>   drivers/gpu/drm/amd/amdgpu/soc15.c | 25 +++++++++++++++----------
>   drivers/gpu/drm/amd/amdgpu/soc21.c | 23 +++++++++++++----------
>   3 files changed, 41 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c
> index dabeeab2f2ad..3cc068974bcd 100644
> --- a/drivers/gpu/drm/amd/amdgpu/nv.c
> +++ b/drivers/gpu/drm/amd/amdgpu/nv.c
> @@ -531,13 +531,6 @@ static void nv_program_aspm(struct amdgpu_device *adev)
>   
>   }
>   
> -static void nv_enable_doorbell_aperture(struct amdgpu_device *adev,
> -					bool enable)
> -{
> -	adev->nbio.funcs->enable_doorbell_aperture(adev, enable);
> -	adev->nbio.funcs->enable_doorbell_selfring_aperture(adev, enable);
> -}
> -
>   const struct amdgpu_ip_block_version nv_common_ip_block =
>   {
>   	.type = AMD_IP_BLOCK_TYPE_COMMON,
> @@ -999,6 +992,11 @@ static int nv_common_late_init(void *handle)
>   		}
>   	}
>   
> +	/* Enable selfring doorbell aperture late because doorbell BAR
> +	 * aperture will change if resize BAR successfully in gmc sw_init.
> +	 */
> +	adev->nbio.funcs->enable_doorbell_selfring_aperture(adev, true);
> +
>   	return 0;
>   }
>   
> @@ -1038,7 +1036,7 @@ static int nv_common_hw_init(void *handle)
>   	if (adev->nbio.funcs->remap_hdp_registers && !amdgpu_sriov_vf(adev))
>   		adev->nbio.funcs->remap_hdp_registers(adev);
>   	/* enable the doorbell aperture */
> -	nv_enable_doorbell_aperture(adev, true);
> +	adev->nbio.funcs->enable_doorbell_aperture(adev, true);
>   
>   	return 0;
>   }
> @@ -1047,8 +1045,13 @@ static int nv_common_hw_fini(void *handle)
>   {
>   	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
>   
> -	/* disable the doorbell aperture */
> -	nv_enable_doorbell_aperture(adev, false);
> +	/* Disable the doorbell aperture and selfring doorbell aperture
> +	 * separately in hw_fini because nv_enable_doorbell_aperture
> +	 * has been removed and there is no need to delay disabling
> +	 * selfring doorbell.
> +	 */
> +	adev->nbio.funcs->enable_doorbell_aperture(adev, false);
> +	adev->nbio.funcs->enable_doorbell_selfring_aperture(adev, false);
>   
>   	return 0;
>   }
> diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
> index 4d1487a9836c..3221522e71e8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/soc15.c
> +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
> @@ -619,13 +619,6 @@ static void soc15_program_aspm(struct amdgpu_device *adev)
>   		adev->nbio.funcs->program_aspm(adev);
>   }
>   
> -static void soc15_enable_doorbell_aperture(struct amdgpu_device *adev,
> -					   bool enable)
> -{
> -	adev->nbio.funcs->enable_doorbell_aperture(adev, enable);
> -	adev->nbio.funcs->enable_doorbell_selfring_aperture(adev, enable);
> -}
> -
>   const struct amdgpu_ip_block_version vega10_common_ip_block =
>   {
>   	.type = AMD_IP_BLOCK_TYPE_COMMON,
> @@ -1125,6 +1118,11 @@ static int soc15_common_late_init(void *handle)
>   	if (amdgpu_sriov_vf(adev))
>   		xgpu_ai_mailbox_get_irq(adev);
>   
> +	/* Enable selfring doorbell aperture late because doorbell BAR
> +	 * aperture will change if resize BAR successfully in gmc sw_init.
> +	 */
> +	adev->nbio.funcs->enable_doorbell_selfring_aperture(adev, true);
> +
>   	return 0;
>   }
>   
> @@ -1182,7 +1180,8 @@ static int soc15_common_hw_init(void *handle)
>   		adev->nbio.funcs->remap_hdp_registers(adev);
>   
>   	/* enable the doorbell aperture */
> -	soc15_enable_doorbell_aperture(adev, true);
> +	adev->nbio.funcs->enable_doorbell_aperture(adev, true);
> +
>   	/* HW doorbell routing policy: doorbell writing not
>   	 * in SDMA/IH/MM/ACV range will be routed to CP. So
>   	 * we need to init SDMA doorbell range prior
> @@ -1198,8 +1197,14 @@ static int soc15_common_hw_fini(void *handle)
>   {
>   	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
>   
> -	/* disable the doorbell aperture */
> -	soc15_enable_doorbell_aperture(adev, false);
> +	/* Disable the doorbell aperture and selfring doorbell aperture
> +	 * separately in hw_fini because soc15_enable_doorbell_aperture
> +	 * has been removed and there is no need to delay disabling
> +	 * selfring doorbell.
> +	 */
> +	adev->nbio.funcs->enable_doorbell_aperture(adev, false);
> +	adev->nbio.funcs->enable_doorbell_selfring_aperture(adev, false);
> +
>   	if (amdgpu_sriov_vf(adev))
>   		xgpu_ai_mailbox_put_irq(adev);
>   
> diff --git a/drivers/gpu/drm/amd/amdgpu/soc21.c b/drivers/gpu/drm/amd/amdgpu/soc21.c
> index 7d59303ca2f9..0f82b8e83acb 100644
> --- a/drivers/gpu/drm/amd/amdgpu/soc21.c
> +++ b/drivers/gpu/drm/amd/amdgpu/soc21.c
> @@ -450,13 +450,6 @@ static void soc21_program_aspm(struct amdgpu_device *adev)
>   		adev->nbio.funcs->program_aspm(adev);
>   }
>   
> -static void soc21_enable_doorbell_aperture(struct amdgpu_device *adev,
> -					bool enable)
> -{
> -	adev->nbio.funcs->enable_doorbell_aperture(adev, enable);
> -	adev->nbio.funcs->enable_doorbell_selfring_aperture(adev, enable);
> -}
> -
>   const struct amdgpu_ip_block_version soc21_common_ip_block =
>   {
>   	.type = AMD_IP_BLOCK_TYPE_COMMON,
> @@ -764,6 +757,11 @@ static int soc21_common_late_init(void *handle)
>   			amdgpu_irq_get(adev, &adev->nbio.ras_err_event_athub_irq, 0);
>   	}
>   
> +	/* Enable selfring doorbell aperture late because doorbell BAR
> +	 * aperture will change if resize BAR successfully in gmc sw_init.
> +	 */
> +	adev->nbio.funcs->enable_doorbell_selfring_aperture(adev, true);
> +
>   	return 0;
>   }
>   
> @@ -797,7 +795,7 @@ static int soc21_common_hw_init(void *handle)
>   	if (adev->nbio.funcs->remap_hdp_registers)
>   		adev->nbio.funcs->remap_hdp_registers(adev);
>   	/* enable the doorbell aperture */
> -	soc21_enable_doorbell_aperture(adev, true);
> +	adev->nbio.funcs->enable_doorbell_aperture(adev, true);
>   
>   	return 0;
>   }
> @@ -806,8 +804,13 @@ static int soc21_common_hw_fini(void *handle)
>   {
>   	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
>   
> -	/* disable the doorbell aperture */
> -	soc21_enable_doorbell_aperture(adev, false);
> +	/* Disable the doorbell aperture and selfring doorbell aperture
> +	 * separately in hw_fini because soc21_enable_doorbell_aperture
> +	 * has been removed and there is no need to delay disabling
> +	 * selfring doorbell.
> +	 */
> +	adev->nbio.funcs->enable_doorbell_aperture(adev, false);
> +	adev->nbio.funcs->enable_doorbell_selfring_aperture(adev, false);
>   
>   	if (amdgpu_sriov_vf(adev)) {
>   		xgpu_nv_mailbox_put_irq(adev);