Skip to contentSkip to conversation

SCSI bug fixes for 2.6.27-rc6

PATCH New James Bottomley 1 participant 1 message Sep 29, 2008

Subsystems (2)
SCSI QLogic QLA2XXX FC-SCSI driver
lore
Share & tools
lore

James Bottomley

author maintainer
#0 lore raw

PATCH 1/1 SCSI bug fixes for 2.6.27-rc6

Just three. One is to prevent an I/O hang when we get an error on a split request (affects USB devices with the last sector bug). One is to defer enabling qla2xxx interrupts until the device is fully initialised (fixes intermittent oops on NULL deref in the driver) and one is to make the qlogicpti fill its continuation segments correctly (fixes data corruption on various sun systems)

The patch is available here:

master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git

The short changelog is:

Andrew Vasquez (1):
qla2xxx: Defer enablement of RISC interrupts until ISP initialization comp

Boaz Harrosh (1):
qlogicpti: fix sg list traversal error in continuation entries

James Bottomley (1):
Fix hang with split requests

And the diffstat:

 drivers/scsi/qla2xxx/qla_isr.c |    1 -
 drivers/scsi/qla2xxx/qla_os.c  |    2 ++
 drivers/scsi/qlogicpti.c       |    1 +
 drivers/scsi/scsi_lib.c        |    3 ++-
 4 files changed, 5 insertions(+), 2 deletions(-)

The entire diff is attached below.

James

---

drivers/scsi/qla2xxx/qla_isr.c +0 -1
index 45a3b93..bf41887 100644
@@ -1834,7 +1834,6 @@ clear_risc_ints:
 		WRT_REG_WORD(&reg->isp.hccr, HCCR_CLR_HOST_INT);
 	}
 	spin_unlock_irq(&ha->hardware_lock);
-	ha->isp_ops->enable_intrs(ha);
 
 fail:
 	return ret;
drivers/scsi/qla2xxx/qla_os.c +2 -0
index 26afe44..6d0f0e5 100644
@@ -1740,6 +1740,8 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 	if (ret)
 		goto probe_failed;
 
+	ha->isp_ops->enable_intrs(ha);
+
 	scsi_scan_host(host);
 
 	qla2x00_alloc_sysfs_attr(ha);
drivers/scsi/qlogicpti.c +1 -0
index 4a1cf63..9053508 100644
@@ -914,6 +914,7 @@ static inline int load_cmd(struct scsi_cmnd *Cmnd, struct Command_Entry *cmd,
 				ds[i].d_count = sg_dma_len(s);
 			}
 			sg_count -= n;
+			sg = s;
 		}
 	} else {
 		cmd->dataseg[0].d_base = 0;
drivers/scsi/scsi_lib.c +2 -1
index ff5d56b..62307bd 100644
@@ -852,7 +852,7 @@ static void scsi_end_bidi_request(struct scsi_cmnd *cmd)
 void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
 {
 	int result = cmd->result;
-	int this_count = scsi_bufflen(cmd);
+	int this_count;
 	struct request_queue *q = cmd->device->request_queue;
 	struct request *req = cmd->request;
 	int error = 0;

@@ -908,6 +908,7 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
 	 */
 	if (scsi_end_request(cmd, error, good_bytes, result == 0) == NULL)
 		return;
+	this_count = blk_rq_bytes(req);
 
 	/* good_bytes = 0, or (inclusive) there were leftovers and
 	 * result = 0, so scsi_end_request couldn't retry.