Commit b18ff692 authored by Bokun Zhang's avatar Bokun Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: Filter security violation registers 



Recently, there is security policy update under SRIOV.
We need to filter the registers that hit the violation
and move the code to the host driver side so that
the guest driver can execute correctly.

Signed-off-by: default avatarBokun Zhang <Bokun.Zhang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0cd7f378

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

+46 −37
Original line number Diff line number Diff line
@@ -542,9 +542,6 @@ static void sdma_v5_2_ctx_switch_enable(struct amdgpu_device *adev, bool enable) 
	}



	for (i = 0; i < adev->sdma.num_instances; i++) {

		f32_cntl = RREG32(sdma_v5_2_get_reg_offset(adev, i, mmSDMA0_CNTL));

		f32_cntl = REG_SET_FIELD(f32_cntl, SDMA0_CNTL,

				AUTO_CTXSW_ENABLE, enable ? 1 : 0);

		if (enable && amdgpu_sdma_phase_quantum) {

			WREG32_SOC15_IP(GC, sdma_v5_2_get_reg_offset(adev, i, mmSDMA0_PHASE0_QUANTUM),

			       phase_quantum);
@@ -553,8 +550,14 @@ static void sdma_v5_2_ctx_switch_enable(struct amdgpu_device *adev, bool enable) 
			WREG32_SOC15_IP(GC, sdma_v5_2_get_reg_offset(adev, i, mmSDMA0_PHASE2_QUANTUM),

			       phase_quantum);

		}



		if (!amdgpu_sriov_vf(adev)) {

			f32_cntl = RREG32(sdma_v5_2_get_reg_offset(adev, i, mmSDMA0_CNTL));

			f32_cntl = REG_SET_FIELD(f32_cntl, SDMA0_CNTL,

					AUTO_CTXSW_ENABLE, enable ? 1 : 0);

			WREG32(sdma_v5_2_get_reg_offset(adev, i, mmSDMA0_CNTL), f32_cntl);

		}

	}



}
@@ -576,12 +579,14 @@ static void sdma_v5_2_enable(struct amdgpu_device *adev, bool enable) 
		sdma_v5_2_rlc_stop(adev);

	}



	if (!amdgpu_sriov_vf(adev)) {

		for (i = 0; i < adev->sdma.num_instances; i++) {

			f32_cntl = RREG32(sdma_v5_2_get_reg_offset(adev, i, mmSDMA0_F32_CNTL));

			f32_cntl = REG_SET_FIELD(f32_cntl, SDMA0_F32_CNTL, HALT, enable ? 0 : 1);

			WREG32(sdma_v5_2_get_reg_offset(adev, i, mmSDMA0_F32_CNTL), f32_cntl);

		}

	}

}



/**

 * sdma_v5_2_gfx_resume - setup and start the async dma engines
@@ -608,6 +613,7 @@ static int sdma_v5_2_gfx_resume(struct amdgpu_device *adev) 
		ring = &adev->sdma.instance[i].ring;

		wb_offset = (ring->rptr_offs * 4);



		if (!amdgpu_sriov_vf(adev))

			WREG32_SOC15_IP(GC, sdma_v5_2_get_reg_offset(adev, i, mmSDMA0_SEM_WAIT_FAIL_TIMER_CNTL), 0);



		/* Set ring buffer size in dwords */
@@ -683,8 +689,11 @@ static int sdma_v5_2_gfx_resume(struct amdgpu_device *adev) 
			sdma_v5_2_ring_set_wptr(ring);



		/* set minor_ptr_update to 0 after wptr programed */



		WREG32_SOC15_IP(GC, sdma_v5_2_get_reg_offset(adev, i, mmSDMA0_GFX_MINOR_PTR_UPDATE), 0);



		/* SRIOV VF has no control of any of registers below */

		if (!amdgpu_sriov_vf(adev)) {

			/* set utc l1 enable flag always to 1 */

			temp = RREG32(sdma_v5_2_get_reg_offset(adev, i, mmSDMA0_CNTL));

			temp = REG_SET_FIELD(temp, SDMA0_CNTL, UTC_L1_ENABLE, 1);
@@ -708,7 +717,6 @@ static int sdma_v5_2_gfx_resume(struct amdgpu_device *adev) 
				 SDMA0_UTCL1_PAGE__LLC_NOALLOC_MASK);

			WREG32_SOC15_IP(GC, sdma_v5_2_get_reg_offset(adev, i, mmSDMA0_UTCL1_PAGE), temp);



		if (!amdgpu_sriov_vf(adev)) {

			/* unhalt engine */

			temp = RREG32(sdma_v5_2_get_reg_offset(adev, i, mmSDMA0_F32_CNTL));

			temp = REG_SET_FIELD(temp, SDMA0_F32_CNTL, HALT, 0);
@@ -1436,13 +1444,14 @@ static int sdma_v5_2_set_trap_irq_state(struct amdgpu_device *adev, 
					enum amdgpu_interrupt_state state)

{

	u32 sdma_cntl;



	u32 reg_offset = sdma_v5_2_get_reg_offset(adev, type, mmSDMA0_CNTL);



	if (!amdgpu_sriov_vf(adev)) {

		sdma_cntl = RREG32(reg_offset);

		sdma_cntl = REG_SET_FIELD(sdma_cntl, SDMA0_CNTL, TRAP_ENABLE,

			       state == AMDGPU_IRQ_STATE_ENABLE ? 1 : 0);

		WREG32(reg_offset, sdma_cntl);

	}



	return 0;

}