Merge "scsi: ufs: update ufs command logging infrastructure" (84a96c7d) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/scsi/ufs/ufshcd.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -534,7 +534,7 @@ static inline void ufshcd_remove_non_printable(char *val)
		*val = ' ';
		}

		#define UFSHCD_MAX_CMD_LOGGING 100
		#define UFSHCD_MAX_CMD_LOGGING 200

		#ifdef CONFIG_TRACEPOINTS
		static inline void ufshcd_add_command_trace(struct ufs_hba *hba,
		@@ -610,7 +610,7 @@ static void ufshcd_dme_cmd_log(struct ufs_hba hba, char str, u8 cmd_id)
		ufshcd_cmd_log(hba, str, "dme", 0xff, cmd_id, 0xff);
		}

		static void ufshcd_cmd_log_print(struct ufs_hba *hba)
		static void ufshcd_print_cmd_log(struct ufs_hba *hba)
		{
		int i;
		int pos;
		@@ -659,7 +659,7 @@ static void ufshcd_dme_cmd_log(struct ufs_hba hba, char str, u8 cmd_id)
		{
		}

		static void ufshcd_cmd_log_print(struct ufs_hba *hba)
		static void ufshcd_print_cmd_log(struct ufs_hba *hba)
		{
		}
		#endif
		@@ -4334,6 +4334,7 @@ static int ufshcd_uic_pwr_ctrl(struct ufs_hba hba, struct uic_command cmd)
		ufshcd_print_host_state(hba);
		ufshcd_print_pwr_info(hba);
		ufshcd_print_host_regs(hba);
		ufshcd_print_cmd_log(hba);
		}

		ufshcd_save_tstamp_of_last_dme_cmd(hba);
		@@ -6181,7 +6182,7 @@ static void ufshcd_err_handler(struct work_struct *work)
		ufshcd_print_host_state(hba);
		ufshcd_print_pwr_info(hba);
		ufshcd_print_tmrs(hba, hba->outstanding_tasks);
		ufshcd_cmd_log_print(hba);
		ufshcd_print_cmd_log(hba);
		spin_lock_irqsave(hba->host->host_lock, flags);
		}
		}
		@@ -6693,7 +6694,7 @@ static int ufshcd_eh_device_reset_handler(struct scsi_cmnd *cmd)
		hba = shost_priv(host);
		tag = cmd->request->tag;

		ufshcd_cmd_log_print(hba);
		ufshcd_print_cmd_log(hba);
		lrbp = &hba->lrb[tag];
		err = ufshcd_issue_tm_cmd(hba, lrbp->lun, 0, UFS_LOGICAL_RESET, &resp);
		if (err \|\| resp != UPIU_TASK_MANAGEMENT_FUNC_COMPL) {