[PATCH] drm/amdkfd: remove unused sq_int_priv variable

[PATCH] drm/amdkfd: remove unused sq_int_priv variable

[Tom Rix]

clang with W=1 reports
drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_int_process_v11.c:282:38: error: variable
  'sq_int_priv' set but not used [-Werror,-Wunused-but-set-variable]
        uint8_t sq_int_enc, sq_int_errtype, sq_int_priv;
                                            ^
This variable is not used so remove it.

Signed-off-by: Tom Rix <trix@redhat.com>
---
 drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c b/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c
index 0d53f6067422..bbd646c0dee7 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c
@@ -279,7 +279,7 @@ static void event_interrupt_wq_v11(struct kfd_dev *dev,
 {
 	uint16_t source_id, client_id, ring_id, pasid, vmid;
 	uint32_t context_id0, context_id1;
-	uint8_t sq_int_enc, sq_int_errtype, sq_int_priv;
+	uint8_t sq_int_enc, sq_int_errtype;
 	struct kfd_vm_fault_info info = {0};
 	struct kfd_hsa_memory_exception_data exception_data;
 
@@ -348,13 +348,6 @@ static void event_interrupt_wq_v11(struct kfd_dev *dev,
 				break;
 			case SQ_INTERRUPT_WORD_ENCODING_INST:
 				print_sq_intr_info_inst(context_id0, context_id1);
-				sq_int_priv = REG_GET_FIELD(context_id0,
-						SQ_INTERRUPT_WORD_WAVE_CTXID0, PRIV);
-				/*if (sq_int_priv && (kfd_set_dbg_ev_from_interrupt(dev, pasid,
-						KFD_CTXID0_DOORBELL_ID(context_id0),
-						KFD_CTXID0_TRAP_CODE(context_id0),
-						NULL, 0)))
-					return;*/
 				break;
 			case SQ_INTERRUPT_WORD_ENCODING_ERROR:
 				print_sq_intr_info_error(context_id0, context_id1);
-- 
2.27.0

Re: [PATCH] drm/amdkfd: remove unused sq_int_priv variable

[Felix Kuehling]

Am 2023-03-30 um 11:20 schrieb Tom Rix:
> clang with W=1 reports
> drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_int_process_v11.c:282:38: error: variable
>    'sq_int_priv' set but not used [-Werror,-Wunused-but-set-variable]
>          uint8_t sq_int_enc, sq_int_errtype, sq_int_priv;
>                                              ^
> This variable is not used so remove it.

Hi Jon,

I think your debugger patches are going to start using this. Can you 
comment?

I'd prefer not to apply this patch now, as Jon's patches are expected to 
land soon, once Alex is done upstreaming GFX 9.4.3 support.

Regards,
   Felix


>
> Signed-off-by: Tom Rix <trix@redhat.com>
> ---
>   drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 9 +--------
>   1 file changed, 1 insertion(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c b/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c
> index 0d53f6067422..bbd646c0dee7 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c
> @@ -279,7 +279,7 @@ static void event_interrupt_wq_v11(struct kfd_dev *dev,
>   {
>   	uint16_t source_id, client_id, ring_id, pasid, vmid;
>   	uint32_t context_id0, context_id1;
> -	uint8_t sq_int_enc, sq_int_errtype, sq_int_priv;
> +	uint8_t sq_int_enc, sq_int_errtype;
>   	struct kfd_vm_fault_info info = {0};
>   	struct kfd_hsa_memory_exception_data exception_data;
>   
> @@ -348,13 +348,6 @@ static void event_interrupt_wq_v11(struct kfd_dev *dev,
>   				break;
>   			case SQ_INTERRUPT_WORD_ENCODING_INST:
>   				print_sq_intr_info_inst(context_id0, context_id1);
> -				sq_int_priv = REG_GET_FIELD(context_id0,
> -						SQ_INTERRUPT_WORD_WAVE_CTXID0, PRIV);
> -				/*if (sq_int_priv && (kfd_set_dbg_ev_from_interrupt(dev, pasid,
> -						KFD_CTXID0_DOORBELL_ID(context_id0),
> -						KFD_CTXID0_TRAP_CODE(context_id0),
> -						NULL, 0)))
> -					return;*/
>   				break;
>   			case SQ_INTERRUPT_WORD_ENCODING_ERROR:
>   				print_sq_intr_info_error(context_id0, context_id1);

RE: [PATCH] drm/amdkfd: remove unused sq_int_priv variable

[Kim, Jonathan]

[Public]

Hi Felix,

That is correct.  The debugger will need sq_int_priv to work.

Thanks,

Jon

> -----Original Message-----
> From: Kuehling, Felix <Felix.Kuehling@amd.com>
> Sent: Thursday, March 30, 2023 11:39 AM
> To: Tom Rix <trix@redhat.com>; Deucher, Alexander
> <Alexander.Deucher@amd.com>; Koenig, Christian
> <Christian.Koenig@amd.com>; Pan, Xinhui <Xinhui.Pan@amd.com>;
> airlied@gmail.com; daniel@ffwll.ch; nathan@kernel.org;
> ndesaulniers@google.com; Kim, Jonathan <Jonathan.Kim@amd.com>
> Cc: amd-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; linux-
> kernel@vger.kernel.org; llvm@lists.linux.dev
> Subject: Re: [PATCH] drm/amdkfd: remove unused sq_int_priv variable
>
> Am 2023-03-30 um 11:20 schrieb Tom Rix:
> > clang with W=1 reports
> > drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_int_process_v11.c:282:38:
> error: variable
> >    'sq_int_priv' set but not used [-Werror,-Wunused-but-set-variable]
> >          uint8_t sq_int_enc, sq_int_errtype, sq_int_priv;
> >                                              ^
> > This variable is not used so remove it.
>
> Hi Jon,
>
> I think your debugger patches are going to start using this. Can you
> comment?
>
> I'd prefer not to apply this patch now, as Jon's patches are expected to
> land soon, once Alex is done upstreaming GFX 9.4.3 support.
>
> Regards,
>    Felix
>
>
> >
> > Signed-off-by: Tom Rix <trix@redhat.com>
> > ---
> >   drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 9 +--------
> >   1 file changed, 1 insertion(+), 8 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c
> b/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c
> > index 0d53f6067422..bbd646c0dee7 100644
> > --- a/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c
> > +++ b/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c
> > @@ -279,7 +279,7 @@ static void event_interrupt_wq_v11(struct kfd_dev
> *dev,
> >   {
> >     uint16_t source_id, client_id, ring_id, pasid, vmid;
> >     uint32_t context_id0, context_id1;
> > -   uint8_t sq_int_enc, sq_int_errtype, sq_int_priv;
> > +   uint8_t sq_int_enc, sq_int_errtype;
> >     struct kfd_vm_fault_info info = {0};
> >     struct kfd_hsa_memory_exception_data exception_data;
> >
> > @@ -348,13 +348,6 @@ static void event_interrupt_wq_v11(struct kfd_dev
> *dev,
> >                             break;
> >                     case SQ_INTERRUPT_WORD_ENCODING_INST:
> >                             print_sq_intr_info_inst(context_id0,
> context_id1);
> > -                           sq_int_priv = REG_GET_FIELD(context_id0,
> > -
>       SQ_INTERRUPT_WORD_WAVE_CTXID0, PRIV);
> > -                           /*if (sq_int_priv &&
> (kfd_set_dbg_ev_from_interrupt(dev, pasid,
> > -
>       KFD_CTXID0_DOORBELL_ID(context_id0),
> > -
>       KFD_CTXID0_TRAP_CODE(context_id0),
> > -                                           NULL, 0)))
> > -                                   return;*/
> >                             break;
> >                     case SQ_INTERRUPT_WORD_ENCODING_ERROR:
> >                             print_sq_intr_info_error(context_id0,
> context_id1);

Re: [PATCH] drm/amdkfd: remove unused sq_int_priv variable

[Alex Deucher]

On Thu, Mar 30, 2023 at 12:04 PM Kim, Jonathan <Jonathan.Kim@amd.com> wrote:
>
> [Public]
>
> Hi Felix,
>
> That is correct.  The debugger will need sq_int_priv to work.

I'll just apply this for now.  We can squash the revert into the
debugger changes once those land.

Alex

>
> Thanks,
>
> Jon
>
> > -----Original Message-----
> > From: Kuehling, Felix <Felix.Kuehling@amd.com>
> > Sent: Thursday, March 30, 2023 11:39 AM
> > To: Tom Rix <trix@redhat.com>; Deucher, Alexander
> > <Alexander.Deucher@amd.com>; Koenig, Christian
> > <Christian.Koenig@amd.com>; Pan, Xinhui <Xinhui.Pan@amd.com>;
> > airlied@gmail.com; daniel@ffwll.ch; nathan@kernel.org;
> > ndesaulniers@google.com; Kim, Jonathan <Jonathan.Kim@amd.com>
> > Cc: amd-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; linux-
> > kernel@vger.kernel.org; llvm@lists.linux.dev
> > Subject: Re: [PATCH] drm/amdkfd: remove unused sq_int_priv variable
> >
> > Am 2023-03-30 um 11:20 schrieb Tom Rix:
> > > clang with W=1 reports
> > > drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_int_process_v11.c:282:38:
> > error: variable
> > >    'sq_int_priv' set but not used [-Werror,-Wunused-but-set-variable]
> > >          uint8_t sq_int_enc, sq_int_errtype, sq_int_priv;
> > >                                              ^
> > > This variable is not used so remove it.
> >
> > Hi Jon,
> >
> > I think your debugger patches are going to start using this. Can you
> > comment?
> >
> > I'd prefer not to apply this patch now, as Jon's patches are expected to
> > land soon, once Alex is done upstreaming GFX 9.4.3 support.
> >
> > Regards,
> >    Felix
> >
> >
> > >
> > > Signed-off-by: Tom Rix <trix@redhat.com>
> > > ---
> > >   drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 9 +--------
> > >   1 file changed, 1 insertion(+), 8 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c
> > b/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c
> > > index 0d53f6067422..bbd646c0dee7 100644
> > > --- a/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c
> > > +++ b/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c
> > > @@ -279,7 +279,7 @@ static void event_interrupt_wq_v11(struct kfd_dev
> > *dev,
> > >   {
> > >     uint16_t source_id, client_id, ring_id, pasid, vmid;
> > >     uint32_t context_id0, context_id1;
> > > -   uint8_t sq_int_enc, sq_int_errtype, sq_int_priv;
> > > +   uint8_t sq_int_enc, sq_int_errtype;
> > >     struct kfd_vm_fault_info info = {0};
> > >     struct kfd_hsa_memory_exception_data exception_data;
> > >
> > > @@ -348,13 +348,6 @@ static void event_interrupt_wq_v11(struct kfd_dev
> > *dev,
> > >                             break;
> > >                     case SQ_INTERRUPT_WORD_ENCODING_INST:
> > >                             print_sq_intr_info_inst(context_id0,
> > context_id1);
> > > -                           sq_int_priv = REG_GET_FIELD(context_id0,
> > > -
> >       SQ_INTERRUPT_WORD_WAVE_CTXID0, PRIV);
> > > -                           /*if (sq_int_priv &&
> > (kfd_set_dbg_ev_from_interrupt(dev, pasid,
> > > -
> >       KFD_CTXID0_DOORBELL_ID(context_id0),
> > > -
> >       KFD_CTXID0_TRAP_CODE(context_id0),
> > > -                                           NULL, 0)))
> > > -                                   return;*/
> > >                             break;
> > >                     case SQ_INTERRUPT_WORD_ENCODING_ERROR:
> > >                             print_sq_intr_info_error(context_id0,
> > context_id1);