github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-29 02:31:27 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

scsi: ufs: core: Add hba parameter to trace events

Browse Source 
Include the ufs_hba structure as a parameter in various trace events to
provide more context and improve debugging capabilities.  Also remove
dev_name which can replace by dev_name(hba->dev).

Signed-off-by: Peter Wang <peter.wang@mediatek.com>
Link: https://lore.kernel.org/r/20250214083026.1177880-1-peter.wang@mediatek.com
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Peter Wang 2025-02-14 16:29:36 +08:00 committed by Martin K. Petersen
parent 3bcd901e42
commit 583e518e71
2 changed files with 103 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
drivers/ufs/core/ufs_trace.h
View File

@ -83,34 +83,34 @@ UFS_CMD_TRACE_TSF_TYPES
TRACE_EVENT(ufshcd_clk_gating, TRACE_EVENT(ufshcd_clk_gating,
TP_PROTO(const char *dev_name, int state), TP_PROTO(struct ufs_hba *hba, int state),
TP_ARGS(dev_name, state), TP_ARGS(hba, state),
TP_STRUCT__entry( TP_STRUCT__entry(
__string(dev_name, dev_name) __field(struct ufs_hba *, hba)
__field(int, state) __field(int, state)
), ),
TP_fast_assign( TP_fast_assign(
__assign_str(dev_name); __entry->hba = hba;
__entry->state = state; __entry->state = state;
), ),
TP_printk("%s: gating state changed to %s", TP_printk("%s: gating state changed to %s",
__get_str(dev_name), dev_name(__entry->hba->dev),
__print_symbolic(__entry->state, UFSCHD_CLK_GATING_STATES)) __print_symbolic(__entry->state, UFSCHD_CLK_GATING_STATES))
); );
TRACE_EVENT(ufshcd_clk_scaling, TRACE_EVENT(ufshcd_clk_scaling,
TP_PROTO(const char *dev_name, const char *state, const char *clk, TP_PROTO(struct ufs_hba *hba, const char *state, const char *clk,
u32 prev_state, u32 curr_state), u32 prev_state, u32 curr_state),
TP_ARGS(dev_name, state, clk, prev_state, curr_state), TP_ARGS(hba, state, clk, prev_state, curr_state),
TP_STRUCT__entry( TP_STRUCT__entry(
__string(dev_name, dev_name) __field(struct ufs_hba *, hba)
__string(state, state) __string(state, state)
__string(clk, clk) __string(clk, clk)
__field(u32, prev_state) __field(u32, prev_state)
@ -118,7 +118,7 @@ TRACE_EVENT(ufshcd_clk_scaling,
), ),
TP_fast_assign( TP_fast_assign(
__assign_str(dev_name); __entry->hba = hba;
__assign_str(state); __assign_str(state);
__assign_str(clk); __assign_str(clk);
__entry->prev_state = prev_state; __entry->prev_state = prev_state;
@ -126,80 +126,80 @@ TRACE_EVENT(ufshcd_clk_scaling,
), ),
TP_printk("%s: %s %s from %u to %u Hz", TP_printk("%s: %s %s from %u to %u Hz",
__get_str(dev_name), __get_str(state), __get_str(clk), dev_name(__entry->hba->dev), __get_str(state), __get_str(clk),
__entry->prev_state, __entry->curr_state) __entry->prev_state, __entry->curr_state)
); );
TRACE_EVENT(ufshcd_auto_bkops_state, TRACE_EVENT(ufshcd_auto_bkops_state,
TP_PROTO(const char *dev_name, const char *state), TP_PROTO(struct ufs_hba *hba, const char *state),
TP_ARGS(dev_name, state), TP_ARGS(hba, state),
TP_STRUCT__entry( TP_STRUCT__entry(
__string(dev_name, dev_name) __field(struct ufs_hba *, hba)
__string(state, state) __string(state, state)
), ),
TP_fast_assign( TP_fast_assign(
__assign_str(dev_name); __entry->hba = hba;
__assign_str(state); __assign_str(state);
), ),
TP_printk("%s: auto bkops - %s", TP_printk("%s: auto bkops - %s",
__get_str(dev_name), __get_str(state)) dev_name(__entry->hba->dev), __get_str(state))
); );
DECLARE_EVENT_CLASS(ufshcd_profiling_template, DECLARE_EVENT_CLASS(ufshcd_profiling_template,
TP_PROTO(const char *dev_name, const char *profile_info, s64 time_us, TP_PROTO(struct ufs_hba *hba, const char *profile_info, s64 time_us,
int err), int err),
TP_ARGS(dev_name, profile_info, time_us, err), TP_ARGS(hba, profile_info, time_us, err),
TP_STRUCT__entry( TP_STRUCT__entry(
__string(dev_name, dev_name) __field(struct ufs_hba *, hba)
__string(profile_info, profile_info) __string(profile_info, profile_info)
__field(s64, time_us) __field(s64, time_us)
__field(int, err) __field(int, err)
), ),
TP_fast_assign( TP_fast_assign(
__assign_str(dev_name); __entry->hba = hba;
__assign_str(profile_info); __assign_str(profile_info);
__entry->time_us = time_us; __entry->time_us = time_us;
__entry->err = err; __entry->err = err;
), ),
TP_printk("%s: %s: took %lld usecs, err %d", TP_printk("%s: %s: took %lld usecs, err %d",
__get_str(dev_name), __get_str(profile_info), dev_name(__entry->hba->dev), __get_str(profile_info),
__entry->time_us, __entry->err) __entry->time_us, __entry->err)
); );
DEFINE_EVENT(ufshcd_profiling_template, ufshcd_profile_hibern8, DEFINE_EVENT(ufshcd_profiling_template, ufshcd_profile_hibern8,
TP_PROTO(const char *dev_name, const char *profile_info, s64 time_us, TP_PROTO(struct ufs_hba *hba, const char *profile_info, s64 time_us,
int err), int err),
TP_ARGS(dev_name, profile_info, time_us, err)); TP_ARGS(hba, profile_info, time_us, err));
DEFINE_EVENT(ufshcd_profiling_template, ufshcd_profile_clk_gating, DEFINE_EVENT(ufshcd_profiling_template, ufshcd_profile_clk_gating,
TP_PROTO(const char *dev_name, const char *profile_info, s64 time_us, TP_PROTO(struct ufs_hba *hba, const char *profile_info, s64 time_us,
int err), int err),
TP_ARGS(dev_name, profile_info, time_us, err)); TP_ARGS(hba, profile_info, time_us, err));
DEFINE_EVENT(ufshcd_profiling_template, ufshcd_profile_clk_scaling, DEFINE_EVENT(ufshcd_profiling_template, ufshcd_profile_clk_scaling,
TP_PROTO(const char *dev_name, const char *profile_info, s64 time_us, TP_PROTO(struct ufs_hba *hba, const char *profile_info, s64 time_us,
int err), int err),
TP_ARGS(dev_name, profile_info, time_us, err)); TP_ARGS(hba, profile_info, time_us, err));
DECLARE_EVENT_CLASS(ufshcd_template, DECLARE_EVENT_CLASS(ufshcd_template,
TP_PROTO(const char *dev_name, int err, s64 usecs, TP_PROTO(struct ufs_hba *hba, int err, s64 usecs,
int dev_state, int link_state), int dev_state, int link_state),
TP_ARGS(dev_name, err, usecs, dev_state, link_state), TP_ARGS(hba, err, usecs, dev_state, link_state),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(s64, usecs) __field(s64, usecs)
__field(int, err) __field(int, err)
__string(dev_name, dev_name) __field(struct ufs_hba *, hba)
__field(int, dev_state) __field(int, dev_state)
__field(int, link_state) __field(int, link_state)
), ),
@ -207,14 +207,14 @@ DECLARE_EVENT_CLASS(ufshcd_template,
TP_fast_assign( TP_fast_assign(
__entry->usecs = usecs; __entry->usecs = usecs;
__entry->err = err; __entry->err = err;
__assign_str(dev_name); __entry->hba = hba;
__entry->dev_state = dev_state; __entry->dev_state = dev_state;
__entry->link_state = link_state; __entry->link_state = link_state;
), ),
TP_printk( TP_printk(
"%s: took %lld usecs, dev_state: %s, link_state: %s, err %d", "%s: took %lld usecs, dev_state: %s, link_state: %s, err %d",
__get_str(dev_name), dev_name(__entry->hba->dev),
__entry->usecs, __entry->usecs,
__print_symbolic(__entry->dev_state, UFS_PWR_MODES), __print_symbolic(__entry->dev_state, UFS_PWR_MODES),
__print_symbolic(__entry->link_state, UFS_LINK_STATES), __print_symbolic(__entry->link_state, UFS_LINK_STATES),
@ -223,60 +223,62 @@ DECLARE_EVENT_CLASS(ufshcd_template,
); );
DEFINE_EVENT(ufshcd_template, ufshcd_system_suspend, DEFINE_EVENT(ufshcd_template, ufshcd_system_suspend,
TP_PROTO(const char *dev_name, int err, s64 usecs, TP_PROTO(struct ufs_hba *hba, int err, s64 usecs,
int dev_state, int link_state), int dev_state, int link_state),
TP_ARGS(dev_name, err, usecs, dev_state, link_state)); TP_ARGS(hba, err, usecs, dev_state, link_state));
DEFINE_EVENT(ufshcd_template, ufshcd_system_resume, DEFINE_EVENT(ufshcd_template, ufshcd_system_resume,
TP_PROTO(const char *dev_name, int err, s64 usecs, TP_PROTO(struct ufs_hba *hba, int err, s64 usecs,
int dev_state, int link_state), int dev_state, int link_state),
TP_ARGS(dev_name, err, usecs, dev_state, link_state)); TP_ARGS(hba, err, usecs, dev_state, link_state));
DEFINE_EVENT(ufshcd_template, ufshcd_runtime_suspend, DEFINE_EVENT(ufshcd_template, ufshcd_runtime_suspend,
TP_PROTO(const char *dev_name, int err, s64 usecs, TP_PROTO(struct ufs_hba *hba, int err, s64 usecs,
int dev_state, int link_state), int dev_state, int link_state),
TP_ARGS(dev_name, err, usecs, dev_state, link_state)); TP_ARGS(hba, err, usecs, dev_state, link_state));
DEFINE_EVENT(ufshcd_template, ufshcd_runtime_resume, DEFINE_EVENT(ufshcd_template, ufshcd_runtime_resume,
TP_PROTO(const char *dev_name, int err, s64 usecs, TP_PROTO(struct ufs_hba *hba, int err, s64 usecs,
int dev_state, int link_state), int dev_state, int link_state),
TP_ARGS(dev_name, err, usecs, dev_state, link_state)); TP_ARGS(hba, err, usecs, dev_state, link_state));
DEFINE_EVENT(ufshcd_template, ufshcd_init, DEFINE_EVENT(ufshcd_template, ufshcd_init,
TP_PROTO(const char *dev_name, int err, s64 usecs, TP_PROTO(struct ufs_hba *hba, int err, s64 usecs,
int dev_state, int link_state), int dev_state, int link_state),
TP_ARGS(dev_name, err, usecs, dev_state, link_state)); TP_ARGS(hba, err, usecs, dev_state, link_state));
DEFINE_EVENT(ufshcd_template, ufshcd_wl_suspend, DEFINE_EVENT(ufshcd_template, ufshcd_wl_suspend,
TP_PROTO(const char *dev_name, int err, s64 usecs, TP_PROTO(struct ufs_hba *hba, int err, s64 usecs,
int dev_state, int link_state), int dev_state, int link_state),
TP_ARGS(dev_name, err, usecs, dev_state, link_state)); TP_ARGS(hba, err, usecs, dev_state, link_state));
DEFINE_EVENT(ufshcd_template, ufshcd_wl_resume, DEFINE_EVENT(ufshcd_template, ufshcd_wl_resume,
TP_PROTO(const char *dev_name, int err, s64 usecs, TP_PROTO(struct ufs_hba *hba, int err, s64 usecs,
int dev_state, int link_state), int dev_state, int link_state),
TP_ARGS(dev_name, err, usecs, dev_state, link_state)); TP_ARGS(hba, err, usecs, dev_state, link_state));
DEFINE_EVENT(ufshcd_template, ufshcd_wl_runtime_suspend, DEFINE_EVENT(ufshcd_template, ufshcd_wl_runtime_suspend,
TP_PROTO(const char *dev_name, int err, s64 usecs, TP_PROTO(struct ufs_hba *hba, int err, s64 usecs,
int dev_state, int link_state), int dev_state, int link_state),
TP_ARGS(dev_name, err, usecs, dev_state, link_state)); TP_ARGS(hba, err, usecs, dev_state, link_state));
DEFINE_EVENT(ufshcd_template, ufshcd_wl_runtime_resume, DEFINE_EVENT(ufshcd_template, ufshcd_wl_runtime_resume,
TP_PROTO(const char *dev_name, int err, s64 usecs, TP_PROTO(struct ufs_hba *hba, int err, s64 usecs,
int dev_state, int link_state), int dev_state, int link_state),
TP_ARGS(dev_name, err, usecs, dev_state, link_state)); TP_ARGS(hba, err, usecs, dev_state, link_state));
TRACE_EVENT(ufshcd_command, TRACE_EVENT(ufshcd_command,
TP_PROTO(struct scsi_device *sdev, enum ufs_trace_str_t str_t, TP_PROTO(struct scsi_device *sdev, struct ufs_hba *hba,
enum ufs_trace_str_t str_t,
unsigned int tag, u32 doorbell, u32 hwq_id, int transfer_len, unsigned int tag, u32 doorbell, u32 hwq_id, int transfer_len,
u32 intr, u64 lba, u8 opcode, u8 group_id), u32 intr, u64 lba, u8 opcode, u8 group_id),
TP_ARGS(sdev, str_t, tag, doorbell, hwq_id, transfer_len, intr, lba, TP_ARGS(sdev, hba, str_t, tag, doorbell, hwq_id, transfer_len, intr, lba,
opcode, group_id), opcode, group_id),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(struct scsi_device *, sdev) __field(struct scsi_device *, sdev)
__field(struct ufs_hba *, hba)
__field(enum ufs_trace_str_t, str_t) __field(enum ufs_trace_str_t, str_t)
__field(unsigned int, tag) __field(unsigned int, tag)
__field(u32, doorbell) __field(u32, doorbell)
@ -290,6 +292,7 @@ TRACE_EVENT(ufshcd_command,
TP_fast_assign( TP_fast_assign(
__entry->sdev = sdev; __entry->sdev = sdev;
__entry->hba = hba;
__entry->str_t = str_t; __entry->str_t = str_t;
__entry->tag = tag; __entry->tag = tag;
__entry->doorbell = doorbell; __entry->doorbell = doorbell;
@ -312,13 +315,13 @@ TRACE_EVENT(ufshcd_command,
); );
TRACE_EVENT(ufshcd_uic_command, TRACE_EVENT(ufshcd_uic_command,
TP_PROTO(const char *dev_name, enum ufs_trace_str_t str_t, u32 cmd, TP_PROTO(struct ufs_hba *hba, enum ufs_trace_str_t str_t, u32 cmd,
u32 arg1, u32 arg2, u32 arg3), u32 arg1, u32 arg2, u32 arg3),
TP_ARGS(dev_name, str_t, cmd, arg1, arg2, arg3), TP_ARGS(hba, str_t, cmd, arg1, arg2, arg3),
TP_STRUCT__entry( TP_STRUCT__entry(
__string(dev_name, dev_name) __field(struct ufs_hba *, hba)
__field(enum ufs_trace_str_t, str_t) __field(enum ufs_trace_str_t, str_t)
__field(u32, cmd) __field(u32, cmd)
__field(u32, arg1) __field(u32, arg1)
@ -327,7 +330,7 @@ TRACE_EVENT(ufshcd_uic_command,
), ),
TP_fast_assign( TP_fast_assign(
__assign_str(dev_name); __entry->hba = hba;
__entry->str_t = str_t; __entry->str_t = str_t;
__entry->cmd = cmd; __entry->cmd = cmd;
__entry->arg1 = arg1; __entry->arg1 = arg1;
@ -337,19 +340,19 @@ TRACE_EVENT(ufshcd_uic_command,
TP_printk( TP_printk(
"%s: %s: cmd: 0x%x, arg1: 0x%x, arg2: 0x%x, arg3: 0x%x", "%s: %s: cmd: 0x%x, arg1: 0x%x, arg2: 0x%x, arg3: 0x%x",
show_ufs_cmd_trace_str(__entry->str_t), __get_str(dev_name), show_ufs_cmd_trace_str(__entry->str_t), dev_name(__entry->hba->dev),
__entry->cmd, __entry->arg1, __entry->arg2, __entry->arg3 __entry->cmd, __entry->arg1, __entry->arg2, __entry->arg3
) )
); );
TRACE_EVENT(ufshcd_upiu, TRACE_EVENT(ufshcd_upiu,
TP_PROTO(const char *dev_name, enum ufs_trace_str_t str_t, void *hdr, TP_PROTO(struct ufs_hba *hba, enum ufs_trace_str_t str_t, void *hdr,
void *tsf, enum ufs_trace_tsf_t tsf_t), void *tsf, enum ufs_trace_tsf_t tsf_t),
TP_ARGS(dev_name, str_t, hdr, tsf, tsf_t), TP_ARGS(hba, str_t, hdr, tsf, tsf_t),
TP_STRUCT__entry( TP_STRUCT__entry(
__string(dev_name, dev_name) __field(struct ufs_hba *, hba)
__field(enum ufs_trace_str_t, str_t) __field(enum ufs_trace_str_t, str_t)
__array(unsigned char, hdr, 12) __array(unsigned char, hdr, 12)
__array(unsigned char, tsf, 16) __array(unsigned char, tsf, 16)
@ -357,7 +360,7 @@ TRACE_EVENT(ufshcd_upiu,
), ),
TP_fast_assign( TP_fast_assign(
__assign_str(dev_name); __entry->hba = hba;
__entry->str_t = str_t; __entry->str_t = str_t;
memcpy(__entry->hdr, hdr, sizeof(__entry->hdr)); memcpy(__entry->hdr, hdr, sizeof(__entry->hdr));
memcpy(__entry->tsf, tsf, sizeof(__entry->tsf)); memcpy(__entry->tsf, tsf, sizeof(__entry->tsf));
@ -366,7 +369,7 @@ TRACE_EVENT(ufshcd_upiu,
TP_printk( TP_printk(
"%s: %s: HDR:%s, %s:%s", "%s: %s: HDR:%s, %s:%s",
show_ufs_cmd_trace_str(__entry->str_t), __get_str(dev_name), show_ufs_cmd_trace_str(__entry->str_t), dev_name(__entry->hba->dev),
__print_hex(__entry->hdr, sizeof(__entry->hdr)), __print_hex(__entry->hdr, sizeof(__entry->hdr)),
show_ufs_cmd_trace_tsf(__entry->tsf_t), show_ufs_cmd_trace_tsf(__entry->tsf_t),
__print_hex(__entry->tsf, sizeof(__entry->tsf)) __print_hex(__entry->tsf, sizeof(__entry->tsf))
@ -375,22 +378,22 @@ TRACE_EVENT(ufshcd_upiu,
TRACE_EVENT(ufshcd_exception_event, TRACE_EVENT(ufshcd_exception_event,
TP_PROTO(const char *dev_name, u16 status), TP_PROTO(struct ufs_hba *hba, u16 status),
TP_ARGS(dev_name, status), TP_ARGS(hba, status),
TP_STRUCT__entry( TP_STRUCT__entry(
__string(dev_name, dev_name) __field(struct ufs_hba *, hba)
__field(u16, status) __field(u16, status)
), ),
TP_fast_assign( TP_fast_assign(
__assign_str(dev_name); __entry->hba = hba;
__entry->status = status; __entry->status = status;
), ),
TP_printk("%s: status 0x%x", TP_printk("%s: status 0x%x",
__get_str(dev_name), __entry->status dev_name(__entry->hba->dev), __entry->status
) )
); );

68
drivers/ufs/core/ufshcd.c
View File

@ -369,7 +369,7 @@ static void ufshcd_add_cmd_upiu_trace(struct ufs_hba *hba, unsigned int tag,
else else
header = &hba->lrb[tag].ucd_rsp_ptr->header; header = &hba->lrb[tag].ucd_rsp_ptr->header;
trace_ufshcd_upiu(dev_name(hba->dev), str_t, header, &rq->sc.cdb, trace_ufshcd_upiu(hba, str_t, header, &rq->sc.cdb,
UFS_TSF_CDB); UFS_TSF_CDB);
} }
@ -380,7 +380,7 @@ static void ufshcd_add_query_upiu_trace(struct ufs_hba *hba,
if (!trace_ufshcd_upiu_enabled()) if (!trace_ufshcd_upiu_enabled())
return; return;
trace_ufshcd_upiu(dev_name(hba->dev), str_t, &rq_rsp->header, trace_ufshcd_upiu(hba, str_t, &rq_rsp->header,
&rq_rsp->qr, UFS_TSF_OSF); &rq_rsp->qr, UFS_TSF_OSF);
} }
@ -393,12 +393,12 @@ static void ufshcd_add_tm_upiu_trace(struct ufs_hba *hba, unsigned int tag,
return; return;
if (str_t == UFS_TM_SEND) if (str_t == UFS_TM_SEND)
trace_ufshcd_upiu(dev_name(hba->dev), str_t, trace_ufshcd_upiu(hba, str_t,
&descp->upiu_req.req_header, &descp->upiu_req.req_header,
&descp->upiu_req.input_param1, &descp->upiu_req.input_param1,
UFS_TSF_TM_INPUT); UFS_TSF_TM_INPUT);
else else
trace_ufshcd_upiu(dev_name(hba->dev), str_t, trace_ufshcd_upiu(hba, str_t,
&descp->upiu_rsp.rsp_header, &descp->upiu_rsp.rsp_header,
&descp->upiu_rsp.output_param1, &descp->upiu_rsp.output_param1,
UFS_TSF_TM_OUTPUT); UFS_TSF_TM_OUTPUT);
@ -418,7 +418,7 @@ static void ufshcd_add_uic_command_trace(struct ufs_hba *hba,
else else
cmd = ufshcd_readl(hba, REG_UIC_COMMAND); cmd = ufshcd_readl(hba, REG_UIC_COMMAND);
trace_ufshcd_uic_command(dev_name(hba->dev), str_t, cmd, trace_ufshcd_uic_command(hba, str_t, cmd,
ufshcd_readl(hba, REG_UIC_COMMAND_ARG_1), ufshcd_readl(hba, REG_UIC_COMMAND_ARG_1),
ufshcd_readl(hba, REG_UIC_COMMAND_ARG_2), ufshcd_readl(hba, REG_UIC_COMMAND_ARG_2),
ufshcd_readl(hba, REG_UIC_COMMAND_ARG_3)); ufshcd_readl(hba, REG_UIC_COMMAND_ARG_3));
@ -473,7 +473,7 @@ static void ufshcd_add_command_trace(struct ufs_hba *hba, unsigned int tag,
} else { } else {
doorbell = ufshcd_readl(hba, REG_UTP_TRANSFER_REQ_DOOR_BELL); doorbell = ufshcd_readl(hba, REG_UTP_TRANSFER_REQ_DOOR_BELL);
} }
trace_ufshcd_command(cmd->device, str_t, tag, doorbell, hwq_id, trace_ufshcd_command(cmd->device, hba, str_t, tag, doorbell, hwq_id,
transfer_len, intr, lba, opcode, group_id); transfer_len, intr, lba, opcode, group_id);
} }
@ -1063,7 +1063,7 @@ static int ufshcd_set_clk_freq(struct ufs_hba *hba, bool scale_up)
clki->max_freq, ret); clki->max_freq, ret);
break; break;
} }
trace_ufshcd_clk_scaling(dev_name(hba->dev), trace_ufshcd_clk_scaling(hba,
"scaled up", clki->name, "scaled up", clki->name,
clki->curr_freq, clki->curr_freq,
clki->max_freq); clki->max_freq);
@ -1081,7 +1081,7 @@ static int ufshcd_set_clk_freq(struct ufs_hba *hba, bool scale_up)
clki->min_freq, ret); clki->min_freq, ret);
break; break;
} }
trace_ufshcd_clk_scaling(dev_name(hba->dev), trace_ufshcd_clk_scaling(hba,
"scaled down", clki->name, "scaled down", clki->name,
clki->curr_freq, clki->curr_freq,
clki->min_freq); clki->min_freq);
@ -1122,7 +1122,7 @@ int ufshcd_opp_config_clks(struct device *dev, struct opp_table *opp_table,
return ret; return ret;
} }
trace_ufshcd_clk_scaling(dev_name(dev), trace_ufshcd_clk_scaling(hba,
(scaling_down ? "scaled down" : "scaled up"), (scaling_down ? "scaled down" : "scaled up"),
clki->name, hba->clk_scaling.target_freq, freq); clki->name, hba->clk_scaling.target_freq, freq);
} }
@ -1186,7 +1186,7 @@ static int ufshcd_scale_clks(struct ufs_hba *hba, unsigned long freq,
ufshcd_pm_qos_update(hba, scale_up); ufshcd_pm_qos_update(hba, scale_up);
out: out:
trace_ufshcd_profile_clk_scaling(dev_name(hba->dev), trace_ufshcd_profile_clk_scaling(hba,
(scale_up ? "up" : "down"), (scale_up ? "up" : "down"),
ktime_to_us(ktime_sub(ktime_get(), start)), ret); ktime_to_us(ktime_sub(ktime_get(), start)), ret);
return ret; return ret;
@ -1548,7 +1548,7 @@ static int ufshcd_devfreq_target(struct device *dev,
if (!ret) if (!ret)
hba->clk_scaling.target_freq = *freq; hba->clk_scaling.target_freq = *freq;
trace_ufshcd_profile_clk_scaling(dev_name(hba->dev), trace_ufshcd_profile_clk_scaling(hba,
(scale_up ? "up" : "down"), (scale_up ? "up" : "down"),
ktime_to_us(ktime_sub(ktime_get(), start)), ret); ktime_to_us(ktime_sub(ktime_get(), start)), ret);
@ -1881,7 +1881,7 @@ void ufshcd_hold(struct ufs_hba *hba)
case REQ_CLKS_OFF: case REQ_CLKS_OFF:
if (cancel_delayed_work(&hba->clk_gating.gate_work)) { if (cancel_delayed_work(&hba->clk_gating.gate_work)) {
hba->clk_gating.state = CLKS_ON; hba->clk_gating.state = CLKS_ON;
trace_ufshcd_clk_gating(dev_name(hba->dev), trace_ufshcd_clk_gating(hba,
hba->clk_gating.state); hba->clk_gating.state);
break; break;
} }
@ -1893,7 +1893,7 @@ void ufshcd_hold(struct ufs_hba *hba)
fallthrough; fallthrough;
case CLKS_OFF: case CLKS_OFF:
hba->clk_gating.state = REQ_CLKS_ON; hba->clk_gating.state = REQ_CLKS_ON;
trace_ufshcd_clk_gating(dev_name(hba->dev), trace_ufshcd_clk_gating(hba,
hba->clk_gating.state); hba->clk_gating.state);
queue_work(hba->clk_gating.clk_gating_workq, queue_work(hba->clk_gating.clk_gating_workq,
&hba->clk_gating.ungate_work); &hba->clk_gating.ungate_work);
@ -1933,7 +1933,7 @@ static void ufshcd_gate_work(struct work_struct *work)
if (hba->clk_gating.is_suspended || if (hba->clk_gating.is_suspended ||
hba->clk_gating.state != REQ_CLKS_OFF) { hba->clk_gating.state != REQ_CLKS_OFF) {
hba->clk_gating.state = CLKS_ON; hba->clk_gating.state = CLKS_ON;
trace_ufshcd_clk_gating(dev_name(hba->dev), trace_ufshcd_clk_gating(hba,
hba->clk_gating.state); hba->clk_gating.state);
return; return;
} }
@ -1955,7 +1955,7 @@ static void ufshcd_gate_work(struct work_struct *work)
hba->clk_gating.state = CLKS_ON; hba->clk_gating.state = CLKS_ON;
dev_err(hba->dev, "%s: hibern8 enter failed %d\n", dev_err(hba->dev, "%s: hibern8 enter failed %d\n",
__func__, ret); __func__, ret);
trace_ufshcd_clk_gating(dev_name(hba->dev), trace_ufshcd_clk_gating(hba,
hba->clk_gating.state); hba->clk_gating.state);
return; return;
} }
@ -1980,7 +1980,7 @@ static void ufshcd_gate_work(struct work_struct *work)
guard(spinlock_irqsave)(&hba->clk_gating.lock); guard(spinlock_irqsave)(&hba->clk_gating.lock);
if (hba->clk_gating.state == REQ_CLKS_OFF) { if (hba->clk_gating.state == REQ_CLKS_OFF) {
hba->clk_gating.state = CLKS_OFF; hba->clk_gating.state = CLKS_OFF;
trace_ufshcd_clk_gating(dev_name(hba->dev), trace_ufshcd_clk_gating(hba,
hba->clk_gating.state); hba->clk_gating.state);
} }
} }
@ -2006,7 +2006,7 @@ static void __ufshcd_release(struct ufs_hba *hba)
} }
hba->clk_gating.state = REQ_CLKS_OFF; hba->clk_gating.state = REQ_CLKS_OFF;
trace_ufshcd_clk_gating(dev_name(hba->dev), hba->clk_gating.state); trace_ufshcd_clk_gating(hba, hba->clk_gating.state);
queue_delayed_work(hba->clk_gating.clk_gating_workq, queue_delayed_work(hba->clk_gating.clk_gating_workq,
&hba->clk_gating.gate_work, &hba->clk_gating.gate_work,
msecs_to_jiffies(hba->clk_gating.delay_ms)); msecs_to_jiffies(hba->clk_gating.delay_ms));
@ -4419,7 +4419,7 @@ int ufshcd_uic_hibern8_enter(struct ufs_hba *hba)
ufshcd_vops_hibern8_notify(hba, UIC_CMD_DME_HIBER_ENTER, PRE_CHANGE); ufshcd_vops_hibern8_notify(hba, UIC_CMD_DME_HIBER_ENTER, PRE_CHANGE);
ret = ufshcd_uic_pwr_ctrl(hba, &uic_cmd); ret = ufshcd_uic_pwr_ctrl(hba, &uic_cmd);
trace_ufshcd_profile_hibern8(dev_name(hba->dev), "enter", trace_ufshcd_profile_hibern8(hba, "enter",
ktime_to_us(ktime_sub(ktime_get(), start)), ret); ktime_to_us(ktime_sub(ktime_get(), start)), ret);
if (ret) if (ret)
@ -4444,7 +4444,7 @@ int ufshcd_uic_hibern8_exit(struct ufs_hba *hba)
ufshcd_vops_hibern8_notify(hba, UIC_CMD_DME_HIBER_EXIT, PRE_CHANGE); ufshcd_vops_hibern8_notify(hba, UIC_CMD_DME_HIBER_EXIT, PRE_CHANGE);
ret = ufshcd_uic_pwr_ctrl(hba, &uic_cmd); ret = ufshcd_uic_pwr_ctrl(hba, &uic_cmd);
trace_ufshcd_profile_hibern8(dev_name(hba->dev), "exit", trace_ufshcd_profile_hibern8(hba, "exit",
ktime_to_us(ktime_sub(ktime_get(), start)), ret); ktime_to_us(ktime_sub(ktime_get(), start)), ret);
if (ret) { if (ret) {
@ -5805,7 +5805,7 @@ static int ufshcd_enable_auto_bkops(struct ufs_hba *hba)
} }
hba->auto_bkops_enabled = true; hba->auto_bkops_enabled = true;
trace_ufshcd_auto_bkops_state(dev_name(hba->dev), "Enabled"); trace_ufshcd_auto_bkops_state(hba, "Enabled");
/* No need of URGENT_BKOPS exception from the device */ /* No need of URGENT_BKOPS exception from the device */
err = ufshcd_disable_ee(hba, MASK_EE_URGENT_BKOPS); err = ufshcd_disable_ee(hba, MASK_EE_URGENT_BKOPS);
@ -5856,7 +5856,7 @@ static int ufshcd_disable_auto_bkops(struct ufs_hba *hba)
} }
hba->auto_bkops_enabled = false; hba->auto_bkops_enabled = false;
trace_ufshcd_auto_bkops_state(dev_name(hba->dev), "Disabled"); trace_ufshcd_auto_bkops_state(hba, "Disabled");
hba->is_urgent_bkops_lvl_checked = false; hba->is_urgent_bkops_lvl_checked = false;
out: out:
return err; return err;
@ -6208,7 +6208,7 @@ static void ufshcd_exception_event_handler(struct work_struct *work)
return; return;
} }
trace_ufshcd_exception_event(dev_name(hba->dev), status); trace_ufshcd_exception_event(hba, status);
if (status & hba->ee_drv_mask & MASK_EE_URGENT_BKOPS) if (status & hba->ee_drv_mask & MASK_EE_URGENT_BKOPS)
ufshcd_bkops_exception_event_handler(hba); ufshcd_bkops_exception_event_handler(hba);
@ -7672,7 +7672,7 @@ static void ufshcd_process_probe_result(struct ufs_hba *hba,
hba->ufshcd_state = UFSHCD_STATE_OPERATIONAL; hba->ufshcd_state = UFSHCD_STATE_OPERATIONAL;
spin_unlock_irqrestore(hba->host->host_lock, flags); spin_unlock_irqrestore(hba->host->host_lock, flags);
trace_ufshcd_init(dev_name(hba->dev), ret, trace_ufshcd_init(hba, ret,
ktime_to_us(ktime_sub(ktime_get(), probe_start)), ktime_to_us(ktime_sub(ktime_get(), probe_start)),
hba->curr_dev_pwr_mode, hba->uic_link_state); hba->curr_dev_pwr_mode, hba->uic_link_state);
} }
@ -9173,12 +9173,12 @@ static int ufshcd_setup_clocks(struct ufs_hba *hba, bool on)
} else if (!ret && on) { } else if (!ret && on) {
scoped_guard(spinlock_irqsave, &hba->clk_gating.lock) scoped_guard(spinlock_irqsave, &hba->clk_gating.lock)
hba->clk_gating.state = CLKS_ON; hba->clk_gating.state = CLKS_ON;
trace_ufshcd_clk_gating(dev_name(hba->dev), trace_ufshcd_clk_gating(hba,
hba->clk_gating.state); hba->clk_gating.state);
} }
if (clk_state_changed) if (clk_state_changed)
trace_ufshcd_profile_clk_gating(dev_name(hba->dev), trace_ufshcd_profile_clk_gating(hba,
(on ? "on" : "off"), (on ? "on" : "off"),
ktime_to_us(ktime_sub(ktime_get(), start)), ret); ktime_to_us(ktime_sub(ktime_get(), start)), ret);
return ret; return ret;
@ -9878,7 +9878,7 @@ static int ufshcd_wl_runtime_suspend(struct device *dev)
if (ret) if (ret)
dev_err(&sdev->sdev_gendev, "%s failed: %d\n", __func__, ret); dev_err(&sdev->sdev_gendev, "%s failed: %d\n", __func__, ret);
trace_ufshcd_wl_runtime_suspend(dev_name(dev), ret, trace_ufshcd_wl_runtime_suspend(hba, ret,
ktime_to_us(ktime_sub(ktime_get(), start)), ktime_to_us(ktime_sub(ktime_get(), start)),
hba->curr_dev_pwr_mode, hba->uic_link_state); hba->curr_dev_pwr_mode, hba->uic_link_state);
@ -9898,7 +9898,7 @@ static int ufshcd_wl_runtime_resume(struct device *dev)
if (ret) if (ret)
dev_err(&sdev->sdev_gendev, "%s failed: %d\n", __func__, ret); dev_err(&sdev->sdev_gendev, "%s failed: %d\n", __func__, ret);
trace_ufshcd_wl_runtime_resume(dev_name(dev), ret, trace_ufshcd_wl_runtime_resume(hba, ret,
ktime_to_us(ktime_sub(ktime_get(), start)), ktime_to_us(ktime_sub(ktime_get(), start)),
hba->curr_dev_pwr_mode, hba->uic_link_state); hba->curr_dev_pwr_mode, hba->uic_link_state);
@ -9930,7 +9930,7 @@ static int ufshcd_wl_suspend(struct device *dev)
out: out:
if (!ret) if (!ret)
hba->is_sys_suspended = true; hba->is_sys_suspended = true;
trace_ufshcd_wl_suspend(dev_name(dev), ret, trace_ufshcd_wl_suspend(hba, ret,
ktime_to_us(ktime_sub(ktime_get(), start)), ktime_to_us(ktime_sub(ktime_get(), start)),
hba->curr_dev_pwr_mode, hba->uic_link_state); hba->curr_dev_pwr_mode, hba->uic_link_state);
@ -9953,7 +9953,7 @@ static int ufshcd_wl_resume(struct device *dev)
if (ret) if (ret)
dev_err(&sdev->sdev_gendev, "%s failed: %d\n", __func__, ret); dev_err(&sdev->sdev_gendev, "%s failed: %d\n", __func__, ret);
out: out:
trace_ufshcd_wl_resume(dev_name(dev), ret, trace_ufshcd_wl_resume(hba, ret,
ktime_to_us(ktime_sub(ktime_get(), start)), ktime_to_us(ktime_sub(ktime_get(), start)),
hba->curr_dev_pwr_mode, hba->uic_link_state); hba->curr_dev_pwr_mode, hba->uic_link_state);
if (!ret) if (!ret)
@ -9991,7 +9991,7 @@ static int ufshcd_suspend(struct ufs_hba *hba)
} }
if (ufshcd_is_clkgating_allowed(hba)) { if (ufshcd_is_clkgating_allowed(hba)) {
hba->clk_gating.state = CLKS_OFF; hba->clk_gating.state = CLKS_OFF;
trace_ufshcd_clk_gating(dev_name(hba->dev), trace_ufshcd_clk_gating(hba,
hba->clk_gating.state); hba->clk_gating.state);
} }
@ -10064,7 +10064,7 @@ int ufshcd_system_suspend(struct device *dev)
ret = ufshcd_suspend(hba); ret = ufshcd_suspend(hba);
out: out:
trace_ufshcd_system_suspend(dev_name(hba->dev), ret, trace_ufshcd_system_suspend(hba, ret,
ktime_to_us(ktime_sub(ktime_get(), start)), ktime_to_us(ktime_sub(ktime_get(), start)),
hba->curr_dev_pwr_mode, hba->uic_link_state); hba->curr_dev_pwr_mode, hba->uic_link_state);
return ret; return ret;
@ -10092,7 +10092,7 @@ int ufshcd_system_resume(struct device *dev)
ret = ufshcd_resume(hba); ret = ufshcd_resume(hba);
out: out:
trace_ufshcd_system_resume(dev_name(hba->dev), ret, trace_ufshcd_system_resume(hba, ret,
ktime_to_us(ktime_sub(ktime_get(), start)), ktime_to_us(ktime_sub(ktime_get(), start)),
hba->curr_dev_pwr_mode, hba->uic_link_state); hba->curr_dev_pwr_mode, hba->uic_link_state);
@ -10118,7 +10118,7 @@ int ufshcd_runtime_suspend(struct device *dev)
ret = ufshcd_suspend(hba); ret = ufshcd_suspend(hba);
trace_ufshcd_runtime_suspend(dev_name(hba->dev), ret, trace_ufshcd_runtime_suspend(hba, ret,
ktime_to_us(ktime_sub(ktime_get(), start)), ktime_to_us(ktime_sub(ktime_get(), start)),
hba->curr_dev_pwr_mode, hba->uic_link_state); hba->curr_dev_pwr_mode, hba->uic_link_state);
return ret; return ret;
@ -10145,7 +10145,7 @@ int ufshcd_runtime_resume(struct device *dev)
ret = ufshcd_resume(hba); ret = ufshcd_resume(hba);
trace_ufshcd_runtime_resume(dev_name(hba->dev), ret, trace_ufshcd_runtime_resume(hba, ret,
ktime_to_us(ktime_sub(ktime_get(), start)), ktime_to_us(ktime_sub(ktime_get(), start)),
hba->curr_dev_pwr_mode, hba->uic_link_state); hba->curr_dev_pwr_mode, hba->uic_link_state);
return ret; return ret;