Commit d974e426 authored by Martin K. Petersen's avatar Martin K. Petersen Committed by James Bottomley
Browse files

[SCSI] Disable DIF on Hitachi Ultrastar 15K300 



Hitachi Ultrastar 15K300 is quirky. Disable T10 PI (DIF).

Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 8172499a

drivers/scsi/scsi_devinfo.c

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ static struct { 
	{"HITACHI", "DF400", "*", BLIST_REPORTLUN2},

	{"HITACHI", "DF500", "*", BLIST_REPORTLUN2},

	{"HITACHI", "DISK-SUBSYSTEM", "*", BLIST_REPORTLUN2},

	{"HITACHI", "HUS1530", "*", BLIST_NO_DIF},

	{"HITACHI", "OPEN-", "*", BLIST_REPORTLUN2},

	{"HITACHI", "OP-C-", "*", BLIST_SPARSELUN | BLIST_LARGELUN},

	{"HITACHI", "3380-", "*", BLIST_SPARSELUN | BLIST_LARGELUN},

drivers/scsi/scsi_scan.c

+3 −0
Original line number Diff line number Diff line
@@ -911,6 +911,9 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result, 
	if (*bflags & BLIST_RETRY_HWERROR)

		sdev->retry_hwerror = 1;



	if (*bflags & BLIST_NO_DIF)

		sdev->no_dif = 1;



	transport_configure_device(&sdev->sdev_gendev);



	if (sdev->host->hostt->slave_configure) {

include/scsi/scsi_device.h

+4 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ struct scsi_device { 
	unsigned is_visible:1;	/* is the device visible in sysfs */

	unsigned can_power_off:1; /* Device supports runtime power off */

	unsigned wce_default_on:1;	/* Cache is ON by default */

	unsigned no_dif:1;	/* T10 PI (DIF) should be disabled */



	DECLARE_BITMAP(supported_events, SDEV_EVT_MAXBITS); /* supported events */

	struct list_head event_list;	/* asserted events */
@@ -476,6 +477,9 @@ static inline int scsi_device_enclosure(struct scsi_device *sdev) 


static inline int scsi_device_protection(struct scsi_device *sdev)

{

	if (sdev->no_dif)

		return 0;



	return sdev->scsi_level > SCSI_2 && sdev->inquiry[5] & (1<<0);

}

include/scsi/scsi_devinfo.h

+1 −0
Original line number Diff line number Diff line
@@ -30,4 +30,5 @@ 
#define BLIST_RETRY_HWERROR	0x400000 /* retry HARDWARE_ERROR */

#define BLIST_MAX_512		0x800000 /* maximum 512 sector cdb length */

#define BLIST_ATTACH_PQ3	0x1000000 /* Scan: Attach to PQ3 devices */

#define BLIST_NO_DIF		0x2000000 /* Disable T10 PI (DIF) */

#endif