Merge branch 'master' of git://git.infradead.org/users/dwmw2/solos-2.6

diff --combined drivers/atm/solos-pci.c
index 307321b32cb35f43396f26631ce49069f59ce529,6c828347c9cc4a437f0e6d257158e57f3d958812..c5f5186d62a3160404a50b5819c440239b311870
--- 1/drivers/atm/solos-pci.c
--- 2/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
@@@ -59,21 -59,29 +59,29 @@@
  #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;
@@@ -116,6 -124,8 +124,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;
  };
  
  
@@@ -136,10 -146,14 +146,14 @@@ MODULE_PARM_DESC(reset, "Reset Solos ch
  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);
@@@ -372,7 -386,7 +386,7 @@@ static int process_status(struct solos_
        }
  
        snr = next_string(skb);
 -      if (!str)
 +      if (!snr)
                return -EIO;
        attn = next_string(skb);
        if (!attn)
@@@ -517,10 -531,32 +531,32 @@@ static int flash_upgrade(struct solos_c
        if (chip == 0) {
                fw_name = "solos-FPGA.bin";
                blocksize = FPGA_BLOCK;
-       } else {
+       } 
+       
+       if (chip == 1) {
                fw_name = "solos-Firmware.bin";
                blocksize = SOLOS_BLOCK;
        }
+       
+       if (chip == 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;
+               }
+       }
+       
+       if (chip == 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;
+               }
+       }
  
        if (request_firmware(&fw, fw_name, &card->dev->dev))
                return -ENOENT;
@@@ -536,8 -572,10 +572,10 @@@
        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);
  
  
@@@ -557,7 -595,10 +595,10 @@@
                /* 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 */
@@@ -630,6 -671,10 +671,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) {
@@@ -1059,7 -1104,7 +1104,7 @@@ static int fpga_probe(struct pci_dev *d
                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;
@@@ -1094,12 -1139,18 +1139,18 @@@
        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 (0 && fpga_ver > 27)
+       if (card->fpga_version >= DMA_SUPPORTED){
                card->using_dma = 1;
-       else {
+       } else {
+               card->using_dma = 0;
                /* Set RX empty flag for all ports */
                iowrite32(0xF0, card->config_regs + FLAGS_ADDR);
        }
@@@ -1131,6 -1182,12 +1182,12 @@@
        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;
@@@ -1150,7 -1207,6 +1207,7 @@@
   out_release_regions:
        pci_release_regions(dev);
   out:
 +      kfree(card);
        return err;
  }