Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 27 insertions, 36 deletions

diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
index f46138ab38b6..5d1d07645132 100644
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
@@ -165,8 +165,7 @@ static uint32_t fpga_tx(struct solos_card *);
 static irqreturn_t solos_irq(int irq, void *dev_id);
 static struct atm_vcc* find_vcc(struct atm_dev *dev, short vpi, int vci);
 static int list_vccs(int vci);
-static void release_vccs(struct atm_dev *dev);
-static int atm_init(struct solos_card *);
+static int atm_init(struct solos_card *, struct device *);
 static void atm_remove(struct solos_card *);
 static int send_command(struct solos_card *card, int dev, const char *buf, size_t size);
 static void solos_bh(unsigned long);
@@ -384,7 +383,6 @@ static int process_status(struct solos_card *card, int port, struct sk_buff *skb
         /* Anything but 'Showtime' is down */
         if (strcmp(state_str, "Showtime")) {
                 atm_dev_signal_change(card->atmdev[port], ATM_PHY_SIG_LOST);
-                release_vccs(card->atmdev[port]);
                 dev_info(&card->dev->dev, "Port %d: %s\n", port, state_str);
                 return 0;
         }
@@ -529,7 +527,6 @@ static int flash_upgrade(struct solos_card *card, int chip)
 {
         const struct firmware *fw;
         const char *fw_name;
-        uint32_t data32 = 0;
         int blocksize = 0;
         int numblocks = 0;
         int offset;
@@ -578,7 +575,7 @@ static int flash_upgrade(struct solos_card *card, int chip)
         
         dev_info(&card->dev->dev, "Changing FPGA to Update mode\n");
         iowrite32(1, card->config_regs + FPGA_MODE);
-        data32 = ioread32(card->config_regs + FPGA_MODE); 
+        (void) ioread32(card->config_regs + FPGA_MODE); 
 
         /* Set mode to Chip Erase */
         if(chip == 0 || chip == 2)
@@ -697,7 +694,7 @@ void solos_bh(unsigned long card_arg)
                                               size);
                         }
                         if (atmdebug) {
-                                dev_info(&card->dev->dev, "Received: device %d\n", port);
+                                dev_info(&card->dev->dev, "Received: port %d\n", port);
                                 dev_info(&card->dev->dev, "size: %d VPI: %d VCI: %d\n",
                                          size, le16_to_cpu(header->vpi),
                                          le16_to_cpu(header->vci));
@@ -710,8 +707,8 @@ void solos_bh(unsigned long card_arg)
                                                le16_to_cpu(header->vci));
                                 if (!vcc) {
                                         if (net_ratelimit())
-                                                dev_warn(&card->dev->dev, "Received packet for unknown VCI.VPI %d.%d on port %d\n",
-                                                         le16_to_cpu(header->vci), le16_to_cpu(header->vpi),
+                                                dev_warn(&card->dev->dev, "Received packet for unknown VPI.VCI %d.%d on port %d\n",
+                                                         le16_to_cpu(header->vpi), le16_to_cpu(header->vci),
                                                          port);
                                         continue;
                                 }
@@ -830,28 +827,6 @@ static int list_vccs(int vci)
         return num_found;
 }
 
-static void release_vccs(struct atm_dev *dev)
-{
-        int i;
-
-        write_lock_irq(&vcc_sklist_lock);
-        for (i = 0; i < VCC_HTABLE_SIZE; i++) {
-                struct hlist_head *head = &vcc_hash[i];
-                struct hlist_node *node, *tmp;
-                struct sock *s;
-                struct atm_vcc *vcc;
-
-                sk_for_each_safe(s, node, tmp, head) {
-                        vcc = atm_sk(s);
-                        if (vcc->dev == dev) {
-                                vcc_release_async(vcc, -EPIPE);
-                                sk_del_node_init(s);
-                        }
-                }
-        }
-        write_unlock_irq(&vcc_sklist_lock);
-}
-
 
 static int popen(struct atm_vcc *vcc)
 {
@@ -866,8 +841,9 @@ static int popen(struct atm_vcc *vcc)
         }
 
         skb = alloc_skb(sizeof(*header), GFP_ATOMIC);
-        if (!skb && net_ratelimit()) {
-                dev_warn(&card->dev->dev, "Failed to allocate sk_buff in popen()\n");
+        if (!skb) {
+                if (net_ratelimit())
+                        dev_warn(&card->dev->dev, "Failed to allocate sk_buff in popen()\n");
                 return -ENOMEM;
         }
         header = (void *)skb_put(skb, sizeof(*header));
@@ -1017,8 +993,15 @@ static uint32_t fpga_tx(struct solos_card *card)
 
                         /* Clean up and free oldskb now it's gone */
                         if (atmdebug) {
+                                struct pkt_hdr *header = (void *)oldskb->data;
+                                int size = le16_to_cpu(header->size);
+
+                                skb_pull(oldskb, sizeof(*header));
                                 dev_info(&card->dev->dev, "Transmitted: port %d\n",
                                          port);
+                                dev_info(&card->dev->dev, "size: %d VPI: %d VCI: %d\n",
+                                         size, le16_to_cpu(header->vpi),
+                                         le16_to_cpu(header->vci));
                                 print_buffer(oldskb);
                         }
 
@@ -1161,6 +1144,14 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
         dev_info(&dev->dev, "Solos FPGA Version %d.%02d svn-%d\n",
                  major_ver, minor_ver, fpga_ver);
 
+        if (fpga_ver < 37 && (fpga_upgrade || firmware_upgrade ||
+                              db_fpga_upgrade || db_firmware_upgrade)) {
+                dev_warn(&dev->dev,
+                         "FPGA too old; cannot upgrade flash. Use JTAG.\n");
+                fpga_upgrade = firmware_upgrade = 0;
+                db_fpga_upgrade = db_firmware_upgrade = 0;
+        }
+
         if (card->fpga_version >= DMA_SUPPORTED){
                 card->using_dma = 1;
         } else {
@@ -1202,7 +1193,7 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
         if (db_firmware_upgrade)
                 flash_upgrade(card, 3);
 
-        err = atm_init(card);
+        err = atm_init(card, &dev->dev);
         if (err)
                 goto out_free_irq;
 
@@ -1225,7 +1216,7 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
         return err;
 }
 
-static int atm_init(struct solos_card *card)
+static int atm_init(struct solos_card *card, struct device *parent)
 {
         int i;
 
@@ -1236,7 +1227,7 @@ static int atm_init(struct solos_card *card)
                 skb_queue_head_init(&card->tx_queue[i]);
                 skb_queue_head_init(&card->cli_queue[i]);
 
-                card->atmdev[i] = atm_dev_register("solos-pci", &fpga_ops, -1, NULL);
+                card->atmdev[i] = atm_dev_register("solos-pci", parent, &fpga_ops, -1, NULL);
                 if (!card->atmdev[i]) {
                         dev_err(&card->dev->dev, "Could not register ATM device %d\n", i);
                         atm_remove(card);
@@ -1253,7 +1244,7 @@ static int atm_init(struct solos_card *card)
                 card->atmdev[i]->ci_range.vci_bits = 16;
                 card->atmdev[i]->dev_data = card;
                 card->atmdev[i]->phy_data = (void *)(unsigned long)i;
-                atm_dev_signal_change(card->atmdev[i], ATM_PHY_SIG_UNKNOWN);
+                atm_dev_signal_change(card->atmdev[i], ATM_PHY_SIG_FOUND);
 
                 skb = alloc_skb(sizeof(*header), GFP_ATOMIC);
                 if (!skb) {