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 0CE97C6FA8E for ; Mon, 27 Feb 2023 02:05:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 66A9610E2DD; Mon, 27 Feb 2023 02:05:51 +0000 (UTC) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 84FE410E2DD; Mon, 27 Feb 2023 02:05:48 +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 dfw.source.kernel.org (Postfix) with ESMTPS id 103A360CFB; Mon, 27 Feb 2023 02:05:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 63A98C43443; Mon, 27 Feb 2023 02:05:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677463547; bh=0VCysylFJaJFT41C5zz6K7CDeXge3t0X62kW0QHBkQQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qQC99UjChpPhgcYkmFoKxPaBXxvf7NduKsqVT75r8F8tkk9QUXRifvciKvxbZJG33 WijWDKg76PZ8I6t3UGOpugqOvDmn96jh7G7apWoY/Shw5Ls8fVoo1O3B0tlV9GSoly Ek2jaES/QfAuDzocpzgqDU1xliRcoTC5idKlBL355Hcx5trL1wR2T47Z7BPHiPKy9u NjqTJ6BJKvn558Kh1xjG0wtaof+o46aRkpYpTggIqZNmqxw4g0iFK7VES5TyK4Yg+2 rkHs2kDxmD3mZ6g/0pispm8t7PW/eGcycfRQ1G1gRaAUJCj5cxW09q9+/ju7z18Wsj Yk5EouJjDiHTQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 11/58] drm/amd: Avoid BUG() for case of SRIOV missing IP version Date: Sun, 26 Feb 2023 21:04:09 -0500 Message-Id: <20230227020457.1048737-11-sashal@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230227020457.1048737-1-sashal@kernel.org> References: <20230227020457.1048737-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 712dd72f3ccf2..087147f09933a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -354,7 +354,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 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 A82B9C7EE23 for ; Mon, 27 Feb 2023 02:05:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 062C489561; Mon, 27 Feb 2023 02:05:51 +0000 (UTC) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 84FE410E2DD; Mon, 27 Feb 2023 02:05:48 +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 dfw.source.kernel.org (Postfix) with ESMTPS id 103A360CFB; Mon, 27 Feb 2023 02:05:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 63A98C43443; Mon, 27 Feb 2023 02:05:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677463547; bh=0VCysylFJaJFT41C5zz6K7CDeXge3t0X62kW0QHBkQQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qQC99UjChpPhgcYkmFoKxPaBXxvf7NduKsqVT75r8F8tkk9QUXRifvciKvxbZJG33 WijWDKg76PZ8I6t3UGOpugqOvDmn96jh7G7apWoY/Shw5Ls8fVoo1O3B0tlV9GSoly Ek2jaES/QfAuDzocpzgqDU1xliRcoTC5idKlBL355Hcx5trL1wR2T47Z7BPHiPKy9u NjqTJ6BJKvn558Kh1xjG0wtaof+o46aRkpYpTggIqZNmqxw4g0iFK7VES5TyK4Yg+2 rkHs2kDxmD3mZ6g/0pispm8t7PW/eGcycfRQ1G1gRaAUJCj5cxW09q9+/ju7z18Wsj Yk5EouJjDiHTQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 11/58] drm/amd: Avoid BUG() for case of SRIOV missing IP version Date: Sun, 26 Feb 2023 21:04:09 -0500 Message-Id: <20230227020457.1048737-11-sashal@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230227020457.1048737-1-sashal@kernel.org> References: <20230227020457.1048737-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development 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 , Alex Deucher , Likun.Gao@amd.com, candice.li@amd.com, christian.koenig@amd.com, Hawking.Zhang@amd.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 712dd72f3ccf2..087147f09933a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -354,7 +354,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 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 BA22BC6FA8E for ; Mon, 27 Feb 2023 02:08:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230251AbjB0CIF (ORCPT ); Sun, 26 Feb 2023 21:08:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59466 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230213AbjB0CHf (ORCPT ); Sun, 26 Feb 2023 21:07:35 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 016581ABE6; Sun, 26 Feb 2023 18:06:50 -0800 (PST) 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 dfw.source.kernel.org (Postfix) with ESMTPS id 712C460D3E; Mon, 27 Feb 2023 02:05:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 63A98C43443; Mon, 27 Feb 2023 02:05:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677463547; bh=0VCysylFJaJFT41C5zz6K7CDeXge3t0X62kW0QHBkQQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qQC99UjChpPhgcYkmFoKxPaBXxvf7NduKsqVT75r8F8tkk9QUXRifvciKvxbZJG33 WijWDKg76PZ8I6t3UGOpugqOvDmn96jh7G7apWoY/Shw5Ls8fVoo1O3B0tlV9GSoly Ek2jaES/QfAuDzocpzgqDU1xliRcoTC5idKlBL355Hcx5trL1wR2T47Z7BPHiPKy9u NjqTJ6BJKvn558Kh1xjG0wtaof+o46aRkpYpTggIqZNmqxw4g0iFK7VES5TyK4Yg+2 rkHs2kDxmD3mZ6g/0pispm8t7PW/eGcycfRQ1G1gRaAUJCj5cxW09q9+/ju7z18Wsj Yk5EouJjDiHTQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mario Limonciello , Alex Deucher , Lijo Lazar , Sasha Levin , christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, Hawking.Zhang@amd.com, Likun.Gao@amd.com, guchun.chen@amd.com, candice.li@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.1 11/58] drm/amd: Avoid BUG() for case of SRIOV missing IP version Date: Sun, 26 Feb 2023 21:04:09 -0500 Message-Id: <20230227020457.1048737-11-sashal@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230227020457.1048737-1-sashal@kernel.org> References: <20230227020457.1048737-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: 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 712dd72f3ccf2..087147f09933a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -354,7 +354,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