mempolicy: ERR_PTR dereference in mpol_shared_policy_init()
[safe/jmp/linux-2.6] / drivers / atm / solos-pci.c
index 21c73b1..ded76c4 100644 (file)
@@ -40,6 +40,7 @@
 #include <linux/firmware.h>
 #include <linux/ctype.h>
 #include <linux/swab.h>
+#include <linux/slab.h>
 
 #define VERSION "0.07"
 #define PTAG "solos-pci"
 #define RX_DMA_ADDR(port)      (0x30 + (4 * (port)))
 
 #define DATA_RAM_SIZE  32768
-#define BUF_SIZE       4096
+#define BUF_SIZE       2048
+#define OLD_BUF_SIZE   4096 /* For FPGA versions <= 2*/
 #define FPGA_PAGE      528 /* FPGA flash page size*/
 #define SOLOS_PAGE     512 /* Solos flash page size*/
 #define FPGA_BLOCK     (FPGA_PAGE * 8) /* FPGA flash block size*/
 #define SOLOS_BLOCK    (SOLOS_PAGE * 8) /* Solos flash block size*/
 
-#define RX_BUF(card, nr) ((card->buffers) + (nr)*BUF_SIZE*2)
-#define TX_BUF(card, nr) ((card->buffers) + (nr)*BUF_SIZE*2 + BUF_SIZE)
+#define RX_BUF(card, nr) ((card->buffers) + (nr)*(card->buffer_size)*2)
+#define TX_BUF(card, nr) ((card->buffers) + (nr)*(card->buffer_size)*2 + (card->buffer_size))
+#define FLASH_BUF ((card->buffers) + 4*(card->buffer_size)*2)
 
 #define RX_DMA_SIZE    2048
 
+#define FPGA_VERSION(a,b) (((a) << 8) + (b))
+#define LEGACY_BUFFERS 2
+#define DMA_SUPPORTED  4
+
+static int reset = 0;
 static int atmdebug = 0;
 static int firmware_upgrade = 0;
 static int fpga_upgrade = 0;
+static int db_firmware_upgrade = 0;
+static int db_fpga_upgrade = 0;
 
 struct pkt_hdr {
        __le16 size;
@@ -115,6 +125,8 @@ struct solos_card {
        wait_queue_head_t param_wq;
        wait_queue_head_t fw_wq;
        int using_dma;
+       int fpga_version;
+       int buffer_size;
 };
 
 
@@ -131,12 +143,21 @@ MODULE_AUTHOR("Traverse Technologies <support@traverse.com.au>");
 MODULE_DESCRIPTION("Solos PCI driver");
 MODULE_VERSION(VERSION);
 MODULE_LICENSE("GPL");
+MODULE_FIRMWARE("solos-FPGA.bin");
+MODULE_FIRMWARE("solos-Firmware.bin");
+MODULE_FIRMWARE("solos-db-FPGA.bin");
+MODULE_PARM_DESC(reset, "Reset Solos chips on startup");
 MODULE_PARM_DESC(atmdebug, "Print ATM data");
 MODULE_PARM_DESC(firmware_upgrade, "Initiate Solos firmware upgrade");
 MODULE_PARM_DESC(fpga_upgrade, "Initiate FPGA upgrade");
+MODULE_PARM_DESC(db_firmware_upgrade, "Initiate daughter board Solos firmware upgrade");
+MODULE_PARM_DESC(db_fpga_upgrade, "Initiate daughter board FPGA upgrade");
+module_param(reset, int, 0444);
 module_param(atmdebug, int, 0644);
 module_param(firmware_upgrade, int, 0444);
 module_param(fpga_upgrade, int, 0444);
+module_param(db_firmware_upgrade, int, 0444);
+module_param(db_fpga_upgrade, int, 0444);
 
 static void fpga_queue(struct solos_card *card, int port, struct sk_buff *skb,
                       struct atm_vcc *vcc);
@@ -311,14 +332,16 @@ static char *next_string(struct sk_buff *skb)
  * for the information therein. Fields are....
  *
  *     packet version
- *     TxBitRate       (version >= 1)
  *     RxBitRate       (version >= 1)
+ *     TxBitRate       (version >= 1)
  *     State           (version >= 1)
+ *     LocalSNRMargin  (version >= 1)
+ *     LocalLineAttn   (version >= 1)
  */       
 static int process_status(struct solos_card *card, int port, struct sk_buff *skb)
 {
-       char *str, *end, *state_str;
-       int ver, rate_up, rate_down, state;
+       char *str, *end, *state_str, *snr, *attn;
+       int ver, rate_up, rate_down;
 
        if (!card->atmdev[port])
                return -ENODEV;
@@ -337,46 +360,48 @@ static int process_status(struct solos_card *card, int port, struct sk_buff *skb
        str = next_string(skb);
        if (!str)
                return -EIO;
-       rate_up = simple_strtol(str, &end, 10);
+       if (!strcmp(str, "ERROR")) {
+               dev_dbg(&card->dev->dev, "Status packet indicated Solos error on port %d (starting up?)\n",
+                        port);
+               return 0;
+       }
+
+       rate_down = simple_strtol(str, &end, 10);
        if (*end)
                return -EIO;
 
        str = next_string(skb);
        if (!str)
                return -EIO;
-       rate_down = simple_strtol(str, &end, 10);
+       rate_up = simple_strtol(str, &end, 10);
        if (*end)
                return -EIO;
 
        state_str = next_string(skb);
        if (!state_str)
                return -EIO;
-       if (!strcmp(state_str, "Showtime"))
-               state = ATM_PHY_SIG_FOUND;
-       else {
-               state = ATM_PHY_SIG_LOST;
+
+       /* Anything but 'Showtime' is down */
+       if (strcmp(state_str, "Showtime")) {
+               card->atmdev[port]->signal = ATM_PHY_SIG_LOST;
                release_vccs(card->atmdev[port]);
+               dev_info(&card->dev->dev, "Port %d: %s\n", port, state_str);
+               return 0;
        }
 
-       if (state == ATM_PHY_SIG_LOST) {
-               dev_info(&card->dev->dev, "Port %d ATM state: %s\n",
-                        port, state_str);
-       } else {
-               char *snr, *attn;
-
-               snr = next_string(skb);
-               if (!str)
-                       return -EIO;
-               attn = next_string(skb);
-               if (!attn)
-                       return -EIO;
-
-               dev_info(&card->dev->dev, "Port %d: %s (%d/%d kb/s%s%s%s%s)\n",
-                        port, state_str, rate_down/1000, rate_up/1000,
-                        snr[0]?", SNR ":"", snr, attn[0]?", Attn ":"", attn);
-       }               
+       snr = next_string(skb);
+       if (!snr)
+               return -EIO;
+       attn = next_string(skb);
+       if (!attn)
+               return -EIO;
+
+       dev_info(&card->dev->dev, "Port %d: %s @%d/%d kb/s%s%s%s%s\n",
+                port, state_str, rate_down/1000, rate_up/1000,
+                snr[0]?", SNR ":"", snr, attn[0]?", Attn ":"", attn);
+       
        card->atmdev[port]->link_rate = rate_down / 424;
-       card->atmdev[port]->signal = state;
+       card->atmdev[port]->signal = ATM_PHY_SIG_FOUND;
 
        return 0;
 }
@@ -507,12 +532,37 @@ static int flash_upgrade(struct solos_card *card, int chip)
        int numblocks = 0;
        int offset;
 
-       if (chip == 0) {
+       switch (chip) {
+       case 0:
                fw_name = "solos-FPGA.bin";
                blocksize = FPGA_BLOCK;
-       } else {
+               break;
+       case 1:
                fw_name = "solos-Firmware.bin";
                blocksize = SOLOS_BLOCK;
+               break;
+       case 2:
+               if (card->fpga_version > LEGACY_BUFFERS){
+                       fw_name = "solos-db-FPGA.bin";
+                       blocksize = FPGA_BLOCK;
+               } else {
+                       dev_info(&card->dev->dev, "FPGA version doesn't support"
+                                       " daughter board upgrades\n");
+                       return -EPERM;
+               }
+               break;
+       case 3:
+               if (card->fpga_version > LEGACY_BUFFERS){
+                       fw_name = "solos-Firmware.bin";
+                       blocksize = SOLOS_BLOCK;
+               } else {
+                       dev_info(&card->dev->dev, "FPGA version doesn't support"
+                                       " daughter board upgrades\n");
+                       return -EPERM;
+               }
+               break;
+       default:
+               return -ENODEV;
        }
 
        if (request_firmware(&fw, fw_name, &card->dev->dev))
@@ -529,8 +579,10 @@ static int flash_upgrade(struct solos_card *card, int chip)
        data32 = ioread32(card->config_regs + FPGA_MODE); 
 
        /* Set mode to Chip Erase */
-       dev_info(&card->dev->dev, "Set FPGA Flash mode to %s Chip Erase\n",
-                chip?"Solos":"FPGA");
+       if(chip == 0 || chip == 2)
+               dev_info(&card->dev->dev, "Set FPGA Flash mode to FPGA Chip Erase\n");
+       if(chip == 1 || chip == 3)
+               dev_info(&card->dev->dev, "Set FPGA Flash mode to Solos Chip Erase\n");
        iowrite32((chip * 2), card->config_regs + FLASH_MODE);
 
 
@@ -550,7 +602,10 @@ static int flash_upgrade(struct solos_card *card, int chip)
                /* Copy block to buffer, swapping each 16 bits */
                for(i = 0; i < blocksize; i += 4) {
                        uint32_t word = swahb32p((uint32_t *)(fw->data + offset + i));
-                       iowrite32(word, RX_BUF(card, 3) + i);
+                       if(card->fpga_version > LEGACY_BUFFERS)
+                               iowrite32(word, FLASH_BUF + i);
+                       else
+                               iowrite32(word, RX_BUF(card, 3) + i);
                }
 
                /* Specify block number and then trigger flash write */
@@ -623,6 +678,10 @@ void solos_bh(unsigned long card_arg)
                                memcpy_fromio(header, RX_BUF(card, port), sizeof(*header));
 
                                size = le16_to_cpu(header->size);
+                               if (size > (card->buffer_size - sizeof(*header))){
+                                       dev_warn(&card->dev->dev, "Invalid buffer size\n");
+                                       continue;
+                               }
 
                                skb = alloc_skb(size + 1, GFP_ATOMIC);
                                if (!skb) {
@@ -660,7 +719,11 @@ void solos_bh(unsigned long card_arg)
                                break;
 
                        case PKT_STATUS:
-                               process_status(card, port, skb);
+                               if (process_status(card, port, skb) &&
+                                   net_ratelimit()) {
+                                       dev_warn(&card->dev->dev, "Bad status packet of %d bytes on port %d:\n", skb->len, port);
+                                       print_buffer(skb);
+                               }
                                dev_kfree_skb_any(skb);
                                break;
 
@@ -1028,7 +1091,7 @@ static struct atmdev_ops fpga_ops = {
 
 static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
 {
-       int err, i;
+       int err;
        uint16_t fpga_ver;
        uint8_t major_ver, minor_ver;
        uint32_t data32;
@@ -1048,7 +1111,7 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
                goto out;
        }
 
-       err = pci_set_dma_mask(dev, DMA_32BIT_MASK);
+       err = pci_set_dma_mask(dev, DMA_BIT_MASK(32));
        if (err) {
                dev_warn(&dev->dev, "Failed to set 32-bit DMA mask\n");
                goto out;
@@ -1071,24 +1134,36 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
                goto out_unmap_config;
        }
 
-       //Fill Config Mem with zeros
-       for(i = 0; i < 128; i += 4)
-               iowrite32(0, card->config_regs + i);
+       if (reset) {
+               iowrite32(1, card->config_regs + FPGA_MODE);
+               data32 = ioread32(card->config_regs + FPGA_MODE); 
 
-       //Set RX empty flags
-       iowrite32(0xF0, card->config_regs + FLAGS_ADDR);
+               iowrite32(0, card->config_regs + FPGA_MODE);
+               data32 = ioread32(card->config_regs + FPGA_MODE); 
+       }
 
        data32 = ioread32(card->config_regs + FPGA_VER);
        fpga_ver = (data32 & 0x0000FFFF);
        major_ver = ((data32 & 0xFF000000) >> 24);
        minor_ver = ((data32 & 0x00FF0000) >> 16);
+       card->fpga_version = FPGA_VERSION(major_ver,minor_ver);
+       if (card->fpga_version > LEGACY_BUFFERS)
+               card->buffer_size = BUF_SIZE;
+       else
+               card->buffer_size = OLD_BUF_SIZE;
        dev_info(&dev->dev, "Solos FPGA Version %d.%02d svn-%d\n",
                 major_ver, minor_ver, fpga_ver);
 
-       if (fpga_ver > 27)
+       if (card->fpga_version >= DMA_SUPPORTED){
                card->using_dma = 1;
+       } else {
+               card->using_dma = 0;
+               /* Set RX empty flag for all ports */
+               iowrite32(0xF0, card->config_regs + FLAGS_ADDR);
+       }
 
-       card->nr_ports = 2; /* FIXME: Detect daughterboard */
+       data32 = ioread32(card->config_regs + PORTS);
+       card->nr_ports = (data32 & 0x000000FF);
 
        pci_set_drvdata(dev, card);
 
@@ -1114,6 +1189,12 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
        if (firmware_upgrade)
                flash_upgrade(card, 1);
 
+       if (db_fpga_upgrade)
+               flash_upgrade(card, 2);
+
+       if (db_firmware_upgrade)
+               flash_upgrade(card, 3);
+
        err = atm_init(card);
        if (err)
                goto out_free_irq;
@@ -1133,6 +1214,7 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
  out_release_regions:
        pci_release_regions(dev);
  out:
+       kfree(card);
        return err;
 }
 
@@ -1190,10 +1272,28 @@ static void atm_remove(struct solos_card *card)
 
        for (i = 0; i < card->nr_ports; i++) {
                if (card->atmdev[i]) {
+                       struct sk_buff *skb;
+
                        dev_info(&card->dev->dev, "Unregistering ATM device %d\n", card->atmdev[i]->number);
 
                        sysfs_remove_group(&card->atmdev[i]->class_dev.kobj, &solos_attr_group);
                        atm_dev_deregister(card->atmdev[i]);
+
+                       skb = card->rx_skb[i];
+                       if (skb) {
+                               pci_unmap_single(card->dev, SKB_CB(skb)->dma_addr,
+                                                RX_DMA_SIZE, PCI_DMA_FROMDEVICE);
+                               dev_kfree_skb(skb);
+                       }
+                       skb = card->tx_skb[i];
+                       if (skb) {
+                               pci_unmap_single(card->dev, SKB_CB(skb)->dma_addr,
+                                                skb->len, PCI_DMA_TODEVICE);
+                               dev_kfree_skb(skb);
+                       }
+                       while ((skb = skb_dequeue(&card->tx_queue[i])))
+                               dev_kfree_skb(skb);
                }
        }
 }
@@ -1201,13 +1301,23 @@ static void atm_remove(struct solos_card *card)
 static void fpga_remove(struct pci_dev *dev)
 {
        struct solos_card *card = pci_get_drvdata(dev);
+       
+       /* Disable IRQs */
+       iowrite32(0, card->config_regs + IRQ_EN_ADDR);
+
+       /* Reset FPGA */
+       iowrite32(1, card->config_regs + FPGA_MODE);
+       (void)ioread32(card->config_regs + FPGA_MODE); 
 
        atm_remove(card);
 
-       iowrite32(0, card->config_regs + IRQ_EN_ADDR);
        free_irq(dev->irq, card);
        tasklet_kill(&card->tlet);
 
+       /* Release device from reset */
+       iowrite32(0, card->config_regs + FPGA_MODE);
+       (void)ioread32(card->config_regs + FPGA_MODE); 
+
        pci_iounmap(dev, card->buffers);
        pci_iounmap(dev, card->config_regs);