drm:amdgpu: Enable IH RING1 for IH v6.0
Subsystems (2)
PATCH v2 1/5 drm:amdgpu: Enable IH RING1 for IH v6.0
We need IH Ring1 for handling the pagefault
interrupts which are overflowing the default
ring for specific usecases.
--- drivers/gpu/drm/amd/amdgpu/ih_v6_0.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/ih_v6_0.c +6 -2
@@ -549,8 +549,12 @@ static int ih_v6_0_sw_init(void *handle) adev->irq.ih.use_doorbell = true; adev->irq.ih.doorbell_index = adev->doorbell_index.ih <<1 ; - adev->irq.ih1.ring_size =0 ; - adev->irq.ih2.ring_size =0 ; + r =amdgpu_ih_ring_init (adev, &adev->irq.ih1,IH_RING_SIZE , use_bus_addr); +if (r) +return r; + + adev->irq.ih1.use_doorbell = true; + adev->irq.ih1.doorbell_index = (adev->doorbell_index.ih +1 ) <<1 ;/* initialize ih control register offset */ ih_v6_0_init_register_offset (adev);
Signature · 1 line
2.34.1
PATCH v2 2/5 drm:amdgpu: Enable IH RING1 for IH v6.1
We need IH Ring1 for handling the pagefault
interrupts which are overflowing the default
ring for specific usecases.
--- drivers/gpu/drm/amd/amdgpu/ih_v6_1.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/ih_v6_1.c +6 -2
@@ -550,8 +550,12 @@ static int ih_v6_1_sw_init(void *handle) adev->irq.ih.use_doorbell = true; adev->irq.ih.doorbell_index = adev->doorbell_index.ih <<1 ; - adev->irq.ih1.ring_size =0 ; - adev->irq.ih2.ring_size =0 ; + r =amdgpu_ih_ring_init (adev, &adev->irq.ih1,IH_RING_SIZE , use_bus_addr); +if (r) +return r; + + adev->irq.ih1.use_doorbell = true; + adev->irq.ih1.doorbell_index = (adev->doorbell_index.ih +1 ) <<1 ;/* initialize ih control register offset */ ih_v6_1_init_register_offset (adev);
Signature · 1 line
2.34.1
PATCH v2 3/5 drm/amdgpu: Add IH_RING1_CFG headers for IH v6.0
In reply to Sunil KhatriAdd offsets, mask and shift macros for IH v6.0
which are needed to configure ring1 client irq
redirection.
--- .../drm/amd/include/asic_reg/oss/osssys_6_0_0_offset.h | 4 ++++ .../amd/include/asic_reg/oss/osssys_6_0_0_sh_mask.h | 10 ++++++++++ 2 files changed, 14 insertions(+)
drivers/gpu/drm/amd/include/asic_reg/oss/osssys_6_0_0_offset.h +4 -0
@@ -237,6 +237,10 @@#define regSEM_REGISTER_LAST_PART2_BASE_IDX 0#define regIH_CLIENT_CFG 0x0184#define regIH_CLIENT_CFG_BASE_IDX 0 +#define regIH_RING1_CLIENT_CFG_INDEX 0x0185 +#define regIH_RING1_CLIENT_CFG_INDEX_BASE_IDX 0 +#define regIH_RING1_CLIENT_CFG_DATA 0x0186 +#define regIH_RING1_CLIENT_CFG_DATA_BASE_IDX 0#define regIH_CLIENT_CFG_INDEX 0x0188#define regIH_CLIENT_CFG_INDEX_BASE_IDX 0#define regIH_CLIENT_CFG_DATA 0x0189
drivers/gpu/drm/amd/include/asic_reg/oss/osssys_6_0_0_sh_mask.h +10 -0
@@ -888,6 +888,16 @@//IH_CLIENT_CFG #define IH_CLIENT_CFG__TOTAL_CLIENT_NUM__SHIFT 0x0#define IH_CLIENT_CFG__TOTAL_CLIENT_NUM_MASK 0x0000003FL +//IH_RING1_CLIENT_CFG_INDEX +#define IH_RING1_CLIENT_CFG_INDEX__INDEX__SHIFT 0x0 +#define IH_RING1_CLIENT_CFG_INDEX__INDEX_MASK 0x00000007L +//IH_RING1_CLIENT_CFG_DATA +#define IH_RING1_CLIENT_CFG_DATA__CLIENT_ID__SHIFT 0x0 +#define IH_RING1_CLIENT_CFG_DATA__SOURCE_ID__SHIFT 0x8 +#define IH_RING1_CLIENT_CFG_DATA__SOURCE_ID_MATCH_ENABLE__SHIFT 0x10 +#define IH_RING1_CLIENT_CFG_DATA__CLIENT_ID_MASK 0x000000FFL +#define IH_RING1_CLIENT_CFG_DATA__SOURCE_ID_MASK 0x0000FF00L +#define IH_RING1_CLIENT_CFG_DATA__SOURCE_ID_MATCH_ENABLE_MASK 0x00010000L//IH_CLIENT_CFG_INDEX #define IH_CLIENT_CFG_INDEX__INDEX__SHIFT 0x0#define IH_CLIENT_CFG_INDEX__INDEX_MASK 0x0000001FL
Signature · 1 line
2.34.1
PATCH v2 4/5 drm/amdgpu: Enable redirection of irq's for IH V6.0
In reply to Sunil KhatriEnable redirection of irq for pagefaults for specific clients to avoid overflow without dropping interrupts.
So here we redirect the interrupts to another IH ring i.e ring1 where only these interrupts are processed.
--- drivers/gpu/drm/amd/amdgpu/ih_v6_0.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/gpu/drm/amd/amdgpu/ih_v6_0.c +14 -0
@@ -346,6 +346,20 @@ static int ih_v6_0_irq_init(struct amdgpu_device *adev) DELAY, 3);WREG32_SOC15 (OSSSYS ,0 , regIH_MSI_STORM_CTRL, tmp); +/* +* Redirect the interrupts to IH RB1 +*/ + tmp =RREG32_SOC15 (OSSSYS ,0 , regIH_RING1_CLIENT_CFG_INDEX); + tmp =REG_SET_FIELD (tmp,IH_RING1_CLIENT_CFG_INDEX ,INDEX ,0 ); +WREG32_SOC15 (OSSSYS ,0 , regIH_RING1_CLIENT_CFG_INDEX, tmp); + + tmp =RREG32_SOC15 (OSSSYS ,0 , regIH_RING1_CLIENT_CFG_DATA); + tmp =REG_SET_FIELD (tmp,IH_RING1_CLIENT_CFG_DATA ,CLIENT_ID ,0xa ); + tmp =REG_SET_FIELD (tmp,IH_RING1_CLIENT_CFG_DATA ,SOURCE_ID ,0x0 ); + tmp =REG_SET_FIELD (tmp,IH_RING1_CLIENT_CFG_DATA , +SOURCE_ID_MATCH_ENABLE ,0x1 ); +WREG32_SOC15 (OSSSYS ,0 , regIH_RING1_CLIENT_CFG_DATA, tmp); +pci_set_master (adev->pdev);/* enable interrupts */
Signature · 1 line
2.34.1
PATCH v2 5/5 drm/amdgpu: Enable redirection of irq's for IH V6.1
In reply to Sunil KhatriEnable redirection of irq for pagefaults for specific clients to avoid overflow without dropping interrupts.
So here we redirect the interrupts to another IH ring i.e ring1 where only these interrupts are processed.
--- drivers/gpu/drm/amd/amdgpu/ih_v6_1.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/gpu/drm/amd/amdgpu/ih_v6_1.c +14 -0
@@ -346,6 +346,20 @@ static int ih_v6_1_irq_init(struct amdgpu_device *adev) DELAY, 3);WREG32_SOC15 (OSSSYS ,0 , regIH_MSI_STORM_CTRL, tmp); +/* +* Redirect the interrupts to IH RB1 +*/ + tmp =RREG32_SOC15 (OSSSYS ,0 , regIH_RING1_CLIENT_CFG_INDEX); + tmp =REG_SET_FIELD (tmp,IH_RING1_CLIENT_CFG_INDEX ,INDEX ,0 ); +WREG32_SOC15 (OSSSYS ,0 , regIH_RING1_CLIENT_CFG_INDEX, tmp); + + tmp =RREG32_SOC15 (OSSSYS ,0 , regIH_RING1_CLIENT_CFG_DATA); + tmp =REG_SET_FIELD (tmp,IH_RING1_CLIENT_CFG_DATA ,CLIENT_ID ,0xa ); + tmp =REG_SET_FIELD (tmp,IH_RING1_CLIENT_CFG_DATA ,SOURCE_ID ,0x0 ); + tmp =REG_SET_FIELD (tmp,IH_RING1_CLIENT_CFG_DATA , +SOURCE_ID_MATCH_ENABLE ,0x1 ); +WREG32_SOC15 (OSSSYS ,0 , regIH_RING1_CLIENT_CFG_DATA, tmp); +pci_set_master (adev->pdev);/* enable interrupts */
Signature · 1 line
2.34.1