Commit 4774cfe3 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:
 "All fixes for drivers.

  The core change in the error handler is simply to translate an ALUA
  specific sense code into a retry the ALUA components can handle and
  won't impact any other devices"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: error: alua: I/O errors for ALUA state transitions
  scsi: storvsc: Increase the timeouts to storvsc_timeout
  scsi: s390: zfcp: Ensure synchronous unit_add
  scsi: iscsi: Fix incorrect error path labels for flashnode operations
  scsi: mvsas: Fix typos in per-phy comments and SAS cmd port registers
  scsi: core: ufs: Fix a hang in the error handler
parents 25294cb8 5c3ba819

drivers/s390/scsi/zfcp_sysfs.c

+2 −0
Original line number Diff line number Diff line
@@ -449,6 +449,8 @@ static ssize_t zfcp_sysfs_unit_add_store(struct device *dev, 
	if (kstrtoull(buf, 0, (unsigned long long *) &fcp_lun))

		return -EINVAL;



	flush_work(&port->rport_work);



	retval = zfcp_unit_add(port, fcp_lun);

	if (retval)

		return retval;

drivers/scsi/mvsas/mv_defs.h

+2 −2
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ enum hw_register_bits { 


	/* MVS_Px_INT_STAT, MVS_Px_INT_MASK (per-phy events) */

	PHYEV_DEC_ERR		= (1U << 24),	/* Phy Decoding Error */

	PHYEV_DCDR_ERR		= (1U << 23),	/* STP Deocder Error */

	PHYEV_DCDR_ERR		= (1U << 23),	/* STP Decoder Error */

	PHYEV_CRC_ERR		= (1U << 22),	/* STP CRC Error */

	PHYEV_UNASSOC_FIS	= (1U << 19),	/* unassociated FIS rx'd */

	PHYEV_AN		= (1U << 18),	/* SATA async notification */
@@ -347,7 +347,7 @@ enum sas_cmd_port_registers { 
	CMD_SATA_PORT_MEM_CTL0	= 0x158, /* SATA Port Memory Control 0 */

	CMD_SATA_PORT_MEM_CTL1	= 0x15c, /* SATA Port Memory Control 1 */

	CMD_XOR_MEM_BIST_CTL	= 0x160, /* XOR Memory BIST Control */

	CMD_XOR_MEM_BIST_STAT	= 0x164, /* XOR Memroy BIST Status */

	CMD_XOR_MEM_BIST_STAT	= 0x164, /* XOR Memory BIST Status */

	CMD_DMA_MEM_BIST_CTL	= 0x168, /* DMA Memory BIST Control */

	CMD_DMA_MEM_BIST_STAT	= 0x16c, /* DMA Memory BIST Status */

	CMD_PORT_MEM_BIST_CTL	= 0x170, /* Port Memory BIST Control */

drivers/scsi/scsi_error.c

+2 −1
Original line number Diff line number Diff line
@@ -665,7 +665,8 @@ enum scsi_disposition scsi_check_sense(struct scsi_cmnd *scmd) 
		 * if the device is in the process of becoming ready, we

		 * should retry.

		 */

		if ((sshdr.asc == 0x04) && (sshdr.ascq == 0x01))

		if ((sshdr.asc == 0x04) &&

		    (sshdr.ascq == 0x01 || sshdr.ascq == 0x0a))

			return NEEDS_RETRY;

		/*

		 * if the device is not started, we need to wake

drivers/scsi/scsi_transport_iscsi.c

+5 −6
Original line number Diff line number Diff line
@@ -3499,7 +3499,7 @@ static int iscsi_new_flashnode(struct iscsi_transport *transport, 
		pr_err("%s could not find host no %u\n",

		       __func__, ev->u.new_flashnode.host_no);

		err = -ENODEV;

		goto put_host;

		goto exit_new_fnode;

	}



	index = transport->new_flashnode(shost, data, len);
@@ -3509,7 +3509,6 @@ static int iscsi_new_flashnode(struct iscsi_transport *transport, 
	else

		err = -EIO;



put_host:

	scsi_host_put(shost);



exit_new_fnode:
@@ -3534,7 +3533,7 @@ static int iscsi_del_flashnode(struct iscsi_transport *transport, 
		pr_err("%s could not find host no %u\n",

		       __func__, ev->u.del_flashnode.host_no);

		err = -ENODEV;

		goto put_host;

		goto exit_del_fnode;

	}



	idx = ev->u.del_flashnode.flashnode_idx;
@@ -3576,7 +3575,7 @@ static int iscsi_login_flashnode(struct iscsi_transport *transport, 
		pr_err("%s could not find host no %u\n",

		       __func__, ev->u.login_flashnode.host_no);

		err = -ENODEV;

		goto put_host;

		goto exit_login_fnode;

	}



	idx = ev->u.login_flashnode.flashnode_idx;
@@ -3628,7 +3627,7 @@ static int iscsi_logout_flashnode(struct iscsi_transport *transport, 
		pr_err("%s could not find host no %u\n",

		       __func__, ev->u.logout_flashnode.host_no);

		err = -ENODEV;

		goto put_host;

		goto exit_logout_fnode;

	}



	idx = ev->u.logout_flashnode.flashnode_idx;
@@ -3678,7 +3677,7 @@ static int iscsi_logout_flashnode_sid(struct iscsi_transport *transport, 
		pr_err("%s could not find host no %u\n",

		       __func__, ev->u.logout_flashnode.host_no);

		err = -ENODEV;

		goto put_host;

		goto exit_logout_sid;

	}



	session = iscsi_session_lookup(ev->u.logout_flashnode_sid.sid);

drivers/scsi/storvsc_drv.c

+6 −4
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ MODULE_PARM_DESC(ring_avail_percent_lowater, 
/*

 * Timeout in seconds for all devices managed by this driver.

 */

static int storvsc_timeout = 180;

static const int storvsc_timeout = 180;



#if IS_ENABLED(CONFIG_SCSI_FC_ATTRS)

static struct scsi_transport_template *fc_transport_template;
@@ -768,7 +768,7 @@ static void handle_multichannel_storage(struct hv_device *device, int max_chns) 
		return;

	}



	t = wait_for_completion_timeout(&request->wait_event, 10*HZ);

	t = wait_for_completion_timeout(&request->wait_event, storvsc_timeout * HZ);

	if (t == 0) {

		dev_err(dev, "Failed to create sub-channel: timed out\n");

		return;
@@ -833,7 +833,7 @@ static int storvsc_execute_vstor_op(struct hv_device *device, 
	if (ret != 0)

		return ret;



	t = wait_for_completion_timeout(&request->wait_event, 5*HZ);

	t = wait_for_completion_timeout(&request->wait_event, storvsc_timeout * HZ);

	if (t == 0)

		return -ETIMEDOUT;
@@ -1350,6 +1350,8 @@ static int storvsc_connect_to_vsp(struct hv_device *device, u32 ring_size, 
		return ret;



	ret = storvsc_channel_init(device, is_fc);

	if (ret)

		vmbus_close(device->channel);



	return ret;

}
@@ -1668,7 +1670,7 @@ static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd) 
	if (ret != 0)

		return FAILED;



	t = wait_for_completion_timeout(&request->wait_event, 5*HZ);

	t = wait_for_completion_timeout(&request->wait_event, storvsc_timeout * HZ);

	if (t == 0)

		return TIMEOUT_ERROR;