[PATCH 2/8] drm/amdgpu: create new files for arcturus ih

Deucher, Alexander Alexander.Deucher at amd.com
Thu Mar 19 01:34:55 UTC 2020


[AMD Public Use]

if we have been using vega10_ih all along for arcturus, presumably the register map is close enough.  I'd suggest either adding whatever new stuff you need to vega10_ih.c or navi10_ih.c.  No need to add a completely new one for a small change like this.

Alex
________________________________
From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> on behalf of Felix Kuehling <felix.kuehling at amd.com>
Sent: Wednesday, March 18, 2020 7:33 PM
To: Sierra Guiza, Alejandro (Alex) <Alex.Sierra at amd.com>; amd-gfx at lists.freedesktop.org <amd-gfx at lists.freedesktop.org>
Subject: Re: [PATCH 2/8] drm/amdgpu: create new files for arcturus ih

How much overlap is there between arcturus_ih and nave10_ih? Given that
they both use the same register map, could they share the same driver
code with only minor differences?

If they're almost the same, maybe you could rename navi10_ih.[ch] to
osssys_v5_0.[ch] and use it for both navi10 and arcturus.

Regards,
   Felix

On 2020-03-18 18:51, Alex Sierra wrote:
> [Why]
> Arcturus uses osssys v4.2. This shares the same register map as
> osssys v5.0.
>
> [How]
> Copy vega10_ih into new arcturus_ih source and header files.
> Replace osssys include file with v5.0.0 on arcturus_ih.c source.
>
> Change-Id: I5215f32f477adb6a30acef6e8add9f8e5bb041ef
> Signed-off-by: Alex Sierra <alex.sierra at amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/arcturus_ih.c | 766 +++++++++++++++++++++++
>   drivers/gpu/drm/amd/amdgpu/arcturus_ih.h |  30 +
>   2 files changed, 796 insertions(+)
>   create mode 100644 drivers/gpu/drm/amd/amdgpu/arcturus_ih.c
>   create mode 100644 drivers/gpu/drm/amd/amdgpu/arcturus_ih.h
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/arcturus_ih.c b/drivers/gpu/drm/amd/amdgpu/arcturus_ih.c
> new file mode 100644
> index 000000000000..21bb5be40921
> --- /dev/null
> +++ b/drivers/gpu/drm/amd/amdgpu/arcturus_ih.c
> @@ -0,0 +1,766 @@
> +/*
> + * 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.
> + *
> + */
> +
> +#include <linux/pci.h>
> +
> +#include "amdgpu.h"
> +#include "amdgpu_ih.h"
> +#include "soc15.h"
> +
> +#include "oss/osssys_5_0_0_offset.h"
> +#include "oss/osssys_5_0_0_sh_mask.h"
> +
> +#include "soc15_common.h"
> +#include "arcturus_ih.h"
> +
> +#define MAX_REARM_RETRY 10
> +
> +static void vega10_ih_set_interrupt_funcs(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;
> +     }
> +}
> +
> +/**
> + * 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;
> +     }
> +}
> +
> +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);
> +
> +     ih_rb_cntl = REG_SET_FIELD(ih_rb_cntl, IH_RB_CNTL,
> +                                MC_SPACE, ih->use_bus_addr ? 1 : 4);
> +     ih_rb_cntl = REG_SET_FIELD(ih_rb_cntl, IH_RB_CNTL,
> +                                WPTR_OVERFLOW_CLEAR, 1);
> +     ih_rb_cntl = REG_SET_FIELD(ih_rb_cntl, IH_RB_CNTL,
> +                                WPTR_OVERFLOW_ENABLE, 1);
> +     ih_rb_cntl = REG_SET_FIELD(ih_rb_cntl, IH_RB_CNTL, RB_SIZE, rb_bufsz);
> +     /* Ring Buffer write pointer writeback. If enabled, IH_RB_WPTR register
> +      * value is written to memory
> +      */
> +     ih_rb_cntl = REG_SET_FIELD(ih_rb_cntl, IH_RB_CNTL,
> +                                WPTR_WRITEBACK_ENABLE, 1);
> +     ih_rb_cntl = REG_SET_FIELD(ih_rb_cntl, IH_RB_CNTL, MC_SNOOP, 1);
> +     ih_rb_cntl = REG_SET_FIELD(ih_rb_cntl, IH_RB_CNTL, MC_RO, 0);
> +     ih_rb_cntl = REG_SET_FIELD(ih_rb_cntl, IH_RB_CNTL, MC_VMID, 0);
> +
> +     return ih_rb_cntl;
> +}
> +
> +static uint32_t vega10_ih_doorbell_rptr(struct amdgpu_ih_ring *ih)
> +{
> +     u32 ih_doorbell_rtpr = 0;
> +
> +     if (ih->use_doorbell) {
> +             ih_doorbell_rtpr = REG_SET_FIELD(ih_doorbell_rtpr,
> +                                              IH_DOORBELL_RPTR, OFFSET,
> +                                              ih->doorbell_index);
> +             ih_doorbell_rtpr = REG_SET_FIELD(ih_doorbell_rtpr,
> +                                              IH_DOORBELL_RPTR,
> +                                              ENABLE, 1);
> +     } else {
> +             ih_doorbell_rtpr = REG_SET_FIELD(ih_doorbell_rtpr,
> +                                              IH_DOORBELL_RPTR,
> +                                              ENABLE, 0);
> +     }
> +     return ih_doorbell_rtpr;
> +}
> +
> +/**
> + * vega10_ih_irq_init - init and enable the interrupt ring
> + *
> + * @adev: amdgpu_device pointer
> + *
> + * Allocate a ring buffer for the interrupt controller,
> + * enable the RLC, disable interrupts, enable the IH
> + * ring buffer and enable it (VI).
> + * Called at device load and reume.
> + * Returns 0 for success, errors for failure.
> + */
> +static int vega10_ih_irq_init(struct amdgpu_device *adev)
> +{
> +     struct amdgpu_ih_ring *ih;
> +     u32 ih_rb_cntl, ih_chicken;
> +     int ret = 0;
> +     u32 tmp;
> +
> +     /* disable irqs */
> +     vega10_ih_disable_interrupts(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) {
> +             ih_chicken = RREG32_SOC15(OSSSYS, 0, mmIH_CHICKEN);
> +             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);
> +     }
> +
> +     /* 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);
> +             }
> +
> +             /* 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);
> +     tmp = REG_SET_FIELD(tmp, IH_STORM_CLIENT_LIST_CNTL,
> +                         CLIENT18_IS_STORM_CLIENT, 1);
> +     WREG32_SOC15(OSSSYS, 0, mmIH_STORM_CLIENT_LIST_CNTL, tmp);
> +
> +     tmp = RREG32_SOC15(OSSSYS, 0, mmIH_INT_FLOOD_CNTL);
> +     tmp = REG_SET_FIELD(tmp, IH_INT_FLOOD_CNTL, FLOOD_CNTL_ENABLE, 1);
> +     WREG32_SOC15(OSSSYS, 0, mmIH_INT_FLOOD_CNTL, tmp);
> +
> +     pci_set_master(adev->pdev);
> +
> +     /* enable interrupts */
> +     vega10_ih_enable_interrupts(adev);
> +
> +     return ret;
> +}
> +
> +/**
> + * vega10_ih_irq_disable - disable interrupts
> + *
> + * @adev: amdgpu_device pointer
> + *
> + * Disable interrupts on the hw (VEGA10).
> + */
> +static void vega10_ih_irq_disable(struct amdgpu_device *adev)
> +{
> +     vega10_ih_disable_interrupts(adev);
> +
> +     /* Wait and acknowledge irq */
> +     mdelay(1);
> +}
> +
> +/**
> + * vega10_ih_get_wptr - get the IH ring buffer wptr
> + *
> + * @adev: amdgpu_device pointer
> + *
> + * Get the IH ring buffer wptr from either the register
> + * or the writeback memory buffer (VEGA10).  Also check for
> + * ring buffer overflow and deal with it.
> + * Returns the value of the wptr.
> + */
> +static u32 vega10_ih_get_wptr(struct amdgpu_device *adev,
> +                           struct amdgpu_ih_ring *ih)
> +{
> +     u32 wptr, reg, tmp;
> +
> +     wptr = le32_to_cpu(*ih->wptr_cpu);
> +
> +     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);
> +     if (!REG_GET_FIELD(wptr, IH_RB_WPTR, RB_OVERFLOW))
> +             goto out;
> +
> +     wptr = REG_SET_FIELD(wptr, IH_RB_WPTR, RB_OVERFLOW, 0);
> +
> +     /* When a ring buffer overflow happen start parsing interrupt
> +      * from the last not overwritten vector (wptr + 32). Hopefully
> +      * this should allow us to catchup.
> +      */
> +     tmp = (wptr + 32) & ih->ptr_mask;
> +     dev_warn(adev->dev, "IH ring buffer overflow "
> +              "(0x%08X, 0x%08X, 0x%08X)\n",
> +              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 = REG_SET_FIELD(tmp, IH_RB_CNTL, WPTR_OVERFLOW_CLEAR, 1);
> +     WREG32_NO_KIQ(reg, tmp);
> +
> +out:
> +     return (wptr & ih->ptr_mask);
> +}
> +
> +/**
> + * vega10_ih_decode_iv - decode an interrupt vector
> + *
> + * @adev: amdgpu_device pointer
> + *
> + * Decodes the interrupt vector at the current rptr
> + * position and also advance the position.
> + */
> +static void vega10_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;
> +}
> +
> +/**
> + * vega10_ih_irq_rearm - rearm IRQ if lost
> + *
> + * @adev: amdgpu_device pointer
> + *
> + */
> +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;
> +
> +     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;
> +
> +     /* Rearm IRQ / re-wwrite doorbell if doorbell write is lost */
> +     for (i = 0; i < MAX_REARM_RETRY; i++) {
> +             v = RREG32_NO_KIQ(reg_rptr);
> +             if ((v < ih->ring_size) && (v != ih->rptr))
> +                     WDOORBELL32(ih->doorbell_index, ih->rptr);
> +             else
> +                     break;
> +     }
> +}
> +
> +/**
> + * vega10_ih_set_rptr - set the IH ring buffer rptr
> + *
> + * @adev: amdgpu_device pointer
> + *
> + * Set the IH ring buffer rptr.
> + */
> +static void vega10_ih_set_rptr(struct amdgpu_device *adev,
> +                            struct amdgpu_ih_ring *ih)
> +{
> +     if (ih->use_doorbell) {
> +             /* XXX check if swapping is necessary on BE */
> +             *ih->rptr_cpu = ih->rptr;
> +             WDOORBELL32(ih->doorbell_index, ih->rptr);
> +
> +             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);
> +     }
> +}
> +
> +/**
> + * vega10_ih_self_irq - dispatch work for ring 1 and 2
> + *
> + * @adev: amdgpu_device pointer
> + * @source: irq source
> + * @entry: IV with WPTR update
> + *
> + * Update the WPTR from the IV and schedule work to handle the entries.
> + */
> +static int vega10_ih_self_irq(struct amdgpu_device *adev,
> +                           struct amdgpu_irq_src *source,
> +                           struct amdgpu_iv_entry *entry)
> +{
> +     uint32_t wptr = cpu_to_le32(entry->src_data[0]);
> +
> +     switch (entry->ring_id) {
> +     case 1:
> +             *adev->irq.ih1.wptr_cpu = wptr;
> +             schedule_work(&adev->irq.ih1_work);
> +             break;
> +     case 2:
> +             *adev->irq.ih2.wptr_cpu = wptr;
> +             schedule_work(&adev->irq.ih2_work);
> +             break;
> +     default:
> +             break;
> +     }
> +     return 0;
> +}
> +
> +static const struct amdgpu_irq_src_funcs vega10_ih_self_irq_funcs = {
> +     .process = vega10_ih_self_irq,
> +};
> +
> +static void vega10_ih_set_self_irq_funcs(struct amdgpu_device *adev)
> +{
> +     adev->irq.self_irq.num_types = 0;
> +     adev->irq.self_irq.funcs = &vega10_ih_self_irq_funcs;
> +}
> +
> +static int vega10_ih_early_init(void *handle)
> +{
> +     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> +
> +     vega10_ih_set_interrupt_funcs(adev);
> +     vega10_ih_set_self_irq_funcs(adev);
> +     return 0;
> +}
> +
> +static int vega10_ih_sw_init(void *handle)
> +{
> +     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> +     int r;
> +
> +     r = amdgpu_irq_add_id(adev, SOC15_IH_CLIENTID_IH, 0,
> +                           &adev->irq.self_irq);
> +     if (r)
> +             return r;
> +
> +     r = amdgpu_ih_ring_init(adev, &adev->irq.ih, 256 * 1024, true);
> +     if (r)
> +             return r;
> +
> +     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;
> +
> +     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;
> +
> +     r = amdgpu_irq_init(adev);
> +
> +     return r;
> +}
> +
> +static int vega10_ih_sw_fini(void *handle)
> +{
> +     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> +
> +     amdgpu_irq_fini(adev);
> +     amdgpu_ih_ring_fini(adev, &adev->irq.ih2);
> +     amdgpu_ih_ring_fini(adev, &adev->irq.ih1);
> +     amdgpu_ih_ring_fini(adev, &adev->irq.ih);
> +
> +     return 0;
> +}
> +
> +static int vega10_ih_hw_init(void *handle)
> +{
> +     int r;
> +     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> +
> +     r = vega10_ih_irq_init(adev);
> +     if (r)
> +             return r;
> +
> +     return 0;
> +}
> +
> +static int vega10_ih_hw_fini(void *handle)
> +{
> +     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> +
> +     vega10_ih_irq_disable(adev);
> +
> +     return 0;
> +}
> +
> +static int vega10_ih_suspend(void *handle)
> +{
> +     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> +
> +     return vega10_ih_hw_fini(adev);
> +}
> +
> +static int vega10_ih_resume(void *handle)
> +{
> +     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> +
> +     return vega10_ih_hw_init(adev);
> +}
> +
> +static bool vega10_ih_is_idle(void *handle)
> +{
> +     /* todo */
> +     return true;
> +}
> +
> +static int vega10_ih_wait_for_idle(void *handle)
> +{
> +     /* todo */
> +     return -ETIMEDOUT;
> +}
> +
> +static int vega10_ih_soft_reset(void *handle)
> +{
> +     /* todo */
> +
> +     return 0;
> +}
> +
> +static void vega10_ih_update_clockgating_state(struct amdgpu_device *adev,
> +                                            bool enable)
> +{
> +     uint32_t data, def, field_val;
> +
> +     if (adev->cg_flags & AMD_CG_SUPPORT_IH_CG) {
> +             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.
> +              */
> +             if (adev->asic_type > CHIP_VEGA10) {
> +                     data = REG_SET_FIELD(data, IH_CLK_CTRL,
> +                                  IH_RETRY_INT_CAM_MEM_CLK_SOFT_OVERRIDE, field_val);
> +                     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);
> +             data = REG_SET_FIELD(data, IH_CLK_CTRL,
> +                                  OSSSYS_SHARE_CLK_SOFT_OVERRIDE, field_val);
> +             data = REG_SET_FIELD(data, IH_CLK_CTRL,
> +                                  LIMIT_SMN_CLK_SOFT_OVERRIDE, field_val);
> +             data = REG_SET_FIELD(data, IH_CLK_CTRL,
> +                                  DYN_CLK_SOFT_OVERRIDE, field_val);
> +             data = REG_SET_FIELD(data, IH_CLK_CTRL,
> +                                  REG_CLK_SOFT_OVERRIDE, field_val);
> +             if (def != data)
> +                     WREG32_SOC15(OSSSYS, 0, mmIH_CLK_CTRL, data);
> +     }
> +}
> +
> +static int vega10_ih_set_clockgating_state(void *handle,
> +                                       enum amd_clockgating_state state)
> +{
> +     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> +
> +     vega10_ih_update_clockgating_state(adev,
> +                             state == AMD_CG_STATE_GATE);
> +     return 0;
> +
> +}
> +
> +static int vega10_ih_set_powergating_state(void *handle,
> +                                       enum amd_powergating_state state)
> +{
> +     return 0;
> +}
> +
> +const struct amd_ip_funcs vega10_ih_ip_funcs = {
> +     .name = "vega10_ih",
> +     .early_init = vega10_ih_early_init,
> +     .late_init = NULL,
> +     .sw_init = vega10_ih_sw_init,
> +     .sw_fini = vega10_ih_sw_fini,
> +     .hw_init = vega10_ih_hw_init,
> +     .hw_fini = vega10_ih_hw_fini,
> +     .suspend = vega10_ih_suspend,
> +     .resume = vega10_ih_resume,
> +     .is_idle = vega10_ih_is_idle,
> +     .wait_for_idle = vega10_ih_wait_for_idle,
> +     .soft_reset = vega10_ih_soft_reset,
> +     .set_clockgating_state = vega10_ih_set_clockgating_state,
> +     .set_powergating_state = vega10_ih_set_powergating_state,
> +};
> +
> +static const struct amdgpu_ih_funcs vega10_ih_funcs = {
> +     .get_wptr = vega10_ih_get_wptr,
> +     .decode_iv = vega10_ih_decode_iv,
> +     .set_rptr = vega10_ih_set_rptr
> +};
> +
> +static void vega10_ih_set_interrupt_funcs(struct amdgpu_device *adev)
> +{
> +     adev->irq.ih_funcs = &vega10_ih_funcs;
> +}
> +
> +const struct amdgpu_ip_block_version vega10_ih_ip_block = {
> +     .type = AMD_IP_BLOCK_TYPE_IH,
> +     .major = 4,
> +     .minor = 0,
> +     .rev = 0,
> +     .funcs = &vega10_ih_ip_funcs,
> +};
> diff --git a/drivers/gpu/drm/amd/amdgpu/arcturus_ih.h b/drivers/gpu/drm/amd/amdgpu/arcturus_ih.h
> new file mode 100644
> index 000000000000..54daf8cf6ff3
> --- /dev/null
> +++ b/drivers/gpu/drm/amd/amdgpu/arcturus_ih.h
> @@ -0,0 +1,30 @@
> +/*
> + * 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 __VEGA10_IH_H__
> +#define __VEGA10_IH_H__
> +
> +extern const struct amd_ip_funcs vega10_ih_ip_funcs;
> +extern const struct amdgpu_ip_block_version vega10_ih_ip_block;
> +
> +#endif
_______________________________________________
amd-gfx mailing list
amd-gfx at lists.freedesktop.org
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Calexander.deucher%40amd.com%7Ca1fe681c257644a9727c08d7cb94d5f5%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637201712448085102&sdata=M8SSL1wFhDgmkyFd36kMHmuPzAqp%2BU0QHwttrz0rOzo%3D&reserved=0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20200319/bc94058b/attachment-0001.htm>


More information about the amd-gfx mailing list