lkml.org 
[lkml]   [2020]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.8 117/148] Revert "scsi: qla2xxx: Disable T10-DIF feature with FC-NVMe during probe"
    Date
    From: Quinn Tran <qutran@marvell.com>

    [ Upstream commit dca93232b361d260413933903cd4bdbd92ebcc7f ]

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

    This reverts commit 5da05a26b8305a625bc9d537671b981795b46dab.

    Link: https://lore.kernel.org/r/20200806111014.28434-12-njavali@marvell.com
    Fixes: 5da05a26b830 ("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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/qla2xxx/qla_os.c | 4 ----
    1 file changed, 4 deletions(-)

    diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
    index e92fad99338cd..5c7c22d0fab4b 100644
    --- a/drivers/scsi/qla2xxx/qla_os.c
    +++ b/drivers/scsi/qla2xxx/qla_os.c
    @@ -2829,10 +2829,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,
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-08-24 10:38    [W:7.330 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site