On 2023-07-30 01:27:07, Dmitry Baryshkov wrote:
> In preparation to reworking IRQ indcies, stop using raw indices in
> kernel traces. Instead use a pair of register index and bit. This
> corresponds closer to the values in HW catalog.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 6 +-
> .../gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 8 +--
> drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 72 +++++++++++--------
> 3 files changed, 49 insertions(+), 37 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> index b81daa415efb..126ad2707dba 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> @@ -413,7 +413,7 @@ int dpu_encoder_helper_wait_for_irq(struct dpu_encoder_phys *phys_enc,
> } else {
> ret = 0;
> trace_dpu_enc_irq_wait_success(DRMID(phys_enc->parent),
> - func, irq_idx,
> + func, DPU_IRQ_REG(irq_idx), DPU_IRQ_BIT(irq_idx),
> phys_enc->hw_pp->idx - PINGPONG_0,
> atomic_read(wait_info->atomic_cnt));
> }
> @@ -1554,7 +1554,9 @@ static int dpu_encoder_helper_wait_event_timeout(
> atomic_read(info->atomic_cnt) == 0, jiffies);
> time = ktime_to_ms(ktime_get());
>
> - trace_dpu_enc_wait_event_timeout(drm_id, irq_idx, rc, time,
> + trace_dpu_enc_wait_event_timeout(drm_id,
> + DPU_IRQ_REG(irq_idx), DPU_IRQ_BIT(irq_idx),
> + rc, time,
> expected_time,
> atomic_read(info->atomic_cnt));
> /* If we timed out, counter is valid and time is less, wait again */
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c
> index b1592d73470d..04e5b889c6d6 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c
> @@ -546,7 +546,7 @@ int dpu_core_irq_register_callback(struct dpu_kms *dpu_kms, int irq_idx,
> return -EBUSY;
> }
>
> - trace_dpu_core_irq_register_callback(irq_idx, irq_cb);
> + trace_dpu_core_irq_register_callback(DPU_IRQ_REG(irq_idx), DPU_IRQ_BIT(irq_idx), irq_cb);
> irq_entry->arg = irq_arg;
> irq_entry->cb = irq_cb;
>
> @@ -558,7 +558,7 @@ int dpu_core_irq_register_callback(struct dpu_kms *dpu_kms, int irq_idx,
> DPU_IRQ_REG(irq_idx), DPU_IRQ_BIT(irq_idx));
> spin_unlock_irqrestore(&dpu_kms->hw_intr->irq_lock, irq_flags);
>
> - trace_dpu_irq_register_success(irq_idx);
> + trace_dpu_irq_register_success(DPU_IRQ_REG(irq_idx), DPU_IRQ_BIT(irq_idx));
>
> return 0;
> }
> @@ -579,7 +579,7 @@ int dpu_core_irq_unregister_callback(struct dpu_kms *dpu_kms, int irq_idx)
> DPU_IRQ_REG(irq_idx), DPU_IRQ_BIT(irq_idx));
>
> spin_lock_irqsave(&dpu_kms->hw_intr->irq_lock, irq_flags);
> - trace_dpu_core_irq_unregister_callback(irq_idx);
> + trace_dpu_core_irq_unregister_callback(DPU_IRQ_REG(irq_idx), DPU_IRQ_BIT(irq_idx));
>
> ret = dpu_hw_intr_disable_irq_locked(dpu_kms->hw_intr, irq_idx);
> if (ret)
> @@ -592,7 +592,7 @@ int dpu_core_irq_unregister_callback(struct dpu_kms *dpu_kms, int irq_idx)
>
> spin_unlock_irqrestore(&dpu_kms->hw_intr->irq_lock, irq_flags);
>
> - trace_dpu_irq_unregister_success(irq_idx);
> + trace_dpu_irq_unregister_success(DPU_IRQ_REG(irq_idx), DPU_IRQ_BIT(irq_idx));
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h
> index 1a92d21094f4..b64bd8eba26c 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h
> @@ -168,46 +168,50 @@ TRACE_EVENT(dpu_perf_crtc_update,
> );
>
> DECLARE_EVENT_CLASS(dpu_irq_template,
> - TP_PROTO(int irq_idx),
> - TP_ARGS(irq_idx),
> + TP_PROTO(unsigned int irq_reg, unsigned int irq_bit),
> + TP_ARGS(irq_reg, irq_bit),
> TP_STRUCT__entry(
> - __field( int, irq_idx )
> + __field( unsigned int, irq_reg )
> + __field( unsigned int, irq_bit )
> ),
> TP_fast_assign(
> - __entry->irq_idx = irq_idx;
> + __entry->irq_reg = irq_reg;
> + __entry->irq_bit = irq_bit;
> ),
> - TP_printk("irq=%d", __entry->irq_idx)
> + TP_printk("IRQ=[%d, %d]", __entry->irq_reg, __entry->irq_bit)
Regarding the other patch: IRQ=[...] works for me too, as long as it's
consistent.
Reviewed-by: Marijn Suijten <marijn.suijten@xxxxxxxxxxxxxx>
> );
> DEFINE_EVENT(dpu_irq_template, dpu_irq_register_success,
> - TP_PROTO(int irq_idx),
> - TP_ARGS(irq_idx)
> + TP_PROTO(unsigned int irq_reg, unsigned int irq_bit),
> + TP_ARGS(irq_reg, irq_bit)
> );
> DEFINE_EVENT(dpu_irq_template, dpu_irq_unregister_success,
> - TP_PROTO(int irq_idx),
> - TP_ARGS(irq_idx)
> + TP_PROTO(unsigned int irq_reg, unsigned int irq_bit),
> + TP_ARGS(irq_reg, irq_bit)
> );
>
> TRACE_EVENT(dpu_enc_irq_wait_success,
> TP_PROTO(uint32_t drm_id, void *func,
> - int irq_idx, enum dpu_pingpong pp_idx, int atomic_cnt),
> - TP_ARGS(drm_id, func, irq_idx, pp_idx, atomic_cnt),
> + unsigned int irq_reg, unsigned int irq_bit, enum dpu_pingpong pp_idx, int atomic_cnt),
> + TP_ARGS(drm_id, func, irq_reg, irq_bit, pp_idx, atomic_cnt),
> TP_STRUCT__entry(
> __field( uint32_t, drm_id )
> __field( void *, func )
> - __field( int, irq_idx )
> + __field( unsigned int, irq_reg )
> + __field( unsigned int, irq_bit )
> __field( enum dpu_pingpong, pp_idx )
> __field( int, atomic_cnt )
> ),
> TP_fast_assign(
> __entry->drm_id = drm_id;
> __entry->func = func;
> - __entry->irq_idx = irq_idx;
> + __entry->irq_reg = irq_reg;
> + __entry->irq_bit = irq_bit;
> __entry->pp_idx = pp_idx;
> __entry->atomic_cnt = atomic_cnt;
> ),
> - TP_printk("id=%u, callback=%ps, irq=%d, pp=%d, atomic_cnt=%d",
> + TP_printk("id=%u, callback=%ps, IRQ=[%d, %d], pp=%d, atomic_cnt=%d",
> __entry->drm_id, __entry->func,
> - __entry->irq_idx, __entry->pp_idx, __entry->atomic_cnt)
> + __entry->irq_reg, __entry->irq_bit, __entry->pp_idx, __entry->atomic_cnt)
> );
>
> DECLARE_EVENT_CLASS(dpu_drm_obj_template,
> @@ -507,12 +511,13 @@ DEFINE_EVENT(dpu_id_event_template, dpu_crtc_frame_event_more_pending,
> );
>
> TRACE_EVENT(dpu_enc_wait_event_timeout,
> - TP_PROTO(uint32_t drm_id, int irq_idx, int rc, s64 time,
> + TP_PROTO(uint32_t drm_id, unsigned int irq_reg, unsigned int irq_bit, int rc, s64 time,
> s64 expected_time, int atomic_cnt),
> - TP_ARGS(drm_id, irq_idx, rc, time, expected_time, atomic_cnt),
> + TP_ARGS(drm_id, irq_reg, irq_bit, rc, time, expected_time, atomic_cnt),
> TP_STRUCT__entry(
> __field( uint32_t, drm_id )
> - __field( int, irq_idx )
> + __field( unsigned int, irq_reg )
> + __field( unsigned int, irq_bit )
> __field( int, rc )
> __field( s64, time )
> __field( s64, expected_time )
> @@ -520,14 +525,15 @@ TRACE_EVENT(dpu_enc_wait_event_timeout,
> ),
> TP_fast_assign(
> __entry->drm_id = drm_id;
> - __entry->irq_idx = irq_idx;
> + __entry->irq_reg = irq_reg;
> + __entry->irq_bit = irq_bit;
> __entry->rc = rc;
> __entry->time = time;
> __entry->expected_time = expected_time;
> __entry->atomic_cnt = atomic_cnt;
> ),
> - TP_printk("id=%u, irq_idx=%d, rc=%d, time=%lld, expected=%lld cnt=%d",
> - __entry->drm_id, __entry->irq_idx, __entry->rc, __entry->time,
> + TP_printk("id=%u, IRQ=[%d, %d], rc=%d, time=%lld, expected=%lld cnt=%d",
> + __entry->drm_id, __entry->irq_reg, __entry->irq_bit, __entry->rc, __entry->time,
> __entry->expected_time, __entry->atomic_cnt)
> );
>
> @@ -886,30 +892,34 @@ TRACE_EVENT(dpu_intf_connect_ext_te,
> );
>
> TRACE_EVENT(dpu_core_irq_register_callback,
> - TP_PROTO(int irq_idx, void *callback),
> - TP_ARGS(irq_idx, callback),
> + TP_PROTO(unsigned int irq_reg, unsigned int irq_bit, void *callback),
> + TP_ARGS(irq_reg, irq_bit, callback),
> TP_STRUCT__entry(
> - __field( int, irq_idx )
> + __field( unsigned int, irq_reg )
> + __field( unsigned int, irq_bit )
> __field( void *, callback)
> ),
> TP_fast_assign(
> - __entry->irq_idx = irq_idx;
> + __entry->irq_reg = irq_reg;
> + __entry->irq_bit = irq_bit;
> __entry->callback = callback;
> ),
> - TP_printk("irq_idx:%d callback:%ps", __entry->irq_idx,
> + TP_printk("IRQ=[%d, %d] callback:%ps", __entry->irq_reg, __entry->irq_bit,
> __entry->callback)
> );
>
> TRACE_EVENT(dpu_core_irq_unregister_callback,
> - TP_PROTO(int irq_idx),
> - TP_ARGS(irq_idx),
> + TP_PROTO(unsigned int irq_reg, unsigned int irq_bit),
> + TP_ARGS(irq_reg, irq_bit),
> TP_STRUCT__entry(
> - __field( int, irq_idx )
> + __field( unsigned int, irq_reg )
> + __field( unsigned int, irq_bit )
> ),
> TP_fast_assign(
> - __entry->irq_idx = irq_idx;
> + __entry->irq_reg = irq_reg;
> + __entry->irq_bit = irq_bit;
> ),
> - TP_printk("irq_idx:%d", __entry->irq_idx)
> + TP_printk("IRQ=[%d, %d]", __entry->irq_reg, __entry->irq_bit)
> );
>
> TRACE_EVENT(dpu_core_perf_update_clk,
> --
> 2.39.2
>
