drm/amdgpu: fix and cleanup gmc_v7_0_flush_gpu_tlb_pasid

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 invalidate instead of just restting the first one.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Shashank Sharma <shashank.sharma@amd.com>
Acked-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
index 6a6929ac27482d76ca5eefff06e8410572182f28..0219a4e00bb7b35e8b3bf8799cbb6586357c0152 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
@@ -33,6 +33,7 @@
 #include "amdgpu_ucode.h"
 #include "amdgpu_amdkfd.h"
 #include "amdgpu_gem.h"
+#include "amdgpu_reset.h"
 
 #include "bif/bif_4_1_d.h"
 #include "bif/bif_4_1_sh_mask.h"
@@ -426,23 +427,23 @@ static int gmc_v7_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;
 }