On Tue, Sep 5, 2023 at 3:00 AM Christian König
<ckoenig.leichtzumerken@xxxxxxxxx> wrote:
>
> Testing for reset is pointless since the reset can start right after the
> test. Grab the reset semaphore instead.
>
> The same PASID can be used by more than once VMID, build a mask of VMIDs
> to reset instead of just restting the first one.
>
> Signed-off-by: Christian König <christian.koenig@xxxxxxx>
Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx>
> ---
> drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
> index 5af235202513..2d51531a1f2d 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
> @@ -31,6 +31,7 @@
> #include "amdgpu_ucode.h"
> #include "amdgpu_amdkfd.h"
> #include "amdgpu_gem.h"
> +#include "amdgpu_reset.h"
>
> #include "gmc/gmc_8_1_d.h"
> #include "gmc/gmc_8_1_sh_mask.h"
> @@ -616,25 +617,24 @@ static int gmc_v8_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,
> uint16_t pasid, uint32_t flush_type,
> bool all_hub, uint32_t inst)
> {
> + u32 mask = 0x0;
> int vmid;
> - unsigned int tmp;
>
> - if (amdgpu_in_reset(adev))
> - return -EIO;
> + if(!down_read_trylock(&adev->reset_domain->sem))
> + return 0;
>
> for (vmid = 1; vmid < 16; vmid++) {
> + u32 tmp = RREG32(mmATC_VMID0_PASID_MAPPING + vmid);
>
> - tmp = RREG32(mmATC_VMID0_PASID_MAPPING + vmid);
> if ((tmp & ATC_VMID0_PASID_MAPPING__VALID_MASK) &&
> - (tmp & ATC_VMID0_PASID_MAPPING__PASID_MASK) == pasid) {
> - WREG32(mmVM_INVALIDATE_REQUEST, 1 << vmid);
> - RREG32(mmVM_INVALIDATE_RESPONSE);
> - break;
> - }
> + (tmp & ATC_VMID0_PASID_MAPPING__PASID_MASK) == pasid)
> + mask |= 1 << vmid;
> }
>
> + WREG32(mmVM_INVALIDATE_REQUEST, mask);
> + RREG32(mmVM_INVALIDATE_RESPONSE);
> + up_read(&adev->reset_domain->sem);
> return 0;
> -
> }
>
> /*
> --
> 2.34.1
>
