tehuti: Use request_firmware()

Firmware blob is little endian.

Compile-tested only.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

6 files changed, 2718 insertions, 10729 deletions

diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c
index be9f38f8f0b..7debd1e4e1f 100644
--- a/drivers/net/tehuti.c
+++ b/drivers/net/tehuti.c
@@ -63,7 +63,6 @@
  */
 
 #include "tehuti.h"
-#include "tehuti_fw.h"
 
 static struct pci_device_id __devinitdata bdx_pci_tbl[] = {
         {0x1FC9, 0x3009, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
@@ -318,28 +317,41 @@ static int bdx_poll(struct napi_struct *napi, int budget)
 
 static int bdx_fw_load(struct bdx_priv *priv)
 {
+        const struct firmware *fw = NULL;
         int master, i;
+        int rc;
 
         ENTER;
         master = READ_REG(priv, regINIT_SEMAPHORE);
         if (!READ_REG(priv, regINIT_STATUS) && master) {
-                bdx_tx_push_desc_safe(priv, s_firmLoad, sizeof(s_firmLoad));
+                rc = request_firmware(&fw, "tehuti/firmware.bin", &priv->pdev->dev);
+                if (rc)
+                        goto out;
+                bdx_tx_push_desc_safe(priv, (char *)fw->data, fw->size);
                 mdelay(100);
         }
         for (i = 0; i < 200; i++) {
-                if (READ_REG(priv, regINIT_STATUS))
-                        break;
+                if (READ_REG(priv, regINIT_STATUS)) {
+                        rc = 0;
+                        goto out;
+                }
                 mdelay(2);
         }
+        rc = -EIO;
+out:
         if (master)
                 WRITE_REG(priv, regINIT_SEMAPHORE, 1);
+        if (fw)
+                release_firmware(fw);
 
-        if (i == 200) {
+        if (rc) {
                 ERR("%s: firmware loading failed\n", priv->ndev->name);
-                DBG("VPC = 0x%x VIC = 0x%x INIT_STATUS = 0x%x i=%d\n",
-                    READ_REG(priv, regVPC),
-                    READ_REG(priv, regVIC), READ_REG(priv, regINIT_STATUS), i);
-                RET(-EIO);
+                if (rc == -EIO)
+                        DBG("VPC = 0x%x VIC = 0x%x INIT_STATUS = 0x%x i=%d\n",
+                            READ_REG(priv, regVPC),
+                            READ_REG(priv, regVIC),
+                            READ_REG(priv, regINIT_STATUS), i);
+                RET(rc);
         } else {
                 DBG("%s: firmware loading success\n", priv->ndev->name);
                 RET(0);
@@ -617,13 +629,6 @@ err:
         RET(rc);
 }
 
-static void __init bdx_firmware_endianess(void)
-{
-        int i;
-        for (i = 0; i < ARRAY_SIZE(s_firmLoad); i++)
-                s_firmLoad[i] = CPU_CHIP_SWAP32(s_firmLoad[i]);
-}
-
 static int bdx_range_check(struct bdx_priv *priv, u32 offset)
 {
         return (offset > (u32) (BDX_REGS_SIZE / priv->nic->port_num)) ?
@@ -2501,7 +2506,6 @@ static void __init print_driver_id(void)
 static int __init bdx_module_init(void)
 {
         ENTER;
-        bdx_firmware_endianess();
         init_txd_sizes();
         print_driver_id();
         RET(pci_register_driver(&bdx_pci_driver));
@@ -2521,3 +2525,4 @@ module_exit(bdx_module_exit);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(BDX_DRV_DESC);
+MODULE_FIRMWARE("tehuti/firmware.bin");
diff --git a/drivers/net/tehuti.h b/drivers/net/tehuti.h
index efaf84d9757..dec67e0a9ca 100644
--- a/drivers/net/tehuti.h
+++ b/drivers/net/tehuti.h
@@ -29,6 +29,7 @@
 #include <linux/if_vlan.h>
 #include <linux/interrupt.h>
 #include <linux/vmalloc.h>
+#include <linux/firmware.h>
 #include <asm/byteorder.h>
 
 /* Compile Time Switches */
diff --git a/drivers/net/tehuti_fw.h b/drivers/net/tehuti_fw.h
deleted file mode 100644
index 2c603a8a438..00000000000
--- a/drivers/net/tehuti_fw.h
+++ /dev/null
@@ -1,10712 +0,0 @@
-/*
- * Tehuti Networks(R) Network Driver
- * Copyright (C) 2007 Tehuti Networks Ltd. All rights reserved
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-/* Loading Firmware */
-/* INT_MEM Ver */
-static u32 s_firmLoad[] = {
-        0x000f0002,
-        0x40718000,
-        0x0000002d,
-        0xc0000000,
-        0x000f0002,
-        0x00718001,
-        0x0000002d,
-        0xc0800000,
-        0x000f0002,
-        0x00718002,
-        0x0000002d,
-        0xc1000000,
-        0x000f0002,
-        0x00718003,
-        0x0000002d,
-        0xc1800000,
-        0x000f0002,
-        0x00718004,
-        0x0000002d,
-        0xc2000000,
-        0x000f0002,
-        0x00718005,
-        0x0000002d,
-        0xc2800000,
-        0x000f0002,
-        0x00718006,
-        0x0000002d,
-        0xc3000000,
-        0x000f0002,
-        0x00718007,
-        0x0000002d,
-        0xc3800000,
-        0x000f0002,
-        0x00718008,
-        0x0000002d,
-        0xc4000000,
-        0x000f0002,
-        0x00718009,
-        0x0000002d,
-        0xc4800000,
-        0x000f0002,
-        0x0071800a,
-        0x0000002d,
-        0xc5000000,
-        0x000f0002,
-        0x0071800b,
-        0x0000002d,
-        0xc5800000,
-        0x000f0002,
-        0x0071800c,
-        0x0000002d,
-        0xc6000000,
-        0x000f0002,
-        0x0071800d,
-        0x0000002d,
-        0xc6800000,
-        0x000f0002,
-        0x0071800e,
-        0x0000002d,
-        0xc7000000,
-        0x000f0002,
-        0x0071800f,
-        0x0000002d,
-        0xc7800000,
-        0x000f0002,
-        0x00718010,
-        0x0000002d,
-        0xc8000000,
-        0x000f0002,
-        0x00718011,
-        0x0000002d,
-        0xc8800000,
-        0x000f0002,
-        0x00718012,
-        0x0000002d,
-        0xc9000000,
-        0x000f0002,
-        0x00718013,
-        0x0000002d,
-        0xc9800000,
-        0x000f0002,
-        0x00718014,
-        0x0000002d,
-        0xca000000,
-        0x000f0002,
-        0x00718015,