From nobody Fri Dec 19 20:42:15 2025 Received: from cstnet.cn (smtp81.cstnet.cn [159.226.251.81]) (using TLSv1.2 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1A05528B4EC; Tue, 15 Apr 2025 11:56:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.226.251.81 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744718197; cv=none; b=qgSzj+dUSBtqIWNUaEo8NgAkaNIMNlXONxIU9OYpqHMNgoF6e5ZmjftV5lepM7VXS25ab4GHioTrsc15N+NkRzihyFxhrf17tpfCLuRdxPbkDQPtxbwCet8L4ju/1BwubTHv1SQaCdbbOEuybNza1GBqQMeJbLsl8OUyyL4jnFc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744718197; c=relaxed/simple; bh=TWaCut/RExePpx4QTK5CSr1MZZMK62Zu9FZPK47hfJE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=LSsYBt7Zn90x2KQHYQTxy+jsS1W9hQfaCOXsEk/bxzpKJZE6ygjbihi1gS6gdgOKiV5g3u8NIIGlVOD51XbYbgJz/u2+5qz+NLHVbCwuu4iYwreVv8w2Pw5LOetSHbjz5fxCqpTb5w54wY2W8fuvWI6LJXQT5RMDZhXJgqFBnPY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iscas.ac.cn; spf=pass smtp.mailfrom=iscas.ac.cn; arc=none smtp.client-ip=159.226.251.81 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iscas.ac.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=iscas.ac.cn Received: from localhost.localdomain (unknown [124.16.141.245]) by APP-03 (Coremail) with SMTP id rQCowAD3oD1oSf5nr+UACQ--.19460S2; Tue, 15 Apr 2025 19:56:26 +0800 (CST) From: Wentao Liang To: kenneth.feng@amd.com, alexander.deucher@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, simona@ffwll.ch Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Wentao Liang , stable@vger.kernel.org Subject: [PATCH] drm/amd/pm/powerplay/smumgr/vegam_smumgr: Fix error handling in vegam_populate_smc_boot_level() Date: Tue, 15 Apr 2025 19:56:00 +0800 Message-ID: <20250415115601.3238-1-vulab@iscas.ac.cn> X-Mailer: git-send-email 2.42.0.windows.2 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: rQCowAD3oD1oSf5nr+UACQ--.19460S2 X-Coremail-Antispam: 1UD129KBjvJXoW7Ww48Jr4UWFWkJryUGFWfKrg_yoW8ur1xpF 9xCr9Ivwn5JanxJFnrtF1IvF1rZ3W8JFWrCF17C340vw1Yqr1UZr4YyFyavayUCFyxGwsI qr17Z3W5ur4I9aDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9014x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26r1j6r1xM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4j 6F4UM28EF7xvwVC2z280aVAFwI0_Cr1j6rxdM28EF7xvwVC2z280aVCY1x0267AKxVW0oV Cq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0 I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Gr0_Cr1lOx8S6xCaFVCjc4AY6r1j6r 4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwACI402YVCY1x02628v n2kIc2xKxwCY1x0262kKe7AKxVWUtVW8ZwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7x kEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E 67AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCw CI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1x MIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIda VFxhVjvjDU0xZFpf9x0JUqeHgUUUUU= X-CM-SenderInfo: pyxotu46lvutnvoduhdfq/1tbiBwkNA2f+Ih6YKQAAsU Content-Type: text/plain; charset="utf-8" In vegam_populate_smc_boot_level(), the return value of phm_find_boot_level() is 0 or negative error code and the "if (result)" branch statement will never run into the true branch. Besides, this will skip setting the voltages later below. Returning early may break working devices. Add an error handling to phm_find_boot_level() to reset the boot level when the function fails. A proper implementation can be found in tonga_populate_smc_boot_level(). Fixes: 4a1132782200 ("drm/amd/powerplay: return errno code to caller when e= rror occur") Cc: stable@vger.kernel.org # v5.6+ Signed-off-by: Wentao Liang --- .../drm/amd/pm/powerplay/smumgr/vegam_smumgr.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/amd/pm/powerplay/smumgr/vegam_smumgr.c b/drive= rs/gpu/drm/amd/pm/powerplay/smumgr/vegam_smumgr.c index 34c9f59b889a..c68dd12b858a 100644 --- a/drivers/gpu/drm/amd/pm/powerplay/smumgr/vegam_smumgr.c +++ b/drivers/gpu/drm/amd/pm/powerplay/smumgr/vegam_smumgr.c @@ -1374,15 +1374,20 @@ static int vegam_populate_smc_boot_level(struct pp_= hwmgr *hwmgr, result =3D phm_find_boot_level(&(data->dpm_table.sclk_table), data->vbios_boot_state.sclk_bootup_value, (uint32_t *)&(table->GraphicsBootLevel)); - if (result) - return result; + if (result !=3D 0) { + table->GraphicsBootLevel =3D 0; + pr_err("VBIOS did not find boot engine clock value in dependency table. = Using Graphics DPM level 0!\n"); + result =3D 0; + } =20 result =3D phm_find_boot_level(&(data->dpm_table.mclk_table), data->vbios_boot_state.mclk_bootup_value, (uint32_t *)&(table->MemoryBootLevel)); - - if (result) - return result; + if (result !=3D 0) { + table->MemoryBootLevel =3D 0; + pr_err("VBIOS did not find boot engine clock value in dependency table. = Using Memory DPM level 0!\n"); + result =3D 0; + } =20 table->BootVddc =3D data->vbios_boot_state.vddc_bootup_value * VOLTAGE_SCALE; --=20 2.42.0.windows.2