Commit ef2b7eb5 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:
 "One core change that moves a disk start message to a location where it
  will only be printed once instead of twice plus a couple of error
  handling race fixes in the ufs driver"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: sd: Do not repeat the starting disk message
  scsi: ufs: core: Fix ufshcd_abort_one racing issue
  scsi: ufs: core: Fix ufshcd_clear_cmd racing issue
parents d6e1712b 7a6bbc28

drivers/scsi/sd.c

+2 −3
Original line number Diff line number Diff line
@@ -4119,8 +4119,6 @@ static int sd_resume(struct device *dev) 
{

	struct scsi_disk *sdkp = dev_get_drvdata(dev);



	sd_printk(KERN_NOTICE, sdkp, "Starting disk\n");



	if (opal_unlock_from_suspend(sdkp->opal_dev)) {

		sd_printk(KERN_NOTICE, sdkp, "OPAL unlock failed\n");

		return -EIO;
@@ -4137,12 +4135,13 @@ static int sd_resume_common(struct device *dev, bool runtime) 
	if (!sdkp)	/* E.g.: runtime resume at the start of sd_probe() */

		return 0;



	sd_printk(KERN_NOTICE, sdkp, "Starting disk\n");



	if (!sd_do_start_stop(sdkp->device, runtime)) {

		sdkp->suspended = false;

		return 0;

	}



	sd_printk(KERN_NOTICE, sdkp, "Starting disk\n");

	ret = sd_start_stop_device(sdkp, 1);

	if (!ret) {

		sd_resume(dev);

drivers/ufs/core/ufs-mcq.c

+6 −5
Original line number Diff line number Diff line
@@ -105,16 +105,15 @@ EXPORT_SYMBOL_GPL(ufshcd_mcq_config_mac); 
 * @hba: per adapter instance

 * @req: pointer to the request to be issued

 *

 * Return: the hardware queue instance on which the request would

 * be queued.

 * Return: the hardware queue instance on which the request will be or has

 * been queued. %NULL if the request has already been freed.

 */

struct ufs_hw_queue *ufshcd_mcq_req_to_hwq(struct ufs_hba *hba,

					 struct request *req)

{

	u32 utag = blk_mq_unique_tag(req);

	u32 hwq = blk_mq_unique_tag_to_hwq(utag);

	struct blk_mq_hw_ctx *hctx = READ_ONCE(req->mq_hctx);



	return &hba->uhq[hwq];

	return hctx ? &hba->uhq[hctx->queue_num] : NULL;

}



/**
@@ -515,6 +514,8 @@ int ufshcd_mcq_sq_cleanup(struct ufs_hba *hba, int task_tag) 
		if (!cmd)

			return -EINVAL;

		hwq = ufshcd_mcq_req_to_hwq(hba, scsi_cmd_to_rq(cmd));

		if (!hwq)

			return 0;

	} else {

		hwq = hba->dev_cmd_queue;

	}

drivers/ufs/core/ufshcd.c

+2 −0
Original line number Diff line number Diff line
@@ -6456,6 +6456,8 @@ static bool ufshcd_abort_one(struct request *rq, void *priv) 
	/* Release cmd in MCQ mode if abort succeeds */

	if (is_mcq_enabled(hba) && (*ret == 0)) {

		hwq = ufshcd_mcq_req_to_hwq(hba, scsi_cmd_to_rq(lrbp->cmd));

		if (!hwq)

			return 0;

		spin_lock_irqsave(&hwq->cq_lock, flags);

		if (ufshcd_cmd_inflight(lrbp->cmd))

			ufshcd_release_scsi_cmd(hba, lrbp);