Skip to contentSkip to conversation

drm/amdkfd: remove unused sq_int_priv variable

PATCH In review Tom Rix 4 participants 4 messages Mar 30, 2023 – May 31, 2023

Subsystems (3)
lore
Share & tools
lore

Tom Rix

author
#0 lore raw

PATCH 1/1 drm/amdkfd: remove unused sq_int_priv variable

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.

---
 drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c +1 -8
index 0d53f6067422..bbd646c0dee7 100644
@@ -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);
Signature · 1 line
2.27.0
maintainer
#1 lore raw

Am 2023-03-30 um 11:20 schrieb Tom Rix:

Quoted 6 lines

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

Quoted 33 lines
---
  drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 9 +--------
  1 file changed, 1 insertion(+), 8 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c +1 -8
index 0d53f6067422..bbd646c0dee7 100644
@@ -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 lore raw

[Public]

Hi Felix,

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

Thanks,

Jon

Quoted 75 lines

-----Original Message-----
From: Kuehling, Felix <[email protected]>
Sent: Thursday, March 30, 2023 11:39 AM
To: Tom Rix <[email protected]>; Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Pan, Xinhui <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; Kim, Jonathan <[email protected]>
Cc: [email protected]; [email protected]; linux- [email protected]; [email protected]
Subject: Re: [PATCH] drm/amdkfd: remove unused sq_int_priv variable

Am 2023-03-30 um 11:20 schrieb Tom Rix:

Quoted 2 lines

clang with W=1 reports drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_int_process_v11.c:282:38:

error: variable

Quoted 4 lines
   '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

Review

Quoted 7 lines
---
  drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 9 +--------
  1 file changed, 1 insertion(+), 8 deletions(-)
(quoted diff) +0 -0

b/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c

drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c static void event_interrupt_wq_v11(struct kfd_dev

Quoted 4 lines

index 0d53f6067422..bbd646c0dee7 100644

drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c +0 -0
@@ -279,7 +279,7 @@ static void event_interrupt_wq_v11(struct kfd_dev

*dev,

drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c static void event_interrupt_wq_v11(struct kfd_dev

Quoted 9 lines
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c +1 -1
  {
    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,

drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c static void event_interrupt_wq_v11(struct kfd_dev *dev,

Quoted 3 lines
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c +0 -0
                            break;
                    case SQ_INTERRUPT_WORD_ENCODING_INST:
                            print_sq_intr_info_inst(context_id0,

context_id1);

drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c static void event_interrupt_wq_v11(struct kfd_dev · line 352

Quoted 2 lines
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c +0 -2
-                           sq_int_priv = REG_GET_FIELD(context_id0,
-
      SQ_INTERRUPT_WORD_WAVE_CTXID0, PRIV);

drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c static void event_interrupt_wq_v11(struct kfd_dev · line 353

Quoted 1 line
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c +0 -1
-                           /*if (sq_int_priv &&

(kfd_set_dbg_ev_from_interrupt(dev, pasid,

drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c static void event_interrupt_wq_v11(struct kfd_dev · line 354

Quoted 1 line
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c +0 -1
-

KFD_CTXID0_DOORBELL_ID(context_id0),

drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c static void event_interrupt_wq_v11(struct kfd_dev · line 355

Quoted 1 line
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c +0 -1
-
      KFD_CTXID0_TRAP_CODE(context_id0),

drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c static void event_interrupt_wq_v11(struct kfd_dev *dev,

Quoted 5 lines
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c +0 -2
-                                           NULL, 0)))
-                                   return;*/
                            break;
                    case SQ_INTERRUPT_WORD_ENCODING_ERROR:
                            print_sq_intr_info_error(context_id0,

context_id1);

#3 lore raw
Quoted 6 lines · Jonathan

[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

Quoted 80 lines

Thanks,

Jon

Quoted 75 lines

-----Original Message-----
From: Kuehling, Felix <[email protected]>
Sent: Thursday, March 30, 2023 11:39 AM
To: Tom Rix <[email protected]>; Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Pan, Xinhui <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; Kim, Jonathan <[email protected]>
Cc: [email protected]; [email protected]; linux- [email protected]; [email protected]
Subject: Re: [PATCH] drm/amdkfd: remove unused sq_int_priv variable

Am 2023-03-30 um 11:20 schrieb Tom Rix:

Quoted 2 lines

clang with W=1 reports drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_int_process_v11.c:282:38:

error: variable

Quoted 4 lines
   '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

Review

Quoted 7 lines
---
  drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 9 +--------
  1 file changed, 1 insertion(+), 8 deletions(-)
(quoted diff) +0 -0

b/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c

drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c static void event_interrupt_wq_v11(struct kfd_dev

Quoted 4 lines

index 0d53f6067422..bbd646c0dee7 100644

drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c +0 -0
@@ -279,7 +279,7 @@ static void event_interrupt_wq_v11(struct kfd_dev

*dev,

drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c static void event_interrupt_wq_v11(struct kfd_dev

Quoted 9 lines
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c +1 -1
  {
    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,

drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c static void event_interrupt_wq_v11(struct kfd_dev *dev,

Quoted 3 lines
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c +0 -0
                            break;
                    case SQ_INTERRUPT_WORD_ENCODING_INST:
                            print_sq_intr_info_inst(context_id0,

context_id1);

drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c static void event_interrupt_wq_v11(struct kfd_dev · line 352

Quoted 2 lines
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c +0 -2
-                           sq_int_priv = REG_GET_FIELD(context_id0,
-
      SQ_INTERRUPT_WORD_WAVE_CTXID0, PRIV);

drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c static void event_interrupt_wq_v11(struct kfd_dev · line 353

Quoted 1 line
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c +0 -1
-                           /*if (sq_int_priv &&

(kfd_set_dbg_ev_from_interrupt(dev, pasid,

drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c static void event_interrupt_wq_v11(struct kfd_dev · line 354

Quoted 1 line
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c +0 -1
-

KFD_CTXID0_DOORBELL_ID(context_id0),

drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c static void event_interrupt_wq_v11(struct kfd_dev · line 355

Quoted 1 line
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c +0 -1
-
      KFD_CTXID0_TRAP_CODE(context_id0),

drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c static void event_interrupt_wq_v11(struct kfd_dev *dev,

Quoted 5 lines
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c +0 -2
-                                           NULL, 0)))
-                                   return;*/
                            break;
                    case SQ_INTERRUPT_WORD_ENCODING_ERROR:
                            print_sq_intr_info_error(context_id0,

context_id1);