[SCSI] qla2xxx: T10 DIF Type 2 support

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index d9b431d061b2554dc80ebc3fc5d30c579182cbaa..420238cc794eb7dd69dbe132bdf6be29752ed644 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -1758,8 +1758,10 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)
                            " protection.\n"));
                        scsi_host_set_prot(vha->host,
                            SHOST_DIF_TYPE1_PROTECTION
+                           | SHOST_DIF_TYPE2_PROTECTION
                            | SHOST_DIF_TYPE3_PROTECTION
                            | SHOST_DIX_TYPE1_PROTECTION
+                           | SHOST_DIX_TYPE2_PROTECTION
                            | SHOST_DIX_TYPE3_PROTECTION);
                        scsi_host_set_guard(vha->host, SHOST_DIX_GUARD_CRC);
                } else

diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
index d2b299f2c50358f1015e08e2402c6f26f7bcbb00..4e4c21fafe3ac0cf123f449cf5a8b79b905505a7 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
@@ -712,6 +712,25 @@ qla24xx_set_t10dif_tags(struct scsi_cmnd *cmd, struct fw_dif_context *pkt,
         * match LBA in CDB + N
         */
        case SCSI_PROT_DIF_TYPE2:
+               if (!ql2xenablehba_err_chk)
+                       break;
+
+               if (scsi_prot_sg_count(cmd)) {
+                       spt = page_address(sg_page(scsi_prot_sglist(cmd))) +
+                           scsi_prot_sglist(cmd)[0].offset;
+                       pkt->app_tag = swab32(spt->app_tag);
+                       pkt->app_tag_mask[0] =  0xff;
+                       pkt->app_tag_mask[1] =  0xff;
+               }
+
+               pkt->ref_tag = cpu_to_le32((uint32_t)
+                   (0xffffffff & scsi_get_lba(cmd)));
+
+               /* enable ALL bytes of the ref tag */
+               pkt->ref_tag_mask[0] = 0xff;
+               pkt->ref_tag_mask[1] = 0xff;
+               pkt->ref_tag_mask[2] = 0xff;
+               pkt->ref_tag_mask[3] = 0xff;
                break;
 
        /* For Type 3 protection: 16 bit GUARD only */
@@ -1062,7 +1081,7 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,
        total_bytes = data_bytes;
        dif_bytes = 0;
        blk_size = cmd->device->sector_size;
-       if (scsi_get_prot_type(cmd) == SCSI_PROT_DIF_TYPE1) {
+       if (scsi_get_prot_op(cmd) != SCSI_PROT_NORMAL) {
                dif_bytes = (data_bytes / blk_size) * 8;
                total_bytes += dif_bytes;
        }
@@ -1100,6 +1119,12 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,
            vha->host_no, dif_bytes, dif_bytes, total_bytes, total_bytes,
            crc_ctx_pkt->blk_size, crc_ctx_pkt->blk_size));
 
+       if (!data_bytes || cmd->sc_data_direction == DMA_NONE) {
+               DEBUG18(printk(KERN_INFO "%s: Zero data bytes or DMA-NONE %d\n",
+                   __func__, data_bytes));
+               cmd_pkt->byte_count = __constant_cpu_to_le32(0);
+               return QLA_SUCCESS;
+       }
        /* Walks data segments */
 
        cmd_pkt->control_flags |=
@@ -1310,9 +1335,11 @@ qla24xx_dif_start_scsi(srb_t *sp)
 
 #define QDSS_GOT_Q_SPACE       BIT_0
 
-       /* Only process protection in this routine */
-       if (scsi_get_prot_op(cmd) == SCSI_PROT_NORMAL)
-               return qla24xx_start_scsi(sp);
+       /* Only process protection or >16 cdb in this routine */
+       if (scsi_get_prot_op(cmd) == SCSI_PROT_NORMAL) {
+               if (cmd->cmd_len <= 16)
+                       return qla24xx_start_scsi(sp);
+       }
 
        /* Setup device pointers. */
 

diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c
index 9a82c34f62065a0b3aea6f9e4d29744007f03c41..987c5b0ca78ea22d67d074ee7d170ef1f14b52a4 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_mid.c
+++ b/drivers/scsi/qla2xxx/qla_mid.c
@@ -399,7 +399,10 @@ qla24xx_create_vhost(struct fc_vport *fc_vport)
        host->can_queue = base_vha->req->length + 128;
        host->this_id = 255;
        host->cmd_per_lun = 3;
-       host->max_cmd_len = MAX_CMDSZ;
+       if ((IS_QLA25XX(ha) || IS_QLA81XX(ha)) && ql2xenabledif)
+               host->max_cmd_len = 32;
+       else
+               host->max_cmd_len = MAX_CMDSZ;
        host->max_channel = MAX_BUSES - 1;
        host->max_lun = MAX_LUNS;
        host->unique_id = host->host_no;

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index aeb2f1b504c4c82efaed02939531f245147d8f39..ff2172da7c19d8793c79f415df7bde254325b25b 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -2147,7 +2147,10 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
        host->this_id = 255;
        host->cmd_per_lun = 3;
        host->unique_id = host->host_no;
-       host->max_cmd_len = MAX_CMDSZ;
+       if ((IS_QLA25XX(ha) || IS_QLA81XX(ha)) && ql2xenabledif)
+               host->max_cmd_len = 32;
+       else
+               host->max_cmd_len = MAX_CMDSZ;
        host->max_channel = MAX_BUSES - 1;
        host->max_lun = MAX_LUNS;
        host->transportt = qla2xxx_transport_template;
@@ -2255,8 +2258,10 @@ skip_dpc:
                            " protection.\n"));
                        scsi_host_set_prot(host,
                            SHOST_DIF_TYPE1_PROTECTION
+                           | SHOST_DIF_TYPE2_PROTECTION
                            | SHOST_DIF_TYPE3_PROTECTION
                            | SHOST_DIX_TYPE1_PROTECTION
+                           | SHOST_DIX_TYPE2_PROTECTION
                            | SHOST_DIX_TYPE3_PROTECTION);
                        scsi_host_set_guard(host, SHOST_DIX_GUARD_CRC);
                } else