Commit dca93232 authored Aug 06, 2020 by Quinn Tran Committed by Martin K. Petersen Aug 17, 2020

Revert "scsi: qla2xxx: Disable T10-DIF feature with FC-NVMe during probe"

FCP T10-PI and NVMe features are independent of each other. This patch
allows both features to co-exist.

This reverts commit 5da05a26.

Link: https://lore.kernel.org/r/20200806111014.28434-12-njavali@marvell.com


Fixes: 5da05a26 ("scsi: qla2xxx: Disable T10-DIF feature with FC-NVMe during probe")
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: Quinn Tran <qutran@marvell.com>
Signed-off-by: Nilesh Javali <njavali@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent de7e6194

drivers/scsi/qla2xxx/qla_os.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -2834,10 +2834,6 @@ 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,

Admin message