firewire: ohci: cache the context run bit

The DMA context run control bit is entirely controlled by software, so
it is safe to cache it.  This allows the driver to avoid doing an
additional MMIO read when queueing an AT packet.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Clemens Ladisch 2010-12-24 14:42:46 +01:00 committed by Stefan Richter
parent 78dec56d6a
commit 386a4153a2
1 changed files with 4 additions and 4 deletions

View File

@ -125,6 +125,7 @@ struct context {
struct fw_ohci *ohci; struct fw_ohci *ohci;
u32 regs; u32 regs;
int total_allocation; int total_allocation;
bool running;
bool flushing; bool flushing;
/* /*
@ -1174,6 +1175,7 @@ static void context_run(struct context *ctx, u32 extra)
le32_to_cpu(ctx->last->branch_address)); le32_to_cpu(ctx->last->branch_address));
reg_write(ohci, CONTROL_CLEAR(ctx->regs), ~0); reg_write(ohci, CONTROL_CLEAR(ctx->regs), ~0);
reg_write(ohci, CONTROL_SET(ctx->regs), CONTEXT_RUN | extra); reg_write(ohci, CONTROL_SET(ctx->regs), CONTEXT_RUN | extra);
ctx->running = true;
flush_writes(ohci); flush_writes(ohci);
} }
@ -1202,6 +1204,7 @@ static void context_stop(struct context *ctx)
ctx->active = false; ctx->active = false;
reg_write(ctx->ohci, CONTROL_CLEAR(ctx->regs), CONTEXT_RUN); reg_write(ctx->ohci, CONTROL_CLEAR(ctx->regs), CONTEXT_RUN);
ctx->running = false;
flush_writes(ctx->ohci); flush_writes(ctx->ohci);
for (i = 0; i < 10; i++) { for (i = 0; i < 10; i++) {
@ -1232,7 +1235,6 @@ static int at_context_queue_packet(struct context *ctx,
struct descriptor *d, *last; struct descriptor *d, *last;
__le32 *header; __le32 *header;
int z, tcode; int z, tcode;
u32 reg;
d = context_get_descriptors(ctx, 4, &d_bus); d = context_get_descriptors(ctx, 4, &d_bus);
if (d == NULL) { if (d == NULL) {
@ -1351,9 +1353,7 @@ static int at_context_queue_packet(struct context *ctx,
context_append(ctx, d, z, 4 - z); context_append(ctx, d, z, 4 - z);
/* If the context isn't already running, start it up. */ if (!ctx->running)
reg = reg_read(ctx->ohci, CONTROL_SET(ctx->regs));
if ((reg & CONTEXT_RUN) == 0)
context_run(ctx, 0); context_run(ctx, 0);
return 0; return 0;