Commit 90f340e2 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 ten bug fixes (and two consisting of copyright year
  update and version number change) pretty much all of which involve
  either a crash or a hang except the removal of the random sleep from
  the qla2xxx driver (which is a coding error so bad, we want it gone
  before anyone has a chance to copy it)."

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  [SCSI] lpfc: fix potential NULL pointer dereference in lpfc_sli4_rq_put()
  [SCSI] libsas: fix handling vacant phy in sas_set_ex_phy()
  [SCSI] ibmvscsi: Fix slave_configure deadlock
  [SCSI] qla2xxx: Update the driver version to 8.04.00.13-k.
  [SCSI] qla2xxx: Remove debug code that msleeps for random duration.
  [SCSI] qla2xxx: Update copyright dates information in LICENSE.qla2xxx file.
  [SCSI] qla2xxx: Fix crash during firmware dump procedure.
  [SCSI] Revert "qla2xxx: Add setting of driver version string for vendor application."
  [SCSI] ipr: dlpar failed when adding an adapter back
  [SCSI] ipr: fix addition of abort command to HRRQ free queue
  [SCSI] st: Take additional queue ref in st_probe
  [SCSI] libsas: use right function to alloc smp response
  [SCSI] ipr: ipr_test_msi() fails when running with msi-x enabled adapter
parents 0b1fd266 5a25bf36

Documentation/scsi/LICENSE.qla2xxx

+1 −1
Original line number Diff line number Diff line 
Copyright (c) 2003-2012 QLogic Corporation

Copyright (c) 2003-2013 QLogic Corporation

QLogic Linux FC-FCoE Driver



This program includes a device driver for Linux 3.x.

drivers/scsi/ibmvscsi/ibmvscsi.c

+1 −1
Original line number Diff line number Diff line
@@ -1899,8 +1899,8 @@ static int ibmvscsi_slave_configure(struct scsi_device *sdev) 
		sdev->allow_restart = 1;

		blk_queue_rq_timeout(sdev->request_queue, 120 * HZ);

	}

	scsi_adjust_queue_depth(sdev, 0, shost->cmd_per_lun);

	spin_unlock_irqrestore(shost->host_lock, lock_flags);

	scsi_adjust_queue_depth(sdev, 0, shost->cmd_per_lun);

	return 0;

}

drivers/scsi/ipr.c

+10 −3
Original line number Diff line number Diff line
@@ -5148,7 +5148,7 @@ static int ipr_cancel_op(struct scsi_cmnd *scsi_cmd) 
		ipr_trace;

	}



	list_add_tail(&ipr_cmd->queue, &hrrq->hrrq_free_q);

	list_add_tail(&ipr_cmd->queue, &ipr_cmd->hrrq->hrrq_free_q);

	if (!ipr_is_naca_model(res))

		res->needs_sync_complete = 1;
@@ -9349,6 +9349,9 @@ static int ipr_test_msi(struct ipr_ioa_cfg *ioa_cfg, struct pci_dev *pdev) 
	int_reg = readl(ioa_cfg->regs.sense_interrupt_mask_reg);

	spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);



	if (ioa_cfg->intr_flag == IPR_USE_MSIX)

		rc = request_irq(ioa_cfg->vectors_info[0].vec, ipr_test_intr, 0, IPR_NAME, ioa_cfg);

	else

		rc = request_irq(pdev->irq, ipr_test_intr, 0, IPR_NAME, ioa_cfg);

	if (rc) {

		dev_err(&pdev->dev, "Can not assign irq %d\n", pdev->irq);
@@ -9371,6 +9374,9 @@ static int ipr_test_msi(struct ipr_ioa_cfg *ioa_cfg, struct pci_dev *pdev) 


	spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);



	if (ioa_cfg->intr_flag == IPR_USE_MSIX)

		free_irq(ioa_cfg->vectors_info[0].vec, ioa_cfg);

	else

		free_irq(pdev->irq, ioa_cfg);



	LEAVE;
@@ -9722,6 +9728,7 @@ static void __ipr_remove(struct pci_dev *pdev) 
	spin_unlock_irqrestore(ioa_cfg->host->host_lock, host_lock_flags);

	wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);

	flush_work(&ioa_cfg->work_q);

	INIT_LIST_HEAD(&ioa_cfg->used_res_q);

	spin_lock_irqsave(ioa_cfg->host->host_lock, host_lock_flags);



	spin_lock(&ipr_driver_lock);

drivers/scsi/libsas/sas_expander.c

+13 −1
Original line number Diff line number Diff line
@@ -235,6 +235,17 @@ static void sas_set_ex_phy(struct domain_device *dev, int phy_id, void *rsp) 
	linkrate  = phy->linkrate;

	memcpy(sas_addr, phy->attached_sas_addr, SAS_ADDR_SIZE);



	/* Handle vacant phy - rest of dr data is not valid so skip it */

	if (phy->phy_state == PHY_VACANT) {

		memset(phy->attached_sas_addr, 0, SAS_ADDR_SIZE);

		phy->attached_dev_type = NO_DEVICE;

		if (!test_bit(SAS_HA_ATA_EH_ACTIVE, &ha->state)) {

			phy->phy_id = phy_id;

			goto skip;

		} else

			goto out;

	}



	phy->attached_dev_type = to_dev_type(dr);

	if (test_bit(SAS_HA_ATA_EH_ACTIVE, &ha->state))

		goto out;
@@ -272,6 +283,7 @@ static void sas_set_ex_phy(struct domain_device *dev, int phy_id, void *rsp) 
	phy->phy->maximum_linkrate = dr->pmax_linkrate;

	phy->phy->negotiated_linkrate = phy->linkrate;



 skip:

	if (new_phy)

		if (sas_phy_add(phy->phy)) {

			sas_phy_free(phy->phy);
@@ -388,7 +400,7 @@ int sas_ex_phy_discover(struct domain_device *dev, int single) 
	if (!disc_req)

		return -ENOMEM;



	disc_resp = alloc_smp_req(DISCOVER_RESP_SIZE);

	disc_resp = alloc_smp_resp(DISCOVER_RESP_SIZE);

	if (!disc_resp) {

		kfree(disc_req);

		return -ENOMEM;

drivers/scsi/lpfc/lpfc_sli.c

+2 −1
Original line number Diff line number Diff line
@@ -438,11 +438,12 @@ lpfc_sli4_rq_put(struct lpfc_queue *hq, struct lpfc_queue *dq, 
	struct lpfc_rqe *temp_hrqe;

	struct lpfc_rqe *temp_drqe;

	struct lpfc_register doorbell;

	int put_index = hq->host_index;

	int put_index;



	/* sanity check on queue memory */

	if (unlikely(!hq) || unlikely(!dq))

		return -ENOMEM;

	put_index = hq->host_index;

	temp_hrqe = hq->qe[hq->host_index].rqe;

	temp_drqe = dq->qe[dq->host_index].rqe;

CRA Git | Maintained and supported by SUSTech CRA and CCSE