Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp246900ybi; Wed, 29 May 2019 20:34:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqzhkysSBMjfWqQMfcC5UmdXXg7z16ynV7fC7EtHTvlaYohay4xgmQ9VUe6bgOn6Ki6mAoUs X-Received: by 2002:a62:cfc4:: with SMTP id b187mr1543171pfg.134.1559187284181; Wed, 29 May 2019 20:34:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559187284; cv=none; d=google.com; s=arc-20160816; b=iQYwEGMQ4668w0bbxLHJDRw35P0G8QewlTtnwAutfqDyPAPbswzHf1m+600jHpbVtC 7A5sdH1p7ScYxCNackqHPqWSQurEUtmgpFc4hxV3CTDokyeDonmrq8kaWXKP8GQw9IJn xcKNwJSAF0XYHNuvxa+/hfofabMrAPQKCUECLToLZtPEhBsuNyBxr4B4uLf5rNYLWZzB GvownkGG5U9qNB958uGPX3Qr6kvIXSQJBJJPo6Qjn9yOjWnb6Dls2Zhc5wq++g2LGMgR K6iyQmaGmnKjB7zVZWTHxseJrWCdU7E5xanKjhVvWk8uKmkSUgNz2Cq4RRXIGucrrvuU I81A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=nfcqZh+Sk45j4d85h5p0NvvFLIqGvr4X/f+MeNmQQ/I=; b=PZrdXEKFvgjsSZzazwn5mRJU6z2VQQa5GIQaBDEjNhrb2Ai9QRR691k2rOMrlhBA4m kQH1FuLFvZLG5mmKoLQ8/heAyezsRnPIPuV6R8g6IdNmy5ybhb/77y4nLdkQEFbPzMN9 tWH560tZzpOKa/OYVx110Vv6ZGZrZGcmWm604kavrWKwDLWdJhTNHO7OFv/cc+8WTTWu x3JhFo/ZR0E+y1DpYPw7e9fr7LaV1s+HwLhDOrmy+C0W5CDq3qsylP7TGwdhZaRAMBkm OlGXVP+sleAgTLiphyPNVOFV0mrL1IuVxTAAg+GvV2tLa7CYtszWo1WYIQGOA4kD7xK/ PQNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=p1tJUMe5; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p7si2192205pfn.266.2019.05.29.20.34.28; Wed, 29 May 2019 20:34:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=p1tJUMe5; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387501AbfE3D2h (ORCPT + 99 others); Wed, 29 May 2019 23:28:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:57612 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732109AbfE3DUB (ORCPT ); Wed, 29 May 2019 23:20:01 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9438B2490A; Thu, 30 May 2019 03:20:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186400; bh=Nw1S3ljB75XOEqY4ile3e0I008mEEAwfaIm2KJFl3dk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p1tJUMe5MkRyqSKa8yPR9Wewt88tpRMiMUieBHzhdAOrwtpHx/Z4N57QUXknpToWX woAZHu1ASiL1uYhPgzbt/C0TRA5vrV0meLcJOhmmp/G2KSqNlzGMgTGxyfXBx2AM98 1b1C9b2gCuftwpRqLlK76nCpSzWw6jc2lP46fFgA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dick Kennedy , James Smart , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 4.14 183/193] scsi: lpfc: Fix fc4type information for FDMI Date: Wed, 29 May 2019 20:07:17 -0700 Message-Id: <20190530030512.869029471@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030446.953835040@linuxfoundation.org> References: <20190530030446.953835040@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 32a80c093b524a0682f1c6166c910387b116ffce ] The driver is reporting support for NVME even when not configured for NVME operation. Fix (and make more readable) when NVME protocol support is indicated. Signed-off-by: Dick Kennedy Signed-off-by: James Smart Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/lpfc/lpfc_ct.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c index 54664a07d92ec..601a4ee60de85 100644 --- a/drivers/scsi/lpfc/lpfc_ct.c +++ b/drivers/scsi/lpfc/lpfc_ct.c @@ -2092,10 +2092,11 @@ lpfc_fdmi_port_attr_fc4type(struct lpfc_vport *vport, ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue; memset(ae, 0, 32); - ae->un.AttrTypes[3] = 0x02; /* Type 1 - ELS */ - ae->un.AttrTypes[2] = 0x01; /* Type 8 - FCP */ - ae->un.AttrTypes[6] = 0x01; /* Type 40 - NVME */ - ae->un.AttrTypes[7] = 0x01; /* Type 32 - CT */ + ae->un.AttrTypes[3] = 0x02; /* Type 0x1 - ELS */ + ae->un.AttrTypes[2] = 0x01; /* Type 0x8 - FCP */ + if (vport->nvmei_support || vport->phba->nvmet_support) + ae->un.AttrTypes[6] = 0x01; /* Type 0x28 - NVME */ + ae->un.AttrTypes[7] = 0x01; /* Type 0x20 - CT */ size = FOURBYTES + 32; ad->AttrLen = cpu_to_be16(size); ad->AttrType = cpu_to_be16(RPRT_SUPPORTED_FC4_TYPES); @@ -2395,9 +2396,11 @@ lpfc_fdmi_port_attr_active_fc4type(struct lpfc_vport *vport, ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue; memset(ae, 0, 32); - ae->un.AttrTypes[3] = 0x02; /* Type 1 - ELS */ - ae->un.AttrTypes[2] = 0x01; /* Type 8 - FCP */ - ae->un.AttrTypes[7] = 0x01; /* Type 32 - CT */ + ae->un.AttrTypes[3] = 0x02; /* Type 0x1 - ELS */ + ae->un.AttrTypes[2] = 0x01; /* Type 0x8 - FCP */ + if (vport->phba->cfg_enable_fc4_type & LPFC_ENABLE_NVME) + ae->un.AttrTypes[6] = 0x1; /* Type 0x28 - NVME */ + ae->un.AttrTypes[7] = 0x01; /* Type 0x20 - CT */ size = FOURBYTES + 32; ad->AttrLen = cpu_to_be16(size); ad->AttrType = cpu_to_be16(RPRT_ACTIVE_FC4_TYPES); -- 2.20.1