Skip to content

Commit

Permalink
firewire: core: don't update Broadcast_Channel if RFC 2734 conditions…
Browse files Browse the repository at this point in the history
… aren't met

This extra check will avoid Broadcast_Channel register related traffic
to many IIDC, SBP-2, and AV/C devices which aren't IRMC or have a
max_rec < 8 (i.e. support < 512 bytes async payload).  This avoids a
little bit of traffic after bus reset and is even more careful with
devices which don't implement this CSR.

The assumption is that no other protocol than IP over 1394 uses the
broadcast channel for streams.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
  • Loading branch information
Stefan Richter committed Jun 14, 2009
1 parent 099d541 commit 837ec78
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
18 changes: 17 additions & 1 deletion drivers/firewire/core-device.c
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,9 @@ static int read_bus_info_block(struct fw_device *device, int generation)

kfree(old_rom);
ret = 0;
device->cmc = rom[2] >> 30 & 1;
device->max_rec = rom[2] >> 12 & 0xf;
device->cmc = rom[2] >> 30 & 1;
device->irmc = rom[2] >> 31 & 1;
out:
kfree(rom);

Expand Down Expand Up @@ -841,6 +843,20 @@ static void set_broadcast_channel(struct fw_device *device, int generation)
if (!card->broadcast_channel_allocated)
return;

/*
* The Broadcast_Channel Valid bit is required by nodes which want to
* transmit on this channel. Such transmissions are practically
* exclusive to IP over 1394 (RFC 2734). IP capable nodes are required
* to be IRM capable and have a max_rec of 8 or more. We use this fact
* to narrow down to which nodes we send Broadcast_Channel updates.
*/
if (!device->irmc || device->max_rec < 8)
return;

/*
* Some 1394-1995 nodes crash if this 1394a-2000 register is written.
* Perform a read test first.
*/
if (device->bc_implemented == BC_UNKNOWN) {
rcode = fw_run_transaction(card, TCODE_READ_QUADLET_REQUEST,
device->node_id, generation, device->max_speed,
Expand Down
2 changes: 2 additions & 0 deletions include/linux/firewire.h
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,9 @@ struct fw_device {
size_t config_rom_length;
int config_rom_retries;
unsigned is_local:1;
unsigned max_rec:4;
unsigned cmc:1;
unsigned irmc:1;
unsigned bc_implemented:2;

struct delayed_work work;
Expand Down

0 comments on commit 837ec78

Please sign in to comment.