[PATCH] lib/amdgpu: fix potential issue with bitwise AND operation

[Zhang, Jesse(Jie)]

[AMD Official Use Only - AMD Internal Distribution Only]

This patch is Reviewed-by: "Jesse.zhang at amd.com"

-----Original Message-----
From: vitaly.prosyak at amd.com <vitaly.prosyak at amd.com>
Sent: Wednesday, April 23, 2025 7:58 AM
To: igt-dev at lists.freedesktop.org
Cc: Prosyak, Vitaly <Vitaly.Prosyak at amd.com>; Zhang, Jesse(Jie) <Jesse.Zhang at amd.com>
Subject: [PATCH] lib/amdgpu: fix potential issue with bitwise AND operation

From: Vitaly Prosyak <vitaly.prosyak at amd.com>

The availability of reset mask options should be tested using a bitwise AND, but since we’ve only ever used a single option per call, this typo didn’t manifest as a bug.
Also, improve the debug message to provide more clarity when the requested reset type is not supported by the driver or firmware.

Cc: Jesse Zhang <jesse.zhang at amd.com>
Signed-off-by: Vitaly Prosyak <vitaly.prosyak at amd.com>
---
 lib/amdgpu/amd_ip_blocks.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/amdgpu/amd_ip_blocks.c b/lib/amdgpu/amd_ip_blocks.c index 4eaf639b3..d6764194d 100644
--- a/lib/amdgpu/amd_ip_blocks.c
+++ b/lib/amdgpu/amd_ip_blocks.c
@@ -1022,6 +1022,7 @@ is_reset_enable(enum amd_ip_block_type ip_type, uint32_t reset_type, const struc
        char cmd[256];
        FILE *fp;
        char buffer[128];
+       char buffer2[128];

        char *token, *buf;
        char reset_mask[32];
@@ -1047,6 +1048,7 @@ is_reset_enable(enum amd_ip_block_type ip_type, uint32_t reset_type, const struc
        buf = fgets(buffer, sizeof(buffer)-1, fp);

        if (buf != NULL) {
+               strcpy(buffer2, buffer);
                token = strtok(buf, " \n");
                while (token != NULL) {
                        for (i = 0; reset_arr[i].name != NULL; i++) { @@ -1062,11 +1064,12 @@ is_reset_enable(enum amd_ip_block_type ip_type, uint32_t reset_type, const struc
                igt_kmsg("***FAILURE fgets %s LINE %d FILE %s\n",
                                buffer, __LINE__, __FILE__);
        }
-       if (mask == reset_type)
+       if (mask & reset_type)
                enable = true;
        else
-               igt_kmsg("***FAILURE mask found 0x%x requested 0x%x operation is not supported LINE %d FILE %s\n",
-                               mask, reset_type, __LINE__, __FILE__);
+               igt_kmsg("***FAILURE mask found 0x%x(%s) requested 0x%x operation %s is not supported LINE %d FILE %s\n",
+                               mask, buffer2, reset_type, ip_type == AMD_IP_GFX ? "GFX": ip_type == AMD_IP_COMPUTE ? "COMPUTE" : "SDMA",
+                                               __LINE__, __FILE__);

        pclose(fp);

--
2.34.1