Commit 9b6ad6a0 authored by Takashi Sakamoto's avatar Takashi Sakamoto

firewire: core: use common helper function to serialize phy configuration packet

A common helper function is available to serialize the first quadlet of phy
configuration packet.

This commit is for the purpose.

Link: https://lore.kernel.org/r/20240729134631.127189-4-o-takashi@sakamocchi.jpSigned-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
parent faa11b99
...@@ -37,6 +37,8 @@ ...@@ -37,6 +37,8 @@
#include "core.h" #include "core.h"
#include <trace/events/firewire.h> #include <trace/events/firewire.h>
#include "packet-header-definitions.h"
/* /*
* ABI version history is documented in linux/firewire-cdev.h. * ABI version history is documented in linux/firewire-cdev.h.
*/ */
...@@ -1635,7 +1637,7 @@ static int ioctl_send_phy_packet(struct client *client, union ioctl_arg *arg) ...@@ -1635,7 +1637,7 @@ static int ioctl_send_phy_packet(struct client *client, union ioctl_arg *arg)
e->client = client; e->client = client;
e->p.speed = SCODE_100; e->p.speed = SCODE_100;
e->p.generation = a->generation; e->p.generation = a->generation;
e->p.header[0] = TCODE_LINK_INTERNAL << 4; async_header_set_tcode(e->p.header, TCODE_LINK_INTERNAL);
e->p.header[1] = a->data[0]; e->p.header[1] = a->data[0];
e->p.header[2] = a->data[1]; e->p.header[2] = a->data[1];
e->p.header_length = 12; e->p.header_length = 12;
......
...@@ -464,7 +464,6 @@ static void transmit_phy_packet_callback(struct fw_packet *packet, ...@@ -464,7 +464,6 @@ static void transmit_phy_packet_callback(struct fw_packet *packet,
static struct fw_packet phy_config_packet = { static struct fw_packet phy_config_packet = {
.header_length = 12, .header_length = 12,
.header[0] = TCODE_LINK_INTERNAL << 4,
.payload_length = 0, .payload_length = 0,
.speed = SCODE_100, .speed = SCODE_100,
.callback = transmit_phy_packet_callback, .callback = transmit_phy_packet_callback,
...@@ -497,6 +496,7 @@ void fw_send_phy_config(struct fw_card *card, ...@@ -497,6 +496,7 @@ void fw_send_phy_config(struct fw_card *card,
mutex_lock(&phy_config_mutex); mutex_lock(&phy_config_mutex);
async_header_set_tcode(phy_config_packet.header, TCODE_LINK_INTERNAL);
phy_config_packet.header[1] = data; phy_config_packet.header[1] = data;
phy_config_packet.header[2] = ~data; phy_config_packet.header[2] = ~data;
phy_config_packet.generation = generation; phy_config_packet.generation = generation;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment