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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 47D7EC7EE31 for ; Mon, 27 Feb 2023 02:01:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 64CDD10E19B; Mon, 27 Feb 2023 02:01:45 +0000 (UTC) Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by gabe.freedesktop.org (Postfix) with ESMTPS id DCE2610E185; Mon, 27 Feb 2023 02:01:40 +0000 (UTC) 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 88A68B80CA9; Mon, 27 Feb 2023 02:01:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D4010C433EF; Mon, 27 Feb 2023 02:01:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677463298; bh=cxKiHHz+PL9jilHqQUdXCDX19Vv6GDNjP8Lw7k0QEBI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S16LLh1oqHU+7UrPxAkcI2LPkdzVki4fmGgP2X1dbjbWxdzfvuD3QrpR2h8BVomdR bmtj7ZtP+I2azueRgnNF1oWL0cFsuAtddNPFZt2yKeWdQQDbdUiTqiI5Tc6kvc8k43 omgXiDXx5e0KGyEfDXBhSng1AuNh+rtkGCqL3ATNEcQe8Dm33EmKjVgPG9iFp7zWPS Nqa6pfIkKUVEsYbV+atVAF4ro2UKB05YOt6Kl/oaolgm7E5Mlz27EXzI4hLOaenxD/ 1yPf//lYUeSyaTUFlttFAN8JsDK9OfNYvrPVKycATVjbxwvwWwVZLlBif5V/kCTJWO 1vPuRz7bIxCrw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 6.2 11/60] drm/amd: Avoid BUG() for case of SRIOV missing IP version Date: Sun, 26 Feb 2023 20:59:56 -0500 Message-Id: <20230227020045.1045105-11-sashal@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230227020045.1045105-1-sashal@kernel.org> References: <20230227020045.1045105-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , Xinhui.Pan@amd.com, guchun.chen@amd.com, dri-devel@lists.freedesktop.org, Lijo Lazar , amd-gfx@lists.freedesktop.org, Mario Limonciello , daniel@ffwll.ch, Alex Deucher , Likun.Gao@amd.com, candice.li@amd.com, airlied@gmail.com, christian.koenig@amd.com, Hawking.Zhang@amd.com Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" From: Mario Limonciello [ Upstream commit 93fec4f8c158584065134b4d45e875499bf517c8 ] No need to crash the kernel. AMDGPU will now fail to probe. Reviewed-by: Alex Deucher Reviewed-by: Lijo Lazar Signed-off-by: Mario Limonciello 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 7a2fc920739bb..ba092072308fa 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -380,7 +380,7 @@ static int psp_init_sriov_microcode(struct psp_context *psp) adev->virt.autoload_ucode_id = AMDGPU_UCODE_ID_CP_MES1_DATA; break; default: - BUG(); + ret = -EINVAL; break; } return ret; -- 2.39.0