scsi: ufs: Export UFS debugging dump for vendors
Subsystems (2)
v2 cover scsi: ufs: Export UFS debugging dump for vendors
Hi,
This series creates an unified entry function for UFS debugging information dump, and exports it to vendors to help debugging.
In the same time, do a small cleanup in ufshcd_make_hba_operational().
v1 -> v2:
- Fix incorrect returned value in patch[3]'s ufs_mtk_link_set_hpm()
Stanley Chu (3):
scsi: ufs: Remove redundant label "out" in
ufshcd_make_hba_operational()
scsi: ufs: Manage and export UFS debugging information dump
scsi: ufs-mediatek: Print host information for failed supsend and
resume
drivers/scsi/ufs/ufs-mediatek.c | 16 +++++++---- drivers/scsi/ufs/ufshcd.c | 51 +++++++++++++++++++-------------- drivers/scsi/ufs/ufshcd.h | 8 ++++++ 3 files changed, 47 insertions(+), 28 deletions(-)
Signature · 1 line
2.18.0
PATCH v2 1/3 scsi: ufs: Remove redundant label "out" in ufshcd_make_hba_operational()
Label "out" is redundant in ufshcd_make_hba_operational() and can be removed.
--- drivers/scsi/ufs/ufshcd.c | 2 -- 1 file changed, 2 deletions(-)
drivers/scsi/ufs/ufshcd.c +0 -2
@@ -4258,10 +4258,8 @@ int ufshcd_make_hba_operational(struct ufs_hba *hba)dev_err (hba->dev,"Host controller not ready to process requests" ); err = -EIO ; - goto out; } -out:return err; }EXPORT_SYMBOL_GPL (ufshcd_make_hba_operational);
Signature · 1 line
2.18.0
PATCH v2 2/3 scsi: ufs: Manage and export UFS debugging information dump
In reply to Stanley ChuUFS has many functions to print different types of debugging information. Some information is helpful for vendor drivers and can be dumped if something wrong in vendor-specific flows.
To have minimum and most simple exported interface for vendor drivers, create a single and unified entrance to most debugging functions, and then export the entry function.
--- drivers/scsi/ufs/ufshcd.c | 49 +++++++++++++++++++++++---------------- drivers/scsi/ufs/ufshcd.h | 8 +++++++ 2 files changed, 37 insertions(+), 20 deletions(-)
drivers/scsi/ufs/ufshcd.c +29 -20
@@ -573,6 +573,19 @@ static void ufshcd_print_pwr_info(struct ufs_hba *hba) hba->pwr_info.hs_rate); } +void ufshcd_print_info (struct ufs_hba *hba,enum ufs_info_item flags) +{ +if (flags &UFS_INFO_HOST_STATE ) +ufshcd_print_host_state (hba); +if (flags &UFS_INFO_HOST_REGS ) +ufshcd_print_host_regs (hba); +if (flags &UFS_INFO_PWR ) +ufshcd_print_pwr_info (hba); +if (flags &UFS_INFO_TMRS ) +ufshcd_print_tmrs (hba, hba->outstanding_tasks); +} +EXPORT_SYMBOL_GPL (ufshcd_print_info); +void ufshcd_delay_us (unsigned long us,unsigned long tolerance) {if (!us)
@@ -3783,11 +3796,9 @@ static int ufshcd_uic_pwr_ctrl(struct ufs_hba *hba, struct uic_command *cmd) ret = (status !=PWR_OK ) ? status :-1 ; } out: -if (ret) { -ufshcd_print_host_state (hba); -ufshcd_print_pwr_info (hba); -ufshcd_print_host_regs (hba); - } +if (ret) +ufshcd_print_info (hba,UFS_INFO_HOST_STATE | +UFS_INFO_HOST_REGS |UFS_INFO_PWR );spin_lock_irqsave (hba->host->host_lock, flags); hba->active_uic_cmd =NULL ;
@@ -4454,7 +4465,7 @@ static int ufshcd_link_startup(struct ufs_hba *hba)/* Mark that link is up in PWM-G1, 1-lane, SLOW-AUTO mode */ ufshcd_init_pwr_info (hba); -ufshcd_print_pwr_info (hba); +ufshcd_print_info (hba,UFS_INFO_PWR );if (hba->quirks &UFSHCD_QUIRK_BROKEN_LCC ) { ret =ufshcd_disable_device_tx_lcc (hba);
@@ -4471,9 +4482,8 @@ static int ufshcd_link_startup(struct ufs_hba *hba) out:if (ret) {dev_err (hba->dev,"link startup failed %d\n" , ret); -ufshcd_print_host_state (hba); -ufshcd_print_pwr_info (hba); -ufshcd_print_host_regs (hba); +ufshcd_print_info (hba,UFS_INFO_HOST_STATE | +UFS_INFO_HOST_REGS |UFS_INFO_PWR ); }return ret; }
@@ -4817,8 +4827,8 @@ ufshcd_transfer_rsp_status(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)dev_err (hba->dev,"OCS error from controller = %x for tag %d\n" , ocs, lrbp->task_tag); -ufshcd_print_host_regs (hba); -ufshcd_print_host_state (hba); +ufshcd_print_info (hba,UFS_INFO_HOST_STATE | +UFS_INFO_HOST_REGS );break ; }/* end of switch */
@@ -5801,9 +5811,9 @@ static irqreturn_t ufshcd_check_errors(struct ufs_hba *hba) __func__, hba->saved_err, hba->saved_uic_err); -ufshcd_print_host_regs (hba); -ufshcd_print_pwr_info (hba); -ufshcd_print_tmrs (hba, hba->outstanding_tasks); +ufshcd_print_info (hba,UFS_INFO_HOST_REGS | +UFS_INFO_PWR | +UFS_INFO_TMRS );ufshcd_print_trs (hba, hba->outstanding_reqs, pr_prdt); }
@@ -6416,9 +6426,8 @@ static int ufshcd_abort(struct scsi_cmnd *cmd)scsi_print_command (hba->lrb[tag].cmd);if (!hba->req_abort_count) {ufshcd_update_reg_hist (&hba->ufs_stats.task_abort,0 ); -ufshcd_print_host_regs (hba); -ufshcd_print_host_state (hba); -ufshcd_print_pwr_info (hba); +ufshcd_print_info (hba,UFS_INFO_HOST_STATE | +UFS_INFO_HOST_REGS |UFS_INFO_PWR );ufshcd_print_trs (hba,1 << tag, true); }else {ufshcd_print_trs (hba,1 << tag, false);
@@ -7444,7 +7453,7 @@ static int ufshcd_probe_hba(struct ufs_hba *hba, bool async) __func__, ret); goto out; } -ufshcd_print_pwr_info (hba); +ufshcd_print_info (hba,UFS_INFO_PWR ); }/*
@@ -8897,8 +8906,8 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) err =ufshcd_hba_enable (hba);if (err) {dev_err (hba->dev,"Host controller enable failed\n" ); -ufshcd_print_host_regs (hba); -ufshcd_print_host_state (hba); +ufshcd_print_info (hba,UFS_INFO_HOST_STATE | +UFS_INFO_HOST_REGS ); goto free_tmf_queue; }
drivers/scsi/ufs/ufshcd.h +8 -0
@@ -817,6 +817,13 @@ static inline void ufshcd_rmwl(struct ufs_hba *hba, u32 mask, u32 val, u32 reg)ufshcd_writel (hba, tmp, reg); } +enum ufs_info_item { +UFS_INFO_HOST_STATE = (1 <<0 ), +UFS_INFO_HOST_REGS = (1 <<1 ), +UFS_INFO_PWR = (1 <<2 ), +UFS_INFO_TMRS = (1 <<3 ) +}; +int ufshcd_alloc_host (struct device *,struct ufs_hba **);void ufshcd_dealloc_host (struct ufs_hba *);int ufshcd_hba_enable (struct ufs_hba *hba);
@@ -826,6 +833,7 @@ int ufshcd_make_hba_operational(struct ufs_hba *hba);void ufshcd_remove (struct ufs_hba *);int ufshcd_uic_hibern8_exit (struct ufs_hba *hba);void ufshcd_delay_us (unsigned long us,unsigned long tolerance); +void ufshcd_print_info (struct ufs_hba *hba,enum ufs_info_item flags);int ufshcd_wait_for_register (struct ufs_hba *hba,u32 reg,u32 mask,u32 val,unsigned long interval_us,unsigned long timeout_ms);
Signature · 5 lines
2.18.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 3/3 scsi: ufs-mediatek: Print host information for failed supsend and resume
In reply to Stanley ChuPrint host state and register dumps while suspend or resume flow is failed.
--- drivers/scsi/ufs/ufs-mediatek.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
drivers/scsi/ufs/ufs-mediatek.c +10 -6
@@ -469,23 +469,24 @@ static int ufs_mtk_link_set_hpm(struct ufs_hba *hba) err =ufshcd_hba_enable (hba);if (err) -return err; + goto out; err =ufs_mtk_unipro_set_pm (hba,0 );if (err) -return err; + goto out; err =ufshcd_uic_hibern8_exit (hba);if (!err)ufshcd_set_link_active (hba);else -return err; + goto out; err =ufshcd_make_hba_operational (hba); +out:if (err) -return err; - -return 0 ; +ufshcd_print_info (hba,UFS_INFO_HOST_STATE | +UFS_INFO_HOST_REGS |UFS_INFO_PWR ); +return err; }static int ufs_mtk_link_set_lpm (struct ufs_hba *hba)
@@ -494,6 +495,9 @@ static int ufs_mtk_link_set_lpm(struct ufs_hba *hba) err =ufs_mtk_unipro_set_pm (hba,1 );if (err) { +ufshcd_print_info (hba,UFS_INFO_HOST_STATE | +UFS_INFO_HOST_REGS |UFS_INFO_PWR ); +/* Resume UniPro state for following error recovery */ ufs_mtk_unipro_set_pm (hba,0 );return err;
Signature · 1 line
2.18.0