Commit 0e4fa661 authored by Yunxiang Li's avatar Yunxiang Li Committed by Wen Zhiwei
Browse files

drm/amdgpu: add skip_hw_access checks for sriov 

stable inclusion
from stable-v6.6.50
commit 494b42f35fc2a858941757dbbf5619f6ff405562
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAYKL6

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=494b42f35fc2a858941757dbbf5619f6ff405562



--------------------------------

[ Upstream commit b3948ad1ac582f560e1f3aeaecf384619921c48d ]

Accessing registers via host is missing the check for skip_hw_access and
the lockdep check that comes with it.

Signed-off-by: default avatarYunxiang Li <Yunxiang.Li@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 6d7a428c

drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c

+9 −0
Original line number Diff line number Diff line
@@ -998,6 +998,9 @@ static u32 amdgpu_virt_rlcg_reg_rw(struct amdgpu_device *adev, u32 offset, u32 v 
		return 0;

	}



	if (amdgpu_device_skip_hw_access(adev))

		return 0;



	reg_access_ctrl = &adev->gfx.rlc.reg_access_ctrl[xcc_id];

	scratch_reg0 = (void __iomem *)adev->rmmio + 4 * reg_access_ctrl->scratch_reg0;

	scratch_reg1 = (void __iomem *)adev->rmmio + 4 * reg_access_ctrl->scratch_reg1;
@@ -1073,6 +1076,9 @@ void amdgpu_sriov_wreg(struct amdgpu_device *adev, 
{

	u32 rlcg_flag;



	if (amdgpu_device_skip_hw_access(adev))

		return;



	if (!amdgpu_sriov_runtime(adev) &&

		amdgpu_virt_get_rlcg_reg_access_flag(adev, acc_flags, hwip, true, &rlcg_flag)) {

		amdgpu_virt_rlcg_reg_rw(adev, offset, value, rlcg_flag, xcc_id);
@@ -1090,6 +1096,9 @@ u32 amdgpu_sriov_rreg(struct amdgpu_device *adev, 
{

	u32 rlcg_flag;



	if (amdgpu_device_skip_hw_access(adev))

		return 0;



	if (!amdgpu_sriov_runtime(adev) &&

		amdgpu_virt_get_rlcg_reg_access_flag(adev, acc_flags, hwip, false, &rlcg_flag))

		return amdgpu_virt_rlcg_reg_rw(adev, offset, 0, rlcg_flag, xcc_id);