Commit 2a5a4326 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:
 "Mostly small stragglers that missed the initial merge.

  Driver updates are qla2xxx and smartpqi (mp3sas has a high diffstat
  due to the volatile qualifier removal, fnic due to unused function
  removal and sd.c has a lot of code shuffling to remove forward
  declarations)"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (38 commits)
  scsi: ufs: core: No need to update UPIU.header.flags and lun in advanced RPMB handler
  scsi: ufs: core: Add advanced RPMB support where UFSHCI 4.0 does not support EHS length in UTRD
  scsi: mpt3sas: Remove volatile qualifier
  scsi: mpt3sas: Perform additional retries if doorbell read returns 0
  scsi: libsas: Simplify sas_queue_reset() and remove unused code
  scsi: ufs: Fix the build for the old ARM OABI
  scsi: qla2xxx: Fix unused variable warning in qla2xxx_process_purls_pkt()
  scsi: fnic: Remove unused functions fnic_scsi_host_start/end_tag()
  scsi: qla2xxx: Fix spelling mistake "tranport" -> "transport"
  scsi: fnic: Replace sgreset tag with max_tag_id
  scsi: qla2xxx: Remove unused variables in qla24xx_build_scsi_type_6_iocbs()
  scsi: qla2xxx: Fix nvme_fc_rcv_ls_req() undefined error
  scsi: smartpqi: Change driver version to 2.1.24-046
  scsi: smartpqi: Enhance error messages
  scsi: smartpqi: Enhance controller offline notification
  scsi: smartpqi: Enhance shutdown notification
  scsi: smartpqi: Simplify lun_number assignment
  scsi: smartpqi: Rename pciinfo to pci_info
  scsi: smartpqi: Rename MACRO to clarify purpose
  scsi: smartpqi: Add abort handler
  ...
parents 6b41fb27 9f6fec65

drivers/ata/libata-scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -4752,7 +4752,7 @@ void ata_scsi_dev_rescan(struct work_struct *work) 
			}



			spin_unlock_irqrestore(ap->lock, flags);

			scsi_rescan_device(&(sdev->sdev_gendev));

			scsi_rescan_device(sdev);

			scsi_device_put(sdev);

			spin_lock_irqsave(ap->lock, flags);

		}

drivers/scsi/aacraid/commsup.c

+1 −1
Original line number Diff line number Diff line
@@ -1451,7 +1451,7 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr) 
#endif

				break;

			}

			scsi_rescan_device(&device->sdev_gendev);

			scsi_rescan_device(device);

			break;



		default:

drivers/scsi/fnic/fnic.h

+2 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 


#define DRV_NAME		"fnic"

#define DRV_DESCRIPTION		"Cisco FCoE HBA Driver"

#define DRV_VERSION		"1.6.0.55"

#define DRV_VERSION		"1.6.0.56"

#define PFX			DRV_NAME ": "

#define DFX                     DRV_NAME "%d: "
@@ -236,6 +236,7 @@ struct fnic { 
	unsigned int wq_count;

	unsigned int cq_count;



	struct mutex sgreset_mutex;

	struct dentry *fnic_stats_debugfs_host;

	struct dentry *fnic_stats_debugfs_file;

	struct dentry *fnic_reset_debugfs_file;

drivers/scsi/fnic/fnic_scsi.c

+9 −44
Original line number Diff line number Diff line
@@ -2167,39 +2167,6 @@ static int fnic_clean_pending_aborts(struct fnic *fnic, 
	return ret;

}



/*

 * fnic_scsi_host_start_tag

 * Allocates tagid from host's tag list

 **/

static inline int

fnic_scsi_host_start_tag(struct fnic *fnic, struct scsi_cmnd *sc)

{

	struct request *rq = scsi_cmd_to_rq(sc);

	struct request_queue *q = rq->q;

	struct request *dummy;



	dummy = blk_mq_alloc_request(q, REQ_OP_WRITE, BLK_MQ_REQ_NOWAIT);

	if (IS_ERR(dummy))

		return SCSI_NO_TAG;



	rq->tag = dummy->tag;

	sc->host_scribble = (unsigned char *)dummy;



	return dummy->tag;

}



/*

 * fnic_scsi_host_end_tag

 * frees tag allocated by fnic_scsi_host_start_tag.

 **/

static inline void

fnic_scsi_host_end_tag(struct fnic *fnic, struct scsi_cmnd *sc)

{

	struct request *dummy = (struct request *)sc->host_scribble;



	blk_mq_free_request(dummy);

}



/*

 * SCSI Eh thread issues a Lun Reset when one or more commands on a LUN

 * fail to get aborted. It calls driver's eh_device_reset with a SCSI command
@@ -2222,7 +2189,6 @@ int fnic_device_reset(struct scsi_cmnd *sc) 
	struct reset_stats *reset_stats;

	int tag = rq->tag;

	DECLARE_COMPLETION_ONSTACK(tm_done);

	int tag_gen_flag = 0;   /*to track tags allocated by fnic driver*/

	bool new_sc = 0;



	/* Wait for rport to unblock */
@@ -2252,17 +2218,17 @@ int fnic_device_reset(struct scsi_cmnd *sc) 
	}



	fnic_priv(sc)->flags = FNIC_DEVICE_RESET;

	/* Allocate tag if not present */



	if (unlikely(tag < 0)) {

		/*

		 * Really should fix the midlayer to pass in a proper

		 * request for ioctls...

		 * For device reset issued through sg3utils, we let

		 * only one LUN_RESET to go through and use a special

		 * tag equal to max_tag_id so that we don't have to allocate

		 * or free it. It won't interact with tags

		 * allocated by mid layer.

		 */

		tag = fnic_scsi_host_start_tag(fnic, sc);

		if (unlikely(tag == SCSI_NO_TAG))

			goto fnic_device_reset_end;

		tag_gen_flag = 1;

		mutex_lock(&fnic->sgreset_mutex);

		tag = fnic->fnic_max_tag_id;

		new_sc = 1;

	}

	io_lock = fnic_io_lock_hash(fnic, sc);
@@ -2434,9 +2400,8 @@ int fnic_device_reset(struct scsi_cmnd *sc) 
		  (u64)sc->cmnd[4] << 8 | sc->cmnd[5]),

		  fnic_flags_and_state(sc));



	/* free tag if it is allocated */

	if (unlikely(tag_gen_flag))

		fnic_scsi_host_end_tag(fnic, sc);

	if (new_sc)

		mutex_unlock(&fnic->sgreset_mutex);



	FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,

		      "Returning from device reset %s\n",

drivers/scsi/libsas/sas_scsi_host.c

+3 −38
Original line number Diff line number Diff line
@@ -386,37 +386,7 @@ struct sas_phy *sas_get_local_phy(struct domain_device *dev) 
}

EXPORT_SYMBOL_GPL(sas_get_local_phy);



static void sas_wait_eh(struct domain_device *dev)

{

	struct sas_ha_struct *ha = dev->port->ha;

	DEFINE_WAIT(wait);



	if (dev_is_sata(dev)) {

		ata_port_wait_eh(dev->sata_dev.ap);

		return;

	}

 retry:

	spin_lock_irq(&ha->lock);



	while (test_bit(SAS_DEV_EH_PENDING, &dev->state)) {

		prepare_to_wait(&ha->eh_wait_q, &wait, TASK_UNINTERRUPTIBLE);

		spin_unlock_irq(&ha->lock);

		schedule();

		spin_lock_irq(&ha->lock);

	}

	finish_wait(&ha->eh_wait_q, &wait);



	spin_unlock_irq(&ha->lock);



	/* make sure SCSI EH is complete */

	if (scsi_host_in_recovery(ha->shost)) {

		msleep(10);

		goto retry;

	}

}



static int sas_queue_reset(struct domain_device *dev, int reset_type,

			   u64 lun, int wait)

static int sas_queue_reset(struct domain_device *dev, int reset_type, u64 lun)

{

	struct sas_ha_struct *ha = dev->port->ha;

	int scheduled = 0, tries = 100;
@@ -424,8 +394,6 @@ static int sas_queue_reset(struct domain_device *dev, int reset_type, 
	/* ata: promote lun reset to bus reset */

	if (dev_is_sata(dev)) {

		sas_ata_schedule_reset(dev);

		if (wait)

			sas_ata_wait_eh(dev);

		return SUCCESS;

	}
@@ -443,9 +411,6 @@ static int sas_queue_reset(struct domain_device *dev, int reset_type, 
		}

		spin_unlock_irq(&ha->lock);



		if (wait)

			sas_wait_eh(dev);



		if (scheduled)

			return SUCCESS;

	}
@@ -498,7 +463,7 @@ int sas_eh_device_reset_handler(struct scsi_cmnd *cmd) 
	struct sas_internal *i = to_sas_internal(host->transportt);



	if (current != host->ehandler)

		return sas_queue_reset(dev, SAS_DEV_LU_RESET, cmd->device->lun, 0);

		return sas_queue_reset(dev, SAS_DEV_LU_RESET, cmd->device->lun);



	int_to_scsilun(cmd->device->lun, &lun);
@@ -521,7 +486,7 @@ int sas_eh_target_reset_handler(struct scsi_cmnd *cmd) 
	struct sas_internal *i = to_sas_internal(host->transportt);



	if (current != host->ehandler)

		return sas_queue_reset(dev, SAS_DEV_RESET, 0, 0);

		return sas_queue_reset(dev, SAS_DEV_RESET, 0);



	if (!i->dft->lldd_I_T_nexus_reset)

		return FAILED;