Commit 80e1e176 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:
 "Three small fixes in the UFS driver: two are for power management
  issues and the third is to fix a slew of problem in the sysfs code"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: ufs: Fix race between shutdown and runtime resume flow
  scsi: ufs: Make sure clk scaling happens only when HBA is runtime ACTIVE
  scsi: ufs: Fix unexpected values from ufshcd_read_desc_param()
parents 9223e74f e92643db

drivers/scsi/ufs/ufshcd.c

+23 −14
Original line number Diff line number Diff line
@@ -1294,8 +1294,15 @@ static int ufshcd_devfreq_target(struct device *dev, 
	}

	spin_unlock_irqrestore(hba->host->host_lock, irq_flags);



	pm_runtime_get_noresume(hba->dev);

	if (!pm_runtime_active(hba->dev)) {

		pm_runtime_put_noidle(hba->dev);

		ret = -EAGAIN;

		goto out;

	}

	start = ktime_get();

	ret = ufshcd_devfreq_scale(hba, scale_up);

	pm_runtime_put(hba->dev);



	trace_ufshcd_profile_clk_scaling(dev_name(hba->dev),

		(scale_up ? "up" : "down"),
@@ -3192,13 +3199,19 @@ int ufshcd_read_desc_param(struct ufs_hba *hba, 
	/* Get the length of descriptor */

	ufshcd_map_desc_id_to_length(hba, desc_id, &buff_len);

	if (!buff_len) {

		dev_err(hba->dev, "%s: Failed to get desc length", __func__);

		dev_err(hba->dev, "%s: Failed to get desc length\n", __func__);

		return -EINVAL;

	}



	if (param_offset >= buff_len) {

		dev_err(hba->dev, "%s: Invalid offset 0x%x in descriptor IDN 0x%x, length 0x%x\n",

			__func__, param_offset, desc_id, buff_len);

		return -EINVAL;

	}



	/* Check whether we need temp memory */

	if (param_offset != 0 || param_size < buff_len) {

		desc_buf = kmalloc(buff_len, GFP_KERNEL);

		desc_buf = kzalloc(buff_len, GFP_KERNEL);

		if (!desc_buf)

			return -ENOMEM;

	} else {
@@ -3212,14 +3225,14 @@ int ufshcd_read_desc_param(struct ufs_hba *hba, 
					desc_buf, &buff_len);



	if (ret) {

		dev_err(hba->dev, "%s: Failed reading descriptor. desc_id %d, desc_index %d, param_offset %d, ret %d",

		dev_err(hba->dev, "%s: Failed reading descriptor. desc_id %d, desc_index %d, param_offset %d, ret %d\n",

			__func__, desc_id, desc_index, param_offset, ret);

		goto out;

	}



	/* Sanity check */

	if (desc_buf[QUERY_DESC_DESC_TYPE_OFFSET] != desc_id) {

		dev_err(hba->dev, "%s: invalid desc_id %d in descriptor header",

		dev_err(hba->dev, "%s: invalid desc_id %d in descriptor header\n",

			__func__, desc_buf[QUERY_DESC_DESC_TYPE_OFFSET]);

		ret = -EINVAL;

		goto out;
@@ -3229,12 +3242,12 @@ int ufshcd_read_desc_param(struct ufs_hba *hba, 
	buff_len = desc_buf[QUERY_DESC_LENGTH_OFFSET];

	ufshcd_update_desc_length(hba, desc_id, desc_index, buff_len);



	/* Check wherher we will not copy more data, than available */

	if (is_kmalloc && (param_offset + param_size) > buff_len)

	if (is_kmalloc) {

		/* Make sure we don't copy more data than available */

		if (param_offset + param_size > buff_len)

			param_size = buff_len - param_offset;



	if (is_kmalloc)

		memcpy(param_read_buf, &desc_buf[param_offset], param_size);

	}

out:

	if (is_kmalloc)

		kfree(desc_buf);
@@ -8900,11 +8913,7 @@ int ufshcd_shutdown(struct ufs_hba *hba) 
	if (ufshcd_is_ufs_dev_poweroff(hba) && ufshcd_is_link_off(hba))

		goto out;



	if (pm_runtime_suspended(hba->dev)) {

		ret = ufshcd_runtime_resume(hba);

		if (ret)

			goto out;

	}

	pm_runtime_get_sync(hba->dev);



	ret = ufshcd_suspend(hba, UFS_SHUTDOWN_PM);

out:

CRA Git | Maintained and supported by SUSTech CRA and CCSE