From nobody Mon Feb 9 08:32:51 2026 Received: from fout2-smtp.messagingengine.com (fout2-smtp.messagingengine.com [103.168.172.145]) (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 AA2A3147C86 for ; Mon, 29 Jul 2024 13:46:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.145 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722260800; cv=none; b=D/bAeaNwrLWni0879QPgwoIrpOhBDf4q6m+eNGlxBYaIkreZWW5HMmF16VqGqbE/BO2FZsTdsYkA/nRDrk/1UYCxRpTb2rAUM3JNaASrlcZRzqYDsm3YUV3ZykqRbGfsITswuTq+emnUPhiI0zHOaJr9c1zv9Hg1e/qz+WrL9fo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722260800; c=relaxed/simple; bh=cS5Sym8Z9j+OJ0ThHcA+a8pykzx1OoGFIjcQvngS5NQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rI8xOA2gDB8iTGhloFTJIn0/EbsjQyHrdASntgLaG+mj/iGV6YKYq96xQzIpm7g/ybmq0UG7teD417v0oh30MFa2kHkp2/5vVp5uIhX0FDK+PDq1rJHF/uvThJ8cYprhC5Plu1S2KJCkEMWtior8ycBw/KQYybet7QyxbBBLqHA= 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=y99smwt9; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=ACKdFaWw; arc=none smtp.client-ip=103.168.172.145 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="y99smwt9"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="ACKdFaWw" Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailfout.nyi.internal (Postfix) with ESMTP id BE7F4138024B; Mon, 29 Jul 2024 09:46:37 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 29 Jul 2024 09:46:37 -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=fm3; t=1722260797; x= 1722347197; bh=0tCtpGDits0Hy6LBmFMD6VZ1iHyJ5l1QnaLH/UD29/k=; b=y 99smwt9JmjhgMnlVL0mX3UavIs0EqLsO8Ir4I8v6HMWqSVidXnumw0ElbvxU9uDy OmY+8Y2dLf9GUQtK4hczBlcz/9cKAVKQl/+d3nYs+B3emXtMxLSUjIfIDzRbh0J7 aof9Bgh3kTvf6iR2H2aWb1HTqVEgq+vg2x5nTpooxC6X9aHtP4v+XTksobe45Qps 4IET+D25FfPmzbQQRkBAd0XE/JW11kK1zxngIB/OJwGuc6fV37wjA8b+c9jMS1s7 ERqYScB58KPoyGqSg2JLP1M8qNu74RqOhzw6oPBEBtx3WYj3nF6eLGfoyPkp+DBj r4ARu2tF5ECgDjII0Z/pQ== 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=fm3; t=1722260797; x= 1722347197; bh=0tCtpGDits0Hy6LBmFMD6VZ1iHyJ5l1QnaLH/UD29/k=; b=A CKdFaWwi9mt+gPufPW0fj9/kIF+HwjSTqqFvhT7NnlQxlFt8wSJAy39b11QzWcno W8D9vZHz+qtJkZs1E76KjqEOgxEuZAl4AcePtY9ivzMy6kugPWnR9EfgIh/xxmTJ wEjrVVzDBM47rIPqc4zm8l8tXrOE0zzXeQkF0QlufvX5tqM6UVKeZFDBcYvzSWi2 C74dHwXI07a9ZobttKa65w6ooHrHLB+QeYu0fICDCv3HdIlWcrGJAV5suREOZrhQ Ry0+7/eaTVAmrKHnrpbuEu+yNTe2KI+Dcj+aAm+hDCvK7kLeI5uG20o0d8RBMUZp dLxItVWlIvGsvVSQEjBQQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrjedvgdeilecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepvfgrkhgrshhhihcuufgrkhgrmhhothhouceoohdqthgrkhgr shhhihesshgrkhgrmhhotggthhhirdhjpheqnecuggftrfgrthhtvghrnhepvdejgfejue dvgfduudekleevtefgtdevhfdtffefiefgveeuteffiedvffekvddtnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepohdqthgrkhgrshhhihessh grkhgrmhhotggthhhirdhjphdpnhgspghrtghpthhtoheptd X-ME-Proxy: Feedback-ID: ie8e14432:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 29 Jul 2024 09:46:36 -0400 (EDT) From: Takashi Sakamoto To: linux1394-devel@lists.sourceforge.net Cc: linux-kernel@vger.kernel.org Subject: [PATCH 1/3] firewire: ohci: use TCODE_LINK_INTERNAL consistently Date: Mon, 29 Jul 2024 22:46:29 +0900 Message-ID: <20240729134631.127189-2-o-takashi@sakamocchi.jp> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240729134631.127189-1-o-takashi@sakamocchi.jp> References: <20240729134631.127189-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" In IEEE 1394 specification, 0x0e in tcode field is reserved for internal purpose depending on link layer. In 1394 OHCI specification, it is used to express phy packet in AT/AR contexts. Current implementation of 1394 OHCI driver has several macros for the code. They can be simply replaced with a macro in core code. This commit obsoletes the macros. Signed-off-by: Takashi Sakamoto --- drivers/firewire/ohci.c | 9 ++++----- drivers/firewire/ohci.h | 1 - 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index 314a29c0fd3e..c3fff94b13e5 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c @@ -264,7 +264,6 @@ static inline struct fw_ohci *fw_ohci(struct fw_card *c= ard) #define OHCI1394_REGISTER_SIZE 0x800 #define OHCI1394_PCI_HCI_Control 0x40 #define SELF_ID_BUF_SIZE 0x800 -#define OHCI_TCODE_PHY_PACKET 0x0e #define OHCI_VERSION_1_1 0x010010 =20 static char ohci_driver_name[] =3D KBUILD_MODNAME; @@ -586,7 +585,7 @@ static void log_ar_at_event(struct fw_ohci *ohci, ohci_notice(ohci, "A%c %s, %s\n", dir, evts[evt], tcodes[tcode]); break; - case 0xe: + case TCODE_LINK_INTERNAL: ohci_notice(ohci, "A%c %s, PHY %08x %08x\n", dir, evts[evt], header[1], header[2]); break; @@ -939,7 +938,7 @@ static __le32 *handle_ar_packet(struct ar_context *ctx,= __le32 *buffer) =20 case TCODE_WRITE_RESPONSE: case TCODE_READ_QUADLET_REQUEST: - case OHCI_TCODE_PHY_PACKET: + case TCODE_LINK_INTERNAL: p.header_length =3D 12; p.payload_length =3D 0; break; @@ -967,7 +966,7 @@ static __le32 *handle_ar_packet(struct ar_context *ctx,= __le32 *buffer) * Several controllers, notably from NEC and VIA, forget to * write ack_complete status at PHY packet reception. */ - if (evt =3D=3D OHCI1394_evt_no_status && tcode =3D=3D OHCI1394_phy_tcode) + if (evt =3D=3D OHCI1394_evt_no_status && tcode =3D=3D TCODE_LINK_INTERNAL) p.ack =3D ACK_COMPLETE; =20 /* @@ -1435,7 +1434,7 @@ static int at_context_queue_packet(struct context *ct= x, break; =20 case TCODE_LINK_INTERNAL: - header[0] =3D cpu_to_le32((OHCI1394_phy_tcode << 4) | + header[0] =3D cpu_to_le32((TCODE_LINK_INTERNAL << 4) | (packet->speed << 16)); header[1] =3D cpu_to_le32(packet->header[1]); header[2] =3D cpu_to_le32(packet->header[2]); diff --git a/drivers/firewire/ohci.h b/drivers/firewire/ohci.h index 71c2ed84cafb..9ed36cfc6cae 100644 --- a/drivers/firewire/ohci.h +++ b/drivers/firewire/ohci.h @@ -153,7 +153,6 @@ #define OHCI1394_evt_unknown 0xe #define OHCI1394_evt_flushed 0xf =20 -#define OHCI1394_phy_tcode 0xe =20 // Self-ID DMA. =20 --=20 2.43.0 From nobody Mon Feb 9 08:32:51 2026 Received: from fout2-smtp.messagingengine.com (fout2-smtp.messagingengine.com [103.168.172.145]) (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 7A0161514F8 for ; Mon, 29 Jul 2024 13:46:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.145 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722260802; cv=none; b=Fmz0hABqwy7Gatp4NbbwJUGJL204ujjf6cEWFU3UFoYI855tHyxr5GsK9ecuwH9Z4/UFc9EBjvbaoTRp35C0G/9wtYUxjgQvNFDcHCNTeh+uCUGfZCEL7hKPGA/SkjzlzNxUznCCuOiFRy99fTMIE36fRvEpU9Bhf5CL+uo8LAA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722260802; c=relaxed/simple; bh=CypZyBAmur8jk1dMIRMI/JD+8QpCn7AnNr+0wvRzl8Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e4dob6xstZO04j4/+iq5o5iA1qZotFmZSpOfutcWWuzzHHreLTKJ9NtAUkUT8afGM2JCoCuPEtSk9E87v85MkCJzy0z1yLAuBfwKrRRrSkl/mP6N6BOT+89VkaV3fUdccRQecPpOmYV1vWDBX1eKrriDeCKy2l/SLbTd5warwuk= 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=rNoMVBIV; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=KRfRQM55; arc=none smtp.client-ip=103.168.172.145 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="rNoMVBIV"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="KRfRQM55" Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailfout.nyi.internal (Postfix) with ESMTP id 9635F13801DC; Mon, 29 Jul 2024 09:46:39 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 29 Jul 2024 09:46:39 -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=fm3; t=1722260799; x= 1722347199; bh=U5rod4RFqqD1jbS5LRRa2T3sPIulvkc5tgqY5IiVoIQ=; b=r NoMVBIVIN9jiii48x1LG/QTqho54xKGnlT2/NCByyNPQLNm+hXllHuHW1pgniabU 3ST42kxzKnp3jDdwRhZOdUHgUuzAGiQI7J201XV5+lQQo/d3K40PAmlLlS71wuMO H8JMuY0ZfTFL7YCIYwThKuNKbdnzVTryYcQ0BDB/LG6u9Jcib6Sr9xb/Uw4To5pj QOcVPltJScrvAG48w63NGAX9Lny+C0n29DAOf2zRsmNoeyCH7jFrg77QevwkkndP s9kbNs7zUn7YtOHN4epkcjrzNPap0OJLcmSAvPWel/KUb2YylijCe2uZcEIezrXT F35QA2n7MUziAvi1DUtog== 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=fm3; t=1722260799; x= 1722347199; bh=U5rod4RFqqD1jbS5LRRa2T3sPIulvkc5tgqY5IiVoIQ=; b=K RfRQM55xCLgw5MYHyDzB9vbRQx9qUi2z1+P6/md8EBK1AEA4A6y8tHzVT5ikgU6/ LXtnSoUKycysmI/E+pQec/I8cgGEEhEKrwENPbZ+e9x953L0T8t+rZBF4ZH9jTyh 02uLsVv6xfn3+gC3ABT0wfYI9B7/GzANqA0M6/y3u4yLz9u2bnfgvOcql7s8j8e7 tPcanwizvT5wzwhtMFDhfdf1QXgBKynLGCm1U/Mj81nGqvto8X2txmOkIVyhUxyt K9OjMF5zpwrEjnLArCaLH2/JR3h7OwWvTudc3MV+FlrK7N8NZahRm5Q4KsIe1WtJ 79SsuefXKEnUNzRLDiUuQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrjedvgdeilecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepvfgrkhgrshhhihcuufgrkhgrmhhothhouceoohdqthgrkhgr shhhihesshgrkhgrmhhotggthhhirdhjpheqnecuggftrfgrthhtvghrnhepvdejgfejue dvgfduudekleevtefgtdevhfdtffefiefgveeuteffiedvffekvddtnecuvehluhhsthgv rhfuihiivgepudenucfrrghrrghmpehmrghilhhfrhhomhepohdqthgrkhgrshhhihessh grkhgrmhhotggthhhirdhjphdpnhgspghrtghpthhtoheptd X-ME-Proxy: Feedback-ID: ie8e14432:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 29 Jul 2024 09:46:37 -0400 (EDT) From: Takashi Sakamoto To: linux1394-devel@lists.sourceforge.net Cc: linux-kernel@vger.kernel.org Subject: [PATCH 2/3] firewire: ohci: minor code refactoring to localize text table Date: Mon, 29 Jul 2024 22:46:30 +0900 Message-ID: <20240729134631.127189-3-o-takashi@sakamocchi.jp> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240729134631.127189-1-o-takashi@sakamocchi.jp> References: <20240729134631.127189-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 string table for tcode is just used by log_ar_at_event(). In the case, it is suitable to move the table inner the function definition. This commit is for the purpose. Additionally, the hard-coded value for tcode is replaced with defined macros as many as possible. Signed-off-by: Takashi Sakamoto --- drivers/firewire/ohci.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index c3fff94b13e5..a0bb0e87e18a 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c @@ -531,20 +531,28 @@ static const char *evts[] =3D { [0x1e] =3D "ack_type_error", [0x1f] =3D "-reserved-", [0x20] =3D "pending/cancelled", }; -static const char *tcodes[] =3D { - [0x0] =3D "QW req", [0x1] =3D "BW req", - [0x2] =3D "W resp", [0x3] =3D "-reserved-", - [0x4] =3D "QR req", [0x5] =3D "BR req", - [0x6] =3D "QR resp", [0x7] =3D "BR resp", - [0x8] =3D "cycle start", [0x9] =3D "Lk req", - [0xa] =3D "async stream packet", [0xb] =3D "Lk resp", - [0xc] =3D "-reserved-", [0xd] =3D "-reserved-", - [0xe] =3D "link internal", [0xf] =3D "-reserved-", -}; =20 static void log_ar_at_event(struct fw_ohci *ohci, char dir, int speed, u32 *header, int evt) { + static const char *const tcodes[] =3D { + [TCODE_WRITE_QUADLET_REQUEST] =3D "QW req", + [TCODE_WRITE_BLOCK_REQUEST] =3D "BW req", + [TCODE_WRITE_RESPONSE] =3D "W resp", + [0x3] =3D "-reserved-", + [TCODE_READ_QUADLET_REQUEST] =3D "QR req", + [TCODE_READ_BLOCK_REQUEST] =3D "BR req", + [TCODE_READ_QUADLET_RESPONSE] =3D "QR resp", + [TCODE_READ_BLOCK_RESPONSE] =3D "BR resp", + [TCODE_CYCLE_START] =3D "cycle start", + [TCODE_LOCK_REQUEST] =3D "Lk req", + [TCODE_STREAM_DATA] =3D "async stream packet", + [TCODE_LOCK_RESPONSE] =3D "Lk resp", + [0xc] =3D "-reserved-", + [0xd] =3D "-reserved-", + [TCODE_LINK_INTERNAL] =3D "link internal", + [0xf] =3D "-reserved-", + }; int tcode =3D async_header_get_tcode(header); char specific[12]; =20 --=20 2.43.0 From nobody Mon Feb 9 08:32:51 2026 Received: from fhigh7-smtp.messagingengine.com (fhigh7-smtp.messagingengine.com [103.168.172.158]) (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 3200615530C for ; Mon, 29 Jul 2024 13:46:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.158 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722260803; cv=none; b=J9Ze3qZcKJM1/onag5SA5hCRrQqEiLWNf1R9MkFL8xWr/YKG5bgKfD01+PmsFSi0xCDk/JK4YGfTACv24flU5JTyTEF5X2VsCcTNQ5N2dg799v+6o6b0TNOX949jlmU0QdP9z2GZ8D96MQpw99jYSW0IY2xwEw5xL++EJPURltE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722260803; c=relaxed/simple; bh=6u4YK7HIh8qzxvNwOc536bUNAr0nGICv+grHBPnyhYo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kaYll5x8RrOwUUgFoqi+omkF8AKl/9e/3Y+j13b09JDyCh5DqepOlg/rKjzE0KlyOsxdE9s9xkNesl88zgaF0a1VVGfNi4c9vOWkjvJzFGaPso//XMJe1pY82D+044WGfr7A/KD8af0D2gXKPfiGBNm3GFftUkQ8eSm+NDmdocU= 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=m/8rkA9j; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=Y0tWsoJ+; arc=none smtp.client-ip=103.168.172.158 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="m/8rkA9j"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="Y0tWsoJ+" Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 07F24114018D; Mon, 29 Jul 2024 09:46:41 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Mon, 29 Jul 2024 09:46:41 -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=fm3; t=1722260801; x= 1722347201; bh=j6bWCSRv+RuSR+rObc2XVVpxBOoLwKSQSviTJPiNqUw=; b=m /8rkA9jZLDzEL2K0EEWBwCNxpzLlA74zT47+ZDjErKcPgHLrN45zHs8QQ5oB5/zd KTjlyzkReQPt1BIuFUWYvcSmfrlZ4ViFN7c5DfmrhXDYWEf/rBToqGIlsc0EaFRw OgYSOwoSgXL9Rcd1uZ9tSJfQxhWxfElwzoGjFWPHhlVVkOIocbG+q7064HJpiwxN KUsyfmfD0mt6taju7biOS+RglMpxh07cs0+NP/I/41OInCapyxZKckl5DPnNgoBe A4xQHIzYohHqwjs6llKsfGXKNb6PMy6nU5uniqq5UUiEVFFrIfyiBn6ja85gqJPM zc5exFH/yoJO9XOptaHew== 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=fm3; t=1722260801; x= 1722347201; bh=j6bWCSRv+RuSR+rObc2XVVpxBOoLwKSQSviTJPiNqUw=; b=Y 0tWsoJ+6jO0E5mjTVUOsKm8IrIO0SBhe0njhLT9CvMHCyYrRiMZ8R7pUKDDZPmuW 6nCddeZxNi1Fa4c7of8zroREcTgIowzc8GF8r4vqbDiIMBYRuIvZ2xzaUWYLgEvx cPe1FUhlZnX1hPmh2LpGHwwlMFxc4RvTP3/xKrI1F3TPs514gIUhwXVc82PpxuqU vD/AQJVMAcFmy8VlQAVq3S/yEjZrzSUJkc3wjuolbqsR0cvlW2BUkuxI+/0huZkS Ve/8fREsnUctghU7OOJz3lqYSUHpT3k71pUbifzfFNjepNFE/CrKjckMJXGItQaf Q0o2S8zrbS7HwXgJfKN5g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrjedvgdeilecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepvfgrkhgrshhhihcuufgrkhgrmhhothhouceoohdqthgrkhgr shhhihesshgrkhgrmhhotggthhhirdhjpheqnecuggftrfgrthhtvghrnhepvdejgfejue dvgfduudekleevtefgtdevhfdtffefiefgveeuteffiedvffekvddtnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepohdqthgrkhgrshhhihessh grkhgrmhhotggthhhirdhjphdpnhgspghrtghpthhtoheptd X-ME-Proxy: Feedback-ID: ie8e14432:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 29 Jul 2024 09:46:39 -0400 (EDT) From: Takashi Sakamoto To: linux1394-devel@lists.sourceforge.net Cc: linux-kernel@vger.kernel.org Subject: [PATCH 3/3] firewire: core: use common helper function to serialize phy configuration packet Date: Mon, 29 Jul 2024 22:46:31 +0900 Message-ID: <20240729134631.127189-4-o-takashi@sakamocchi.jp> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240729134631.127189-1-o-takashi@sakamocchi.jp> References: <20240729134631.127189-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" A common helper function is available to serialize the first quadlet of phy configuration packet. This commit is for the purpose. Signed-off-by: Takashi Sakamoto --- drivers/firewire/core-cdev.c | 4 +++- drivers/firewire/core-transaction.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c index 9a7dc90330a3..619048dcfd72 100644 --- a/drivers/firewire/core-cdev.c +++ b/drivers/firewire/core-cdev.c @@ -37,6 +37,8 @@ #include "core.h" #include =20 +#include "packet-header-definitions.h" + /* * ABI version history is documented in linux/firewire-cdev.h. */ @@ -1635,7 +1637,7 @@ static int ioctl_send_phy_packet(struct client *clien= t, union ioctl_arg *arg) e->client =3D client; e->p.speed =3D SCODE_100; e->p.generation =3D a->generation; - e->p.header[0] =3D TCODE_LINK_INTERNAL << 4; + async_header_set_tcode(e->p.header, TCODE_LINK_INTERNAL); e->p.header[1] =3D a->data[0]; e->p.header[2] =3D a->data[1]; e->p.header_length =3D 12; diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-tr= ansaction.c index 4d2fc1f31fec..a89c841a7dbe 100644 --- a/drivers/firewire/core-transaction.c +++ b/drivers/firewire/core-transaction.c @@ -464,7 +464,6 @@ static void transmit_phy_packet_callback(struct fw_pack= et *packet, =20 static struct fw_packet phy_config_packet =3D { .header_length =3D 12, - .header[0] =3D TCODE_LINK_INTERNAL << 4, .payload_length =3D 0, .speed =3D SCODE_100, .callback =3D transmit_phy_packet_callback, @@ -497,6 +496,7 @@ void fw_send_phy_config(struct fw_card *card, =20 mutex_lock(&phy_config_mutex); =20 + async_header_set_tcode(phy_config_packet.header, TCODE_LINK_INTERNAL); phy_config_packet.header[1] =3D data; phy_config_packet.header[2] =3D ~data; phy_config_packet.generation =3D generation; --=20 2.43.0