Merge "scsi: ufs-debugfs: overwrite error scenario value via debugfs" (c8df36dc) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/scsi/ufs/ufs-debugfs.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -357,7 +357,7 @@ static ssize_t ufsdbg_err_inj_scenario_write(struct file *file,
		return ret;
		}

		hba->debugfs_files.err_inj_scenario_mask \|= err_scen;
		hba->debugfs_files.err_inj_scenario_mask = err_scen;

		return cnt;
		}

+6 −5

Original line number	Diff line number	Diff line
		@@ -3618,10 +3618,10 @@ int ufshcd_dme_set_attr(struct ufs_hba *hba, u32 attr_sel,
		set, UIC_GET_ATTR_ID(attr_sel), mib_val, ret);
		} while (ret && peer && --retries);

		if (!retries)
		if (ret)
		dev_err(hba->dev, "%s: attr-id 0x%x val 0x%x failed %d retries\n",
		set, UIC_GET_ATTR_ID(attr_sel), mib_val,
		retries);
		UFS_UIC_COMMAND_RETRIES - retries);

		return ret;
		}
		@@ -3689,9 +3689,10 @@ int ufshcd_dme_get_attr(struct ufs_hba *hba, u32 attr_sel,
		get, UIC_GET_ATTR_ID(attr_sel), ret);
		} while (ret && peer && --retries);

		if (!retries)
		if (ret)
		dev_err(hba->dev, "%s: attr-id 0x%x failed %d retries\n",
		get, UIC_GET_ATTR_ID(attr_sel), retries);
		get, UIC_GET_ATTR_ID(attr_sel),
		UFS_UIC_COMMAND_RETRIES - retries);

		if (mib_val && !ret)
		*mib_val = uic_cmd.argument3;