From patchwork Mon Mar 5 20:04:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Smart X-Patchwork-Id: 10259581 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8D08760134 for ; Mon, 5 Mar 2018 20:04:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7945028B1D for ; Mon, 5 Mar 2018 20:04:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6C66128BCD; Mon, 5 Mar 2018 20:04:29 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, 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 493E828B1D for ; Mon, 5 Mar 2018 20:04:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752480AbeCEUEY (ORCPT ); Mon, 5 Mar 2018 15:04:24 -0500 Received: from mail-qk0-f194.google.com ([209.85.220.194]:41257 "EHLO mail-qk0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751838AbeCEUEW (ORCPT ); Mon, 5 Mar 2018 15:04:22 -0500 Received: by mail-qk0-f194.google.com with SMTP id w142so22132839qkb.8 for ; Mon, 05 Mar 2018 12:04:22 -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=+8yLFAT0Vx+zCChvVBPwIadJIThdgI9RdRc3YumRBT4=; b=Fs9V/RQFnsJnRbjNjmujZjJ+/kKm3OEt5EDj0OCgI+u3roKCEV6JulQwGLdAtw0QRh zXwfPSI63QLDqH9XiRVL0inb5tjmIXvdV/ulz7rCw7pp4+wXPf9oMpWACtBDdp7Vux4C mOugoVh4VO0I57ZJre59EU2SEZf/JM9grz7qSiHmAx0UNlann1KzlYtb0Hp3qhSm5+kF qnWtalgxW+itxRxXQzVf2qmz1hL00zSPrxDpE5FXunGuWAQ2G+UaMt9D/0A5j/qRUdOl A/cbkYsbyb/qckQbdIXAPnjgPxKbJRPNPPtkzhQWCsr27chhm9Ez9zEMsssWmMkcmuej RkqQ== 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=+8yLFAT0Vx+zCChvVBPwIadJIThdgI9RdRc3YumRBT4=; b=sZ4GMCB/XnwMokk5RB4ogjhJlsDtg/4OdiO8pknGICBS0Nyc0Vt0uJacQIr+HVdNPo 8lDxgfuCcVjblkyxrPJsfTZcFDoxy+rvXA65zbEcUga0984UzYKNAxTuJ35CdTq8TjoF 8WKLPXoOseo8xz14potCcyi74GcLhl7UDai/S9PFol/hXhzOj5G/d4+LxueBsOloA7+d rFJKHTZPW5IeGhUHVeM2q+AZW9CABYdYKuHlsXTXO0TB2dZNkVh+l7y94Eb0AwPVeofa JYlpNU09jOV0Wps/BWPxO5xtAQtR6QXAt0PScGmerM89cXLnpS+y1tZkJU8w+oiGqclI PMGg== X-Gm-Message-State: AElRT7Fq2+7mJllQvDoSXzH3vbaESuD1qRYBWNTkwqRk6Y7hsHiLu0/h F1zFJZZKZP/yzMsO10fxQfVRmw== X-Google-Smtp-Source: AG47ELvJowrH2iWRlYoZ9SvDG0jVCNSvN+3mqc5wYt27pIEhaEPnIfKUUDnQON+CpDAhEd7arIM+uw== X-Received: by 10.55.189.131 with SMTP id n125mr24329989qkf.350.1520280261484; Mon, 05 Mar 2018 12:04:21 -0800 (PST) Received: from os42.localdomain ([192.19.218.250]) by smtp.gmail.com with ESMTPSA id y124sm8529243qke.40.2018.03.05.12.04.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 Mar 2018 12:04:21 -0800 (PST) From: James Smart To: linux-scsi@vger.kernel.org Cc: James Smart , Dick Kennedy , James Smart Subject: [PATCH 1/9] lpfc: Fix NVME Initiator FirstBurst Date: Mon, 5 Mar 2018 12:04:02 -0800 Message-Id: <20180305200410.23620-2-jsmart2021@gmail.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20180305200410.23620-1-jsmart2021@gmail.com> References: <20180305200410.23620-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 First Burst support was not properly indicated in NVMe PRLI. Correct the bit position and the logic to check and set first burst support. Signed-off-by: Dick Kennedy Signed-off-by: James Smart --- drivers/scsi/lpfc/lpfc_nportdisc.c | 15 ++++++++++++++- drivers/scsi/lpfc/lpfc_nvme.h | 2 ++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c index b63179d895e2..022060636ae1 100644 --- a/drivers/scsi/lpfc/lpfc_nportdisc.c +++ b/drivers/scsi/lpfc/lpfc_nportdisc.c @@ -1998,8 +1998,14 @@ lpfc_cmpl_prli_prli_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, ndlp->nlp_type |= NLP_NVME_TARGET; if (bf_get_be32(prli_disc, nvpr)) ndlp->nlp_type |= NLP_NVME_DISCOVERY; + + /* + * If prli_fba is set, the Target supports FirstBurst. + * If prli_fb_sz is 0, the FirstBurst size is unlimited, + * otherwise it defines the actual size supported by + * the NVME Target. + */ if ((bf_get_be32(prli_fba, nvpr) == 1) && - (bf_get_be32(prli_fb_sz, nvpr) > 0) && (phba->cfg_nvme_enable_fb) && (!phba->nvmet_support)) { /* Both sides support FB. The target's first @@ -2008,6 +2014,13 @@ lpfc_cmpl_prli_prli_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, ndlp->nlp_flag |= NLP_FIRSTBURST; ndlp->nvme_fb_size = bf_get_be32(prli_fb_sz, nvpr); + + /* Expressed in units of 512 bytes */ + if (ndlp->nvme_fb_size) + ndlp->nvme_fb_size <<= + LPFC_NVME_FB_SHIFT; + else + ndlp->nvme_fb_size = LPFC_NVME_MAX_FB; } } diff --git a/drivers/scsi/lpfc/lpfc_nvme.h b/drivers/scsi/lpfc/lpfc_nvme.h index e79f8f75758c..48b0229ebc99 100644 --- a/drivers/scsi/lpfc/lpfc_nvme.h +++ b/drivers/scsi/lpfc/lpfc_nvme.h @@ -27,6 +27,8 @@ #define LPFC_NVME_WAIT_TMO 10 #define LPFC_NVME_EXPEDITE_XRICNT 8 +#define LPFC_NVME_FB_SHIFT 9 +#define LPFC_NVME_MAX_FB (1 << 20) /* 1M */ struct lpfc_nvme_qhandle { uint32_t index; /* WQ index to use */