On Tue, Apr 2, 2024 at 5:20 AM Erico Nunes <nunes.erico@xxxxxxxxx> wrote:
>
> This is needed because we want to reset those devices in device-agnostic
> code such as lima_sched.
> In particular, masking irqs will be useful before a hard reset to
> prevent race conditions.
>
> Signed-off-by: Erico Nunes <nunes.erico@xxxxxxxxx>
> ---
> drivers/gpu/drm/lima/lima_bcast.c | 12 ++++++++++++
> drivers/gpu/drm/lima/lima_bcast.h | 3 +++
> drivers/gpu/drm/lima/lima_gp.c | 8 ++++++++
> drivers/gpu/drm/lima/lima_pp.c | 18 ++++++++++++++++++
> drivers/gpu/drm/lima/lima_sched.c | 2 ++
> drivers/gpu/drm/lima/lima_sched.h | 1 +
> 6 files changed, 44 insertions(+)
>
> diff --git a/drivers/gpu/drm/lima/lima_bcast.c b/drivers/gpu/drm/lima/lima_bcast.c
> index fbc43f243c54..6d000504e1a4 100644
> --- a/drivers/gpu/drm/lima/lima_bcast.c
> +++ b/drivers/gpu/drm/lima/lima_bcast.c
> @@ -43,6 +43,18 @@ void lima_bcast_suspend(struct lima_ip *ip)
>
> }
>
> +int lima_bcast_mask_irq(struct lima_ip *ip)
> +{
> + bcast_write(LIMA_BCAST_BROADCAST_MASK, 0);
> + bcast_write(LIMA_BCAST_INTERRUPT_MASK, 0);
> + return 0;
> +}
> +
> +int lima_bcast_reset(struct lima_ip *ip)
> +{
> + return lima_bcast_hw_init(ip);
> +}
> +
> int lima_bcast_init(struct lima_ip *ip)
> {
> int i;
> diff --git a/drivers/gpu/drm/lima/lima_bcast.h b/drivers/gpu/drm/lima/lima_bcast.h
> index 465ee587bceb..cd08841e4787 100644
> --- a/drivers/gpu/drm/lima/lima_bcast.h
> +++ b/drivers/gpu/drm/lima/lima_bcast.h
> @@ -13,4 +13,7 @@ void lima_bcast_fini(struct lima_ip *ip);
>
> void lima_bcast_enable(struct lima_device *dev, int num_pp);
>
> +int lima_bcast_mask_irq(struct lima_ip *ip);
> +int lima_bcast_reset(struct lima_ip *ip);
> +
> #endif
> diff --git a/drivers/gpu/drm/lima/lima_gp.c b/drivers/gpu/drm/lima/lima_gp.c
> index 6b354e2fb61d..e15295071533 100644
> --- a/drivers/gpu/drm/lima/lima_gp.c
> +++ b/drivers/gpu/drm/lima/lima_gp.c
> @@ -233,6 +233,13 @@ static void lima_gp_task_mmu_error(struct lima_sched_pipe *pipe)
> lima_sched_pipe_task_done(pipe);
> }
>
> +static void lima_gp_task_mask_irq(struct lima_sched_pipe *pipe)
> +{
> + struct lima_ip *ip = pipe->processor[0];
> +
> + gp_write(LIMA_GP_INT_MASK, 0);
> +}
> +
> static int lima_gp_task_recover(struct lima_sched_pipe *pipe)
> {
> struct lima_ip *ip = pipe->processor[0];
> @@ -365,6 +372,7 @@ int lima_gp_pipe_init(struct lima_device *dev)
> pipe->task_error = lima_gp_task_error;
> pipe->task_mmu_error = lima_gp_task_mmu_error;
> pipe->task_recover = lima_gp_task_recover;
> + pipe->task_mask_irq = lima_gp_task_mask_irq;
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/lima/lima_pp.c b/drivers/gpu/drm/lima/lima_pp.c
> index d0d2db0ef1ce..a4a2ffe6527c 100644
> --- a/drivers/gpu/drm/lima/lima_pp.c
> +++ b/drivers/gpu/drm/lima/lima_pp.c
> @@ -429,6 +429,9 @@ static void lima_pp_task_error(struct lima_sched_pipe *pipe)
>
> lima_pp_hard_reset(ip);
> }
> +
> + if (pipe->bcast_processor)
> + lima_bcast_reset(pipe->bcast_processor);
> }
>
> static void lima_pp_task_mmu_error(struct lima_sched_pipe *pipe)
> @@ -437,6 +440,20 @@ static void lima_pp_task_mmu_error(struct lima_sched_pipe *pipe)
> lima_sched_pipe_task_done(pipe);
> }
>
> +static void lima_pp_task_mask_irq(struct lima_sched_pipe *pipe)
> +{
> + int i;
> +
> + for (i = 0; i < pipe->num_processor; i++) {
> + struct lima_ip *ip = pipe->processor[i];
> +
> + pp_write(LIMA_PP_INT_MASK, 0);
> + }
> +
> + if (pipe->bcast_processor)
> + lima_bcast_mask_irq(pipe->bcast_processor);
> +}
> +
> static struct kmem_cache *lima_pp_task_slab;
> static int lima_pp_task_slab_refcnt;
>
> @@ -468,6 +485,7 @@ int lima_pp_pipe_init(struct lima_device *dev)
> pipe->task_fini = lima_pp_task_fini;
> pipe->task_error = lima_pp_task_error;
> pipe->task_mmu_error = lima_pp_task_mmu_error;
> + pipe->task_mask_irq = lima_pp_task_mask_irq;
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/lima/lima_sched.c b/drivers/gpu/drm/lima/lima_sched.c
> index 00b19adfc888..66841503a618 100644
> --- a/drivers/gpu/drm/lima/lima_sched.c
> +++ b/drivers/gpu/drm/lima/lima_sched.c
> @@ -422,6 +422,8 @@ static enum drm_gpu_sched_stat lima_sched_timedout_job(struct drm_sched_job *job
> */
> for (i = 0; i < pipe->num_processor; i++)
> synchronize_irq(pipe->processor[i]->irq);
> + if (pipe->bcast_processor)
> + synchronize_irq(pipe->bcast_processor->irq);
Better split this into another patch as it does not match the commit comment.
>
> if (dma_fence_is_signaled(task->fence)) {
> DRM_WARN("%s unexpectedly high interrupt latency\n", lima_ip_name(ip));
> diff --git a/drivers/gpu/drm/lima/lima_sched.h b/drivers/gpu/drm/lima/lima_sched.h
> index 6bd4f3b70109..85b23ba901d5 100644
> --- a/drivers/gpu/drm/lima/lima_sched.h
> +++ b/drivers/gpu/drm/lima/lima_sched.h
> @@ -80,6 +80,7 @@ struct lima_sched_pipe {
> void (*task_error)(struct lima_sched_pipe *pipe);
> void (*task_mmu_error)(struct lima_sched_pipe *pipe);
> int (*task_recover)(struct lima_sched_pipe *pipe);
> + void (*task_mask_irq)(struct lima_sched_pipe *pipe);
>
> struct work_struct recover_work;
> };
> --
> 2.44.0
>
