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 B107B212B13; Wed, 4 Dec 2024 23:28:17 +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=1733354897; cv=none; b=YJ0FMrusEavvScs7TVtThhk3W2IAFqFP5IWmklQlqnNml3HtFwTz2juMOjLv7AYOTjIfmTlvKwCbkdAcOxKwOg4zVEtWYvSkXgvQXveN0ukhNVKvX7WcJtuiyqkwQ+hhOUkSqhHZKQQcXIDk7VBUQvyzMYkixYQGSY39wTJPWeo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733354897; c=relaxed/simple; bh=+xvD9PxdjL4QXA4HRCcN/0klB+D9Qd6jLPiwD9S8Erg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=juZH7Mhl51tfrmzb+gb+7nDBEU3+GHwkClK6J8GBE+KzdU4/JhTDMVIKq/6lKNMCWn1HTgUox2ClV+1l0uaUwnALMayPqQgFmQ4Egz+rDMB9WlcQpc0QvpfDH8SuPFjq4yxailofYzwvvMtKvTdFIqsh+Vk1tiV7mQfzpZzcO4I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hoNGQQ+m; 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="hoNGQQ+m" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 67A2DC4CECD; Wed, 4 Dec 2024 23:28:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1733354897; bh=+xvD9PxdjL4QXA4HRCcN/0klB+D9Qd6jLPiwD9S8Erg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hoNGQQ+mw7lgO9mP4L1BbLH9+IpgxtO0w6GJvBPkarB3GZVE/vACQ9Xpv/nhHosTA +iVdNHjPBfNAFcTnD1mGScrAzUti5NXo1vDbOL9PMi9SesNqWFG8FV5flxSQRmtGNO G/cOL1KfYUGaXmq2QDvQyDdY65a5Wgvghq8pnHgjbmPXlZ8J4a43xVYGb9JQ41oa0U w5ObFIRbxeI7xtGB43EESdPIdZhaqb5UpNN9ALeq+1svSrpE3ESVlNrFyOIerEm7Qa 50gnpVwwqP7h+GqyaWdmea2hPRQGribDLc+TFfBM2aAuY3cc4o6QWIXgqvU/GUnw8D ziOg65Kqx6jAw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Xiang Liu , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Stanley . Yang" , Alex Deucher , Sasha Levin , Xinhui.Pan@amd.com, airlied@gmail.com, simona@ffwll.ch, sunil.khatri@amd.com, lijo.lazar@amd.com, leo.liu@amd.com, Jane.Jian@amd.com, David.Wu3@amd.com, sathishkumar.sundararaju@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.12 12/15] drm/amdgpu/vcn: reset fw_shared when VCPU buffers corrupted on vcn v4.0.3 Date: Wed, 4 Dec 2024 17:16:06 -0500 Message-ID: <20241204221627.2247598-12-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241204221627.2247598-1-sashal@kernel.org> References: <20241204221627.2247598-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.12.1 Content-Transfer-Encoding: 8bit From: Xiang Liu [ Upstream commit 928cd772e18ffbd7723cb2361db4a8ccf2222235 ] It is not necessarily corrupted. When there is RAS fatal error, device memory access is blocked. Hence vcpu bo cannot be saved to system memory as in a regular suspend sequence before going for reset. In other full device reset cases, that gets saved and restored during resume. v2: Remove redundant code like vcn_v4_0 did v2: Refine commit message v3: Drop the volatile v3: Refine commit message Signed-off-by: Xiang Liu Acked-by: Christian König Reviewed-by: Stanley.Yang Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 30 ++++++++++++++++++------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c index 0fda703363004..6fca2915ea8fd 100644 --- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c @@ -116,6 +116,20 @@ static int vcn_v4_0_3_early_init(void *handle) return amdgpu_vcn_early_init(adev); } +static int vcn_v4_0_3_fw_shared_init(struct amdgpu_device *adev, int inst_idx) +{ + struct amdgpu_vcn4_fw_shared *fw_shared; + + fw_shared = adev->vcn.inst[inst_idx].fw_shared.cpu_addr; + fw_shared->present_flag_0 = cpu_to_le32(AMDGPU_FW_SHARED_FLAG_0_UNIFIED_QUEUE); + fw_shared->sq.is_enabled = 1; + + if (amdgpu_vcnfw_log) + amdgpu_vcn_fwlog_init(&adev->vcn.inst[inst_idx]); + + return 0; +} + /** * vcn_v4_0_3_sw_init - sw init for VCN block * @@ -148,8 +162,6 @@ static int vcn_v4_0_3_sw_init(void *handle) return r; for (i = 0; i < adev->vcn.num_vcn_inst; i++) { - volatile struct amdgpu_vcn4_fw_shared *fw_shared; - vcn_inst = GET_INST(VCN, i); ring = &adev->vcn.inst[i].ring_enc[0]; @@ -172,12 +184,7 @@ static int vcn_v4_0_3_sw_init(void *handle) if (r) return r; - fw_shared = adev->vcn.inst[i].fw_shared.cpu_addr; - fw_shared->present_flag_0 = cpu_to_le32(AMDGPU_FW_SHARED_FLAG_0_UNIFIED_QUEUE); - fw_shared->sq.is_enabled = true; - - if (amdgpu_vcnfw_log) - amdgpu_vcn_fwlog_init(&adev->vcn.inst[i]); + vcn_v4_0_3_fw_shared_init(adev, i); } if (amdgpu_sriov_vf(adev)) { @@ -273,6 +280,8 @@ static int vcn_v4_0_3_hw_init(void *handle) } } else { for (i = 0; i < adev->vcn.num_vcn_inst; ++i) { + struct amdgpu_vcn4_fw_shared *fw_shared; + vcn_inst = GET_INST(VCN, i); ring = &adev->vcn.inst[i].ring_enc[0]; @@ -296,6 +305,11 @@ static int vcn_v4_0_3_hw_init(void *handle) regVCN_RB1_DB_CTRL); } + /* Re-init fw_shared when RAS fatal error occurred */ + fw_shared = adev->vcn.inst[i].fw_shared.cpu_addr; + if (!fw_shared->sq.is_enabled) + vcn_v4_0_3_fw_shared_init(adev, i); + r = amdgpu_ring_test_helper(ring); if (r) return r; -- 2.43.0