[SCSI] qla2xxx: Correct MQ-chain information retrieval during a firmware dump.

[linux-2.6-omap-h63xx.git] / drivers / scsi / sd_dif.c

diff --git a/drivers/scsi/sd_dif.c b/drivers/scsi/sd_dif.c
index 4d17f3d35aacff87cde0885cb5cb591e60baca31..184dff492797e960c2a65ae4fce5f81ead4c3654 100644 (file)
--- a/drivers/scsi/sd_dif.c
+++ b/drivers/scsi/sd_dif.c
@@ -142,7 +142,7 @@ static int sd_dif_type1_verify_ip(struct blk_integrity_exchg *bix)
 static void sd_dif_type1_set_tag(void *prot, void *tag_buf, unsigned int sectors)
 {
        struct sd_dif_tuple *sdt = prot;
-       char *tag = tag_buf;
+       u8 *tag = tag_buf;
        unsigned int i, j;
 
        for (i = 0, j = 0 ; i < sectors ; i++, j += 2, sdt++) {
@@ -154,7 +154,7 @@ static void sd_dif_type1_set_tag(void *prot, void *tag_buf, unsigned int sectors
 static void sd_dif_type1_get_tag(void *prot, void *tag_buf, unsigned int sectors)
 {
        struct sd_dif_tuple *sdt = prot;
-       char *tag = tag_buf;
+       u8 *tag = tag_buf;
        unsigned int i, j;
 
        for (i = 0, j = 0 ; i < sectors ; i++, j += 2, sdt++) {
@@ -256,7 +256,7 @@ static int sd_dif_type3_verify_ip(struct blk_integrity_exchg *bix)
 static void sd_dif_type3_set_tag(void *prot, void *tag_buf, unsigned int sectors)
 {
        struct sd_dif_tuple *sdt = prot;
-       char *tag = tag_buf;
+       u8 *tag = tag_buf;
        unsigned int i, j;
 
        for (i = 0, j = 0 ; i < sectors ; i++, j += 6, sdt++) {
@@ -269,7 +269,7 @@ static void sd_dif_type3_set_tag(void *prot, void *tag_buf, unsigned int sectors
 static void sd_dif_type3_get_tag(void *prot, void *tag_buf, unsigned int sectors)
 {
        struct sd_dif_tuple *sdt = prot;
-       char *tag = tag_buf;
+       u8 *tag = tag_buf;
        unsigned int i, j;
 
        for (i = 0, j = 0 ; i < sectors ; i++, j += 2, sdt++) {
@@ -311,25 +311,26 @@ void sd_dif_config_host(struct scsi_disk *sdkp)
        struct scsi_device *sdp = sdkp->device;
        struct gendisk *disk = sdkp->disk;
        u8 type = sdkp->protection_type;
+       int dif, dix;
 
-       /* If this HBA doesn't support DIX, resort to normal I/O or DIF */
-       if (scsi_host_dix_capable(sdp->host, type) == 0) {
+       dif = scsi_host_dif_capable(sdp->host, type);
+       dix = scsi_host_dix_capable(sdp->host, type);
 
-               if (type == SD_DIF_TYPE0_PROTECTION)
-                       return;
-
-               if (scsi_host_dif_capable(sdp->host, type) == 0) {
-                       sd_printk(KERN_INFO, sdkp, "Type %d protection " \
-                                 "unsupported by HBA. Disabling DIF.\n", type);
-                       sdkp->protection_type = 0;
-                       return;
-               }
+       if (!dix && scsi_host_dix_capable(sdp->host, 0)) {
+               dif = 0; dix = 1;
+       }
 
-               sd_printk(KERN_INFO, sdkp, "Enabling DIF Type %d protection\n",
-                         type);
+       if (type) {
+               if (dif)
+                       sd_printk(KERN_NOTICE, sdkp,
+                                 "Enabling DIF Type %d protection\n", type);
+               else
+                       sd_printk(KERN_NOTICE, sdkp,
+                                 "Disabling DIF Type %d protection\n", type);
+       }
 
+       if (!dix)
                return;
-       }
 
        /* Enable DMA of protection information */
        if (scsi_host_get_guard(sdkp->device->host) & SHOST_DIX_GUARD_IP)
@@ -343,17 +344,17 @@ void sd_dif_config_host(struct scsi_disk *sdkp)
                else
                        blk_integrity_register(disk, &dif_type1_integrity_crc);
 
-       sd_printk(KERN_INFO, sdkp,
-                 "Enabling %s integrity protection\n", disk->integrity->name);
+       sd_printk(KERN_NOTICE, sdkp,
+                 "Enabling DIX %s protection\n", disk->integrity->name);
 
        /* Signal to block layer that we support sector tagging */
-       if (type && sdkp->ATO) {
+       if (dif && type && sdkp->ATO) {
                if (type == SD_DIF_TYPE3_PROTECTION)
                        disk->integrity->tag_size = sizeof(u16) + sizeof(u32);
                else
                        disk->integrity->tag_size = sizeof(u16);
 
-               sd_printk(KERN_INFO, sdkp, "DIF application tag size %u\n",
+               sd_printk(KERN_NOTICE, sdkp, "DIF application tag size %u\n",
                          disk->integrity->tag_size);
        }
 }
@@ -361,7 +362,7 @@ void sd_dif_config_host(struct scsi_disk *sdkp)
 /*
  * DIF DMA operation magic decoder ring.
  */
-void sd_dif_op(struct scsi_cmnd *scmd, unsigned int dif, unsigned int dix)
+void sd_dif_op(struct scsi_cmnd *scmd, unsigned int dif, unsigned int dix, unsigned int type)
 {
        int csum_convert, prot_op;
 
@@ -373,7 +374,10 @@ void sd_dif_op(struct scsi_cmnd *scmd, unsigned int dif, unsigned int dix)
        else
                csum_convert = 0;
 
+       BUG_ON(dif && (scmd->cmnd[0] == READ_6 || scmd->cmnd[0] == WRITE_6));
+
        switch (scmd->cmnd[0]) {
+       case READ_6:
        case READ_10:
        case READ_12:
        case READ_16:
@@ -389,6 +393,7 @@ void sd_dif_op(struct scsi_cmnd *scmd, unsigned int dif, unsigned int dix)
 
                break;
 
+       case WRITE_6:
        case WRITE_10:
        case WRITE_12:
        case WRITE_16:
@@ -406,7 +411,8 @@ void sd_dif_op(struct scsi_cmnd *scmd, unsigned int dif, unsigned int dix)
        }
 
        scsi_set_prot_op(scmd, prot_op);
-       scsi_set_prot_type(scmd, dif);
+       if (dif)
+               scsi_set_prot_type(scmd, type);
 }
 
 /*
@@ -473,8 +479,9 @@ int sd_dif_prepare(struct request *rq, sector_t hw_sector, unsigned int sector_s
 
 error:
        kunmap_atomic(sdt, KM_USER0);
-       sd_printk(KERN_ERR, sdkp, "%s: virt %u, phys %u, ref %u\n",
-                 __func__, virt, phys, be32_to_cpu(sdt->ref_tag));
+       sd_printk(KERN_ERR, sdkp, "%s: virt %u, phys %u, ref %u, app %4x\n",
+                 __func__, virt, phys, be32_to_cpu(sdt->ref_tag),
+                 be16_to_cpu(sdt->app_tag));
 
        return -EIO;
 }