From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2818E148FF2; Thu, 1 Aug 2024 00:08:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722470935; cv=none; b=gzKoJD+n3EzthEj4ddac1E1JvT+gOa7Meuf9q8QL5ikXobGgIvYwk3dTU16iTg2jY+80FAQNbKKwFvSfk+xbk7edVRrgLyovzhfjoxfB2rjqE9+ds+v+12KO+Bh2YkyCFW8zlu7puqvp0nVHUY51ejRW/QlTKprty53VkM9rm9k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722470935; c=relaxed/simple; bh=xEO72KxPzj8doPGXZCu1twFzPUPOKM7kbozlBb8AOnU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VLzFCa+l+7TLWFYnU/ZHpy/4SCbmoEblLcARBQWfAq3A0r7lGvoZIa6lZlqEtXCrzbS8IouessGzZPtavfLNle1PFDoo1XUle6xdQNyQgoT5mq6BJid6c0oY+PgfibYViU8PdFfX52JuH5+31iO0nB4VukvXK5OU7Q4fY7+i7iU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=h48+52+B; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="h48+52+B" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F2AD3C4AF12; Thu, 1 Aug 2024 00:08:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722470934; bh=xEO72KxPzj8doPGXZCu1twFzPUPOKM7kbozlBb8AOnU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h48+52+BC0TQ/YhSxXeVrrlZ8fVTX1MLKl0tZ6RAbKcGq0WOV8bnrqYkzCKKj29Aa 3ZRuu4nD9b/PU0NvqKTs1RvOZXxoBd969WYK+a/wa9MkpY1OHK18bvyilKTHD9w4Zw SzVi6QF8RpCvX32i5PhaHx98dR9Z68GnSUVl5UYe5O+7gFhBaTq2pDzqSR0US2rlnR NgzuJmowxLkESove0CsYOjMw7AFlSZ6xeRUP7SNahxHNab36ixdXhwGKZnhx1o56Jv IvMUYADTsC98OdCitzpkfTfaJ+GUPbBEPjIZnCA7pGP/5fa+85kZKpHAagUTR7u0/A RPG57jjMIcLvg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ma Jun , Tim Huang , Alex Deucher , Sasha Levin , kenneth.feng@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, jesse.zhang@amd.com, kevinyang.wang@amd.com, sunran001@208suo.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.10 004/121] drm/amdgpu/pm: Check the return value of smum_send_msg_to_smc Date: Wed, 31 Jul 2024 19:59:02 -0400 Message-ID: <20240801000834.3930818-4-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240801000834.3930818-1-sashal@kernel.org> References: <20240801000834.3930818-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.10.2 Content-Transfer-Encoding: 8bit From: Ma Jun [ Upstream commit 579f0c21baec9e7506b6bb3f60f0a9b6d07693b4 ] Check the return value of smum_send_msg_to_smc, otherwise we might use an uninitialized variable "now" Signed-off-by: Ma Jun Reviewed-by: Tim Huang Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c index 02ba68d7c6546..0b181bc8931c8 100644 --- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c +++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c @@ -1036,7 +1036,9 @@ static int smu10_print_clock_levels(struct pp_hwmgr *hwmgr, switch (type) { case PP_SCLK: - smum_send_msg_to_smc(hwmgr, PPSMC_MSG_GetGfxclkFrequency, &now); + ret = smum_send_msg_to_smc(hwmgr, PPSMC_MSG_GetGfxclkFrequency, &now); + if (ret) + return ret; /* driver only know min/max gfx_clk, Add level 1 for all other gfx clks */ if (now == data->gfx_max_freq_limit/100) @@ -1057,7 +1059,9 @@ static int smu10_print_clock_levels(struct pp_hwmgr *hwmgr, i == 2 ? "*" : ""); break; case PP_MCLK: - smum_send_msg_to_smc(hwmgr, PPSMC_MSG_GetFclkFrequency, &now); + ret = smum_send_msg_to_smc(hwmgr, PPSMC_MSG_GetFclkFrequency, &now); + if (ret) + return ret; for (i = 0; i < mclk_table->count; i++) size += sprintf(buf + size, "%d: %uMhz %s\n", -- 2.43.0