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 9270D60263; Thu, 1 Aug 2024 00:21:21 +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=1722471681; cv=none; b=KG8y3SQS/+xbjC1LzOT+WIolQh78G6ZrTdjoYMI/wp6kPI2PAuYinpIN87hqC75o7ZCS+w/0gq6MabguFWb2VaVpHrnJkJY2TMwFMUOSvBIg+6kKLkfl/HgZCRmruY7YrkK9SGmbnvgNn5q4xn+XvQegDCgvaQe1jaK1JoAI7Nw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722471681; c=relaxed/simple; bh=xEO72KxPzj8doPGXZCu1twFzPUPOKM7kbozlBb8AOnU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EsRSbNMYbyv/Y7sg+Xcuph/FP1z5gC+CDz37Y0LwqdFhARKttkc1kPNkuw++QYkYUrs17tkw3sPta6tEmO8q+Tv2nBI9ZxHR1jKW3IoaGDpuDaUVsdCZ7b1fcQm7b4p9gb+VDDkopwpl07/1mxRas9bRRWA/MbCLKy0XY+iQVoM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bN1H55TW; 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="bN1H55TW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 735DDC4AF0C; Thu, 1 Aug 2024 00:21:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722471681; bh=xEO72KxPzj8doPGXZCu1twFzPUPOKM7kbozlBb8AOnU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bN1H55TWxwDeZB5iNVXCerkWMtMqwH4xQLu4x/hi0/WjXRCwmGn5C2SEdQOL4Tsqb KMe9F9IDiRk7iphtyp6HTeA+3epv0QYhJ4Fe4YFWK0sgfztFr8wo/lI8Gj1+P6cjb3 rfMlpdAdY11eArlg5hbzibC15BPS4URLGaUPTAmLGebsyylkFlFndVYwA5bAWQ/Cc+ Rwc38wVaO1DhjTzxCypKwMCNyttzxSipJi6ruIBnV5jcUl76V4ux9hhkHXEQOWdbeG D08sxUcY/F6U77ZXRLm2M9TIGmx7DK31A5O1SmDiqKRdQ84JBvANAC9qz7T6iZJ10w RnOS1RJZG83iw== 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, sunran001@208suo.com, jesse.zhang@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.6 03/83] drm/amdgpu/pm: Check the return value of smum_send_msg_to_smc Date: Wed, 31 Jul 2024 20:17:18 -0400 Message-ID: <20240801002107.3934037-3-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240801002107.3934037-1-sashal@kernel.org> References: <20240801002107.3934037-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.6.43 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