Commit 6cbcc7ab authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull more SCSI updates from James Bottomley:
 "This series is all the stragglers that didn't quite make the first
  merge window pull. It's mostly minor updates and bug fixes of merge
  window code but it also has two driver updates: ufs and qla2xxx"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (46 commits)
  scsi: scsi_debug: Don't call kcalloc() if size arg is zero
  scsi: core: Remove command size deduction from scsi_setup_scsi_cmnd()
  scsi: scsi_ioctl: Validate command size
  scsi: ufs: ufshpb: Properly handle max-single-cmd
  scsi: core: Avoid leaving shost->last_reset with stale value if EH does not run
  scsi: bsg: Fix errno when scsi_bsg_register_queue() fails
  scsi: sr: Remove duplicate assignment
  scsi: ufs: ufs-exynos: Introduce ExynosAuto v9 virtual host
  scsi: ufs: ufs-exynos: Multi-host configuration for ExynosAuto v9
  scsi: ufs: ufs-exynos: Support ExynosAuto v9 UFS
  scsi: ufs: ufs-exynos: Add pre/post_hce_enable drv callbacks
  scsi: ufs: ufs-exynos: Factor out priv data init
  scsi: ufs: ufs-exynos: Add EXYNOS_UFS_OPT_SKIP_CONFIG_PHY_ATTR option
  scsi: ufs: ufs-exynos: Support custom version of ufs_hba_variant_ops
  scsi: ufs: ufs-exynos: Add setup_clocks callback
  scsi: ufs: ufs-exynos: Add refclkout_stop control
  scsi: ufs: ufs-exynos: Simplify drv_data retrieval
  scsi: ufs: ufs-exynos: Change pclk available max value
  scsi: ufs: Add quirk to enable host controller without PH configuration
  scsi: ufs: Add quirk to handle broken UIC command
  ...
parents 030c28a0 3344b58b

drivers/scsi/elx/libefc_sli/sli4.c

+4 −5
Original line number Diff line number Diff line
@@ -4145,7 +4145,7 @@ static int 
sli_get_read_config(struct sli4 *sli4)

{

	struct sli4_rsp_read_config *conf = sli4->bmbx.virt;

	u32 i, total, total_size;

	u32 i, total;

	u32 *base;



	if (sli_cmd_read_config(sli4, sli4->bmbx.virt)) {
@@ -4203,8 +4203,7 @@ sli_get_read_config(struct sli4 *sli4) 


	for (i = 0; i < SLI4_RSRC_MAX; i++) {

		total = sli4->ext[i].number * sli4->ext[i].size;

		total_size = BITS_TO_LONGS(total) * sizeof(long);

		sli4->ext[i].use_map = kzalloc(total_size, GFP_KERNEL);

		sli4->ext[i].use_map = bitmap_zalloc(total, GFP_KERNEL);

		if (!sli4->ext[i].use_map) {

			efc_log_err(sli4, "bitmap memory allocation failed %d\n",

				    i);
@@ -4743,7 +4742,7 @@ sli_reset(struct sli4 *sli4) 
	sli4->ext[0].base = NULL;



	for (i = 0; i < SLI4_RSRC_MAX; i++) {

		kfree(sli4->ext[i].use_map);

		bitmap_free(sli4->ext[i].use_map);

		sli4->ext[i].use_map = NULL;

		sli4->ext[i].base = NULL;

	}
@@ -4784,7 +4783,7 @@ sli_teardown(struct sli4 *sli4) 
	for (i = 0; i < SLI4_RSRC_MAX; i++) {

		sli4->ext[i].base = NULL;



		kfree(sli4->ext[i].use_map);

		bitmap_free(sli4->ext[i].use_map);

		sli4->ext[i].use_map = NULL;

	}

drivers/scsi/hosts.c

+1 −0
Original line number Diff line number Diff line
@@ -388,6 +388,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize) 
	shost->shost_state = SHOST_CREATED;

	INIT_LIST_HEAD(&shost->__devices);

	INIT_LIST_HEAD(&shost->__targets);

	INIT_LIST_HEAD(&shost->eh_abort_list);

	INIT_LIST_HEAD(&shost->eh_cmd_q);

	INIT_LIST_HEAD(&shost->starved_list);

	init_waitqueue_head(&shost->host_wait);

drivers/scsi/qla2xxx/qla_attr.c

+6 −1
Original line number Diff line number Diff line
@@ -2762,7 +2762,12 @@ qla2x00_terminate_rport_io(struct fc_rport *rport) 
			if (fcport->loop_id != FC_NO_LOOP_ID)

				fcport->logout_on_delete = 1;



			if (!EDIF_NEGOTIATION_PENDING(fcport)) {

				ql_dbg(ql_dbg_disc, fcport->vha, 0x911e,

				       "%s %d schedule session deletion\n", __func__,

				       __LINE__);

				qlt_schedule_sess_for_deletion(fcport);

			}

		} else {

			qla2x00_port_logout(fcport->vha, fcport);

		}

drivers/scsi/qla2xxx/qla_def.h

+2 −2
Original line number Diff line number Diff line
@@ -639,9 +639,9 @@ struct qla_els_pt_arg { 
	u8 els_opcode;

	u8 vp_idx;

	__le16 nport_handle;

	u16 control_flags;

	u16 control_flags, ox_id;

	__le32 rx_xchg_address;

	port_id_t did;

	port_id_t did, sid;

	u32 tx_len, tx_byte_count, rx_len, rx_byte_count;

	dma_addr_t tx_addr, rx_addr;

drivers/scsi/qla2xxx/qla_edif.c

+172 −156

File changed.

Preview size limit exceeded, changes collapsed.