diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-23 17:48:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-23 17:48:28 -0400 |
| commit | 0bf7a7056c7b39502008feb484b95a5877cdf59d (patch) | |
| tree | 9bffbc828a4e46c91f8ea8e64c5f0985597ee29e | |
| parent | faa2ad09c01c48012fe4c117d3256e354e0f9238 (diff) | |
| parent | 256d0eaac87da1e993190846064f339f4c7a63f5 (diff) | |
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"This is a set of four essential fixes: two oops related (bnx2i,
virtio-scsi), one data corruption related (hpsa) and one failure to
boot due to interrupt routing issues (mpt2ss).
Signed-off-by: James Bottomley <JBottomley@Parallels.com>"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
[SCSI] hpsa: fix handling of protocol error
[SCSI] mpt2sas: Fix for issue - Unable to boot from the drive connected to HBA
[SCSI] bnx2i: Fixed NULL ptr deference for 1G bnx2 Linux iSCSI offload
[SCSI] scsi: virtio-scsi: Fix address translation failure of HighMem pages used by sg list
| -rw-r--r-- | drivers/scsi/bnx2i/bnx2i_hwi.c | 3 | ||||
| -rw-r--r-- | drivers/scsi/hpsa.c | 3 | ||||
| -rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_base.c | 7 | ||||
| -rw-r--r-- | drivers/scsi/virtio_scsi.c | 2 |
4 files changed, 13 insertions, 2 deletions
diff --git a/drivers/scsi/bnx2i/bnx2i_hwi.c b/drivers/scsi/bnx2i/bnx2i_hwi.c index 33d6630529de..91eec60252ee 100644 --- a/drivers/scsi/bnx2i/bnx2i_hwi.c +++ b/drivers/scsi/bnx2i/bnx2i_hwi.c | |||
| @@ -1264,6 +1264,9 @@ int bnx2i_send_fw_iscsi_init_msg(struct bnx2i_hba *hba) | |||
| 1264 | int rc = 0; | 1264 | int rc = 0; |
| 1265 | u64 mask64; | 1265 | u64 mask64; |
| 1266 | 1266 | ||
| 1267 | memset(&iscsi_init, 0x00, sizeof(struct iscsi_kwqe_init1)); | ||
| 1268 | memset(&iscsi_init2, 0x00, sizeof(struct iscsi_kwqe_init2)); | ||
| 1269 | |||
| 1267 | bnx2i_adjust_qp_size(hba); | 1270 | bnx2i_adjust_qp_size(hba); |
| 1268 | 1271 | ||
| 1269 | iscsi_init.flags = | 1272 | iscsi_init.flags = |
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 796482badf13..2b4261cb7742 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c | |||
| @@ -1315,8 +1315,9 @@ static void complete_scsi_command(struct CommandList *cp) | |||
| 1315 | } | 1315 | } |
| 1316 | break; | 1316 | break; |
| 1317 | case CMD_PROTOCOL_ERR: | 1317 | case CMD_PROTOCOL_ERR: |
| 1318 | cmd->result = DID_ERROR << 16; | ||
| 1318 | dev_warn(&h->pdev->dev, "cp %p has " | 1319 | dev_warn(&h->pdev->dev, "cp %p has " |
| 1319 | "protocol error \n", cp); | 1320 | "protocol error\n", cp); |
| 1320 | break; | 1321 | break; |
| 1321 | case CMD_HARDWARE_ERR: | 1322 | case CMD_HARDWARE_ERR: |
| 1322 | cmd->result = DID_ERROR << 16; | 1323 | cmd->result = DID_ERROR << 16; |
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c index b25757d1e91b..9d5a56c4b332 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_base.c +++ b/drivers/scsi/mpt2sas/mpt2sas_base.c | |||
| @@ -1209,6 +1209,13 @@ _base_check_enable_msix(struct MPT2SAS_ADAPTER *ioc) | |||
| 1209 | u16 message_control; | 1209 | u16 message_control; |
| 1210 | 1210 | ||
| 1211 | 1211 | ||
| 1212 | /* Check whether controller SAS2008 B0 controller, | ||
| 1213 | if it is SAS2008 B0 controller use IO-APIC instead of MSIX */ | ||
| 1214 | if (ioc->pdev->device == MPI2_MFGPAGE_DEVID_SAS2008 && | ||
| 1215 | ioc->pdev->revision == 0x01) { | ||
| 1216 | return -EINVAL; | ||
| 1217 | } | ||
| 1218 | |||
| 1212 | base = pci_find_capability(ioc->pdev, PCI_CAP_ID_MSIX); | 1219 | base = pci_find_capability(ioc->pdev, PCI_CAP_ID_MSIX); |
| 1213 | if (!base) { | 1220 | if (!base) { |
| 1214 | dfailprintk(ioc, printk(MPT2SAS_INFO_FMT "msix not " | 1221 | dfailprintk(ioc, printk(MPT2SAS_INFO_FMT "msix not " |
diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c index c7030fbee79c..3e79a2f00042 100644 --- a/drivers/scsi/virtio_scsi.c +++ b/drivers/scsi/virtio_scsi.c | |||
| @@ -331,7 +331,7 @@ static void virtscsi_map_sgl(struct scatterlist *sg, unsigned int *p_idx, | |||
| 331 | int i; | 331 | int i; |
| 332 | 332 | ||
| 333 | for_each_sg(table->sgl, sg_elem, table->nents, i) | 333 | for_each_sg(table->sgl, sg_elem, table->nents, i) |
| 334 | sg_set_buf(&sg[idx++], sg_virt(sg_elem), sg_elem->length); | 334 | sg[idx++] = *sg_elem; |
| 335 | 335 | ||
| 336 | *p_idx = idx; | 336 | *p_idx = idx; |
| 337 | } | 337 | } |