firewire: optimize config ROM creation

The config ROM image of the local node was created in CPU byte order,
then a temporary big endian copy was created to compute the CRC, and
finally the card driver created its own big endian copy.

We now generate it in big endian byte order in the first place to avoid
one byte order conversion and the temporary on-stack copy of the ROM
image (1000 bytes stack usage in process context).  Furthermore, two
1000 bytes memset()s are replaced by one 1000 bytes - ROM length sized
memset.

The trivial fw_memcpy_{from,to}_be32() helpers are now superfluous and
removed.  The newly added __compute_block_crc() function will be folded
into fw_compute_block_crc() in a subsequent change.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

1 files changed, 19 insertions, 11 deletions

diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index 5d524254499e..418415564791 100644
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -205,7 +205,7 @@ struct fw_ohci {
         dma_addr_t config_rom_bus;
         __be32 *next_config_rom;
         dma_addr_t next_config_rom_bus;
-        u32 next_header;
+        __be32 next_header;
 
         struct ar_context ar_request_ctx;
         struct ar_context ar_response_ctx;
@@ -1355,8 +1355,9 @@ static void bus_reset_tasklet(unsigned long data)
                  */
                 reg_write(ohci, OHCI1394_BusOptions,
                           be32_to_cpu(ohci->config_rom[2]));
-                ohci->config_rom[0] = cpu_to_be32(ohci->next_header);
-                reg_write(ohci, OHCI1394_ConfigROMhdr, ohci->next_header);
+                ohci->config_rom[0] = ohci->next_header;
+                reg_write(ohci, OHCI1394_ConfigROMhdr,
+                          be32_to_cpu(ohci->next_header));
         }
 
 #ifdef CONFIG_FIREWIRE_OHCI_REMOTE_DMA
@@ -1464,7 +1465,17 @@ static int software_reset(struct fw_ohci *ohci)
         return -EBUSY;
 }
 
-static int ohci_enable(struct fw_card *card, u32 *config_rom, size_t length)
+static void copy_config_rom(__be32 *dest, const __be32 *src, size_t length)
+{
+        size_t size = length * 4;
+
+        memcpy(dest, src, size);
+        if (size < CONFIG_ROM_SIZE)
+                memset(&dest[length], 0, CONFIG_ROM_SIZE - size);
+}
+
+static int ohci_enable(struct fw_card *card,
+                       const __be32 *config_rom, size_t length)
 {
         struct fw_ohci *ohci = fw_ohci(card);
         struct pci_dev *dev = to_pci_dev(card->device);
@@ -1565,8 +1576,7 @@ static int ohci_enable(struct fw_card *card, u32 *config_rom, size_t length)
                 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);
+                copy_config_rom(ohci->next_config_rom, config_rom, length);
         } else {
                 /*
                  * In the suspend case, config_rom is NULL, which
@@ -1576,7 +1586,7 @@ static int ohci_enable(struct fw_card *card, u32 *config_rom, size_t length)
                 ohci->next_config_rom_bus = ohci->config_rom_bus;
         }
 
-        ohci->next_header = be32_to_cpu(ohci->next_config_rom[0]);
+        ohci->next_header = ohci->next_config_rom[0];
         ohci->next_config_rom[0] = 0;
         reg_write(ohci, OHCI1394_ConfigROMhdr, 0);
         reg_write(ohci, OHCI1394_BusOptions,
@@ -1610,7 +1620,7 @@ static int ohci_enable(struct fw_card *card, u32 *config_rom, size_t length)
 }
 
 static int ohci_set_config_rom(struct fw_card *card,
-                               u32 *config_rom, size_t length)
+                               const __be32 *config_rom, size_t length)
 {
         struct fw_ohci *ohci;
         unsigned long flags;
@@ -1659,9 +1669,7 @@ static int ohci_set_config_rom(struct fw_card *card,
                 ohci->next_config_rom = next_config_rom;
                 ohci->next_config_rom_bus = next_config_rom_bus;
 
-                memset(ohci->next_config_rom, 0, CONFIG_ROM_SIZE);
-                fw_memcpy_to_be32(ohci->next_config_rom, config_rom,
-                                  length * 4);
+                copy_config_rom(ohci->next_config_rom, config_rom, length);
 
                 ohci->next_header = config_rom[0];
                 ohci->next_config_rom[0] = 0;