amdgpu: Don't print L2 status if there's nothing to print

If a 2nd fault comes in before the 1st is handled, the 1st fault will
clear out the FAULT STATUS registers before the 2nd fault is handled.
Thus we get a lot of zeroes. If status=0, just skip the L2 fault status
information, to avoid confusion of why some VM fault status prints in
dmesg are all zeroes.

Signed-off-by: Kent Russell <kent.russell@amd.com>
Reviewed-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_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
index 3c9b7f88a6cdd982f728927fd16a1cb2d5566e74..697599c46240ed9b7190765f4d48211ebc2f9fbf 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
@@ -175,7 +175,10 @@ static int gmc_v10_0_process_interrupt(struct amdgpu_device *adev,
                        addr, entry->client_id,
                        soc15_ih_clientid_name[entry->client_id]);
 
-       if (!amdgpu_sriov_vf(adev))
+       /* Only print L2 fault status if the status register could be read and
+        * contains useful information
+        */
+       if (status != 0)
                hub->vmhub_funcs->print_l2_protection_fault_status(adev,
                                                                   status);
 

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c
index 6e7cf551fe16b9e7ad704e6ec1c470f6f42a1d71..f893ab4c14df353ff345e9d72bdd398cacd8f1dc 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c
@@ -144,7 +144,10 @@ static int gmc_v11_0_process_interrupt(struct amdgpu_device *adev,
                dev_err(adev->dev, "  in page starting at address 0x%016llx from client %d\n",
                                addr, entry->client_id);
 
-               if (!amdgpu_sriov_vf(adev))
+               /* Only print L2 fault status if the status register could be read and
+                * contains useful information
+                */
+               if (status != 0)
                        hub->vmhub_funcs->print_l2_protection_fault_status(adev, status);
        }
 

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c
index d4a9a03e5fd0c6a943f635628895176f79fe5540..d22b027fd0bb8f5a58dcb260efc08ffb55540849 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c
@@ -137,7 +137,10 @@ static int gmc_v12_0_process_interrupt(struct amdgpu_device *adev,
                dev_err(adev->dev, "  in page starting at address 0x%016llx from client %d\n",
                                addr, entry->client_id);
 
-               if (!amdgpu_sriov_vf(adev))
+               /* Only print L2 fault status if the status register could be read and
+                * contains useful information
+                */
+               if (status != 0)
                        hub->vmhub_funcs->print_l2_protection_fault_status(adev, status);
        }
 

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index 010db0e586500c0127b9ca905645394356f817f7..f43ded8a0aabcb63c6d419b462e965f11db26942 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -672,6 +672,12 @@ static int gmc_v9_0_process_interrupt(struct amdgpu_device *adev,
            (amdgpu_ip_version(adev, GC_HWIP, 0) >= IP_VERSION(9, 4, 2)))
                return 0;
 
+       /* Only print L2 fault status if the status register could be read and
+        * contains useful information
+        */
+       if (!status)
+               return 0;
+
        if (!amdgpu_sriov_vf(adev))
                WREG32_P(hub->vm_l2_pro_fault_cntl, 1, ~1);