From patchwork Sat Aug 13 00:10:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Reed X-Patchwork-Id: 1666023 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=DVDx6Sz0; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4M4LYh0ZPVz9sGR for ; Sat, 13 Aug 2022 10:11:18 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1oMek9-0007Mu-Qm; Sat, 13 Aug 2022 00:11:09 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1oMek3-0007K8-KF for kernel-team@lists.ubuntu.com; Sat, 13 Aug 2022 00:11:03 +0000 Received: from mail-ot1-f70.google.com (mail-ot1-f70.google.com [209.85.210.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 4E2173F0E1 for ; Sat, 13 Aug 2022 00:11:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1660349463; bh=KkpuoytdoBnY4xUSQs8CuB5uvP+9FAfph1SNRDxir+c=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=DVDx6Sz0PMRybE9RRl/lSCblwveNVmFrBhivNd5LIpv5hSNE3nujGQuI6zQRgkAvB 6V9txm3aRHzRQpcTDcQu5a8C7CyJ8LLZZYOHLJsA1UhUIKTFuIadsKpSNxlVplQnt7 GKCMmL39moAirJynV10Kwe56kyXZiAOQvj6HcbPrBDHttjAQ5o/dWGpu8Zg9BlGnSO 1E+Z7AVl88QslyJ/RMS0HZZ43iTuPbbd/2w7dgdrRfmgYxyY8Huerzc+Rbhr9Qtiti 2Q8W9WA5Yzpuyli5VyyAr1tQ62961cJGUlc5ojbVL39hcNe66JRJ2LOPq/NgUToFsJ +dcwopQnSZq0Q== Received: by mail-ot1-f70.google.com with SMTP id f22-20020a056830205600b0063724673c3aso819208otp.3 for ; Fri, 12 Aug 2022 17:11:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=KkpuoytdoBnY4xUSQs8CuB5uvP+9FAfph1SNRDxir+c=; b=ySfOjGKTa1LFJ7CfHfoFaM9a5IwVdkf8AOQF3KQxEsayChDhUISwm+vOYMktpBEJl8 vlh2dTWnZE3FwZ4pOSwdOlilJhwYPfW+Hlp17VARNuzY72HHuV3+cNVSM/1fZHLJb1qU HnRQerU9Sug4BjBRRMtauFYiq2PSMXLI51x2kQJXSktJKVyPCTfs8zZvthbG5h/R4Niz HDvRg4x2lO1TvgCxry9da+PzrjIQGzEh4xGvXRS6b3ivtRUWBiBuY+68ykf0uD53tDKC kMtIgS3yvxg79QzPd/9VvMDaYL2nbpsRlG5g2pNcg/COUIlQ989D6o5f6cRV4bJRSQEn KW/g== X-Gm-Message-State: ACgBeo1rcBbt11JaFA6tDBUImzeYKAoT8PfV/dEKbUf0he/t18bHFsTG gJd+xeFWssyMlkbpDJ1973A7fVMHE3v3QEjKcm99827n7hRSmBjafzaOP7XydVaj785wNUWx2wR tUMg9PpZE5hY72fo1pWubxErxQxSNqTLHiLeqKNABhQ== X-Received: by 2002:a05:6830:290a:b0:618:b519:53f5 with SMTP id z10-20020a056830290a00b00618b51953f5mr2374089otu.237.1660349461818; Fri, 12 Aug 2022 17:11:01 -0700 (PDT) X-Google-Smtp-Source: AA6agR5m3F5hYsbehWbIl7Nk0MD8ye8+Q55JDgcQwJ3XoNSFGDufMVNRr9NAO67/GOV1luwM0F7FzQ== X-Received: by 2002:a05:6830:290a:b0:618:b519:53f5 with SMTP id z10-20020a056830290a00b00618b51953f5mr2374075otu.237.1660349461413; Fri, 12 Aug 2022 17:11:01 -0700 (PDT) Received: from localhost ([2600:1700:1d0:5e50:51b0:150c:5b8d:e224]) by smtp.gmail.com with ESMTPSA id r3-20020a4ae503000000b00441c26f8fadsm588040oot.12.2022.08.12.17.11.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Aug 2022 17:11:01 -0700 (PDT) From: Michael Reed To: kernel-team@lists.ubuntu.com Subject: [SRU][F][PATCH 1/5] scsi: fnic: Change shost_printk() to FNIC_FCS_DBG() Date: Fri, 12 Aug 2022 19:10:53 -0500 Message-Id: <20220813001057.34877-2-michael.reed@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220813001057.34877-1-michael.reed@canonical.com> References: <20220813001057.34877-1-michael.reed@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Karan Tilak Kumar Replacing shost_printk with FNIC_FCS_DBG() so that these log messages are controlled by fnic_log_level flag in fnic_fip_handler_timer. Bumping up version number from 47 to 49 to maintain same level as internal version. BugLink: https://launchpad.net/bugs/1984011 Link: https://lore.kernel.org/r/20201120220712.16708-1-kartilak@cisco.com Reviewed-by: Arulprabhu Ponnusamy Co-developed-by: Satish Kharat Signed-off-by: Satish Kharat Signed-off-by: Karan Tilak Kumar Signed-off-by: Martin K. Petersen (cherry picked from commit 90b3a938031fd2da2000f84e58223971ad8f6df3) Signed-off-by: Michael Reed --- drivers/scsi/fnic/fnic.h | 2 +- drivers/scsi/fnic/fnic_fcs.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h index 477513dc23b7..ed00b6061e0c 100644 --- a/drivers/scsi/fnic/fnic.h +++ b/drivers/scsi/fnic/fnic.h @@ -39,7 +39,7 @@ #define DRV_NAME "fnic" #define DRV_DESCRIPTION "Cisco FCoE HBA Driver" -#define DRV_VERSION "1.6.0.47" +#define DRV_VERSION "1.6.0.49" #define PFX DRV_NAME ": " #define DFX DRV_NAME "%d: " diff --git a/drivers/scsi/fnic/fnic_fcs.c b/drivers/scsi/fnic/fnic_fcs.c index 673887e383cc..f2c88847c394 100644 --- a/drivers/scsi/fnic/fnic_fcs.c +++ b/drivers/scsi/fnic/fnic_fcs.c @@ -1358,7 +1358,7 @@ void fnic_handle_fip_timer(struct fnic *fnic) } vlan = list_first_entry(&fnic->vlans, struct fcoe_vlan, list); - shost_printk(KERN_DEBUG, fnic->lport->host, + FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host, "fip_timer: vlan %d state %d sol_count %d\n", vlan->vid, vlan->state, vlan->sol_count); switch (vlan->state) { @@ -1381,7 +1381,7 @@ void fnic_handle_fip_timer(struct fnic *fnic) * no response on this vlan, remove from the list. * Try the next vlan */ - shost_printk(KERN_INFO, fnic->lport->host, + FNIC_FCS_DBG(KERN_INFO, fnic->lport->host, "Dequeue this VLAN ID %d from list\n", vlan->vid); list_del(&vlan->list); @@ -1391,7 +1391,7 @@ void fnic_handle_fip_timer(struct fnic *fnic) /* we exhausted all vlans, restart vlan disc */ spin_unlock_irqrestore(&fnic->vlans_lock, flags); - shost_printk(KERN_INFO, fnic->lport->host, + FNIC_FCS_DBG(KERN_INFO, fnic->lport->host, "fip_timer: vlan list empty, " "trigger vlan disc\n"); fnic_event_enq(fnic, FNIC_EVT_START_VLAN_DISC); From patchwork Sat Aug 13 00:10:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Reed X-Patchwork-Id: 1666022 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=vI20xmEP; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4M4LYh0Khzz9sGQ for ; Sat, 13 Aug 2022 10:11:18 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1oMek7-0007L9-Fn; Sat, 13 Aug 2022 00:11:07 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1oMek4-0007KF-1g for kernel-team@lists.ubuntu.com; Sat, 13 Aug 2022 00:11:04 +0000 Received: from mail-ot1-f71.google.com (mail-ot1-f71.google.com [209.85.210.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id C14953F139 for ; Sat, 13 Aug 2022 00:11:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1660349463; bh=uOYYjD+DV/2QpYTk/s2woQYoOtS3D2cMX1U3IucActc=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=vI20xmEPpauJa3Ovj4gkMqf8IkPPKKLShnipunGpUA8Ny/NefvHPG1j3aReSdLR0N ObmfrVg3BFpqjal9VzusEJwka+7Vo3PLBv7V8+PYafwZ+3SLFLtNvZGgOBo7Ox0L0G l4sEQk4ra09+rdVhf5nFBdSkBwr4tLQ2136WnqyTqT5rRw06k8NhuYXN5vDXQOvMn3 9LOQ7RU9Y+Jll4cestBJ+V5z47U5L8PaKEaHJrBRp4VqOQUzAnzt06Yx5SteXim2Dd s1jGBF53WBWkKjV6I0DscZYMSGhdss6omQVczvF6uJl8KPbJb3Qw/XN6dJNFZDGRu7 t0AU1zTWpYv4A== Received: by mail-ot1-f71.google.com with SMTP id 102-20020a9d04ef000000b0061c50a3c031so827937otm.18 for ; Fri, 12 Aug 2022 17:11:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=uOYYjD+DV/2QpYTk/s2woQYoOtS3D2cMX1U3IucActc=; b=sHqrchq+a/liiDPstQHgpPpkoLghrXSZVr2M7s1EeB6RXE0TSX9NRTfvONG1doESL4 84Zor2vNwjoML7yu13MFNlHJsw0lP0zKLessHauixhjk9TIQFG/dGbCxAcsvFWKKlz3I YkqIxUOOu/Jnx9aWvYm1w3AUD86kODWvF1t7QMmbLb/4gvkUaXEss3KeGhykdN7K38Te zcYvSpryIwJL7k86Np/EmTaI6jd0cCgEXCJe3EN2XGdCGSa1FFEAI1yNKD39GHhF+r7l s69iH5aOexvzKVLHKjK7Wz+DD6MX/GvIgc2Q2FYNtQNvuqvd0WocXqvbTqiXRgW4vbgm H+Og== X-Gm-Message-State: ACgBeo2q8TMWkcx+h8F46Yg8A7e4oblmVkbkFHhqz1pGWvAq+m9rzchc ThnHQ6hTvDzyqCWKyb2GSif0cEgVThuw1jPoe94rkr46OCeLX5VdZ+SE/r8hBtsvakuCoMwiVEx 11VxP9c+v5Nm7jHZVJerE7Nh7Hy8EFGmKE+UGuU/Lkw== X-Received: by 2002:aca:3309:0:b0:343:58ca:6e20 with SMTP id z9-20020aca3309000000b0034358ca6e20mr2728471oiz.218.1660349462560; Fri, 12 Aug 2022 17:11:02 -0700 (PDT) X-Google-Smtp-Source: AA6agR47ByduP6cHyBAaix4Xj2h+ToJhkvaEyoKuSbUJM6sH6hxU+uEAHtImP6tGYeaFBYQBkYGTJg== X-Received: by 2002:aca:3309:0:b0:343:58ca:6e20 with SMTP id z9-20020aca3309000000b0034358ca6e20mr2728461oiz.218.1660349462210; Fri, 12 Aug 2022 17:11:02 -0700 (PDT) Received: from localhost ([2600:1700:1d0:5e50:51b0:150c:5b8d:e224]) by smtp.gmail.com with ESMTPSA id c9-20020a9d75c9000000b00616d3ec6734sm639102otl.53.2022.08.12.17.11.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Aug 2022 17:11:01 -0700 (PDT) From: Michael Reed To: kernel-team@lists.ubuntu.com Subject: [SRU][F][PATCH 2/5] scsi: fnic: Avoid looping in TRANS ETH on unload Date: Fri, 12 Aug 2022 19:10:54 -0500 Message-Id: <20220813001057.34877-3-michael.reed@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220813001057.34877-1-michael.reed@canonical.com> References: <20220813001057.34877-1-michael.reed@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Karan Tilak Kumar Avoid looping in fnic_scsi_abort_io() before sending fw reset when fnic is in TRANS ETH state and when we have not received any link events. BugLink: https://launchpad.net/bugs/1984011 Link: https://lore.kernel.org/r/20201121012145.18522-1-kartilak@cisco.com Reviewed-by: Arulprabhu Ponnusamy Co-developed-by: Satish Kharat Signed-off-by: Satish Kharat Signed-off-by: Karan Tilak Kumar Signed-off-by: Martin K. Petersen (cherry picked from commit f9e2beb990f0836b642e5e7d1bed285bbc137c83) Signed-off-by: Michael Reed --- drivers/scsi/fnic/fnic.h | 3 ++- drivers/scsi/fnic/fnic_fcs.c | 2 ++ drivers/scsi/fnic/fnic_main.c | 2 ++ drivers/scsi/fnic/fnic_scsi.c | 3 ++- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h index ed00b6061e0c..6dc8c916de31 100644 --- a/drivers/scsi/fnic/fnic.h +++ b/drivers/scsi/fnic/fnic.h @@ -39,7 +39,7 @@ #define DRV_NAME "fnic" #define DRV_DESCRIPTION "Cisco FCoE HBA Driver" -#define DRV_VERSION "1.6.0.49" +#define DRV_VERSION "1.6.0.50" #define PFX DRV_NAME ": " #define DFX DRV_NAME "%d: " @@ -245,6 +245,7 @@ struct fnic { u32 vlan_hw_insert:1; /* let hw insert the tag */ u32 in_remove:1; /* fnic device in removal */ u32 stop_rx_link_events:1; /* stop proc. rx frames, link events */ + u32 link_events:1; /* set when we get any link event*/ struct completion *remove_wait; /* device remove thread blocks */ diff --git a/drivers/scsi/fnic/fnic_fcs.c b/drivers/scsi/fnic/fnic_fcs.c index f2c88847c394..ab74b8d642aa 100644 --- a/drivers/scsi/fnic/fnic_fcs.c +++ b/drivers/scsi/fnic/fnic_fcs.c @@ -56,6 +56,8 @@ void fnic_handle_link(struct work_struct *work) spin_lock_irqsave(&fnic->fnic_lock, flags); + fnic->link_events = 1; /* less work to just set everytime*/ + if (fnic->stop_rx_link_events) { spin_unlock_irqrestore(&fnic->fnic_lock, flags); return; diff --git a/drivers/scsi/fnic/fnic_main.c b/drivers/scsi/fnic/fnic_main.c index 3a2618bcce67..b0310afa7ba9 100644 --- a/drivers/scsi/fnic/fnic_main.c +++ b/drivers/scsi/fnic/fnic_main.c @@ -581,6 +581,8 @@ static int fnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) fnic->lport = lp; fnic->ctlr.lp = lp; + fnic->link_events = 0; + snprintf(fnic->name, sizeof(fnic->name) - 1, "%s%d", DRV_NAME, host->host_no); diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c index 1630fae6af1c..9b23f9701f91 100644 --- a/drivers/scsi/fnic/fnic_scsi.c +++ b/drivers/scsi/fnic/fnic_scsi.c @@ -2672,7 +2672,8 @@ void fnic_scsi_abort_io(struct fc_lport *lp) /* Issue firmware reset for fnic, wait for reset to complete */ retry_fw_reset: spin_lock_irqsave(&fnic->fnic_lock, flags); - if (unlikely(fnic->state == FNIC_IN_FC_TRANS_ETH_MODE)) { + if (unlikely(fnic->state == FNIC_IN_FC_TRANS_ETH_MODE) && + fnic->link_events) { /* fw reset is in progress, poll for its completion */ spin_unlock_irqrestore(&fnic->fnic_lock, flags); schedule_timeout(msecs_to_jiffies(100)); From patchwork Sat Aug 13 00:10:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Reed X-Patchwork-Id: 1666021 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=uFgItr8p; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4M4LYh0wY4z9sGT for ; Sat, 13 Aug 2022 10:11:18 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1oMek6-0007Kq-9j; Sat, 13 Aug 2022 00:11:06 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1oMek4-0007KV-Su for kernel-team@lists.ubuntu.com; Sat, 13 Aug 2022 00:11:04 +0000 Received: from mail-ot1-f70.google.com (mail-ot1-f70.google.com [209.85.210.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 96C7F3F0E1 for ; Sat, 13 Aug 2022 00:11:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1660349464; bh=HoYSFV2XSJiHbCL0neawYf4h5yLyB7mKjVSPDScrJ98=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uFgItr8ppZAwnC/MOEhT9I2VycQtQUhXXIDMZwZVmQij1t7LOq/HyAEBxdKYjaFxI tp05MnOY00yyf8goI+Ll72tNXjZ1M87eJScL8QNXZfHxdzFukeshIjI/cVAAK8IdT3 f2pP3Ee7ey3Y9inyqyLOJgvpEm2xiOK02mc0rki39jmoBtmCoQQV+7Zr5+SKls+Con mG2yy/VdY6bhJjMtKpjpc/5YGm4qxsyFOD5Bw8iG4LXNk7SPny3MxYjFf3wGbdCaH3 pdBbTyAz4TlYWeMpXK+Z6nFf/h3unnJsIhhX+F9euycaq4nG7ryRKLHX5zT34/VTmN 3+WoZadp+9XKA== Received: by mail-ot1-f70.google.com with SMTP id d35-20020a9d2926000000b006370ba56e1cso830007otb.15 for ; Fri, 12 Aug 2022 17:11:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=HoYSFV2XSJiHbCL0neawYf4h5yLyB7mKjVSPDScrJ98=; b=65Gz7x7XAgdGw8jp5Hn4T++snXs5fl8btpwOFnFAbWXX85Zwzd9hOJ87BGWl5UjqqO i1/zRwYsE+Jp6TWIuP1WhEjVKFaViyMx/k7tw0W1D+iGGQEgI85XPV2UfGeXDPy06+48 a1E5ZaIotX5+vUp567k4mIDyjdVkxmVymVS801RUyAgJBYs1WQgtrZpS8/V10QLrIF+r dnAI3xyBJ84QmSBMtH13e8GJq/klDAypOU/bwLNlhQ0IPn0vH24ftjfP+rx+rM4W7U3B fNJ9v69chXqoruU2lIj8s9wWltmrcxGflt8vLwfloEpz5FjRlc0tUyMqOEfW7HMoPCtt gqkQ== X-Gm-Message-State: ACgBeo2vkK0K17ktBysu9aVS8kQ+bvgQV7CpbUbv4T2mhHpUQU6UH33O dIC/k8fWtSfIxDVa5fa7JGX9rMOg2Xy0MlweQThXt4REnzVmXtV16yUA+2xYkyEQPvEdgVs420O E3xHRwE/2fQsg/HiUg1fskuHufsDcJsMm/rabiWMGRg== X-Received: by 2002:a05:6870:73ce:b0:118:8dc9:90fe with SMTP id a14-20020a05687073ce00b001188dc990femr702993oan.250.1660349463380; Fri, 12 Aug 2022 17:11:03 -0700 (PDT) X-Google-Smtp-Source: AA6agR44Bo2lHpomj2yENFASQeX/KvxtbmtBAhqtbIF75Ft+7JDHECXElN5p+XOcLig5YHlZXz8leA== X-Received: by 2002:a05:6870:73ce:b0:118:8dc9:90fe with SMTP id a14-20020a05687073ce00b001188dc990femr702986oan.250.1660349463134; Fri, 12 Aug 2022 17:11:03 -0700 (PDT) Received: from localhost ([2600:1700:1d0:5e50:51b0:150c:5b8d:e224]) by smtp.gmail.com with ESMTPSA id d63-20020aca3642000000b00339c8aab320sm603720oia.3.2022.08.12.17.11.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Aug 2022 17:11:02 -0700 (PDT) From: Michael Reed To: kernel-team@lists.ubuntu.com Subject: [SRU][F][PATCH 3/5] scsi: fnic: Change shost_printk() to FNIC_MAIN_DBG() Date: Fri, 12 Aug 2022 19:10:55 -0500 Message-Id: <20220813001057.34877-4-michael.reed@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220813001057.34877-1-michael.reed@canonical.com> References: <20220813001057.34877-1-michael.reed@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Karan Tilak Kumar Replace shost_printk() with FNIC_MAIN_DBG() so that these log messages are controlled by fnic_log_level flag in fnic_handle_link. BugLink: https://launchpad.net/bugs/1984011 Link: https://lore.kernel.org/r/20201121013739.18701-1-kartilak@cisco.com Reviewed-by: Arulprabhu Ponnusamy Co-developed-by: Satish Kharat Signed-off-by: Satish Kharat Signed-off-by: Karan Tilak Kumar Signed-off-by: Martin K. Petersen (cherry picked from commit 875d4eda3bd67315418f4e6f6725a877aa1786b5) Signed-off-by: Michael Reed --- drivers/scsi/fnic/fnic.h | 2 +- drivers/scsi/fnic/fnic_fcs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h index 6dc8c916de31..7c5c911b2673 100644 --- a/drivers/scsi/fnic/fnic.h +++ b/drivers/scsi/fnic/fnic.h @@ -39,7 +39,7 @@ #define DRV_NAME "fnic" #define DRV_DESCRIPTION "Cisco FCoE HBA Driver" -#define DRV_VERSION "1.6.0.50" +#define DRV_VERSION "1.6.0.51" #define PFX DRV_NAME ": " #define DFX DRV_NAME "%d: " diff --git a/drivers/scsi/fnic/fnic_fcs.c b/drivers/scsi/fnic/fnic_fcs.c index ab74b8d642aa..78857ea1491d 100644 --- a/drivers/scsi/fnic/fnic_fcs.c +++ b/drivers/scsi/fnic/fnic_fcs.c @@ -75,7 +75,7 @@ void fnic_handle_link(struct work_struct *work) atomic64_set(&fnic->fnic_stats.misc_stats.current_port_speed, new_port_speed); if (old_port_speed != new_port_speed) - shost_printk(KERN_INFO, fnic->lport->host, + FNIC_MAIN_DBG(KERN_INFO, fnic->lport->host, "Current vnic speed set to : %llu\n", new_port_speed); From patchwork Sat Aug 13 00:10:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Reed X-Patchwork-Id: 1666024 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=t0ALvFaO; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4M4LYh0c83z9sGS for ; Sat, 13 Aug 2022 10:11:18 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1oMekC-0007Op-Co; Sat, 13 Aug 2022 00:11:12 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1oMek6-0007Ki-2A for kernel-team@lists.ubuntu.com; Sat, 13 Aug 2022 00:11:06 +0000 Received: from mail-oi1-f198.google.com (mail-oi1-f198.google.com [209.85.167.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 776B73F0E1 for ; Sat, 13 Aug 2022 00:11:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1660349465; bh=je0snfJaQQ5skSoRcJ05l17ZCrb3Ae5MkrxZn5FU5gc=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=t0ALvFaO3aQ6C8AUjEDFMzaxgKAbeV6PCrw3WcD9PvrVLX7+0tpX85lSZmCoDnzZC l8oJkgmmpKnqAjAR2k/5oPHUE2RrioYP99fqDN4OMRMJSINvwOzT8JTo5MUAIUR/64 mAnF2n8b6niKp5XWKNkG7idLCWxoop3Q91I967O8B6DhJa3UcE8rjyZ9Fc3Mzg4AlE 7l4/YNWcav7vf3x6uiBYKXX4TyX+HWU2iHrnMuI4a6Gu8dgsbCmDHead6SyWL1ERwW UYTkNltsCgntudVtWLFW74+ZdH+XTffF6FGyZNfQGzSxX2wvl4OxFvqivmAHnrQBcK Mg9LS4LhzC6xg== Received: by mail-oi1-f198.google.com with SMTP id bb10-20020a056808168a00b00342d91dd857so857236oib.21 for ; Fri, 12 Aug 2022 17:11:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=je0snfJaQQ5skSoRcJ05l17ZCrb3Ae5MkrxZn5FU5gc=; b=dG2mLbyoKPsrtiONuJFbsgEQmRJTLyWZdzg/vagSaVW/jy30UvDAs5N2gNDf7yS0zr uXj2mbIsP8BhTuPL/dTaAY0Zq/t5vnKdViEWPR50oQaKOjoOy+gXq6Y9sbFCMVezIYvM 8eH7Na+GJAT1uVYm9mu6PZNuPUUqmSXHG55ZshWY4gziIAIV36aORFXMXa9+UtUJPHiA tZRWg96bYqvwv3bOuLJb4mhW2sw9jGgHTB9B3MebCJ9H5xurbQB3fgbI++aYS2KKbpN9 U6i5XoLDqFMlTB+gV7p7cFqf3IJbIP3v76CXtEBwVwjsTIEzGX04xr6OIHu+tcgdCdCK A3Og== X-Gm-Message-State: ACgBeo3oB5RxC44ceMPu2xBNN1TG1HBl2zvUWANMl6VavtuDhXKXxWai REYqcwQfieDXUeUAW/zpGw2QkjbzRiDhJ/Cj6Nf4WFyqSYSBaS4sn2Cbr/1WSXh+PUgHpod0Rrm 2VLKTbA1s9Wk0L+lM1ldw0hSBLYqFe76Yef8Hx+nEtg== X-Received: by 2002:a9d:6494:0:b0:61c:c1ba:c302 with SMTP id g20-20020a9d6494000000b0061cc1bac302mr2357978otl.70.1660349464303; Fri, 12 Aug 2022 17:11:04 -0700 (PDT) X-Google-Smtp-Source: AA6agR6uLmG1j0zu7PjaZUyQuoWyuySOFITGLC+vajMds351NQ+EHDcaPU/kKkdjk4FkmbaaNlwFxg== X-Received: by 2002:a9d:6494:0:b0:61c:c1ba:c302 with SMTP id g20-20020a9d6494000000b0061cc1bac302mr2357967otl.70.1660349464036; Fri, 12 Aug 2022 17:11:04 -0700 (PDT) Received: from localhost ([2600:1700:1d0:5e50:51b0:150c:5b8d:e224]) by smtp.gmail.com with ESMTPSA id v83-20020aca6156000000b0033b15465357sm605545oib.5.2022.08.12.17.11.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Aug 2022 17:11:03 -0700 (PDT) From: Michael Reed To: kernel-team@lists.ubuntu.com Subject: [SRU][F][PATCH 4/5] scsi: fnic: Set scsi_set_resid() only for underflow Date: Fri, 12 Aug 2022 19:10:56 -0500 Message-Id: <20220813001057.34877-5-michael.reed@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220813001057.34877-1-michael.reed@canonical.com> References: <20220813001057.34877-1-michael.reed@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Karan Tilak Kumar Set scsi_set_resid() only if FCPIO_ICMND_CMPL_RESID_UNDER is set. BugLink: https://launchpad.net/bugs/1984011 Link: https://lore.kernel.org/r/20201121015134.18872-1-kartilak@cisco.com Reviewed-by: Arulprabhu Ponnusamy Co-developed-by: Satish Kharat Signed-off-by: Satish Kharat Signed-off-by: Karan Tilak Kumar Signed-off-by: Martin K. Petersen (cherry picked from commit 74ae6d6a6805f9fe162e4527d8ff0f7d2f9bc0d0) Signed-off-by: Michael Reed --- drivers/scsi/fnic/fnic.h | 2 +- drivers/scsi/fnic/fnic_scsi.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h index 7c5c911b2673..e4d399f41a0a 100644 --- a/drivers/scsi/fnic/fnic.h +++ b/drivers/scsi/fnic/fnic.h @@ -39,7 +39,7 @@ #define DRV_NAME "fnic" #define DRV_DESCRIPTION "Cisco FCoE HBA Driver" -#define DRV_VERSION "1.6.0.51" +#define DRV_VERSION "1.6.0.52" #define PFX DRV_NAME ": " #define DFX DRV_NAME "%d: " diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c index 9b23f9701f91..486ff8a18a37 100644 --- a/drivers/scsi/fnic/fnic_scsi.c +++ b/drivers/scsi/fnic/fnic_scsi.c @@ -920,10 +920,11 @@ static void fnic_fcpio_icmnd_cmpl_handler(struct fnic *fnic, case FCPIO_SUCCESS: sc->result = (DID_OK << 16) | icmnd_cmpl->scsi_status; xfer_len = scsi_bufflen(sc); - scsi_set_resid(sc, icmnd_cmpl->residual); - if (icmnd_cmpl->flags & FCPIO_ICMND_CMPL_RESID_UNDER) + if (icmnd_cmpl->flags & FCPIO_ICMND_CMPL_RESID_UNDER) { xfer_len -= icmnd_cmpl->residual; + scsi_set_resid(sc, icmnd_cmpl->residual); + } if (icmnd_cmpl->scsi_status == SAM_STAT_CHECK_CONDITION) atomic64_inc(&fnic_stats->misc_stats.check_condition); From patchwork Sat Aug 13 00:10:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Reed X-Patchwork-Id: 1666025 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=WlSF/hLA; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4M4LYh1j5wz9sGq for ; Sat, 13 Aug 2022 10:11:18 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1oMekA-0007NC-1u; Sat, 13 Aug 2022 00:11:10 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1oMek7-0007LO-Qm for kernel-team@lists.ubuntu.com; Sat, 13 Aug 2022 00:11:07 +0000 Received: from mail-ot1-f71.google.com (mail-ot1-f71.google.com [209.85.210.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id B51BF3F0E1 for ; Sat, 13 Aug 2022 00:11:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1660349466; bh=uK8nOTFOvPnCT01cz3AO4go+AWmc4oUhYNoYCKeWYgg=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WlSF/hLAkU2tq5NllCTzN9AVYIYtGxeYRnUdRwySI25WBG/xJZuT7yUhzRm+UAGEN xSu+wcjHXcXYXdhLf/Z2p2yyolLOu9aLrR3g8lIdJXaHs9JgALIMgWa8nliqJOip0V wQNCFov69o20BjeE8XW2Kj4c+8UjCLy96Co/wTuC34POUAIhsA+GPTFlTvSVGvlFnT wnL/MUFQlSAvlJgjDL5sFI2d33kgVc8ji8Yny7MfX8lnSEYeFqtihm3ax/l5zHAeqc JEMstD3kMuT3u1SIdP7XESrPgObsoBjCsg0LSSmGml+Jf+o97KB4uRQW4+vUauW/Ra Dzw+hFdU3VjHg== Received: by mail-ot1-f71.google.com with SMTP id f3-20020a9d2c03000000b00636969b5938so823460otb.6 for ; Fri, 12 Aug 2022 17:11:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=uK8nOTFOvPnCT01cz3AO4go+AWmc4oUhYNoYCKeWYgg=; b=fvqaTzENOsmdzmG0XkpFvjuEUclMmAbr/UzVyadU8XcG2cONR+slYnpE19bL+DkX48 j81Bhawj6f4bdd5PbZzj+C+m5WxcMg1DneYxpUVXctByPz7McCYJd+lvTlW9KO0nIQmk MRynmyZG2q6jgyOoHOci0NR5sUXmNt/XerYHXc7ArTUHbAOiTHC91HQAcK3SPL3ZEA0l 0qM3MLA2DBjmHl2AQnXlWIKfud4sulEuKHS3SW6G3D/ge9rMX/w4cDwfzLSfVTCECQR7 rebQntvQvYhIaBGn1xXmkv2MEFRfeiSENeRQ3g2AhFDWdlfbZcg+kEG1pcmjNBaRfZ6T is7Q== X-Gm-Message-State: ACgBeo2L28cu4k3QkIqkbwP7BWci8xUW2Rg+ytZFkzcIyIg04zxcT+y1 ngOKZqIYzaGEZEMkM3XyO5VH0tvfuJV61R7iKZGqS//32jVwx2NtPMw1jIGzwIlV7JCGi/ooYyK 1ybGDIabXZdFGpvb70d21L4qwSZE6yC6Vk3lq6Whg7A== X-Received: by 2002:a05:6870:3485:b0:101:b3b1:ff4d with SMTP id n5-20020a056870348500b00101b3b1ff4dmr6832600oah.95.1660349465260; Fri, 12 Aug 2022 17:11:05 -0700 (PDT) X-Google-Smtp-Source: AA6agR4MJitLG1YH9akpWwzMO4b9kymxTIiXHltZUpyHJ7vq4kymJSRKxRYdr/nj2MD1+2SGMECjdQ== X-Received: by 2002:a05:6870:3485:b0:101:b3b1:ff4d with SMTP id n5-20020a056870348500b00101b3b1ff4dmr6832596oah.95.1660349465022; Fri, 12 Aug 2022 17:11:05 -0700 (PDT) Received: from localhost ([2600:1700:1d0:5e50:51b0:150c:5b8d:e224]) by smtp.gmail.com with ESMTPSA id m12-20020a056870560c00b000f32fb9d2bfsm201533oao.5.2022.08.12.17.11.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Aug 2022 17:11:04 -0700 (PDT) From: Michael Reed To: kernel-team@lists.ubuntu.com Subject: [SRU][F][PATCH 5/5] scsi: fnic: Validate io_req before others Date: Fri, 12 Aug 2022 19:10:57 -0500 Message-Id: <20220813001057.34877-6-michael.reed@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220813001057.34877-1-michael.reed@canonical.com> References: <20220813001057.34877-1-michael.reed@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Karan Tilak Kumar We need to check for a valid io_req before we check other data. Also, remove redundant checks. BugLink: https://launchpad.net/bugs/1984011 Link: https://lore.kernel.org/r/20201121023337.19295-1-kartilak@cisco.com Reviewed-by: Arulprabhu Ponnusamy Co-developed-by: Satish Kharat Signed-off-by: Satish Kharat Signed-off-by: Karan Tilak Kumar Signed-off-by: Martin K. Petersen (cherry picked from commit 3256b4682386298ec106c1d1896b064f6a291f88) Signed-off-by: Michael Reed --- drivers/scsi/fnic/fnic.h | 2 +- drivers/scsi/fnic/fnic_scsi.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h index e4d399f41a0a..69f373b53132 100644 --- a/drivers/scsi/fnic/fnic.h +++ b/drivers/scsi/fnic/fnic.h @@ -39,7 +39,7 @@ #define DRV_NAME "fnic" #define DRV_DESCRIPTION "Cisco FCoE HBA Driver" -#define DRV_VERSION "1.6.0.52" +#define DRV_VERSION "1.6.0.53" #define PFX DRV_NAME ": " #define DFX DRV_NAME "%d: " diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c index 486ff8a18a37..d2e226073d34 100644 --- a/drivers/scsi/fnic/fnic_scsi.c +++ b/drivers/scsi/fnic/fnic_scsi.c @@ -1734,15 +1734,14 @@ void fnic_terminate_rport_io(struct fc_rport *rport) continue; } - cmd_rport = starget_to_rport(scsi_target(sc->device)); - if (rport != cmd_rport) { + io_req = (struct fnic_io_req *)CMD_SP(sc); + if (!io_req) { spin_unlock_irqrestore(io_lock, flags); continue; } - io_req = (struct fnic_io_req *)CMD_SP(sc); - - if (!io_req || rport != cmd_rport) { + cmd_rport = starget_to_rport(scsi_target(sc->device)); + if (rport != cmd_rport) { spin_unlock_irqrestore(io_lock, flags); continue; }