Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18c27a62 authored by James Smart's avatar James Smart Committed by Martin K. Petersen
Browse files

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: default avatarDick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: default avatarJames Smart <jsmart2021@gmail.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 5e5b511d

drivers/scsi/lpfc/lpfc.h

+0 −1
Original line number Diff line number Diff line
@@ -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 */

drivers/scsi/lpfc/lpfc_hbadisc.c

+0 −2
Original line number Diff line number Diff line
@@ -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)

drivers/scsi/lpfc/lpfc_sli.c

+0 −30
Original line number Diff line number Diff line
@@ -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.