Commit b00ecabf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] ibmvfc: Fix DMA mapping leak on memory allocation failure
  [SCSI] qla2xxx: Update version number to 8.03.00-k2.
  [SCSI] qla2xxx: Add checks for a valid fcport in dev-loss-tmo/terminate_rport_io callbacks.
  [SCSI] qla2xxx: Correct regression in DMA-mask setting prior to allocations.
  [SCSI] qla2xxx: Correct descriptions in flash manipulation routines.
  [SCSI] qla2xxx: Correct regression in EH abort handling.
  [SCSI] qla2xxx: Correct endianness issue during flash manipulation.
  [SCSI] qla2xxx: Correct MSI-X vector allocation for single queue mode.
  [SCSI] qla2xxx: Modify firmware-load order precedence for ISP81XX parts.
  [SCSI] qla2xxx: Always serialize mailbox command execution.
  [SCSI] qla2xxx: Ensure RISC-interrupt-enabled consistency for IS_NOPOLLING_TYPE() ISPs.
  [SCSI] qla2xxx: Simplify sector-mask calculation in preparation for larger flash parts.
  [SCSI] qla2xxx: Fix memory leak in error path
  [SCSI] qla4xxx: do not reuse session when connecting to different target port
  [SCSI] libiscsi: fix iscsi pool leak
parents 97179fd4 64b840dd

drivers/scsi/ibmvscsi/ibmvfc.c

+3 −1
Original line number Diff line number Diff line
@@ -1322,6 +1322,8 @@ static int ibmvfc_map_sg_data(struct scsi_cmnd *scmd, 
					       &evt->ext_list_token);



		if (!evt->ext_list) {

			scsi_dma_unmap(scmd);

			if (vhost->log_level > IBMVFC_DEFAULT_LOG_LEVEL)

				scmd_printk(KERN_ERR, scmd, "Can't allocate memory for scatterlist\n");

			return -ENOMEM;

		}

drivers/scsi/libiscsi.c

+1 −0
Original line number Diff line number Diff line
@@ -1981,6 +1981,7 @@ void iscsi_pool_free(struct iscsi_pool *q) 
		kfree(q->pool[i]);

	if (q->pool)

		kfree(q->pool);

	kfree(q->queue);

}

EXPORT_SYMBOL_GPL(iscsi_pool_free);

drivers/scsi/qla2xxx/qla_attr.c

+6 −0
Original line number Diff line number Diff line
@@ -1016,6 +1016,9 @@ qla2x00_dev_loss_tmo_callbk(struct fc_rport *rport) 
	struct Scsi_Host *host = rport_to_shost(rport);

	fc_port_t *fcport = *(fc_port_t **)rport->dd_data;



	if (!fcport)

		return;



	qla2x00_abort_fcport_cmds(fcport);



	/*
@@ -1033,6 +1036,9 @@ qla2x00_terminate_rport_io(struct fc_rport *rport) 
{

	fc_port_t *fcport = *(fc_port_t **)rport->dd_data;



	if (!fcport)

		return;



	/*

	 * At this point all fcport's software-states are cleared.  Perform any

	 * final cleanup of firmware resources (PCBs and XCBs).

drivers/scsi/qla2xxx/qla_gbl.h

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ extern void qla24xx_update_fw_options(scsi_qla_host_t *); 
extern void qla81xx_update_fw_options(scsi_qla_host_t *);

extern int qla2x00_load_risc(struct scsi_qla_host *, uint32_t *);

extern int qla24xx_load_risc(scsi_qla_host_t *, uint32_t *);

extern int qla81xx_load_risc(scsi_qla_host_t *, uint32_t *);



extern int qla2x00_loop_resync(scsi_qla_host_t *);

drivers/scsi/qla2xxx/qla_init.c

+47 −6
Original line number Diff line number Diff line
@@ -3562,6 +3562,9 @@ qla24xx_reset_adapter(scsi_qla_host_t *vha) 
	WRT_REG_DWORD(&reg->hccr, HCCRX_REL_RISC_PAUSE);

	RD_REG_DWORD(&reg->hccr);

	spin_unlock_irqrestore(&ha->hardware_lock, flags);



	if (IS_NOPOLLING_TYPE(ha))

		ha->isp_ops->enable_intrs(ha);

}



/* On sparc systems, obtain port and node WWN from firmware
@@ -3847,6 +3850,10 @@ qla24xx_load_risc_flash(scsi_qla_host_t *vha, uint32_t *srisc_addr) 
	uint32_t i;

	struct qla_hw_data *ha = vha->hw;

	struct req_que *req = ha->req_q_map[0];



	qla_printk(KERN_INFO, ha,

	    "FW: Loading from flash (%x)...\n", ha->flt_region_fw);



	rval = QLA_SUCCESS;



	segments = FA_RISC_CODE_SEGMENTS;
@@ -4022,8 +4029,8 @@ fail_fw_integrity: 
	return QLA_FUNCTION_FAILED;

}



int

qla24xx_load_risc(scsi_qla_host_t *vha, uint32_t *srisc_addr)

static int

qla24xx_load_risc_blob(scsi_qla_host_t *vha, uint32_t *srisc_addr)

{

	int	rval;

	int	segments, fragment;
@@ -4043,12 +4050,12 @@ qla24xx_load_risc(scsi_qla_host_t *vha, uint32_t *srisc_addr) 
		qla_printk(KERN_ERR, ha, "Firmware images can be retrieved "

		    "from: " QLA_FW_URL ".\n");



		/* Try to load RISC code from flash. */

		qla_printk(KERN_ERR, ha, "Attempting to load (potentially "

		    "outdated) firmware from flash.\n");

		return qla24xx_load_risc_flash(vha, srisc_addr);

		return QLA_FUNCTION_FAILED;

	}



	qla_printk(KERN_INFO, ha,

	    "FW: Loading via request-firmware...\n");



	rval = QLA_SUCCESS;



	segments = FA_RISC_CODE_SEGMENTS;
@@ -4133,6 +4140,40 @@ fail_fw_integrity: 
	return QLA_FUNCTION_FAILED;

}



int

qla24xx_load_risc(scsi_qla_host_t *vha, uint32_t *srisc_addr)

{

	int rval;



	/*

	 * FW Load priority:

	 * 1) Firmware via request-firmware interface (.bin file).

	 * 2) Firmware residing in flash.

	 */

	rval = qla24xx_load_risc_blob(vha, srisc_addr);

	if (rval == QLA_SUCCESS)

		return rval;



	return qla24xx_load_risc_flash(vha, srisc_addr);

}



int

qla81xx_load_risc(scsi_qla_host_t *vha, uint32_t *srisc_addr)

{

	int rval;



	/*

	 * FW Load priority:

	 * 1) Firmware residing in flash.

	 * 2) Firmware via request-firmware interface (.bin file).

	 */

	rval = qla24xx_load_risc_flash(vha, srisc_addr);

	if (rval == QLA_SUCCESS)

		return rval;



	return qla24xx_load_risc_blob(vha, srisc_addr);

}



void

qla2x00_try_to_stop_firmware(scsi_qla_host_t *vha)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE