p54pci: cache firmware for suspend/resume

Johannes pointed out that the driver has cache the firmware for
suspend/resume cycles.

Signed-off-by: Christian Lamparter <chunkeey@web.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c
index 6bf5123c10b2f501975a3d988233cc06cb53dbef..3373b022d91ee927339369f972847ac4f3d2dd5d 100644 (file)
--- a/drivers/net/wireless/p54/p54common.c
+++ b/drivers/net/wireless/p54/p54common.c
@@ -1524,16 +1524,24 @@ static int p54_start(struct ieee80211_hw *dev)
 
        mutex_lock(&priv->conf_mutex);
        err = priv->open(dev);
-       if (!err)
-               priv->mode = NL80211_IFTYPE_MONITOR;
+       if (err)
+               goto out;
        P54_SET_QUEUE(priv->qos_params[0], 0x0002, 0x0003, 0x0007, 47);
        P54_SET_QUEUE(priv->qos_params[1], 0x0002, 0x0007, 0x000f, 94);
        P54_SET_QUEUE(priv->qos_params[2], 0x0003, 0x000f, 0x03ff, 0);
        P54_SET_QUEUE(priv->qos_params[3], 0x0007, 0x000f, 0x03ff, 0);
        err = p54_set_edcf(dev);
-       if (!err)
-               err = p54_init_stats(dev);
+       if (err)
+               goto out;
+       err = p54_init_stats(dev);
+       if (err)
+               goto out;
+       err = p54_setup_mac(dev, P54_FILTER_TYPE_NONE, NULL);
+       if (err)
+               goto out;
+       priv->mode = NL80211_IFTYPE_MONITOR;
 
+out:
        mutex_unlock(&priv->conf_mutex);
        return err;
 }

diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c
index c4a868ae6d6b0efef665bdfa42184b35fd21e807..d21c509325fee92db982611747820c00ce254ace 100644 (file)
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
@@ -47,7 +47,6 @@ MODULE_DEVICE_TABLE(pci, p54p_table);
 static int p54p_upload_firmware(struct ieee80211_hw *dev)
 {
        struct p54p_priv *priv = dev->priv;
-       const struct firmware *fw_entry = NULL;
        __le32 reg;
        int err;
        __le32 *data;
@@ -73,23 +72,15 @@ static int p54p_upload_firmware(struct ieee80211_hw *dev)
        P54P_WRITE(ctrl_stat, reg);
        wmb();
 
-       err = request_firmware(&fw_entry, "isl3886pci", &priv->pdev->dev);
-       if (err) {
-               printk(KERN_ERR "%s (p54pci): cannot find firmware "
-                      "(isl3886pci)\n", pci_name(priv->pdev));
-               err = request_firmware(&fw_entry, "isl3886", &priv->pdev->dev);
-               if (err)
-                       return err;
-       }
+       /* wait for the firmware to reset properly */
+       mdelay(10);
 
-       err = p54_parse_firmware(dev, fw_entry);
-       if (err) {
-               release_firmware(fw_entry);
+       err = p54_parse_firmware(dev, priv->firmware);
+       if (err)
                return err;
-       }
 
-       data = (__le32 *) fw_entry->data;
-       remains = fw_entry->size;
+       data = (__le32 *) priv->firmware->data;
+       remains = priv->firmware->size;
        device_addr = ISL38XX_DEV_FIRMWARE_ADDR;
        while (remains) {
                u32 i = 0;
@@ -107,8 +98,6 @@ static int p54p_upload_firmware(struct ieee80211_hw *dev)
                P54P_READ(int_enable);
        }
 
-       release_firmware(fw_entry);
-
        reg = P54P_READ(ctrl_stat);
        reg &= cpu_to_le32(~ISL38XX_CTRL_STAT_CLKRUN);
        reg &= cpu_to_le32(~ISL38XX_CTRL_STAT_RESET);
@@ -500,15 +489,14 @@ static int __devinit p54p_probe(struct pci_dev *pdev,
        if (mem_len < sizeof(struct p54p_csr)) {
                printk(KERN_ERR "%s (p54pci): Too short PCI resources\n",
                       pci_name(pdev));
-               pci_disable_device(pdev);
-               return err;
+               goto err_disable_dev;
        }
 
        err = pci_request_regions(pdev, "p54pci");
        if (err) {
                printk(KERN_ERR "%s (p54pci): Cannot obtain PCI resources\n",
                       pci_name(pdev));
-               return err;
+               goto err_disable_dev;
        }
 
        if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) ||
@@ -561,6 +549,17 @@ static int __devinit p54p_probe(struct pci_dev *pdev,
        spin_lock_init(&priv->lock);
        tasklet_init(&priv->rx_tasklet, p54p_rx_tasklet, (unsigned long)dev);
 
+       err = request_firmware(&priv->firmware, "isl3886pci",
+                              &priv->pdev->dev);
+       if (err) {
+               printk(KERN_ERR "%s (p54pci): cannot find firmware "
+                       "(isl3886pci)\n", pci_name(priv->pdev));
+               err = request_firmware(&priv->firmware, "isl3886",
+                                      &priv->pdev->dev);
+               if (err)
+                       goto err_free_common;
+       }
+
        err = p54p_open(dev);
        if (err)
                goto err_free_common;
@@ -579,6 +578,7 @@ static int __devinit p54p_probe(struct pci_dev *pdev,
        return 0;
 
  err_free_common:
+       release_firmware(priv->firmware);
        p54_free_common(dev);
        pci_free_consistent(pdev, sizeof(*priv->ring_control),
                            priv->ring_control, priv->ring_control_dma);
@@ -592,6 +592,7 @@ static int __devinit p54p_probe(struct pci_dev *pdev,
 
  err_free_reg:
        pci_release_regions(pdev);
+ err_disable_dev:
        pci_disable_device(pdev);
        return err;
 }
@@ -606,6 +607,7 @@ static void __devexit p54p_remove(struct pci_dev *pdev)
 
        ieee80211_unregister_hw(dev);
        priv = dev->priv;
+       release_firmware(priv->firmware);
        pci_free_consistent(pdev, sizeof(*priv->ring_control),
                            priv->ring_control, priv->ring_control_dma);
        p54_free_common(dev);

diff --git a/drivers/net/wireless/p54/p54pci.h b/drivers/net/wireless/p54/p54pci.h
index 4a6778070afc1fc3da1a2cbc9c9d598db9d07e75..fbb683953fb258b8949627398fff499fd21355fd 100644 (file)
--- a/drivers/net/wireless/p54/p54pci.h
+++ b/drivers/net/wireless/p54/p54pci.h
@@ -93,7 +93,7 @@ struct p54p_priv {
        struct pci_dev *pdev;
        struct p54p_csr __iomem *map;
        struct tasklet_struct rx_tasklet;
-
+       const struct firmware *firmware;
        spinlock_t lock;
        struct p54p_ring_control *ring_control;
        dma_addr_t ring_control_dma;