The ZBC_IN command (REPORT ZONES) reply length is always a multiple of 64B and thus may not be aligned on the device LBA size. For this command, retry due to the unaligned completion length is incorrect so do not check alignment of the reply length. Signed-off-by: Damien Le Moal <damien.lemoal@xxxxxxx> --- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c index 0b5b423..f04b872 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c @@ -4723,8 +4723,9 @@ _scsih_io_done(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index, u32 reply) * then scsi-ml does not need to handle this misbehavior. */ sector_sz = scmd->device->sector_size; - if (unlikely(scmd->request->cmd_type == REQ_TYPE_FS && sector_sz && - xfer_cnt % sector_sz)) { + if (scmd->request->cmd_type == REQ_TYPE_FS && + scmd->cmnd[0] != ZBC_IN && + sector_sz && xfer_cnt % sector_sz) { sdev_printk(KERN_INFO, scmd->device, "unaligned partial completion avoided (xfer_cnt=%u, sector_sz=%u)\n", xfer_cnt, sector_sz); -- 2.9.3