Commit c25b24fa 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 SCSI updates from James Bottomley:
 "Final round of fixes that came in too late to send in the first
  request.

  It's nine bug fixes and one version update (because of a bug fix) and
  one set of PCI ID additions. There's one bug fix in the core which is
  really a one liner (except that an additional sdev pointer was added
  for convenience) and the rest are in drivers"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: target: core: Add TMF to tmr_list handling
  scsi: core: Kick the requeue list after inserting when flushing
  scsi: fnic: unlock on error path in fnic_queuecommand()
  scsi: fcoe: Fix unsigned comparison with zero in store_ctlr_mode()
  scsi: mpi3mr: Fix mpi3mr_fw.c kernel-doc warnings
  scsi: smartpqi: Bump driver version to 2.1.26-030
  scsi: smartpqi: Fix logical volume rescan race condition
  scsi: smartpqi: Add new controller PCI IDs
  scsi: ufs: qcom: Remove unnecessary goto statement from ufs_qcom_config_esi()
  scsi: ufs: core: Remove the ufshcd_hba_exit() call from ufshcd_async_scan()
  scsi: ufs: core: Simplify power management during async scan
parents 12551488 83ab6816

drivers/scsi/fcoe/fcoe_sysfs.c

+4 −2
Original line number Diff line number Diff line
@@ -263,6 +263,7 @@ static ssize_t store_ctlr_mode(struct device *dev, 
			       const char *buf, size_t count)

{

	struct fcoe_ctlr_device *ctlr = dev_to_ctlr(dev);

	int res;



	if (count > FCOE_MAX_MODENAME_LEN)

		return -EINVAL;
@@ -279,12 +280,13 @@ static ssize_t store_ctlr_mode(struct device *dev, 
			return -ENOTSUPP;

		}



		ctlr->mode = sysfs_match_string(fip_conn_type_names, buf);

		if (ctlr->mode < 0 || ctlr->mode == FIP_CONN_TYPE_UNKNOWN) {

		res = sysfs_match_string(fip_conn_type_names, buf);

		if (res < 0 || res == FIP_CONN_TYPE_UNKNOWN) {

			LIBFCOE_SYSFS_DBG(ctlr, "Unknown mode %s provided.\n",

					  buf);

			return -EINVAL;

		}

		ctlr->mode = res;



		ctlr->f->set_fcoe_ctlr_mode(ctlr);

		LIBFCOE_SYSFS_DBG(ctlr, "Mode changed to %s.\n", buf);

drivers/scsi/fnic/fnic_scsi.c

+1 −0
Original line number Diff line number Diff line
@@ -546,6 +546,7 @@ int fnic_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *sc) 
	if (fnic->sw_copy_wq[hwq].io_req_table[blk_mq_unique_tag_to_tag(mqtag)] != NULL) {

		WARN(1, "fnic<%d>: %s: hwq: %d tag 0x%x already exists\n",

				fnic->fnic_num, __func__, hwq, blk_mq_unique_tag_to_tag(mqtag));

		spin_unlock_irqrestore(&fnic->wq_copy_lock[hwq], flags);

		return SCSI_MLQUEUE_HOST_BUSY;

	}

drivers/scsi/mpi3mr/mpi3mr_fw.c

+2 −4
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ int mpi3mr_process_admin_reply_q(struct mpi3mr_ioc *mrioc) 
 * @op_reply_q: op_reply_qinfo object

 * @reply_ci: operational reply descriptor's queue consumer index

 *

 * Returns reply descriptor frame address

 * Returns: reply descriptor frame address

 */

static inline struct mpi3_default_reply_descriptor *

mpi3mr_get_reply_desc(struct op_reply_qinfo *op_reply_q, u32 reply_ci)
@@ -1063,7 +1063,6 @@ enum mpi3mr_iocstate mpi3mr_get_iocstate(struct mpi3mr_ioc *mrioc) 
 * @mrioc: Adapter instance reference

 *

 * Free the DMA memory allocated for IOCTL handling purpose.



 *

 * Return: None

 */
@@ -1106,7 +1105,6 @@ static void mpi3mr_free_ioctl_dma_memory(struct mpi3mr_ioc *mrioc) 
/**

 * mpi3mr_alloc_ioctl_dma_memory - Alloc memory for ioctl dma

 * @mrioc: Adapter instance reference



 *

 * This function allocates dmaable memory required to handle the

 * application issued MPI3 IOCTL requests.
@@ -1241,7 +1239,7 @@ static int mpi3mr_issue_and_process_mur(struct mpi3mr_ioc *mrioc, 
 * during reset/resume

 * @mrioc: Adapter instance reference

 *

 * Return zero if the new IOCFacts parameters value is compatible with

 * Return: zero if the new IOCFacts parameters value is compatible with

 * older values else return -EPERM

 */

static int

drivers/scsi/scsi_error.c

+6 −3
Original line number Diff line number Diff line
@@ -2197,15 +2197,18 @@ void scsi_eh_flush_done_q(struct list_head *done_q) 
	struct scsi_cmnd *scmd, *next;



	list_for_each_entry_safe(scmd, next, done_q, eh_entry) {

		struct scsi_device *sdev = scmd->device;



		list_del_init(&scmd->eh_entry);

		if (scsi_device_online(scmd->device) &&

		    !scsi_noretry_cmd(scmd) && scsi_cmd_retry_allowed(scmd) &&

		if (scsi_device_online(sdev) && !scsi_noretry_cmd(scmd) &&

		    scsi_cmd_retry_allowed(scmd) &&

		    scsi_eh_should_retry_cmd(scmd)) {

			SCSI_LOG_ERROR_RECOVERY(3,

				scmd_printk(KERN_INFO, scmd,

					     "%s: flush retry cmd\n",

					     current->comm));

				scsi_queue_insert(scmd, SCSI_MLQUEUE_EH_RETRY);

				blk_mq_kick_requeue_list(sdev->request_queue);

		} else {

			/*

			 * If just we got sense for the device (called

drivers/scsi/smartpqi/smartpqi.h

+0 −1
Original line number Diff line number Diff line
@@ -1347,7 +1347,6 @@ struct pqi_ctrl_info { 
	bool		controller_online;

	bool		block_requests;

	bool		scan_blocked;

	u8		logical_volume_rescan_needed : 1;

	u8		inbound_spanning_supported : 1;

	u8		outbound_spanning_supported : 1;

	u8		pqi_mode_enabled : 1;