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 275941A00D7; Wed, 25 Sep 2024 11:53:00 +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=1727265180; cv=none; b=GAQxkhDpBA9TfDzxz4iPiyrPg5rjXKk3IPaVNqCTQXv2U58PaBUXy63CNLt6qKc+ZIaCGLDkphS5Y3yIN6/l2pfvW3qBoltfH1zr/CAyMEFeUS17ykMGVfJoLa2JQ3iqGH+RceE0upN7LXl0NEUaWSDgMEH/l7hm9JNY0WeADUs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727265180; c=relaxed/simple; bh=F5K3EUs7bmUksDI8jNzKhnbmoQAbhXS8dUA6E+dxQ0s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uSDUSWFr2+5IcUkf2D++lae9MbXgtYdbJIAmhA11fErNA35YJOcohdKWUNG9w4NghZdOm/fNju9imh6rrPPKSG5+ll+rIhcd5cEwJ3K95mFeMOeCOE395mrHn8lzxkRXnjNRe3qxA0OZrsHi9wqhKp2310xhMWxZaX7gOsY8ZfM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Xf8sPTYA; 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="Xf8sPTYA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0E958C4CEC3; Wed, 25 Sep 2024 11:52:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1727265180; bh=F5K3EUs7bmUksDI8jNzKhnbmoQAbhXS8dUA6E+dxQ0s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Xf8sPTYABZENSvABmm+6crd4xPGBcCTXgfUX997M1chbXkT57p0aG3W2y16/iSeT9 6emaccNIOEGTQD0DyDoYfBGzmbPoxyiNQoEDY+R3DY336Xo//m6Edo5VK40umeeOlH hBvPmWIE7S1w3RT+BhqySMhkvUoe2xvD6CPG3JC0p2nm8Y0er1IpfeSU/0Eel5I6m0 f6zGB5pqKa+0fcMpK8gEmZKZESDdOtsK6gwCjfzAadV5P4J1ON/541dA89OTf4NORB Fp1eD9Hnlqrm6sniUTDA7/ICYe+nueWKq5UsgmkTJu5eGZt5+Zo0JwNesxKl2ZISnm D8HirY2xQu7bQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alex Deucher , Vitaly Prosyak , Sasha Levin , christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, sunil.khatri@amd.com, zhenguo.yin@amd.com, Jun.Ma2@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.11 225/244] drm/amdgpu/gfx10: use rlc safe mode for soft recovery Date: Wed, 25 Sep 2024 07:27:26 -0400 Message-ID: <20240925113641.1297102-225-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240925113641.1297102-1-sashal@kernel.org> References: <20240925113641.1297102-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.11 Content-Transfer-Encoding: 8bit From: Alex Deucher [ Upstream commit ead60e9c4e29c8574cae1be4fe3af1d9a978fb0f ] Protect the MMIO access with safe mode. Acked-by: Vitaly Prosyak Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c index 5b41c6a44068c..1bb602c4f9b3f 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c @@ -8889,7 +8889,9 @@ static void gfx_v10_0_ring_soft_recovery(struct amdgpu_ring *ring, value = REG_SET_FIELD(value, SQ_CMD, MODE, 0x01); value = REG_SET_FIELD(value, SQ_CMD, CHECK_VMID, 1); value = REG_SET_FIELD(value, SQ_CMD, VM_ID, vmid); + amdgpu_gfx_rlc_enter_safe_mode(adev, 0); WREG32_SOC15(GC, 0, mmSQ_CMD, value); + amdgpu_gfx_rlc_exit_safe_mode(adev, 0); } static void -- 2.43.0