[PATCH 2/2] drm/amdgpu: use the callback function for reset status polling on IMU

[Alex Deucher]

On Thu, May 19, 2022 at 11:05 PM Huang Rui <ray.huang at amd.com> wrote:
>
> Switch to use the callback function to poll the reset status on IMU.
> Because it will have different sequency on other ASICs.
>
> Signed-off-by: Huang Rui <ray.huang at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_imu.h |  1 +
>  drivers/gpu/drm/amd/amdgpu/imu_v11_0.c  | 35 ++++++++++++++++---------
>  2 files changed, 23 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_imu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_imu.h
> index cfc4a92837f0..484e936812e4 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_imu.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_imu.h
> @@ -35,6 +35,7 @@ struct amdgpu_imu_funcs {
>      void (*setup_imu)(struct amdgpu_device *adev);
>      int (*start_imu)(struct amdgpu_device *adev);
>      void (*program_rlc_ram)(struct amdgpu_device *adev);
> +    int (*wait_for_reset_status)(struct amdgpu_device *adev);
>  };
>
>  struct imu_rlc_ram_golden {
> diff --git a/drivers/gpu/drm/amd/amdgpu/imu_v11_0.c b/drivers/gpu/drm/amd/amdgpu/imu_v11_0.c
> index da18d6724125..64da0ad688d2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/imu_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/imu_v11_0.c
> @@ -117,6 +117,25 @@ static int imu_v11_0_load_microcode(struct amdgpu_device *adev)
>         return 0;
>  }
>
> +static int imu_v11_0_wait_for_reset_status(struct amdgpu_device *adev)
> +{
> +       int i, imu_reg_val = 0;
> +
> +       for (i = 0; i < adev->usec_timeout; i++) {
> +               imu_reg_val = RREG32_SOC15(GC, 0, regGFX_IMU_GFX_RESET_CTRL);
> +               if ((imu_reg_val & 0x1f) == 0x1f)
> +                       break;
> +               udelay(1);
> +       }
> +
> +       if (i >= adev->usec_timeout) {
> +               dev_err(adev->dev, "init imu: IMU start timeout\n");
> +               return -ETIMEDOUT;
> +       }
> +
> +       return 0;
> +}
> +
>  static void imu_v11_0_setup(struct amdgpu_device *adev)
>  {
>         int imu_reg_val;
> @@ -146,19 +165,8 @@ static int imu_v11_0_start(struct amdgpu_device *adev)
>         imu_reg_val &= 0xfffffffe;
>         WREG32_SOC15(GC, 0, regGFX_IMU_CORE_CTRL, imu_reg_val);
>
> -       if (adev->gfx.imu.mode == DEBUG_MODE) {
> -               for (i = 0; i < adev->usec_timeout; i++) {
> -                       imu_reg_val = RREG32_SOC15(GC, 0, regGFX_IMU_GFX_RESET_CTRL);
> -                       if ((imu_reg_val & 0x1f) == 0x1f)
> -                               break;
> -                       udelay(1);
> -               }
> -
> -               if (i >= adev->usec_timeout) {
> -                       dev_err(adev->dev, "init imu: IMU start timeout\n");
> -                       return -ETIMEDOUT;
> -               }
> -       }

You can drop the stack variable i in this function now.  With that
fixed, the series is:
Acked-by: Alex Deucher <alexander.deucher at amd.com>

> +       if (adev->gfx.imu.mode == DEBUG_MODE)
> +               return imu_v11_0_wait_for_reset_status(adev);
>
>         return 0;
>  }
> @@ -368,4 +376,5 @@ const struct amdgpu_imu_funcs gfx_v11_0_imu_funcs = {
>         .setup_imu = imu_v11_0_setup,
>         .start_imu = imu_v11_0_start,
>         .program_rlc_ram = imu_v11_0_program_rlc_ram,
> +       .wait_for_reset_status = imu_v11_0_wait_for_reset_status,
>  };
> --
> 2.25.1
>