drm/amdgpu: Clear doorbell interrupt status after BACO exit for SIENNA_CICHLID
Subsystems (2)
PATCH 1/1 drm/amdgpu: Clear doorbell interrupt status after BACO exit for SIENNA_CICHLID
In passthrough mode, if we unloaded driver in BACO mode(RTPM). Kernel would receive thousands of unhandled interrupts. That's because there was doorbell moniter interrupt on BIF, so KVM would keep injecting interrupt to guest VM. So we should clear door bell interrupt status after BACO exit.
Signed-off-by Chengzhe Liu <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 1 + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3 -0
@@ -5265,6 +5265,9 @@ int amdgpu_device_baco_exit(struct drm_device *dev) adev->nbio.funcs->enable_doorbell_interrupt) adev->nbio.funcs->enable_doorbell_interrupt(adev, true); +if (amdgpu_passthrough (adev) && adev->nbio.funcs->clear_doorbell_interrupt) + adev->nbio.funcs->clear_doorbell_interrupt (adev); +return 0 ; }
drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h +1 -0
@@ -95,6 +95,7 @@ struct amdgpu_nbio_funcs {void (*program_aspm)(struct amdgpu_device *adev);void (*apply_lc_spc_mode_wa)(struct amdgpu_device *adev);void (*apply_l1_link_width_reconfig_wa)(struct amdgpu_device *adev); +void (*clear_doorbell_interrupt)(struct amdgpu_device *adev); };struct amdgpu_nbio {
drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c +20 -0
@@ -508,6 +508,25 @@ static void nbio_v2_3_apply_l1_link_width_reconfig_wa(struct amdgpu_device *adevWREG32_PCIE (smnPCIE_LC_LINK_WIDTH_CNTL, reg_data); } +static void nbio_v2_3_clear_doorbell_interrupt (struct amdgpu_device *adev) +{ +uint32_t reg, reg_data; + +if (adev->asic_type !=CHIP_SIENNA_CICHLID ) +return ; + + reg =RREG32_SOC15 (NBIO ,0 , mmBIF_RB_CNTL); + +/*Clear Interrupt Status*/ +if ((reg &BIF_RB_CNTL__RB_ENABLE_MASK ) ==0 ) { + reg =RREG32_SOC15 (NBIO ,0 , mmBIF_DOORBELL_INT_CNTL); +if (reg &BIF_DOORBELL_INT_CNTL__DOORBELL_INTERRUPT_STATUS_MASK ) { + reg_data =1 <<BIF_DOORBELL_INT_CNTL__DOORBELL_INTERRUPT_CLEAR__SHIFT ; +WREG32_SOC15 (NBIO ,0 , mmBIF_DOORBELL_INT_CNTL, reg_data); + } + } +} +const struct amdgpu_nbio_funcs nbio_v2_3_funcs = { .get_hdp_flush_req_offset = nbio_v2_3_get_hdp_flush_req_offset, .get_hdp_flush_done_offset = nbio_v2_3_get_hdp_flush_done_offset,
@@ -531,4 +550,5 @@ const struct amdgpu_nbio_funcs nbio_v2_3_funcs = { .program_aspm = nbio_v2_3_program_aspm, .apply_lc_spc_mode_wa = nbio_v2_3_apply_lc_spc_mode_wa, .apply_l1_link_width_reconfig_wa = nbio_v2_3_apply_l1_link_width_reconfig_wa, + .clear_doorbell_interrupt = nbio_v2_3_clear_doorbell_interrupt, };
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx