scsi: mpt3sas: Fix reference tag handling for WRITE_INSERT

Testing revealed a problem with how the reference tag was handled for
a WRITE_INSERT operation. The SCSI_PROT_REF_CHECK flag is not set when
the controller is asked to generate the protection information
(i.e. not DIX). And as a result the initial reference tag would not be
set in the WRITE_INSERT case.

Separate handling of the REF_CHECK and REF_INCREMENT flags to align
with both the DIX spec and the MPI implementation.

Link: https://lore.kernel.org/r/20211028034202.24225-1-martin.petersen@oracle.com
Fixes: b3e2c72af1d5 ("scsi: mpt3sas: Use the proper SCSI midlayer interfaces for PI")
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index d383d4a034366ecf3a6eaf4a5ca61fd870efa48d..ad1b6c2b37a74e93d24eec8b24ced13670724700 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -5065,9 +5065,12 @@ _scsih_setup_eedp(struct MPT3SAS_ADAPTER *ioc, struct scsi_cmnd *scmd,
        if (scmd->prot_flags & SCSI_PROT_GUARD_CHECK)
                eedp_flags |= MPI2_SCSIIO_EEDPFLAGS_CHECK_GUARD;
 
-       if (scmd->prot_flags & SCSI_PROT_REF_CHECK) {
-               eedp_flags |= MPI2_SCSIIO_EEDPFLAGS_INC_PRI_REFTAG |
-                       MPI2_SCSIIO_EEDPFLAGS_CHECK_REFTAG;
+       if (scmd->prot_flags & SCSI_PROT_REF_CHECK)
+               eedp_flags |= MPI2_SCSIIO_EEDPFLAGS_CHECK_REFTAG;
+
+       if (scmd->prot_flags & SCSI_PROT_REF_INCREMENT) {
+               eedp_flags |= MPI2_SCSIIO_EEDPFLAGS_INC_PRI_REFTAG;
+
                mpi_request->CDB.EEDP32.PrimaryReferenceTag =
                        cpu_to_be32(scsi_prot_ref_tag(scmd));
        }