Skip to contentSkip to conversation

ieee1394 fixes

GIT PULL Stefan Richter 1 participant 1 message Jun 29, 2007 Firewire

lore
Share & tools
lore
#0 lore raw

Linus, please pull from the for-linus branch at

    git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git for-linus

to receive the following updates.

Stefan Richter (2):
firewire: fix async reception on big endian machines
firewire: add Kconfig help on building both stacks

 drivers/firewire/Kconfig   |   65 +++++++++++++++++++++++------------
 drivers/firewire/fw-ohci.c |    6 ++--
 2 files changed, 46 insertions(+), 25 deletions(-)

commit 0a9972baa7454c747fd5f67ce864420dff99d383

Author: Stefan Richter <[email protected]>
Date:   Sat Jun 23 20:28:17 2007 +0200

firewire: fix async reception on big endian machines

descriptor.data_address is little endian

---

drivers/firewire/fw-ohci.c +3 -3
index b72a5c1..96c8ac5 100644
@@ -373,8 +373,8 @@ static void ar_context_tasklet(unsigned long data)
 
 		offset = offsetof(struct ar_buffer, data);
 		dma_unmap_single(ohci->card.device,
-				 ab->descriptor.data_address - offset,
-				 PAGE_SIZE, DMA_BIDIRECTIONAL);
+			le32_to_cpu(ab->descriptor.data_address) - offset,
+			PAGE_SIZE, DMA_BIDIRECTIONAL);
 
 		buffer = ab;
 		ab = ab->next;
@@ -427,7 +427,7 @@ static void ar_context_run(struct ar_context *ctx)
 	size_t offset;
 
 	offset = offsetof(struct ar_buffer, data);
-	ab_bus = ab->descriptor.data_address - offset;
+	ab_bus = le32_to_cpu(ab->descriptor.data_address) - offset;
 
 	reg_write(ctx->ohci, COMMAND_PTR(ctx->regs), ab_bus | 1);
 	reg_write(ctx->ohci, CONTROL_SET(ctx->regs), CONTEXT_RUN);

commit fe77d4f283e840879f0e23b86a5d6a486823fdef

Author: Stefan Richter <[email protected]>
Date:   Mon Jun 25 22:18:40 2007 +0200

firewire: add Kconfig help on building both stacks

Alas that won't work so good, because nobody reads help texts.

I thought about adding some crude multiple choice selection (build the old stack, build the new stack, build both stacks). It's possible, but it would introduce awkward dummy config variables.

---

drivers/firewire/Kconfig +43 -22

93 lines not on this page · raw message

Signature · 3 lines
Stefan Richter
-=====-=-=== -==- ===-=
http://arcgraph.de/sr/