drm/amd/amdgpu: Fix a less than zero check on a uint32_t struct field

Currently the error check from the call to mes_v12_inv_tlb_convert_hub_id
is always false because a uint32_t struct field hub_id is being used to
to perform the less than zero error check. Fix this by using the int
variable ret to perform the check.

Fixes: 87e65052616c ("drm/amd/amdgpu : Use the MES INV_TLBS API for tlb invalidation on gfx12")
Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c b/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c
index cd5c966cee957de0bf15df4e359be4a8930040fe..ff5df28b57ec027b5126de46fb0ba37daca7dcdd 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c
@@ -899,6 +899,7 @@ static int mes_v12_0_inv_tlbs_pasid(struct amdgpu_mes *mes,
                                    struct mes_inv_tlbs_pasid_input *input)
 {
        union MESAPI__INV_TLBS mes_inv_tlbs;
+       int ret;
 
        memset(&mes_inv_tlbs, 0, sizeof(mes_inv_tlbs));
 
@@ -911,9 +912,10 @@ static int mes_v12_0_inv_tlbs_pasid(struct amdgpu_mes *mes,
        mes_inv_tlbs.invalidate_tlbs.inv_sel_id = input->pasid;
 
        /*convert amdgpu_mes_hub_id to mes expected hub_id */
-       mes_inv_tlbs.invalidate_tlbs.hub_id = mes_v12_inv_tlb_convert_hub_id(input->hub_id);
-       if (mes_inv_tlbs.invalidate_tlbs.hub_id < 0)
+       ret = mes_v12_inv_tlb_convert_hub_id(input->hub_id);
+       if (ret < 0)
                return -EINVAL;
+       mes_inv_tlbs.invalidate_tlbs.hub_id = ret;
        return mes_v12_0_submit_pkt_and_poll_completion(mes, AMDGPU_MES_KIQ_PIPE,
                        &mes_inv_tlbs, sizeof(mes_inv_tlbs),
                        offsetof(union MESAPI__INV_TLBS, api_status));