Commit f1cba521 authored by Takashi Sakamoto's avatar Takashi Sakamoto
Browse files

firewire: core: rename cause flag of tracepoints event 

The flag of FW_ISO_CONTEXT_COMPLETIONS_CAUSE_IRQ directly causes hardIRQ
request by 1394 OHCI hardware when the corresponding isochronous packet is
transferred, however it is not so directly associated to hardIRQ
processing itself.

This commit renames the flag so that it relates to interrupt parameter of
internal packet data.

Link: https://lore.kernel.org/r/20240912133038.238786-6-o-takashi@sakamocchi.jp


Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
parent 4010cb1e

drivers/firewire/ohci.c

+3 −3
Original line number Diff line number Diff line
@@ -2927,7 +2927,7 @@ static int handle_ir_packet_per_buffer(struct context *context, 
	copy_iso_headers(ctx, (u32 *) (last + 1));



	if (last->control & cpu_to_le16(DESCRIPTOR_IRQ_ALWAYS))

		flush_iso_completions(ctx, FW_ISO_CONTEXT_COMPLETIONS_CAUSE_IRQ);

		flush_iso_completions(ctx, FW_ISO_CONTEXT_COMPLETIONS_CAUSE_INTERRUPT);



	return 1;

}
@@ -2963,7 +2963,7 @@ static int handle_ir_buffer_fill(struct context *context, 


	if (last->control & cpu_to_le16(DESCRIPTOR_IRQ_ALWAYS)) {

		trace_isoc_inbound_multiple_completions(&ctx->base, completed,

							FW_ISO_CONTEXT_COMPLETIONS_CAUSE_IRQ);

							FW_ISO_CONTEXT_COMPLETIONS_CAUSE_INTERRUPT);



		ctx->base.callback.mc(&ctx->base,

				      buffer_dma + completed,
@@ -3059,7 +3059,7 @@ static int handle_it_packet(struct context *context, 
	ctx->header_length += 4;



	if (last->control & cpu_to_le16(DESCRIPTOR_IRQ_ALWAYS))

		flush_iso_completions(ctx, FW_ISO_CONTEXT_COMPLETIONS_CAUSE_IRQ);

		flush_iso_completions(ctx, FW_ISO_CONTEXT_COMPLETIONS_CAUSE_INTERRUPT);



	return 1;

}

include/trace/events/firewire.h

+2 −2
Original line number Diff line number Diff line
@@ -830,13 +830,13 @@ TRACE_EVENT_CONDITION(isoc_inbound_multiple_queue, 
#ifndef show_cause

enum fw_iso_context_completions_cause {

	FW_ISO_CONTEXT_COMPLETIONS_CAUSE_FLUSH = 0,

	FW_ISO_CONTEXT_COMPLETIONS_CAUSE_IRQ,

	FW_ISO_CONTEXT_COMPLETIONS_CAUSE_INTERRUPT,

	FW_ISO_CONTEXT_COMPLETIONS_CAUSE_HEADER_OVERFLOW,

};

#define show_cause(cause) 								\

	__print_symbolic(cause,								\

		{ FW_ISO_CONTEXT_COMPLETIONS_CAUSE_FLUSH, "FLUSH" },			\

		{ FW_ISO_CONTEXT_COMPLETIONS_CAUSE_IRQ, "IRQ" },			\

		{ FW_ISO_CONTEXT_COMPLETIONS_CAUSE_INTERRUPT, "INTERRUPT" },		\

		{ FW_ISO_CONTEXT_COMPLETIONS_CAUSE_HEADER_OVERFLOW, "HEADER_OVERFLOW" }	\

	)

#endif