scsi: lpfc: cleanup: Remove unused FCP_XRI_ABORT_EVENT slowpath event

Both NVME and SCSI aborts are now processed off the CQ workqueue and do not
generate events for the slowpath any more.

Remove the unused event code.

Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: James Smart <jsmart2021@gmail.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
index 19827ce7a4d99f134863ad0940fef6322437f084..feae8fb57623ca31fd447774017af0fccc0560d9 100644 (file)
--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
@@ -711,7 +711,6 @@ struct lpfc_hba {
 #define HBA_FCOE_MODE          0x4 /* HBA function in FCoE Mode */
 #define HBA_SP_QUEUE_EVT       0x8 /* Slow-path qevt posted to worker thread*/
 #define HBA_POST_RECEIVE_BUFFER 0x10 /* Rcv buffers need to be posted */
-#define FCP_XRI_ABORT_EVENT    0x20
 #define ELS_XRI_ABORT_EVENT    0x40
 #define ASYNC_EVENT            0x80
 #define LINK_DISABLED          0x100 /* Link disabled by user */

diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index b183b882d50677ed8dab2c5c3ee0d1e88d9e8e7d..62689a06c18811e41b8f19d6eb5bebbed6909348 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -638,8 +638,6 @@ lpfc_work_done(struct lpfc_hba *phba)
        if (phba->pci_dev_grp == LPFC_PCI_DEV_OC) {
                if (phba->hba_flag & HBA_RRQ_ACTIVE)
                        lpfc_handle_rrq_active(phba);
-               if (phba->hba_flag & FCP_XRI_ABORT_EVENT)
-                       lpfc_sli4_fcp_xri_abort_event_proc(phba);
                if (phba->hba_flag & ELS_XRI_ABORT_EVENT)
                        lpfc_sli4_els_xri_abort_event_proc(phba);
                if (phba->hba_flag & ASYNC_EVENT)

diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index ab1b9d9123b6aebb4de5d73e153eb761a55ab6f3..7847ce2a94092998ee69823ae931e69a4f34c2c6 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -12892,36 +12892,6 @@ lpfc_sli_intr_handler(int irq, void *dev_id)
        return (sp_irq_rc == IRQ_HANDLED) ? sp_irq_rc : fp_irq_rc;
 }  /* lpfc_sli_intr_handler */
 
-/**
- * lpfc_sli4_fcp_xri_abort_event_proc - Process fcp xri abort event
- * @phba: pointer to lpfc hba data structure.
- *
- * This routine is invoked by the worker thread to process all the pending
- * SLI4 FCP abort XRI events.
- **/
-void lpfc_sli4_fcp_xri_abort_event_proc(struct lpfc_hba *phba)
-{
-       struct lpfc_cq_event *cq_event;
-
-       /* First, declare the fcp xri abort event has been handled */
-       spin_lock_irq(&phba->hbalock);
-       phba->hba_flag &= ~FCP_XRI_ABORT_EVENT;
-       spin_unlock_irq(&phba->hbalock);
-       /* Now, handle all the fcp xri abort events */
-       while (!list_empty(&phba->sli4_hba.sp_fcp_xri_aborted_work_queue)) {
-               /* Get the first event from the head of the event queue */
-               spin_lock_irq(&phba->hbalock);
-               list_remove_head(&phba->sli4_hba.sp_fcp_xri_aborted_work_queue,
-                                cq_event, struct lpfc_cq_event, list);
-               spin_unlock_irq(&phba->hbalock);
-               /* Notify aborted XRI for FCP work queue */
-               lpfc_sli4_fcp_xri_aborted(phba, &cq_event->cqe.wcqe_axri,
-                                         cq_event->hdwq);
-               /* Free the event processed back to the free pool */
-               lpfc_sli4_cq_event_release(phba, cq_event);
-       }
-}
-
 /**
  * lpfc_sli4_els_xri_abort_event_proc - Process els xri abort event
  * @phba: pointer to lpfc hba data structure.