diff options
| author | adam radford <aradford@gmail.com> | 2013-02-10 00:29:15 +0100 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-02-22 16:25:18 +0100 |
| commit | 046c9ec259d271e7988c7fbe80b8bddf3c8efdc4 (patch) | |
| tree | 84f5640211be4c940d685e8ce81c5ef652a83191 /drivers/scsi | |
| parent | [SCSI] qla2xxx: Wait for IDC complete event to finish loopback operation. (diff) | |
| download | linux-046c9ec259d271e7988c7fbe80b8bddf3c8efdc4.tar.xz linux-046c9ec259d271e7988c7fbe80b8bddf3c8efdc4.zip | |
[SCSI] megaraid_sas: Add 4k FastPath DIF support
The following patch for megaraid_sas will allow Fastpath T10PI/DIF
frame builds to work with 4k sector size.
Signed-off-by: Adam Radford <aradford@gmail.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/megaraid/megaraid_sas_fusion.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/megaraid/megaraid_sas_fusion.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c index 74030aff69ad..a6bccf097fc6 100644 --- a/drivers/scsi/megaraid/megaraid_sas_fusion.c +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c @@ -1206,7 +1206,7 @@ megasas_set_pd_lba(struct MPI2_RAID_SCSI_IO_REQUEST *io_request, u8 cdb_len, MPI2_SCSIIO_EEDPFLAGS_INSERT_OP; } io_request->Control |= (0x4 << 26); - io_request->EEDPBlockSize = MEGASAS_EEDPBLOCKSIZE; + io_request->EEDPBlockSize = scp->device->sector_size; } else { /* Some drives don't support 16/12 byte CDB's, convert to 10 */ if (((cdb_len == 12) || (cdb_len == 16)) && diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.h b/drivers/scsi/megaraid/megaraid_sas_fusion.h index a7c64f051996..f68a3cd11d5d 100644 --- a/drivers/scsi/megaraid/megaraid_sas_fusion.h +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.h @@ -61,7 +61,6 @@ #define MEGASAS_SCSI_ADDL_CDB_LEN 0x18 #define MEGASAS_RD_WR_PROTECT_CHECK_ALL 0x20 #define MEGASAS_RD_WR_PROTECT_CHECK_NONE 0x60 -#define MEGASAS_EEDPBLOCKSIZE 512 /* * Raid context flags |