From patchwork Wed Dec 26 23:33:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Smart X-Patchwork-Id: 10743345 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E937413AD for ; Wed, 26 Dec 2018 23:34:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DB20F2849B for ; Wed, 26 Dec 2018 23:34:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CFCDA284ED; Wed, 26 Dec 2018 23:34:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6F64028524 for ; Wed, 26 Dec 2018 23:34:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727086AbeLZXd7 (ORCPT ); Wed, 26 Dec 2018 18:33:59 -0500 Received: from mail-yb1-f196.google.com ([209.85.219.196]:34169 "EHLO mail-yb1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726859AbeLZXd7 (ORCPT ); Wed, 26 Dec 2018 18:33:59 -0500 Received: by mail-yb1-f196.google.com with SMTP id w6so2326923ybq.1 for ; Wed, 26 Dec 2018 15:33:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=a8j5xpqunFxmGcKfjVahbwSFf+V5AEnHHWDBwjUSHQI=; b=Wt/uOmMyP/gv+ghgmKe37afnDKVCxdhpyDF8SCFoLMKRqBu9YwhKjtjYKtstnA/6xp OppM3rESdGsKNuI/uU8wsOxbJq0wex1I8iMTpthrhop3ZEmEPVXz2OuuvWR9AGTh9nXO KDyHuOfB0OD8O406uDwuj1jtz0t0BCTbosfJ0aQ1mNlRBN39Yehkxb/mug+4lgJo4hTX gor39kh4Q347I5jg7wva0epe2QyVVppJc1e2oLbmhAitPNRxZ2/kPoLWnMGmbiMohVZA H5Tj4UBtEHUDq34waYbCjjojCZzh1EecimUpsf4/LeSSHVVqdCciUc2Slp76XBhewE/w h/uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=a8j5xpqunFxmGcKfjVahbwSFf+V5AEnHHWDBwjUSHQI=; b=HoQs3GvoNqIf81/So9QGxbxBc+DKNaYyo2vgpWSrLU+oVMJBEjdSyztuOB1xodP2dY AZAiV+O5YLtuyIk7wgaaPcLcIzXht3Zj7RpxerVbTSHoiX417mdD7HrI4PaOyk8+3ZXj TFkL4gHZYbeNgPFzQqandiGQXK/k0NfJToeilzsHXTXaYIBZZkREHQxgo/LNJ/eZtGsD tJmixQO00jyDcWWWBJdytkLHs/PRsrIlsRKrF+e14N28MSxadg7VZAy0VoftHIKaduUV TcwGeEraBiIrzljcx77IyOdDSOeP4YaKScfNH7x3U0prvZs8bkCyVctCfyNxPdDpe1BO LO8A== X-Gm-Message-State: AA+aEWbyMr8qScHDFyL9MzbPK9iS3UI89rbYDHnQrikhabVKjPau1+NJ 0jc/wpt2oHtLIEKJXQ9V7g03+iAU X-Google-Smtp-Source: ALg8bN6KpucSupXh/mVbMe3e5h4m9pdfJa+KI6VcMTFQuT4nxsViQ9yyQ8QSOiXBXVtTy64eWHX4pg== X-Received: by 2002:a5b:4d2:: with SMTP id u18mr21829453ybp.282.1545867237941; Wed, 26 Dec 2018 15:33:57 -0800 (PST) Received: from os42.localdomain ([192.19.228.250]) by smtp.gmail.com with ESMTPSA id h145sm13616483ywc.72.2018.12.26.15.33.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Dec 2018 15:33:57 -0800 (PST) From: James Smart To: linux-scsi@vger.kernel.org Cc: James Smart , Dick Kennedy Subject: [PATCH 07/25] lpfc: cleanup: Remove unused FCP_XRI_ABORT_EVENT slowpath event Date: Wed, 26 Dec 2018 15:33:16 -0800 Message-Id: <20181226233334.27518-8-jsmart2021@gmail.com> X-Mailer: git-send-email 2.13.7 In-Reply-To: <20181226233334.27518-1-jsmart2021@gmail.com> References: <20181226233334.27518-1-jsmart2021@gmail.com> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Signed-off-by: James Smart Reviewed-by: Hannes Reinecke --- drivers/scsi/lpfc/lpfc.h | 1 - drivers/scsi/lpfc/lpfc_hbadisc.c | 2 -- drivers/scsi/lpfc/lpfc_sli.c | 30 ------------------------------ 3 files changed, 33 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h index 19827ce7a4d9..feae8fb57623 100644 --- 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 b183b882d506..62689a06c188 100644 --- 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 11e1303248a4..ee73c646b609 100644 --- a/drivers/scsi/lpfc/lpfc_sli.c +++ b/drivers/scsi/lpfc/lpfc_sli.c @@ -12894,36 +12894,6 @@ lpfc_sli_intr_handler(int irq, void *dev_id) } /* 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. *