[SCSI] Deprecate SCSI_PROT_*_CONVERT operations

The checksum format is orthogonal to whether the protection information
is being passed on beyond the HBA or not.  It is perfectly valid to use
a non-T10 CRC with WRITE_STRIP and READ_INSERT.

Consequently it no longer makes sense to explicitly refer to the
conversion in the protection operation.  Update sd_dif and lpfc
accordingly.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Acked-by: Ihab Hamadi <Ihab.Hamadi@Emulex.Com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 3 insertions, 12 deletions

diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index 61d089703806..c88f59f0ce30 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -56,8 +56,6 @@ static char *dif_op_str[] = {
         "SCSI_PROT_WRITE_INSERT",
         "SCSI_PROT_READ_PASS",
         "SCSI_PROT_WRITE_PASS",
-        "SCSI_PROT_READ_CONVERT",
-        "SCSI_PROT_WRITE_CONVERT"
 };
 static void
 lpfc_release_scsi_buf_s4(struct lpfc_hba *phba, struct lpfc_scsi_buf *psb);
@@ -1131,13 +1129,11 @@ lpfc_sc_to_sli_prof(struct scsi_cmnd *sc)
                         ret_prof = LPFC_PROF_A1;
                         break;
 
-                case SCSI_PROT_READ_CONVERT:
-                case SCSI_PROT_WRITE_CONVERT:
+                case SCSI_PROT_READ_PASS:
+                case SCSI_PROT_WRITE_PASS:
                         ret_prof = LPFC_PROF_AST1;
                         break;
 
-                case SCSI_PROT_READ_PASS:
-                case SCSI_PROT_WRITE_PASS:
                 case SCSI_PROT_NORMAL:
                 default:
                         printk(KERN_ERR "Bad op/guard:%d/%d combination\n",
@@ -1157,8 +1153,6 @@ lpfc_sc_to_sli_prof(struct scsi_cmnd *sc)
                         ret_prof = LPFC_PROF_C1;
                         break;
 
-                case SCSI_PROT_READ_CONVERT:
-                case SCSI_PROT_WRITE_CONVERT:
                 case SCSI_PROT_READ_INSERT:
                 case SCSI_PROT_WRITE_STRIP:
                 case SCSI_PROT_NORMAL:
@@ -1209,8 +1203,7 @@ lpfc_get_cmd_dif_parms(struct scsi_cmnd *sc, uint16_t *apptagmask,
         static int cnt;
 
         if (protcnt && (op == SCSI_PROT_WRITE_STRIP ||
-                                op == SCSI_PROT_WRITE_PASS ||
-                                op == SCSI_PROT_WRITE_CONVERT)) {
+                                op == SCSI_PROT_WRITE_PASS)) {
 
                 cnt++;
                 spt = page_address(sg_page(scsi_prot_sglist(sc))) +
@@ -1501,8 +1494,6 @@ lpfc_prot_group_type(struct lpfc_hba *phba, struct scsi_cmnd *sc)
         case SCSI_PROT_WRITE_STRIP:
         case SCSI_PROT_READ_PASS:
         case SCSI_PROT_WRITE_PASS:
-        case SCSI_PROT_WRITE_CONVERT:
-        case SCSI_PROT_READ_CONVERT:
                 ret = LPFC_PG_TYPE_DIF_BUF;
                 break;
         default: