From nobody Thu Feb 12 12:32:42 2026 Received: from fout6-smtp.messagingengine.com (fout6-smtp.messagingengine.com [103.168.172.149]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BFC5A144D10 for ; Thu, 13 Jun 2024 13:14:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.149 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718284495; cv=none; b=XFVloQL3kvmU+gdT3MDjPWA0K6J7kEbVFTx8hJphvzspB646jfu0q3XqqUbty4S+3ZSiCVVGtQmVqjzt3Sq2LfRF80CRjgOPv+WV3QhfT6r9q+pU+OirDCez5PBGoAtKfEZ5LIPJqKFER/sxnvk+rBOS517a+3v/vPTP5cUWvrA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718284495; c=relaxed/simple; bh=7L1gd/DIa6bveNbIw8EQeC/U0pFIIXBZQ3326vb4SvM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HMQr6xf9/dB32L6TJUDXvqYE9zbjK0CD9bMwxCHSMxWOWAey3EgvVkFDxPmaRxK2zfxLimSdR+sf/ZvcH/KvbOx6xDbxU6jW/5bIWoWc7y+IInCi9so29UwYuFDvHoP3qtDhKh1GzAZRxf28xDxxrR/WPOMBGPm/srLtjDA2qcM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sakamocchi.jp; spf=pass smtp.mailfrom=sakamocchi.jp; dkim=pass (2048-bit key) header.d=sakamocchi.jp header.i=@sakamocchi.jp header.b=AuFr9FRx; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=DFMNXnWv; arc=none smtp.client-ip=103.168.172.149 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sakamocchi.jp Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sakamocchi.jp Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sakamocchi.jp header.i=@sakamocchi.jp header.b="AuFr9FRx"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="DFMNXnWv" Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailfout.nyi.internal (Postfix) with ESMTP id D50521380099; Thu, 13 Jun 2024 09:14:51 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Thu, 13 Jun 2024 09:14:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakamocchi.jp; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm1; t=1718284491; x= 1718370891; bh=a3iKFf3cgzA8fuhlXuxo5mFXhLHZpHmIQrt+HGCliT0=; b=A uFr9FRxT94ZornUIuVu0mtp0WshtQK4TabiCvmYdjWk2oBswq4Bp8cfq7vP7NUXI dBSpciW7RhAKmOPsQU0vF2Ah+276ymDh+F7IJO2161qUk9JbN19Lrq+/wR2FmVeC r2jr2CmqLjYI4kOOm9uAdIU8oS6Iwt01VHww1bh5bE5KKguOG7oPdeMxyVF3r3Px 7R2NPrEhzRsz5Cx1BVahlO7heuHEcGhb828Af+b4ND0ftDXHkaJMQSgfMb8xvONW lgFknLDMRqiBg2MZ4ktIrOKAiLjITIhJNosGi+ddv9iaUNRjAhllGwP4ONJw/sru vpcddIyoWmCGQCO7HtMmw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1718284491; x= 1718370891; bh=a3iKFf3cgzA8fuhlXuxo5mFXhLHZpHmIQrt+HGCliT0=; b=D FMNXnWvNeoQ8bv/xK7GsC1IMCuzZIOgQt4PedrVK7SEer/qFyHwOTX4ta9TZJ41S OqTvkW+NhruRmTh8YjQbA8TqXCib57vMD2M1Cdo/by1kpDqird8V4koAhXJrEUOX PgU81kJv9/XgfYVPe6eYTtvhanv58ZdJo1kU5kx0H2ywWm3fVf68Fog0/jRn57D7 zX1+xcw8IMl1RZd94gUL8wPuyXSYH0C/MGVNSRn3RI/4ROEhmeOoUqwBNqNF7jly hsO4iFK2wFEYt7OnyniFbL7YOY0VpDBxL2cdRSEsKuPWy/HWhAxiW/03N+7CKvOr k0HPUbcW0lBlyV7URLjhA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrfedujedgiedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefvrghkrghshhhiucfurghkrghmohhtohcuoehoqdhtrghk rghshhhisehsrghkrghmohgttghhihdrjhhpqeenucggtffrrghtthgvrhhnpedvjefgje euvdfguddukeelveetgfdtvefhtdfffeeigfevueetffeivdffkedvtdenucevlhhushht vghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehoqdhtrghkrghshhhise hsrghkrghmohgttghhihdrjhhp X-ME-Proxy: Feedback-ID: ie8e14432:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 13 Jun 2024 09:14:50 -0400 (EDT) From: Takashi Sakamoto To: linux1394-devel@lists.sourceforge.net Cc: linux-kernel@vger.kernel.org Subject: [PATCH 5/8] firewire: core: record card index in async_phy_outbound_complete tracepoints event Date: Thu, 13 Jun 2024 22:14:37 +0900 Message-ID: <20240613131440.431766-6-o-takashi@sakamocchi.jp> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240613131440.431766-1-o-takashi@sakamocchi.jp> References: <20240613131440.431766-1-o-takashi@sakamocchi.jp> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The asynchronous transmission of phy packet is initiated on one of 1394 OHCI controller, however the existing tracepoints events has the lack of data about it. This commit adds card_index member into event structure to store the index of host controller in use, and prints it. Signed-off-by: Takashi Sakamoto --- drivers/firewire/core-cdev.c | 2 +- drivers/firewire/core-transaction.c | 2 +- include/trace/events/firewire.h | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c index ff8739f96af5..9a7dc90330a3 100644 --- a/drivers/firewire/core-cdev.c +++ b/drivers/firewire/core-cdev.c @@ -1559,7 +1559,7 @@ static void outbound_phy_packet_callback(struct fw_pa= cket *packet, struct client *e_client =3D e->client; u32 rcode; =20 - trace_async_phy_outbound_complete((uintptr_t)packet, status, packet->gene= ration, + trace_async_phy_outbound_complete((uintptr_t)packet, card->index, status,= packet->generation, packet->timestamp); =20 switch (status) { diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-tr= ansaction.c index e522dc3d9897..bd5a467cfd60 100644 --- a/drivers/firewire/core-transaction.c +++ b/drivers/firewire/core-transaction.c @@ -464,7 +464,7 @@ static DECLARE_COMPLETION(phy_config_done); static void transmit_phy_packet_callback(struct fw_packet *packet, struct fw_card *card, int status) { - trace_async_phy_outbound_complete((uintptr_t)packet, packet->generation, = status, + trace_async_phy_outbound_complete((uintptr_t)packet, card->index, packet-= >generation, status, packet->timestamp); complete(&phy_config_done); } diff --git a/include/trace/events/firewire.h b/include/trace/events/firewir= e.h index a59dc26b2a53..61c7a2461fbc 100644 --- a/include/trace/events/firewire.h +++ b/include/trace/events/firewire.h @@ -244,23 +244,26 @@ TRACE_EVENT(async_phy_outbound_initiate, ); =20 TRACE_EVENT(async_phy_outbound_complete, - TP_PROTO(u64 packet, unsigned int generation, unsigned int status, unsign= ed int timestamp), - TP_ARGS(packet, generation, status, timestamp), + TP_PROTO(u64 packet, unsigned int card_index, unsigned int generation, un= signed int status, unsigned int timestamp), + TP_ARGS(packet, card_index, generation, status, timestamp), TP_STRUCT__entry( __field(u64, packet) + __field(u8, card_index) __field(u8, generation) __field(u8, status) __field(u16, timestamp) ), TP_fast_assign( __entry->packet =3D packet; + __entry->card_index =3D card_index; __entry->generation =3D generation; __entry->status =3D status; __entry->timestamp =3D timestamp; ), TP_printk( - "packet=3D0x%llx generation=3D%u status=3D%u timestamp=3D0x%04x", + "packet=3D0x%llx card_index=3D%u generation=3D%u status=3D%u timestamp= =3D0x%04x", __entry->packet, + __entry->card_index, __entry->generation, __entry->status, __entry->timestamp --=20 2.43.0