FireWire updates
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 FireWire/ IEEE 1394 subsystem updates. The bigger portion of this has been in -mm for a long time, held up by another now fixed bug.
drivers/firewire/fw-ohci.c | 37 +++++++++++++++------- drivers/ieee1394/ieee1394_transactions.c | 2 - 2 files changed, 25 insertions(+), 14 deletions(-)
Adrian Bunk (1):
ieee1394: ieee1394_transactions.c: remove dead code
Kristian Høgsberg (1):
firewire: Fix pci resume to not pass in a __be32 config rom.
Full log and diff:
commit 2ed45b07c957e37db88d7d3696b63eb79b0ef5ef
Author: Adrian Bunk <[email protected]> Date: Sun Oct 28 16:51:32 2007 +0100
ieee1394: ieee1394_transactions.c: remove dead code
This patch removes dead code spotted by the Intel C Compiler.
drivers/ieee1394/ieee1394_transactions.c +0 -2
@@ -235,7 +235,6 @@ int hpsb_packet_success(struct hpsb_packet *packet) packet->node_id);return -EAGAIN ; } -BUG ();case ACK_BUSY_X :case ACK_BUSY_A :
@@ -282,7 +281,6 @@ int hpsb_packet_success(struct hpsb_packet *packet) packet->ack_code, packet->node_id, packet->tcode);return -EAGAIN ; } -BUG (); } struct hpsb_packet *hpsb_make_readpacket(struct hpsb_host *host, nodeid_t node,
commit 0bd243c4d93583cd8e1786c0bd6982f6f9f94ab6
Author: Kristian Høgsberg <[email protected]> Date: Tue Jun 5 19:27:05 2007 -0400
firewire: Fix pci resume to not pass in a __be32 config rom.
The ohci_enable() function shared between pci_probe and pci_resume takes a host endian config rom, but ohci->config_rom is __be32. This sets up the config rom in the wrong endian on little endian machine, specifically, BusOptions will be initialized to a 0 max receive size.
This patch changes the way we reuse the config rom so that we avoid this problem.
drivers/firewire/fw-ohci.c +25 -12
@@ -984,8 +984,10 @@ static void bus_reset_tasklet(unsigned long data)*/ if (ohci->next_config_rom !=NULL ) { - free_rom = ohci->config_rom; - free_rom_bus = ohci->config_rom_bus; +if (ohci->next_config_rom != ohci->config_rom) { + free_rom = ohci->config_rom; + free_rom_bus = ohci->config_rom_bus; + } ohci->config_rom = ohci->next_config_rom; ohci->config_rom_bus = ohci->next_config_rom_bus; ohci->next_config_rom =NULL ;
@@ -1161,19 +1163,30 @@ static int ohci_enable(struct fw_card *card, u32 *config_rom, size_t length)* the right values in the bus reset tasklet. */ - ohci->next_config_rom = -dma_alloc_coherent (ohci->card.device,CONFIG_ROM_SIZE , - &ohci->next_config_rom_bus,GFP_KERNEL ); -if (ohci->next_config_rom ==NULL ) -return -ENOMEM ; +if (config_rom) { + ohci->next_config_rom = +dma_alloc_coherent (ohci->card.device,CONFIG_ROM_SIZE , + &ohci->next_config_rom_bus, +GFP_KERNEL ); +if (ohci->next_config_rom ==NULL ) +return -ENOMEM ; -memset (ohci->next_config_rom,0 ,CONFIG_ROM_SIZE ); -fw_memcpy_to_be32 (ohci->next_config_rom, config_rom, length *4 ); +memset (ohci->next_config_rom,0 ,CONFIG_ROM_SIZE ); +fw_memcpy_to_be32 (ohci->next_config_rom, config_rom, length *4 ); + }else { +/* +* In the suspend case, config_rom is NULL, which +* means that we just reuse the old config rom. +*/ + ohci->next_config_rom = ohci->config_rom; + ohci->next_config_rom_bus = ohci->config_rom_bus; + } - ohci->next_header = config_rom[0 ]; + ohci->next_header =be32_to_cpu (ohci->next_config_rom[0 ]); ohci->next_config_rom[0 ] =0 ;reg_write (ohci, OHCI1394_ConfigROMhdr,0 ); -reg_write (ohci, OHCI1394_BusOptions, config_rom[2 ]); +reg_write (ohci, OHCI1394_BusOptions, +be32_to_cpu (ohci->next_config_rom[2 ]));reg_write (ohci, OHCI1394_ConfigROMmap, ohci->next_config_rom_bus);reg_write (ohci, OHCI1394_AsReqFilterHiSet,0x80000000 );
@@ -1984,7 +1997,7 @@ static int pci_resume(struct pci_dev *pdev) return err; } -return ohci_enable (&ohci->card, ohci->config_rom,CONFIG_ROM_SIZE ); +return ohci_enable (&ohci->card,NULL ,0 ); }#endif
Signature · 3 lines
Stefan Richter -=====-=-=== =-=- ===== http://arcgraph.de/sr/