Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bf7a705 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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: default avatarJames Bottomley <JBottomley@Parallels.com&gt;">

* 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
parents faa2ad09 256d0eaa

drivers/scsi/bnx2i/bnx2i_hwi.c

+3 −0
Original line number Diff line number Diff line
@@ -1264,6 +1264,9 @@ int bnx2i_send_fw_iscsi_init_msg(struct bnx2i_hba *hba) 
	int rc = 0;

	u64 mask64;



	memset(&iscsi_init, 0x00, sizeof(struct iscsi_kwqe_init1));

	memset(&iscsi_init2, 0x00, sizeof(struct iscsi_kwqe_init2));



	bnx2i_adjust_qp_size(hba);



	iscsi_init.flags =

drivers/scsi/hpsa.c

+2 −1
Original line number Diff line number Diff line
@@ -1315,6 +1315,7 @@ static void complete_scsi_command(struct CommandList *cp) 
	}

		break;

	case CMD_PROTOCOL_ERR:

		cmd->result = DID_ERROR << 16;

		dev_warn(&h->pdev->dev, "cp %p has "

			"protocol error\n", cp);

		break;

drivers/scsi/mpt2sas/mpt2sas_base.c

+7 −0
Original line number Diff line number Diff line
@@ -1209,6 +1209,13 @@ _base_check_enable_msix(struct MPT2SAS_ADAPTER *ioc) 
	u16 message_control;





	/* Check whether controller SAS2008 B0 controller,

	   if it is SAS2008 B0 controller use IO-APIC instead of MSIX */

	if (ioc->pdev->device == MPI2_MFGPAGE_DEVID_SAS2008 &&

	    ioc->pdev->revision == 0x01) {

		return -EINVAL;

	}



	base = pci_find_capability(ioc->pdev, PCI_CAP_ID_MSIX);

	if (!base) {

		dfailprintk(ioc, printk(MPT2SAS_INFO_FMT "msix not "

drivers/scsi/virtio_scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ static void virtscsi_map_sgl(struct scatterlist *sg, unsigned int *p_idx, 
	int i;



	for_each_sg(table->sgl, sg_elem, table->nents, i)

		sg_set_buf(&sg[idx++], sg_virt(sg_elem), sg_elem->length);

		sg[idx++] = *sg_elem;



	*p_idx = idx;

}