From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C373C6FA82 for ; Sat, 10 Sep 2022 21:24:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230004AbiIJVYe (ORCPT ); Sat, 10 Sep 2022 17:24:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230380AbiIJVX0 (ORCPT ); Sat, 10 Sep 2022 17:23:26 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61CEB4BD13; Sat, 10 Sep 2022 14:19:17 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 37472B80915; Sat, 10 Sep 2022 21:18:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3A335C43140; Sat, 10 Sep 2022 21:18:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1662844736; bh=c15g6TlQSNLnuj/POUbCskQOM/kc1isI+563BYNg+DY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hr9pSG1uBqaKJ/Z7aMf3yCSrp8xUA6yWmOA1Hju/ghcbv4xBpChDgSLauqsvKmNCr Yz5z6HQk/VS4YLARQD7yYQ7+xpQqD1rx+G+aPgFq9vVkgCt3XGUh312UANEcXy9vk6 12n3qb3qq/CpLkZtQB04xoed4g4ehI5PO1gaHFGf8phGC4EeOO3VvZM4oK4A48wDY+ le+uMIvUZNKs/BmNmnMCh6x2cVsmn/JMxhN5PZ3y0MRHvoDxEFpCtKFHYnnkjh7g/t deS8jNACv4EJRCJukZG75qNbgW6yESYdAmF/MHIzX+LeEW0nF0KrDItyNGRIu+wZja LTsXf+a2u4y/A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chengming Gui , Hawking Zhang , Alex Deucher , Sasha Levin , christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@linux.ie, daniel@ffwll.ch, Likun.Gao@amd.com, john.clements@amd.com, candice.li@amd.com, guchun.chen@amd.com, tao.zhou1@amd.com, Bokun.Zhang@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.10 11/14] drm/amd/amdgpu: skip ucode loading if ucode_size == 0 Date: Sat, 10 Sep 2022 17:18:29 -0400 Message-Id: <20220910211832.70579-11-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220910211832.70579-1-sashal@kernel.org> References: <20220910211832.70579-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chengming Gui [ Upstream commit 39c84b8e929dbd4f63be7e04bf1a2bcd92b44177 ] Restrict the ucode loading check to avoid frontdoor loading error. Signed-off-by: Chengming Gui Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c index 2f47f81a74a57..f3a806df7648d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -1921,7 +1921,7 @@ static int psp_load_smu_fw(struct psp_context *psp) static bool fw_load_skip_check(struct psp_context *psp, struct amdgpu_firmware_info *ucode) { - if (!ucode->fw) + if (!ucode->fw || !ucode->ucode_size) return true; if (ucode->ucode_id == AMDGPU_UCODE_ID_SMC && -- 2.35.1