Commit 4a52338b authored by Ziqi Chen's avatar Ziqi Chen Committed by Martin K. Petersen
Browse files

scsi: ufs: core: Add trace event for MCQ 



Add MCQ hardware queue ID in the existing trace event ufshcd_command().

Signed-off-by: default avatarZiqi Chen <quic_ziqichen@quicinc.com>
Link: https://lore.kernel.org/r/1678866271-49601-1-git-send-email-quic_ziqichen@quicinc.com


Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 127fd07d

drivers/ufs/core/ufshcd.c

+12 −3
Original line number Diff line number Diff line
@@ -422,7 +422,9 @@ static void ufshcd_add_command_trace(struct ufs_hba *hba, unsigned int tag, 
{

	u64 lba = 0;

	u8 opcode = 0, group_id = 0;

	u32 intr, doorbell;

	u32 doorbell = 0;

	u32 intr;

	int hwq_id = -1;

	struct ufshcd_lrb *lrbp = &hba->lrb[tag];

	struct scsi_cmnd *cmd = lrbp->cmd;

	struct request *rq = scsi_cmd_to_rq(cmd);
@@ -456,9 +458,16 @@ static void ufshcd_add_command_trace(struct ufs_hba *hba, unsigned int tag, 
	}



	intr = ufshcd_readl(hba, REG_INTERRUPT_STATUS);



	if (is_mcq_enabled(hba)) {

		struct ufs_hw_queue *hwq = ufshcd_mcq_req_to_hwq(hba, rq);



		hwq_id = hwq->id;

	} else {

		doorbell = ufshcd_readl(hba, REG_UTP_TRANSFER_REQ_DOOR_BELL);

	}

	trace_ufshcd_command(dev_name(hba->dev), str_t, tag,

			doorbell, transfer_len, intr, lba, opcode, group_id);

			doorbell, hwq_id, transfer_len, intr, lba, opcode, group_id);

}



static void ufshcd_print_clk_freqs(struct ufs_hba *hba)

include/trace/events/ufs.h

+12 −10
Original line number Diff line number Diff line
@@ -268,10 +268,10 @@ DEFINE_EVENT(ufshcd_template, ufshcd_wl_runtime_resume, 


TRACE_EVENT(ufshcd_command,

	TP_PROTO(const char *dev_name, enum ufs_trace_str_t str_t,

		 unsigned int tag, u32 doorbell, int transfer_len, u32 intr,

		 u64 lba, u8 opcode, u8 group_id),

		 unsigned int tag, u32 doorbell, u32 hwq_id, int transfer_len,

		 u32 intr, u64 lba, u8 opcode, u8 group_id),



	TP_ARGS(dev_name, str_t, tag, doorbell, transfer_len,

	TP_ARGS(dev_name, str_t, tag, doorbell, hwq_id, transfer_len,

			intr, lba, opcode, group_id),



	TP_STRUCT__entry(
@@ -279,9 +279,10 @@ TRACE_EVENT(ufshcd_command, 
		__field(enum ufs_trace_str_t, str_t)

		__field(unsigned int, tag)

		__field(u32, doorbell)

		__field(int, transfer_len)

		__field(u32, hwq_id)

		__field(u32, intr)

		__field(u64, lba)

		__field(int, transfer_len)

		__field(u8, opcode)

		__field(u8, group_id)

	),
@@ -291,19 +292,20 @@ TRACE_EVENT(ufshcd_command, 
		__entry->str_t = str_t;

		__entry->tag = tag;

		__entry->doorbell = doorbell;

		__entry->transfer_len = transfer_len;

		__entry->hwq_id = hwq_id;

		__entry->intr = intr;

		__entry->lba = lba;

		__entry->transfer_len = transfer_len;

		__entry->opcode = opcode;

		__entry->group_id = group_id;

	),



	TP_printk(

		"%s: %s: tag: %u, DB: 0x%x, size: %d, IS: %u, LBA: %llu, opcode: 0x%x (%s), group_id: 0x%x",

		"%s: %s: tag: %u, DB: 0x%x, size: %d, IS: %u, LBA: %llu, opcode: 0x%x (%s), group_id: 0x%x, hwq_id: %d",

		show_ufs_cmd_trace_str(__entry->str_t), __get_str(dev_name),

		__entry->tag, __entry->doorbell, __entry->transfer_len,

		__entry->intr, __entry->lba, (u32)__entry->opcode,

		str_opcode(__entry->opcode), (u32)__entry->group_id

		__entry->tag, __entry->doorbell, __entry->transfer_len, __entry->intr,

		__entry->lba, (u32)__entry->opcode, str_opcode(__entry->opcode),

		(u32)__entry->group_id, __entry->hwq_id

	)

);