Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

firewire: Loop requests to the host controller back into the stack.

Browse source 
Signed-off-by: Kristian Høgsberg <krh@redhat.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Kristian Høgsberg 2007-01-26 00:38:04 -05:00 • committed by Stefan Richter
parent 2639a6fb26
commit e636fe2576
2 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/firewire/fw-device.c
View file

@ -532,11 +532,6 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event)
{ {
struct fw_device *device; struct fw_device *device;
/* Ignore events for the local node (i.e. the node that
* corresponds to the ieee1394 controller in this linux box). */
if (node == card->local_node)
return;
switch (event) { switch (event) {
case FW_NODE_CREATED: case FW_NODE_CREATED:
case FW_NODE_LINK_ON: case FW_NODE_LINK_ON:

33
drivers/firewire/fw-ohci.c
View file

@ -121,6 +121,7 @@ struct fw_ohci {
dma_addr_t self_id_bus; dma_addr_t self_id_bus;
__le32 *self_id_cpu; __le32 *self_id_cpu;
struct tasklet_struct bus_reset_tasklet; struct tasklet_struct bus_reset_tasklet;
int node_id;
int generation; int generation;
int request_generation; int request_generation;
@ -538,29 +539,45 @@ at_context_init(struct at_context *ctx, struct fw_ohci *ohci, u32 control_set)
return 0; return 0;
} }
#define header_get_destination(q) (((q) >> 16) & 0xffff)
static void static void
at_context_transmit(struct at_context *ctx, struct fw_packet *packet) at_context_transmit(struct at_context *ctx, struct fw_packet *packet)
{ {
LIST_HEAD(list); LIST_HEAD(list);
unsigned long flags; unsigned long flags;
int was_empty; int local;
spin_lock_irqsave(&ctx->ohci->lock, flags); spin_lock_irqsave(&ctx->ohci->lock, flags);
was_empty = list_empty(&ctx->list); if (header_get_destination(packet->header[0]) == ctx->ohci->node_id &&
list_add_tail(&packet->link, &ctx->list); ctx->ohci->generation == packet->generation) {
if (was_empty) local = 1;
at_context_setup_packet(ctx, &list); } else {
list_add_tail(&packet->link, &ctx->list);
if (ctx->list.next == &packet->link)
at_context_setup_packet(ctx, &list);
local = 0;
}
spin_unlock_irqrestore(&ctx->ohci->lock, flags); spin_unlock_irqrestore(&ctx->ohci->lock, flags);
do_packet_callbacks(ctx->ohci, &list); do_packet_callbacks(ctx->ohci, &list);
if (local) {
packet->ack = ACK_PENDING;
packet->callback(packet, &ctx->ohci->card, packet->ack);
if (ctx == &ctx->ohci->at_request_ctx)
fw_core_handle_request(&ctx->ohci->card, packet);
else
fw_core_handle_response(&ctx->ohci->card, packet);
}
} }
static void bus_reset_tasklet(unsigned long data) static void bus_reset_tasklet(unsigned long data)
{ {
struct fw_ohci *ohci = (struct fw_ohci *)data; struct fw_ohci *ohci = (struct fw_ohci *)data;
int self_id_count, i, j, reg, node_id; int self_id_count, i, j, reg;
int generation, new_generation; int generation, new_generation;
unsigned long flags; unsigned long flags;
@ -569,7 +586,7 @@ static void bus_reset_tasklet(unsigned long data)
fw_error("node ID not valid, new bus reset in progress\n"); fw_error("node ID not valid, new bus reset in progress\n");
return; return;
} }
node_id = reg & 0xffff; ohci->node_id = reg & 0xffff;
/* The count in the SelfIDCount register is the number of /* The count in the SelfIDCount register is the number of
* bytes in the self ID receive buffer. Since we also receive * bytes in the self ID receive buffer. Since we also receive
@ -638,7 +655,7 @@ static void bus_reset_tasklet(unsigned long data)
spin_unlock_irqrestore(&ohci->lock, flags); spin_unlock_irqrestore(&ohci->lock, flags);
fw_core_handle_bus_reset(&ohci->card, node_id, generation, fw_core_handle_bus_reset(&ohci->card, ohci->node_id, generation,
self_id_count, ohci->self_id_buffer); self_id_count, ohci->self_id_buffer);
} }