Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...

[linux-2.6-omap-h63xx.git] / drivers / staging / slicoss / slicoss.c

diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
index 8fa9490b3e2ca707320e3ccafc28d21089a07b26..bf7da8f898abe5bfaf0f3b3397ab64b2ee5823c7 100644 (file)
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -94,6 +94,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 
+#include <linux/firmware.h>
 #include <linux/types.h>
 #include <linux/dma-mapping.h>
 #include <linux/mii.h>
@@ -105,15 +106,6 @@
 
 #include <linux/uaccess.h>
 #include "slicinc.h"
-#include "gbdownload.h"
-#include "gbrcvucode.h"
-#include "oasisrcvucode.h"
-
-#ifdef DEBUG_MICROCODE
-#include "oasisdbgdownload.h"
-#else
-#include "oasisdownload.h"
-#endif
 
 #if SLIC_DUMP_ENABLED
 #include "slicdump.h"
@@ -323,7 +315,7 @@ static void slic_init_adapter(struct net_device *netdev,
        index, pslic_handle, adapter->pfree_slic_handles, pslic_handle->next);*/
        adapter->pshmem = (struct slic_shmem *)
                                        pci_alloc_consistent(adapter->pcidev,
-                                       sizeof(struct slic_shmem *),
+                                       sizeof(struct slic_shmem),
                                        &adapter->
                                        phys_shmem);
 /*
@@ -765,8 +757,7 @@ static int slic_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 #ifdef SLIC_USER_REQUEST_DUMP_ENABLED
        case SIOCSLICDUMPCARD:
                {
-                       struct adapter *adapter = (struct adapter *)
-                                                       dev->priv;
+                       struct adapter *adapter = netdev_priv(dev);
                        struct sliccard *card;
 
                        ASSERT(adapter);
@@ -1432,7 +1423,7 @@ static void slic_init_cleanup(struct adapter *adapter)
                DBG_MSG("adapter[%p] port %d pshmem[%p] FreeShmem ",
                        adapter, adapter->port, (void *) adapter->pshmem);
                pci_free_consistent(adapter->pcidev,
-                                   sizeof(struct slic_shmem *),
+                                   sizeof(struct slic_shmem),
                                    adapter->pshmem, adapter->phys_shmem);
                adapter->pshmem = NULL;
                adapter->phys_shmem = (dma_addr_t) NULL;
@@ -1685,7 +1676,7 @@ static void slic_timer_ping(ulong dev)
        struct sliccard *card;
 
        ASSERT(dev);
-       adapter = (struct adapter *)((struct net_device *) dev)->priv;
+       adapter = netdev_priv((struct net_device *)dev);
        ASSERT(adapter);
        card = adapter->card;
        ASSERT(card);
@@ -2187,6 +2178,9 @@ static void slic_card_cleanup(struct sliccard *card)
 
 static int slic_card_download_gbrcv(struct adapter *adapter)
 {
+       const struct firmware *fw;
+       const char *file = "";
+       int ret;
        __iomem struct slic_regs *slic_regs = adapter->slic_regs;
        u32 codeaddr;
        unsigned char *instruction = NULL;
@@ -2194,12 +2188,32 @@ static int slic_card_download_gbrcv(struct adapter *adapter)
 
        switch (adapter->devid) {
        case SLIC_2GB_DEVICE_ID:
-               instruction = (unsigned char *)&OasisRcvUCode[0];
-               rcvucodelen = OasisRcvUCodeLen;
+               file = "oasis_rcv.bin";
+               break;
+       case SLIC_1GB_DEVICE_ID:
+               file = "gb_rcv.bin";
+               break;
+       default:
+               ASSERT(0);
+               break;
+       }
+
+       ret = request_firmware(&fw, file, &adapter->pcidev->dev);
+       if (ret) {
+               printk(KERN_ERR "SLICOSS: Failed to load firmware %s\n", file);
+               return ret;
+       }
+
+       instruction = (unsigned char *)fw->data;
+       rcvucodelen = fw->size;
+       switch (adapter->devid) {
+       case SLIC_2GB_DEVICE_ID:
+               if (rcvucodelen != OasisRcvUCodeLen)
+                       return -EINVAL;
                break;
        case SLIC_1GB_DEVICE_ID:
-               instruction = (unsigned char *)&GBRcvUCode[0];
-               rcvucodelen = GBRcvUCodeLen;
+               if (rcvucodelen != GBRcvUCodeLen)
+                       return -EINVAL;
                break;
        default:
                ASSERT(0);
@@ -2226,13 +2240,16 @@ static int slic_card_download_gbrcv(struct adapter *adapter)
        }
 
        /* download finished */
+       release_firmware(fw);
        WRITE_REG(slic_regs->slic_rcv_wcs, SLIC_RCVWCS_FINISH, FLUSH);
-
        return 0;
 }
 
 static int slic_card_download(struct adapter *adapter)
 {
+       const struct firmware *fw;
+       const char *file = "";
+       int ret;
        u32 section;
        int thissectionsize;
        int codeaddr;
@@ -2256,6 +2273,7 @@ static int slic_card_download(struct adapter *adapter)
        case SLIC_2GB_DEVICE_ID:
 /*      DBG_MSG ("slicoss: %s devid==SLIC_2GB_DEVICE_ID sections[%x]\n",
        __func__, (uint) ONumSections); */
+               file = "slic_oasis.bin";
                numsects = ONumSections;
                for (i = 0; i < numsects; i++) {
                        sectsize[i] = OSectionSize[i];
@@ -2265,6 +2283,7 @@ static int slic_card_download(struct adapter *adapter)
        case SLIC_1GB_DEVICE_ID:
 /*              DBG_MSG ("slicoss: %s devid==SLIC_1GB_DEVICE_ID sections[%x]\n",
                __func__, (uint) MNumSections); */
+               file = "slic_mojave.bin";
                numsects = MNumSections;
                for (i = 0; i < numsects; i++) {
                        sectsize[i] = MSectionSize[i];
@@ -2275,26 +2294,33 @@ static int slic_card_download(struct adapter *adapter)
                ASSERT(0);
                break;
        }
+       ret = request_firmware(&fw, file, &adapter->pcidev->dev);
+       if (ret) {
+               printk(KERN_ERR "SLICOSS: Failed to load firmware %s\n", file);
+               return ret;
+       }
 
        ASSERT(numsects <= 3);
 
        for (section = 0; section < numsects; section++) {
                switch (adapter->devid) {
                case SLIC_2GB_DEVICE_ID:
-                       instruction = (u32 *) &OasisUCode[section][0];
+                       instruction = (u32 *)(fw->data + (SECTION_SIZE *
+                                                               section));
                        baseaddress = sectstart[section];
                        thissectionsize = sectsize[section] >> 3;
                        lastinstruct =
-                           (u32 *) &OasisUCode[section][sectsize[section] -
-                                                            8];
+                           (u32 *)(fw->data + (SECTION_SIZE * section) +
+                                       sectsize[section] - 8);
                        break;
                case SLIC_1GB_DEVICE_ID:
-                       instruction = (u32 *) &MojaveUCode[section][0];
+                       instruction = (u32 *)(fw->data + (SECTION_SIZE *
+                                                               section));
                        baseaddress = sectstart[section];
                        thissectionsize = sectsize[section] >> 3;
                        lastinstruct =
-                           (u32 *) &MojaveUCode[section][sectsize[section]
-                                                             - 8];
+                           (u32 *)(fw->data + (SECTION_SIZE * section) +
+                                       sectsize[section] - 8);
                        break;
                default:
                        ASSERT(0);
@@ -2330,10 +2356,12 @@ static int slic_card_download(struct adapter *adapter)
        for (section = 0; section < numsects; section++) {
                switch (adapter->devid) {
                case SLIC_2GB_DEVICE_ID:
-                       instruction = (u32 *)&OasisUCode[section][0];
+                       instruction = (u32 *)fw->data + (SECTION_SIZE *
+                                                               section);
                        break;
                case SLIC_1GB_DEVICE_ID:
-                       instruction = (u32 *)&MojaveUCode[section][0];
+                       instruction = (u32 *)fw->data + (SECTION_SIZE *
+                                                               section);
                        break;
                default:
                        ASSERT(0);
@@ -2375,13 +2403,13 @@ static int slic_card_download(struct adapter *adapter)
                                    thissectionsize[%x] failure[%x]\n",
                                     __func__, codeaddr, thissectionsize,
                                     failure);
-
+                               release_firmware(fw);
                                return -EIO;
                        }
                }
        }
 /*    DBG_MSG ("slicoss: Compare done\n");*/
-
+       release_firmware(fw);
        /* Everything OK, kick off the card */
        mdelay(10);
        WRITE_REG(slic_regs->slic_wcs, SLIC_WCS_START, FLUSH);
@@ -2833,9 +2861,8 @@ static u32 slic_card_locate(struct adapter *adapter)
        }
        if (!physcard) {
                /* no structure allocated for this physical card yet */
-               physcard = kmalloc(sizeof(struct physcard *), GFP_ATOMIC);
+               physcard = kzalloc(sizeof(struct physcard), GFP_ATOMIC);
                ASSERT(physcard);
-               memset(physcard, 0, sizeof(struct physcard *));
 
                DBG_MSG
                    ("\n%s Allocate a PHYSICALcard:\n    PHYSICAL_Card[%p]\n\
@@ -3136,7 +3163,7 @@ static void slic_timer_get_stats(ulong dev)
        struct slic_shmem *pshmem;
 
        ASSERT(dev);
-       adapter = (struct adapter *)((struct net_device *)dev)->priv;
+       adapter = netdev_priv((struct net_device *)dev);
        ASSERT(adapter);
        card = adapter->card;
        ASSERT(card);