Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bd243c4 authored by Kristian Høgsberg's avatar Kristian Høgsberg Committed by Stefan Richter
Browse files

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.

Signed-off-by: default avatarKristian Hoegsberg <krh@redhat.com>
Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent 5307cc1a

drivers/firewire/fw-ohci.c

+25 −12
Original line number Diff line number Diff line
@@ -984,8 +984,10 @@ static void bus_reset_tasklet(unsigned long data) 
	 */



	if (ohci->next_config_rom != NULL) {

		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.

	 */



	if (config_rom) {

		ohci->next_config_rom =

			dma_alloc_coherent(ohci->card.device, CONFIG_ROM_SIZE,

				   &ohci->next_config_rom_bus, GFP_KERNEL);

					   &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);

	} 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