From: Gabriel Krisman Bertazi Date: Tue, 3 Nov 2015 18:26:07 +0000 (-0200) Subject: ipr: Don't set NO_ULEN_CHK bit when resource is a vset. X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~11228^2~1^2~35 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4f92d01a642d27716f60cdab0fd3c527fb7cfb0f;p=mirror_ubuntu-focal-kernel.git ipr: Don't set NO_ULEN_CHK bit when resource is a vset. According to the IPR specification, Inhibit Underlength Checking bit must be disabled when issuing commands to vsets. Enabling it in this case might cause SCSI commands to fail with an Illegal Request, so make sure we keep this bit cleared when resource is a vset. Signed-off-by: Gabriel Krisman Bertazi Reviewed-by: Manoj Kumar Acked-by: Brian King Reviewed-by: Wen Xiong Signed-off-by: Martin K. Petersen --- diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index 238efab90bf2..6849b7f18bc2 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c @@ -6363,15 +6363,19 @@ static int ipr_queuecommand(struct Scsi_Host *shost, ipr_cmd->scsi_cmd = scsi_cmd; ipr_cmd->done = ipr_scsi_eh_done; - if (ipr_is_gscsi(res) || ipr_is_vset_device(res)) { + if (ipr_is_gscsi(res)) { if (scsi_cmd->underflow == 0) ioarcb->cmd_pkt.flags_hi |= IPR_FLAGS_HI_NO_ULEN_CHK; - ioarcb->cmd_pkt.flags_hi |= IPR_FLAGS_HI_NO_LINK_DESC; - if (ipr_is_gscsi(res) && res->reset_occurred) { + if (res->reset_occurred) { res->reset_occurred = 0; ioarcb->cmd_pkt.flags_lo |= IPR_FLAGS_LO_DELAY_AFTER_RST; } + } + + if (ipr_is_gscsi(res) || ipr_is_vset_device(res)) { + ioarcb->cmd_pkt.flags_hi |= IPR_FLAGS_HI_NO_LINK_DESC; + ioarcb->cmd_pkt.flags_lo |= IPR_FLAGS_LO_ALIGNED_BFR; if (scsi_cmd->flags & SCMD_TAGGED) ioarcb->cmd_pkt.flags_lo |= IPR_FLAGS_LO_SIMPLE_TASK;