From patchwork Tue Apr 2 21:24:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Himanshu Madhani X-Patchwork-Id: 10882355 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 5086C922 for ; Tue, 2 Apr 2019 21:25:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3BD4A288BA for ; Tue, 2 Apr 2019 21:25:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3058F288D2; Tue, 2 Apr 2019 21:25:59 +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.9 required=2.0 tests=BAYES_00,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 D83A5288BA for ; Tue, 2 Apr 2019 21:25:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726655AbfDBVZ6 (ORCPT ); Tue, 2 Apr 2019 17:25:58 -0400 Received: from mail-eopbgr710071.outbound.protection.outlook.com ([40.107.71.71]:55607 "EHLO NAM05-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726656AbfDBVZ6 (ORCPT ); Tue, 2 Apr 2019 17:25:58 -0400 Received: from BN8PR07CA0034.namprd07.prod.outlook.com (2603:10b6:408:ac::47) by CY1PR07MB2537.namprd07.prod.outlook.com (2a01:111:e400:c636::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1750.22; Tue, 2 Apr 2019 21:25:57 +0000 Received: from CO1NAM05FT020.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e50::204) by BN8PR07CA0034.outlook.office365.com (2603:10b6:408:ac::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1750.15 via Frontend Transport; Tue, 2 Apr 2019 21:25:56 +0000 Authentication-Results: spf=fail (sender IP is 199.233.58.38) smtp.mailfrom=marvell.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=fail action=none header.from=marvell.com; Received-SPF: Fail (protection.outlook.com: domain of marvell.com does not designate 199.233.58.38 as permitted sender) receiver=protection.outlook.com; client-ip=199.233.58.38; helo=CAEXCH02.caveonetworks.com; Received: from CAEXCH02.caveonetworks.com (199.233.58.38) by CO1NAM05FT020.mail.protection.outlook.com (10.152.96.128) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA) id 15.20.1771.6 via Frontend Transport; Tue, 2 Apr 2019 21:25:56 +0000 Received: from dut1171.mv.qlogic.com (10.112.88.18) by CAEXCH02.caveonetworks.com (10.67.98.110) with Microsoft SMTP Server (TLS) id 14.2.347.0; Tue, 2 Apr 2019 14:24:51 -0700 Received: from dut1171.mv.qlogic.com (localhost [127.0.0.1]) by dut1171.mv.qlogic.com (8.14.7/8.14.7) with ESMTP id x32LOo5V028524; Tue, 2 Apr 2019 14:24:50 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id x32LOooX028523; Tue, 2 Apr 2019 14:24:50 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH v2 05/15] qla2xxx: Disable T10-DIF feature with FC-NVMe during probe Date: Tue, 2 Apr 2019 14:24:24 -0700 Message-ID: <20190402212434.28469-6-hmadhani@marvell.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20190402212434.28469-1-hmadhani@marvell.com> References: <20190402212434.28469-1-hmadhani@marvell.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131987139566029048;(abac79dc-c90b-41ba-8033-08d666125e47);(abac79dc-c90b-41ba-8033-08d666125e47) X-Forefront-Antispam-Report: CIP:199.233.58.38;IPV:CAL;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(396003)(346002)(376002)(39860400002)(136003)(2980300002)(1110001)(1109001)(339900001)(189003)(199004)(36756003)(5660300002)(486006)(6666004)(356004)(126002)(446003)(11346002)(476003)(42186006)(76176011)(16586007)(2616005)(80596001)(498600001)(26826003)(110136005)(54906003)(36906005)(87636003)(51416003)(14444005)(316002)(69596002)(336012)(26005)(86362001)(68736007)(53936002)(47776003)(50226002)(8936002)(8676002)(305945005)(4326008)(105606002)(2906002)(85426001)(81166006)(81156014)(50466002)(48376002)(1076003)(97736004)(106466001)(4744005);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR07MB2537;H:CAEXCH02.caveonetworks.com;FPR:;SPF:Fail;LANG:en;PTR:InfoDomainNonexistent;MX:1;A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8344bcb7-ecca-460b-2651-08d6b7b1cb30 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(5600139)(711020)(4605104)(2017052603328);SRVR:CY1PR07MB2537; X-MS-TrafficTypeDiagnostic: CY1PR07MB2537: X-Microsoft-Antispam-PRVS: X-Forefront-PRVS: 0995196AA2 X-Microsoft-Antispam-Message-Info: Qec335X2GtVnfCWDH1LoQGj1ByGQxRj9criUTJWVYx0Y0GlgWNqZq1SxRENQY6hkz1VfsOmMxi1rqMD79KQCPe8ZD2PVV5d53CWthHt0JvqZtKqXnBbRRzjt9ordlFEeR71DyHZimbUZ3HdbOYWAAfSL/kgEc5pe8EZW0ttn4pgh8yWItz1cN53ceMEPxsUpzOIvOuWIUO2o/E/JKgLaktul0GwS5L5BiCBQ9YE5eoNr8oc9lvKs482nDCqeutRCYuctJil2Bjpnu3a4bRnrFHdrZGCMHGB7RltbCWL8cI8aKXALWJrtqNu8gwhjLDOKNz6bIknc9FbyJMEI4r4Bq7UvNGcyzzf3PRFxbXMnbx9ZaKahPsrxMRqRRyUmFxZ9JXOKQiAjOUEYR0MNIUTZIF0BZa8y3bv8Q76orJMPA/4= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Apr 2019 21:25:56.2646 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8344bcb7-ecca-460b-2651-08d6b7b1cb30 X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e;Ip=[199.233.58.38];Helo=[CAEXCH02.caveonetworks.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR07MB2537 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 From: Giridhar Malavali With FC-NVMe enabled, driver does not support T10 DIF/DIX. This patch disabled T10-PI information when ql2xnvmeenable is set. Signed-off-by: Giridhar Malavali Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_os.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index dde13036b06a..04c2309a6369 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -2899,6 +2899,10 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) /* This may fail but that's ok */ pci_enable_pcie_error_reporting(pdev); + /* Turn off T10-DIF when FC-NVMe is enabled */ + if (ql2xnvmeenable) + ql2xenabledif = 0; + ha = kzalloc(sizeof(struct qla_hw_data), GFP_KERNEL); if (!ha) { ql_log_pci(ql_log_fatal, pdev, 0x0009,