drm/amdgpu: add amdgpu_ih_regs structure
Subsystems (2)
PATCH 1/27 drm/amdgpu: add amdgpu_ih_regs structure
amdgpu_ih_regs holds all the registers for
an ih ring
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h +13 -0
@@ -30,6 +30,18 @@struct amdgpu_device ;struct amdgpu_iv_entry ; +struct amdgpu_ih_regs { +uint32_t ih_rb_base; +uint32_t ih_rb_base_hi; +uint32_t ih_rb_cntl; +uint32_t ih_rb_wptr; +uint32_t ih_rb_rptr; +uint32_t ih_doorbell_rptr; +uint32_t ih_rb_wptr_addr_lo; +uint32_t ih_rb_wptr_addr_hi; +uint32_t psp_reg_id; +}; +/* * R6xx+ IH ring */
@@ -53,6 +65,7 @@ struct amdgpu_ih_ring {bool enabled;unsigned rptr;atomic_t lock; +struct amdgpu_ih_regs ih_regs; };/* provided by the ih block */
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/27 drm/amdgpu: add helper to init ih ring regs for vega10
vega10_ih_init_register_offset will be used to init register offset for all the available ih rings
--- drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 47 ++++++++++++++++++++++++++ 1 file changed, 47 insertions(+)
drivers/gpu/drm/amd/amdgpu/vega10_ih.c +47 -0
@@ -37,6 +37,53 @@static void vega10_ih_set_interrupt_funcs (struct amdgpu_device *adev); +/** +* vega10_ih_init_register_offset - Initialize register offset for ih rings +* +* @adev: amdgpu_device pointer +* +* Initialize register offset ih rings (VEGA10). +*/ +static void vega10_ih_init_register_offset (struct amdgpu_device *adev) +{ +struct amdgpu_ih_regs *ih_regs; + +if (adev->irq.ih.ring_size) { + ih_regs = &adev->irq.ih.ih_regs; + ih_regs->ih_rb_base =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_BASE); + ih_regs->ih_rb_base_hi =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_BASE_HI); + ih_regs->ih_rb_cntl =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_CNTL); + ih_regs->ih_rb_wptr =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_WPTR); + ih_regs->ih_rb_rptr =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_RPTR); + ih_regs->ih_doorbell_rptr =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_DOORBELL_RPTR); + ih_regs->ih_rb_wptr_addr_lo =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_WPTR_ADDR_LO); + ih_regs->ih_rb_wptr_addr_hi =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_WPTR_ADDR_HI); + ih_regs->psp_reg_id =PSP_REG_IH_RB_CNTL ; + } + +if (adev->irq.ih1.ring_size) { + ih_regs = &adev->irq.ih1.ih_regs; + ih_regs->ih_rb_base =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_BASE_RING1); + ih_regs->ih_rb_base_hi =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_BASE_HI_RING1); + ih_regs->ih_rb_cntl =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_CNTL_RING1); + ih_regs->ih_rb_wptr =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_WPTR_RING1); + ih_regs->ih_rb_rptr =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_RPTR_RING1); + ih_regs->ih_doorbell_rptr =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_DOORBELL_RPTR_RING1); + ih_regs->psp_reg_id =PSP_REG_IH_RB_CNTL_RING1 ; + } + +if (adev->irq.ih2.ring_size) { + ih_regs = &adev->irq.ih2.ih_regs; + ih_regs->ih_rb_base =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_BASE_RING2); + ih_regs->ih_rb_base_hi =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_BASE_HI_RING2); + ih_regs->ih_rb_cntl =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_CNTL_RING2); + ih_regs->ih_rb_wptr =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_WPTR_RING2); + ih_regs->ih_rb_rptr =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_RPTR_RING2); + ih_regs->ih_doorbell_rptr =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_DOORBELL_RPTR_RING2); + ih_regs->psp_reg_id =PSP_REG_IH_RB_CNTL_RING2 ; + } +} +/** * vega10_ih_enable_interrupts - Enable the interrupt ring buffer *
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/27 drm/amdgpu: add helper to enable an ih ring for vega10
In reply to Hawking Zhangvega10_ih_enable_ring will be used to enable an ih ring for vega10/12, RAVEN series and RENOIR.
--- drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 52 ++++++++++++++++++++++++++ 1 file changed, 52 insertions(+)
drivers/gpu/drm/amd/amdgpu/vega10_ih.c +52 -0
@@ -255,6 +255,58 @@ static uint32_t vega10_ih_doorbell_rptr(struct amdgpu_ih_ring *ih)return ih_doorbell_rtpr; } +/** +* vega10_ih_enable_ring - enable an ih ring buffer +* +* @adev: amdgpu_device pointer +* @ih: amdgpu_ih_ring pointer +* +* Enable an ih ring buffer (VEGA10) +*/ +static int vega10_ih_enable_ring (struct amdgpu_device *adev, +struct amdgpu_ih_ring *ih) +{ +struct amdgpu_ih_regs *ih_regs; +uint32_t tmp; + + ih_regs = &ih->ih_regs; + +/* Ring Buffer base. [39:8] of 40-bit address of the beginning of the ring buffer*/ +WREG32 (ih_regs->ih_rb_base, ih->gpu_addr >>8 ); +WREG32 (ih_regs->ih_rb_base_hi, (ih->gpu_addr >>40 ) &0xff ); + + tmp =RREG32 (ih_regs->ih_rb_cntl); + tmp =vega10_ih_rb_cntl (ih, tmp); +if (ih == &adev->irq.ih) + tmp =REG_SET_FIELD (tmp,IH_RB_CNTL ,RPTR_REARM , !!adev->irq.msi_enabled); +if (ih == &adev->irq.ih1) { + tmp =REG_SET_FIELD (tmp,IH_RB_CNTL ,WPTR_OVERFLOW_ENABLE ,0 ); + tmp =REG_SET_FIELD (tmp,IH_RB_CNTL ,RB_FULL_DRAIN_ENABLE ,1 ); + } +if (amdgpu_sriov_vf (adev)) { +if (psp_reg_program (&adev->psp, ih_regs->psp_reg_id, tmp)) { +dev_err (adev->dev,"PSP program IH_RB_CNTL failed!\n" ); +return -ETIMEDOUT ; + } + }else { +WREG32 (ih_regs->ih_rb_cntl, tmp); + } + +if (ih == &adev->irq.ih) { +/* set the ih ring 0 writeback address whether it's enabled or not */ +WREG32 (ih_regs->ih_rb_wptr_addr_lo,lower_32_bits (ih->wptr_addr)); +WREG32 (ih_regs->ih_rb_wptr_addr_hi,upper_32_bits (ih->wptr_addr) &0xFFFF ); + } + +/* set rptr, wptr to 0 */ +WREG32 (ih_regs->ih_rb_wptr,0 ); +WREG32 (ih_regs->ih_rb_rptr,0 ); + +WREG32 (ih_regs->ih_doorbell_rptr,vega10_ih_doorbell_rptr (ih)); + +return 0 ; +} +/** * vega10_ih_irq_init - init and enable the interrupt ring *
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/27 drm/amdgpu: add helper to toggle ih ring interrupts for vega10
In reply to Hawking Zhangvega10_ih_toggle_ring_interrupts will be used to enable/disable an ih ring interrupts for vega10/12, RAVEN series and RENOIR APUs
--- drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 45 ++++++++++++++++++++++++++ 1 file changed, 45 insertions(+)
drivers/gpu/drm/amd/amdgpu/vega10_ih.c +45 -0
@@ -213,6 +213,51 @@ static void vega10_ih_disable_interrupts(struct amdgpu_device *adev) } } +/** +* vega10_ih_toggle_ring_interrupts - toggle the interrupt ring buffer +* +* @adev: amdgpu_device pointer +* @ih: amdgpu_ih_ring pointet +* @enable: true - enable the interrupts, false - disable the interrupts +* +* Toggle the interrupt ring buffer (VEGA10) +*/ +static int vega10_ih_toggle_ring_interrupts (struct amdgpu_device *adev, +struct amdgpu_ih_ring *ih, +bool enable) +{ +struct amdgpu_ih_regs *ih_regs; +uint32_t tmp; + + ih_regs = &ih->ih_regs; + + tmp =RREG32 (ih_regs->ih_rb_cntl); + tmp =REG_SET_FIELD (tmp,IH_RB_CNTL ,RB_ENABLE , (enable ?1 :0 )); +/* enable_intr field is only valid in ring0 */ +if (ih == &adev->irq.ih) + tmp =REG_SET_FIELD (tmp,IH_RB_CNTL ,ENABLE_INTR , (enable ?1 :0 )); +if (amdgpu_sriov_vf (adev)) { +if (psp_reg_program (&adev->psp, ih_regs->psp_reg_id, tmp)) { +dev_err (adev->dev,"PSP program IH_RB_CNTL failed!\n" ); +return -ETIMEDOUT ; + } + }else { +WREG32 (ih_regs->ih_rb_cntl, tmp); + } + +if (enable) { + ih->enabled = true; + }else { +/* set rptr, wptr to 0 */ +WREG32 (ih_regs->ih_rb_rptr,0 ); +WREG32 (ih_regs->ih_rb_wptr,0 ); + ih->enabled = false; + ih->rptr =0 ; + } + +return 0 ; +} +static uint32_t vega10_ih_rb_cntl (struct amdgpu_ih_ring *ih,uint32_t ih_rb_cntl) {int rb_bufsz =order_base_2 (ih->ring_size /4 );
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/27 drm/amdgpu: switch to ih_init_register_offset for vega10
In reply to Hawking ZhangInitialize ih control registers offset through helper function vega10_ih_init_register_offset.
--- drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/amdgpu/vega10_ih.c +3 -0
@@ -758,6 +758,9 @@ static int vega10_ih_sw_init(void *handle) adev->irq.ih2.use_doorbell = true; adev->irq.ih2.doorbell_index = (adev->doorbell_index.ih +2 ) <<1 ; +/* initialize ih control registers offset */ +vega10_ih_init_register_offset (adev); + r =amdgpu_ih_ring_init (adev, &adev->irq.ih_soft,PAGE_SIZE , true);if (r)return r;
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/27 drm/amdgpu: switch to ih_toggle_interrupts for vega10
In reply to Hawking Zhangreplace ih_enable_interrupts and ih_disable_interrupts with ih_toggle_interrupts
--- drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 168 +++++-------------------- 1 file changed, 34 insertions(+), 134 deletions(-)
drivers/gpu/drm/amd/amdgpu/vega10_ih.c +34 -134
@@ -84,135 +84,6 @@ static void vega10_ih_init_register_offset(struct amdgpu_device *adev) } } -/** -* vega10_ih_enable_interrupts - Enable the interrupt ring buffer -* -* @adev: amdgpu_device pointer -* -* Enable the interrupt ring buffer (VEGA10). -*/ -static void vega10_ih_enable_interrupts (struct amdgpu_device *adev) -{ -u32 ih_rb_cntl =RREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL); - - ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL ,RB_ENABLE ,1 ); - ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL ,ENABLE_INTR ,1 ); -if (amdgpu_sriov_vf (adev)) { -if (psp_reg_program (&adev->psp,PSP_REG_IH_RB_CNTL , ih_rb_cntl)) { -DRM_ERROR ("PSP program IH_RB_CNTL failed!\n" ); -return ; - } - }else { -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL, ih_rb_cntl); - } - adev->irq.ih.enabled = true; - -if (adev->irq.ih1.ring_size) { - ih_rb_cntl =RREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL_RING1); - ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL_RING1 , -RB_ENABLE ,1 ); -if (amdgpu_sriov_vf (adev)) { -if (psp_reg_program (&adev->psp,PSP_REG_IH_RB_CNTL_RING1 , - ih_rb_cntl)) { -DRM_ERROR ("program IH_RB_CNTL_RING1 failed!\n" ); -return ; - } - }else { -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL_RING1, ih_rb_cntl); - } - adev->irq.ih1.enabled = true; - } - -if (adev->irq.ih2.ring_size) { - ih_rb_cntl =RREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL_RING2); - ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL_RING2 , -RB_ENABLE ,1 ); -if (amdgpu_sriov_vf (adev)) { -if (psp_reg_program (&adev->psp,PSP_REG_IH_RB_CNTL_RING2 , - ih_rb_cntl)) { -DRM_ERROR ("program IH_RB_CNTL_RING2 failed!\n" ); -return ; - } - }else { -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL_RING2, ih_rb_cntl); - } - adev->irq.ih2.enabled = true; - } - -if (adev->irq.ih_soft.ring_size) - adev->irq.ih_soft.enabled = true; -} - -/** -* vega10_ih_disable_interrupts - Disable the interrupt ring buffer -* -* @adev: amdgpu_device pointer -* -* Disable the interrupt ring buffer (VEGA10). -*/ -static void vega10_ih_disable_interrupts (struct amdgpu_device *adev) -{ -u32 ih_rb_cntl =RREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL); - - ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL ,RB_ENABLE ,0 ); - ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL ,ENABLE_INTR ,0 ); -if (amdgpu_sriov_vf (adev)) { -if (psp_reg_program (&adev->psp,PSP_REG_IH_RB_CNTL , ih_rb_cntl)) { -DRM_ERROR ("PSP program IH_RB_CNTL failed!\n" ); -return ; - } - }else { -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL, ih_rb_cntl); - } - -/* set rptr, wptr to 0 */ -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_RPTR,0 ); -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_WPTR,0 ); - adev->irq.ih.enabled = false; - adev->irq.ih.rptr =0 ; - -if (adev->irq.ih1.ring_size) { - ih_rb_cntl =RREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL_RING1); - ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL_RING1 , -RB_ENABLE ,0 ); -if (amdgpu_sriov_vf (adev)) { -if (psp_reg_program (&adev->psp,PSP_REG_IH_RB_CNTL_RING1 , - ih_rb_cntl)) { -DRM_ERROR ("program IH_RB_CNTL_RING1 failed!\n" ); -return ; - } - }else { -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL_RING1, ih_rb_cntl); - } -/* set rptr, wptr to 0 */ -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_RPTR_RING1,0 ); -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_WPTR_RING1,0 ); - adev->irq.ih1.enabled = false; - adev->irq.ih1.rptr =0 ; - } - -if (adev->irq.ih2.ring_size) { - ih_rb_cntl =RREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL_RING2); - ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL_RING2 , -RB_ENABLE ,0 ); -if (amdgpu_sriov_vf (adev)) { -if (psp_reg_program (&adev->psp,PSP_REG_IH_RB_CNTL_RING2 , - ih_rb_cntl)) { -DRM_ERROR ("program IH_RB_CNTL_RING2 failed!\n" ); -return ; - } - }else { -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL_RING2, ih_rb_cntl); - } - -/* set rptr, wptr to 0 */ -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_RPTR_RING2,0 ); -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_WPTR_RING2,0 ); - adev->irq.ih2.enabled = false; - adev->irq.ih2.rptr =0 ; - } -} -/** * vega10_ih_toggle_ring_interrupts - toggle the interrupt ring buffer *
@@ -258,6 +129,31 @@ static int vega10_ih_toggle_ring_interrupts(struct amdgpu_device *adev,return 0 ; } +/** +* vega10_ih_toggle_interrupts - Toggle all the available interrupt ring buffers +* +* @adev: amdgpu_device pointer +* @enable: enable or disable interrupt ring buffers +* +* Toggle all the available interrupt ring buffers (VEGA10). +*/ +static int vega10_ih_toggle_interrupts (struct amdgpu_device *adev,bool enable) +{ +struct amdgpu_ih_ring *ih[] = {&adev->irq.ih, &adev->irq.ih1, &adev->irq.ih2}; +int i; +int r; + +for (i =0 ; i <ARRAY_SIZE (ih); i++) { +if (ih[i]->ring_size) { + r =vega10_ih_toggle_ring_interrupts (adev, ih[i], enable); +if (r) +return r; + } + } + +return 0 ; +} +static uint32_t vega10_ih_rb_cntl (struct amdgpu_ih_ring *ih,uint32_t ih_rb_cntl) {int rb_bufsz =order_base_2 (ih->ring_size /4 );
@@ -367,11 +263,13 @@ static int vega10_ih_irq_init(struct amdgpu_device *adev) {struct amdgpu_ih_ring *ih;u32 ih_rb_cntl, ih_chicken; -int ret =0 ; +int ret;u32 tmp;/* disable irqs */ -vega10_ih_disable_interrupts (adev); + ret =vega10_ih_toggle_interrupts (adev, false); +if (ret) +return ret; adev->nbio.funcs->ih_control (adev);
@@ -489,9 +387,11 @@ static int vega10_ih_irq_init(struct amdgpu_device *adev)pci_set_master (adev->pdev);/* enable interrupts */ -vega10_ih_enable_interrupts (adev); + ret =vega10_ih_toggle_interrupts (adev, true); +if (ret) +return ret; -return ret; +return 0 ; }/**
@@ -503,7 +403,7 @@ static int vega10_ih_irq_init(struct amdgpu_device *adev)*/ static void vega10_ih_irq_disable (struct amdgpu_device *adev) { -vega10_ih_disable_interrupts (adev); +vega10_ih_toggle_interrupts (adev, false);/* Wait and acknowledge irq */ mdelay (1 );
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 7/27 drm/amdgpu: switch to ih_enable_ring for vega10
In reply to Hawking Zhanguse vega10_ih_enable_ring to enable all the available ring buffers for vega10/12, RAVEN series and RENOIR APUs
--- drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 95 +++----------------------- 1 file changed, 8 insertions(+), 87 deletions(-)
drivers/gpu/drm/amd/amdgpu/vega10_ih.c +8 -87
@@ -261,9 +261,10 @@ static int vega10_ih_enable_ring(struct amdgpu_device *adev,*/ static int vega10_ih_irq_init (struct amdgpu_device *adev) { -struct amdgpu_ih_ring *ih; -u32 ih_rb_cntl, ih_chicken; +struct amdgpu_ih_ring *ih[] = {&adev->irq.ih, &adev->irq.ih1, &adev->irq.ih2}; +u32 ih_chicken;int ret; +int i;u32 tmp;/* disable irqs */
@@ -273,24 +274,6 @@ static int vega10_ih_irq_init(struct amdgpu_device *adev) adev->nbio.funcs->ih_control (adev); - ih = &adev->irq.ih; -/* Ring Buffer base. [39:8] of 40-bit address of the beginning of the ring buffer*/ -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_BASE, ih->gpu_addr >>8 ); -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_BASE_HI, (ih->gpu_addr >>40 ) &0xff ); - - ih_rb_cntl =RREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL); - ih_rb_cntl =vega10_ih_rb_cntl (ih, ih_rb_cntl); - ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL ,RPTR_REARM , - !!adev->irq.msi_enabled); -if (amdgpu_sriov_vf (adev)) { -if (psp_reg_program (&adev->psp,PSP_REG_IH_RB_CNTL , ih_rb_cntl)) { -DRM_ERROR ("PSP program IH_RB_CNTL failed!\n" ); -return -ETIMEDOUT ; - } - }else { -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL, ih_rb_cntl); - } -if ((adev->asic_type ==CHIP_ARCTURUS && adev->firmware.load_type ==AMDGPU_FW_LOAD_DIRECT ) || adev->asic_type ==CHIP_RENOIR ) {
@@ -305,74 +288,12 @@ static int vega10_ih_irq_init(struct amdgpu_device *adev)WREG32_SOC15 (OSSSYS ,0 , mmIH_CHICKEN, ih_chicken); } -/* set the writeback address whether it's enabled or not */ -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_WPTR_ADDR_LO, -lower_32_bits (ih->wptr_addr)); -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_WPTR_ADDR_HI, -upper_32_bits (ih->wptr_addr) &0xFFFF ); - -/* set rptr, wptr to 0 */ -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_WPTR,0 ); -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_RPTR,0 ); - -WREG32_SOC15 (OSSSYS ,0 , mmIH_DOORBELL_RPTR, -vega10_ih_doorbell_rptr (ih)); - - ih = &adev->irq.ih1; -if (ih->ring_size) { -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_BASE_RING1, ih->gpu_addr >>8 ); -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_BASE_HI_RING1, - (ih->gpu_addr >>40 ) &0xff ); - - ih_rb_cntl =RREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL_RING1); - ih_rb_cntl =vega10_ih_rb_cntl (ih, ih_rb_cntl); - ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL , -WPTR_OVERFLOW_ENABLE ,0 ); - ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL , -RB_FULL_DRAIN_ENABLE ,1 ); -if (amdgpu_sriov_vf (adev)) { -if (psp_reg_program (&adev->psp,PSP_REG_IH_RB_CNTL_RING1 , - ih_rb_cntl)) { -DRM_ERROR ("program IH_RB_CNTL_RING1 failed!\n" ); -return -ETIMEDOUT ; - } - }else { -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL_RING1, ih_rb_cntl); - } - -/* set rptr, wptr to 0 */ -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_WPTR_RING1,0 ); -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_RPTR_RING1,0 ); - -WREG32_SOC15 (OSSSYS ,0 , mmIH_DOORBELL_RPTR_RING1, -vega10_ih_doorbell_rptr (ih)); - } - - ih = &adev->irq.ih2; -if (ih->ring_size) { -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_BASE_RING2, ih->gpu_addr >>8 ); -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_BASE_HI_RING2, - (ih->gpu_addr >>40 ) &0xff ); - - ih_rb_cntl =RREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL_RING2); - ih_rb_cntl =vega10_ih_rb_cntl (ih, ih_rb_cntl); - -if (amdgpu_sriov_vf (adev)) { -if (psp_reg_program (&adev->psp,PSP_REG_IH_RB_CNTL_RING2 , - ih_rb_cntl)) { -DRM_ERROR ("program IH_RB_CNTL_RING2 failed!\n" ); -return -ETIMEDOUT ; - } - }else { -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL_RING2, ih_rb_cntl); +for (i =0 ; i <ARRAY_SIZE (ih); i++) { +if (ih[i]->ring_size) { + ret =vega10_ih_enable_ring (adev, ih[i]); +if (ret) +return ret; } - -/* set rptr, wptr to 0 */ -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_WPTR_RING2,0 ); -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_RPTR_RING2,0 ); - -WREG32_SOC15 (OSSSYS ,0 , mmIH_DOORBELL_RPTR_RING2, -vega10_ih_doorbell_rptr (ih)); } tmp =RREG32_SOC15 (OSSSYS ,0 , mmIH_STORM_CLIENT_LIST_CNTL);
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 8/27 drm/amdgpu: use cached ih rb control reg offsets for vega10
In reply to Hawking Zhangall the ih rb control register offsets are cached at the beginning of ih_sw_init.
--- drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 54 +++++++------------------- 1 file changed, 14 insertions(+), 40 deletions(-)
drivers/gpu/drm/amd/amdgpu/vega10_ih.c +14 -40
@@ -344,25 +344,17 @@ static void vega10_ih_irq_disable(struct amdgpu_device *adev)static u32 vega10_ih_get_wptr (struct amdgpu_device *adev,struct amdgpu_ih_ring *ih) { -u32 wptr, reg, tmp; +u32 wptr, tmp; +struct amdgpu_ih_regs *ih_regs; wptr =le32_to_cpu (*ih->wptr_cpu); + ih_regs = &ih->ih_regs;if (!REG_GET_FIELD (wptr,IH_RB_WPTR ,RB_OVERFLOW )) goto out;/* Double check that the overflow wasn't already cleared. */ - -if (ih == &adev->irq.ih) - reg =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_WPTR); -else if (ih == &adev->irq.ih1) - reg =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_WPTR_RING1); -else if (ih == &adev->irq.ih2) - reg =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_WPTR_RING2); -else -BUG (); - - wptr =RREG32_NO_KIQ (reg); + wptr =RREG32_NO_KIQ (ih_regs->ih_rb_wptr);if (!REG_GET_FIELD (wptr,IH_RB_WPTR ,RB_OVERFLOW )) goto out;
@@ -378,18 +370,9 @@ static u32 vega10_ih_get_wptr(struct amdgpu_device *adev, wptr, ih->rptr, tmp); ih->rptr = tmp; -if (ih == &adev->irq.ih) - reg =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_CNTL); -else if (ih == &adev->irq.ih1) - reg =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_CNTL_RING1); -else if (ih == &adev->irq.ih2) - reg =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_CNTL_RING2); -else -BUG (); - - tmp =RREG32_NO_KIQ (reg); + tmp =RREG32_NO_KIQ (ih_regs->ih_rb_cntl); tmp =REG_SET_FIELD (tmp,IH_RB_CNTL ,WPTR_OVERFLOW_CLEAR ,1 ); -WREG32_NO_KIQ (reg, tmp); +WREG32_NO_KIQ (ih_regs->ih_rb_cntl, tmp); out:return (wptr & ih->ptr_mask);
@@ -450,22 +433,14 @@ static void vega10_ih_decode_iv(struct amdgpu_device *adev,static void vega10_ih_irq_rearm (struct amdgpu_device *adev,struct amdgpu_ih_ring *ih) { -uint32_t reg_rptr =0 ;uint32_t v =0 ;uint32_t i =0 ; +struct amdgpu_ih_regs *ih_regs; -if (ih == &adev->irq.ih) - reg_rptr =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_RPTR); -else if (ih == &adev->irq.ih1) - reg_rptr =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_RPTR_RING1); -else if (ih == &adev->irq.ih2) - reg_rptr =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_RPTR_RING2); -else -return ; - + ih_regs = &ih->ih_regs;/* Rearm IRQ / re-wwrite doorbell if doorbell write is lost */ for (i =0 ; i <MAX_REARM_RETRY ; i++) { - v =RREG32_NO_KIQ (reg_rptr); + v =RREG32_NO_KIQ (ih_regs->ih_rb_rptr);if ((v < ih->ring_size) && (v != ih->rptr))WDOORBELL32 (ih->doorbell_index, ih->rptr);else
@@ -484,6 +459,8 @@ static void vega10_ih_irq_rearm(struct amdgpu_device *adev,static void vega10_ih_set_rptr (struct amdgpu_device *adev,struct amdgpu_ih_ring *ih) { +struct amdgpu_ih_regs *ih_regs; +if (ih->use_doorbell) {/* XXX check if swapping is necessary on BE */ *ih->rptr_cpu = ih->rptr;
@@ -491,12 +468,9 @@ static void vega10_ih_set_rptr(struct amdgpu_device *adev,if (amdgpu_sriov_vf (adev))vega10_ih_irq_rearm (adev, ih); - }else if (ih == &adev->irq.ih) { -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_RPTR, ih->rptr); - }else if (ih == &adev->irq.ih1) { -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_RPTR_RING1, ih->rptr); - }else if (ih == &adev->irq.ih2) { -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_RPTR_RING2, ih->rptr); + }else { + ih_regs = &ih->ih_regs; +WREG32 (ih_regs->ih_rb_rptr, ih->rptr); } }
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 9/27 drm/amdgpu: correct ih cg programming for vega10 ih block
In reply to Hawking Zhangvega10/12 and RAVEN don't support soft override ih_buffer_mem_clk.
--- drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/vega10_ih.c +2 -6
@@ -640,15 +640,11 @@ static void vega10_ih_update_clockgating_state(struct amdgpu_device *adev, def = data =RREG32_SOC15 (OSSSYS ,0 , mmIH_CLK_CTRL); field_val = enable ?0 :1 ;/** -* Vega10 does not have IH_RETRY_INT_CAM_MEM_CLK_SOFT_OVERRIDE -* and IH_BUFFER_MEM_CLK_SOFT_OVERRIDE field. +* Vega10/12 and RAVEN don't have IH_BUFFER_MEM_CLK_SOFT_OVERRIDE field. */ -if (adev->asic_type >CHIP_VEGA10 ) { - data =REG_SET_FIELD (data,IH_CLK_CTRL , -IH_RETRY_INT_CAM_MEM_CLK_SOFT_OVERRIDE , field_val); +if (adev->asic_type ==CHIP_RENOIR ) data =REG_SET_FIELD (data,IH_CLK_CTRL ,IH_BUFFER_MEM_CLK_SOFT_OVERRIDE , field_val); - } data =REG_SET_FIELD (data,IH_CLK_CTRL ,DBUS_MUX_CLK_SOFT_OVERRIDE , field_val);
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 10/27 drm/amdgpu: add helper to init ih ring regs for navi10
In reply to Hawking Zhangnavi10_ih_init_register_offset will be used to init register offset for all the available ih rings
--- drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 47 ++++++++++++++++++++++++++ 1 file changed, 47 insertions(+)
drivers/gpu/drm/amd/amdgpu/navi10_ih.c +47 -0
@@ -39,6 +39,53 @@static void navi10_ih_set_interrupt_funcs (struct amdgpu_device *adev); +/** +* navi10_ih_init_register_offset - Initialize register offset for ih rings +* +* @adev: amdgpu_device pointer +* +* Initialize register offset ih rings (NAVI10). +*/ +static void navi10_ih_init_register_offset (struct amdgpu_device *adev) +{ +struct amdgpu_ih_regs *ih_regs; + +if (adev->irq.ih.ring_size) { + ih_regs = &adev->irq.ih.ih_regs; + ih_regs->ih_rb_base =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_BASE); + ih_regs->ih_rb_base_hi =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_BASE_HI); + ih_regs->ih_rb_cntl =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_CNTL); + ih_regs->ih_rb_wptr =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_WPTR); + ih_regs->ih_rb_rptr =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_RPTR); + ih_regs->ih_doorbell_rptr =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_DOORBELL_RPTR); + ih_regs->ih_rb_wptr_addr_lo =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_WPTR_ADDR_LO); + ih_regs->ih_rb_wptr_addr_hi =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_WPTR_ADDR_HI); + ih_regs->psp_reg_id =PSP_REG_IH_RB_CNTL ; + } + +if (adev->irq.ih1.ring_size) { + ih_regs = &adev->irq.ih1.ih_regs; + ih_regs->ih_rb_base =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_BASE_RING1); + ih_regs->ih_rb_base_hi =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_BASE_HI_RING1); + ih_regs->ih_rb_cntl =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_CNTL_RING1); + ih_regs->ih_rb_wptr =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_WPTR_RING1); + ih_regs->ih_rb_rptr =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_RPTR_RING1); + ih_regs->ih_doorbell_rptr =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_DOORBELL_RPTR_RING1); + ih_regs->psp_reg_id =PSP_REG_IH_RB_CNTL_RING1 ; + } + +if (adev->irq.ih2.ring_size) { + ih_regs = &adev->irq.ih2.ih_regs; + ih_regs->ih_rb_base =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_BASE_RING2); + ih_regs->ih_rb_base_hi =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_BASE_HI_RING2); + ih_regs->ih_rb_cntl =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_CNTL_RING2); + ih_regs->ih_rb_wptr =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_WPTR_RING2); + ih_regs->ih_rb_rptr =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_RPTR_RING2); + ih_regs->ih_doorbell_rptr =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_DOORBELL_RPTR_RING2); + ih_regs->psp_reg_id =PSP_REG_IH_RB_CNTL_RING2 ; + } +} +/** * force_update_wptr_for_self_int - Force update the wptr for self interrupt *
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 11/27 drm/amdgpu: add helper to enable an ih ring for navi10
In reply to Hawking Zhangnavi10_ih_enable_ring will be used to enable an ih ring for navi1x and onwards
--- drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 52 ++++++++++++++++++++++++++ 1 file changed, 52 insertions(+)
drivers/gpu/drm/amd/amdgpu/navi10_ih.c +52 -0
@@ -300,6 +300,58 @@ static uint32_t navi10_ih_doorbell_rptr(struct amdgpu_ih_ring *ih)return ih_doorbell_rtpr; } +/** +* navi10_ih_enable_ring - enable an ih ring buffer +* +* @adev: amdgpu_device pointer +* @ih: amdgpu_ih_ring pointer +* +* Enable an ih ring buffer (NAVI10) +*/ +static int navi10_ih_enable_ring (struct amdgpu_device *adev, +struct amdgpu_ih_ring *ih) +{ +struct amdgpu_ih_regs *ih_regs; +uint32_t tmp; + + ih_regs = &ih->ih_regs; + +/* Ring Buffer base. [39:8] of 40-bit address of the beginning of the ring buffer*/ +WREG32 (ih_regs->ih_rb_base, ih->gpu_addr >>8 ); +WREG32 (ih_regs->ih_rb_base_hi, (ih->gpu_addr >>40 ) &0xff ); + + tmp =RREG32 (ih_regs->ih_rb_cntl); + tmp =navi10_ih_rb_cntl (ih, tmp); +if (ih == &adev->irq.ih) + tmp =REG_SET_FIELD (tmp,IH_RB_CNTL ,RPTR_REARM , !!adev->irq.msi_enabled); +if (ih == &adev->irq.ih1) { + tmp =REG_SET_FIELD (tmp,IH_RB_CNTL ,WPTR_OVERFLOW_ENABLE ,0 ); + tmp =REG_SET_FIELD (tmp,IH_RB_CNTL ,RB_FULL_DRAIN_ENABLE ,1 ); + } +if (amdgpu_sriov_vf (adev) && adev->asic_type <CHIP_NAVI10 ) { +if (psp_reg_program (&adev->psp, ih_regs->psp_reg_id, tmp)) { +dev_err (adev->dev,"PSP program IH_RB_CNTL failed!\n" ); +return -ETIMEDOUT ; + } + }else { +WREG32 (ih_regs->ih_rb_cntl, tmp); + } + +if (ih == &adev->irq.ih) { +/* set the ih ring 0 writeback address whether it's enabled or not */ +WREG32 (ih_regs->ih_rb_wptr_addr_lo,lower_32_bits (ih->wptr_addr)); +WREG32 (ih_regs->ih_rb_wptr_addr_hi,upper_32_bits (ih->wptr_addr) &0xFFFF ); + } + +/* set rptr, wptr to 0 */ +WREG32 (ih_regs->ih_rb_wptr,0 ); +WREG32 (ih_regs->ih_rb_rptr,0 ); + +WREG32 (ih_regs->ih_doorbell_rptr,navi10_ih_doorbell_rptr (ih)); + +return 0 ; +} +static void navi10_ih_reroute_ih (struct amdgpu_device *adev) {uint32_t tmp;
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 12/27 drm/amdgpu: add helper to toggle ih ring interrupts for navi10
In reply to Hawking Zhangnavi10_ih_toggle_ring_interrupts will be used to enable/disable an ih ring interrupts for navi1x and onwards
--- drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 45 ++++++++++++++++++++++++++ 1 file changed, 45 insertions(+)
drivers/gpu/drm/amd/amdgpu/navi10_ih.c +45 -0
@@ -258,6 +258,51 @@ static void navi10_ih_disable_interrupts(struct amdgpu_device *adev) } +/** +* navi10_ih_toggle_ring_interrupts - toggle the interrupt ring buffer +* +* @adev: amdgpu_device pointer +* @ih: amdgpu_ih_ring pointet +* @enable: true - enable the interrupts, false - disable the interrupts +* +* Toggle the interrupt ring buffer (NAVI10) +*/ +static int navi10_ih_toggle_ring_interrupts (struct amdgpu_device *adev, +struct amdgpu_ih_ring *ih, +bool enable) +{ +struct amdgpu_ih_regs *ih_regs; +uint32_t tmp; + + ih_regs = &ih->ih_regs; + + tmp =RREG32 (ih_regs->ih_rb_cntl); + tmp =REG_SET_FIELD (tmp,IH_RB_CNTL ,RB_ENABLE , (enable ?1 :0 )); +/* enable_intr field is only valid in ring0 */ +if (ih == &adev->irq.ih) + tmp =REG_SET_FIELD (tmp,IH_RB_CNTL ,ENABLE_INTR , (enable ?1 :0 )); +if (amdgpu_sriov_vf (adev) && adev->asic_type <CHIP_NAVI10 ) { +if (psp_reg_program (&adev->psp, ih_regs->psp_reg_id, tmp)) { +dev_err (adev->dev,"PSP program IH_RB_CNTL failed!\n" ); +return -ETIMEDOUT ; + } + }else { +WREG32 (ih_regs->ih_rb_cntl, tmp); + } + +if (enable) { + ih->enabled = true; + }else { +/* set rptr, wptr to 0 */ +WREG32 (ih_regs->ih_rb_rptr,0 ); +WREG32 (ih_regs->ih_rb_wptr,0 ); + ih->enabled = false; + ih->rptr =0 ; + } + +return 0 ; +} +static uint32_t navi10_ih_rb_cntl (struct amdgpu_ih_ring *ih,uint32_t ih_rb_cntl) {int rb_bufsz =order_base_2 (ih->ring_size /4 );
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 13/27 drm/amdgpu: switch to ih_init_register_offset for navi10
In reply to Hawking ZhangInitialize ih control registers offset through helper function navi10_ih_init_register_offset.
--- drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/amdgpu/navi10_ih.c +3 -0
@@ -847,6 +847,9 @@ static int navi10_ih_sw_init(void *handle) (adev->doorbell_index.ih +2 ) <<1 ; } +/* initialize ih control registers offset */ +navi10_ih_init_register_offset (adev); + r =amdgpu_ih_ring_init (adev, &adev->irq.ih_soft,PAGE_SIZE , true);if (r)return r;
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 14/27 drm/amdgpu: switch to ih_toggle_interrupts for navi10
In reply to Hawking Zhangreplace ih_enable_interrupts and ih_disable_interrupts with ih_toggle_interrupts
--- drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 166 +++++-------------------- 1 file changed, 33 insertions(+), 133 deletions(-)
drivers/gpu/drm/amd/amdgpu/navi10_ih.c +33 -133
@@ -128,136 +128,6 @@ force_update_wptr_for_self_int(struct amdgpu_device *adev,WREG32_SOC15 (OSSSYS ,0 , mmIH_CNTL2, ih_cntl); } -/** -* navi10_ih_enable_interrupts - Enable the interrupt ring buffer -* -* @adev: amdgpu_device pointer -* -* Enable the interrupt ring buffer (NAVI10). -*/ -static void navi10_ih_enable_interrupts (struct amdgpu_device *adev) -{ -u32 ih_rb_cntl =RREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL); - - ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL ,RB_ENABLE ,1 ); - ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL ,ENABLE_INTR ,1 ); -if (amdgpu_sriov_vf (adev) && adev->asic_type <CHIP_NAVI10 ) { -if (psp_reg_program (&adev->psp,PSP_REG_IH_RB_CNTL , ih_rb_cntl)) { -DRM_ERROR ("PSP program IH_RB_CNTL failed!\n" ); -return ; - } - }else { -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL, ih_rb_cntl); - } - - adev->irq.ih.enabled = true; - -if (adev->irq.ih1.ring_size) { - ih_rb_cntl =RREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL_RING1); - ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL_RING1 , -RB_ENABLE ,1 ); -if (amdgpu_sriov_vf (adev) && adev->asic_type <CHIP_NAVI10 ) { -if (psp_reg_program (&adev->psp,PSP_REG_IH_RB_CNTL_RING1 , - ih_rb_cntl)) { -DRM_ERROR ("program IH_RB_CNTL_RING1 failed!\n" ); -return ; - } - }else { -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL_RING1, ih_rb_cntl); - } - adev->irq.ih1.enabled = true; - } - -if (adev->irq.ih2.ring_size) { - ih_rb_cntl =RREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL_RING2); - ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL_RING2 , -RB_ENABLE ,1 ); -if (amdgpu_sriov_vf (adev) && adev->asic_type <CHIP_NAVI10 ) { -if (psp_reg_program (&adev->psp,PSP_REG_IH_RB_CNTL_RING2 , - ih_rb_cntl)) { -DRM_ERROR ("program IH_RB_CNTL_RING2 failed!\n" ); -return ; - } - }else { -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL_RING2, ih_rb_cntl); - } - adev->irq.ih2.enabled = true; - } - -if (adev->irq.ih_soft.ring_size) - adev->irq.ih_soft.enabled = true; -} - -/** -* navi10_ih_disable_interrupts - Disable the interrupt ring buffer -* -* @adev: amdgpu_device pointer -* -* Disable the interrupt ring buffer (NAVI10). -*/ -static void navi10_ih_disable_interrupts (struct amdgpu_device *adev) -{ -u32 ih_rb_cntl =RREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL); - - ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL ,RB_ENABLE ,0 ); - ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL ,ENABLE_INTR ,0 ); -if (amdgpu_sriov_vf (adev) && adev->asic_type <CHIP_NAVI10 ) { -if (psp_reg_program (&adev->psp,PSP_REG_IH_RB_CNTL , ih_rb_cntl)) { -DRM_ERROR ("PSP program IH_RB_CNTL failed!\n" ); -return ; - } - }else { -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL, ih_rb_cntl); - } - -/* set rptr, wptr to 0 */ -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_RPTR,0 ); -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_WPTR,0 ); - adev->irq.ih.enabled = false; - adev->irq.ih.rptr =0 ; - -if (adev->irq.ih1.ring_size) { - ih_rb_cntl =RREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL_RING1); - ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL_RING1 , -RB_ENABLE ,0 ); -if (amdgpu_sriov_vf (adev) && adev->asic_type <CHIP_NAVI10 ) { -if (psp_reg_program (&adev->psp,PSP_REG_IH_RB_CNTL_RING1 , - ih_rb_cntl)) { -DRM_ERROR ("program IH_RB_CNTL_RING1 failed!\n" ); -return ; - } - }else { -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL_RING1, ih_rb_cntl); - } -/* set rptr, wptr to 0 */ -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_RPTR_RING1,0 ); -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_WPTR_RING1,0 ); - adev->irq.ih1.enabled = false; - adev->irq.ih1.rptr =0 ; - } - -if (adev->irq.ih2.ring_size) { - ih_rb_cntl =RREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL_RING2); - ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL_RING2 , -RB_ENABLE ,0 ); -if (amdgpu_sriov_vf (adev) && adev->asic_type <CHIP_NAVI10 ) { -if (psp_reg_program (&adev->psp,PSP_REG_IH_RB_CNTL_RING2 , - ih_rb_cntl)) { -DRM_ERROR ("program IH_RB_CNTL_RING2 failed!\n" ); -return ; - } - }else { -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL_RING2, ih_rb_cntl); - } -/* set rptr, wptr to 0 */ -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_RPTR_RING2,0 ); -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_WPTR_RING2,0 ); - adev->irq.ih2.enabled = false; - adev->irq.ih2.rptr =0 ; - } - -} -/** * navi10_ih_toggle_ring_interrupts - toggle the interrupt ring buffer *
@@ -303,6 +173,31 @@ static int navi10_ih_toggle_ring_interrupts(struct amdgpu_device *adev,return 0 ; } +/** +* navi10_ih_toggle_interrupts - Toggle all the available interrupt ring buffers +* +* @adev: amdgpu_device pointer +* @enable: enable or disable interrupt ring buffers +* +* Toggle all the available interrupt ring buffers (NAVI10). +*/ +static int navi10_ih_toggle_interrupts (struct amdgpu_device *adev,bool enable) +{ +struct amdgpu_ih_ring *ih[] = {&adev->irq.ih, &adev->irq.ih1, &adev->irq.ih2}; +int i; +int r; + +for (i =0 ; i <ARRAY_SIZE (ih); i++) { +if (ih[i]->ring_size) { + r =navi10_ih_toggle_ring_interrupts (adev, ih[i], enable); +if (r) +return r; + } + } + +return 0 ; +} +static uint32_t navi10_ih_rb_cntl (struct amdgpu_ih_ring *ih,uint32_t ih_rb_cntl) {int rb_bufsz =order_base_2 (ih->ring_size /4 );
@@ -431,9 +326,12 @@ static int navi10_ih_irq_init(struct amdgpu_device *adev)struct amdgpu_ih_ring *ih = &adev->irq.ih;u32 ih_rb_cntl, ih_chicken;u32 tmp; +int ret;/* disable irqs */ -navi10_ih_disable_interrupts (adev); + ret =navi10_ih_toggle_interrupts (adev, false); +if (ret) +return ret; adev->nbio.funcs->ih_control (adev);
@@ -562,7 +460,9 @@ static int navi10_ih_irq_init(struct amdgpu_device *adev)pci_set_master (adev->pdev);/* enable interrupts */ -navi10_ih_enable_interrupts (adev); + ret =navi10_ih_toggle_interrupts (adev, true); +if (ret) +return ret;/* enable wptr force update for self int */ force_update_wptr_for_self_int (adev,0 ,8 , true);
@@ -579,7 +479,7 @@ static int navi10_ih_irq_init(struct amdgpu_device *adev)static void navi10_ih_irq_disable (struct amdgpu_device *adev) {force_update_wptr_for_self_int (adev,0 ,8 , false); -navi10_ih_disable_interrupts (adev); +navi10_ih_toggle_interrupts (adev, false);/* Wait and acknowledge irq */ mdelay (1 );
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 15/27 drm/amdgpu: switch to ih_enable_ring for navi10
In reply to Hawking Zhanguse navi10_ih_enable_ring to enable all the available ring buffers for navi1x and onwards
--- drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 102 +++---------------------- 1 file changed, 12 insertions(+), 90 deletions(-)
drivers/gpu/drm/amd/amdgpu/navi10_ih.c +12 -90
@@ -323,10 +323,11 @@ static void navi10_ih_reroute_ih(struct amdgpu_device *adev)*/ static int navi10_ih_irq_init (struct amdgpu_device *adev) { -struct amdgpu_ih_ring *ih = &adev->irq.ih; -u32 ih_rb_cntl, ih_chicken; +struct amdgpu_ih_ring *ih[] = {&adev->irq.ih, &adev->irq.ih1, &adev->irq.ih2}; +u32 ih_chicken;u32 tmp;int ret; +int i;/* disable irqs */ ret =navi10_ih_toggle_interrupts (adev, false);
@@ -335,27 +336,8 @@ static int navi10_ih_irq_init(struct amdgpu_device *adev) adev->nbio.funcs->ih_control (adev); -/* Ring Buffer base. [39:8] of 40-bit address of the beginning of the ring buffer*/ -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_BASE, ih->gpu_addr >>8 ); -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_BASE_HI, (ih->gpu_addr >>40 ) &0xff ); - - ih_rb_cntl =RREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL); - ih_rb_cntl =navi10_ih_rb_cntl (ih, ih_rb_cntl); - ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL ,RPTR_REARM , - !!adev->irq.msi_enabled); -if (amdgpu_sriov_vf (adev) && adev->asic_type <CHIP_NAVI10 ) { -if (psp_reg_program (&adev->psp,PSP_REG_IH_RB_CNTL , ih_rb_cntl)) { -DRM_ERROR ("PSP program IH_RB_CNTL failed!\n" ); -return -ETIMEDOUT ; - } - }else { -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL, ih_rb_cntl); - } -if (adev->irq.ih1.ring_size) -navi10_ih_reroute_ih (adev); -if (unlikely (adev->firmware.load_type ==AMDGPU_FW_LOAD_DIRECT )) { -if (ih->use_bus_addr) { +if (ih[0 ]->use_bus_addr) {switch (adev->asic_type) {case CHIP_SIENNA_CICHLID :case CHIP_NAVY_FLOUNDER :
@@ -376,77 +358,17 @@ static int navi10_ih_irq_init(struct amdgpu_device *adev) } } -/* set the writeback address whether it's enabled or not */ -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_WPTR_ADDR_LO, -lower_32_bits (ih->wptr_addr)); -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_WPTR_ADDR_HI, -upper_32_bits (ih->wptr_addr) &0xFFFF ); - -/* set rptr, wptr to 0 */ -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_RPTR,0 ); -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_WPTR,0 ); - -WREG32_SOC15 (OSSSYS ,0 , mmIH_DOORBELL_RPTR, -navi10_ih_doorbell_rptr (ih)); - - adev->nbio.funcs->ih_doorbell_range (adev, ih->use_doorbell, - ih->doorbell_index); - - ih = &adev->irq.ih1; -if (ih->ring_size) { -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_BASE_RING1, ih->gpu_addr >>8 ); -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_BASE_HI_RING1, - (ih->gpu_addr >>40 ) &0xff ); - - ih_rb_cntl =RREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL_RING1); - ih_rb_cntl =navi10_ih_rb_cntl (ih, ih_rb_cntl); - ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL , -WPTR_OVERFLOW_ENABLE ,0 ); - ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL , -RB_FULL_DRAIN_ENABLE ,1 ); -if (amdgpu_sriov_vf (adev) && adev->asic_type <CHIP_NAVI10 ) { -if (psp_reg_program (&adev->psp,PSP_REG_IH_RB_CNTL_RING1 , - ih_rb_cntl)) { -DRM_ERROR ("program IH_RB_CNTL_RING1 failed!\n" ); -return -ETIMEDOUT ; - } - }else { -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL_RING1, ih_rb_cntl); - } -/* set rptr, wptr to 0 */ -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_WPTR_RING1,0 ); -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_RPTR_RING1,0 ); - -WREG32_SOC15 (OSSSYS ,0 , mmIH_DOORBELL_RPTR_RING1, -navi10_ih_doorbell_rptr (ih)); - } - - ih = &adev->irq.ih2; -if (ih->ring_size) { -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_BASE_RING2, ih->gpu_addr >>8 ); -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_BASE_HI_RING2, - (ih->gpu_addr >>40 ) &0xff ); - - ih_rb_cntl =RREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL_RING2); - ih_rb_cntl =navi10_ih_rb_cntl (ih, ih_rb_cntl); - -if (amdgpu_sriov_vf (adev) && adev->asic_type <CHIP_NAVI10 ) { -if (psp_reg_program (&adev->psp,PSP_REG_IH_RB_CNTL_RING2 , - ih_rb_cntl)) { -DRM_ERROR ("program IH_RB_CNTL_RING2 failed!\n" ); -return -ETIMEDOUT ; - } - }else { -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL_RING2, ih_rb_cntl); +for (i =0 ; i <ARRAY_SIZE (ih); i++) { +if (ih[i]->ring_size) { + ret =navi10_ih_enable_ring (adev, ih[i]); +if (ret) +return ret; } -/* set rptr, wptr to 0 */ -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_WPTR_RING2,0 ); -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_RPTR_RING2,0 ); - -WREG32_SOC15 (OSSSYS ,0 , mmIH_DOORBELL_RPTR_RING2, -navi10_ih_doorbell_rptr (ih)); } +/* update doorbell range for ih ring 0*/ + adev->nbio.funcs->ih_doorbell_range (adev, ih[0 ]->use_doorbell, + ih[0 ]->doorbell_index); tmp =RREG32_SOC15 (OSSSYS ,0 , mmIH_STORM_CLIENT_LIST_CNTL); tmp = REG_SET_FIELD(tmp, IH_STORM_CLIENT_LIST_CNTL,
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 16/27 drm/amdgpu: use cached ih rb control reg offsets for navi10
In reply to Hawking Zhangall the ih rb control register offsets are cached at the beginning of navi10 ih_sw_init.
--- drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 52 +++++++------------------- 1 file changed, 14 insertions(+), 38 deletions(-)
drivers/gpu/drm/amd/amdgpu/navi10_ih.c +14 -38
@@ -421,23 +421,16 @@ static void navi10_ih_irq_disable(struct amdgpu_device *adev)static u32 navi10_ih_get_wptr (struct amdgpu_device *adev,struct amdgpu_ih_ring *ih) { -u32 wptr, reg, tmp; +u32 wptr, tmp; +struct amdgpu_ih_regs *ih_regs; wptr =le32_to_cpu (*ih->wptr_cpu); + ih_regs = &ih->ih_regs;if (!REG_GET_FIELD (wptr,IH_RB_WPTR ,RB_OVERFLOW )) goto out; -if (ih == &adev->irq.ih) - reg =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_WPTR); -else if (ih == &adev->irq.ih1) - reg =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_WPTR_RING1); -else if (ih == &adev->irq.ih2) - reg =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_WPTR_RING2); -else -BUG (); - - wptr =RREG32_NO_KIQ (reg); + wptr =RREG32_NO_KIQ (ih_regs->ih_rb_wptr);if (!REG_GET_FIELD (wptr,IH_RB_WPTR ,RB_OVERFLOW )) goto out; wptr =REG_SET_FIELD (wptr,IH_RB_WPTR ,RB_OVERFLOW ,0 );
@@ -452,18 +445,9 @@ static u32 navi10_ih_get_wptr(struct amdgpu_device *adev, wptr, ih->rptr, tmp); ih->rptr = tmp; -if (ih == &adev->irq.ih) - reg =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_CNTL); -else if (ih == &adev->irq.ih1) - reg =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_CNTL_RING1); -else if (ih == &adev->irq.ih2) - reg =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_CNTL_RING2); -else -BUG (); - - tmp =RREG32_NO_KIQ (reg); + tmp =RREG32_NO_KIQ (ih_regs->ih_rb_cntl); tmp =REG_SET_FIELD (tmp,IH_RB_CNTL ,WPTR_OVERFLOW_CLEAR ,1 ); -WREG32_NO_KIQ (reg, tmp); +WREG32_NO_KIQ (ih_regs->ih_rb_cntl, tmp); out:return (wptr & ih->ptr_mask); }
@@ -523,22 +507,15 @@ static void navi10_ih_decode_iv(struct amdgpu_device *adev,static void navi10_ih_irq_rearm (struct amdgpu_device *adev,struct amdgpu_ih_ring *ih) { -uint32_t reg_rptr =0 ;uint32_t v =0 ;uint32_t i =0 ; +struct amdgpu_ih_regs *ih_regs; -if (ih == &adev->irq.ih) - reg_rptr =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_RPTR); -else if (ih == &adev->irq.ih1) - reg_rptr =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_RPTR_RING1); -else if (ih == &adev->irq.ih2) - reg_rptr =SOC15_REG_OFFSET (OSSSYS ,0 , mmIH_RB_RPTR_RING2); -else -return ; + ih_regs = &ih->ih_regs;/* Rearm IRQ / re-write doorbell if doorbell write is lost */ for (i =0 ; i <MAX_REARM_RETRY ; i++) { - v =RREG32_NO_KIQ (reg_rptr); + v =RREG32_NO_KIQ (ih_regs->ih_rb_rptr);if ((v < ih->ring_size) && (v != ih->rptr))WDOORBELL32 (ih->doorbell_index, ih->rptr);else
@@ -557,6 +534,8 @@ static void navi10_ih_irq_rearm(struct amdgpu_device *adev,static void navi10_ih_set_rptr (struct amdgpu_device *adev,struct amdgpu_ih_ring *ih) { +struct amdgpu_ih_regs *ih_regs; +if (ih->use_doorbell) {/* XXX check if swapping is necessary on BE */ *ih->rptr_cpu = ih->rptr;
@@ -564,12 +543,9 @@ static void navi10_ih_set_rptr(struct amdgpu_device *adev,if (amdgpu_sriov_vf (adev))navi10_ih_irq_rearm (adev, ih); - }else if (ih == &adev->irq.ih) { -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_RPTR, ih->rptr); - }else if (ih == &adev->irq.ih1) { -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_RPTR_RING1, ih->rptr); - }else if (ih == &adev->irq.ih2) { -WREG32_SOC15 (OSSSYS ,0 , mmIH_RB_RPTR_RING2, ih->rptr); + }else { + ih_regs = &ih->ih_regs; +WREG32 (ih_regs->ih_rb_rptr, ih->rptr); } }
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 17/27 drm/amdgpu: add a helper function to decode iv
In reply to Hawking Zhangsince from soc15, all the chips share the same iv format. create a common helper to decode iv
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 43 ++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 4 ++- 2 files changed, 46 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c +43 -0
@@ -205,3 +205,46 @@ int amdgpu_ih_process(struct amdgpu_device *adev, struct amdgpu_ih_ring *ih)return IRQ_HANDLED ; } +/** +* amdgpu_ih_decode_iv_helper - decode an interrupt vector +* +* @adev: amdgpu_device pointer +* +* Decodes the interrupt vector at the current rptr +* position and also advance the position for for Vega10 +* and later GPUs. +*/ +void amdgpu_ih_decode_iv_helper (struct amdgpu_device *adev, +struct amdgpu_ih_ring *ih, +struct amdgpu_iv_entry *entry) +{ +/* wptr/rptr are in bytes! */ +u32 ring_index = ih->rptr >>2 ; +uint32_t dw[8 ]; + + dw[0 ] =le32_to_cpu (ih->ring[ring_index +0 ]); + dw[1 ] =le32_to_cpu (ih->ring[ring_index +1 ]); + dw[2 ] =le32_to_cpu (ih->ring[ring_index +2 ]); + dw[3 ] =le32_to_cpu (ih->ring[ring_index +3 ]); + dw[4 ] =le32_to_cpu (ih->ring[ring_index +4 ]); + dw[5 ] =le32_to_cpu (ih->ring[ring_index +5 ]); + dw[6 ] =le32_to_cpu (ih->ring[ring_index +6 ]); + dw[7 ] =le32_to_cpu (ih->ring[ring_index +7 ]); + + entry->client_id = dw[0 ] &0xff ; + entry->src_id = (dw[0 ] >>8 ) &0xff ; + entry->ring_id = (dw[0 ] >>16 ) &0xff ; + entry->vmid = (dw[0 ] >>24 ) &0xf ; + entry->vmid_src = (dw[0 ] >>31 ); + entry->timestamp = dw[1 ] | ((u64)(dw[2 ] &0xffff ) <<32 ); + entry->timestamp_src = dw[2 ] >>31 ; + entry->pasid = dw[3 ] &0xffff ; + entry->pasid_src = dw[3 ] >>31 ; + entry->src_data[0 ] = dw[4 ]; + entry->src_data[1 ] = dw[5 ]; + entry->src_data[2 ] = dw[6 ]; + entry->src_data[3 ] = dw[7 ]; + +/* wptr/rptr are in bytes! */ + ih->rptr +=32 ; +}
drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h +3 -1
@@ -88,5 +88,7 @@ void amdgpu_ih_ring_fini(struct amdgpu_device *adev, struct amdgpu_ih_ring *ih);void amdgpu_ih_ring_write (struct amdgpu_ih_ring *ih,const uint32_t *iv,unsigned int num_dw);int amdgpu_ih_process (struct amdgpu_device *adev,struct amdgpu_ih_ring *ih); - +void amdgpu_ih_decode_iv_helper (struct amdgpu_device *adev, +struct amdgpu_ih_ring *ih, +struct amdgpu_iv_entry *entry);#endif
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 18/27 drm/amdgpu: switch to common decode iv helper
In reply to Hawking ZhangThe iv format is the same for all the soc15 adpater and onwards and can share a common function to decode iv.
--- drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 47 +------------------------- drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 47 +------------------------- 2 files changed, 2 insertions(+), 92 deletions(-)
drivers/gpu/drm/amd/amdgpu/navi10_ih.c +1 -46
@@ -452,51 +452,6 @@ static u32 navi10_ih_get_wptr(struct amdgpu_device *adev,return (wptr & ih->ptr_mask); } -/** -* navi10_ih_decode_iv - decode an interrupt vector -* -* @adev: amdgpu_device pointer -* @ih: IH ring buffer to decode -* @entry: IV entry to place decoded information into -* -* Decodes the interrupt vector at the current rptr -* position and also advance the position. -*/ -static void navi10_ih_decode_iv (struct amdgpu_device *adev, -struct amdgpu_ih_ring *ih, -struct amdgpu_iv_entry *entry) -{ -/* wptr/rptr are in bytes! */ -u32 ring_index = ih->rptr >>2 ; -uint32_t dw[8 ]; - - dw[0 ] =le32_to_cpu (ih->ring[ring_index +0 ]); - dw[1 ] =le32_to_cpu (ih->ring[ring_index +1 ]); - dw[2 ] =le32_to_cpu (ih->ring[ring_index +2 ]); - dw[3 ] =le32_to_cpu (ih->ring[ring_index +3 ]); - dw[4 ] =le32_to_cpu (ih->ring[ring_index +4 ]); - dw[5 ] =le32_to_cpu (ih->ring[ring_index +5 ]); - dw[6 ] =le32_to_cpu (ih->ring[ring_index +6 ]); - dw[7 ] =le32_to_cpu (ih->ring[ring_index +7 ]); - - entry->client_id = dw[0 ] &0xff ; - entry->src_id = (dw[0 ] >>8 ) &0xff ; - entry->ring_id = (dw[0 ] >>16 ) &0xff ; - entry->vmid = (dw[0 ] >>24 ) &0xf ; - entry->vmid_src = (dw[0 ] >>31 ); - entry->timestamp = dw[1 ] | ((u64)(dw[2 ] &0xffff ) <<32 ); - entry->timestamp_src = dw[2 ] >>31 ; - entry->pasid = dw[3 ] &0xffff ; - entry->pasid_src = dw[3 ] >>31 ; - entry->src_data[0 ] = dw[4 ]; - entry->src_data[1 ] = dw[5 ]; - entry->src_data[2 ] = dw[6 ]; - entry->src_data[3 ] = dw[7 ]; - -/* wptr/rptr are in bytes! */ - ih->rptr +=32 ; -} -/** * navi10_ih_irq_rearm - rearm IRQ if lost *
@@ -793,7 +748,7 @@ static const struct amd_ip_funcs navi10_ih_ip_funcs = {static const struct amdgpu_ih_funcs navi10_ih_funcs = { .get_wptr = navi10_ih_get_wptr, - .decode_iv = navi10_ih_decode_iv, + .decode_iv = amdgpu_ih_decode_iv_helper, .set_rptr = navi10_ih_set_rptr };
drivers/gpu/drm/amd/amdgpu/vega10_ih.c +1 -46
59 lines not on this page · raw message
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 19/27 drm/amdgpu: add osssys v4_2 ip headers (v2)
In reply to Hawking Zhangv1: add osssys v4_2 register offset and shift masks header files. vega20 and arcturus will refer to these ip headers. (Hawking)
v2: clean up osssys v4_2 registers (Alex)
--- .../asic_reg/oss/osssys_4_2_0_offset.h | 345 +++++ .../asic_reg/oss/osssys_4_2_0_sh_mask.h | 1300 +++++++++++++++++ 2 files changed, 1645 insertions(+) create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/osssys_4_2_0_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/osssys_4_2_0_sh_mask.h
drivers/gpu/drm/amd/include/asic_reg/oss/osssys_4_2_0_offset.h new file +345 -0
@@ -0,0 +1,345 @@ +/* +* Copyright 2020 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +*/ +#ifndef _osssys_4_2_0_OFFSET_HEADER +#define _osssys_4_2_0_OFFSET_HEADER + + + +// addressBlock: osssys_osssysdec +// base address: 0x4280 +#define mmIH_VMID_0_LUT 0x0000 +#define mmIH_VMID_0_LUT_BASE_IDX 0 +#define mmIH_VMID_1_LUT 0x0001 +#define mmIH_VMID_1_LUT_BASE_IDX 0 +#define mmIH_VMID_2_LUT 0x0002 +#define mmIH_VMID_2_LUT_BASE_IDX 0 +#define mmIH_VMID_3_LUT 0x0003 +#define mmIH_VMID_3_LUT_BASE_IDX 0 +#define mmIH_VMID_4_LUT 0x0004 +#define mmIH_VMID_4_LUT_BASE_IDX 0 +#define mmIH_VMID_5_LUT 0x0005 +#define mmIH_VMID_5_LUT_BASE_IDX 0 +#define mmIH_VMID_6_LUT 0x0006 +#define mmIH_VMID_6_LUT_BASE_IDX 0 +#define mmIH_VMID_7_LUT 0x0007 +#define mmIH_VMID_7_LUT_BASE_IDX 0 +#define mmIH_VMID_8_LUT 0x0008 +#define mmIH_VMID_8_LUT_BASE_IDX 0 +#define mmIH_VMID_9_LUT 0x0009 +#define mmIH_VMID_9_LUT_BASE_IDX 0 +#define mmIH_VMID_10_LUT 0x000a +#define mmIH_VMID_10_LUT_BASE_IDX 0 +#define mmIH_VMID_11_LUT 0x000b +#define mmIH_VMID_11_LUT_BASE_IDX 0 +#define mmIH_VMID_12_LUT 0x000c +#define mmIH_VMID_12_LUT_BASE_IDX 0 +#define mmIH_VMID_13_LUT 0x000d +#define mmIH_VMID_13_LUT_BASE_IDX 0 +#define mmIH_VMID_14_LUT 0x000e +#define mmIH_VMID_14_LUT_BASE_IDX 0 +#define mmIH_VMID_15_LUT 0x000f +#define mmIH_VMID_15_LUT_BASE_IDX 0 +#define mmIH_VMID_0_LUT_MM 0x0010 +#define mmIH_VMID_0_LUT_MM_BASE_IDX 0 +#define mmIH_VMID_1_LUT_MM 0x0011 +#define mmIH_VMID_1_LUT_MM_BASE_IDX 0 +#define mmIH_VMID_2_LUT_MM 0x0012 +#define mmIH_VMID_2_LUT_MM_BASE_IDX 0 +#define mmIH_VMID_3_LUT_MM 0x0013 +#define mmIH_VMID_3_LUT_MM_BASE_IDX 0 +#define mmIH_VMID_4_LUT_MM 0x0014 +#define mmIH_VMID_4_LUT_MM_BASE_IDX 0 +#define mmIH_VMID_5_LUT_MM 0x0015 +#define mmIH_VMID_5_LUT_MM_BASE_IDX 0 +#define mmIH_VMID_6_LUT_MM 0x0016 +#define mmIH_VMID_6_LUT_MM_BASE_IDX 0 +#define mmIH_VMID_7_LUT_MM 0x0017 +#define mmIH_VMID_7_LUT_MM_BASE_IDX 0 +#define mmIH_VMID_8_LUT_MM 0x0018 +#define mmIH_VMID_8_LUT_MM_BASE_IDX 0 +#define mmIH_VMID_9_LUT_MM 0x0019 +#define mmIH_VMID_9_LUT_MM_BASE_IDX 0 +#define mmIH_VMID_10_LUT_MM 0x001a +#define mmIH_VMID_10_LUT_MM_BASE_IDX 0 +#define mmIH_VMID_11_LUT_MM 0x001b +#define mmIH_VMID_11_LUT_MM_BASE_IDX 0 +#define mmIH_VMID_12_LUT_MM 0x001c +#define mmIH_VMID_12_LUT_MM_BASE_IDX 0 +#define mmIH_VMID_13_LUT_MM 0x001d +#define mmIH_VMID_13_LUT_MM_BASE_IDX 0 +#define mmIH_VMID_14_LUT_MM 0x001e +#define mmIH_VMID_14_LUT_MM_BASE_IDX 0 +#define mmIH_VMID_15_LUT_MM 0x001f +#define mmIH_VMID_15_LUT_MM_BASE_IDX 0 +#define mmIH_COOKIE_0 0x0020 +#define mmIH_COOKIE_0_BASE_IDX 0 +#define mmIH_COOKIE_1 0x0021 +#define mmIH_COOKIE_1_BASE_IDX 0 +#define mmIH_COOKIE_2 0x0022 +#define mmIH_COOKIE_2_BASE_IDX 0 +#define mmIH_COOKIE_3 0x0023 +#define mmIH_COOKIE_3_BASE_IDX 0 +#define mmIH_COOKIE_4 0x0024 +#define mmIH_COOKIE_4_BASE_IDX 0 +#define mmIH_COOKIE_5 0x0025 +#define mmIH_COOKIE_5_BASE_IDX 0 +#define mmIH_COOKIE_6 0x0026 +#define mmIH_COOKIE_6_BASE_IDX 0 +#define mmIH_COOKIE_7 0x0027 +#define mmIH_COOKIE_7_BASE_IDX 0 +#define mmIH_REGISTER_LAST_PART0 0x003f +#define mmIH_REGISTER_LAST_PART0_BASE_IDX 0 +#define mmSEM_REQ_INPUT_0 0x0040 +#define mmSEM_REQ_INPUT_0_BASE_IDX 0 +#define mmSEM_REQ_INPUT_1 0x0041 +#define mmSEM_REQ_INPUT_1_BASE_IDX 0 +#define mmSEM_REQ_INPUT_2 0x0042 +#define mmSEM_REQ_INPUT_2_BASE_IDX 0 +#define mmSEM_REQ_INPUT_3 0x0043 +#define mmSEM_REQ_INPUT_3_BASE_IDX 0 +#define mmSEM_REGISTER_LAST_PART0 0x007f +#define mmSEM_REGISTER_LAST_PART0_BASE_IDX 0 +#define mmIH_RB_CNTL 0x0080 +#define mmIH_RB_CNTL_BASE_IDX 0 +#define mmIH_RB_BASE 0x0081 +#define mmIH_RB_BASE_BASE_IDX 0 +#define mmIH_RB_BASE_HI 0x0082 +#define mmIH_RB_BASE_HI_BASE_IDX 0 +#define mmIH_RB_RPTR 0x0083 +#define mmIH_RB_RPTR_BASE_IDX 0 +#define mmIH_RB_WPTR 0x0084 +#define mmIH_RB_WPTR_BASE_IDX 0 +#define mmIH_RB_WPTR_ADDR_HI 0x0085 +#define mmIH_RB_WPTR_ADDR_HI_BASE_IDX 0 +#define mmIH_RB_WPTR_ADDR_LO 0x0086 +#define mmIH_RB_WPTR_ADDR_LO_BASE_IDX 0 +#define mmIH_DOORBELL_RPTR 0x0087 +#define mmIH_DOORBELL_RPTR_BASE_IDX 0 +#define mmIH_RB_CNTL_RING1 0x008c +#define mmIH_RB_CNTL_RING1_BASE_IDX 0 +#define mmIH_RB_BASE_RING1 0x008d +#define mmIH_RB_BASE_RING1_BASE_IDX 0 +#define mmIH_RB_BASE_HI_RING1 0x008e +#define mmIH_RB_BASE_HI_RING1_BASE_IDX 0 +#define mmIH_RB_RPTR_RING1 0x008f +#define mmIH_RB_RPTR_RING1_BASE_IDX 0 +#define mmIH_RB_WPTR_RING1 0x0090 +#define mmIH_RB_WPTR_RING1_BASE_IDX 0 +#define mmIH_DOORBELL_RPTR_RING1 0x0093 +#define mmIH_DOORBELL_RPTR_RING1_BASE_IDX 0 +#define mmIH_RB_CNTL_RING2 0x0098 +#define mmIH_RB_CNTL_RING2_BASE_IDX 0 +#define mmIH_RB_BASE_RING2 0x0099 +#define mmIH_RB_BASE_RING2_BASE_IDX 0 +#define mmIH_RB_BASE_HI_RING2 0x009a +#define mmIH_RB_BASE_HI_RING2_BASE_IDX 0 +#define mmIH_RB_RPTR_RING2 0x009b +#define mmIH_RB_RPTR_RING2_BASE_IDX 0 +#define mmIH_RB_WPTR_RING2 0x009c +#define mmIH_RB_WPTR_RING2_BASE_IDX 0 +#define mmIH_DOORBELL_RPTR_RING2 0x009f +#define mmIH_DOORBELL_RPTR_RING2_BASE_IDX 0 +#define mmIH_VERSION 0x00a5 +#define mmIH_VERSION_BASE_IDX 0 +#define mmIH_CNTL 0x00c0 +#define mmIH_CNTL_BASE_IDX 0 +#define mmIH_CNTL2 0x00c1 +#define mmIH_CNTL2_BASE_IDX 0 +#define mmIH_STATUS 0x00c2 +#define mmIH_STATUS_BASE_IDX 0 +#define mmIH_PERFMON_CNTL 0x00c3 +#define mmIH_PERFMON_CNTL_BASE_IDX 0 +#define mmIH_PERFCOUNTER0_RESULT 0x00c4 +#define mmIH_PERFCOUNTER0_RESULT_BASE_IDX 0 +#define mmIH_PERFCOUNTER1_RESULT 0x00c5 +#define mmIH_PERFCOUNTER1_RESULT_BASE_IDX 0 +#define mmIH_DSM_MATCH_VALUE_BIT_31_0 0x00c7 +#define mmIH_DSM_MATCH_VALUE_BIT_31_0_BASE_IDX 0 +#define mmIH_DSM_MATCH_VALUE_BIT_63_32 0x00c8 +#define mmIH_DSM_MATCH_VALUE_BIT_63_32_BASE_IDX 0 +#define mmIH_DSM_MATCH_VALUE_BIT_95_64 0x00c9 +#define mmIH_DSM_MATCH_VALUE_BIT_95_64_BASE_IDX 0 +#define mmIH_DSM_MATCH_FIELD_CONTROL 0x00ca +#define mmIH_DSM_MATCH_FIELD_CONTROL_BASE_IDX 0 +#define mmIH_DSM_MATCH_DATA_CONTROL 0x00cb +#define mmIH_DSM_MATCH_DATA_CONTROL_BASE_IDX 0 +#define mmIH_DSM_MATCH_FCN_ID 0x00cc +#define mmIH_DSM_MATCH_FCN_ID_BASE_IDX 0 +#define mmIH_LIMIT_INT_RATE_CNTL 0x00cd +#define mmIH_LIMIT_INT_RATE_CNTL_BASE_IDX 0 +#define mmIH_VF_RB_STATUS 0x00ce +#define mmIH_VF_RB_STATUS_BASE_IDX 0 +#define mmIH_VF_RB_STATUS2 0x00cf +#define mmIH_VF_RB_STATUS2_BASE_IDX 0 +#define mmIH_VF_RB1_STATUS 0x00d0 +#define mmIH_VF_RB1_STATUS_BASE_IDX 0 +#define mmIH_VF_RB1_STATUS2 0x00d1 +#define mmIH_VF_RB1_STATUS2_BASE_IDX 0 +#define mmIH_VF_RB2_STATUS 0x00d2 +#define mmIH_VF_RB2_STATUS_BASE_IDX 0 +#define mmIH_VF_RB2_STATUS2 0x00d3 +#define mmIH_VF_RB2_STATUS2_BASE_IDX 0 +#define mmIH_INT_FLOOD_CNTL 0x00d5 +#define mmIH_INT_FLOOD_CNTL_BASE_IDX 0 +#define mmIH_RB0_INT_FLOOD_STATUS 0x00d6 +#define mmIH_RB0_INT_FLOOD_STATUS_BASE_IDX 0 +#define mmIH_RB1_INT_FLOOD_STATUS 0x00d7 +#define mmIH_RB1_INT_FLOOD_STATUS_BASE_IDX 0 +#define mmIH_RB2_INT_FLOOD_STATUS 0x00d8 +#define mmIH_RB2_INT_FLOOD_STATUS_BASE_IDX 0 +#define mmIH_INT_FLOOD_STATUS 0x00d9 +#define mmIH_INT_FLOOD_STATUS_BASE_IDX 0 +#define mmIH_STORM_CLIENT_LIST_CNTL 0x00da +#define mmIH_STORM_CLIENT_LIST_CNTL_BASE_IDX 0 +#define mmIH_CLK_CTRL 0x00db +#define mmIH_CLK_CTRL_BASE_IDX 0 +#define mmIH_INT_FLAGS 0x00dc +#define mmIH_INT_FLAGS_BASE_IDX 0 +#define mmIH_LAST_INT_INFO0 0x00dd +#define mmIH_LAST_INT_INFO0_BASE_IDX 0 +#define mmIH_LAST_INT_INFO1 0x00de +#define mmIH_LAST_INT_INFO1_BASE_IDX 0 +#define mmIH_LAST_INT_INFO2 0x00df +#define mmIH_LAST_INT_INFO2_BASE_IDX 0 +#define mmIH_SCRATCH 0x00e0 +#define mmIH_SCRATCH_BASE_IDX 0 +#define mmIH_CLIENT_CREDIT_ERROR 0x00e1 +#define mmIH_CLIENT_CREDIT_ERROR_BASE_IDX 0 +#define mmIH_GPU_IOV_VIOLATION_LOG 0x00e2 +#define mmIH_GPU_IOV_VIOLATION_LOG_BASE_IDX 0 +#define mmIH_COOKIE_REC_VIOLATION_LOG 0x00e3 +#define mmIH_COOKIE_REC_VIOLATION_LOG_BASE_IDX 0 +#define mmIH_CREDIT_STATUS 0x00e4 +#define mmIH_CREDIT_STATUS_BASE_IDX 0 +#define mmIH_MMHUB_ERROR 0x00e5 +#define mmIH_MMHUB_ERROR_BASE_IDX 0 +#define mmIH_MEM_POWER_CTRL 0x00e8 +#define mmIH_MEM_POWER_CTRL_BASE_IDX 0 +#define mmIH_REGISTER_LAST_PART2 0x00ff +#define mmIH_REGISTER_LAST_PART2_BASE_IDX 0 +#define mmSEM_CLK_CTRL 0x0100 +#define mmSEM_CLK_CTRL_BASE_IDX 0 +#define mmSEM_UTC_CREDIT 0x0101 +#define mmSEM_UTC_CREDIT_BASE_IDX 0 +#define mmSEM_UTC_CONFIG 0x0102 +#define mmSEM_UTC_CONFIG_BASE_IDX 0 +#define mmSEM_UTCL2_TRAN_EN_LUT 0x0103 +#define mmSEM_UTCL2_TRAN_EN_LUT_BASE_IDX 0 +#define mmSEM_MCIF_CONFIG 0x0104 +#define mmSEM_MCIF_CONFIG_BASE_IDX 0 +#define mmSEM_PERFMON_CNTL 0x0105 +#define mmSEM_PERFMON_CNTL_BASE_IDX 0 +#define mmSEM_PERFCOUNTER0_RESULT 0x0106 +#define mmSEM_PERFCOUNTER0_RESULT_BASE_IDX 0 +#define mmSEM_PERFCOUNTER1_RESULT 0x0107 +#define mmSEM_PERFCOUNTER1_RESULT_BASE_IDX 0 +#define mmSEM_STATUS 0x0108 +#define mmSEM_STATUS_BASE_IDX 0 +#define mmSEM_MAILBOX_CLIENTCONFIG 0x0109 +#define mmSEM_MAILBOX_CLIENTCONFIG_BASE_IDX 0 +#define mmSEM_MAILBOX 0x010a +#define mmSEM_MAILBOX_BASE_IDX 0 +#define mmSEM_MAILBOX_CONTROL 0x010b +#define mmSEM_MAILBOX_CONTROL_BASE_IDX 0 +#define mmSEM_CHICKEN_BITS 0x010c +#define mmSEM_CHICKEN_BITS_BASE_IDX 0 +#define mmSEM_MAILBOX_CLIENTCONFIG_EXTRA 0x010d +#define mmSEM_MAILBOX_CLIENTCONFIG_EXTRA_BASE_IDX 0 +#define mmSEM_GPU_IOV_VIOLATION_LOG 0x010e +#define mmSEM_GPU_IOV_VIOLATION_LOG_BASE_IDX 0 +#define mmSEM_OUTSTANDING_THRESHOLD 0x010f +#define mmSEM_OUTSTANDING_THRESHOLD_BASE_IDX 0 +#define mmSEM_MEM_POWER_CTRL 0x0110 +#define mmSEM_MEM_POWER_CTRL_BASE_IDX 0 +#define mmSEM_REGISTER_LAST_PART2 0x017f +#define mmSEM_REGISTER_LAST_PART2_BASE_IDX 0 +#define mmIH_ACTIVE_FCN_ID 0x0180 +#define mmIH_ACTIVE_FCN_ID_BASE_IDX 0 +#define mmIH_VIRT_RESET_REQ 0x0181 +#define mmIH_VIRT_RESET_REQ_BASE_IDX 0 +#define mmIH_CLIENT_CFG 0x0184 +#define mmIH_CLIENT_CFG_BASE_IDX 0 +#define mmIH_CLIENT_CFG_INDEX 0x0188 +#define mmIH_CLIENT_CFG_INDEX_BASE_IDX 0 +#define mmIH_CLIENT_CFG_DATA 0x0189 +#define mmIH_CLIENT_CFG_DATA_BASE_IDX 0 +#define mmIH_CID_REMAP_INDEX 0x018a +#define mmIH_CID_REMAP_INDEX_BASE_IDX 0 +#define mmIH_CID_REMAP_DATA 0x018b +#define mmIH_CID_REMAP_DATA_BASE_IDX 0 +#define mmIH_CHICKEN 0x018c +#define mmIH_CHICKEN_BASE_IDX 0 +#define mmIH_MMHUB_CNTL 0x018d +#define mmIH_MMHUB_CNTL_BASE_IDX 0 +#define mmIH_INT_DROP_CNTL 0x018e +#define mmIH_INT_DROP_CNTL_BASE_IDX 0 +#define mmIH_INT_DROP_MATCH_VALUE0 0x018f +#define mmIH_INT_DROP_MATCH_VALUE0_BASE_IDX 0 +#define mmIH_INT_DROP_MATCH_VALUE1 0x0190 +#define mmIH_INT_DROP_MATCH_VALUE1_BASE_IDX 0 +#define mmIH_INT_DROP_MATCH_MASK0 0x0191 +#define mmIH_INT_DROP_MATCH_MASK0_BASE_IDX 0 +#define mmIH_INT_DROP_MATCH_MASK1 0x0192 +#define mmIH_INT_DROP_MATCH_MASK1_BASE_IDX 0 +#define mmIH_REGISTER_LAST_PART1 0x019f +#define mmIH_REGISTER_LAST_PART1_BASE_IDX 0 +#define mmSEM_ACTIVE_FCN_ID 0x01a0 +#define mmSEM_ACTIVE_FCN_ID_BASE_IDX 0 +#define mmSEM_VIRT_RESET_REQ 0x01a1 +#define mmSEM_VIRT_RESET_REQ_BASE_IDX 0 +#define mmSEM_RESP_SDMA0 0x01a4 +#define mmSEM_RESP_SDMA0_BASE_IDX 0 +#define mmSEM_RESP_SDMA1 0x01a5 +#define mmSEM_RESP_SDMA1_BASE_IDX 0 +#define mmSEM_RESP_UVD 0x01a6 +#define mmSEM_RESP_UVD_BASE_IDX 0 +#define mmSEM_RESP_VCE_0 0x01a7 +#define mmSEM_RESP_VCE_0_BASE_IDX 0 +#define mmSEM_RESP_ACP 0x01a8 +#define mmSEM_RESP_ACP_BASE_IDX 0 +#define mmSEM_RESP_ISP 0x01a9 +#define mmSEM_RESP_ISP_BASE_IDX 0 +#define mmSEM_RESP_VCE_1 0x01aa +#define mmSEM_RESP_VCE_1_BASE_IDX 0 +#define mmSEM_RESP_VP8 0x01ab +#define mmSEM_RESP_VP8_BASE_IDX 0 +#define mmSEM_RESP_GC 0x01ac +#define mmSEM_RESP_GC_BASE_IDX 0 +#define mmSEM_RESP_UVD_1 0x01ad +#define mmSEM_RESP_UVD_1_BASE_IDX 0 +#define mmSEM_CID_REMAP_INDEX 0x01b0 +#define mmSEM_CID_REMAP_INDEX_BASE_IDX 0 +#define mmSEM_CID_REMAP_DATA 0x01b1 +#define mmSEM_CID_REMAP_DATA_BASE_IDX 0 +#define mmSEM_ATOMIC_OP_LUT 0x01b2 +#define mmSEM_ATOMIC_OP_LUT_BASE_IDX 0 +#define mmSEM_EDC_CONFIG 0x01b3 +#define mmSEM_EDC_CONFIG_BASE_IDX 0 +#define mmSEM_CHICKEN_BITS2 0x01b4 +#define mmSEM_CHICKEN_BITS2_BASE_IDX 0 +#define mmSEM_MMHUB_CNTL 0x01b5 +#define mmSEM_MMHUB_CNTL_BASE_IDX 0 +#define mmSEM_REGISTER_LAST_PART1 0x01bf +#define mmSEM_REGISTER_LAST_PART1_BASE_IDX 0 + +#endif
drivers/gpu/drm/amd/include/asic_reg/oss/osssys_4_2_0_sh_mask.h new file +1300 -0
1,300 lines not on this page · raw message
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 20/27 drm/amdgpu: create vega20 ih blocks
In reply to Hawking Zhangvega20 ih blocks will be used for vega20/arcturus
--- drivers/gpu/drm/amd/amdgpu/Makefile | 1 + drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 661 +++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/vega20_ih.h | 30 ++ 3 files changed, 692 insertions(+) create mode 100644 drivers/gpu/drm/amd/amdgpu/vega20_ih.c create mode 100644 drivers/gpu/drm/amd/amdgpu/vega20_ih.h
drivers/gpu/drm/amd/amdgpu/Makefile +1 -0
@@ -97,6 +97,7 @@ amdgpu-y += \ tonga_ih.o \ cz_ih.o \ vega10_ih.o \ + vega20_ih.o \ navi10_ih.o # add PSP block
drivers/gpu/drm/amd/amdgpu/vega20_ih.c new file +661 -0
661 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/vega20_ih.h new file +30 -0
@@ -0,0 +1,30 @@ +/* +* Copyright 2016 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +*/ + +#ifndef __VEGA20_IH_H__ +#define __VEGA20_IH_H__ + +extern const struct amd_ip_funcs vega20_ih_ip_funcs; +extern const struct amdgpu_ip_block_version vega20_ih_ip_block; + +#endif
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 21/27 drm/amdgpu: reroute vmc/utcl2 interrupts to ih ring 1 for arcturus
In reply to Hawking Zhangarcturus allows driver to program ih_cfg_index/data through mmio directly in case page faults overwhlem the interrupt handlers and the driver lost the valuable interrupt information
--- drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 34 ++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
drivers/gpu/drm/amd/amdgpu/vega20_ih.c +34 -0
@@ -248,6 +248,38 @@ static int vega20_ih_enable_ring(struct amdgpu_device *adev,return 0 ; } +/** +* vega20_ih_reroute_ih - reroute VMC/UTCL2 ih to an ih ring +* +* @adev: amdgpu_device pointer +* +* Reroute VMC and UMC interrupts on primary ih ring to +* ih ring 1 so they won't lose when bunches of page faults +* interrupts overwhelms the interrupt handler(VEGA20) +*/ +static void vega20_ih_reroute_ih (struct amdgpu_device *adev) +{ +uint32_t tmp; + +/* vega20 ih reroute will go through psp +* this function is only used for arcturus +*/ +if (adev->asic_type ==CHIP_ARCTURUS ) { +/* Reroute to IH ring 1 for VMC */ +WREG32_SOC15 (OSSSYS ,0 , mmIH_CLIENT_CFG_INDEX,0x12 ); + tmp =RREG32_SOC15 (OSSSYS ,0 , mmIH_CLIENT_CFG_DATA); + tmp =REG_SET_FIELD (tmp,IH_CLIENT_CFG_DATA ,CLIENT_TYPE ,1 ); + tmp =REG_SET_FIELD (tmp,IH_CLIENT_CFG_DATA ,RING_ID ,1 ); +WREG32_SOC15 (OSSSYS ,0 , mmIH_CLIENT_CFG_DATA, tmp); + +/* Reroute IH ring 1 for UTCL2 */ +WREG32_SOC15 (OSSSYS ,0 , mmIH_CLIENT_CFG_INDEX,0x1B ); + tmp =RREG32_SOC15 (OSSSYS ,0 , mmIH_CLIENT_CFG_DATA); + tmp =REG_SET_FIELD (tmp,IH_CLIENT_CFG_DATA ,RING_ID ,1 ); +WREG32_SOC15 (OSSSYS ,0 , mmIH_CLIENT_CFG_DATA, tmp); + } +} +/** * vega20_ih_irq_init - init and enable the interrupt ring *
@@ -289,6 +321,8 @@ static int vega20_ih_irq_init(struct amdgpu_device *adev)for (i =0 ; i <ARRAY_SIZE (ih); i++) {if (ih[i]->ring_size) { +if (i ==1 ) +vega20_ih_reroute_ih (adev); ret =vega20_ih_enable_ring (adev, ih[i]);if (ret)return ret;
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 22/27 drm/amdgpu: switch to vega20 ih block for vega20/arcturus
In reply to Hawking Zhangreplace navi10 ih block with vega20 ih block for vega20 and arcturus
--- drivers/gpu/drm/amd/amdgpu/soc15.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +5 -4
@@ -60,6 +60,7 @@#include "nbio_v7_0.h" #include "nbio_v7_4.h" #include "vega10_ih.h" +#include "vega20_ih.h" #include "navi10_ih.h" #include "sdma_v4_0.h" #include "uvd_v7_0.h"
@@ -729,12 +730,12 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &psp_v3_1_ip_block); }if (adev->asic_type ==CHIP_VEGA20 ) -amdgpu_device_ip_block_add (adev, &navi10_ih_ip_block); +amdgpu_device_ip_block_add (adev, &vega20_ih_ip_block);else amdgpu_device_ip_block_add (adev, &vega10_ih_ip_block); }else {if (adev->asic_type ==CHIP_VEGA20 ) -amdgpu_device_ip_block_add (adev, &navi10_ih_ip_block); +amdgpu_device_ip_block_add (adev, &vega20_ih_ip_block);else amdgpu_device_ip_block_add (adev, &vega10_ih_ip_block);if (likely (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP )) {
@@ -787,9 +788,9 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)if (amdgpu_sriov_vf (adev)) {if (likely (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ))amdgpu_device_ip_block_add (adev, &psp_v11_0_ip_block); -amdgpu_device_ip_block_add (adev, &navi10_ih_ip_block); +amdgpu_device_ip_block_add (adev, &vega20_ih_ip_block); }else { -amdgpu_device_ip_block_add (adev, &navi10_ih_ip_block); +amdgpu_device_ip_block_add (adev, &vega20_ih_ip_block);if (likely (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ))amdgpu_device_ip_block_add (adev, &psp_v11_0_ip_block); }
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 23/27 drm/amdgpu: retire the vega20 code path from navi10 ih block
In reply to Hawking Zhangalready switched to vega20 ih block for vega20 and arcturus. no need to add vega20 support in navi10 ih block
--- drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 40 ++------------------------ 1 file changed, 2 insertions(+), 38 deletions(-)
drivers/gpu/drm/amd/amdgpu/navi10_ih.c +2 -38
@@ -151,7 +151,7 @@ static int navi10_ih_toggle_ring_interrupts(struct amdgpu_device *adev,/* enable_intr field is only valid in ring0 */ if (ih == &adev->irq.ih) tmp =REG_SET_FIELD (tmp,IH_RB_CNTL ,ENABLE_INTR , (enable ?1 :0 )); -if (amdgpu_sriov_vf (adev) && adev->asic_type <CHIP_NAVI10 ) { +if (amdgpu_sriov_vf (adev)) {if (psp_reg_program (&adev->psp, ih_regs->psp_reg_id, tmp)) {dev_err (adev->dev,"PSP program IH_RB_CNTL failed!\n" );return -ETIMEDOUT ;
@@ -268,7 +268,7 @@ static int navi10_ih_enable_ring(struct amdgpu_device *adev, tmp =REG_SET_FIELD (tmp,IH_RB_CNTL ,WPTR_OVERFLOW_ENABLE ,0 ); tmp =REG_SET_FIELD (tmp,IH_RB_CNTL ,RB_FULL_DRAIN_ENABLE ,1 ); } -if (amdgpu_sriov_vf (adev) && adev->asic_type <CHIP_NAVI10 ) { +if (amdgpu_sriov_vf (adev)) {if (psp_reg_program (&adev->psp, ih_regs->psp_reg_id, tmp)) {dev_err (adev->dev,"PSP program IH_RB_CNTL failed!\n" );return -ETIMEDOUT ;
@@ -292,24 +292,6 @@ static int navi10_ih_enable_ring(struct amdgpu_device *adev,return 0 ; } -static void navi10_ih_reroute_ih (struct amdgpu_device *adev) -{ -uint32_t tmp; - -/* Reroute to IH ring 1 for VMC */ -WREG32_SOC15 (OSSSYS ,0 , mmIH_CLIENT_CFG_INDEX,0x12 ); - tmp =RREG32_SOC15 (OSSSYS ,0 , mmIH_CLIENT_CFG_DATA); - tmp =REG_SET_FIELD (tmp,IH_CLIENT_CFG_DATA ,CLIENT_TYPE ,1 ); - tmp =REG_SET_FIELD (tmp,IH_CLIENT_CFG_DATA ,RING_ID ,1 ); -WREG32_SOC15 (OSSSYS ,0 , mmIH_CLIENT_CFG_DATA, tmp); - -/* Reroute IH ring 1 for UMC */ -WREG32_SOC15 (OSSSYS ,0 , mmIH_CLIENT_CFG_INDEX,0x1B ); - tmp =RREG32_SOC15 (OSSSYS ,0 , mmIH_CLIENT_CFG_DATA); - tmp =REG_SET_FIELD (tmp,IH_CLIENT_CFG_DATA ,RING_ID ,1 ); -WREG32_SOC15 (OSSSYS ,0 , mmIH_CLIENT_CFG_DATA, tmp); -} -/** * navi10_ih_irq_init - init and enable the interrupt ring *
@@ -582,24 +564,6 @@ static int navi10_ih_sw_init(void *handle) adev->irq.ih1.ring_size =0 ; adev->irq.ih2.ring_size =0 ; -if (adev->asic_type <CHIP_NAVI10 ) { - r =amdgpu_ih_ring_init (adev, &adev->irq.ih1,PAGE_SIZE , true); -if (r) -return r; - - adev->irq.ih1.use_doorbell = true; - adev->irq.ih1.doorbell_index = - (adev->doorbell_index.ih +1 ) <<1 ; - - r =amdgpu_ih_ring_init (adev, &adev->irq.ih2,PAGE_SIZE , true); -if (r) -return r; - - adev->irq.ih2.use_doorbell = true; - adev->irq.ih2.doorbell_index = - (adev->doorbell_index.ih +2 ) <<1 ; - } -/* initialize ih control registers offset */ navi10_ih_init_register_offset (adev);
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 24/27 drm/amdgpu: correct ih_chicken programming for vega10/vega20 ih blocks
In reply to Hawking ZhangIH_CHICKEN.MC_SPACE_FBPA_ENABLE field is only valid when IH_RB_CNTL.MC_SPACE is programed to 0x3, frame buffer physical address. For both bus address and gpu virtual address, don't program MC_SPACE_FBPA_ENABLE field
--- drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 3 --- drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 3 --- 2 files changed, 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/vega10_ih.c +0 -3
@@ -281,9 +281,6 @@ static int vega10_ih_irq_init(struct amdgpu_device *adev)if (adev->irq.ih.use_bus_addr) { ih_chicken =REG_SET_FIELD (ih_chicken,IH_CHICKEN ,MC_SPACE_GPA_ENABLE ,1 ); - }else { - ih_chicken =REG_SET_FIELD (ih_chicken,IH_CHICKEN , -MC_SPACE_FBPA_ENABLE ,1 ); }WREG32_SOC15 (OSSSYS ,0 , mmIH_CHICKEN, ih_chicken); }
drivers/gpu/drm/amd/amdgpu/vega20_ih.c +0 -3
@@ -312,9 +312,6 @@ static int vega20_ih_irq_init(struct amdgpu_device *adev)if (adev->irq.ih.use_bus_addr) { ih_chicken =REG_SET_FIELD (ih_chicken,IH_CHICKEN ,MC_SPACE_GPA_ENABLE ,1 ); - }else { - ih_chicken =REG_SET_FIELD (ih_chicken,IH_CHICKEN , -MC_SPACE_FBPA_ENABLE ,1 ); }WREG32_SOC15 (OSSSYS ,0 , mmIH_CHICKEN, ih_chicken); }
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 25/27 drm/amdgpu: drop arcturus IH_CHICKEN programming from vega10 ih block
In reply to Hawking Zhangarcturus ih support already switched to vega20 ih block. drop arcturus ih_chicken programming from vega10 ih block.
--- drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/vega10_ih.c +1 -3
@@ -274,9 +274,7 @@ static int vega10_ih_irq_init(struct amdgpu_device *adev) adev->nbio.funcs->ih_control (adev); -if ((adev->asic_type ==CHIP_ARCTURUS && - adev->firmware.load_type ==AMDGPU_FW_LOAD_DIRECT ) || - adev->asic_type ==CHIP_RENOIR ) { +if (adev->asic_type ==CHIP_RENOIR ) { ih_chicken =RREG32_SOC15 (OSSSYS ,0 , mmIH_CHICKEN);if (adev->irq.ih.use_bus_addr) { ih_chicken = REG_SET_FIELD(ih_chicken, IH_CHICKEN,
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 26/27 drm/amdgpu: drop ih reroute function from psp v11
In reply to Hawking ZhangFor all the ASICs that integrate psp v11, vega20 doesn't support ih reroute. arcturus and later will allow kernel driver to program ih_cfg_index/data through mmio directly. navi1x and onwards will only support grb_ih_set command in sriov configuration.
psp_v11_0_reroute_ih is not needed any more.
--- drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 36 -------------------------- 1 file changed, 36 deletions(-)
drivers/gpu/drm/amd/amdgpu/psp_v11_0.c +0 -36
@@ -392,37 +392,6 @@ static int psp_v11_0_bootloader_load_sos(struct psp_context *psp)return ret; } -static void psp_v11_0_reroute_ih (struct psp_context *psp) -{ -struct amdgpu_device *adev = psp->adev; -uint32_t tmp; - -/* Change IH ring for VMC */ - tmp =REG_SET_FIELD (0 ,IH_CLIENT_CFG_DATA ,CREDIT_RETURN_ADDR ,0x1244b ); - tmp =REG_SET_FIELD (tmp,IH_CLIENT_CFG_DATA ,CLIENT_TYPE ,1 ); - tmp =REG_SET_FIELD (tmp,IH_CLIENT_CFG_DATA ,RING_ID ,1 ); - -WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_69,3 ); -WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_70, tmp); -WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_64,GFX_CTRL_CMD_ID_GBR_IH_SET ); - -mdelay (20 ); -psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_64), -0x80000000 ,0x8000FFFF , false); - -/* Change IH ring for UMC */ - tmp =REG_SET_FIELD (0 ,IH_CLIENT_CFG_DATA ,CREDIT_RETURN_ADDR ,0x1216b ); - tmp =REG_SET_FIELD (tmp,IH_CLIENT_CFG_DATA ,RING_ID ,1 ); - -WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_69,4 ); -WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_70, tmp); -WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_64,GFX_CTRL_CMD_ID_GBR_IH_SET ); - -mdelay (20 ); -psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_64), -0x80000000 ,0x8000FFFF , false); -} -static int psp_v11_0_ring_init (struct psp_context *psp,enum psp_ring_type ring_type) {
@@ -430,11 +399,6 @@ static int psp_v11_0_ring_init(struct psp_context *psp,struct psp_ring *ring;struct amdgpu_device *adev = psp->adev; -if ((!amdgpu_sriov_vf (adev)) && - !(adev->asic_type >=CHIP_SIENNA_CICHLID && - adev->asic_type <=CHIP_DIMGREY_CAVEFISH )) -psp_v11_0_reroute_ih (psp); - ring = &psp->km_ring; ring->ring_type = ring_type;
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 26/27] drm/amdgpu: drop ih reroute function from psp v11
Am 12.12.20 um 16:45 schrieb Hawking Zhang:
Quoted 9 lines
For all the ASICs that integrate psp v11, vega20 doesn't support ih reroute. arcturus and later will allow kernel driver to program ih_cfg_index/data through mmio directly. navi1x and onwards will only support
grb_ih_setcommand in sriov configuration.
psp_v11_0_reroute_ihis not needed any more.Signed-off-by Hawking Zhang <[email protected]>
The original plan was to implement this for Vega20 as well, but since it looks like we never get that it is probably best to remove this.
Patch is Reviewed-by: Christian König <[email protected]>
Quoted 48 lines
--- drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 36 -------------------------- 1 file changed, 36 deletions(-)drivers/gpu/drm/amd/amdgpu/psp_v11_0.c +0
-31@@ -392,37 +392,6 @@ static int psp_v11_0_bootloader_load_sos(struct psp_context *psp)return ret; } -static void psp_v11_0_reroute_ih (struct psp_context *psp) -{ -struct amdgpu_device *adev = psp->adev; -uint32_t tmp; - -/* Change IH ring for VMC */ - tmp =REG_SET_FIELD (0 ,IH_CLIENT_CFG_DATA ,CREDIT_RETURN_ADDR ,0x1244b ); - tmp =REG_SET_FIELD (tmp,IH_CLIENT_CFG_DATA ,CLIENT_TYPE ,1 ); - tmp =REG_SET_FIELD (tmp,IH_CLIENT_CFG_DATA ,RING_ID ,1 ); - -WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_69,3 ); -WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_70, tmp); -WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_64,GFX_CTRL_CMD_ID_GBR_IH_SET ); - -mdelay (20 ); -psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_64), -0x80000000 ,0x8000FFFF , false); - -/* Change IH ring for UMC */ - tmp =REG_SET_FIELD (0 ,IH_CLIENT_CFG_DATA ,CREDIT_RETURN_ADDR ,0x1216b ); - tmp =REG_SET_FIELD (tmp,IH_CLIENT_CFG_DATA ,RING_ID ,1 ); - -WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_69,4 ); -WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_70, tmp); -WREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_64,GFX_CTRL_CMD_ID_GBR_IH_SET ); - -mdelay (20 ); -psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_64), -0x80000000 ,0x8000FFFF , false); -} -static int psp_v11_0_ring_init (struct psp_context *psp,enum psp_ring_type ring_type) {@@ -430,11 +399,6 @@ static int psp_v11_0_ring_init(struct psp_context *psp,struct psp_ring *ring;
drivers/gpu/drm/amd/amdgpu/psp_v11_0.c static int psp_v11_0_ring_init(struct psp_context *psp, · line 404
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/psp_v11_0.c +0
-5struct amdgpu_device *adev = psp->adev; -if ((!amdgpu_sriov_vf (adev)) && - !(adev->asic_type >=CHIP_SIENNA_CICHLID && - adev->asic_type <=CHIP_DIMGREY_CAVEFISH )) -psp_v11_0_reroute_ih (psp); - ring = &psp->km_ring; ring->ring_type = ring_type;
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 27/27 drm/amdgpu: don't create ih ring 1 and ring 2 for APU
In reply to Hawking ZhangAPUs don't support ih ring 1 and ring 2.
--- drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/amdgpu/vega10_ih.c +12 -11
@@ -489,20 +489,21 @@ static int vega10_ih_sw_init(void *handle) adev->irq.ih.use_doorbell = true; adev->irq.ih.doorbell_index = adev->doorbell_index.ih <<1 ; - r =amdgpu_ih_ring_init (adev, &adev->irq.ih1,PAGE_SIZE , true); -if (r) -return r; - - adev->irq.ih1.use_doorbell = true; - adev->irq.ih1.doorbell_index = (adev->doorbell_index.ih +1 ) <<1 ; +if (!(adev->flags &AMD_IS_APU )) { + r =amdgpu_ih_ring_init (adev, &adev->irq.ih1,PAGE_SIZE , true); +if (r) +return r; - r =amdgpu_ih_ring_init (adev, &adev->irq.ih2,PAGE_SIZE , true); -if (r) -return r; + adev->irq.ih1.use_doorbell = true; + adev->irq.ih1.doorbell_index = (adev->doorbell_index.ih +1 ) <<1 ; - adev->irq.ih2.use_doorbell = true; - adev->irq.ih2.doorbell_index = (adev->doorbell_index.ih +2 ) <<1 ; + r =amdgpu_ih_ring_init (adev, &adev->irq.ih2,PAGE_SIZE , true); +if (r) +return r; + adev->irq.ih2.use_doorbell = true; + adev->irq.ih2.doorbell_index = (adev->doorbell_index.ih +2 ) <<1 ; + }/* initialize ih control registers offset */ vega10_ih_init_register_offset (adev);
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
The series is
Am 2020-12-12 um 10:45 a.m. schrieb Hawking Zhang:
Quoted 36 lines
amdgpu_ih_regsholds all the registers for
an ih ringSigned-off-by Hawking Zhang <[email protected]>Reviewed-by Christian König <[email protected]>Acked-by Felix Kuehling <[email protected]>Reviewed-by Dennis Li <[email protected]>Reviewed-by Feifei Xu <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 13 +++++++++++++ 1 file changed, 13 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h +12
-0@@ -30,6 +30,18 @@struct amdgpu_device ;struct amdgpu_iv_entry ; +struct amdgpu_ih_regs { +uint32_t ih_rb_base; +uint32_t ih_rb_base_hi; +uint32_t ih_rb_cntl; +uint32_t ih_rb_wptr; +uint32_t ih_rb_rptr; +uint32_t ih_doorbell_rptr; +uint32_t ih_rb_wptr_addr_lo; +uint32_t ih_rb_wptr_addr_hi; +uint32_t psp_reg_id; +}; +/* * R6xx+ IH ring */
drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h struct amdgpu_ih_ring { · line 71
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h +1
-0@@ -53,6 +65,7 @@ struct amdgpu_ih_ring {bool enabled;unsigned rptr;atomic_t lock; +struct amdgpu_ih_regs ih_regs; };/* provided by the ih block */
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx