246 files changed, 12880 insertions, 3193 deletions

diff --git a/drivers/base/class.c b/drivers/base/class.c
index 0ef00e8d4153..e085af0ff94f 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -140,7 +140,6 @@ int class_register(struct class *cls)
 
         pr_debug("device class '%s': registering\n", cls->name);
 
-        INIT_LIST_HEAD(&cls->children);
         INIT_LIST_HEAD(&cls->devices);
         INIT_LIST_HEAD(&cls->interfaces);
         kset_init(&cls->class_dirs);
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 8ce6de5a7e28..937e8258981d 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -53,11 +53,13 @@ int register_memory_notifier(struct notifier_block *nb)
 {
         return blocking_notifier_chain_register(&memory_chain, nb);
 }
+EXPORT_SYMBOL(register_memory_notifier);
 
 void unregister_memory_notifier(struct notifier_block *nb)
 {
         blocking_notifier_chain_unregister(&memory_chain, nb);
 }
+EXPORT_SYMBOL(unregister_memory_notifier);
 
 /*
  * register_memory - Setup a sysfs device for a memory block
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 7b76fd3b93a4..45cc3d9eacb8 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -418,7 +418,7 @@ void __suspend_report_result(const char *function, void *fn, int ret)
 {
         if (ret) {
                 printk(KERN_ERR "%s(): ", function);
-                print_fn_descriptor_symbol("%s() returns ", (unsigned long)fn);
+                print_fn_descriptor_symbol("%s returns ", fn);
                 printk("%d\n", ret);
         }
 }
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 5dce3877eee5..595a925c62a9 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -196,6 +196,7 @@ config ESPSERIAL
 config MOXA_INTELLIO
         tristate "Moxa Intellio support"
         depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
+        select FW_LOADER
         help
           Say Y here if you have a Moxa Intellio multiport serial card.
 
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 5a5455585c1d..192688344ed2 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -2352,10 +2352,16 @@ static int __devinit ipmi_of_probe(struct of_device *dev,
 
         info->si_type           = (enum si_type) match->data;
         info->addr_source       = "device-tree";
-        info->io_setup          = mem_setup;
         info->irq_setup         = std_irq_setup;
 
-        info->io.addr_type      = IPMI_MEM_ADDR_SPACE;
+        if (resource.flags & IORESOURCE_IO) {
+                info->io_setup          = port_setup;
+                info->io.addr_type      = IPMI_IO_ADDR_SPACE;
+        } else {
+                info->io_setup          = mem_setup;
+                info->io.addr_type      = IPMI_MEM_ADDR_SPACE;
+        }
+
         info->io.addr_data      = resource.start;
 
         info->io.regsize        = regsize ? *regsize : DEFAULT_REGSIZE;
diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c
index 19105ec203f7..8096389b0dc2 100644
--- a/drivers/char/n_tty.c
+++ b/drivers/char/n_tty.c
@@ -282,16 +282,20 @@ static int opost(unsigned char c, struct tty_struct *tty)
                         if (O_ONLRET(tty))
                                 tty->column = 0;
                         if (O_ONLCR(tty)) {
-                                if (space < 2)
+                                if (space < 2) {
+                                        unlock_kernel();
                                         return -1;
+                                }
                                 tty_put_char(tty, '\r');
                                 tty->column = 0;
                         }
                         tty->canon_column = tty->column;
                         break;
                 case '\r':
-                        if (O_ONOCR(tty) && tty->column == 0)
+                        if (O_ONOCR(tty) && tty->column == 0) {
+                                unlock_kernel();
                                 return 0;
+                        }
                         if (O_OCRNL(tty)) {
                                 c = '\n';
                                 if (O_ONLRET(tty))
@@ -303,10 +307,13 @@ static int opost(unsigned char c, struct tty_struct *tty)
                 case '\t':
                         spaces = 8 - (tty->column & 7);
                         if (O_TABDLY(tty) == XTABS) {
-                                if (space < spaces)
+                                if (space < spaces) {
+                                        unlock_kernel();
                                         return -1;
+                                }
                                 tty->column += spaces;
                                 tty->ops->write(tty, "        ", spaces);
+                                unlock_kernel();
                                 return 0;
                         }
                         tty->column += spaces;
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c
index 2001b0e52dc6..55c1653be00c 100644
--- a/drivers/char/synclink_gt.c
+++ b/drivers/char/synclink_gt.c
@@ -916,7 +916,7 @@ static int put_char(struct tty_struct *tty, unsigned char ch)
 {
         struct slgt_info *info = tty->driver_data;
         unsigned long flags;
-        int ret;
+        int ret = 0;
 
         if (sanity_check(info, tty->name, "put_char"))
                 return 0;
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 49c1a2267a55..e94bee032314 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -1215,10 +1215,11 @@ int tty_check_change(struct tty_struct *tty)
 
         if (!tty->pgrp) {
                 printk(KERN_WARNING "tty_check_change: tty->pgrp == NULL!\n");
-                goto out;
+                goto out_unlock;
         }
         if (task_pgrp(current) == tty->pgrp)
-                goto out;
+                goto out_unlock;
+        spin_unlock_irqrestore(&tty->ctrl_lock, flags);
         if (is_ignored(SIGTTOU))
                 goto out;
         if (is_current_pgrp_orphaned()) {
@@ -1229,6 +1230,8 @@ int tty_check_change(struct tty_struct *tty)
         set_thread_flag(TIF_SIGPENDING);
         ret = -ERESTARTSYS;
 out:
+        return ret;
+out_unlock:
         spin_unlock_irqrestore(&tty->ctrl_lock, flags);
         return ret;
 }
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index f702f9152ce6..b4f3aefa12b6 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -1,8 +1,6 @@
 #
 # IDE ATA ATAPI Block device driver configuration
 #
-# Andre Hedrick <andre@linux-ide.org>
-#
 
 # Select HAVE_IDE if IDE is supported
 config HAVE_IDE
@@ -335,7 +333,7 @@ config BLK_DEV_CMD640
           This driver will work automatically in PCI based systems (most new
           systems have PCI slots). But if your system uses VESA local bus
           (VLB) instead of PCI, you must also supply a kernel boot parameter
-          to enable the CMD640 bugfix/support: "ide0=cmd640_vlb". (Try "man
+          to enable the CMD640 bugfix/support: "cmd640.probe_vlb". (Try "man
           bootparam" or see the documentation of your boot loader about how to
           pass options to the kernel.)
 
@@ -457,27 +455,11 @@ config BLK_DEV_ALI15X3
           onboard chipsets.  It also tests for Simplex mode and enables
           normal dual channel support.
 
-          If you say Y here, you also need to say Y to "Use DMA by default
-          when available", above.  Please read the comments at the top of
+          Please read the comments at the top of
           <file:drivers/ide/pci/alim15x3.c>.
 
           If unsure, say N.
 
-config WDC_ALI15X3
-        bool "ALI M15x3 WDC support (DANGEROUS)"
-        depends on BLK_DEV_ALI15X3
-        ---help---
-          This allows for UltraDMA support for WDC drives that ignore CRC
-          checking. You are a fool for enabling this option, but there have
-          been requests. DO NOT COMPLAIN IF YOUR DRIVE HAS FS CORRUPTION, IF
-          YOU ENABLE THIS! No one will listen, just laugh for ignoring this
-          SERIOUS WARNING.
-
-          Using this option can allow WDC drives to run at ATA-4/5 transfer
-          rates with only an ATA-2 support structure.
-
-          SAY N!
-
 config BLK_DEV_AMD74XX
         tristate "AMD and nVidia IDE support"
         depends on !ARM
@@ -520,9 +502,6 @@ config BLK_DEV_CY82C693
           This driver adds detection and support for the CY82C693 chipset
           used on Digital's PC-Alpha 164SX boards.
 
-          If you say Y here, you need to say Y to "Use DMA by default
-          when available" as well.
-
 config BLK_DEV_CS5520
         tristate "Cyrix CS5510/20 MediaGX chipset support (VERY EXPERIMENTAL)"
         depends on EXPERIMENTAL
@@ -613,13 +592,12 @@ config BLK_DEV_SC1200
           National SCx200 series of embedded x86 "Geode" systems.
 
 config BLK_DEV_PIIX
-        tristate "Intel PIIXn chipsets support"
+        tristate "Intel PIIX/ICH chipsets support"
         select BLK_DEV_IDEDMA_PCI
         help
-          This driver adds explicit support for Intel PIIX and ICH chips
-          and also for the Efar Victory66 (slc90e66) chip.  This allows
-          the kernel to change PIO, DMA and UDMA speeds and to configure
-          the chip to optimum performance.
+          This driver adds explicit support for Intel PIIX and ICH chips.
+          This allows the kernel to change PIO, DMA and UDMA speeds and to
+          configure the chip to optimum performance.
 
 config BLK_DEV_IT8213
         tristate "IT8213 IDE support"
@@ -657,11 +635,7 @@ config BLK_DEV_PDC202XX_OLD
           happen if the BIOS revisions of all installed cards (three-max) do
           not match, the driver attempts to do dynamic tuning of the chipset
           at boot-time for max-speed.  Ultra33 BIOS 1.25 or newer is required
-          for more than one card. This card may require that you say Y to
-          "Special UDMA Feature".
-
-          If you say Y here, you need to say Y to "Use DMA by default when
-          available" as well.
+          for more than one card.
 
           Please read the comments at the top of
           <file:drivers/ide/pci/pdc202xx_old.c>.
@@ -710,9 +684,6 @@ config BLK_DEV_SIS5513
           ATA100: SiS635, SiS645, SiS650, SiS730, SiS735, SiS740,
           SiS745, SiS750
 
-          If you say Y here, you need to say Y to "Use DMA by default when
-          available" as well.
-
           Please read the comments at the top of <file:drivers/ide/pci/sis5513.c>.
 
 config BLK_DEV_SL82C105
@@ -734,9 +705,6 @@ config BLK_DEV_SLC90E66
           and it will handle timing cycles.  Since this is an improved
           look-a-like to the PIIX4 it should be a nice addition.
 
-          If you say Y here, you need to say Y to "Use DMA by default when
-          available" as well.
-
           Please read the comments at the top of
           <file:drivers/ide/pci/slc90e66.c>.
 
@@ -888,17 +856,17 @@ config BLK_DEV_IDEDOUBLER
         bool "Amiga IDE Doubler support (EXPERIMENTAL)"
         depends on BLK_DEV_GAYLE && EXPERIMENTAL
         ---help---
-          This driver provides support for the so-called `IDE doublers' (made
+          This feature provides support for the so-called `IDE doublers' (made
           by various manufacturers, e.g. Eyetech) that can be connected to
           the on-board IDE interface of some Amiga models. Using such an IDE
           doubler, you can connect up to four instead of two IDE devices to
           the Amiga's on-board IDE interface.
 
           Note that the normal Amiga Gayle IDE driver may not work correctly
-          if you have an IDE doubler and don't enable this driver!
+          if you have an IDE doubler and don't enable this feature!
 
-          Say Y if you have an IDE doubler.  The driver is enabled at kernel
-          runtime using the "ide=doubler" kernel boot parameter.
+          Say Y if you have an IDE doubler.  The feature is enabled at kernel
+          runtime using the "gayle.doubler" kernel boot parameter.
 
 config BLK_DEV_BUDDHA
         tristate "Buddha/Catweasel/X-Surf IDE interface support (EXPERIMENTAL)"
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 57d9a9a79a6f..0daf923541ff 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -95,7 +95,7 @@ void SELECT_DRIVE (ide_drive_t *drive)
         hwif->OUTB(drive->select.all, hwif->io_ports.device_addr);
 }
 
-void SELECT_MASK (ide_drive_t *drive, int mask)
+static void SELECT_MASK(ide_drive_t *drive, int mask)
 {
         const struct ide_port_ops *port_ops = drive->hwif->port_ops;
 
diff --git a/drivers/ide/mips/swarm.c b/drivers/ide/mips/swarm.c
index 712d17bdd470..52fee3d2771a 100644
--- a/drivers/ide/mips/swarm.c
+++ b/drivers/ide/mips/swarm.c
@@ -4,7 +4,7 @@
  *      Author: Manish Lachwani, mlachwani@mvista.com
  * Copyright (C) 2004  MIPS Technologies, Inc.  All rights reserved.
  *      Author: Maciej W. Rozycki <macro@mips.com>
- * Copyright (c) 2006  Maciej W. Rozycki
+ * Copyright (c) 2006, 2008  Maciej W. Rozycki
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -70,8 +70,9 @@ static int __devinit swarm_ide_probe(struct device *dev)
         ide_hwif_t *hwif;
         u8 __iomem *base;
         phys_t offset, size;
+        hw_regs_t hw;
         int i;
-        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
+        u8 idx[] = { 0xff, 0xff, 0xff, 0xff };
 
         if (!SIBYTE_HAVE_IDE)
                 return -ENODEV;
@@ -112,14 +113,15 @@ static int __devinit swarm_ide_probe(struct device *dev)
         hwif->host_flags = IDE_HFLAG_MMIO;
         default_hwif_mmiops(hwif);
 
-        hwif->chipset = ide_generic;
-
         for (i = 0; i <= 7; i++)
-                hwif->io_ports_array[i] =
+                hw.io_ports_array[i] =
                                 (unsigned long)(base + ((0x1f0 + i) << 5));
-        hwif->io_ports.ctl_addr =
+        hw.io_ports.ctl_addr =
                                 (unsigned long)(base + (0x3f6 << 5));
-        hwif->irq = K_INT_GB_IDE;
+        hw.irq = K_INT_GB_IDE;
+        hw.chipset = ide_generic;
+
+        ide_init_port_hw(hwif, &hw);
 
         idx[0] = hwif->index;
 
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index c1922f9cfe80..f2129d5e07f2 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -39,6 +39,16 @@
 #include <asm/io.h>
 
 /*
+ * Allow UDMA on M1543C-E chipset for WDC disks that ignore CRC checking
+ * (this is DANGEROUS and could result in data corruption).
+ */
+static int wdc_udma;
+
+module_param(wdc_udma, bool, 0);
+MODULE_PARM_DESC(wdc_udma,
+                 "allow UDMA on M1543C-E chipset for WDC disks (DANGEROUS)");
+
+/*
  *      ALi devices are not plug in. Otherwise these static values would
  *      need to go. They ought to go away anyway
  */
@@ -76,11 +86,6 @@ static void ali_set_pio_mode(ide_drive_t *drive, const u8 pio)
                 a_clc = 0;
         c_time = ide_pio_timings[pio].cycle_time;
 
-#if 0
-        if ((r_clc = ((c_time - s_time - a_time) * bus_speed + 999) / 1000) >= 16)
-                r_clc = 0;
-#endif
-
         if (!(r_clc = (c_time * bus_speed + 999) / 1000 - a_clc - s_clc)) {
                 r_clc = 1;
         } else {
@@ -110,16 +115,6 @@ static void ali_set_pio_mode(ide_drive_t *drive, const u8 pio)
         pci_write_config_byte(dev, port, s_clc);
         pci_write_config_byte(dev, port+drive->select.b.unit+2, (a_clc << 4) | r_clc);
         local_irq_restore(flags);
-
-        /*
-         * setup   active  rec
-         * { 70,   165,    365 },   PIO Mode 0
-         * { 50,   125,    208 },   PIO Mode 1
-         * { 30,   100,    110 },   PIO Mode 2
-         * { 30,   80,     70  },   PIO Mode 3 with IORDY
-         * { 25,   70,     25  },   PIO Mode 4 with IORDY  ns
-         * { 20,   50,     30  }    PIO Mode 5 with IORDY (nonstandard)
-         */
 }
 
 /**
@@ -131,9 +126,7 @@ static void ali_set_pio_mode(ide_drive_t *drive, const u8 pio)
  *      The actual rules for the ALi are:
  *              No UDMA on revisions <= 0x20
  *              Disk only for revisions < 0xC2
- *              Not WDC drives for revisions < 0xC2
- *
- *      FIXME: WDC ifdef needs to die
+ *              Not WDC drives on M1543C-E (?)
  */
 
 static u8 ali_udma_filter(ide_drive_t *drive)
@@ -141,10 +134,9 @@ static u8 ali_udma_filter(ide_drive_t *drive)
         if (m5229_revision > 0x20 && m5229_revision < 0xC2) {
                 if (drive->media != ide_disk)
                         return 0;
-#ifndef CONFIG_WDC_ALI15X3
-                if (chip_is_1543c_e && strstr(drive->id->model, "WDC "))
+                if (chip_is_1543c_e && strstr(drive->id->model, "WDC ") &&
+                    wdc_udma == 0)
                         return 0;
-#endif
         }
 
         return drive->hwif->ultra_mask;
@@ -537,17 +529,9 @@ static const struct ide_port_info ali15x3_chipset __devinitdata = {
  
 static int __devinit alim15x3_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        static struct pci_device_id ati_rs100[] = {
-                { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS100) },
-                { },
-        };
-
         struct ide_port_info d = ali15x3_chipset;
         u8 rev = dev->revision, idx = id->driver_data;
 
-        if (pci_dev_present(ati_rs100))
-                printk(KERN_WARNING "alim15x3: ATI Radeon IGP Northbridge is not yet fully tested.\n");
-
         /* don't use LBA48 DMA on ALi devices before rev 0xC5 */
         if (rev <= 0xC4)
                 d.host_flags |= IDE_HFLAG_NO_LBA48_DMA;
diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c
index 17669a434438..992b1cf8db69 100644
--- a/drivers/ide/pci/cs5520.c
+++ b/drivers/ide/pci/cs5520.c
@@ -119,6 +119,7 @@ static const struct ide_dma_ops cs5520_dma_ops = {
         .dma_timeout            = ide_dma_timeout,
 };
 
+/* FIXME: VDMA is disabled because it caused system hangs */
 #define DECLARE_CS_DEV(name_str)                                \
         {                                                       \
                 .name           = name_str,                     \
@@ -126,7 +127,6 @@ static const struct ide_dma_ops cs5520_dma_ops = {
                 .dma_ops        = &cs5520_dma_ops,              \
                 .host_flags     = IDE_HFLAG_ISA_PORTS |         \
                                   IDE_HFLAG_CS5520 |            \
-                                  IDE_HFLAG_VDMA |              \
                                   IDE_HFLAG_NO_ATAPI_DMA |      \
                                   IDE_HFLAG_ABUSE_SET_DMA_MODE, \
                 .pio_mask       = ATA_PIO4,                     \
diff --git a/drivers/infiniband/hw/cxgb3/cxio_hal.c b/drivers/infiniband/hw/cxgb3/cxio_hal.c
index ebf9d3043f80..3f441fc57c17 100644
--- a/drivers/infiniband/hw/cxgb3/cxio_hal.c
+++ b/drivers/infiniband/hw/cxgb3/cxio_hal.c
@@ -405,11 +405,11 @@ int cxio_flush_sq(struct t3_wq *wq, struct t3_cq *cq, int count)
         struct t3_swsq *sqp = wq->sq + Q_PTR2IDX(wq->sq_rptr, wq->sq_size_log2);
 
         ptr = wq->sq_rptr + count;
-        sqp += count;
+        sqp = wq->sq + Q_PTR2IDX(ptr, wq->sq_size_log2);
         while (ptr != wq->sq_wptr) {
                 insert_sq_cqe(wq, cq, sqp);
-                sqp++;
                 ptr++;
+                sqp = wq->sq + Q_PTR2IDX(ptr, wq->sq_size_log2);
                 flushed++;
         }
         return flushed;
diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c b/drivers/infiniband/hw/ipath/ipath_driver.c
index ce7b7c34360e..daad09a45910 100644
--- a/drivers/infiniband/hw/ipath/ipath_driver.c
+++ b/drivers/infiniband/hw/ipath/ipath_driver.c
@@ -1894,7 +1894,7 @@ void ipath_cancel_sends(struct ipath_devdata *dd, int restore_sendctrl)
          */
         if (dd->ipath_flags & IPATH_HAS_SEND_DMA) {
                 int skip_cancel;
-                u64 *statp = &dd->ipath_sdma_status;
+                unsigned long *statp = &dd->ipath_sdma_status;
 
                 spin_lock_irqsave(&dd->ipath_sdma_lock, flags);
                 skip_cancel =
@@ -2616,7 +2616,7 @@ int ipath_reset_device(int unit)
                                 ipath_dbg("unit %u port %d is in use "
                                           "(PID %u cmd %s), can't reset\n",
                                           unit, i,
-                                          dd->ipath_pd[i]->port_pid,
+                                          pid_nr(dd->ipath_pd[i]->port_pid),
                                           dd->ipath_pd[i]->port_comm);
                                 ret = -EBUSY;
                                 goto bail;
@@ -2654,19 +2654,21 @@ bail:
 static int ipath_signal_procs(struct ipath_devdata *dd, int sig)
 {
         int i, sub, any = 0;
-        pid_t pid;
+        struct pid *pid;
 
         if (!dd->ipath_pd)
                 return 0;
         for (i = 1; i < dd->ipath_cfgports; i++) {
-                if (!dd->ipath_pd[i] || !dd->ipath_pd[i]->port_cnt ||
-                    !dd->ipath_pd[i]->port_pid)
+                if (!dd->ipath_pd[i] || !dd->ipath_pd[i]->port_cnt)
                         continue;
                 pid = dd->ipath_pd[i]->port_pid;
+                if (!pid)
+                        continue;
+
                 dev_info(&dd->pcidev->dev, "context %d in use "
                           "(PID %u), sending signal %d\n",
-                          i, pid, sig);
-                kill_proc(pid, sig, 1);
+                          i, pid_nr(pid), sig);
+                kill_pid(pid, sig, 1);
                 any++;
                 for (sub = 0; sub < INFINIPATH_MAX_SUBPORT; sub++) {
                         pid = dd->ipath_pd[i]->port_subpid[sub];
@@ -2674,8 +2676,8 @@ static int ipath_signal_procs(struct ipath_devdata *dd, int sig)
                                 continue;
                         dev_info(&dd->pcidev->dev, "sub-context "
                                 "%d:%d in use (PID %u), sending "
-                                "signal %d\n", i, sub, pid, sig);
-                        kill_proc(pid, sig, 1);
+                                "signal %d\n", i, sub, pid_nr(pid), sig);
+                        kill_pid(pid, sig, 1);
                         any++;
                 }
         }
diff --git a/drivers/infiniband/hw/ipath/ipath_file_ops.c b/drivers/infiniband/hw/ipath/ipath_file_ops.c
index 3295177c937e..b472b15637f0 100644
--- a/drivers/infiniband/hw/ipath/ipath_file_ops.c
+++ b/drivers/infiniband/hw/ipath/ipath_file_ops.c
@@ -555,7 +555,7 @@ static int ipath_tid_free(struct ipath_portdata *pd, unsigned subport,
                         p = dd->ipath_pageshadow[porttid + tid];
                         dd->ipath_pageshadow[porttid + tid] = NULL;
                         ipath_cdbg(VERBOSE, "PID %u freeing TID %u\n",
-                                   pd->port_pid, tid);
+                                   pid_nr(pd->port_pid), tid);
                         dd->ipath_f_put_tid(dd, &tidbase[tid],
                                             RCVHQ_RCV_TYPE_EXPECTED,
                                             dd->ipath_tidinvalid);
@@ -1609,7 +1609,7 @@ static int try_alloc_port(struct ipath_devdata *dd, int port,
                            port);
                 pd->port_cnt = 1;
                 port_fp(fp) = pd;
-                pd->port_pid = current->pid;
+                pd->port_pid = get_pid(task_pid(current));
                 strncpy(pd->port_comm, current->comm, sizeof(pd->port_comm));
                 ipath_stats.sps_ports++;
                 ret = 0;
@@ -1793,14 +1793,15 @@ static int find_shared_port(struct file *fp,
                         }
                         port_fp(fp) = pd;
                         subport_fp(fp) = pd->port_cnt++;
-                        pd->port_subpid[subport_fp(fp)] = current->pid;
+                        pd->port_subpid[subport_fp(fp)] =
+                                get_pid(task_pid(current));
                         tidcursor_fp(fp) = 0;
                         pd->active_slaves |= 1 << subport_fp(fp);
                         ipath_cdbg(PROC,
                                    "%s[%u] %u sharing %s[%u] unit:port %u:%u\n",
                                    current->comm, current->pid,
                                    subport_fp(fp),
-                                   pd->port_comm, pd->port_pid,
+                                   pd->port_comm, pid_nr(pd->port_pid),
                                    dd->ipath_unit, pd->port_port);
                         ret = 1;
                         goto done;
@@ -2066,7 +2067,8 @@ static int ipath_close(struct inode *in, struct file *fp)
                  * the slave(s) don't wait for receive data forever.
                  */
                 pd->active_slaves &= ~(1 << fd->subport);
-                pd->port_subpid[fd->subport] = 0;
+                put_pid(pd->port_subpid[fd->subport]);
+                pd->port_subpid[fd->subport] = NULL;
                 mutex_unlock(&ipath_mutex);
                 goto bail;
         }
@@ -2074,7 +2076,7 @@ static int ipath_close(struct inode *in, struct file *fp)
 
         if (pd->port_hdrqfull) {
                 ipath_cdbg(PROC, "%s[%u] had %u rcvhdrqfull errors "
-                           "during run\n", pd->port_comm, pd->port_pid,
+                           "during run\n", pd->port_comm, pid_nr(pd->port_pid),
                            pd->port_hdrqfull);
                 pd->port_hdrqfull = 0;
         }
@@ -2134,11 +2136,12 @@ static int ipath_close(struct inode *in, struct file *fp)
                         unlock_expected_tids(pd);
                 ipath_stats.sps_ports--;
                 ipath_cdbg(PROC, "%s[%u] closed port %u:%u\n",
-                           pd->port_comm, pd->port_pid,
+                           pd->port_comm, pid_nr(pd->port_pid),
                            dd->ipath_unit, port);
         }
 
-        pd->port_pid = 0;
+        put_pid(pd->port_pid);
+        pd->port_pid = NULL;
         dd->ipath_pd[pd->port_port] = NULL; /* before releasing mutex */
         mutex_unlock(&ipath_mutex);
         ipath_free_pddata(dd, pd); /* after releasing the mutex */
diff --git a/drivers/infiniband/hw/ipath/ipath_kernel.h b/drivers/infiniband/hw/ipath/ipath_kernel.h
index 02b24a340599..59a8b254b97f 100644
--- a/drivers/infiniband/hw/ipath/ipath_kernel.h
+++ b/drivers/infiniband/hw/ipath/ipath_kernel.h
@@ -159,8 +159,8 @@ struct ipath_portdata {
         /* saved total number of polled urgent packets for poll edge trigger */
         u32 port_urgent_poll;
         /* pid of process using this port */
-        pid_t port_pid;
-        pid_t port_subpid[INFINIPATH_MAX_SUBPORT];
+        struct pid *port_pid;
+        struct pid *port_subpid[INFINIPATH_MAX_SUBPORT];
         /* same size as task_struct .comm[] */
         char port_comm[16];
         /* pkeys set by this use of this port */
@@ -483,7 +483,7 @@ struct ipath_devdata {
 
         /* SendDMA related entries */
         spinlock_t            ipath_sdma_lock;
-        u64                   ipath_sdma_status;
+        unsigned long         ipath_sdma_status;
         unsigned long         ipath_sdma_abort_jiffies;
         unsigned long         ipath_sdma_abort_intr_timeout;
         unsigned long         ipath_sdma_buf_jiffies;
@@ -822,8 +822,8 @@ struct ipath_devdata {
 #define IPATH_SDMA_DISARMED  1
 #define IPATH_SDMA_DISABLED  2
 #define IPATH_SDMA_LAYERBUF  3
-#define IPATH_SDMA_RUNNING  62
-#define IPATH_SDMA_SHUTDOWN 63
+#define IPATH_SDMA_RUNNING  30
+#define IPATH_SDMA_SHUTDOWN 31
 
 /* bit combinations that correspond to abort states */
 #define IPATH_SDMA_ABORT_NONE 0
diff --git a/drivers/infiniband/hw/ipath/ipath_qp.c b/drivers/infiniband/hw/ipath/ipath_qp.c
index dd5b6e9d57c2..4715911101e4 100644
--- a/drivers/infiniband/hw/ipath/ipath_qp.c
+++ b/drivers/infiniband/hw/ipath/ipath_qp.c
@@ -242,7 +242,6 @@ static void ipath_free_qp(struct ipath_qp_table *qpt, struct ipath_qp *qp)
 {
         struct ipath_qp *q, **qpp;
         unsigned long flags;
-        int fnd = 0;
 
         spin_lock_irqsave(&qpt->lock, flags);
 
@@ -253,51 +252,40 @@ static void ipath_free_qp(struct ipath_qp_table *qpt, struct ipath_qp *qp)
                         *qpp = qp->next;
                         qp->next = NULL;
                         atomic_dec(&qp->refcount);
-                        fnd = 1;
                         break;
                 }
         }
 
         spin_unlock_irqrestore(&qpt->lock, flags);
-
-        if (!fnd)
-                return;
-
-        free_qpn(qpt, qp->ibqp.qp_num);
-
-        wait_event(qp->wait, !atomic_read(&qp->refcount));
 }
 
 /**
- * ipath_free_all_qps - remove all QPs from the table
+ * ipath_free_all_qps - check for QPs still in use
  * @qpt: the QP table to empty
+ *
+ * There should not be any QPs still in use.
+ * Free memory for table.
  */
-void ipath_free_all_qps(struct ipath_qp_table *qpt)
+unsigned ipath_free_all_qps(struct ipath_qp_table *qpt)
 {
         unsigned long flags;
-        struct ipath_qp *qp, *nqp;
-        u32 n;
+        struct ipath_qp *qp;
+        u32 n, qp_inuse = 0;
 
+        spin_lock_irqsave(&qpt->lock, flags);
         for (n = 0; n < qpt->max; n++) {
-                spin_lock_irqsave(&qpt->lock, flags);
                 qp = qpt->table[n];
                 qpt->table[n] = NULL;
-                spin_unlock_irqrestore(&qpt->lock, flags);
-
-                while (qp) {
-                        nqp = qp->next;
-                        free_qpn(qpt, qp->ibqp.qp_num);
-                        if (!atomic_dec_and_test(&qp->refcount) ||
-                            !ipath_destroy_qp(&qp->ibqp))
-                                ipath_dbg("QP memory leak!\n");
-                        qp = nqp;
-                }
+
+                for (; qp; qp = qp->next)
+                        qp_inuse++;
         }
+        spin_unlock_irqrestore(&qpt->lock, flags);
 
-        for (n = 0; n < ARRAY_SIZE(qpt->map); n++) {
+        for (n = 0; n < ARRAY_SIZE(qpt->map); n++)
                 if (qpt->map[n].page)
-                        free_page((unsigned long)qpt->map[n].page);
-        }
+                        free_page((unsigned long) qpt->map[n].page);
+        return qp_inuse;
 }
 
 /**
@@ -336,11 +324,12 @@ static void ipath_reset_qp(struct ipath_qp *qp, enum ib_qp_type type)
         qp->remote_qpn = 0;
         qp->qkey = 0;
         qp->qp_access_flags = 0;
-        qp->s_busy = 0;
+        atomic_set(&qp->s_dma_busy, 0);
         qp->s_flags &= IPATH_S_SIGNAL_REQ_WR;
         qp->s_hdrwords = 0;
         qp->s_wqe = NULL;
         qp->s_pkt_delay = 0;
+        qp->s_draining = 0;
         qp->s_psn = 0;
         qp->r_psn = 0;
         qp->r_msn = 0;
@@ -353,7 +342,8 @@ static void ipath_reset_qp(struct ipath_qp *qp, enum ib_qp_type type)
         }
         qp->s_ack_state = IB_OPCODE_RC_ACKNOWLEDGE;
         qp->r_nak_state = 0;
-        qp->r_wrid_valid = 0;
+        qp->r_aflags = 0;
+        qp->r_flags = 0;
         qp->s_rnr_timeout = 0;
         qp->s_head = 0;
         qp->s_tail = 0;
@@ -361,7 +351,6 @@ static void ipath_reset_qp(struct ipath_qp *qp, enum ib_qp_type type)
         qp->s_last = 0;
         qp->s_ssn = 1;
         qp->s_lsn = 0;
-        qp->s_wait_credit = 0;
         memset(qp->s_ack_queue, 0, sizeof(qp->s_ack_queue));
         qp->r_head_ack_queue = 0;
         qp->s_tail_ack_queue = 0;
@@ -370,17 +359,17 @@ static void ipath_reset_qp(struct ipath_qp *qp, enum ib_qp_type type)
                 qp->r_rq.wq->head = 0;
                 qp->r_rq.wq->tail = 0;
         }
-        qp->r_reuse_sge = 0;
 }
 
 /**
- * ipath_error_qp - put a QP into an error state
- * @qp: the QP to put into an error state
+ * ipath_error_qp - put a QP into the error state
+ * @qp: the QP to put into the error state
  * @err: the receive completion error to signal if a RWQE is active
  *
  * Flushes both send and receive work queues.
  * Returns true if last WQE event should be generated.
  * The QP s_lock should be held and interrupts disabled.
+ * If we are already in error state, just return.
  */
 
 int ipath_error_qp(struct ipath_qp *qp, enum ib_wc_status err)
@@ -389,8 +378,10 @@ int ipath_error_qp(struct ipath_qp *qp, enum ib_wc_status err)
         struct ib_wc wc;
         int ret = 0;
 
-        ipath_dbg("QP%d/%d in error state (%d)\n",
-                  qp->ibqp.qp_num, qp->remote_qpn, err);
+        if (qp->state == IB_QPS_ERR)
+                goto bail;
+
+        qp->state = IB_QPS_ERR;
 
         spin_lock(&dev->pending_lock);
         if (!list_empty(&qp->timerwait))
@@ -399,39 +390,21 @@ int ipath_error_qp(struct ipath_qp *qp, enum ib_wc_status err)
                 list_del_init(&qp->piowait);
         spin_unlock(&dev->pending_lock);
 
-        wc.vendor_err = 0;
-        wc.byte_len = 0;
-        wc.imm_data = 0;
+        /* Schedule the sending tasklet to drain the send work queue. */
+        if (qp->s_last != qp->s_head)
+                ipath_schedule_send(qp);
+
+        memset(&wc, 0, sizeof(wc));
         wc.qp = &qp->ibqp;
-        wc.src_qp = 0;
-        wc.wc_flags = 0;
-        wc.pkey_index = 0;
-        wc.slid = 0;
-        wc.sl = 0;
-        wc.dlid_path_bits = 0;
-        wc.port_num = 0;
-        if (qp->r_wrid_valid) {
-                qp->r_wrid_valid = 0;
+        wc.opcode = IB_WC_RECV;
+
+        if (test_and_clear_bit(IPATH_R_WRID_VALID, &qp->r_aflags)) {
                 wc.wr_id = qp->r_wr_id;
-                wc.opcode = IB_WC_RECV;
                 wc.status = err;
                 ipath_cq_enter(to_icq(qp->ibqp.recv_cq), &wc, 1);
         }
         wc.status = IB_WC_WR_FLUSH_ERR;
 
-        while (qp->s_last != qp->s_head) {
-                struct ipath_swqe *wqe = get_swqe_ptr(qp, qp->s_last);
-
-                wc.wr_id = wqe->wr.wr_id;
-                wc.opcode = ib_ipath_wc_opcode[wqe->wr.opcode];
-                if (++qp->s_last >= qp->s_size)
-                        qp->s_last = 0;
-                ipath_cq_enter(to_icq(qp->ibqp.send_cq), &wc, 1);
-        }
-        qp->s_cur = qp->s_tail = qp->s_head;
-        qp->s_hdrwords = 0;
-        qp->s_ack_state = IB_OPCODE_RC_ACKNOWLEDGE;
-
         if (qp->r_rq.wq) {
                 struct ipath_rwq *wq;
                 u32 head;
@@ -447,7 +420,6 @@ int ipath_error_qp(struct ipath_qp *qp, enum ib_wc_status err)
                 tail = wq->tail;
                 if (tail >= qp->r_rq.size)
                         tail = 0;
-                wc.opcode = IB_WC_RECV;
                 while (tail != head) {
                         wc.wr_id = get_rwqe_ptr(&qp->r_rq, tail)->wr_id;
                         if (++tail >= qp->r_rq.size)
@@ -460,6 +432,7 @@ int ipath_error_qp(struct ipath_qp *qp, enum ib_wc_status err)
         } else if (qp->ibqp.event_handler)
                 ret = 1;
 
+bail:
         return ret;
 }
 
@@ -478,11 +451,10 @@ int ipath_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
         struct ipath_ibdev *dev = to_idev(ibqp->device);
         struct ipath_qp *qp = to_iqp(ibqp);
         enum ib_qp_state cur_state, new_state;
-        unsigned long flags;
         int lastwqe = 0;
         int ret;
 
-        spin_lock_irqsave(&qp->s_lock, flags);
+        spin_lock_irq(&qp->s_lock);
 
         cur_state = attr_mask & IB_QP_CUR_STATE ?
                 attr->cur_qp_state : qp->state;
@@ -535,16 +507,42 @@ int ipath_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 
         switch (new_state) {
         case IB_QPS_RESET:
+                if (qp->state != IB_QPS_RESET) {
+                        qp->state = IB_QPS_RESET;
+                        spin_lock(&dev->pending_lock);
+                        if (!list_empty(&qp->timerwait))
+                                list_del_init(&qp->timerwait);
+                        if (!list_empty(&qp->piowait))
+                                list_del_init(&qp->piowait);
+                        spin_unlock(&dev->pending_lock);
+                        qp->s_flags &= ~IPATH_S_ANY_WAIT;
+                        spin_unlock_irq(&qp->s_lock);
+                        /* Stop the sending tasklet */
+                        tasklet_kill(&qp->s_task);
+                        wait_event(qp->wait_dma, !atomic_read(&qp->s_dma_busy));
+                        spin_lock_irq(&qp->s_lock);
+                }
                 ipath_reset_qp(qp, ibqp->qp_type);
                 break;
 
+        case IB_QPS_SQD:
+                qp->s_draining = qp->s_last != qp->s_cur;
+                qp->state = new_state;
+                break;
+
+        case IB_QPS_SQE:
+                if (qp->ibqp.qp_type == IB_QPT_RC)
+                        goto inval;
+                qp->state = new_state;
+                break;
+
         case IB_QPS_ERR:
                 lastwqe = ipath_error_qp(qp, IB_WC_WR_FLUSH_ERR);
                 break;
 
         default:
+                qp->state = new_state;
                 break;
-
         }
 
         if (attr_mask & IB_QP_PKEY_INDEX)
@@ -597,8 +595,7 @@ int ipath_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
         if (attr_mask & IB_QP_MAX_QP_RD_ATOMIC)
                 qp->s_max_rd_atomic = attr->max_rd_atomic;
 
-        qp->state = new_state;
-        spin_unlock_irqrestore(&qp->s_lock, flags);
+        spin_unlock_irq(&qp->s_lock);
 
         if (lastwqe) {
                 struct ib_event ev;
@@ -612,7 +609,7 @@ int ipath_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
         goto bail;
 
 inval:
-        spin_unlock_irqrestore(&qp->s_lock, flags);
+        spin_unlock_irq(&qp->s_lock);
         ret = -EINVAL;
 
 bail:
@@ -643,7 +640,7 @@ int ipath_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
         attr->pkey_index = qp->s_pkey_index;
         attr->alt_pkey_index = 0;
         attr->en_sqd_async_notify = 0;
-        attr->sq_draining = 0;
+        attr->sq_draining = qp->s_draining;
         attr->max_rd_atomic = qp->s_max_rd_atomic;
         attr->max_dest_rd_atomic = qp->r_max_rd_atomic;
         attr->min_rnr_timer = qp->r_min_rnr_timer;
@@ -833,6 +830,7 @@ struct ib_qp *ipath_create_qp(struct ib_pd *ibpd,
                 spin_lock_init(&qp->r_rq.lock);
                 atomic_set(&qp->refcount, 0);
                 init_waitqueue_head(&qp->wait);
+                init_waitqueue_head(&qp->wait_dma);
                 tasklet_init(&qp->s_task, ipath_do_send, (unsigned long)qp);
                 INIT_LIST_HEAD(&qp->piowait);
                 INIT_LIST_HEAD(&qp->timerwait);
@@ -926,6 +924,7 @@ bail_ip:
         else
                 vfree(qp->r_rq.wq);
         ipath_free_qp(&dev->qp_table, qp);
+        free_qpn(&dev->qp_table, qp->ibqp.qp_num);
 bail_qp:
         kfree(qp);
 bail_swq:
@@ -947,41 +946,44 @@ int ipath_destroy_qp(struct ib_qp *ibqp)
 {
         struct ipath_qp *qp = to_iqp(ibqp);
         struct ipath_ibdev *dev = to_idev(ibqp->device);
-        unsigned long flags;
 
-        spin_lock_irqsave(&qp->s_lock, flags);
-        qp->state = IB_QPS_ERR;
-        spin_unlock_irqrestore(&qp->s_lock, flags);
-        spin_lock(&dev->n_qps_lock);
-        dev->n_qps_allocated--;
-        spin_unlock(&dev->n_qps_lock);
+        /* Make sure HW and driver activity is stopped. */
+        spin_lock_irq(&qp->s_lock);
+        if (qp->state != IB_QPS_RESET) {
+                qp->state = IB_QPS_RESET;
+                spin_lock(&dev->pending_lock);
+                if (!list_empty(&qp->timerwait))
+                        list_del_init(&qp->timerwait);
+                if (!list_empty(&qp->piowait))
+                        list_del_init(&qp->piowait);
+                spin_unlock(&dev->pending_lock);
+                qp->s_flags &= ~IPATH_S_ANY_WAIT;
+                spin_unlock_irq(&qp->s_lock);
+                /* Stop the sending tasklet */
+                tasklet_kill(&qp->s_task);
+                wait_event(qp->wait_dma, !atomic_read(&qp->s_dma_busy));
+        } else
+                spin_unlock_irq(&qp->s_lock);
 
-        /* Stop the sending tasklet. */
-        tasklet_kill(&qp->s_task);
+        ipath_free_qp(&dev->qp_table, qp);
 
         if (qp->s_tx) {
                 atomic_dec(&qp->refcount);
                 if (qp->s_tx->txreq.flags & IPATH_SDMA_TXREQ_F_FREEBUF)
                         kfree(qp->s_tx->txreq.map_addr);
+                spin_lock_irq(&dev->pending_lock);
+                list_add(&qp->s_tx->txreq.list, &dev->txreq_free);
+                spin_unlock_irq(&dev->pending_lock);
+                qp->s_tx = NULL;
         }
 
-        /* Make sure the QP isn't on the timeout list. */
-        spin_lock_irqsave(&dev->pending_lock, flags);
-        if (!list_empty(&qp->timerwait))
-                list_del_init(&qp->timerwait);
-        if (!list_empty(&qp->piowait))
-                list_del_init(&qp->piowait);
-        if (qp->s_tx)
-                list_add(&qp->s_tx->txreq.list, &dev->txreq_free);
-        spin_unlock_irqrestore(&dev->pending_lock, flags);
+        wait_event(qp->wait, !atomic_read(&qp->refcount));
 
-        /*
-         * Make sure that the QP is not in the QPN table so receive
-         * interrupts will discard packets for this QP.  XXX Also remove QP
-         * from multicast table.
-         */
-        if (atomic_read(&qp->refcount) != 0)
-                ipath_free_qp(&dev->qp_table, qp);
+        /* all user's cleaned up, mark it available */
+        free_qpn(&dev->qp_table, qp->ibqp.qp_num);
+        spin_lock(&dev->n_qps_lock);
+        dev->n_qps_allocated--;
+        spin_unlock(&dev->n_qps_lock);
 
         if (qp->ip)
                 kref_put(&qp->ip->ref, ipath_release_mmap_info);
@@ -1026,48 +1028,6 @@ bail:
 }
 
 /**
- * ipath_sqerror_qp - put a QP's send queue into an error state
- * @qp: QP who's send queue will be put into an error state
- * @wc: the WC responsible for putting the QP in this state
- *
- * Flushes the send work queue.
- * The QP s_lock should be held and interrupts disabled.
- */
-
-void ipath_sqerror_qp(struct ipath_qp *qp, struct ib_wc *wc)
-{
-        struct ipath_ibdev *dev = to_idev(qp->ibqp.device);
-        struct ipath_swqe *wqe = get_swqe_ptr(qp, qp->s_last);
-
-        ipath_dbg("Send queue error on QP%d/%d: err: %d\n",
-                  qp->ibqp.qp_num, qp->remote_qpn, wc->status);
-
-        spin_lock(&dev->pending_lock);
-        if (!list_empty(&qp->timerwait))
-                list_del_init(&qp->timerwait);
-        if (!list_empty(&qp->piowait))
-                list_del_init(&qp->piowait);
-        spin_unlock(&dev->pending_lock);
-
-        ipath_cq_enter(to_icq(qp->ibqp.send_cq), wc, 1);
-        if (++qp->s_last >= qp->s_size)
-                qp->s_last = 0;
-
-        wc->status = IB_WC_WR_FLUSH_ERR;
-
-        while (qp->s_last != qp->s_head) {
-                wqe = get_swqe_ptr(qp, qp->s_last);
-                wc->wr_id = wqe->wr.wr_id;
-                wc->opcode = ib_ipath_wc_opcode[wqe->wr.opcode];
-                ipath_cq_enter(to_icq(qp->ibqp.send_cq), wc, 1);
-                if (++qp->s_last >= qp->s_size)
-                        qp->s_last = 0;
-        }
-        qp->s_cur = qp->s_tail = qp->s_head;
-        qp->state = IB_QPS_SQE;
-}
-
-/**
  * ipath_get_credit - flush the send work queue of a QP
  * @qp: the qp who's send work queue to flush
  * @aeth: the Acknowledge Extended Transport Header
@@ -1093,9 +1053,10 @@ void ipath_get_credit(struct ipath_qp *qp, u32 aeth)
         }
 
         /* Restart sending if it was blocked due to lack of credits. */
-        if (qp->s_cur != qp->s_head &&
+        if ((qp->s_flags & IPATH_S_WAIT_SSN_CREDIT) &&
+            qp->s_cur != qp->s_head &&
             (qp->s_lsn == (u32) -1 ||
              ipath_cmp24(get_swqe_ptr(qp, qp->s_cur)->ssn,
                          qp->s_lsn + 1) <= 0))
-                tasklet_hi_schedule(&qp->s_task);
+                ipath_schedule_send(qp);
 }
diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
index 08b11b567614..108df667d2ee 100644
--- a/drivers/infiniband/hw/ipath/ipath_rc.c
+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
@@ -92,6 +92,10 @@ static int ipath_make_rc_ack(struct ipath_ibdev *dev, struct ipath_qp *qp,
         u32 bth0;
         u32 bth2;
 
+        /* Don't send an ACK if we aren't supposed to. */
+        if (!(ib_ipath_state_ops[qp->state] & IPATH_PROCESS_RECV_OK))
+                goto bail;
+
         /* header size in 32-bit words LRH+BTH = (8+12)/4. */
         hwords = 5;
 
@@ -238,14 +242,25 @@ int ipath_make_rc_req(struct ipath_qp *qp)
             ipath_make_rc_ack(dev, qp, ohdr, pmtu))
                 goto done;
 
-        if (!(ib_ipath_state_ops[qp->state] & IPATH_PROCESS_SEND_OK) ||
-            qp->s_rnr_timeout || qp->s_wait_credit)
-                goto bail;
+        if (!(ib_ipath_state_ops[qp->state] & IPATH_PROCESS_SEND_OK)) {
+                if (!(ib_ipath_state_ops[qp->state] & IPATH_FLUSH_SEND))
+                        goto bail;
+                /* We are in the error state, flush the work request. */
+                if (qp->s_last == qp->s_head)
+                        goto bail;
+                /* If DMAs are in progress, we can't flush immediately. */
+                if (atomic_read(&qp->s_dma_busy)) {
+                        qp->s_flags |= IPATH_S_WAIT_DMA;
+                        goto bail;
+                }
+                wqe = get_swqe_ptr(qp, qp->s_last);
+                ipath_send_complete(qp, wqe, IB_WC_WR_FLUSH_ERR);
+                goto done;
+        }
 
-        /* Limit the number of packets sent without an ACK. */
-        if (ipath_cmp24(qp->s_psn, qp->s_last_psn + IPATH_PSN_CREDIT) > 0) {
-                qp->s_wait_credit = 1;
-                dev->n_rc_stalls++;
+        /* Leave BUSY set until RNR timeout. */
+        if (qp->s_rnr_timeout) {
+                qp->s_flags |= IPATH_S_WAITING;
                 goto bail;
         }
 
@@ -257,6 +272,9 @@ int ipath_make_rc_req(struct ipath_qp *qp)
         wqe = get_swqe_ptr(qp, qp->s_cur);
         switch (qp->s_state) {
         default:
+                if (!(ib_ipath_state_ops[qp->state] &
+                    IPATH_PROCESS_NEXT_SEND_OK))
+                        goto bail;
                 /*
                  * Resend an old request or start a new one.
                  *
@@ -294,8 +312,10 @@ int ipath_make_rc_req(struct ipath_qp *qp)
                 case IB_WR_SEND_WITH_IMM:
                         /* If no credit, return. */
                         if (qp->s_lsn != (u32) -1 &&
-                            ipath_cmp24(wqe->ssn, qp->s_lsn + 1) > 0)
+                            ipath_cmp24(wqe->ssn, qp->s_lsn + 1) > 0) {
+                                qp->s_flags |= IPATH_S_WAIT_SSN_CREDIT;
                                 goto bail;
+                        }
                         wqe->lpsn = wqe->psn;
                         if (len > pmtu) {
                                 wqe->lpsn += (len - 1) / pmtu;
@@ -325,8 +345,10 @@ int ipath_make_rc_req(struct ipath_qp *qp)
                 case IB_WR_RDMA_WRITE_WITH_IMM:
                         /* If no credit, return. */
                         if (qp->s_lsn != (u32) -1 &&
-                            ipath_cmp24(wqe->ssn, qp->s_lsn + 1) > 0)
+                            ipath_cmp24(wqe->ssn, qp->s_lsn + 1) > 0) {
+                                qp->s_flags |= IPATH_S_WAIT_SSN_CREDIT;
                                 goto bail;
+                        }
                         ohdr->u.rc.reth.vaddr =
                                 cpu_to_be64(wqe->wr.wr.rdma.remote_addr);
                         ohdr->u.rc.reth.rkey =
@@ -570,7 +592,11 @@ int ipath_make_rc_req(struct ipath_qp *qp)
         ipath_make_ruc_header(dev, qp, ohdr, bth0 | (qp->s_state << 24), bth2);
 done:
         ret = 1;
+        goto unlock;
+
 bail:
+        qp->s_flags &= ~IPATH_S_BUSY;
+unlock:
         spin_unlock_irqrestore(&qp->s_lock, flags);
         return ret;
 }
@@ -606,7 +632,11 @@ static void send_rc_ack(struct ipath_qp *qp)
 
         spin_unlock_irqrestore(&qp->s_lock, flags);
 
+        /* Don't try to send ACKs if the link isn't ACTIVE */
         dd = dev->dd;
+        if (!(dd->ipath_flags & IPATH_LINKACTIVE))
+                goto done;
+
         piobuf = ipath_getpiobuf(dd, 0, NULL);
         if (!piobuf) {
                 /*
@@ -668,15 +698,16 @@ static void send_rc_ack(struct ipath_qp *qp)
         goto done;
 
 queue_ack:
-        dev->n_rc_qacks++;
-        qp->s_flags |= IPATH_S_ACK_PENDING;
-        qp->s_nak_state = qp->r_nak_state;
-        qp->s_ack_psn = qp->r_ack_psn;
+        if (ib_ipath_state_ops[qp->state] & IPATH_PROCESS_RECV_OK) {
+                dev->n_rc_qacks++;
+                qp->s_flags |= IPATH_S_ACK_PENDING;
+                qp->s_nak_state = qp->r_nak_state;
+                qp->s_ack_psn = qp->r_ack_psn;
+
+                /* Schedule the send tasklet. */
+                ipath_schedule_send(qp);
+        }
         spin_unlock_irqrestore(&qp->s_lock, flags);
-
-        /* Call ipath_do_rc_send() in another thread. */
-        tasklet_hi_schedule(&qp->s_task);
-
 done:
         return;
 }
@@ -735,7 +766,7 @@ static void reset_psn(struct ipath_qp *qp, u32 psn)
         /*
          * Set the state to restart in the middle of a request.
          * Don't change the s_sge, s_cur_sge, or s_cur_size.
-         * See ipath_do_rc_send().
+         * See ipath_make_rc_req().
          */
         switch (opcode) {
         case IB_WR_SEND:
@@ -771,27 +802,14 @@ done:
  *
  * The QP s_lock should be held and interrupts disabled.
  */
-void ipath_restart_rc(struct ipath_qp *qp, u32 psn, struct ib_wc *wc)
+void ipath_restart_rc(struct ipath_qp *qp, u32 psn)
 {
         struct ipath_swqe *wqe = get_swqe_ptr(qp, qp->s_last);
         struct ipath_ibdev *dev;
 
         if (qp->s_retry == 0) {
-                wc->wr_id = wqe->wr.wr_id;
-                wc->status = IB_WC_RETRY_EXC_ERR;
-                wc->opcode = ib_ipath_wc_opcode[wqe->wr.opcode];
-                wc->vendor_err = 0;
-                wc->byte_len = 0;
-                wc->qp = &qp->ibqp;
-                wc->imm_data = 0;
-                wc->src_qp = qp->remote_qpn;
-                wc->wc_flags = 0;
-                wc->pkey_index = 0;
-                wc->slid = qp->remote_ah_attr.dlid;
-                wc->sl = qp->remote_ah_attr.sl;
-                wc->dlid_path_bits = 0;
-                wc->port_num = 0;
-                ipath_sqerror_qp(qp, wc);
+                ipath_send_complete(qp, wqe, IB_WC_RETRY_EXC_ERR);
+                ipath_error_qp(qp, IB_WC_WR_FLUSH_ERR);
                 goto bail;
         }
         qp->s_retry--;
@@ -804,6 +822,8 @@ void ipath_restart_rc(struct ipath_qp *qp, u32 psn, struct ib_wc *wc)
         spin_lock(&dev->pending_lock);
         if (!list_empty(&qp->timerwait))
                 list_del_init(&qp->timerwait);
+        if (!list_empty(&qp->piowait))
+                list_del_init(&qp->piowait);
         spin_unlock(&dev->pending_lock);
 
         if (wqe->wr.opcode == IB_WR_RDMA_READ)
@@ -812,7 +832,7 @@ void ipath_restart_rc(struct ipath_qp *qp, u32 psn, struct ib_wc *wc)
                 dev->n_rc_resends += (qp->s_psn - psn) & IPATH_PSN_MASK;
 
         reset_psn(qp, psn);
-        tasklet_hi_schedule(&qp->s_task);
+        ipath_schedule_send(qp);
 
 bail:
         return;
@@ -820,13 +840,7 @@ bail:
 
 static inline void update_last_psn(struct ipath_qp *qp, u32 psn)
 {
-        if (qp->s_last_psn != psn) {
-                qp->s_last_psn = psn;
-                if (qp->s_wait_credit) {
-                        qp->s_wait_credit = 0;
-                        tasklet_hi_schedule(&qp->s_task);
-                }
-        }
+        qp->s_last_psn = psn;
 }
 
 /**
@@ -845,6 +859,7 @@ static int do_rc_ack(struct ipath_qp *qp, u32 aeth, u32 psn, int opcode,
 {
         struct ipath_ibdev *dev = to_idev(qp->ibqp.device);
         struct ib_wc wc;
+        enum ib_wc_status status;
         struct ipath_swqe *wqe;
         int ret = 0;
         u32 ack_psn;
@@ -909,7 +924,7 @@ static int do_rc_ack(struct ipath_qp *qp, u32 aeth, u32 psn, int opcode,
                          */
                         update_last_psn(qp, wqe->psn - 1);
                         /* Retry this request. */
-                        ipath_restart_rc(qp, wqe->psn, &wc);
+                        ipath_restart_rc(qp, wqe->psn);
                         /*
                          * No need to process the ACK/NAK since we are
                          * restarting an earlier request.
@@ -925,32 +940,23 @@ static int do_rc_ack(struct ipath_qp *qp, u32 aeth, u32 psn, int opcode,
                      wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD)) {
                         qp->s_num_rd_atomic--;
                         /* Restart sending task if fence is complete */
-                        if ((qp->s_flags & IPATH_S_FENCE_PENDING) &&
-                            !qp->s_num_rd_atomic) {
-                                qp->s_flags &= ~IPATH_S_FENCE_PENDING;
-                                tasklet_hi_schedule(&qp->s_task);
-                        } else if (qp->s_flags & IPATH_S_RDMAR_PENDING) {
-                                qp->s_flags &= ~IPATH_S_RDMAR_PENDING;
-                                tasklet_hi_schedule(&qp->s_task);
-                        }
+                        if (((qp->s_flags & IPATH_S_FENCE_PENDING) &&
+                             !qp->s_num_rd_atomic) ||
+                            qp->s_flags & IPATH_S_RDMAR_PENDING)
+                                ipath_schedule_send(qp);
                 }
                 /* Post a send completion queue entry if requested. */
                 if (!(qp->s_flags & IPATH_S_SIGNAL_REQ_WR) ||
                     (wqe->wr.send_flags & IB_SEND_SIGNALED)) {
+                        memset(&wc, 0, sizeof wc);
                         wc.wr_id = wqe->wr.wr_id;
                         wc.status = IB_WC_SUCCESS;
                         wc.opcode = ib_ipath_wc_opcode[wqe->wr.opcode];
-                        wc.vendor_err = 0;
                         wc.byte_len = wqe->length;
-                        wc.imm_data = 0;
                         wc.qp = &qp->ibqp;
                         wc.src_qp = qp->remote_qpn;
-                        wc.wc_flags = 0;
-                        wc.pkey_index = 0;
                         wc.slid = qp->remote_ah_attr.dlid;
                         wc.sl = qp->remote_ah_attr.sl;
-                        wc.dlid_path_bits = 0;
-                        wc.port_num = 0;
                         ipath_cq_enter(to_icq(qp->ibqp.send_cq), &wc, 0);
                 }
                 qp->s_retry = qp->s_retry_cnt;
@@ -971,6 +977,8 @@ static int do_rc_ack(struct ipath_qp *qp, u32 aeth, u32 psn, int opcode,
                 } else {
                         if (++qp->s_last >= qp->s_size)
                                 qp->s_last = 0;
+                        if (qp->state == IB_QPS_SQD && qp->s_last == qp->s_cur)
+                                qp->s_draining = 0;
                         if (qp->s_last == qp->s_tail)
                                 break;
                         wqe = get_swqe_ptr(qp, qp->s_last);
@@ -994,7 +1002,7 @@ static int do_rc_ack(struct ipath_qp *qp, u32 aeth, u32 psn, int opcode,
                          */
                         if (ipath_cmp24(qp->s_psn, psn) <= 0) {
                                 reset_psn(qp, psn + 1);
-                                tasklet_hi_schedule(&qp->s_task);
+                                ipath_schedule_send(qp);
                         }
                 } else if (ipath_cmp24(qp->s_psn, psn) <= 0) {
                         qp->s_state = OP(SEND_LAST);
@@ -1012,7 +1020,7 @@ static int do_rc_ack(struct ipath_qp *qp, u32 aeth, u32 psn, int opcode,
                 if (qp->s_last == qp->s_tail)
                         goto bail;
                 if (qp->s_rnr_retry == 0) {
-                        wc.status = IB_WC_RNR_RETRY_EXC_ERR;
+                        status = IB_WC_RNR_RETRY_EXC_ERR;
                         goto class_b;
                 }
                 if (qp->s_rnr_retry_cnt < 7)
@@ -1033,6 +1041,7 @@ static int do_rc_ack(struct ipath_qp *qp, u32 aeth, u32 psn, int opcode,
                         ib_ipath_rnr_table[(aeth >> IPATH_AETH_CREDIT_SHIFT) &
                                            IPATH_AETH_CREDIT_MASK];
                 ipath_insert_rnr_queue(qp);
+                ipath_schedule_send(qp);
                 goto bail;
 
         case 3:         /* NAK */
@@ -1050,37 +1059,25 @@ static int do_rc_ack(struct ipath_qp *qp, u32 aeth, u32 psn, int opcode,
                          * RDMA READ response which terminates the RDMA
                          * READ.
                          */
-                        ipath_restart_rc(qp, psn, &wc);
+                        ipath_restart_rc(qp, psn);
                         break;
 
                 case 1: /* Invalid Request */
-                        wc.status = IB_WC_REM_INV_REQ_ERR;
+                        status = IB_WC_REM_INV_REQ_ERR;
                         dev->n_other_naks++;
                         goto class_b;
 
                 case 2: /* Remote Access Error */
-                        wc.status = IB_WC_REM_ACCESS_ERR;
+                        status = IB_WC_REM_ACCESS_ERR;
                         dev->n_other_naks++;
                         goto class_b;
 
                 case 3: /* Remote Operation Error */
-                        wc.status = IB_WC_REM_OP_ERR;
+                        status = IB_WC_REM_OP_ERR;
                         dev->n_other_naks++;
                 class_b:
-                        wc.wr_id = wqe->wr.wr_id;
-                        wc.opcode = ib_ipath_wc_opcode[wqe->wr.opcode];
-                        wc.vendor_err = 0;
-                        wc.byte_len = 0;
-                        wc.qp = &qp->ibqp;
-                        wc.imm_data = 0;
-                        wc.src_qp = qp->remote_qpn;
-                        wc.wc_flags = 0;
-                        wc.pkey_index = 0;
-                        wc.slid = qp->remote_ah_attr.dlid;
-                        wc.sl = qp->remote_ah_attr.sl;
-                        wc.dlid_path_bits = 0;
-                        wc.port_num = 0;
-                        ipath_sqerror_qp(qp, &wc);
+                        ipath_send_complete(qp, wqe, status);
+                        ipath_error_qp(qp, IB_WC_WR_FLUSH_ERR);
                         break;
 
                 default:
@@ -1126,8 +1123,8 @@ static inline void ipath_rc_rcv_resp(struct ipath_ibdev *dev,
                                      int header_in_data)
 {
         struct ipath_swqe *wqe;
+        enum ib_wc_status status;
         unsigned long flags;
-        struct ib_wc wc;
         int diff;
         u32 pad;
         u32 aeth;
@@ -1135,6 +1132,10 @@ static inline void ipath_rc_rcv_resp(struct ipath_ibdev *dev,
 
         spin_lock_irqsave(&qp->s_lock, flags);
 
+        /* Double check we can process this now that we hold the s_lock. */
+        if (!(ib_ipath_state_ops[qp->state] & IPATH_PROCESS_RECV_OK))
+                goto ack_done;
+
         /* Ignore invalid responses. */
         if (ipath_cmp24(psn, qp->s_next_psn) >= 0)
                 goto ack_done;
@@ -1159,6 +1160,7 @@ static inline void ipath_rc_rcv_resp(struct ipath_ibdev *dev,
         if (unlikely(qp->s_last == qp->s_tail))
                 goto ack_done;
         wqe = get_swqe_ptr(qp, qp->s_last);
+        status = IB_WC_SUCCESS;
 
         switch (opcode) {
         case OP(ACKNOWLEDGE):
@@ -1187,6 +1189,7 @@ static inline void ipath_rc_rcv_resp(struct ipath_ibdev *dev,
                 wqe = get_swqe_ptr(qp, qp->s_last);
                 if (unlikely(wqe->wr.opcode != IB_WR_RDMA_READ))
                         goto ack_op_err;
+                qp->r_flags &= ~IPATH_R_RDMAR_SEQ;
                 /*
                  * If this is a response to a resent RDMA read, we
                  * have to be careful to copy the data to the right
@@ -1200,7 +1203,10 @@ static inline void ipath_rc_rcv_resp(struct ipath_ibdev *dev,
                 /* no AETH, no ACK */
                 if (unlikely(ipath_cmp24(psn, qp->s_last_psn + 1))) {
                         dev->n_rdma_seq++;
-                        ipath_restart_rc(qp, qp->s_last_psn + 1, &wc);
+                        if (qp->r_flags & IPATH_R_RDMAR_SEQ)
+                                goto ack_done;
+                        qp->r_flags |= IPATH_R_RDMAR_SEQ;
+                        ipath_restart_rc(qp, qp->s_last_psn + 1);
                         goto ack_done;
                 }
                 if (unlikely(wqe->wr.opcode != IB_WR_RDMA_READ))
@@ -1261,7 +1267,10 @@ static inline void ipath_rc_rcv_resp(struct ipath_ibdev *dev,
                 /* ACKs READ req. */
                 if (unlikely(ipath_cmp24(psn, qp->s_last_psn + 1))) {
                         dev->n_rdma_seq++;
-                        ipath_restart_rc(qp, qp->s_last_psn + 1, &wc);
+                        if (qp->r_flags & IPATH_R_RDMAR_SEQ)
+                                goto ack_done;
+                        qp->r_flags |= IPATH_R_RDMAR_SEQ;
+                        ipath_restart_rc(qp, qp->s_last_psn + 1);
                         goto ack_done;
                 }
                 if (unlikely(wqe->wr.opcode != IB_WR_RDMA_READ))
@@ -1291,31 +1300,16 @@ static inline void ipath_rc_rcv_resp(struct ipath_ibdev *dev,
                 goto ack_done;
         }
 
-ack_done:
-        spin_unlock_irqrestore(&qp->s_lock, flags);
-        goto bail;
-
 ack_op_err:
-        wc.status = IB_WC_LOC_QP_OP_ERR;
+        status = IB_WC_LOC_QP_OP_ERR;
         goto ack_err;
 
 ack_len_err:
-        wc.status = IB_WC_LOC_LEN_ERR;
+        status = IB_WC_LOC_LEN_ERR;
 ack_err:
-        wc.wr_id = wqe->wr.wr_id;
-        wc.opcode = ib_ipath_wc_opcode[wqe->wr.opcode];
-        wc.vendor_err = 0;
-        wc.byte_len = 0;
-        wc.imm_data = 0;
-        wc.qp = &qp->ibqp;
-        wc.src_qp = qp->remote_qpn;
-        wc.wc_flags = 0;
-        wc.pkey_index = 0;
-        wc.slid = qp->remote_ah_attr.dlid;
-        wc.sl = qp->remote_ah_attr.sl;
-        wc.dlid_path_bits = 0;
-        wc.port_num = 0;
-        ipath_sqerror_qp(qp, &wc);
+        ipath_send_complete(qp, wqe, status);
+        ipath_error_qp(qp, IB_WC_WR_FLUSH_ERR);
+ack_done:
         spin_unlock_irqrestore(&qp->s_lock, flags);
 bail:
         return;
@@ -1384,7 +1378,12 @@ static inline int ipath_rc_rcv_error(struct ipath_ibdev *dev,
         psn &= IPATH_PSN_MASK;
         e = NULL;
         old_req = 1;
+
         spin_lock_irqsave(&qp->s_lock, flags);
+        /* Double check we can process this now that we hold the s_lock. */
+        if (!(ib_ipath_state_ops[qp->state] & IPATH_PROCESS_RECV_OK))
+                goto unlock_done;
+
         for (i = qp->r_head_ack_queue; ; i = prev) {
                 if (i == qp->s_tail_ack_queue)
                         old_req = 0;
@@ -1512,7 +1511,7 @@ static inline int ipath_rc_rcv_error(struct ipath_ibdev *dev,
                 break;
         }
         qp->r_nak_state = 0;
-        tasklet_hi_schedule(&qp->s_task);
+        ipath_schedule_send(qp);
 
 unlock_done:
         spin_unlock_irqrestore(&qp->s_lock, flags);
@@ -1523,13 +1522,12 @@ send_ack:
         return 0;
 }
 
-static void ipath_rc_error(struct ipath_qp *qp, enum ib_wc_status err)
+void ipath_rc_error(struct ipath_qp *qp, enum ib_wc_status err)
 {
         unsigned long flags;
         int lastwqe;
 
         spin_lock_irqsave(&qp->s_lock, flags);
-        qp->state = IB_QPS_ERR;
         lastwqe = ipath_error_qp(qp, err);
         spin_unlock_irqrestore(&qp->s_lock, flags);
 
@@ -1545,18 +1543,15 @@ static void ipath_rc_error(struct ipath_qp *qp, enum ib_wc_status err)
 
 static inline void ipath_update_ack_queue(struct ipath_qp *qp, unsigned n)
 {
-        unsigned long flags;
         unsigned next;
 
         next = n + 1;
         if (next > IPATH_MAX_RDMA_ATOMIC)
                 next = 0;
-        spin_lock_irqsave(&qp->s_lock, flags);
         if (n == qp->s_tail_ack_queue) {
                 qp->s_tail_ack_queue = next;
                 qp->s_ack_state = OP(ACKNOWLEDGE);
         }
-        spin_unlock_irqrestore(&qp->s_lock, flags);
 }
 
 /**
@@ -1585,6 +1580,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
         int diff;
         struct ib_reth *reth;
         int header_in_data;
+        unsigned long flags;
 
         /* Validate the SLID. See Ch. 9.6.1.5 */
         if (unlikely(be16_to_cpu(hdr->lrh[3]) != qp->remote_ah_attr.dlid))
@@ -1643,11 +1639,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
                     opcode == OP(SEND_LAST) ||
                     opcode == OP(SEND_LAST_WITH_IMMEDIATE))
                         break;
-        nack_inv:
-                ipath_rc_error(qp, IB_WC_REM_INV_REQ_ERR);
-                qp->r_nak_state = IB_NAK_INVALID_REQUEST;
-                qp->r_ack_psn = qp->r_psn;
-                goto send_ack;
+                goto nack_inv;
 
         case OP(RDMA_WRITE_FIRST):
         case OP(RDMA_WRITE_MIDDLE):
@@ -1673,18 +1665,13 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
                 break;
         }
 
-        wc.imm_data = 0;
-        wc.wc_flags = 0;
+        memset(&wc, 0, sizeof wc);
 
         /* OK, process the packet. */
         switch (opcode) {
         case OP(SEND_FIRST):
-                if (!ipath_get_rwqe(qp, 0)) {
-                rnr_nak:
-                        qp->r_nak_state = IB_RNR_NAK | qp->r_min_rnr_timer;
-                        qp->r_ack_psn = qp->r_psn;
-                        goto send_ack;
-                }
+                if (!ipath_get_rwqe(qp, 0))
+                        goto rnr_nak;
                 qp->r_rcv_len = 0;
                 /* FALLTHROUGH */
         case OP(SEND_MIDDLE):
@@ -1741,9 +1728,8 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
                         goto nack_inv;
                 ipath_copy_sge(&qp->r_sge, data, tlen);
                 qp->r_msn++;
-                if (!qp->r_wrid_valid)
+                if (!test_and_clear_bit(IPATH_R_WRID_VALID, &qp->r_aflags))
                         break;
-                qp->r_wrid_valid = 0;
                 wc.wr_id = qp->r_wr_id;
                 wc.status = IB_WC_SUCCESS;
                 if (opcode == OP(RDMA_WRITE_LAST_WITH_IMMEDIATE) ||
@@ -1751,14 +1737,10 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
                         wc.opcode = IB_WC_RECV_RDMA_WITH_IMM;
                 else
                         wc.opcode = IB_WC_RECV;
-                wc.vendor_err = 0;
                 wc.qp = &qp->ibqp;
                 wc.src_qp = qp->remote_qpn;
-                wc.pkey_index = 0;
                 wc.slid = qp->remote_ah_attr.dlid;
                 wc.sl = qp->remote_ah_attr.sl;
-                wc.dlid_path_bits = 0;
-                wc.port_num = 0;
                 /* Signal completion event if the solicited bit is set. */
                 ipath_cq_enter(to_icq(qp->ibqp.recv_cq), &wc,
                                (ohdr->bth[0] &
@@ -1819,9 +1801,13 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
                 next = qp->r_head_ack_queue + 1;
                 if (next > IPATH_MAX_RDMA_ATOMIC)
                         next = 0;
+                spin_lock_irqsave(&qp->s_lock, flags);
+                /* Double check we can process this while holding the s_lock. */
+                if (!(ib_ipath_state_ops[qp->state] & IPATH_PROCESS_RECV_OK))
+                        goto unlock;
                 if (unlikely(next == qp->s_tail_ack_queue)) {
                         if (!qp->s_ack_queue[next].sent)
-                                goto nack_inv;
+                                goto nack_inv_unlck;
                         ipath_update_ack_queue(qp, next);
                 }
                 e = &qp->s_ack_queue[qp->r_head_ack_queue];
@@ -1842,7 +1828,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
                         ok = ipath_rkey_ok(qp, &e->rdma_sge, len, vaddr,
                                            rkey, IB_ACCESS_REMOTE_READ);
                         if (unlikely(!ok))
-                                goto nack_acc;
+                                goto nack_acc_unlck;
                         /*
                          * Update the next expected PSN.  We add 1 later
                          * below, so only add the remainder here.
@@ -1869,13 +1855,12 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
                 qp->r_psn++;
                 qp->r_state = opcode;
                 qp->r_nak_state = 0;
-                barrier();
                 qp->r_head_ack_queue = next;
 
-                /* Call ipath_do_rc_send() in another thread. */
-                tasklet_hi_schedule(&qp->s_task);
+                /* Schedule the send tasklet. */
+                ipath_schedule_send(qp);
 
-                goto done;
+                goto unlock;
         }
 
         case OP(COMPARE_SWAP):
@@ -1894,9 +1879,13 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
                 next = qp->r_head_ack_queue + 1;
                 if (next > IPATH_MAX_RDMA_ATOMIC)
                         next = 0;
+                spin_lock_irqsave(&qp->s_lock, flags);
+                /* Double check we can process this while holding the s_lock. */
+                if (!(ib_ipath_state_ops[qp->state] & IPATH_PROCESS_RECV_OK))
+                        goto unlock;
                 if (unlikely(next == qp->s_tail_ack_queue)) {
                         if (!qp->s_ack_queue[next].sent)
-                                goto nack_inv;
+                                goto nack_inv_unlck;
                         ipath_update_ack_queue(qp, next);
                 }
                 if (!header_in_data)
@@ -1906,13 +1895,13 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
                 vaddr = ((u64) be32_to_cpu(ateth->vaddr[0]) << 32) |
                         be32_to_cpu(ateth->vaddr[1]);
                 if (unlikely(vaddr & (sizeof(u64) - 1)))
-                        goto nack_inv;
+                        goto nack_inv_unlck;
                 rkey = be32_to_cpu(ateth->rkey);
                 /* Check rkey & NAK */
                 if (unlikely(!ipath_rkey_ok(qp, &qp->r_sge,
                                             sizeof(u64), vaddr, rkey,
                                             IB_ACCESS_REMOTE_ATOMIC)))
-                        goto nack_acc;
+                        goto nack_acc_unlck;
                 /* Perform atomic OP and save result. */
                 maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
                 sdata = be64_to_cpu(ateth->swap_data);
@@ -1929,13 +1918,12 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
                 qp->r_psn++;
                 qp->r_state = opcode;
                 qp->r_nak_state = 0;
-                barrier();
                 qp->r_head_ack_queue = next;
 
-                /* Call ipath_do_rc_send() in another thread. */
-                tasklet_hi_schedule(&qp->s_task);
+                /* Schedule the send tasklet. */
+                ipath_schedule_send(qp);
 
-                goto done;
+                goto unlock;
         }
 
         default:
@@ -1951,14 +1939,31 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
                 goto send_ack;
         goto done;
 
+rnr_nak:
+        qp->r_nak_state = IB_RNR_NAK | qp->r_min_rnr_timer;
+        qp->r_ack_psn = qp->r_psn;
+        goto send_ack;
+
+nack_inv_unlck:
+        spin_unlock_irqrestore(&qp->s_lock, flags);
+nack_inv:
+        ipath_rc_error(qp, IB_WC_LOC_QP_OP_ERR);
+        qp->r_nak_state = IB_NAK_INVALID_REQUEST;
+        qp->r_ack_psn = qp->r_psn;
+        goto send_ack;
+
+nack_acc_unlck:
+        spin_unlock_irqrestore(&qp->s_lock, flags);
 nack_acc:
-        ipath_rc_error(qp, IB_WC_REM_ACCESS_ERR);
+        ipath_rc_error(qp, IB_WC_LOC_PROT_ERR);
         qp->r_nak_state = IB_NAK_REMOTE_ACCESS_ERROR;
         qp->r_ack_psn = qp->r_psn;
-
 send_ack:
         send_rc_ack(qp);
+        goto done;
 
+unlock:
+        spin_unlock_irqrestore(&qp->s_lock, flags);
 done:
         return;
 }
diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
index 9e3fe61cbd08..a4b5521567fe 100644
--- a/drivers/infiniband/hw/ipath/ipath_ruc.c
+++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007 QLogic Corporation. All rights reserved.
+ * Copyright (c) 2006, 2007, 2008 QLogic Corporation. All rights reserved.
  * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -78,6 +78,7 @@ const u32 ib_ipath_rnr_table[32] = {
  * ipath_insert_rnr_queue - put QP on the RNR timeout list for the device
  * @qp: the QP
  *
+ * Called with the QP s_lock held and interrupts disabled.
  * XXX Use a simple list for now.  We might need a priority
  * queue if we have lots of QPs waiting for RNR timeouts
  * but that should be rare.
@@ -85,9 +86,9 @@ const u32 ib_ipath_rnr_table[32] = {
 void ipath_insert_rnr_queue(struct ipath_qp *qp)
 {
         struct ipath_ibdev *dev = to_idev(qp->ibqp.device);
-        unsigned long flags;
 
-        spin_lock_irqsave(&dev->pending_lock, flags);
+        /* We already did a spin_lock_irqsave(), so just use spin_lock */
+        spin_lock(&dev->pending_lock);
         if (list_empty(&dev->rnrwait))
                 list_add(&qp->timerwait, &dev->rnrwait);
         else {
@@ -109,7 +110,7 @@ void ipath_insert_rnr_queue(struct ipath_qp *qp)
                         nqp->s_rnr_timeout -= qp->s_rnr_timeout;
                 list_add(&qp->timerwait, l);
         }
-        spin_unlock_irqrestore(&dev->pending_lock, flags);
+        spin_unlock(&dev->pending_lock);
 }
 
 /**
@@ -140,20 +141,11 @@ int ipath_init_sge(struct ipath_qp *qp, struct ipath_rwqe *wqe,
         goto bail;
 
 bad_lkey:
+        memset(&wc, 0, sizeof(wc));
         wc.wr_id = wqe->wr_id;
         wc.status = IB_WC_LOC_PROT_ERR;
         wc.opcode = IB_WC_RECV;
-        wc.vendor_err = 0;
-        wc.byte_len = 0;
-        wc.imm_data = 0;
         wc.qp = &qp->ibqp;
-        wc.src_qp = 0;
-        wc.wc_flags = 0;
-        wc.pkey_index = 0;
-        wc.slid = 0;
-        wc.sl = 0;
-        wc.dlid_path_bits = 0;
-        wc.port_num = 0;
         /* Signal solicited completion event. */
         ipath_cq_enter(to_icq(qp->ibqp.recv_cq), &wc, 1);
         ret = 0;
@@ -194,6 +186,11 @@ int ipath_get_rwqe(struct ipath_qp *qp, int wr_id_only)
         }
 
         spin_lock_irqsave(&rq->lock, flags);
+        if (!(ib_ipath_state_ops[qp->state] & IPATH_PROCESS_RECV_OK)) {
+                ret = 0;
+                goto unlock;
+        }
+
         wq = rq->wq;
         tail = wq->tail;
         /* Validate tail before using it since it is user writable. */
@@ -201,9 +198,8 @@ int ipath_get_rwqe(struct ipath_qp *qp, int wr_id_only)
                 tail = 0;
         do {
                 if (unlikely(tail == wq->head)) {
-                        spin_unlock_irqrestore(&rq->lock, flags);
                         ret = 0;
-                        goto bail;
+                        goto unlock;
                 }
                 /* Make sure entry is read after head index is read. */
                 smp_rmb();
@@ -216,7 +212,7 @@ int ipath_get_rwqe(struct ipath_qp *qp, int wr_id_only)
         wq->tail = tail;
 
         ret = 1;
-        qp->r_wrid_valid = 1;
+        set_bit(IPATH_R_WRID_VALID, &qp->r_aflags);
         if (handler) {
                 u32 n;
 
@@ -243,8 +239,8 @@ int ipath_get_rwqe(struct ipath_qp *qp, int wr_id_only)
                         goto bail;
                 }
         }
+unlock:
         spin_unlock_irqrestore(&rq->lock, flags);
-
 bail:
         return ret;
 }
@@ -270,38 +266,63 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
         struct ib_wc wc;
         u64 sdata;
         atomic64_t *maddr;
+        enum ib_wc_status send_status;
 
+        /*
+         * Note that we check the responder QP state after
+         * checking the requester's state.
+         */
         qp = ipath_lookup_qpn(&dev->qp_table, sqp->remote_qpn);
-        if (!qp) {
-                dev->n_pkt_drops++;
-                return;
-        }
 
-again:
         spin_lock_irqsave(&sqp->s_lock, flags);
 
-        if (!(ib_ipath_state_ops[sqp->state] & IPATH_PROCESS_SEND_OK) ||
-            sqp->s_rnr_timeout) {
-                spin_unlock_irqrestore(&sqp->s_lock, flags);
-                goto done;
-        }
+        /* Return if we are already busy processing a work request. */
+        if ((sqp->s_flags & (IPATH_S_BUSY | IPATH_S_ANY_WAIT)) ||
+            !(ib_ipath_state_ops[sqp->state] & IPATH_PROCESS_OR_FLUSH_SEND))
+                goto unlock;
 
-        /* Get the next send request. */
-        if (sqp->s_last == sqp->s_head) {
-                /* Send work queue is empty. */
-                spin_unlock_irqrestore(&sqp->s_lock, flags);
-                goto done;
+        sqp->s_flags |= IPATH_S_BUSY;
+
+again:
+        if (sqp->s_last == sqp->s_head)
+                goto clr_busy;
+        wqe = get_swqe_ptr(sqp, sqp->s_last);
+
+        /* Return if it is not OK to start a new work reqeust. */
+        if (!(ib_ipath_state_ops[sqp->state] & IPATH_PROCESS_NEXT_SEND_OK)) {
+                if (!(ib_ipath_state_ops[sqp->state] & IPATH_FLUSH_SEND))
+                        goto clr_busy;
+                /* We are in the error state, flush the work request. */
+                send_status = IB_WC_WR_FLUSH_ERR;
+                goto flush_send;
         }
 
         /*
          * We can rely on the entry not changing without the s_lock
          * being held until we update s_last.
+         * We increment s_cur to indicate s_last is in progress.
          */
-        wqe = get_swqe_ptr(sqp, sqp->s_last);
+        if (sqp->s_last == sqp->s_cur) {
+                if (++sqp->s_cur >= sqp->s_size)
+                        sqp->s_cur = 0;
+        }
         spin_unlock_irqrestore(&sqp->s_lock, flags);
 
-        wc.wc_flags = 0;
-        wc.imm_data = 0;
+        if (!qp || !(ib_ipath_state_ops[qp->state] & IPATH_PROCESS_RECV_OK)) {
+                dev->n_pkt_drops++;
+                /*
+                 * For RC, the requester would timeout and retry so
+                 * shortcut the timeouts and just signal too many retries.
+                 */
+                if (sqp->ibqp.qp_type == IB_QPT_RC)
+                        send_status = IB_WC_RETRY_EXC_ERR;
+                else
+                        send_status = IB_WC_SUCCESS;
+                goto serr;
+        }
+
+        memset(&wc, 0, sizeof wc);
+        send_status = IB_WC_SUCCESS;
 
         sqp->s_sge.sge = wqe->sg_list[0];
         sqp->s_sge.sg_list = wqe->sg_list + 1;
@@ -313,75 +334,33 @@ again:
                 wc.imm_data = wqe->wr.ex.imm_data;
                 /* FALLTHROUGH */
         case IB_WR_SEND:
-                if (!ipath_get_rwqe(qp, 0)) {
-                rnr_nak:
-                        /* Handle RNR NAK */
-                        if (qp->ibqp.qp_type == IB_QPT_UC)
-                                goto send_comp;
-                        if (sqp->s_rnr_retry == 0) {
-                                wc.status = IB_WC_RNR_RETRY_EXC_ERR;
-                                goto err;
-                        }
-                        if (sqp->s_rnr_retry_cnt < 7)
-                                sqp->s_rnr_retry--;
-                        dev->n_rnr_naks++;
-                        sqp->s_rnr_timeout =
-                                ib_ipath_rnr_table[qp->r_min_rnr_timer];
-                        ipath_insert_rnr_queue(sqp);
-                        goto done;
-                }
+                if (!ipath_get_rwqe(qp, 0))
+                        goto rnr_nak;
                 break;
 
         case IB_WR_RDMA_WRITE_WITH_IMM:
-                if (unlikely(!(qp->qp_access_flags &
-                               IB_ACCESS_REMOTE_WRITE))) {
-                        wc.status = IB_WC_REM_INV_REQ_ERR;
-                        goto err;
-                }
+                if (unlikely(!(qp->qp_access_flags & IB_ACCESS_REMOTE_WRITE)))
+                        goto inv_err;
                 wc.wc_flags = IB_WC_WITH_IMM;
                 wc.imm_data = wqe->wr.ex.imm_data;
                 if (!ipath_get_rwqe(qp, 1))
                         goto rnr_nak;
                 /* FALLTHROUGH */
         case IB_WR_RDMA_WRITE:
-                if (unlikely(!(qp->qp_access_flags &
-                               IB_ACCESS_REMOTE_WRITE))) {
-                        wc.status = IB_WC_REM_INV_REQ_ERR;
-                        goto err;
-                }
+                if (unlikely(!(qp->qp_access_flags & IB_ACCESS_REMOTE_WRITE)))
+                        goto inv_err;
                 if (wqe->length == 0)
                         break;
                 if (unlikely(!ipath_rkey_ok(qp, &qp->r_sge, wqe->length,
                                             wqe->wr.wr.rdma.remote_addr,
                                             wqe->wr.wr.rdma.rkey,
-                                            IB_ACCESS_REMOTE_WRITE))) {
-                acc_err:
-                        wc.status = IB_WC_REM_ACCESS_ERR;
-                err:
-                        wc.wr_id = wqe->wr.wr_id;
-                        wc.opcode = ib_ipath_wc_opcode[wqe->wr.opcode];
-                        wc.vendor_err = 0;
-                        wc.byte_len = 0;
-                        wc.qp = &sqp->ibqp;
-                        wc.src_qp = sqp->remote_qpn;
-                        wc.pkey_index = 0;
-                        wc.slid = sqp->remote_ah_attr.dlid;
-                        wc.sl = sqp->remote_ah_attr.sl;
-                        wc.dlid_path_bits = 0;
-                        wc.port_num = 0;
-                        spin_lock_irqsave(&sqp->s_lock, flags);
-                        ipath_sqerror_qp(sqp, &wc);
-                        spin_unlock_irqrestore(&sqp->s_lock, flags);
-                        goto done;
-                }
+                                            IB_ACCESS_REMOTE_WRITE)))
+                        goto acc_err;
                 break;
 
         case IB_WR_RDMA_READ:
-                if (unlikely(!(qp->qp_access_flags &
-                               IB_ACCESS_REMOTE_READ))) {
-                        wc.status = IB_WC_REM_INV_REQ_ERR;
-                        goto err;
-                }
+                if (unlikely(!(qp->qp_access_flags & IB_ACCESS_REMOTE_READ)))
+                        goto inv_err;
                 if (unlikely(!ipath_rkey_ok(qp, &sqp->s_sge, wqe->length,
                                             wqe->wr.wr.rdma.remote_addr,
                                             wqe->wr.wr.rdma.rkey,
@@ -394,11 +373,8 @@ again:
 
         case IB_WR_ATOMIC_CMP_AND_SWP:
         case IB_WR_ATOMIC_FETCH_AND_ADD:
-                if (unlikely(!(qp->qp_access_flags &
-                               IB_ACCESS_REMOTE_ATOMIC))) {
-                        wc.status = IB_WC_REM_INV_REQ_ERR;
-                        goto err;
-                }
+                if (unlikely(!(qp->qp_access_flags & IB_ACCESS_REMOTE_ATOMIC)))
+                        goto inv_err;
                 if (unlikely(!ipath_rkey_ok(qp, &qp->r_sge, sizeof(u64),
                                             wqe->wr.wr.atomic.remote_addr,
                                             wqe->wr.wr.atomic.rkey,
@@ -415,7 +391,8 @@ again:
                 goto send_comp;
 
         default:
-                goto done;
+                send_status = IB_WC_LOC_QP_OP_ERR;
+                goto serr;
         }
 
         sge = &sqp->s_sge.sge;
@@ -448,8 +425,7 @@ again:
                 sqp->s_len -= len;
         }
 
-        if (wqe->wr.opcode == IB_WR_RDMA_WRITE ||
-            wqe->wr.opcode == IB_WR_RDMA_READ)
+        if (!test_and_clear_bit(IPATH_R_WRID_VALID, &qp->r_aflags))
                 goto send_comp;
 
         if (wqe->wr.opcode == IB_WR_RDMA_WRITE_WITH_IMM)
@@ -458,33 +434,89 @@ again:
                 wc.opcode = IB_WC_RECV;
         wc.wr_id = qp->r_wr_id;
         wc.status = IB_WC_SUCCESS;
-        wc.vendor_err = 0;
         wc.byte_len = wqe->length;
         wc.qp = &qp->ibqp;
         wc.src_qp = qp->remote_qpn;
-        wc.pkey_index = 0;
         wc.slid = qp->remote_ah_attr.dlid;
         wc.sl = qp->remote_ah_attr.sl;
-        wc.dlid_path_bits = 0;
         wc.port_num = 1;
         /* Signal completion event if the solicited bit is set. */
         ipath_cq_enter(to_icq(qp->ibqp.recv_cq), &wc,
                        wqe->wr.send_flags & IB_SEND_SOLICITED);
 
 send_comp:
+        spin_lock_irqsave(&sqp->s_lock, flags);
+flush_send:
         sqp->s_rnr_retry = sqp->s_rnr_retry_cnt;
-        ipath_send_complete(sqp, wqe, IB_WC_SUCCESS);
+        ipath_send_complete(sqp, wqe, send_status);
         goto again;
 
+rnr_nak:
+        /* Handle RNR NAK */
+        if (qp->ibqp.qp_type == IB_QPT_UC)
+                goto send_comp;
+        /*
+         * Note: we don't need the s_lock held since the BUSY flag
+         * makes this single threaded.
+         */
+        if (sqp->s_rnr_retry == 0) {
+                send_status = IB_WC_RNR_RETRY_EXC_ERR;
+                goto serr;
+        }
+        if (sqp->s_rnr_retry_cnt < 7)
+                sqp->s_rnr_retry--;
+        spin_lock_irqsave(&sqp->s_lock, flags);
+        if (!(ib_ipath_state_ops[sqp->state] & IPATH_PROCESS_RECV_OK))
+                goto clr_busy;
+        sqp->s_flags |= IPATH_S_WAITING;
+        dev->n_rnr_naks++;
+        sqp->s_rnr_timeout = ib_ipath_rnr_table[qp->r_min_rnr_timer];
+        ipath_insert_rnr_queue(sqp);
+        goto clr_busy;
+
+inv_err:
+        send_status = IB_WC_REM_INV_REQ_ERR;
+        wc.status = IB_WC_LOC_QP_OP_ERR;
+        goto err;
+
+acc_err:
+        send_status = IB_WC_REM_ACCESS_ERR;
+        wc.status = IB_WC_LOC_PROT_ERR;
+err:
+        /* responder goes to error state */
+        ipath_rc_error(qp, wc.status);
+
+serr:
+        spin_lock_irqsave(&sqp->s_lock, flags);
+        ipath_send_complete(sqp, wqe, send_status);
+        if (sqp->ibqp.qp_type == IB_QPT_RC) {
+                int lastwqe = ipath_error_qp(sqp, IB_WC_WR_FLUSH_ERR);
+
+                sqp->s_flags &= ~IPATH_S_BUSY;
+                spin_unlock_irqrestore(&sqp->s_lock, flags);
+                if (lastwqe) {
+                        struct ib_event ev;
+
+                        ev.device = sqp->ibqp.device;
+                        ev.element.qp = &sqp->ibqp;
+                        ev.event = IB_EVENT_QP_LAST_WQE_REACHED;
+                        sqp->ibqp.event_handler(&ev, sqp->ibqp.qp_context);
+                }
+                goto done;
+        }
+clr_busy:
+        sqp->s_flags &= ~IPATH_S_BUSY;
+unlock:
+        spin_unlock_irqrestore(&sqp->s_lock, flags);
 done:
-        if (atomic_dec_and_test(&qp->refcount))
+        if (qp && atomic_dec_and_test(&qp->refcount))
                 wake_up(&qp->wait);
 }
 
 static void want_buffer(struct ipath_devdata *dd, struct ipath_qp *qp)
 {
         if (!(dd->ipath_flags & IPATH_HAS_SEND_DMA) ||
-                qp->ibqp.qp_type == IB_QPT_SMI) {
+            qp->ibqp.qp_type == IB_QPT_SMI) {
                 unsigned long flags;
 
                 spin_lock_irqsave(&dd->ipath_sendctrl_lock, flags);
@@ -502,26 +534,36 @@ static void want_buffer(struct ipath_devdata *dd, struct ipath_qp *qp)
  * @dev: the device we ran out of buffers on
  *
  * Called when we run out of PIO buffers.
+ * If we are now in the error state, return zero to flush the
+ * send work request.
  */
-static void ipath_no_bufs_available(struct ipath_qp *qp,
+static int ipath_no_bufs_available(struct ipath_qp *qp,
                                     struct ipath_ibdev *dev)
 {
         unsigned long flags;
+        int ret = 1;
 
         /*
          * Note that as soon as want_buffer() is called and
          * possibly before it returns, ipath_ib_piobufavail()
-         * could be called.  If we are still in the tasklet function,
-         * tasklet_hi_schedule() will not call us until the next time
-         * tasklet_hi_schedule() is called.
-         * We leave the busy flag set so that another post send doesn't
-         * try to put the same QP on the piowait list again.
+         * could be called. Therefore, put QP on the piowait list before
+         * enabling the PIO avail interrupt.
          */
-        spin_lock_irqsave(&dev->pending_lock, flags);
-        list_add_tail(&qp->piowait, &dev->piowait);
-        spin_unlock_irqrestore(&dev->pending_lock, flags);
-        want_buffer(dev->dd, qp);
-        dev->n_piowait++;
+        spin_lock_irqsave(&qp->s_lock, flags);
+        if (ib_ipath_state_ops[qp->state] & IPATH_PROCESS_SEND_OK) {
+                dev->n_piowait++;
+                qp->s_flags |= IPATH_S_WAITING;
+                qp->s_flags &= ~IPATH_S_BUSY;
+                spin_lock(&dev->pending_lock);
+                if (list_empty(&qp->piowait))
+                        list_add_tail(&qp->piowait, &dev->piowait);
+                spin_unlock(&dev->pending_lock);
+        } else
+                ret = 0;
+        spin_unlock_irqrestore(&qp->s_lock, flags);
+        if (ret)
+                want_buffer(dev->dd, qp);
+        return ret;
 }
 
 /**
@@ -597,15 +639,13 @@ void ipath_do_send(unsigned long data)
         struct ipath_qp *qp = (struct ipath_qp *)data;
         struct ipath_ibdev *dev = to_idev(qp->ibqp.device);
         int (*make_req)(struct ipath_qp *qp);
-
-        if (test_and_set_bit(IPATH_S_BUSY, &qp->s_busy))
-                goto bail;
+        unsigned long flags;
 
         if ((qp->ibqp.qp_type == IB_QPT_RC ||
              qp->ibqp.qp_type == IB_QPT_UC) &&
             qp->remote_ah_attr.dlid == dev->dd->ipath_lid) {
                 ipath_ruc_loopback(qp);
-                goto clear;
+                goto bail;
         }
 
         if (qp->ibqp.qp_type == IB_QPT_RC)
@@ -615,6 +655,19 @@ void ipath_do_send(unsigned long data)
         else
                make_req = ipath_make_ud_req;
 
+        spin_lock_irqsave(&qp->s_lock, flags);
+
+        /* Return if we are already busy processing a work request. */
+        if ((qp->s_flags & (IPATH_S_BUSY | IPATH_S_ANY_WAIT)) ||
+            !(ib_ipath_state_ops[qp->state] & IPATH_PROCESS_OR_FLUSH_SEND)) {
+                spin_unlock_irqrestore(&qp->s_lock, flags);
+                goto bail;
+        }
+
+        qp->s_flags |= IPATH_S_BUSY;
+
+        spin_unlock_irqrestore(&qp->s_lock, flags);
+
 again:
         /* Check for a constructed packet to be sent. */
         if (qp->s_hdrwords != 0) {
@@ -624,8 +677,8 @@ again:
                  */
                 if (ipath_verbs_send(qp, &qp->s_hdr, qp->s_hdrwords,
                                      qp->s_cur_sge, qp->s_cur_size)) {
-                        ipath_no_bufs_available(qp, dev);
-                        goto bail;
+                        if (ipath_no_bufs_available(qp, dev))
+                                goto bail;
                 }
                 dev->n_unicast_xmit++;
                 /* Record that we sent the packet and s_hdr is empty. */
@@ -634,16 +687,20 @@ again:
 
         if (make_req(qp))
                 goto again;
-clear:
-        clear_bit(IPATH_S_BUSY, &qp->s_busy);
+
 bail:;
 }
 
+/*
+ * This should be called with s_lock held.
+ */
 void ipath_send_complete(struct ipath_qp *qp, struct ipath_swqe *wqe,
                          enum ib_wc_status status)
 {
-        unsigned long flags;
-        u32 last;
+        u32 old_last, last;
+
+        if (!(ib_ipath_state_ops[qp->state] & IPATH_PROCESS_OR_FLUSH_SEND))
+                return;
 
         /* See ch. 11.2.4.1 and 10.7.3.1 */
         if (!(qp->s_flags & IPATH_S_SIGNAL_REQ_WR) ||
@@ -651,27 +708,25 @@ void ipath_send_complete(struct ipath_qp *qp, struct ipath_swqe *wqe,
             status != IB_WC_SUCCESS) {
                 struct ib_wc wc;
 
+                memset(&wc, 0, sizeof wc);
                 wc.wr_id = wqe->wr.wr_id;
                 wc.status = status;
                 wc.opcode = ib_ipath_wc_opcode[wqe->wr.opcode];
-                wc.vendor_err = 0;
-                wc.byte_len = wqe->length;
-                wc.imm_data = 0;
                 wc.qp = &qp->ibqp;
-                wc.src_qp = 0;
-                wc.wc_flags = 0;
-                wc.pkey_index = 0;
-                wc.slid = 0;
-                wc.sl = 0;
-                wc.dlid_path_bits = 0;
-                wc.port_num = 0;
-                ipath_cq_enter(to_icq(qp->ibqp.send_cq), &wc, 0);
+                if (status == IB_WC_SUCCESS)
+                        wc.byte_len = wqe->length;
+                ipath_cq_enter(to_icq(qp->ibqp.send_cq), &wc,
+                               status != IB_WC_SUCCESS);
         }
 
-        spin_lock_irqsave(&qp->s_lock, flags);
-        last = qp->s_last;
+        old_last = last = qp->s_last;
         if (++last >= qp->s_size)
                 last = 0;
         qp->s_last = last;
-        spin_unlock_irqrestore(&qp->s_lock, flags);
+        if (qp->s_cur == old_last)
+                qp->s_cur = last;
+        if (qp->s_tail == old_last)
+                qp->s_tail = last;
+        if (qp->state == IB_QPS_SQD && last == qp->s_cur)
+                qp->s_draining = 0;
 }
diff --git a/drivers/infiniband/hw/ipath/ipath_uc.c b/drivers/infiniband/hw/ipath/ipath_uc.c
index bfe8926b5514..7fd18e833907 100644
--- a/drivers/infiniband/hw/ipath/ipath_uc.c
+++ b/drivers/infiniband/hw/ipath/ipath_uc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007 QLogic Corporation. All rights reserved.
+ * Copyright (c) 2006, 2007, 2008 QLogic Corporation. All rights reserved.
  * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -47,14 +47,30 @@ int ipath_make_uc_req(struct ipath_qp *qp)
 {
         struct ipath_other_headers *ohdr;
         struct ipath_swqe *wqe;
+        unsigned long flags;
         u32 hwords;
         u32 bth0;
         u32 len;
         u32 pmtu = ib_mtu_enum_to_int(qp->path_mtu);
         int ret = 0;
 
-        if (!(ib_ipath_state_ops[qp->state] & IPATH_PROCESS_SEND_OK))
+        spin_lock_irqsave(&qp->s_lock, flags);
+
+        if (!(ib_ipath_state_ops[qp->state] & IPATH_PROCESS_SEND_OK)) {
+                if (!(ib_ipath_state_ops[qp->state] & IPATH_FLUSH_SEND))
+                        goto bail;
+                /* We are in the error state, flush the work request. */
+                if (qp->s_last == qp->s_head)
+                        goto bail;
+                /* If DMAs are in progress, we can't flush immediately. */
+                if (atomic_read(&qp->s_dma_busy)) {
+                        qp->s_flags |= IPATH_S_WAIT_DMA;
+                        goto bail;
+                }
+                wqe = get_swqe_ptr(qp, qp->s_last);
+                ipath_send_complete(qp, wqe, IB_WC_WR_FLUSH_ERR);
                 goto done;
+        }
 
         ohdr = &qp->s_hdr.u.oth;
         if (qp->remote_ah_attr.ah_flags & IB_AH_GRH)
@@ -69,9 +85,12 @@ int ipath_make_uc_req(struct ipath_qp *qp)
         qp->s_wqe = NULL;
         switch (qp->s_state) {
         default:
+                if (!(ib_ipath_state_ops[qp->state] &
+                    IPATH_PROCESS_NEXT_SEND_OK))
+                        goto bail;
                 /* Check if send work queue is empty. */
                 if (qp->s_cur == qp->s_head)
-                        goto done;
+                        goto bail;
                 /*
                  * Start a new request.
                  */
@@ -134,7 +153,7 @@ int ipath_make_uc_req(struct ipath_qp *qp)
                         break;
 
                 default:
-                        goto done;
+                        goto bail;
                 }
                 break;
 
@@ -194,9 +213,14 @@ int ipath_make_uc_req(struct ipath_qp *qp)
         ipath_make_ruc_header(to_idev(qp->ibqp.device),
                               qp, ohdr, bth0 | (qp->s_state << 24),
                               qp->s_next_psn++ & IPATH_PSN_MASK);
+done:
         ret = 1;
+        goto unlock;
 
-done:
+bail:
+        qp->s_flags &= ~IPATH_S_BUSY;
+unlock:
+        spin_unlock_irqrestore(&qp->s_lock, flags);
         return ret;
 }
 
@@ -258,8 +282,7 @@ void ipath_uc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
          */
         opcode = be32_to_cpu(ohdr->bth[0]) >> 24;
 
-        wc.imm_data = 0;
-        wc.wc_flags = 0;
+        memset(&wc, 0, sizeof wc);
 
         /* Compare the PSN verses the expected PSN. */
         if (unlikely(ipath_cmp24(psn, qp->r_psn) != 0)) {
@@ -322,8 +345,8 @@ void ipath_uc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
         case OP(SEND_ONLY):
         case OP(SEND_ONLY_WITH_IMMEDIATE):
         send_first:
-                if (qp->r_reuse_sge) {
-                        qp->r_reuse_sge = 0;
+                if (qp->r_flags & IPATH_R_REUSE_SGE) {
+                        qp->r_flags &= ~IPATH_R_REUSE_SGE;
                         qp->r_sge = qp->s_rdma_read_sge;
                 } else if (!ipath_get_rwqe(qp, 0)) {
                         dev->n_pkt_drops++;
@@ -340,13 +363,13 @@ void ipath_uc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
         case OP(SEND_MIDDLE):
                 /* Check for invalid length PMTU or posted rwqe len. */
                 if (unlikely(tlen != (hdrsize + pmtu + 4))) {
-                        qp->r_reuse_sge = 1;
+                        qp->r_flags |= IPATH_R_REUSE_SGE;
                         dev->n_pkt_drops++;
                         goto done;
                 }
                 qp->r_rcv_len += pmtu;
                 if (unlikely(qp->r_rcv_len > qp->r_len)) {
-                        qp->r_reuse_sge = 1;
+                        qp->r_flags |= IPATH_R_REUSE_SGE;
                         dev->n_pkt_drops++;
                         goto done;
                 }
@@ -372,7 +395,7 @@ void ipath_uc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
                 /* Check for invalid length. */
                 /* XXX LAST len should be >= 1 */
                 if (unlikely(tlen < (hdrsize + pad + 4))) {
-                        qp->r_reuse_sge = 1;
+                        qp->r_flags |= IPATH_R_REUSE_SGE;
                         dev->n_pkt_drops++;
                         goto done;
                 }
@@ -380,7 +403,7 @@ void ipath_uc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
                 tlen -= (hdrsize + pad + 4);
                 wc.byte_len = tlen + qp->r_rcv_len;
                 if (unlikely(wc.byte_len > qp->r_len)) {
-                        qp->r_reuse_sge = 1;
+                        qp->r_flags |= IPATH_R_REUSE_SGE;
                         dev->n_pkt_drops++;
                         goto done;
                 }
@@ -390,14 +413,10 @@ void ipath_uc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
                 wc.wr_id = qp->r_wr_id;
                 wc.status = IB_WC_SUCCESS;
                 wc.opcode = IB_WC_RECV;
-                wc.vendor_err = 0;
                 wc.qp = &qp->ibqp;
                 wc.src_qp = qp->remote_qpn;
-                wc.pkey_index = 0;
                 wc.slid = qp->remote_ah_attr.dlid;
                 wc.sl = qp->remote_ah_attr.sl;
-                wc.dlid_path_bits = 0;
-                wc.port_num = 0;
                 /* Signal completion event if the solicited bit is set. */
                 ipath_cq_enter(to_icq(qp->ibqp.recv_cq), &wc,
                                (ohdr->bth[0] &
@@ -488,8 +507,8 @@ void ipath_uc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
                         dev->n_pkt_drops++;
                         goto done;
                 }
-                if (qp->r_reuse_sge)
-                        qp->r_reuse_sge = 0;
+                if (qp->r_flags & IPATH_R_REUSE_SGE)
+                        qp->r_flags &= ~IPATH_R_REUSE_SGE;
                 else if (!ipath_get_rwqe(qp, 1)) {
                         dev->n_pkt_drops++;
                         goto done;
diff --git a/drivers/infiniband/hw/ipath/ipath_ud.c b/drivers/infiniband/hw/ipath/ipath_ud.c
index 8b6a261c89e3..77ca8ca74e78 100644
--- a/drivers/infiniband/hw/ipath/ipath_ud.c
+++ b/drivers/infiniband/hw/ipath/ipath_ud.c
@@ -65,9 +65,9 @@ static void ipath_ud_loopback(struct ipath_qp *sqp, struct ipath_swqe *swqe)
         u32 length;
 
         qp = ipath_lookup_qpn(&dev->qp_table, swqe->wr.wr.ud.remote_qpn);
-        if (!qp) {
+        if (!qp || !(ib_ipath_state_ops[qp->state] & IPATH_PROCESS_RECV_OK)) {
                 dev->n_pkt_drops++;
-                goto send_comp;
+                goto done;
         }
 
         rsge.sg_list = NULL;
@@ -91,14 +91,12 @@ static void ipath_ud_loopback(struct ipath_qp *sqp, struct ipath_swqe *swqe)
          * present on the wire.
          */
         length = swqe->length;
+        memset(&wc, 0, sizeof wc);
         wc.byte_len = length + sizeof(struct ib_grh);
 
         if (swqe->wr.opcode == IB_WR_SEND_WITH_IMM) {
                 wc.wc_flags = IB_WC_WITH_IMM;
                 wc.imm_data = swqe->wr.ex.imm_data;
-        } else {
-                wc.wc_flags = 0;
-                wc.imm_data = 0;
         }
 
         /*
@@ -229,7 +227,6 @@ static void ipath_ud_loopback(struct ipath_qp *sqp, struct ipath_swqe *swqe)
         }
         wc.status = IB_WC_SUCCESS;
         wc.opcode = IB_WC_RECV;
-        wc.vendor_err = 0;
         wc.qp = &qp->ibqp;
         wc.src_qp = sqp->ibqp.qp_num;
         /* XXX do we know which pkey matched? Only needed for GSI. */
@@ -248,8 +245,7 @@ drop:
         kfree(rsge.sg_list);
         if (atomic_dec_and_test(&qp->refcount))
                 wake_up(&qp->wait);
-send_comp:
-        ipath_send_complete(sqp, swqe, IB_WC_SUCCESS);
+done:;
 }
 
 /**
@@ -264,6 +260,7 @@ int ipath_make_ud_req(struct ipath_qp *qp)
         struct ipath_other_headers *ohdr;
         struct ib_ah_attr *ah_attr;
         struct ipath_swqe *wqe;
+        unsigned long flags;
         u32 nwords;
         u32 extra_bytes;
         u32 bth0;
@@ -271,13 +268,30 @@ int ipath_make_ud_req(struct ipath_qp *qp)
         u16 lid;
         int ret = 0;
 
-        if (unlikely(!(ib_ipath_state_ops[qp->state] & IPATH_PROCESS_SEND_OK)))
-                goto bail;
+        spin_lock_irqsave(&qp->s_lock, flags);
+
+        if (!(ib_ipath_state_ops[qp->state] & IPATH_PROCESS_NEXT_SEND_OK)) {
+                if (!(ib_ipath_state_ops[qp->state] & IPATH_FLUSH_SEND))
+                        goto bail;
+                /* We are in the error state, flush the work request. */
+                if (qp->s_last == qp->s_head)
+                        goto bail;
+                /* If DMAs are in progress, we can't flush immediately. */
+                if (atomic_read(&qp->s_dma_busy)) {
+                        qp->s_flags |= IPATH_S_WAIT_DMA;
+                        goto bail;
+                }
+                wqe = get_swqe_ptr(qp, qp->s_last);
+                ipath_send_complete(qp, wqe, IB_WC_WR_FLUSH_ERR);
+                goto done;
+        }
 
         if (qp->s_cur == qp->s_head)
                 goto bail;
 
         wqe = get_swqe_ptr(qp, qp->s_cur);
+        if (++qp->s_cur >= qp->s_size)
+                qp->s_cur = 0;
 
         /* Construct the header. */
         ah_attr = &to_iah(wqe->wr.wr.ud.ah)->attr;
@@ -288,10 +302,23 @@ int ipath_make_ud_req(struct ipath_qp *qp)
                         dev->n_unicast_xmit++;
         } else {
                 dev->n_unicast_xmit++;
-                lid = ah_attr->dlid &
-                        ~((1 << dev->dd->ipath_lmc) - 1);
+                lid = ah_attr->dlid & ~((1 << dev->dd->ipath_lmc) - 1);
                 if (unlikely(lid == dev->dd->ipath_lid)) {
+                        /*
+                         * If DMAs are in progress, we can't generate
+                         * a completion for the loopback packet since
+                         * it would be out of order.
+                         * XXX Instead of waiting, we could queue a
+                         * zero length descriptor so we get a callback.
+                         */
+                        if (atomic_read(&qp->s_dma_busy)) {
+                                qp->s_flags |= IPATH_S_WAIT_DMA;
+                                goto bail;
+                        }
+                        spin_unlock_irqrestore(&qp->s_lock, flags);
                         ipath_ud_loopback(qp, wqe);
+                        spin_lock_irqsave(&qp->s_lock, flags);
+                        ipath_send_complete(qp, wqe, IB_WC_SUCCESS);
                         goto done;
                 }
         }
@@ -368,11 +395,13 @@ int ipath_make_ud_req(struct ipath_qp *qp)
         ohdr->u.ud.deth[1] = cpu_to_be32(qp->ibqp.qp_num);
 
 done:
-        if (++qp->s_cur >= qp->s_size)
-                qp->s_cur = 0;
         ret = 1;
+        goto unlock;
 
 bail:
+        qp->s_flags &= ~IPATH_S_BUSY;
+unlock:
+        spin_unlock_irqrestore(&qp->s_lock, flags);
         return ret;
 }
 
@@ -506,8 +535,8 @@ void ipath_ud_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
         /*
          * Get the next work request entry to find where to put the data.
          */
-        if (qp->r_reuse_sge)
-                qp->r_reuse_sge = 0;
+        if (qp->r_flags & IPATH_R_REUSE_SGE)
+                qp->r_flags &= ~IPATH_R_REUSE_SGE;
         else if (!ipath_get_rwqe(qp, 0)) {
                 /*
                  * Count VL15 packets dropped due to no receive buffer.
@@ -523,7 +552,7 @@ void ipath_ud_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
         }
         /* Silently drop packets which are too big. */
         if (wc.byte_len > qp->r_len) {
-                qp->r_reuse_sge = 1;
+                qp->r_flags |= IPATH_R_REUSE_SGE;
                 dev->n_pkt_drops++;
                 goto bail;
         }
@@ -535,7 +564,8 @@ void ipath_ud_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
                 ipath_skip_sge(&qp->r_sge, sizeof(struct ib_grh));
         ipath_copy_sge(&qp->r_sge, data,
                        wc.byte_len - sizeof(struct ib_grh));
-        qp->r_wrid_valid = 0;
+        if (!test_and_clear_bit(IPATH_R_WRID_VALID, &qp->r_aflags))
+                goto bail;
         wc.wr_id = qp->r_wr_id;
         wc.status = IB_WC_SUCCESS;
         wc.opcode = IB_WC_RECV;
diff --git a/drivers/infiniband/hw/ipath/ipath_user_sdma.h b/drivers/infiniband/hw/ipath/ipath_user_sdma.h
index e70946c1428c..fc76316c4a58 100644
--- a/drivers/infiniband/hw/ipath/ipath_user_sdma.h
+++ b/drivers/infiniband/hw/ipath/ipath_user_sdma.h
@@ -45,8 +45,6 @@ int ipath_user_sdma_writev(struct ipath_devdata *dd,
 int ipath_user_sdma_make_progress(struct ipath_devdata *dd,
                                   struct ipath_user_sdma_queue *pq);
 
-int ipath_user_sdma_pkt_sent(const struct ipath_user_sdma_queue *pq,
-                             u32 counter);
 void ipath_user_sdma_queue_drain(struct ipath_devdata *dd,
                                  struct ipath_user_sdma_queue *pq);
 
diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.c b/drivers/infiniband/hw/ipath/ipath_verbs.c
index 5015cd2e57bd..e0ec540042bf 100644
--- a/drivers/infiniband/hw/ipath/ipath_verbs.c
+++ b/drivers/infiniband/hw/ipath/ipath_verbs.c
@@ -111,16 +111,24 @@ static unsigned int ib_ipath_disable_sma;
 module_param_named(disable_sma, ib_ipath_disable_sma, uint, S_IWUSR | S_IRUGO);
 MODULE_PARM_DESC(disable_sma, "Disable the SMA");
 
+/*
+ * Note that it is OK to post send work requests in the SQE and ERR
+ * states; ipath_do_send() will process them and generate error
+ * completions as per IB 1.2 C10-96.
+ */
 const int ib_ipath_state_ops[IB_QPS_ERR + 1] = {
         [IB_QPS_RESET] = 0,
         [IB_QPS_INIT] = IPATH_POST_RECV_OK,
         [IB_QPS_RTR] = IPATH_POST_RECV_OK | IPATH_PROCESS_RECV_OK,
         [IB_QPS_RTS] = IPATH_POST_RECV_OK | IPATH_PROCESS_RECV_OK |
-            IPATH_POST_SEND_OK | IPATH_PROCESS_SEND_OK,
+            IPATH_POST_SEND_OK | IPATH_PROCESS_SEND_OK |
+            IPATH_PROCESS_NEXT_SEND_OK,
         [IB_QPS_SQD] = IPATH_POST_RECV_OK | IPATH_PROCESS_RECV_OK |
-            IPATH_POST_SEND_OK,
-        [IB_QPS_SQE] = IPATH_POST_RECV_OK | IPATH_PROCESS_RECV_OK,
-        [IB_QPS_ERR] = 0,
+            IPATH_POST_SEND_OK | IPATH_PROCESS_SEND_OK,
+        [IB_QPS_SQE] = IPATH_POST_RECV_OK | IPATH_PROCESS_RECV_OK |
+            IPATH_POST_SEND_OK | IPATH_FLUSH_SEND,
+        [IB_QPS_ERR] = IPATH_POST_RECV_OK | IPATH_FLUSH_RECV |
+            IPATH_POST_SEND_OK | IPATH_FLUSH_SEND,
 };
 
 struct ipath_ucontext {
@@ -230,18 +238,6 @@ void ipath_skip_sge(struct ipath_sge_state *ss, u32 length)
         }
 }
 
-static void ipath_flush_wqe(struct ipath_qp *qp, struct ib_send_wr *wr)
-{
-        struct ib_wc wc;
-
-        memset(&wc, 0, sizeof(wc));
-        wc.wr_id = wr->wr_id;
-        wc.status = IB_WC_WR_FLUSH_ERR;
-        wc.opcode = ib_ipath_wc_opcode[wr->opcode];
-        wc.qp = &qp->ibqp;
-        ipath_cq_enter(to_icq(qp->ibqp.send_cq), &wc, 1);
-}
-
 /*
  * Count the number of DMA descriptors needed to send length bytes of data.
  * Don't modify the ipath_sge_state to get the count.
@@ -347,14 +343,8 @@ static int ipath_post_one_send(struct ipath_qp *qp, struct ib_send_wr *wr)
         spin_lock_irqsave(&qp->s_lock, flags);
 
         /* Check that state is OK to post send. */
-        if (unlikely(!(ib_ipath_state_ops[qp->state] & IPATH_POST_SEND_OK))) {
-                if (qp->state != IB_QPS_SQE && qp->state != IB_QPS_ERR)
-                        goto bail_inval;
-                /* C10-96 says generate a flushed completion entry. */
-                ipath_flush_wqe(qp, wr);
-                ret = 0;
-                goto bail;
-        }
+        if (unlikely(!(ib_ipath_state_ops[qp->state] & IPATH_POST_SEND_OK)))
+                goto bail_inval;
 
         /* IB spec says that num_sge == 0 is OK. */
         if (wr->num_sge > qp->s_max_sge)
@@ -677,6 +667,7 @@ bail:;
 static void ipath_ib_timer(struct ipath_ibdev *dev)
 {
         struct ipath_qp *resend = NULL;
+        struct ipath_qp *rnr = NULL;
         struct list_head *last;
         struct ipath_qp *qp;
         unsigned long flags;
@@ -703,7 +694,9 @@ static void ipath_ib_timer(struct ipath_ibdev *dev)
                 if (--qp->s_rnr_timeout == 0) {
                         do {
                                 list_del_init(&qp->timerwait);
-                                tasklet_hi_schedule(&qp->s_task);
+                                qp->timer_next = rnr;
+                                rnr = qp;
+                                atomic_inc(&qp->refcount);
                                 if (list_empty(last))
                                         break;
                                 qp = list_entry(last->next, struct ipath_qp,
@@ -743,13 +736,15 @@ static void ipath_ib_timer(struct ipath_ibdev *dev)
         spin_unlock_irqrestore(&dev->pending_lock, flags);
 
         /* XXX What if timer fires again while this is running? */
-        for (qp = resend; qp != NULL; qp = qp->timer_next) {
-                struct ib_wc wc;
+        while (resend != NULL) {
+                qp = resend;
+                resend = qp->timer_next;
 
                 spin_lock_irqsave(&qp->s_lock, flags);
-                if (qp->s_last != qp->s_tail && qp->state == IB_QPS_RTS) {
+                if (qp->s_last != qp->s_tail &&
+                    ib_ipath_state_ops[qp->state] & IPATH_PROCESS_SEND_OK) {
                         dev->n_timeouts++;
-                        ipath_restart_rc(qp, qp->s_last_psn + 1, &wc);
+                        ipath_restart_rc(qp, qp->s_last_psn + 1);
                 }
                 spin_unlock_irqrestore(&qp->s_lock, flags);
 
@@ -757,6 +752,19 @@ static void ipath_ib_timer(struct ipath_ibdev *dev)
                 if (atomic_dec_and_test(&qp->refcount))
                         wake_up(&qp->wait);
         }
+        while (rnr != NULL) {
+                qp = rnr;
+                rnr = qp->timer_next;
+
+                spin_lock_irqsave(&qp->s_lock, flags);
+                if (ib_ipath_state_ops[qp->state] & IPATH_PROCESS_SEND_OK)
+                        ipath_schedule_send(qp);
+                spin_unlock_irqrestore(&qp->s_lock, flags);
+
+                /* Notify ipath_destroy_qp() if it is waiting. */
+                if (atomic_dec_and_test(&qp->refcount))
+                        wake_up(&qp->wait);
+        }
 }
 
 static void update_sge(struct ipath_sge_state *ss, u32 length)
@@ -1012,13 +1020,24 @@ static void sdma_complete(void *cookie, int status)
         struct ipath_verbs_txreq *tx = cookie;
         struct ipath_qp *qp = tx->qp;
         struct ipath_ibdev *dev = to_idev(qp->ibqp.device);
+        unsigned int flags;
+        enum ib_wc_status ibs = status == IPATH_SDMA_TXREQ_S_OK ?
+                IB_WC_SUCCESS : IB_WC_WR_FLUSH_ERR;
 
-        /* Generate a completion queue entry if needed */
-        if (qp->ibqp.qp_type != IB_QPT_RC && tx->wqe) {
-                enum ib_wc_status ibs = status == IPATH_SDMA_TXREQ_S_OK ?
-                        IB_WC_SUCCESS : IB_WC_WR_FLUSH_ERR;
-
+        if (atomic_dec_and_test(&qp->s_dma_busy)) {
+                spin_lock_irqsave(&qp->s_lock, flags);
+                if (tx->wqe)
+                        ipath_send_complete(qp, tx->wqe, ibs);
+                if ((ib_ipath_state_ops[qp->state] & IPATH_FLUSH_SEND &&
+                     qp->s_last != qp->s_head) ||
+                    (qp->s_flags & IPATH_S_WAIT_DMA))
+                        ipath_schedule_send(qp);
+                spin_unlock_irqrestore(&qp->s_lock, flags);
+                wake_up(&qp->wait_dma);
+        } else if (tx->wqe) {
+                spin_lock_irqsave(&qp->s_lock, flags);
                 ipath_send_complete(qp, tx->wqe, ibs);
+                spin_unlock_irqrestore(&qp->s_lock, flags);
         }
 
         if (tx->txreq.flags & IPATH_SDMA_TXREQ_F_FREEBUF)
@@ -1029,6 +1048,21 @@ static void sdma_complete(void *cookie, int status)
                 wake_up(&qp->wait);
 }
 
+static void decrement_dma_busy(struct ipath_qp *qp)
+{
+        unsigned int flags;
+
+        if (atomic_dec_and_test(&qp->s_dma_busy)) {
+                spin_lock_irqsave(&qp->s_lock, flags);
+                if ((ib_ipath_state_ops[qp->state] & IPATH_FLUSH_SEND &&
+                     qp->s_last != qp->s_head) ||
+                    (qp->s_flags & IPATH_S_WAIT_DMA))
+                        ipath_schedule_send(qp);
+                spin_unlock_irqrestore(&qp->s_lock, flags);
+                wake_up(&qp->wait_dma);
+        }
+}
+
 /*
  * Compute the number of clock cycles of delay before sending the next packet.
  * The multipliers reflect the number of clocks for the fastest rate so
@@ -1067,9 +1101,12 @@ static int ipath_verbs_send_dma(struct ipath_qp *qp,
         if (tx) {
                 qp->s_tx = NULL;
                 /* resend previously constructed packet */
+                atomic_inc(&qp->s_dma_busy);
                 ret = ipath_sdma_verbs_send(dd, tx->ss, tx->len, tx);
-                if (ret)
+                if (ret) {
                         qp->s_tx = tx;
+                        decrement_dma_busy(qp);
+                }
                 goto bail;
         }
 
@@ -1120,12 +1157,14 @@ static int ipath_verbs_send_dma(struct ipath_qp *qp,
                 tx->txreq.sg_count = ndesc;
                 tx->map_len = (hdrwords + 2) << 2;
                 tx->txreq.map_addr = &tx->hdr;
+                atomic_inc(&qp->s_dma_busy);
                 ret = ipath_sdma_verbs_send(dd, ss, dwords, tx);
                 if (ret) {
                         /* save ss and length in dwords */
                         tx->ss = ss;
                         tx->len = dwords;
                         qp->s_tx = tx;
+                        decrement_dma_busy(qp);
                 }
                 goto bail;
         }
@@ -1146,6 +1185,7 @@ static int ipath_verbs_send_dma(struct ipath_qp *qp,
         memcpy(piobuf, hdr, hdrwords << 2);
         ipath_copy_from_sge(piobuf + hdrwords, ss, len);
 
+        atomic_inc(&qp->s_dma_busy);
         ret = ipath_sdma_verbs_send(dd, NULL, 0, tx);
         /*
          * If we couldn't queue the DMA request, save the info
@@ -1156,6 +1196,7 @@ static int ipath_verbs_send_dma(struct ipath_qp *qp,
                 tx->ss = NULL;
                 tx->len = 0;
                 qp->s_tx = tx;
+                decrement_dma_busy(qp);
         }
         dev->n_unaligned++;
         goto bail;
@@ -1179,6 +1220,7 @@ static int ipath_verbs_send_pio(struct ipath_qp *qp,
         unsigned flush_wc;
         u32 control;
         int ret;
+        unsigned int flags;
 
         piobuf = ipath_getpiobuf(dd, plen, NULL);
         if (unlikely(piobuf == NULL)) {
@@ -1249,8 +1291,11 @@ static int ipath_verbs_send_pio(struct ipath_qp *qp,
         }
         copy_io(piobuf, ss, len, flush_wc);
 done:
-        if (qp->s_wqe)
+        if (qp->s_wqe) {
+                spin_lock_irqsave(&qp->s_lock, flags);
                 ipath_send_complete(qp, qp->s_wqe, IB_WC_SUCCESS);
+                spin_unlock_irqrestore(&qp->s_lock, flags);
+        }
         ret = 0;
 bail:
         return ret;
@@ -1283,19 +1328,12 @@ int ipath_verbs_send(struct ipath_qp *qp, struct ipath_ib_header *hdr,
          * can defer SDMA restart until link goes ACTIVE without
          * worrying about just how we got there.
          */
-        if (qp->ibqp.qp_type == IB_QPT_SMI)
+        if (qp->ibqp.qp_type == IB_QPT_SMI ||
+            !(dd->ipath_flags & IPATH_HAS_SEND_DMA))
                 ret = ipath_verbs_send_pio(qp, hdr, hdrwords, ss, len,
                                            plen, dwords);
-        /* All non-VL15 packets are dropped if link is not ACTIVE */
-        else if (!(dd->ipath_flags & IPATH_LINKACTIVE)) {
-                if (qp->s_wqe)
-                        ipath_send_complete(qp, qp->s_wqe, IB_WC_SUCCESS);
-                ret = 0;
-        } else if (dd->ipath_flags & IPATH_HAS_SEND_DMA)
-                ret = ipath_verbs_send_dma(qp, hdr, hdrwords, ss, len,
-                                           plen, dwords);
         else
-                ret = ipath_verbs_send_pio(qp, hdr, hdrwords, ss, len,
+                ret = ipath_verbs_send_dma(qp, hdr, hdrwords, ss, len,
                                            plen, dwords);
 
         return ret;
@@ -1403,27 +1441,46 @@ bail:
  * This is called from ipath_intr() at interrupt level when a PIO buffer is
  * available after ipath_verbs_send() returned an error that no buffers were
  * available.  Return 1 if we consumed all the PIO buffers and we still have
- * QPs waiting for buffers (for now, just do a tasklet_hi_schedule and
+ * QPs waiting for buffers (for now, just restart the send tasklet and
  * return zero).
  */
 int ipath_ib_piobufavail(struct ipath_ibdev *dev)
 {
+        struct list_head *list;
+        struct ipath_qp *qplist;
         struct ipath_qp *qp;
         unsigned long flags;
 
         if (dev == NULL)
                 goto bail;
 
+        list = &dev->piowait;
+        qplist = NULL;
+
         spin_lock_irqsave(&dev->pending_lock, flags);
-        while (!list_empty(&dev->piowait)) {
-                qp = list_entry(dev->piowait.next, struct ipath_qp,
-                                piowait);
+        while (!list_empty(list)) {
+                qp = list_entry(list->next, struct ipath_qp, piowait);
                 list_del_init(&qp->piowait);
-                clear_bit(IPATH_S_BUSY, &qp->s_busy);
-                tasklet_hi_schedule(&qp->s_task);
+                qp->pio_next = qplist;
+                qplist = qp;
+                atomic_inc(&qp->refcount);
         }
         spin_unlock_irqrestore(&dev->pending_lock, flags);
 
+        while (qplist != NULL) {
+                qp = qplist;
+                qplist = qp->pio_next;
+
+                spin_lock_irqsave(&qp->s_lock, flags);
+                if (ib_ipath_state_ops[qp->state] & IPATH_PROCESS_SEND_OK)
+                        ipath_schedule_send(qp);
+                spin_unlock_irqrestore(&qp->s_lock, flags);
+
+                /* Notify ipath_destroy_qp() if it is waiting. */
+                if (atomic_dec_and_test(&qp->refcount))
+                        wake_up(&qp->wait);
+        }
+
 bail:
         return 0;
 }
@@ -2145,11 +2202,12 @@ bail:
 void ipath_unregister_ib_device(struct ipath_ibdev *dev)
 {
         struct ib_device *ibdev = &dev->ibdev;
-
-        disable_timer(dev->dd);
+        u32 qps_inuse;
 
         ib_unregister_device(ibdev);
 
+        disable_timer(dev->dd);
+
         if (!list_empty(&dev->pending[0]) ||
             !list_empty(&dev->pending[1]) ||
             !list_empty(&dev->pending[2]))
@@ -2164,7 +2222,10 @@ void ipath_unregister_ib_device(struct ipath_ibdev *dev)
          * Note that ipath_unregister_ib_device() can be called before all
          * the QPs are destroyed!
          */
-        ipath_free_all_qps(&dev->qp_table);
+        qps_inuse = ipath_free_all_qps(&dev->qp_table);
+        if (qps_inuse)
+                ipath_dev_err(dev->dd, "QP memory leak! %u still in use\n",
+                        qps_inuse);
         kfree(dev->qp_table.table);
         kfree(dev->lk_table.table);
         kfree(dev->txreq_bufs);
@@ -2215,17 +2276,14 @@ static ssize_t show_stats(struct device *device, struct device_attribute *attr,
                       "RC OTH NAKs %d\n"
                       "RC timeouts %d\n"
                       "RC RDMA dup %d\n"
-                      "RC stalls   %d\n"
                       "piobuf wait %d\n"
-                      "no piobuf   %d\n"
                       "unaligned   %d\n"
                       "PKT drops   %d\n"
                       "WQE errs    %d\n",
                       dev->n_rc_resends, dev->n_rc_qacks, dev->n_rc_acks,
                       dev->n_seq_naks, dev->n_rdma_seq, dev->n_rnr_naks,
                       dev->n_other_naks, dev->n_timeouts,
-                      dev->n_rdma_dup_busy, dev->n_rc_stalls, dev->n_piowait,
-                      dev->n_no_piobuf, dev->n_unaligned,
+                      dev->n_rdma_dup_busy, dev->n_piowait, dev->n_unaligned,
                       dev->n_pkt_drops, dev->n_wqe_errs);
         for (i = 0; i < ARRAY_SIZE(dev->opstats); i++) {
                 const struct ipath_opcode_stats *si = &dev->opstats[i];
diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.h b/drivers/infiniband/hw/ipath/ipath_verbs.h
index 6514aa8306cd..9d12ae8a778e 100644
--- a/drivers/infiniband/hw/ipath/ipath_verbs.h
+++ b/drivers/infiniband/hw/ipath/ipath_verbs.h
@@ -74,6 +74,11 @@
 #define IPATH_POST_RECV_OK              0x02
 #define IPATH_PROCESS_RECV_OK           0x04
 #define IPATH_PROCESS_SEND_OK           0x08
+#define IPATH_PROCESS_NEXT_SEND_OK      0x10
+#define IPATH_FLUSH_SEND                0x20
+#define IPATH_FLUSH_RECV                0x40
+#define IPATH_PROCESS_OR_FLUSH_SEND \
+        (IPATH_PROCESS_SEND_OK | IPATH_FLUSH_SEND)
 
 /* IB Performance Manager status values */
 #define IB_PMA_SAMPLE_STATUS_DONE       0x00
@@ -353,12 +358,14 @@ struct ipath_qp {
         struct ib_qp ibqp;
         struct ipath_qp *next;          /* link list for QPN hash table */
         struct ipath_qp *timer_next;    /* link list for ipath_ib_timer() */
+        struct ipath_qp *pio_next;      /* link for ipath_ib_piobufavail() */
         struct list_head piowait;       /* link for wait PIO buf */
         struct list_head timerwait;     /* link for waiting for timeouts */
         struct ib_ah_attr remote_ah_attr;
         struct ipath_ib_header s_hdr;   /* next packet header to send */
         atomic_t refcount;
         wait_queue_head_t wait;
+        wait_queue_head_t wait_dma;
         struct tasklet_struct s_task;
         struct ipath_mmap_info *ip;
         struct ipath_sge_state *s_cur_sge;
@@ -369,7 +376,7 @@ struct ipath_qp {
         struct ipath_sge_state s_rdma_read_sge;
         struct ipath_sge_state r_sge;   /* current receive data */
         spinlock_t s_lock;
-        unsigned long s_busy;
+        atomic_t s_dma_busy;
         u16 s_pkt_delay;
         u16 s_hdrwords;         /* size of s_hdr in 32 bit words */
         u32 s_cur_size;         /* size of send packet in bytes */
@@ -383,6 +390,7 @@ struct ipath_qp {
         u32 s_rnr_timeout;      /* number of milliseconds for RNR timeout */
         u32 r_ack_psn;          /* PSN for next ACK or atomic ACK */
         u64 r_wr_id;            /* ID for current receive WQE */
+        unsigned long r_aflags;
         u32 r_len;              /* total length of r_sge */
         u32 r_rcv_len;          /* receive data len processed */
         u32 r_psn;              /* expected rcv packet sequence number */
@@ -394,8 +402,7 @@ struct ipath_qp {
         u8 r_state;             /* opcode of last packet received */
         u8 r_nak_state;         /* non-zero if NAK is pending */
         u8 r_min_rnr_timer;     /* retry timeout value for RNR NAKs */
-        u8 r_reuse_sge;         /* for UC receive errors */
-        u8 r_wrid_valid;        /* r_wrid set but CQ entry not yet made */
+        u8 r_flags;
         u8 r_max_rd_atomic;     /* max number of RDMA read/atomic to receive */
         u8 r_head_ack_queue;    /* index into s_ack_queue[] */
         u8 qp_access_flags;
@@ -404,13 +411,13 @@ struct ipath_qp {
         u8 s_rnr_retry_cnt;
         u8 s_retry;             /* requester retry counter */
         u8 s_rnr_retry;         /* requester RNR retry counter */
-        u8 s_wait_credit;       /* limit number of unacked packets sent */
         u8 s_pkey_index;        /* PKEY index to use */
         u8 s_max_rd_atomic;     /* max number of RDMA read/atomic to send */
         u8 s_num_rd_atomic;     /* number of RDMA read/atomic pending */
         u8 s_tail_ack_queue;    /* index into s_ack_queue[] */
         u8 s_flags;
         u8 s_dmult;
+        u8 s_draining;
         u8 timeout;             /* Timeout for this QP */
         enum ib_mtu path_mtu;
         u32 remote_qpn;
@@ -428,16 +435,40 @@ struct ipath_qp {
         struct ipath_sge r_sg_list[0];  /* verified SGEs */
 };
 
-/* Bit definition for s_busy. */
-#define IPATH_S_BUSY            0
+/*
+ * Atomic bit definitions for r_aflags.
+ */
+#define IPATH_R_WRID_VALID      0
+
+/*
+ * Bit definitions for r_flags.
+ */
+#define IPATH_R_REUSE_SGE       0x01
+#define IPATH_R_RDMAR_SEQ       0x02
 
 /*
  * Bit definitions for s_flags.
+ *
+ * IPATH_S_FENCE_PENDING - waiting for all prior RDMA read or atomic SWQEs
+ *                         before processing the next SWQE
+ * IPATH_S_RDMAR_PENDING - waiting for any RDMA read or atomic SWQEs
+ *                         before processing the next SWQE
+ * IPATH_S_WAITING - waiting for RNR timeout or send buffer available.
+ * IPATH_S_WAIT_SSN_CREDIT - waiting for RC credits to process next SWQE
+ * IPATH_S_WAIT_DMA - waiting for send DMA queue to drain before generating
+ *                    next send completion entry not via send DMA.
  */
 #define IPATH_S_SIGNAL_REQ_WR   0x01
 #define IPATH_S_FENCE_PENDING   0x02
 #define IPATH_S_RDMAR_PENDING   0x04
 #define IPATH_S_ACK_PENDING     0x08
+#define IPATH_S_BUSY            0x10
+#define IPATH_S_WAITING         0x20
+#define IPATH_S_WAIT_SSN_CREDIT 0x40
+#define IPATH_S_WAIT_DMA        0x80
+
+#define IPATH_S_ANY_WAIT (IPATH_S_FENCE_PENDING | IPATH_S_RDMAR_PENDING | \
+        IPATH_S_WAITING | IPATH_S_WAIT_SSN_CREDIT | IPATH_S_WAIT_DMA)
 
 #define IPATH_PSN_CREDIT        512
 
@@ -573,13 +604,11 @@ struct ipath_ibdev {
         u32 n_rnr_naks;
         u32 n_other_naks;
         u32 n_timeouts;
-        u32 n_rc_stalls;
         u32 n_pkt_drops;
         u32 n_vl15_dropped;
         u32 n_wqe_errs;
         u32 n_rdma_dup_busy;
         u32 n_piowait;
-        u32 n_no_piobuf;
         u32 n_unaligned;
         u32 port_cap_flags;
         u32 pma_sample_start;
@@ -657,6 +686,17 @@ static inline struct ipath_ibdev *to_idev(struct ib_device *ibdev)
         return container_of(ibdev, struct ipath_ibdev, ibdev);
 }
 
+/*
+ * This must be called with s_lock held.
+ */
+static inline void ipath_schedule_send(struct ipath_qp *qp)
+{
+        if (qp->s_flags & IPATH_S_ANY_WAIT)
+                qp->s_flags &= ~IPATH_S_ANY_WAIT;
+        if (!(qp->s_flags & IPATH_S_BUSY))
+                tasklet_hi_schedule(&qp->s_task);
+}
+
 int ipath_process_mad(struct ib_device *ibdev,
                       int mad_flags,
                       u8 port_num,
@@ -706,12 +746,10 @@ int ipath_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 int ipath_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
                    int attr_mask, struct ib_qp_init_attr *init_attr);
 
-void ipath_free_all_qps(struct ipath_qp_table *qpt);
+unsigned ipath_free_all_qps(struct ipath_qp_table *qpt);
 
 int ipath_init_qp_table(struct ipath_ibdev *idev, int size);
 
-void ipath_sqerror_qp(struct ipath_qp *qp, struct ib_wc *wc);
-
 void ipath_get_credit(struct ipath_qp *qp, u32 aeth);
 
 unsigned ipath_ib_rate_to_mult(enum ib_rate rate);
@@ -729,7 +767,9 @@ void ipath_uc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
 void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
                   int has_grh, void *data, u32 tlen, struct ipath_qp *qp);
 
-void ipath_restart_rc(struct ipath_qp *qp, u32 psn, struct ib_wc *wc);
+void ipath_restart_rc(struct ipath_qp *qp, u32 psn);
+
+void ipath_rc_error(struct ipath_qp *qp, enum ib_wc_status err);
 
 int ipath_post_ud_send(struct ipath_qp *qp, struct ib_send_wr *wr);
 
diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
index 9f7364a9096d..a4e9269a29bd 100644
--- a/drivers/infiniband/hw/nes/nes.c
+++ b/drivers/infiniband/hw/nes/nes.c
@@ -91,10 +91,6 @@ unsigned int nes_debug_level = 0;
 module_param_named(debug_level, nes_debug_level, uint, 0644);
 MODULE_PARM_DESC(debug_level, "Enable debug output level");
 
-unsigned int nes_lro_max_aggr = NES_LRO_MAX_AGGR;
-module_param(nes_lro_max_aggr, int, NES_LRO_MAX_AGGR);
-MODULE_PARM_DESC(nes_mro_max_aggr, " nic LRO MAX packet aggregation");
-
 LIST_HEAD(nes_adapter_list);
 static LIST_HEAD(nes_dev_list);
 
diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
index 1f9f7bf73862..61b46e9c7d2d 100644
--- a/drivers/infiniband/hw/nes/nes.h
+++ b/drivers/infiniband/hw/nes/nes.h
@@ -173,7 +173,6 @@ extern int disable_mpa_crc;
 extern unsigned int send_first;
 extern unsigned int nes_drv_opt;
 extern unsigned int nes_debug_level;
-extern unsigned int nes_lro_max_aggr;
 
 extern struct list_head nes_adapter_list;
 
diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c
index 8dc70f9bad2f..d3278f111ca7 100644
--- a/drivers/infiniband/hw/nes/nes_hw.c
+++ b/drivers/infiniband/hw/nes/nes_hw.c
@@ -42,6 +42,10 @@
 
 #include "nes.h"
 
+static unsigned int nes_lro_max_aggr = NES_LRO_MAX_AGGR;
+module_param(nes_lro_max_aggr, uint, 0444);
+MODULE_PARM_DESC(nes_lro_max_aggr, "NIC LRO max packet aggregation");
+
 static u32 crit_err_count;
 u32 int_mod_timer_init;
 u32 int_mod_cq_depth_256;
@@ -1738,7 +1742,7 @@ int nes_init_nic_qp(struct nes_device *nesdev, struct net_device *netdev)
                         jumbomode = 1;
                 nes_nic_init_timer_defaults(nesdev, jumbomode);
         }
-        nesvnic->lro_mgr.max_aggr       = NES_LRO_MAX_AGGR;
+        nesvnic->lro_mgr.max_aggr       = nes_lro_max_aggr;
         nesvnic->lro_mgr.max_desc       = NES_MAX_LRO_DESCRIPTORS;
         nesvnic->lro_mgr.lro_arr        = nesvnic->lro_desc;
         nesvnic->lro_mgr.get_skb_header = nes_lro_get_skb_hdr;
diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c
index b8b9e44f7f4e..dbaad39020a1 100644
--- a/drivers/macintosh/adb.c
+++ b/drivers/macintosh/adb.c
@@ -334,7 +334,7 @@ int __init adb_init(void)
         return 0;
 }
 
-__initcall(adb_init);
+device_initcall(adb_init);
 
 static int
 do_adb_reset_bus(void)
diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index 0b8511776b3e..10748240cb2f 100644
--- a/drivers/md/linear.c
+++ b/drivers/md/linear.c
@@ -250,6 +250,7 @@ static int linear_run (mddev_t *mddev)
 {
         linear_conf_t *conf;
 
+        mddev->queue->queue_lock = &mddev->queue->__queue_lock;
         conf = linear_conf(mddev, mddev->raid_disks);
 
         if (!conf)
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
index 42ee1a2dc144..4f4d1f383842 100644
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
@@ -417,6 +417,7 @@ static int multipath_run (mddev_t *mddev)
          * bookkeeping area. [whatever we allocate in multipath_run(),
          * should be freed in multipath_stop()]
          */
+        mddev->queue->queue_lock = &mddev->queue->__queue_lock;
 
         conf = kzalloc(sizeof(multipath_conf_t), GFP_KERNEL);
         mddev->private = conf;
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index 818b48284096..914c04ddec7c 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -280,6 +280,7 @@ static int raid0_run (mddev_t *mddev)
                (mddev->chunk_size>>1)-1);
         blk_queue_max_sectors(mddev->queue, mddev->chunk_size >> 9);
         blk_queue_segment_boundary(mddev->queue, (mddev->chunk_size>>1) - 1);
+        mddev->queue->queue_lock = &mddev->queue->__queue_lock;
 
         conf = kmalloc(sizeof (raid0_conf_t), GFP_KERNEL);
         if (!conf)
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 6778b7cb39bd..ac409b7d83f5 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1935,6 +1935,9 @@ static int run(mddev_t *mddev)
         if (!conf->r1bio_pool)
                 goto out_no_mem;
 
+        spin_lock_init(&conf->device_lock);
+        mddev->queue->queue_lock = &conf->device_lock;
+
         rdev_for_each(rdev, tmp, mddev) {
                 disk_idx = rdev->raid_disk;
                 if (disk_idx >= mddev->raid_disks
@@ -1958,7 +1961,6 @@ static int run(mddev_t *mddev)
         }
         conf->raid_disks = mddev->raid_disks;
         conf->mddev = mddev;
-        spin_lock_init(&conf->device_lock);
         INIT_LIST_HEAD(&conf->retry_list);
 
         spin_lock_init(&conf->resync_lock);
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index faf3d8912979..8536ede1e712 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -2082,6 +2082,9 @@ static int run(mddev_t *mddev)
                 goto out_free_conf;
         }
 
+        spin_lock_init(&conf->device_lock);
+        mddev->queue->queue_lock = &conf->device_lock;
+
         rdev_for_each(rdev, tmp, mddev) {
                 disk_idx = rdev->raid_disk;
                 if (disk_idx >= mddev->raid_disks
@@ -2103,7 +2106,6 @@ static int run(mddev_t *mddev)
 
                 disk->head_position = 0;
         }
-        spin_lock_init(&conf->device_lock);
         INIT_LIST_HEAD(&conf->retry_list);
 
         spin_lock_init(&conf->resync_lock);
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 087eee0cb809..93fde48c0f42 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -2369,8 +2369,8 @@ static void handle_parity_checks5(raid5_conf_t *conf, struct stripe_head *sh,
 
         /* complete a check operation */
         if (test_and_clear_bit(STRIPE_OP_CHECK, &sh->ops.complete)) {
-            clear_bit(STRIPE_OP_CHECK, &sh->ops.ack);
-            clear_bit(STRIPE_OP_CHECK, &sh->ops.pending);
+                clear_bit(STRIPE_OP_CHECK, &sh->ops.ack);
+                clear_bit(STRIPE_OP_CHECK, &sh->ops.pending);
                 if (s->failed == 0) {
                         if (sh->ops.zero_sum_result == 0)
                                 /* parity is correct (on disc,
@@ -2400,16 +2400,6 @@ static void handle_parity_checks5(raid5_conf_t *conf, struct stripe_head *sh,
                         canceled_check = 1; /* STRIPE_INSYNC is not set */
         }
 
-        /* check if we can clear a parity disk reconstruct */
-        if (test_bit(STRIPE_OP_COMPUTE_BLK, &sh->ops.complete) &&
-                test_bit(STRIPE_OP_MOD_REPAIR_PD, &sh->ops.pending)) {
-
-                clear_bit(STRIPE_OP_MOD_REPAIR_PD, &sh->ops.pending);
-                clear_bit(STRIPE_OP_COMPUTE_BLK, &sh->ops.complete);
-                clear_bit(STRIPE_OP_COMPUTE_BLK, &sh->ops.ack);
-                clear_bit(STRIPE_OP_COMPUTE_BLK, &sh->ops.pending);
-        }
-
         /* start a new check operation if there are no failures, the stripe is
          * not insync, and a repair is not in flight
          */
@@ -2424,6 +2414,17 @@ static void handle_parity_checks5(raid5_conf_t *conf, struct stripe_head *sh,
                 }
         }
 
+        /* check if we can clear a parity disk reconstruct */
+        if (test_bit(STRIPE_OP_COMPUTE_BLK, &sh->ops.complete) &&
+            test_bit(STRIPE_OP_MOD_REPAIR_PD, &sh->ops.pending)) {
+
+                clear_bit(STRIPE_OP_MOD_REPAIR_PD, &sh->ops.pending);
+                clear_bit(STRIPE_OP_COMPUTE_BLK, &sh->ops.complete);
+                clear_bit(STRIPE_OP_COMPUTE_BLK, &sh->ops.ack);
+                clear_bit(STRIPE_OP_COMPUTE_BLK, &sh->ops.pending);
+        }
+
+
         /* Wait for check parity and compute block operations to complete
          * before write-back.  If a failure occurred while the check operation
          * was in flight we need to cycle this stripe through handle_stripe
@@ -4256,6 +4257,7 @@ static int run(mddev_t *mddev)
                         goto abort;
         }
         spin_lock_init(&conf->device_lock);
+        mddev->queue->queue_lock = &conf->device_lock;
         init_waitqueue_head(&conf->wait_for_stripe);
         init_waitqueue_head(&conf->wait_for_overlap);
         INIT_LIST_HEAD(&conf->handle_list);
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index ddf57e135c6c..7a7803b5d497 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -89,8 +89,7 @@ config DVB_CORE
 
 config VIDEO_MEDIA
         tristate
-        default DVB_CORE || VIDEO_DEV
-        depends on DVB_CORE || VIDEO_DEV
+        default (DVB_CORE && (VIDEO_DEV = n)) || (VIDEO_DEV && (DVB_CORE = n)) || (DVB_CORE && VIDEO_DEV)
 
 comment "Multimedia drivers"
 
diff --git a/drivers/media/common/tuners/Kconfig b/drivers/media/common/tuners/Kconfig
index 5be85ff53e12..d6206540476b 100644
--- a/drivers/media/common/tuners/Kconfig
+++ b/drivers/media/common/tuners/Kconfig
@@ -1,6 +1,6 @@
 config MEDIA_ATTACH
         bool "Load and attach frontend and tuner driver modules as needed"
-        depends on DVB_CORE
+        depends on VIDEO_MEDIA
         depends on MODULES
         help
           Remove the static dependency of DVB card drivers on all
@@ -19,10 +19,10 @@ config MEDIA_ATTACH
 
 config MEDIA_TUNER
         tristate
-        default DVB_CORE || VIDEO_DEV
-        depends on DVB_CORE || VIDEO_DEV
-        select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE
-        select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMIZE
+        default VIDEO_MEDIA && I2C
+        depends on VIDEO_MEDIA && I2C
+        select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG
+        select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG
         select MEDIA_TUNER_MT20XX if !MEDIA_TUNER_CUSTOMIZE
         select MEDIA_TUNER_TDA8290 if !MEDIA_TUNER_CUSTOMIZE
         select MEDIA_TUNER_TEA5761 if !MEDIA_TUNER_CUSTOMIZE
@@ -46,7 +46,7 @@ if MEDIA_TUNER_CUSTOMIZE
 
 config MEDIA_TUNER_SIMPLE
         tristate "Simple tuner support"
-        depends on I2C
+        depends on VIDEO_MEDIA && I2C
         select MEDIA_TUNER_TDA9887
         default m if MEDIA_TUNER_CUSTOMIZE
         help
@@ -54,7 +54,7 @@ config MEDIA_TUNER_SIMPLE
 
 config MEDIA_TUNER_TDA8290
         tristate "TDA 8290/8295 + 8275(a)/18271 tuner combo"
-        depends on I2C
+        depends on VIDEO_MEDIA && I2C
         select MEDIA_TUNER_TDA827X
         select MEDIA_TUNER_TDA18271
         default m if MEDIA_TUNER_CUSTOMIZE
@@ -63,21 +63,21 @@ config MEDIA_TUNER_TDA8290
 
 config MEDIA_TUNER_TDA827X
         tristate "Philips TDA827X silicon tuner"
-        depends on DVB_CORE && I2C
+        depends on VIDEO_MEDIA && I2C
         default m if DVB_FE_CUSTOMISE
         help
           A DVB-T silicon tuner module. Say Y when you want to support this tuner.
 
 config MEDIA_TUNER_TDA18271
         tristate "NXP TDA18271 silicon tuner"
-        depends on I2C
+        depends on VIDEO_MEDIA && I2C
         default m if DVB_FE_CUSTOMISE
         help
           A silicon tuner module. Say Y when you want to support this tuner.
 
 config MEDIA_TUNER_TDA9887
         tristate "TDA 9885/6/7 analog IF demodulator"
-        depends on I2C
+        depends on VIDEO_MEDIA && I2C
         default m if MEDIA_TUNER_CUSTOMIZE
         help
           Say Y here to include support for Philips TDA9885/6/7
@@ -85,67 +85,79 @@ config MEDIA_TUNER_TDA9887
 
 config MEDIA_TUNER_TEA5761
         tristate "TEA 5761 radio tuner (EXPERIMENTAL)"
-        depends on I2C && EXPERIMENTAL
+        depends on VIDEO_MEDIA && I2C
+        depends on EXPERIMENTAL
         default m if MEDIA_TUNER_CUSTOMIZE
         help
           Say Y here to include support for the Philips TEA5761 radio tuner.
 
 config MEDIA_TUNER_TEA5767
         tristate "TEA 5767 radio tuner"
-        depends on I2C
+        depends on VIDEO_MEDIA && I2C
         default m if MEDIA_TUNER_CUSTOMIZE
         help
           Say Y here to include support for the Philips TEA5767 radio tuner.
 
 config MEDIA_TUNER_MT20XX
         tristate "Microtune 2032 / 2050 tuners"
-        depends on I2C
+        depends on VIDEO_MEDIA && I2C
         default m if MEDIA_TUNER_CUSTOMIZE
         help
           Say Y here to include support for the MT2032 / MT2050 tuner.
 
 config MEDIA_TUNER_MT2060
         tristate "Microtune MT2060 silicon IF tuner"
-        depends on I2C
+        depends on VIDEO_MEDIA && I2C
         default m if DVB_FE_CUSTOMISE
         help
           A driver for the silicon IF tuner MT2060 from Microtune.
 
 config MEDIA_TUNER_MT2266
         tristate "Microtune MT2266 silicon tuner"
-        depends on I2C
+        depends on VIDEO_MEDIA && I2C
         default m if DVB_FE_CUSTOMISE
         help
           A driver for the silicon baseband tuner MT2266 from Microtune.
 
 config MEDIA_TUNER_MT2131
         tristate "Microtune MT2131 silicon tuner"
-        depends on I2C
+        depends on VIDEO_MEDIA && I2C
         default m if DVB_FE_CUSTOMISE
         help
           A driver for the silicon baseband tuner MT2131 from Microtune.
 
 config MEDIA_TUNER_QT1010
         tristate "Quantek QT1010 silicon tuner"
-        depends on DVB_CORE && I2C
+        depends on VIDEO_MEDIA && I2C
         default m if DVB_FE_CUSTOMISE
         help
           A driver for the silicon tuner QT1010 from Quantek.
 
 config MEDIA_TUNER_XC2028
         tristate "XCeive xc2028/xc3028 tuners"
-        depends on I2C && FW_LOADER
+        depends on VIDEO_MEDIA && I2C
+        depends on HOTPLUG
+        select FW_LOADER
         default m if MEDIA_TUNER_CUSTOMIZE
         help
           Say Y here to include support for the xc2028/xc3028 tuners.
 
 config MEDIA_TUNER_XC5000
         tristate "Xceive XC5000 silicon tuner"
-        depends on I2C
+        depends on VIDEO_MEDIA && I2C
+        depends on HOTPLUG
+        select FW_LOADER
         default m if DVB_FE_CUSTOMISE
         help
           A driver for the silicon tuner XC5000 from Xceive.
           This device is only used inside a SiP called togther with a
           demodulator for now.
 
+config MEDIA_TUNER_MXL5005S
+        tristate "MaxLinear MSL5005S silicon tuner"
+        depends on VIDEO_MEDIA && I2C
+        default m if DVB_FE_CUSTOMISE
+        help
+          A driver for the silicon tuner MXL5005S from MaxLinear.
+
 endif # MEDIA_TUNER_CUSTOMIZE
diff --git a/drivers/media/common/tuners/Makefile b/drivers/media/common/tuners/Makefile
index 236d9932fd92..55f7e6706297 100644
--- a/drivers/media/common/tuners/Makefile
+++ b/drivers/media/common/tuners/Makefile
@@ -20,6 +20,7 @@ obj-$(CONFIG_MEDIA_TUNER_MT2060) += mt2060.o
 obj-$(CONFIG_MEDIA_TUNER_MT2266) += mt2266.o
 obj-$(CONFIG_MEDIA_TUNER_QT1010) += qt1010.o
 obj-$(CONFIG_MEDIA_TUNER_MT2131) += mt2131.o
+obj-$(CONFIG_MEDIA_TUNER_MXL5005S) += mxl5005s.o
 
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
 EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
diff --git a/drivers/media/common/tuners/mxl5005s.c b/drivers/media/common/tuners/mxl5005s.c
new file mode 100644
index 000000000000..5d05b5390f66
--- /dev/null
+++ b/drivers/media/common/tuners/mxl5005s.c
@@ -0,0 +1,4110 @@
+/*
+    MaxLinear MXL5005S VSB/QAM/DVBT tuner driver
+
+    Copyright (C) 2008 MaxLinear
+    Copyright (C) 2006 Steven Toth <stoth@hauppauge.com>
+      Functions:
+        mxl5005s_reset()
+        mxl5005s_writereg()
+        mxl5005s_writeregs()
+        mxl5005s_init()
+        mxl5005s_reconfigure()
+        mxl5005s_AssignTunerMode()
+        mxl5005s_set_params()
+        mxl5005s_get_frequency()
+        mxl5005s_get_bandwidth()
+        mxl5005s_release()
+        mxl5005s_attach()
+
+    Copyright (C) 2008 Realtek
+    Copyright (C) 2008 Jan Hoogenraad
+      Functions:
+        mxl5005s_SetRfFreqHz()
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/*
+    History of this driver (Steven Toth):
+      I was given a public release of a linux driver that included
+      support for the MaxLinear MXL5005S silicon tuner. Analysis of
+      the tuner driver showed clearly three things.
+
+      1. The tuner driver didn't support the LinuxTV tuner API
+         so the code Realtek added had to be removed.
+
+      2. A significant amount of the driver is reference driver code
+         from MaxLinear, I felt it was important to identify and
+         preserve this.
+
+      3. New code has to be added to interface correctly with the
+         LinuxTV API, as a regular kernel module.
+
+      Other than the reference driver enum's, I've clearly marked
+      sections of the code and retained the copyright of the
+      respective owners.
+*/
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include "dvb_frontend.h"
+#include "mxl5005s.h"
+
+static int debug;
+
+#define dprintk(level, arg...) do {    \
+        if (level <= debug)            \
+                printk(arg);    \
+        } while (0)
+
+#define TUNER_REGS_NUM          104
+#define INITCTRL_NUM            40
+
+#ifdef _MXL_PRODUCTION
+#define CHCTRL_NUM              39
+#else
+#define CHCTRL_NUM              36
+#endif
+
+#define MXLCTRL_NUM             189
+#define MASTER_CONTROL_ADDR     9
+
+/* Enumeration of Master Control Register State */
+enum master_control_state {
+        MC_LOAD_START = 1,
+        MC_POWER_DOWN,
+        MC_SYNTH_RESET,
+        MC_SEQ_OFF
+};
+
+/* Enumeration of MXL5005 Tuner Modulation Type */
+enum {
+        MXL_DEFAULT_MODULATION = 0,
+        MXL_DVBT,
+        MXL_ATSC,
+        MXL_QAM,
+        MXL_ANALOG_CABLE,
+        MXL_ANALOG_OTA
+} tuner_modu_type;
+
+/* MXL5005 Tuner Register Struct */
+struct TunerReg {
+        u16 Reg_Num;    /* Tuner Register Address */
+        u16 Reg_Val;    /* Current sw programmed value waiting to be writen */
+};
+
+enum {
+        /* Initialization Control Names */
+        DN_IQTN_AMP_CUT = 1,       /* 1 */
+        BB_MODE,                   /* 2 */
+        BB_BUF,                    /* 3 */
+        BB_BUF_OA,                 /* 4 */
+        BB_ALPF_BANDSELECT,        /* 5 */
+        BB_IQSWAP,                 /* 6 */
+        BB_DLPF_BANDSEL,           /* 7 */
+        RFSYN_CHP_GAIN,            /* 8 */
+        RFSYN_EN_CHP_HIGAIN,       /* 9 */
+        AGC_IF,                    /* 10 */
+        AGC_RF,                    /* 11 */
+        IF_DIVVAL,                 /* 12 */
+        IF_VCO_BIAS,               /* 13 */
+        CHCAL_INT_MOD_IF,          /* 14 */
+        CHCAL_FRAC_MOD_IF,         /* 15 */
+        DRV_RES_SEL,               /* 16 */
+        I_DRIVER,                  /* 17 */
+        EN_AAF,                    /* 18 */
+        EN_3P,                     /* 19 */
+        EN_AUX_3P,                 /* 20 */
+        SEL_AAF_BAND,              /* 21 */
+        SEQ_ENCLK16_CLK_OUT,       /* 22 */
+        SEQ_SEL4_16B,              /* 23 */
+        XTAL_CAPSELECT,            /* 24 */
+        IF_SEL_DBL,                /* 25 */
+        RFSYN_R_DIV,               /* 26 */
+        SEQ_EXTSYNTHCALIF,         /* 27 */
+        SEQ_EXTDCCAL,              /* 28 */
+        AGC_EN_RSSI,               /* 29 */
+        RFA_ENCLKRFAGC,            /* 30 */
+        RFA_RSSI_REFH,             /* 31 */
+        RFA_RSSI_REF,              /* 32 */
+        RFA_RSSI_REFL,             /* 33 */
+        RFA_FLR,                   /* 34 */
+        RFA_CEIL,                  /* 35 */
+        SEQ_EXTIQFSMPULSE,         /* 36 */
+        OVERRIDE_1,                /* 37 */
+        BB_INITSTATE_DLPF_TUNE,    /* 38 */
+        TG_R_DIV,                  /* 39 */
+        EN_CHP_LIN_B,              /* 40 */
+
+        /* Channel Change Control Names */
+        DN_POLY = 51,              /* 51 */
+        DN_RFGAIN,                 /* 52 */
+        DN_CAP_RFLPF,              /* 53 */
+        DN_EN_VHFUHFBAR,           /* 54 */
+        DN_GAIN_ADJUST,            /* 55 */
+        DN_IQTNBUF_AMP,            /* 56 */
+        DN_IQTNGNBFBIAS_BST,       /* 57 */
+        RFSYN_EN_OUTMUX,           /* 58 */
+        RFSYN_SEL_VCO_OUT,         /* 59 */
+        RFSYN_SEL_VCO_HI,          /* 60 */
+        RFSYN_SEL_DIVM,            /* 61 */
+        RFSYN_RF_DIV_BIAS,         /* 62 */
+        DN_SEL_FREQ,               /* 63 */
+        RFSYN_VCO_BIAS,            /* 64 */
+        CHCAL_INT_MOD_RF,          /* 65 */
+        CHCAL_FRAC_MOD_RF,         /* 66 */
+        RFSYN_LPF_R,               /* 67 */
+        CHCAL_EN_INT_RF,           /* 68 */
+        TG_LO_DIVVAL,              /* 69 */
+        TG_LO_SELVAL,              /* 70 */
+        TG_DIV_VAL,                /* 71 */
+        TG_VCO_BIAS,               /* 72 */
+        SEQ_EXTPOWERUP,            /* 73 */
+        OVERRIDE_2,                /* 74 */
+        OVERRIDE_3,                /* 75 */
+        OVERRIDE_4,                /* 76 */
+        SEQ_FSM_PULSE,             /* 77 */
+        GPIO_4B,                   /* 78 */
+        GPIO_3B,                   /* 79 */
+        GPIO_4,                    /* 80 */
+        GPIO_3,                    /* 81 */
+        GPIO_1B,                   /* 82 */
+        DAC_A_ENABLE,              /* 83 */
+        DAC_B_ENABLE,              /* 84 */
+        DAC_DIN_A,                 /* 85 */
+        DAC_DIN_B,                 /* 86 */
+#ifdef _MXL_PRODUCTION
+        RFSYN_EN_DIV,              /* 87 */
+        RFSYN_DIVM,                /* 88 */
+        DN_BYPASS_AGC_I2C          /* 89 */
+#endif
+} MXL5005_ControlName;
+
+/*
+ * The following context is source code provided by MaxLinear.
+ * MaxLinear source code - Common_MXL.h (?)
+ */
+
+/* Constants */
+#define MXL5005S_REG_WRITING_TABLE_LEN_MAX      104
+#define MXL5005S_LATCH_BYTE                     0xfe
+
+/* Register address, MSB, and LSB */
+#define MXL5005S_BB_IQSWAP_ADDR                 59
+#define MXL5005S_BB_IQSWAP_MSB                  0
+#define MXL5005S_BB_IQSWAP_LSB                  0
+
+#define MXL5005S_BB_DLPF_BANDSEL_ADDR           53
+#define MXL5005S_BB_DLPF_BANDSEL_MSB            4
+#define MXL5005S_BB_DLPF_BANDSEL_LSB            3
+
+/* Standard modes */
+enum {
+        MXL5005S_STANDARD_DVBT,
+        MXL5005S_STANDARD_ATSC,
+};
+#define MXL5005S_STANDARD_MODE_NUM              2
+
+/* Bandwidth modes */
+enum {
+        MXL5005S_BANDWIDTH_6MHZ = 6000000,
+        MXL5005S_BANDWIDTH_7MHZ = 7000000,
+        MXL5005S_BANDWIDTH_8MHZ = 8000000,
+};
+#define MXL5005S_BANDWIDTH_MODE_NUM             3
+
+/* MXL5005 Tuner Control Struct */
+struct TunerControl {
+        u16 Ctrl_Num;   /* Control Number */
+        u16 size;       /* Number of bits to represent Value */
+        u16 addr[25];   /* Array of Tuner Register Address for each bit pos */
+        u16 bit[25];    /* Array of bit pos in Reg Addr for each bit pos */
+        u16 val[25];    /* Binary representation of Value */
+};
+
+/* MXL5005 Tuner Struct */
+struct mxl5005s_state {
+        u8      Mode;           /* 0: Analog Mode ; 1: Digital Mode */
+        u8      IF_Mode;        /* for Analog Mode, 0: zero IF; 1: low IF */
+        u32     Chan_Bandwidth; /* filter  channel bandwidth (6, 7, 8) */
+        u32     IF_OUT;         /* Desired IF Out Frequency */
+        u16     IF_OUT_LOAD;    /* IF Out Load Resistor (200/300 Ohms) */
+        u32     RF_IN;          /* RF Input Frequency */
+        u32     Fxtal;          /* XTAL Frequency */
+        u8      AGC_Mode;       /* AGC Mode 0: Dual AGC; 1: Single AGC */
+        u16     TOP;            /* Value: take over point */
+        u8      CLOCK_OUT;      /* 0: turn off clk out; 1: turn on clock out */
+        u8      DIV_OUT;        /* 4MHz or 16MHz */
+        u8      CAPSELECT;      /* 0: disable On-Chip pulling cap; 1: enable */
+        u8      EN_RSSI;        /* 0: disable RSSI; 1: enable RSSI */
+
+        /* Modulation Type; */
+        /* 0 - Default; 1 - DVB-T; 2 - ATSC; 3 - QAM; 4 - Analog Cable */
+        u8      Mod_Type;
+
+        /* Tracking Filter Type */
+        /* 0 - Default; 1 - Off; 2 - Type C; 3 - Type C-H */
+        u8      TF_Type;
+
+        /* Calculated Settings */
+        u32     RF_LO;          /* Synth RF LO Frequency */
+        u32     IF_LO;          /* Synth IF LO Frequency */
+        u32     TG_LO;          /* Synth TG_LO Frequency */
+
+        /* Pointers to ControlName Arrays */
+        u16     Init_Ctrl_Num;          /* Number of INIT Control Names */
+        struct TunerControl
+                Init_Ctrl[INITCTRL_NUM]; /* INIT Control Names Array Pointer */
+
+        u16     CH_Ctrl_Num;            /* Number of CH Control Names */
+        struct TunerControl
+                CH_Ctrl[CHCTRL_NUM];    /* CH Control Name Array Pointer */
+
+        u16     MXL_Ctrl_Num;           /* Number of MXL Control Names */
+        struct TunerControl
+                MXL_Ctrl[MXLCTRL_NUM];  /* MXL Control Name Array Pointer */
+
+        /* Pointer to Tuner Register Array */
+        u16     TunerRegs_Num;          /* Number of Tuner Registers */
+        struct TunerReg
+                TunerRegs[TUNER_REGS_NUM]; /* Tuner Register Array Pointer */
+
+        /* Linux driver framework specific */
+        struct mxl5005s_config *config;
+        struct dvb_frontend *frontend;
+        struct i2c_adapter *i2c;
+
+        /* Cache values */
+        u32 current_mode;
+
+};
+
+static u16 MXL_GetMasterControl(u8 *MasterReg, int state);
+static u16 MXL_ControlWrite(struct dvb_frontend *fe, u16 ControlNum, u32 value);
+static u16 MXL_ControlRead(struct dvb_frontend *fe, u16 controlNum, u32 *value);
+static void MXL_RegWriteBit(struct dvb_frontend *fe, u8 address, u8 bit,
+        u8 bitVal);
+static u16 MXL_GetCHRegister(struct dvb_frontend *fe, u8 *RegNum,
+        u8 *RegVal, int *count);
+static u32 MXL_Ceiling(u32 value, u32 resolution);
+static u16 MXL_RegRead(struct dvb_frontend *fe, u8 RegNum, u8 *RegVal);
+static u16 MXL_ControlWrite_Group(struct dvb_frontend *fe, u16 controlNum,
+        u32 value, u16 controlGroup);
+static u16 MXL_SetGPIO(struct dvb_frontend *fe, u8 GPIO_Num, u8 GPIO_Val);
+static u16 MXL_GetInitRegister(struct dvb_frontend *fe, u8 *RegNum,
+        u8 *RegVal, int *count);
+static u32 MXL_GetXtalInt(u32 Xtal_Freq);
+static u16 MXL_TuneRF(struct dvb_frontend *fe, u32 RF_Freq);
+static void MXL_SynthIFLO_Calc(struct dvb_frontend *fe);
+static void MXL_SynthRFTGLO_Calc(struct dvb_frontend *fe);
+static u16 MXL_GetCHRegister_ZeroIF(struct dvb_frontend *fe, u8 *RegNum,
+        u8 *RegVal, int *count);
+static int mxl5005s_writeregs(struct dvb_frontend *fe, u8 *addrtable,
+        u8 *datatable, u8 len);
+static u16 MXL_IFSynthInit(struct dvb_frontend *fe);
+static int mxl5005s_AssignTunerMode(struct dvb_frontend *fe, u32 mod_type,
+        u32 bandwidth);
+static int mxl5005s_reconfigure(struct dvb_frontend *fe, u32 mod_type,
+        u32 bandwidth);
+
+/* ----------------------------------------------------------------
+ * Begin: Custom code salvaged from the Realtek driver.
+ * Copyright (C) 2008 Realtek
+ * Copyright (C) 2008 Jan Hoogenraad
+ * This code is placed under the terms of the GNU General Public License
+ *
+ * Released by Realtek under GPLv2.
+ * Thanks to Realtek for a lot of support we received !
+ *
+ *  Revision: 080314 - original version
+ */
+
+static int mxl5005s_SetRfFreqHz(struct dvb_frontend *fe, unsigned long RfFreqHz)
+{
+        struct mxl5005s_state *state = fe->tuner_priv;
+        unsigned char AddrTable[MXL5005S_REG_WRITING_TABLE_LEN_MAX];
+        unsigned char ByteTable[MXL5005S_REG_WRITING_TABLE_LEN_MAX];
+        int TableLen;
+
+        u32 IfDivval = 0;
+        unsigned char MasterControlByte;
+
+        dprintk(1, "%s() freq=%ld\n", __func__, RfFreqHz);
+
+        /* Set MxL5005S tuner RF frequency according to example code. */
+
+        /* Tuner RF frequency setting stage 0 */
+        MXL_GetMasterControl(ByteTable, MC_SYNTH_RESET);
+        AddrTable[0] = MASTER_CONTROL_ADDR;
+        ByteTable[0] |= state->config->AgcMasterByte;
+
+        mxl5005s_writeregs(fe, AddrTable, ByteTable, 1);
+
+        /* Tuner RF frequency setting stage 1 */
+        MXL_TuneRF(fe, RfFreqHz);
+
+        MXL_ControlRead(fe, IF_DIVVAL, &IfDivval);
+
+        MXL_ControlWrite(fe, SEQ_FSM_PULSE, 0);
+        MXL_ControlWrite(fe, SEQ_EXTPOWERUP, 1);
+        MXL_ControlWrite(fe, IF_DIVVAL, 8);
+        MXL_GetCHRegister(fe, AddrTable, ByteTable, &TableLen);
+
+        MXL_GetMasterControl(&MasterControlByte, MC_LOAD_START);
+        AddrTable[TableLen] = MASTER_CONTROL_ADDR ;
+        ByteTable[TableLen] = MasterControlByte |
+                state->config->AgcMasterByte;
+        TableLen += 1;
+
+        mxl5005s_writeregs(fe, AddrTable, ByteTable, TableLen);
+
+        /* Wait 30 ms. */
+        msleep(150);
+
+        /* Tuner RF frequency setting stage 2 */
+        MXL_ControlWrite(fe, SEQ_FSM_PULSE, 1);
+        MXL_ControlWrite(fe, IF_DIVVAL, IfDivval);
+        MXL_GetCHRegister_ZeroIF(fe, AddrTable, ByteTable, &TableLen);
+
+        MXL_GetMasterControl(&MasterControlByte, MC_LOAD_START);
+        AddrTable[TableLen] = MASTER_CONTROL_ADDR ;
+        ByteTable[TableLen] = MasterControlByte |
+                state->config->AgcMasterByte ;
+        TableLen += 1;
+
+        mxl5005s_writeregs(fe, AddrTable, ByteTable, TableLen);
+
+        msleep(100);
+
+        return 0;
+}
+/* End: Custom code taken from the Realtek driver */
+
+/* ----------------------------------------------------------------
+ * Begin: Reference driver code found in the Realtek driver.
+ * Copyright (C) 2008 MaxLinear
+ */
+static u16 MXL5005_RegisterInit(struct dvb_frontend *fe)
+{
+        struct mxl5005s_state *state = fe->tuner_priv;
+        state->TunerRegs_Num = TUNER_REGS_NUM ;
+
+        state->TunerRegs[0].Reg_Num = 9 ;
+        state->TunerRegs[0].Reg_Val = 0x40 ;
+
+        state->TunerRegs[1].Reg_Num = 11 ;
+        state->TunerRegs[1].Reg_Val = 0x19 ;
+
+        state->TunerRegs[2].Reg_Num = 12 ;
+        state->TunerRegs[2].Reg_Val = 0x60 ;
+
+        state->TunerRegs[3].Reg_Num = 13 ;
+        state->TunerRegs[3].Reg_Val = 0x00 ;
+
+        state->TunerRegs[4].Reg_Num = 14 ;
+        state->TunerRegs[4].Reg_Val = 0x00 ;
+
+        state->TunerRegs[5].Reg_Num = 15 ;
+        state->TunerRegs[5].Reg_Val = 0xC0 ;
+
+        state->TunerRegs[6].Reg_Num = 16 ;
+        state->TunerRegs[6].Reg_Val = 0x00 ;
+
+        state->TunerRegs[7].Reg_Num = 17 ;
+        state->TunerRegs[7].Reg_Val = 0x00 ;
+
+        state->TunerRegs[8].Reg_Num = 18 ;
+        state->TunerRegs[8].Reg_Val = 0x00 ;
+
+        state->TunerRegs[9].Reg_Num = 19 ;
+        state->TunerRegs[9].Reg_Val = 0x34 ;
+
+        state->TunerRegs[10].Reg_Num = 21 ;
+        state->TunerRegs[10].Reg_Val = 0x00 ;
+
+        state->TunerRegs[11].Reg_Num = 22 ;
+        state->TunerRegs[11].Reg_Val = 0x6B ;
+
+        state->TunerRegs[12].Reg_Num = 23 ;
+        state->TunerRegs[12].Reg_Val = 0x35 ;
+
+        state->TunerRegs[13].Reg_Num = 24 ;
+        state->TunerRegs[13].Reg_Val = 0x70 ;
+
+        state->TunerRegs[14].Reg_Num = 25 ;
+        state->TunerRegs[14].Reg_Val = 0x3E ;
+
+        state->TunerRegs[15].Reg_Num = 26 ;
+        state->TunerRegs[15].Reg_Val = 0x82 ;
+
+        state->TunerRegs[16].Reg_Num = 31 ;
+        state->TunerRegs[16].Reg_Val = 0x00 ;
+
+        state->TunerRegs[17].Reg_Num = 32 ;
+        state->TunerRegs[17].Reg_Val = 0x40 ;
+
+        state->TunerRegs[18].Reg_Num = 33 ;
+        state->TunerRegs[18].Reg_Val = 0x53 ;
+
+        state->TunerRegs[19].Reg_Num = 34 ;
+        state->TunerRegs[19].Reg_Val = 0x81 ;
+
+        state->TunerRegs[20].Reg_Num = 35 ;
+        state->TunerRegs[20].Reg_Val = 0xC9 ;
+
+        state->TunerRegs[21].Reg_Num = 36 ;
+        state->TunerRegs[21].Reg_Val = 0x01 ;
+
+        state->TunerRegs[22].Reg_Num = 37 ;
+        state->TunerRegs[22].Reg_Val = 0x00 ;
+
+        state->TunerRegs[23].Reg_Num = 41 ;
+        state->TunerRegs[23].Reg_Val = 0x00 ;
+
+        state->TunerRegs[24].Reg_Num = 42 ;
+        state->TunerRegs[24].Reg_Val = 0xF8 ;
+
+        state->TunerRegs[25].Reg_Num = 43 ;
+        state->TunerRegs[25].Reg_Val = 0x43 ;
+
+        state->TunerRegs[26].Reg_Num = 44 ;
+        state->TunerRegs[26].Reg_Val = 0x20 ;
+
+        state->TunerRegs[27].Reg_Num = 45 ;
+        state->TunerRegs[27].Reg_Val = 0x80 ;
+
+        state->TunerRegs[28].Reg_Num = 46 ;
+        state->TunerRegs[28].Reg_Val = 0x88 ;
+
+        state->TunerRegs[29].Reg_Num = 47 ;
+        state->TunerRegs[29].Reg_Val = 0x86 ;
+
+        state->TunerRegs[30].Reg_Num = 48 ;
+        state->TunerRegs[30].Reg_Val = 0x00 ;
+
+        state->TunerRegs[31].Reg_Num = 49 ;
+        state->TunerRegs[31].Reg_Val = 0x00 ;
+
+        state->TunerRegs[32].Reg_Num = 53 ;
+        state->TunerRegs[32].Reg_Val = 0x94 ;
+
+        state->TunerRegs[33].Reg_Num = 54 ;
+        state->TunerRegs[33].Reg_Val = 0xFA ;
+
+        state->TunerRegs[34].Reg_Num = 55 ;
+        state->TunerRegs[34].Reg_Val = 0x92 ;
+
+        state->TunerRegs[35].Reg_Num = 56 ;
+        state->TunerRegs[35].Reg_Val = 0x80 ;
+
+        state->TunerRegs[36].Reg_Num = 57 ;
+        state->TunerRegs[36].Reg_Val = 0x41 ;
+
+        state->TunerRegs[37].Reg_Num = 58 ;
+        state->TunerRegs[37].Reg_Val = 0xDB ;
+
+        state->TunerRegs[38].Reg_Num = 59 ;
+        state->TunerRegs[38].Reg_Val = 0x00 ;
+
+        state->TunerRegs[39].Reg_Num = 60 ;
+        state->TunerRegs[39].Reg_Val = 0x00 ;
+
+        state->TunerRegs[40].Reg_Num = 61 ;
+        state->TunerRegs[40].Reg_Val = 0x00 ;
+
+        state->TunerRegs[41].Reg_Num = 62 ;
+        state->TunerRegs[41].Reg_Val = 0x00 ;
+
+        state->TunerRegs[42].Reg_Num = 65 ;
+        state->TunerRegs[42].Reg_Val = 0xF8 ;
+
+        state->TunerRegs[43].Reg_Num = 66 ;
+        state->TunerRegs[43].Reg_Val = 0xE4 ;
+
+        state->TunerRegs[44].Reg_Num = 67 ;
+        state->TunerRegs[44].Reg_Val = 0x90 ;
+
+        state->TunerRegs[45].Reg_Num = 68 ;
+        state->TunerRegs[45].Reg_Val = 0xC0 ;
+
+        state->TunerRegs[46].Reg_Num = 69 ;
+        state->TunerRegs[46].Reg_Val = 0x01 ;
+
+        state->TunerRegs[47].Reg_Num = 70 ;
+        state->TunerRegs[47].Reg_Val = 0x50 ;
+
+        state->TunerRegs[48].Reg_Num = 71 ;
+        state->TunerRegs[48].Reg_Val = 0x06 ;
+
+        state->TunerRegs[49].Reg_Num = 72 ;
+        state->TunerRegs[49].Reg_Val = 0x00 ;
+
+        state->TunerRegs[50].Reg_Num = 73 ;
+        state->TunerRegs[50].Reg_Val = 0x20 ;
+
+        state->TunerRegs[51].Reg_Num = 76 ;
+        state->TunerRegs[51].Reg_Val = 0xBB ;
+
+        state->TunerRegs[52].Reg_Num = 77 ;
+        state->TunerRegs[52].Reg_Val = 0x13 ;
+
+        state->TunerRegs[53].Reg_Num = 81 ;
+        state->TunerRegs[53].Reg_Val = 0x04 ;
+
+        state->TunerRegs[54].Reg_Num = 82 ;
+        state->TunerRegs[54].Reg_Val = 0x75 ;
+
+        state->TunerRegs[55].Reg_Num = 83 ;
+        state->TunerRegs[55].Reg_Val = 0x00 ;
+
+        state->TunerRegs[56].Reg_Num = 84 ;
+        state->TunerRegs[56].Reg_Val = 0x00 ;
+
+        state->TunerRegs[57].Reg_Num = 85 ;
+        state->TunerRegs[57].Reg_Val = 0x00 ;
+
+        state->TunerRegs[58].Reg_Num = 91 ;
+        state->TunerRegs[58].Reg_Val = 0x70 ;
+
+        state->TunerRegs[59].Reg_Num = 92 ;
+        state->TunerRegs[59].Reg_Val = 0x00 ;
+
+        state->TunerRegs[60].Reg_Num = 93 ;
+        state->TunerRegs[60].Reg_Val = 0x00 ;
+
+        state->TunerRegs[61].Reg_Num = 94 ;
+        state->TunerRegs[61].Reg_Val = 0x00 ;
+
+        state->TunerRegs[62].Reg_Num = 95 ;
+        state->TunerRegs[62].Reg_Val = 0x0C ;
+
+        state->TunerRegs[63].Reg_Num = 96 ;
+        state->TunerRegs[63].Reg_Val = 0x00 ;
+
+        state->TunerRegs[64].Reg_Num = 97 ;
+        state->TunerRegs[64].Reg_Val = 0x00 ;
+
+        state->TunerRegs[65].Reg_Num = 98 ;
+        state->TunerRegs[65].Reg_Val = 0xE2 ;
+
+        state->TunerRegs[66].Reg_Num = 99 ;
+        state->TunerRegs[66].Reg_Val = 0x00 ;
+
+        state->TunerRegs[67].Reg_Num = 100 ;
+        state->TunerRegs[67].Reg_Val = 0x00 ;
+
+        state->TunerRegs[68].Reg_Num = 101 ;
+        state->TunerRegs[68].Reg_Val = 0x12 ;
+
+        state->TunerRegs[69].Reg_Num = 102 ;
+        state->TunerRegs[69].Reg_Val = 0x80 ;
+
+        state->TunerRegs[70].Reg_Num = 103 ;
+        state->TunerRegs[70].Reg_Val = 0x32 ;
+
+        state->TunerRegs[71].Reg_Num = 104 ;
+        state->TunerRegs[71].Reg_Val = 0xB4 ;
+
+        state->TunerRegs[72].Reg_Num = 105 ;
+        state->TunerRegs[72].Reg_Val = 0x60 ;
+
+        state->TunerRegs[73].Reg_Num = 106 ;
+        state->TunerRegs[73].Reg_Val = 0x83 ;
+
+        state->TunerRegs[74].Reg_Num = 107 ;
+        state->TunerRegs[74].Reg_Val = 0x84 ;
+
+        state->TunerRegs[75].Reg_Num = 108 ;
+        state->TunerRegs[75].Reg_Val = 0x9C ;
+
+        state->TunerRegs[76].Reg_Num = 109 ;
+        state->TunerRegs[76].Reg_Val = 0x02 ;
+
+        state->TunerRegs[77].Reg_Num = 110 ;
+        state->TunerRegs[77].Reg_Val = 0x81 ;
+
+        state->TunerRegs[78].Reg_Num = 111 ;
+        state->TunerRegs[78].Reg_Val = 0xC0 ;
+
+        state->TunerRegs[79].Reg_Num = 112 ;
+        state->TunerRegs[79].Reg_Val = 0x10 ;
+
+        state->TunerRegs[80].Reg_Num = 131 ;
+        state->TunerRegs[80].Reg_Val = 0x8A ;
+
+        state->TunerRegs[81].Reg_Num = 132 ;
+        state->TunerRegs[81].Reg_Val = 0x10 ;
+
+        state->TunerRegs[82].Reg_Num = 133 ;
+        state->TunerRegs[82].Reg_Val = 0x24 ;
+
+        state->TunerRegs[83].Reg_Num = 134 ;
+        state->TunerRegs[83].Reg_Val = 0x00 ;
+
+        state->TunerRegs[84].Reg_Num = 135 ;
+        state->TunerRegs[84].Reg_Val = 0x00 ;
+
+        state->TunerRegs[85].Reg_Num = 136 ;
+        state->TunerRegs[85].Reg_Val = 0x7E ;
+
+        state->TunerRegs[86].Reg_Num = 137 ;
+        state->TunerRegs[86].Reg_Val = 0x40 ;
+
+        state->TunerRegs[87].Reg_Num = 138 ;
+        state->TunerRegs[87].Reg_Val = 0x38 ;
+
+        state->TunerRegs[88].Reg_Num = 146 ;
+        state->TunerRegs[88].Reg_Val = 0xF6 ;
+
+        state->TunerRegs[89].Reg_Num = 147 ;
+        state->TunerRegs[89].Reg_Val = 0x1A ;
+
+        state->TunerRegs[90].Reg_Num = 148 ;
+        state->TunerRegs[90].Reg_Val = 0x62 ;
+
+        state->TunerRegs[91].Reg_Num = 149 ;
+        state->TunerRegs[91].Reg_Val = 0x33 ;
+
+        state->TunerRegs[92].Reg_Num = 150 ;
+        state->TunerRegs[92].Reg_Val = 0x80 ;
+
+        state->TunerRegs[93].Reg_Num = 156 ;
+        state->TunerRegs[93].Reg_Val = 0x56 ;
+
+        state->TunerRegs[94].Reg_Num = 157 ;
+        state->TunerRegs[94].Reg_Val = 0x17 ;
+
+        state->TunerRegs[95].Reg_Num = 158 ;
+        state->TunerRegs[95].Reg_Val = 0xA9 ;
+
+        state->TunerRegs[96].Reg_Num = 159 ;
+        state->TunerRegs[96].Reg_Val = 0x00 ;
+
+        state->TunerRegs[97].Reg_Num = 160 ;
+        state->TunerRegs[97].Reg_Val = 0x00 ;
+
+        state->TunerRegs[98].Reg_Num = 161 ;
+        state->TunerRegs[98].Reg_Val = 0x00 ;
+
+        state->TunerRegs[99].Reg_Num = 162 ;
+        state->TunerRegs[99].Reg_Val = 0x40 ;
+
+        state->TunerRegs[100].Reg_Num = 166 ;
+        state->TunerRegs[100].Reg_Val = 0xAE ;
+
+        state->TunerRegs[101].Reg_Num = 167 ;
+        state->TunerRegs[101].Reg_Val = 0x1B ;
+
+        state->TunerRegs[102].Reg_Num = 168 ;
+        state->TunerRegs[102].Reg_Val = 0xF2 ;
+
+        state->TunerRegs[103].Reg_Num = 195 ;
+        state->TunerRegs[103].Reg_Val = 0x00 ;
+
+        return 0 ;
+}
+
+static u16 MXL5005_ControlInit(struct dvb_frontend *fe)
+{
+        struct mxl5005s_state *state = fe->tuner_priv;
+        state->Init_Ctrl_Num = INITCTRL_NUM;
+
+        state->Init_Ctrl[0].Ctrl_Num = DN_IQTN_AMP_CUT ;
+        state->Init_Ctrl[0].size = 1 ;
+        state->Init_Ctrl[0].addr[0] = 73;
+        state->Init_Ctrl[0].bit[0] = 7;
+        state->Init_Ctrl[0].val[0] = 0;
+
+        state->Init_Ctrl[1].Ctrl_Num = BB_MODE ;
+        state->Init_Ctrl[1].size = 1 ;
+        state->Init_Ctrl[1].addr[0] = 53;
+        state->Init_Ctrl[1].bit[0] = 2;
+        state->Init_Ctrl[1].val[0] = 1;
+
+        state->Init_Ctrl[2].Ctrl_Num = BB_BUF ;
+        state->Init_Ctrl[2].size = 2 ;
+        state->Init_Ctrl[2].addr[0] = 53;
+        state->Init_Ctrl[2].bit[0] = 1;
+        state->Init_Ctrl[2].val[0] = 0;
+        state->Init_Ctrl[2].addr[1] = 57;
+        state->Init_Ctrl[2].bit[1] = 0;
+        state->Init_Ctrl[2].val[1] = 1;
+
+        state->Init_Ctrl[3].Ctrl_Num = BB_BUF_OA ;
+        state->Init_Ctrl[3].size = 1 ;
+        state->Init_Ctrl[3].addr[0] = 53;
+        state->Init_Ctrl[3].bit[0] = 0;
+        state->Init_Ctrl[3].val[0] = 0;
+
+        state->Init_Ctrl[4].Ctrl_Num = BB_ALPF_BANDSELECT ;
+        state->Init_Ctrl[4].size = 3 ;
+        state->Init_Ctrl[4].addr[0] = 53;
+        state->Init_Ctrl[4].bit[0] = 5;
+        state->Init_Ctrl[4].val[0] = 0;
+        state->Init_Ctrl[4].addr[1] = 53;
+        state->Init_Ctrl[4].bit[1] = 6;
+        state->Init_Ctrl[4].val[1] = 0;
+        state->Init_Ctrl[4].addr[2] = 53;
+        state->Init_Ctrl[4].bit[2] = 7;
+        state->Init_Ctrl[4].val[2] = 1;
+
+        state->Init_Ctrl[5].Ctrl_Num = BB_IQSWAP ;
+        state->Init_Ctrl[5].size = 1 ;
+        state->Init_Ctrl[5].addr[0] = 59;
+        state->Init_Ctrl[5].bit[0] = 0;
+        state->Init_Ctrl[5].val[0] = 0;
+
+        state->Init_Ctrl[6].Ctrl_Num = BB_DLPF_BANDSEL ;
+        state->Init_Ctrl[6].size = 2 ;
+        state->Init_Ctrl[6].addr[0] = 53;
+        state->Init_Ctrl[6].bit[0] = 3;
+        state->Init_Ctrl[6].val[0] = 0;
+        state->Init_Ctrl[6].addr[1] = 53;
+        state->Init_Ctrl[6].bit[1] = 4;
+        state->Init_Ctrl[6].val[1] = 1;
+
+        state->Init_Ctrl[7].Ctrl_Num = RFSYN_CHP_GAIN ;
+        state->Init_Ctrl[7].size = 4 ;
+        state->Init_Ctrl[7].addr[0] = 22;
+        state->Init_Ctrl[7].bit[0] = 4;
+        state->Init_Ctrl[7].val[0] = 0;
+        state->Init_Ctrl[7].addr[1] = 22;
+        state->Init_Ctrl[7].bit[1] = 5;
+        state->Init_Ctrl[7].val[1] = 1;
+        state->Init_Ctrl[7].addr[2] = 22;
+        state->Init_Ctrl[7].bit[2] = 6;
+        state->Init_Ctrl[7].val[2] = 1;
+        state->Init_Ctrl[7].addr[3] = 22;
+        state->Init_Ctrl[7].bit[3] = 7;
+        state->Init_Ctrl[7].val[3] = 0;
+
+        state->Init_Ctrl[8].Ctrl_Num = RFSYN_EN_CHP_HIGAIN ;
+        state->Init_Ctrl[8].size = 1 ;
+        state->Init_Ctrl[8].addr[0] = 22;
+        state->Init_Ctrl[8].bit[0] = 2;
+        state->Init_Ctrl[8].val[0] = 0;
+
+        state->Init_Ctrl[9].Ctrl_Num = AGC_IF ;
+        state->Init_Ctrl[9].size = 4 ;
+        state->Init_Ctrl[9].addr[0] = 76;
+        state->Init_Ctrl[9].bit[0] = 0;
+        state->Init_Ctrl[9].val[0] = 1;
+        state->Init_Ctrl[9].addr[1] = 76;
+        state->Init_Ctrl[9].bit[1] = 1;
+        state->Init_Ctrl[9].val[1] = 1;
+        state->Init_Ctrl[9].addr[2] = 76;
+        state->Init_Ctrl[9].bit[2] = 2;
+        state->Init_Ctrl[9].val[2] = 0;
+        state->Init_Ctrl[9].addr[3] = 76;
+        state->Init_Ctrl[9].bit[3] = 3;
+        state->Init_Ctrl[9].val[3] = 1;
+
+        state->Init_Ctrl[10].Ctrl_Num = AGC_RF ;
+        state->Init_Ctrl[10].size = 4 ;
+        state->Init_Ctrl[10].addr[0] = 76;
+        state->Init_Ctrl[10].bit[0] = 4;
+        state->Init_Ctrl[10].val[0] = 1;
+        state->Init_Ctrl[10].addr[1] = 76;
+        state->Init_Ctrl[10].bit[1] = 5;
+        state->Init_Ctrl[10].val[1] = 1;
+        state->Init_Ctrl[10].addr[2] = 76;
+        state->Init_Ctrl[10].bit[2] = 6;
+        state->Init_Ctrl[10].val[2] = 0;
+        state->Init_Ctrl[10].addr[3] = 76;
+        state->Init_Ctrl[10].bit[3] = 7;
+        state->Init_Ctrl[10].val[3] = 1;
+
+        state->Init_Ctrl[11].Ctrl_Num = IF_DIVVAL ;
+        state->Init_Ctrl[11].size = 5 ;
+        state->Init_Ctrl[11].addr[0] = 43;
+        state->Init_Ctrl[11].bit[0] = 3;
+        state->Init_Ctrl[11].val[0] = 0;
+        state->Init_Ctrl[11].addr[1] = 43;
+        state->Init_Ctrl[11].bit[1] = 4;
+        state->Init_Ctrl[11].val[1] = 0;
+        state->Init_Ctrl[11].addr[2] = 43;
+        state->Init_Ctrl[11].bit[2] = 5;
+        state->Init_Ctrl[11].val[2] = 0;
+        state->Init_Ctrl[11].addr[3] = 43;
+        state->Init_Ctrl[11].bit[3] = 6;
+        state->Init_Ctrl[11].val[3] = 1;
+        state->Init_Ctrl[11].addr[4] = 43;
+        state->Init_Ctrl[11].bit[4] = 7;
+        state->Init_Ctrl[11].val[4] = 0;
+
+        state->Init_Ctrl[12].Ctrl_Num = IF_VCO_BIAS ;
+        state->Init_Ctrl[12].size = 6 ;
+        state->Init_Ctrl[12].addr[0] = 44;
+        state->Init_Ctrl[12].bit[0] = 2;
+        state->Init_Ctrl[12].val[0] = 0;
+        state->Init_Ctrl[12].addr[1] = 44;
+        state->Init_Ctrl[12].bit[1] = 3;
+        state->Init_Ctrl[12].val[1] = 0;
+        state->Init_Ctrl[12].addr[2] = 44;
+        state->Init_Ctrl[12].bit[2] = 4;
+        state->Init_Ctrl[12].val[2] = 0;
+        state->Init_Ctrl[12].addr[3] = 44;
+        state->Init_Ctrl[12].bit[3] = 5;
+        state->Init_Ctrl[12].val[3] = 1;
+        state->Init_Ctrl[12].addr[4] = 44;
+        state->Init_Ctrl[12].bit[4] = 6;
+        state->Init_Ctrl[12].val[4] = 0;
+        state->Init_Ctrl[12].addr[5] = 44;
+        state->Init_Ctrl[12].bit[5] = 7;
+        state->Init_Ctrl[12].val[5] = 0;
+
+        state->Init_Ctrl[13].Ctrl_Num = CHCAL_INT_MOD_IF ;
+        state->Init_Ctrl[13].size = 7 ;
+        state->Init_Ctrl[13].addr[0] = 11;
+        state->Init_Ctrl[13].bit[0] = 0;
+        state->Init_Ctrl[13].val[0] = 1;
+        state->Init_Ctrl[13].addr[1] = 11;
+        state->Init_Ctrl[13].bit[1] = 1;
+        state->Init_Ctrl[13].val[1] = 0;
+        state->Init_Ctrl[13].addr[2] = 11;
+        state->Init_Ctrl[13].bit[2] = 2;
+        state->Init_Ctrl[13].val[2] = 0;
+        state->Init_Ctrl[13].addr[3] = 11;
+        state->Init_Ctrl[13].bit[3] = 3;
+        state->Init_Ctrl[13].val[3] = 1;
+        state->Init_Ctrl[13].addr[4] = 11;
+        state->Init_Ctrl[13].bit[4] = 4;
+        state->Init_Ctrl[13].val[4] = 1;
+        state->Init_Ctrl[13].addr[5] = 11;
+        state->Init_Ctrl[13].bit[5] = 5;
+        state->Init_Ctrl[13].val[5] = 0;
+        state->Init_Ctrl[13].addr[6] = 11;
+        state->Init_Ctrl[13].bit[6] = 6;
+        state->Init_Ctrl[13].val[6] = 0;
+
+        state->Init_Ctrl[14].Ctrl_Num = CHCAL_FRAC_MOD_IF ;
+        state->Init_Ctrl[14].size = 16 ;
+        state->Init_Ctrl[14].addr[0] = 13;
+        state->Init_Ctrl[14].bit[0] = 0;
+        state->Init_Ctrl[14].val[0] = 0;
+        state->Init_Ctrl[14].addr[1] = 13;
+        state->Init_Ctrl[14].bit[1] = 1;
+        state->Init_Ctrl[14].val[1] = 0;
+        state->Init_Ctrl[14].addr[2] = 13;
+        state->Init_Ctrl[14].bit[2] = 2;
+        state->Init_Ctrl[14].val[2] = 0;
+        state->Init_Ctrl[14].addr[3] = 13;
+        state->Init_Ctrl[14].bit[3] = 3;
+        state->Init_Ctrl[14].val[3] = 0;
+        state->Init_Ctrl[14].addr[4] = 13;
+        state->Init_Ctrl[14].bit[4] = 4;
+        state->Init_Ctrl[14].val[4] = 0;
+        state->Init_Ctrl[14].addr[5] = 13;
+        state->Init_Ctrl[14].bit[5] = 5;
+        state->Init_Ctrl[14].val[5] = 0;
+        state->Init_Ctrl[14].addr[6] = 13;
+        state->Init_Ctrl[14].bit[6] = 6;
+        state->Init_Ctrl[14].val[6] = 0;
+        state->Init_Ctrl[14].addr[7] = 13;
+        state->Init_Ctrl[14].bit[7] = 7;
+        state->Init_Ctrl[14].val[7] = 0;
+        state->Init_Ctrl[14].addr[8] = 12;
+        state->Init_Ctrl[14].bit[8] = 0;
+        state->Init_Ctrl[14].val[8] = 0;
+        state->Init_Ctrl[14].addr[9] = 12;
+        state->Init_Ctrl[14].bit[9] = 1;
+        state->Init_Ctrl[14].val[9] = 0;
+        state->Init_Ctrl[14].addr[10] = 12;
+        state->Init_Ctrl[14].bit[10] = 2;
+        state->Init_Ctrl[14].val[10] = 0;
+        state->Init_Ctrl[14].addr[11] = 12;
+        state->Init_Ctrl[14].bit[11] = 3;
+        state->Init_Ctrl[14].val[11] = 0;
+        state->Init_Ctrl[14].addr[12] = 12;
+        state->Init_Ctrl[14].bit[12] = 4;
+        state->Init_Ctrl[14].val[12] = 0;
+        state->Init_Ctrl[14].addr[13] = 12;
+        state->Init_Ctrl[14].bit[13] = 5;
+        state->Init_Ctrl[14].val[13] = 1;
+        state->Init_Ctrl[14].addr[14] = 12;
+        state->Init_Ctrl[14].bit[14] = 6;
+        state->Init_Ctrl[14].val[14] = 1;
+        state->Init_Ctrl[14].addr[15] = 12;
+        state->Init_Ctrl[14].bit[15] = 7;
+        state->Init_Ctrl[14].val[15] = 0;
+
+        state->Init_Ctrl[15].Ctrl_Num = DRV_RES_SEL ;
+        state->Init_Ctrl[15].size = 3 ;
+        state->Init_Ctrl[15].addr[0] = 147;
+        state->Init_Ctrl[15].bit[0] = 2;
+        state->Init_Ctrl[15].val[0] = 0;
+        state->Init_Ctrl[15].addr[1] = 147;
+        state->Init_Ctrl[15].bit[1] = 3;
+        state->Init_Ctrl[15].val[1] = 1;
+        state->Init_Ctrl[15].addr[2] = 147;
+        state->Init_Ctrl[15].bit[2] = 4;
+        state->Init_Ctrl[15].val[2] = 1;
+
+        state->Init_Ctrl[16].Ctrl_Num = I_DRIVER ;
+        state->Init_Ctrl[16].size = 2 ;
+        state->Init_Ctrl[16].addr[0] = 147;
+        state->Init_Ctrl[16].bit[0] = 0;
+        state->Init_Ctrl[16].val[0] = 0;
+        state->Init_Ctrl[16].addr[1] = 147;
+        state->Init_Ctrl[16].bit[1] = 1;
+        state->Init_Ctrl[16].val[1] = 1;
+
+        state->Init_Ctrl[17].Ctrl_Num = EN_AAF ;
+        state->Init_Ctrl[17].size = 1 ;
+        state->Init_Ctrl[17].addr[0] = 147;
+        state->Init_Ctrl[17].bit[0] = 7;
+        state->Init_Ctrl[17].val[0] = 0;
+
+        state->Init_Ctrl[18].Ctrl_Num = EN_3P ;
+        state->Init_Ctrl[18].size = 1 ;
+        state->Init_Ctrl[18].addr[0] = 147;
+        state->Init_Ctrl[18].bit[0] = 6;
+        state->Init_Ctrl[18].val[0] = 0;
+
+        state->Init_Ctrl[19].Ctrl_Num = EN_AUX_3P ;
+        state->Init_Ctrl[19].size = 1 ;
+        state->Init_Ctrl[19].addr[0] = 156;
+        state->Init_Ctrl[19].bit[0] = 0;
+        state->Init_Ctrl[19].val[0] = 0;
+
+        state->Init_Ctrl[20].Ctrl_Num = SEL_AAF_BAND ;
+        state->Init_Ctrl[20].size = 1 ;
+        state->Init_Ctrl[20].addr[0] = 147;
+        state->Init_Ctrl[20].bit[0] = 5;
+        state->Init_Ctrl[20].val[0] = 0;
+
+        state->Init_Ctrl[21].Ctrl_Num = SEQ_ENCLK16_CLK_OUT ;
+        state->Init_Ctrl[21].size = 1 ;
+        state->Init_Ctrl[21].addr[0] = 137;
+        state->Init_Ctrl[21].bit[0] = 4;
+        state->Init_Ctrl[21].val[0] = 0;
+
+        state->Init_Ctrl[22].Ctrl_Num = SEQ_SEL4_16B ;
+        state->Init_Ctrl[22].size = 1 ;
+        state->Init_Ctrl[22].addr[0] = 137;
+        state->Init_Ctrl[22].bit[0] = 7;
+        state->Init_Ctrl[22].val[0] = 0;
+
+        state->Init_Ctrl[23].Ctrl_Num = XTAL_CAPSELECT ;
+        state->Init_Ctrl[23].size = 1 ;
+        state->Init_Ctrl[23].addr[0] = 91;
+        state->Init_Ctrl[23].bit[0] = 5;
+        state->Init_Ctrl[23].val[0] = 1;
+
+        state->Init_Ctrl[24].Ctrl_Num = IF_SEL_DBL ;
+        state->Init_Ctrl[24].size = 1 ;
+        state->Init_Ctrl[24].addr[0] = 43;
+        state->Init_Ctrl[24].bit[0] = 0;
+        state->Init_Ctrl[24].val[0] = 1;
+
+        state->Init_Ctrl[25].Ctrl_Num = RFSYN_R_DIV ;
+        state->Init_Ctrl[25].size = 2 ;
+        state->Init_Ctrl[25].addr[0] = 22;
+        state->Init_Ctrl[25].bit[0] = 0;
+        state->Init_Ctrl[25].val[0] = 1;
+        state->Init_Ctrl[25].addr[1] = 22;
+        state->Init_Ctrl[25].bit[1] = 1;
+        state->Init_Ctrl[25].val[1] = 1;
+
+        state->Init_Ctrl[26].Ctrl_Num = SEQ_EXTSYNTHCALIF ;
+        state->Init_Ctrl[26].size = 1 ;
+        state->Init_Ctrl[26].addr[0] = 134;
+        state->Init_Ctrl[26].bit[0] = 2;
+        state->Init_Ctrl[26].val[0] = 0;
+
+        state->Init_Ctrl[27].Ctrl_Num = SEQ_EXTDCCAL ;
+        state->Init_Ctrl[27].size = 1 ;
+        state->Init_Ctrl[27].addr[0] = 137;
+        state->Init_Ctrl[27].bit[0] = 3;
+        state->Init_Ctrl[27].val[0] = 0;
+
+        state->Init_Ctrl[28].Ctrl_Num = AGC_EN_RSSI ;
+        state->Init_Ctrl[28].size = 1 ;
+        state->Init_Ctrl[28].addr[0] = 77;
+        state->Init_Ctrl[28].bit[0] = 7;
+        state->Init_Ctrl[28].val[0] = 0;
+
+        state->Init_Ctrl[29].Ctrl_Num = RFA_ENCLKRFAGC ;
+        state->Init_Ctrl[29].size = 1 ;
+        state->Init_Ctrl[29].addr[0] = 166;
+        state->Init_Ctrl[29].bit[0] = 7;
+        state->Init_Ctrl[29].val[0] = 1;
+
+        state->Init_Ctrl[30].Ctrl_Num = RFA_RSSI_REFH ;
+        state->Init_Ctrl[30].size = 3 ;
+        state->Init_Ctrl[30].addr[0] = 166;
+        state->Init_Ctrl[30].bit[0] = 0;
+        state->Init_Ctrl[30].val[0] = 0;
+        state->Init_Ctrl[30].addr[1] = 166;
+        state->Init_Ctrl[30].bit[1] = 1;
+        state->Init_Ctrl[30].val[1] = 1;
+        state->Init_Ctrl[30].addr[2] = 166;
+        state->Init_Ctrl[30].bit[2] = 2;
+        state->Init_Ctrl[30].val[2] = 1;
+
+        state->Init_Ctrl[31].Ctrl_Num = RFA_RSSI_REF ;
+        state->Init_Ctrl[31].size = 3 ;
+        state->Init_Ctrl[31].addr[0] = 166;
+        state->Init_Ctrl[31].bit[0] = 3;
+        state->Init_Ctrl[31].val[0] = 1;
+        state->Init_Ctrl[31].addr[1] = 166;
+        state->Init_Ctrl[31].bit[1] = 4;
+        state->Init_Ctrl[31].val[1] = 0;
+        state->Init_Ctrl[31].addr[2] = 166;
+        state->Init_Ctrl[31].bit[2] = 5;
+        state->Init_Ctrl[31].val[2] = 1;
+
+        state->Init_Ctrl[32].Ctrl_Num = RFA_RSSI_REFL ;
+        state->Init_Ctrl[32].size = 3 ;
+        state->Init_Ctrl[32].addr[0] = 167;
+        state->Init_Ctrl[32].bit[0] = 0;
+        state->Init_Ctrl[32].val[0] = 1;
+        state->Init_Ctrl[32].addr[1] = 167;
+        state->Init_Ctrl[32].bit[1] = 1;
+        state->Init_Ctrl[32].val[1] = 1;
+        state->Init_Ctrl[32].addr[2] = 167;
+        state->Init_Ctrl[32].bit[2] = 2;
+        state->Init_Ctrl[32].val[2] = 0;
+
+        state->Init_Ctrl[33].Ctrl_Num = RFA_FLR ;
+        state->Init_Ctrl[33].size = 4 ;
+        state->Init_Ctrl[33].addr[0] = 168;
+        state->Init_Ctrl[33].bit[0] = 0;
+        state->Init_Ctrl[33].val[0] = 0;
+        state->Init_Ctrl[33].addr[1] = 168;
+        state->Init_Ctrl[33].bit[1] = 1;
+        state->Init_Ctrl[33].val[1] = 1;
+        state->Init_Ctrl[33].addr[2] = 168;
+        state->Init_Ctrl[33].bit[2] = 2;
+        state->Init_Ctrl[33].val[2] = 0;
+        state->Init_Ctrl[33].addr[3] = 168;
+        state->Init_Ctrl[33].bit[3] = 3;
+        state->Init_Ctrl[33].val[3] = 0;
+
+        state->Init_Ctrl[34].Ctrl_Num = RFA_CEIL ;
+        state->Init_Ctrl[34].size = 4 ;
+        state->Init_Ctrl[34].addr[0] = 168;
+        state->Init_Ctrl[34].bit[0] = 4;
+        state->Init_Ctrl[34].val[0] = 1;
+        state->Init_Ctrl[34].addr[1] = 168;
+        state->Init_Ctrl[34].bit[1] = 5;
+        state->Init_Ctrl[34].val[1] = 1;
+        state->Init_Ctrl[34].addr[2] = 168;
+        state->Init_Ctrl[34].bit[2] = 6;
+        state->Init_Ctrl[34].val[2] = 1;
+        state->Init_Ctrl[34].addr[3] = 168;
+        state->Init_Ctrl[34].bit[3] = 7;
+        state->Init_Ctrl[34].val[3] = 1;
+
+        state->Init_Ctrl[35].Ctrl_Num = SEQ_EXTIQFSMPULSE ;
+        state->Init_Ctrl[35].size = 1 ;
+        state->Init_Ctrl[35].addr[0] = 135;
+        state->Init_Ctrl[35].bit[0] = 0;
+        state->Init_Ctrl[35].val[0] = 0;
+
+        state->Init_Ctrl[36].Ctrl_Num = OVERRIDE_1 ;
+        state->Init_Ctrl[36].size = 1 ;
+        state->Init_Ctrl[36].addr[0] = 56;
+        state->Init_Ctrl[36].bit[0] = 3;
+        state->Init_Ctrl[36].val[0] = 0;
+
+        state->Init_Ctrl[37].Ctrl_Num = BB_INITSTATE_DLPF_TUNE ;
+        state->Init_Ctrl[37].size = 7 ;
+        state->Init_Ctrl[37].addr[0] = 59;
+        state->Init_Ctrl[37].bit[0] = 1;
+        state->Init_Ctrl[37].val[0] = 0;
+        state->Init_Ctrl[37].addr[1] = 59;
+        state->Init_Ctrl[37].bit[1] = 2;
+        state->Init_Ctrl[37].val[1] = 0;
+        state->Init_Ctrl[37].addr[2] = 59;
+        state->Init_Ctrl[37].bit[2] = 3;
+        state->Init_Ctrl[37].val[2] = 0;
+        state->Init_Ctrl[37].addr[3] = 59;
+        state->Init_Ctrl[37].bit[3] = 4;
+        state->Init_Ctrl[37].val[3] = 0;
+        state->Init_Ctrl[37].addr[4] = 59;
+        state->Init_Ctrl[37].bit[4] = 5;
+        state->Init_Ctrl[37].val[4] = 0;
+        state->Init_Ctrl[37].addr[5] = 59;
+        state->Init_Ctrl[37].bit[5] = 6;
+        state->Init_Ctrl[37].val[5] = 0;
+        state->Init_Ctrl[37].addr[6] = 59;
+        state->Init_Ctrl[37].bit[6] = 7;
+        state->Init_Ctrl[37].val[6] = 0;
+
+        state->Init_Ctrl[38].Ctrl_Num = TG_R_DIV ;
+        state->Init_Ctrl[38].size = 6 ;
+        state->Init_Ctrl[38].addr[0] = 32;
+        state->Init_Ctrl[38].bit[0] = 2;
+        state->Init_Ctrl[38].val[0] = 0;
+        state->Init_Ctrl[38].addr[1] = 32;
+        state->Init_Ctrl[38].bit[1] = 3;
+        state->Init_Ctrl[38].val[1] = 0;
+        state->Init_Ctrl[38].addr[2] = 32;
+        state->Init_Ctrl[38].bit[2] = 4;
+        state->Init_Ctrl[38].val[2] = 0;
+        state->Init_Ctrl[38].addr[3] = 32;
+        state->Init_Ctrl[38].bit[3] = 5;
+        state->Init_Ctrl[38].val[3] = 0;
+        state->Init_Ctrl[38].addr[4] = 32;
+        state->Init_Ctrl[38].bit[4] = 6;
+        state->Init_Ctrl[38].val[4] = 1;
+        state->Init_Ctrl[38].addr[5] = 32;
+        state->Init_Ctrl[38].bit[5] = 7;
+        state->Init_Ctrl[38].val[5] = 0;
+
+        state->Init_Ctrl[39].Ctrl_Num = EN_CHP_LIN_B ;
+        state->Init_Ctrl[39].size = 1 ;
+        state->Init_Ctrl[39].addr[0] = 25;
+        state->Init_Ctrl[39].bit[0] = 3;
+        state->Init_Ctrl[39].val[0] = 1;
+
+
+        state->CH_Ctrl_Num = CHCTRL_NUM ;
+
+        state->CH_Ctrl[0].Ctrl_Num = DN_POLY ;
+        state->CH_Ctrl[0].size = 2 ;
+        state->CH_Ctrl[0].addr[0] = 68;
+        state->CH_Ctrl[0].bit[0] = 6;
+        state->CH_Ctrl[0].val[0] = 1;
+        state->CH_Ctrl[0].addr[1] = 68;
+        state->CH_Ctrl[0].bit[1] = 7;
+        state->CH_Ctrl[0].val[1] = 1;
+
+        state->CH_Ctrl[1].Ctrl_Num = DN_RFGAIN ;
+        state->CH_Ctrl[1].size = 2 ;
+        state->CH_Ctrl[1].addr[0] = 70;
+        state->CH_Ctrl[1].bit[0] = 6;
+        state->CH_Ctrl[1].val[0] = 1;
+        state->CH_Ctrl[1].addr[1] = 70;
+        state->CH_Ctrl[1].bit[1] = 7;
+        state->CH_Ctrl[1].val[1] = 0;
+
+        state->CH_Ctrl[2].Ctrl_Num = DN_CAP_RFLPF ;
+        state->CH_Ctrl[2].size = 9 ;
+        state->CH_Ctrl[2].addr[0] = 69;
+        state->CH_Ctrl[2].bit[0] = 5;
+        state->CH_Ctrl[2].val[0] = 0;
+        state->CH_Ctrl[2].addr[1] = 69;
+        state->CH_Ctrl[2].bit[1] = 6;
+        state->CH_Ctrl[2].val[1] = 0;
+        state->CH_Ctrl[2].addr[2] = 69;
+        state->CH_Ctrl[2].bit[2] = 7;
+        state->CH_Ctrl[2].val[2] = 0;
+        state->CH_Ctrl[2].addr[3] = 68;
+        state->CH_Ctrl[2].bit[3] = 0;
+        state->CH_Ctrl[2].val[3] = 0;
+        state->CH_Ctrl[2].addr[4] = 68;
+        state->CH_Ctrl[2].bit[4] = 1;
+        state->CH_Ctrl[2].val[4] = 0;
+        state->CH_Ctrl[2].addr[5] = 68;
+        state->CH_Ctrl[2].bit[5] = 2;
+        state->CH_Ctrl[2].val[5] = 0;
+        state->CH_Ctrl[2].addr[6] = 68;
+        state->CH_Ctrl[2].bit[6] = 3;
+        state->CH_Ctrl[2].val[6] = 0;
+        state->CH_Ctrl[2].addr[7] = 68;
+        state->CH_Ctrl[2].bit[7] = 4;
+        state->CH_Ctrl[2].val[7] = 0;
+        state->CH_Ctrl[2].addr[8] = 68;
+        state->CH_Ctrl[2].bit[8] = 5;
+        state->CH_Ctrl[2].val[8] = 0;
+
+        state->CH_Ctrl[3].Ctrl_Num = DN_EN_VHFUHFBAR ;
+        state->CH_Ctrl[3].size = 1 ;
+        state->CH_Ctrl[3].addr[0] = 70;
+        state->CH_Ctrl[3].bit[0] = 5;
+        state->CH_Ctrl[3].val[0] = 0;
+
+        state->CH_Ctrl[4].Ctrl_Num = DN_GAIN_ADJUST ;
+        state->CH_Ctrl[4].size = 3 ;
+        state->CH_Ctrl[4].addr[0] = 73;
+        state->CH_Ctrl[4].bit[0] = 4;
+        state->CH_Ctrl[4].val[0] = 0;
+        state->CH_Ctrl[4].addr[1] = 73;
+        state->CH_Ctrl[4].bit[1] = 5;
+        state->CH_Ctrl[4].val[1] = 1;
+        state->CH_Ctrl[4].addr[2] = 73;
+        state->CH_Ctrl[4].bit[2] = 6;
+        state->CH_Ctrl[4].val[2] = 0;
+
+        state->CH_Ctrl[5].Ctrl_Num = DN_IQTNBUF_AMP ;
+        state->CH_Ctrl[5].size = 4 ;
+        state->CH_Ctrl[5].addr[0] = 70;
+        state->CH_Ctrl[5].bit[0] = 0;
+        state->CH_Ctrl[5].val[0] = 0;
+        state->CH_Ctrl[5].addr[1] = 70;
+        state->CH_Ctrl[5].bit[1] = 1;
+        state->CH_Ctrl[5].val[1] = 0;
+        state->CH_Ctrl[5].addr[2] = 70;
+        state->CH_Ctrl[5].bit[2] = 2;
+        state->CH_Ctrl[5].val[2] = 0;
+        state->CH_Ctrl[5].addr[3] = 70;
+        state->CH_Ctrl[5].bit[3] = 3;
+        state->CH_Ctrl[5].val[3] = 0;
+
+        state->CH_Ctrl[6].Ctrl_Num = DN_IQTNGNBFBIAS_BST ;
+        state->CH_Ctrl[6].size = 1 ;
+        state->CH_Ctrl[6].addr[0] = 70;
+        state->CH_Ctrl[6].bit[0] = 4;
+        state->CH_Ctrl[6].val[0] = 1;
+
+        state->CH_Ctrl[7].Ctrl_Num = RFSYN_EN_OUTMUX ;
+        state->CH_Ctrl[7].size = 1 ;
+        state->CH_Ctrl[7].addr[0] = 111;
+        state->CH_Ctrl[7].bit[0] = 4;
+        state->CH_Ctrl[7].val[0] = 0;
+
+        state->CH_Ctrl[8].Ctrl_Num = RFSYN_SEL_VCO_OUT ;
+        state->CH_Ctrl[8].size = 1 ;
+        state->CH_Ctrl[8].addr[0] = 111;
+        state->CH_Ctrl[8].bit[0] = 7;
+        state->CH_Ctrl[8].val[0] = 1;
+
+        state->CH_Ctrl[9].Ctrl_Num = RFSYN_SEL_VCO_HI ;
+        state->CH_Ctrl[9].size = 1 ;
+        state->CH_Ctrl[9].addr[0] = 111;
+        state->CH_Ctrl[9].bit[0] = 6;
+        state->CH_Ctrl[9].val[0] = 1;
+
+        state->CH_Ctrl[10].Ctrl_Num = RFSYN_SEL_DIVM ;
+        state->CH_Ctrl[10].size = 1 ;
+        state->CH_Ctrl[10].addr[0] = 111;
+        state->CH_Ctrl[10].bit[0] = 5;
+        state->CH_Ctrl[10].val[0] = 0;
+
+        state->CH_Ctrl[11].Ctrl_Num = RFSYN_RF_DIV_BIAS ;
+        state->CH_Ctrl[11].size = 2 ;
+        state->CH_Ctrl[11].addr[0] = 110;
+        state->CH_Ctrl[11].bit[0] = 0;
+        state->CH_Ctrl[11].val[0] = 1;
+        state->CH_Ctrl[11].addr[1] = 110;
+        state->CH_Ctrl[11].bit[1] = 1;
+        state->CH_Ctrl[11].val[1] = 0;
+
+        state->CH_Ctrl[12].Ctrl_Num = DN_SEL_FREQ ;
+        state->CH_Ctrl[12].size = 3 ;
+        state->CH_Ctrl[12].addr[0] = 69;
+        state->CH_Ctrl[12].bit[0] = 2;
+        state->CH_Ctrl[12].val[0] = 0;
+        state->CH_Ctrl[12].addr[1] = 69;
+        state->CH_Ctrl[12].bit[1] = 3;
+        state->CH_Ctrl[12].val[1] = 0;
+        state->CH_Ctrl[12].addr[2] = 69;
+        state->CH_Ctrl[12].bit[2] = 4;
+        state->CH_Ctrl[12].val[2] = 0;
+
+        state->CH_Ctrl[13].Ctrl_Num = RFSYN_VCO_BIAS ;
+        state->CH_Ctrl[13].size = 6 ;
+        state->CH_Ctrl[13].addr[0] = 110;
+        state->CH_Ctrl[13].bit[0] = 2;
+        state->CH_Ctrl[13].val[0] = 0;
+        state->CH_Ctrl[13].addr[1] = 110;
+        state->CH_Ctrl[13].bit[1] = 3;
+        state->CH_Ctrl[13].val[1] = 0;
+        state->CH_Ctrl[13].addr[2] = 110;
+        state->CH_Ctrl[13].bit[2] = 4;
+        state->CH_Ctrl[13].val[2] = 0;
+        state->CH_Ctrl[13].addr[3] = 110;
+        state->CH_Ctrl[13].bit[3] = 5;
+        state->CH_Ctrl[13].val[3] = 0;
+        state->CH_Ctrl[13].addr[4] = 110;
+        state->CH_Ctrl[13].bit[4] = 6;
+        state->CH_Ctrl[13].val[4] = 0;
+        state->CH_Ctrl[13].addr[5] = 110;
+        state->CH_Ctrl[13].bit[5] = 7;
+        state->CH_Ctrl[13].val[5] = 1;
+
+        state->CH_Ctrl[14].Ctrl_Num = CHCAL_INT_MOD_RF ;
+        state->CH_Ctrl[14].size = 7 ;
+        state->CH_Ctrl[14].addr[0] = 14;
+        state->CH_Ctrl[14].bit[0] = 0;
+        state->CH_Ctrl[14].val[0] = 0;
+        state->CH_Ctrl[14].addr[1] = 14;
+        state->CH_Ctrl[14].bit[1] = 1;
+        state->CH_Ctrl[14].val[1] = 0;
+        state->CH_Ctrl[14].addr[2] = 14;
+        state->CH_Ctrl[14].bit[2] = 2;
+        state->CH_Ctrl[14].val[2] = 0;
+        state->CH_Ctrl[14].addr[3] = 14;
+        state->CH_Ctrl[14].bit[3] = 3;
+        state->CH_Ctrl[14].val[3] = 0;
+        state->CH_Ctrl[14].addr[4] = 14;
+        state->CH_Ctrl[14].bit[4] = 4;
+        state->CH_Ctrl[14].val[4] = 0;
+        state->CH_Ctrl[14].addr[5] = 14;
+        state->CH_Ctrl[14].bit[5] = 5;
+        state->CH_Ctrl[14].val[5] = 0;
+        state->CH_Ctrl[14].addr[6] = 14;
+        state->CH_Ctrl[14].bit[6] = 6;
+        state->CH_Ctrl[14].val[6] = 0;
+
+        state->CH_Ctrl[15].Ctrl_Num = CHCAL_FRAC_MOD_RF ;
+        state->CH_Ctrl[15].size = 18 ;
+        state->CH_Ctrl[15].addr[0] = 17;
+        state->CH_Ctrl[15].bit[0] = 6;
+        state->CH_Ctrl[15].val[0] = 0;
+        state->CH_Ctrl[15].addr[1] = 17;
+        state->CH_Ctrl[15].bit[1] = 7;
+        state->CH_Ctrl[15].val[1] = 0;
+        state->CH_Ctrl[15].addr[2] = 16;
+        state->CH_Ctrl[15].bit[2] = 0;
+        state->CH_Ctrl[15].val[2] = 0;
+        state->CH_Ctrl[15].addr[3] = 16;
+        state->CH_Ctrl[15].bit[3] = 1;
+        state->CH_Ctrl[15].val[3] = 0;
+        state->CH_Ctrl[15].addr[4] = 16;
+        state->CH_Ctrl[15].bit[4] = 2;
+        state->CH_Ctrl[15].val[4] = 0;
+        state->CH_Ctrl[15].addr[5] = 16;
+        state->CH_Ctrl[15].bit[5] = 3;
+        state->CH_Ctrl[15].val[5] = 0;
+        state->CH_Ctrl[15].addr[6] = 16;
+        state->CH_Ctrl[15].bit[6] = 4;
+        state->CH_Ctrl[15].val[6] = 0;
+        state->CH_Ctrl[15].addr[7] = 16;
+        state->CH_Ctrl[15].bit[7] = 5;
+        state->CH_Ctrl[15].val[7] = 0;
+        state->CH_Ctrl[15].addr[8] = 16;
+        state->CH_Ctrl[15].bit[8] = 6;
+        state->CH_Ctrl[15].val[8] = 0;
+        state->CH_Ctrl[15].addr[9] = 16;
+        state->CH_Ctrl[15].bit[9] = 7;
+        state->CH_Ctrl[15].val[9] = 0;
+        state->CH_Ctrl[15].addr[10] = 15;
+        state->CH_Ctrl[15].bit[10] = 0;
+        state->CH_Ctrl[15].val[10] = 0;
+        state->CH_Ctrl[15].addr[11] = 15;
+        state->CH_Ctrl[15].bit[11] = 1;
+        state->CH_Ctrl[15].val[11] = 0;
+        state->CH_Ctrl[15].addr[12] = 15;
+        state->CH_Ctrl[15].bit[12] = 2;
+        state->CH_Ctrl[15].val[12] = 0;
+        state->CH_Ctrl[15].addr[13] = 15;
+        state->CH_Ctrl[15].bit[13] = 3;
+        state->CH_Ctrl[15].val[13] = 0;
+        state->CH_Ctrl[15].addr[14] = 15;
+        state->CH_Ctrl[15].bit[14] = 4;
+        state->CH_Ctrl[15].val[14] = 0;
+        state->CH_Ctrl[15].addr[15] = 15;
+        state->CH_Ctrl[15].bit[15] = 5;
+        state->CH_Ctrl[15].val[15] = 0;
+        state->CH_Ctrl[15].addr[16] = 15;
+        state->CH_Ctrl[15].bit[16] = 6;
+        state->CH_Ctrl[15].val[16] = 1;
+        state->CH_Ctrl[15].addr[17] = 15;
+        state->CH_Ctrl[15].bit[17] = 7;
+        state->CH_Ctrl[15].val[17] = 1;
+
+        state->CH_Ctrl[16].Ctrl_Num = RFSYN_LPF_R ;
+        state->CH_Ctrl[16].size = 5 ;
+        state->CH_Ctrl[16].addr[0] = 112;
+        state->CH_Ctrl[16].bit[0] = 0;
+        state->CH_Ctrl[16].val[0] = 0;
+        state->CH_Ctrl[16].addr[1] = 112;
+        state->CH_Ctrl[16].bit[1] = 1;
+        state->CH_Ctrl[16].val[1] = 0;
+        state->CH_Ctrl[16].addr[2] = 112;
+        state->CH_Ctrl[16].bit[2] = 2;
+        state->CH_Ctrl[16].val[2] = 0;
+        state->CH_Ctrl[16].addr[3] = 112;
+        state->CH_Ctrl[16].bit[3] = 3;
+        state->CH_Ctrl[16].val[3] = 0;
+        state->CH_Ctrl[16].addr[4] = 112;
+        state->CH_Ctrl[16].bit[4] = 4;
+        state->CH_Ctrl[16].val[4] = 1;
+
+        state->CH_Ctrl[17].Ctrl_Num = CHCAL_EN_INT_RF ;
+        state->CH_Ctrl[17].size = 1 ;
+        state->CH_Ctrl[17].addr[0] = 14;
+        state->CH_Ctrl[17].bit[0] = 7;
+        state->CH_Ctrl[17].val[0] = 0;
+
+        state->CH_Ctrl[18].Ctrl_Num = TG_LO_DIVVAL ;
+        state->CH_Ctrl[18].size = 4 ;
+        state->CH_Ctrl[18].addr[0] = 107;
+        state->CH_Ctrl[18].bit[0] = 3;
+        state->CH_Ctrl[18].val[0] = 0;
+        state->CH_Ctrl[18].addr[1] = 107;
+        state->CH_Ctrl[18].bit[1] = 4;
+        state->CH_Ctrl[18].val[1] = 0;
+        state->CH_Ctrl[18].addr[2] = 107;
+        state->CH_Ctrl[18].bit[2] = 5;
+        state->CH_Ctrl[18].val[2] = 0;
+        state->CH_Ctrl[18].addr[3] = 107;
+        state->CH_Ctrl[18].bit[3] = 6;
+        state->CH_Ctrl[18].val[3] = 0;
+
+        state->CH_Ctrl[19].Ctrl_Num = TG_LO_SELVAL ;
+        state->CH_Ctrl[19].size = 3 ;
+        state->CH_Ctrl[19].addr[0] = 107;
+        state->CH_Ctrl[19].bit[0] = 7;
+        state->CH_Ctrl[19].val[0] = 1;
+        state->CH_Ctrl[19].addr[1] = 106;
+        state->CH_Ctrl[19].bit[1] = 0;
+        state->CH_Ctrl[19].val[1] = 1;
+        state->CH_Ctrl[19].addr[2] = 106;
+        state->CH_Ctrl[19].bit[2] = 1;
+        state->CH_Ctrl[19].val[2] = 1;
+
+        state->CH_Ctrl[20].Ctrl_Num = TG_DIV_VAL ;
+        state->CH_Ctrl[20].size = 11 ;
+        state->CH_Ctrl[20].addr[0] = 109;
+        state->CH_Ctrl[20].bit[0] = 2;
+        state->CH_Ctrl[20].val[0] = 0;
+        state->CH_Ctrl[20].addr[1] = 109;
+        state->CH_Ctrl[20].bit[1] = 3;
+        state->CH_Ctrl[20].val[1] = 0;
+        state->CH_Ctrl[20].addr[2] = 109;
+        state->CH_Ctrl[20].bit[2] = 4;
+        state->CH_Ctrl[20].val[2] = 0;
+        state->CH_Ctrl[20].addr[3] = 109;
+        state->CH_Ctrl[20].bit[3] = 5;
+        state->CH_Ctrl[20].val[3] = 0;
+        state->CH_Ctrl[20].addr[4] = 109;
+        state->CH_Ctrl[20].bit[4] = 6;
+        state->CH_Ctrl[20].val[4] = 0;
+        state->CH_Ctrl[20].addr[5] = 109;
+        state->CH_Ctrl[20].bit[5] = 7;
+        state->CH_Ctrl[20].val[5] = 0;
+        state->CH_Ctrl[20].addr[6] = 108;
+        state->CH_Ctrl[20].bit[6] = 0;
+        state->CH_Ctrl[20].val[6] = 0;
+        state->CH_Ctrl[20].addr[7] = 108;
+        state->CH_Ctrl[20].bit[7] = 1;
+        state->CH_Ctrl[20].val[7] = 0;
+        state->CH_Ctrl[20].addr[8] = 108;
+        state->CH_Ctrl[20].bit[8] = 2;
+        state->CH_Ctrl[20].val[8] = 1;
+        state->CH_Ctrl[20].addr[9] = 108;
+        state->CH_Ctrl[20].bit[9] = 3;
+        state->CH_Ctrl[20].val[9] = 1;
+        state->CH_Ctrl[20].addr[10] = 108;
+        state->CH_Ctrl[20].bit[10] = 4;
+        state->CH_Ctrl[20].val[10] = 1;
+
+        state->CH_Ctrl[21].Ctrl_Num = TG_VCO_BIAS ;
+        state->CH_Ctrl[21].size = 6 ;
+        state->CH_Ctrl[21].addr[0] = 106;
+        state->CH_Ctrl[21].bit[0] = 2;
+        state->CH_Ctrl[21].val[0] = 0;
+        state->CH_Ctrl[21].addr[1] = 106;
+        state->CH_Ctrl[21].bit[1] = 3;
+        state->CH_Ctrl[21].val[1] = 0;
+        state->CH_Ctrl[21].addr[2] = 106;
+        state->CH_Ctrl[21].bit[2] = 4;
+        state->CH_Ctrl[21].val[2] = 0;
+        state->CH_Ctrl[21].addr[3] = 106;
+        state->CH_Ctrl[21].bit[3] = 5;
+        state->CH_Ctrl[21].val[3] = 0;
+        state->CH_Ctrl[21].addr[4] = 106;
+        state->CH_Ctrl[21].bit[4] = 6;
+        state->CH_Ctrl[21].val[4] = 0;
+        state->CH_Ctrl[21].addr[5] = 106;
+        state->CH_Ctrl[21].bit[5] = 7;
+        state->CH_Ctrl[21].val[5] = 1;
+
+        state->CH_Ctrl[22].Ctrl_Num = SEQ_EXTPOWERUP ;
+        state->CH_Ctrl[22].size = 1 ;
+        state->CH_Ctrl[22].addr[0] = 138;
+        state->CH_Ctrl[22].bit[0] = 4;
+        state->CH_Ctrl[22].val[0] = 1;
+
+        state->CH_Ctrl[23].Ctrl_Num = OVERRIDE_2 ;
+        state->CH_Ctrl[23].size = 1 ;
+        state->CH_Ctrl[23].addr[0] = 17;
+        state->CH_Ctrl[23].bit[0] = 5;
+        state->CH_Ctrl[23].val[0] = 0;
+
+        state->CH_Ctrl[24].Ctrl_Num = OVERRIDE_3 ;
+        state->CH_Ctrl[24].size = 1 ;
+        state->CH_Ctrl[24].addr[0] = 111;
+        state->CH_Ctrl[24].bit[0] = 3;
+        state->CH_Ctrl[24].val[0] = 0;
+
+        state->CH_Ctrl[25].Ctrl_Num = OVERRIDE_4 ;
+        state->CH_Ctrl[25].size = 1 ;
+        state->CH_Ctrl[25].addr[0] = 112;
+        state->CH_Ctrl[25].bit[0] = 7;
+        state->CH_Ctrl[25].val[0] = 0;
+
+        state->CH_Ctrl[26].Ctrl_Num = SEQ_FSM_PULSE ;
+        state->CH_Ctrl[26].size = 1 ;
+        state->CH_Ctrl[26].addr[0] = 136;
+        state->CH_Ctrl[26].bit[0] = 7;
+        state->CH_Ctrl[26].val[0] = 0;
+
+        state->CH_Ctrl[27].Ctrl_Num = GPIO_4B ;
+        state->CH_Ctrl[27].size = 1 ;
+        state->CH_Ctrl[27].addr[0] = 149;
+        state->CH_Ctrl[27].bit[0] = 7;
+        state->CH_Ctrl[27].val[0] = 0;
+
+        state->CH_Ctrl[28].Ctrl_Num = GPIO_3B ;
+        state->CH_Ctrl[28].size = 1 ;
+        state->CH_Ctrl[28].addr[0] = 149;
+        state->CH_Ctrl[28].bit[0] = 6;
+        state->CH_Ctrl[28].val[0] = 0;
+
+        state->CH_Ctrl[29].Ctrl_Num = GPIO_4 ;
+        state->CH_Ctrl[29].size = 1 ;
+        state->CH_Ctrl[29].addr[0] = 149;
+        state->CH_Ctrl[29].bit[0] = 5;
+        state->CH_Ctrl[29].val[0] = 1;
+
+        state->CH_Ctrl[30].Ctrl_Num = GPIO_3 ;
+        state->CH_Ctrl[30].size = 1 ;
+        state->CH_Ctrl[30].addr[0] = 149;
+        state->CH_Ctrl[30].bit[0] = 4;
+        state->CH_Ctrl[30].val[0] = 1;
+
+        state->CH_Ctrl[31].Ctrl_Num = GPIO_1B ;
+        state->CH_Ctrl[31].size = 1 ;
+        state->CH_Ctrl[31].addr[0] = 149;
+        state->CH_Ctrl[31].bit[0] = 3;
+        state->CH_Ctrl[31].val[0] = 0;
+
+        state->CH_Ctrl[32].Ctrl_Num = DAC_A_ENABLE ;
+        state->CH_Ctrl[32].size = 1 ;
+        state->CH_Ctrl[32].addr[0] = 93;
+        state->CH_Ctrl[32].bit[0] = 1;
+        state->CH_Ctrl[32].val[0] = 0;
+
+        state->CH_Ctrl[33].Ctrl_Num = DAC_B_ENABLE ;
+        state->CH_Ctrl[33].size = 1 ;
+        state->CH_Ctrl[33].addr[0] = 93;
+        state->CH_Ctrl[33].bit[0] = 0;
+        state->CH_Ctrl[33].val[0] = 0;
+
+        state->CH_Ctrl[34].Ctrl_Num = DAC_DIN_A ;
+        state->CH_Ctrl[34].size = 6 ;
+        state->CH_Ctrl[34].addr[0] = 92;
+        state->CH_Ctrl[34].bit[0] = 2;
+        state->CH_Ctrl[34].val[0] = 0;
+        state->CH_Ctrl[34].addr[1] = 92;
+        state->CH_Ctrl[34].bit[1] = 3;
+        state->CH_Ctrl[34].val[1] = 0;
+        state->CH_Ctrl[34].addr[2] = 92;
+        state->CH_Ctrl[34].bit[2] = 4;
+        state->CH_Ctrl[34].val[2] = 0;
+        state->CH_Ctrl[34].addr[3] = 92;
+        state->CH_Ctrl[34].bit[3] = 5;
+        state->CH_Ctrl[34].val[3] = 0;
+        state->CH_Ctrl[34].addr[4] = 92;
+        state->CH_Ctrl[34].bit[4] = 6;
+        state->CH_Ctrl[34].val[4] = 0;
+        state->CH_Ctrl[34].addr[5] = 92;
+        state->CH_Ctrl[34].bit[5] = 7;
+        state->CH_Ctrl[34].val[5] = 0;
+
+        state->CH_Ctrl[35].Ctrl_Num = DAC_DIN_B ;
+        state->CH_Ctrl[35].size = 6 ;
+        state->CH_Ctrl[35].addr[0] = 93;
+        state->CH_Ctrl[35].bit[0] = 2;
+        state->CH_Ctrl[35].val[0] = 0;
+        state->CH_Ctrl[35].addr[1] = 93;
+        state->CH_Ctrl[35].bit[1] = 3;
+        state->CH_Ctrl[35].val[1] = 0;
+        state->CH_Ctrl[35].addr[2] = 93;
+        state->CH_Ctrl[35].bit[2] = 4;
+        state->CH_Ctrl[35].val[2] = 0;
+        state->CH_Ctrl[35].addr[3] = 93;
+        state->CH_Ctrl[35].bit[3] = 5;
+        state->CH_Ctrl[35].val[3] = 0;
+        state->CH_Ctrl[35].addr[4] = 93;
+        state->CH_Ctrl[35].bit[4] = 6;
+        state->CH_Ctrl[35].val[4] = 0;
+        state->CH_Ctrl[35].addr[5] = 93;
+        state->CH_Ctrl[35].bit[5] = 7;
+        state->CH_Ctrl[35].val[5] = 0;
+
+#ifdef _MXL_PRODUCTION
+        state->CH_Ctrl[36].Ctrl_Num = RFSYN_EN_DIV ;
+        state->CH_Ctrl[36].size = 1 ;
+        state->CH_Ctrl[36].addr[0] = 109;
+        state->CH_Ctrl[36].bit[0] = 1;
+        state->CH_Ctrl[36].val[0] = 1;
+
+        state->CH_Ctrl[37].Ctrl_Num = RFSYN_DIVM ;
+        state->CH_Ctrl[37].size = 2 ;
+        state->CH_Ctrl[37].addr[0] = 112;
+        state->CH_Ctrl[37].bit[0] = 5;
+        state->CH_Ctrl[37].val[0] = 0;
+        state->CH_Ctrl[37].addr[1] = 112;
+        state->CH_Ctrl[37].bit[1] = 6;
+        state->CH_Ctrl[37].val[1] = 0;
+
+        state->CH_Ctrl[38].Ctrl_Num = DN_BYPASS_AGC_I2C ;
+        state->CH_Ctrl[38].size = 1 ;
+        state->CH_Ctrl[38].addr[0] = 65;
+        state->CH_Ctrl[38].bit[0] = 1;
+        state->CH_Ctrl[38].val[0] = 0;
+#endif
+
+        return 0 ;
+}
+
+static void InitTunerControls(struct dvb_frontend *fe)
+{
+        MXL5005_RegisterInit(fe);
+        MXL5005_ControlInit(fe);
+#ifdef _MXL_INTERNAL
+        MXL5005_MXLControlInit(fe);
+#endif
+}
+
+static u16 MXL5005_TunerConfig(struct dvb_frontend *fe,
+        u8      Mode,           /* 0: Analog Mode ; 1: Digital Mode */
+        u8      IF_mode,        /* for Analog Mode, 0: zero IF; 1: low IF */
+        u32     Bandwidth,      /* filter  channel bandwidth (6, 7, 8) */
+        u32     IF_out,         /* Desired IF Out Frequency */
+        u32     Fxtal,          /* XTAL Frequency */
+        u8      AGC_Mode,       /* AGC Mode - Dual AGC: 0, Single AGC: 1 */
+        u16     TOP,            /* 0: Dual AGC; Value: take over point */
+        u16     IF_OUT_LOAD,    /* IF Out Load Resistor (200 / 300 Ohms) */
+        u8      CLOCK_OUT,      /* 0: turn off clk out; 1: turn on clock out */
+        u8      DIV_OUT,        /* 0: Div-1; 1: Div-4 */
+        u8      CAPSELECT,      /* 0: disable On-Chip pulling cap; 1: enable */
+        u8      EN_RSSI,        /* 0: disable RSSI; 1: enable RSSI */
+
+        /* Modulation Type; */
+        /* 0 - Default; 1 - DVB-T; 2 - ATSC; 3 - QAM; 4 - Analog Cable */
+        u8      Mod_Type,
+
+        /* Tracking Filter */
+        /* 0 - Default; 1 - Off; 2 - Type C; 3 - Type C-H */
+        u8      TF_Type
+        )
+{
+        struct mxl5005s_state *state = fe->tuner_priv;
+        u16 status = 0;
+
+        state->Mode = Mode;
+        state->IF_Mode = IF_mode;
+        state->Chan_Bandwidth = Bandwidth;
+        state->IF_OUT = IF_out;
+        state->Fxtal = Fxtal;
+        state->AGC_Mode = AGC_Mode;
+        state->TOP = TOP;
+        state->IF_OUT_LOAD = IF_OUT_LOAD;
+        state->CLOCK_OUT = CLOCK_OUT;
+        state->DIV_OUT = DIV_OUT;
+        state->CAPSELECT = CAPSELECT;
+        state->EN_RSSI = EN_RSSI;
+        state->Mod_Type = Mod_Type;
+        state->TF_Type = TF_Type;
+
+        /* Initialize all the controls and registers */
+        InitTunerControls(fe);
+
+        /* Synthesizer LO frequency calculation */
+        MXL_SynthIFLO_Calc(fe);
+
+        return status;
+}
+
+static void MXL_SynthIFLO_Calc(struct dvb_frontend *fe)
+{
+        struct mxl5005s_state *state = fe->tuner_priv;
+        if (state->Mode == 1) /* Digital Mode */
+                state->IF_LO = state->IF_OUT;
+        else /* Analog Mode */ {
+                if (state->IF_Mode == 0) /* Analog Zero IF mode */
+                        state->IF_LO = state->IF_OUT + 400000;
+                else /* Analog Low IF mode */
+                        state->IF_LO = state->IF_OUT + state->Chan_Bandwidth/2;
+        }
+}
+
+static void MXL_SynthRFTGLO_Calc(struct dvb_frontend *fe)
+{
+        struct mxl5005s_state *state = fe->tuner_priv;
+
+        if (state->Mode == 1) /* Digital Mode */ {
+                        /* remove 20.48MHz setting for 2.6.10 */
+                        state->RF_LO = state->RF_IN;
+                        /* change for 2.6.6 */
+                        state->TG_LO = state->RF_IN - 750000;
+        } else /* Analog Mode */ {
+                if (state->IF_Mode == 0) /* Analog Zero IF mode */ {
+                        state->RF_LO = state->RF_IN - 400000;
+                        state->TG_LO = state->RF_IN - 1750000;
+                } else /* Analog Low IF mode */ {
+                        state->RF_LO = state->RF_IN - state->Chan_Bandwidth/2;
+                        state->TG_LO = state->RF_IN -
+                                state->Chan_Bandwidth + 500000;
+                }
+        }
+}
+
+static u16 MXL_OverwriteICDefault(struct dvb_frontend *fe)
+{
+        u16 status = 0;
+
+        status += MXL_ControlWrite(fe, OVERRIDE_1, 1);
+        status += MXL_ControlWrite(fe, OVERRIDE_2, 1);
+        status += MXL_ControlWrite(fe, OVERRIDE_3, 1);
+        status += MXL_ControlWrite(fe, OVERRIDE_4, 1);
+
+        return status;
+}
+
+static u16 MXL_BlockInit(struct dvb_frontend *fe)
+{
+        struct mxl5005s_state *state = fe->tuner_priv;
+        u16 status = 0;
+
+        status += MXL_OverwriteICDefault(fe);
+
+        /* Downconverter Control Dig Ana */
+        status += MXL_ControlWrite(fe, DN_IQTN_AMP_CUT, state->Mode ? 1 : 0);
+
+        /* Filter Control  Dig  Ana */
+        status += MXL_ControlWrite(fe, BB_MODE, state->Mode ? 0 : 1);
+        status += MXL_ControlWrite(fe, BB_BUF, state->Mode ? 3 : 2);
+        status += MXL_ControlWrite(fe, BB_BUF_OA, state->Mode ? 1 : 0);
+        status += MXL_ControlWrite(fe, BB_IQSWAP, state->Mode ? 0 : 1);
+        status += MXL_ControlWrite(fe, BB_INITSTATE_DLPF_TUNE, 0);
+
+        /* Initialize Low-Pass Filter */
+        if (state->Mode) { /* Digital Mode */
+                switch (state->Chan_Bandwidth) {
+                case 8000000:
+                        status += MXL_ControlWrite(fe, BB_DLPF_BANDSEL, 0);
+                        break;
+                case 7000000:
+                        status += MXL_ControlWrite(fe, BB_DLPF_BANDSEL, 2);
+                        break;
+                case 6000000:
+                        status += MXL_ControlWrite(fe,
+                                        BB_DLPF_BANDSEL, 3);
+                        break;
+                }
+        } else { /* Analog Mode */
+                switch (state->Chan_Bandwidth) {
+                case 8000000:   /* Low Zero */
+                        status += MXL_ControlWrite(fe, BB_ALPF_BANDSELECT,
+                                        (state->IF_Mode ? 0 : 3));
+                        break;
+                case 7000000:
+                        status += MXL_ControlWrite(fe, BB_ALPF_BANDSELECT,
+                                        (state->IF_Mode ? 1 : 4));
+                        break;
+                case 6000000:
+                        status += MXL_ControlWrite(fe, BB_ALPF_BANDSELECT,
+                                        (state->IF_Mode ? 2 : 5));
+                        break;
+                }
+        }
+
+        /* Charge Pump Control Dig  Ana */
+        status += MXL_ControlWrite(fe, RFSYN_CHP_GAIN, state->Mode ? 5 : 8);
+        status += MXL_ControlWrite(fe,
+                RFSYN_EN_CHP_HIGAIN, state->Mode ? 1 : 1);
+        status += MXL_ControlWrite(fe, EN_CHP_LIN_B, state->Mode ? 0 : 0);
+
+        /* AGC TOP Control */
+        if (state->AGC_Mode == 0) /* Dual AGC */ {
+                status += MXL_ControlWrite(fe, AGC_IF, 15);
+                status += MXL_ControlWrite(fe, AGC_RF, 15);
+        } else /*  Single AGC Mode Dig  Ana */
+                status += MXL_ControlWrite(fe, AGC_RF, state->Mode ? 15 : 12);
+
+        if (state->TOP == 55) /* TOP == 5.5 */
+                status += MXL_ControlWrite(fe, AGC_IF, 0x0);
+
+        if (state->TOP == 72) /* TOP == 7.2 */
+                status += MXL_ControlWrite(fe, AGC_IF, 0x1);
+
+        if (state->TOP == 92) /* TOP == 9.2 */
+                status += MXL_ControlWrite(fe, AGC_IF, 0x2);
+
+        if (state->TOP == 110) /* TOP == 11.0 */
+                status += MXL_ControlWrite(fe, AGC_IF, 0x3);
+
+        if (state->TOP == 129) /* TOP == 12.9 */
+                status += MXL_ControlWrite(fe, AGC_IF, 0x4);
+
+        if (state->TOP == 147) /* TOP == 14.7 */
+                status += MXL_ControlWrite(fe, AGC_IF, 0x5);
+
+        if (state->TOP == 168) /* TOP == 16.8 */
+                status += MXL_ControlWrite(fe, AGC_IF, 0x6);
+
+        if (state->TOP == 194) /* TOP == 19.4 */
+                status += MXL_ControlWrite(fe, AGC_IF, 0x7);
+
+        if (state->TOP == 212) /* TOP == 21.2 */
+                status += MXL_ControlWrite(fe, AGC_IF, 0x9);
+
+        if (state->TOP == 232) /* TOP == 23.2 */
+                status += MXL_ControlWrite(fe, AGC_IF, 0xA);
+
+        if (state->TOP == 252) /* TOP == 25.2 */
+                status += MXL_ControlWrite(fe, AGC_IF, 0xB);
+
+        if (state->TOP == 271) /* TOP == 27.1 */
+                status += MXL_ControlWrite(fe, AGC_IF, 0xC);
+
+        if (state->TOP == 292) /* TOP == 29.2 */
+                status += MXL_ControlWrite(fe, AGC_IF, 0xD);
+
+        if (state->TOP == 317) /* TOP == 31.7 */
+                status += MXL_ControlWrite(fe, AGC_IF, 0xE);
+
+        if (state->TOP == 349) /* TOP == 34.9 */
+                status += MXL_ControlWrite(fe, AGC_IF, 0xF);
+
+        /* IF Synthesizer Control */
+        status += MXL_IFSynthInit(fe);
+
+        /* IF UpConverter Control */
+        if (state->IF_OUT_LOAD == 200) {
+                status += MXL_ControlWrite(fe, DRV_RES_SEL, 6);
+                status += MXL_ControlWrite(fe, I_DRIVER, 2);
+        }
+        if (state->IF_OUT_LOAD == 300) {
+                status += MXL_ControlWrite(fe, DRV_RES_SEL, 4);
+                status += MXL_ControlWrite(fe, I_DRIVER, 1);
+        }
+
+        /* Anti-Alias Filtering Control
+         * initialise Anti-Aliasing Filter
+         */
+        if (state->Mode) { /* Digital Mode */
+                if (state->IF_OUT >= 4000000UL && state->IF_OUT <= 6280000UL) {
+                        status += MXL_ControlWrite(fe, EN_AAF, 1);
+                        status += MXL_ControlWrite(fe, EN_3P, 1);
+                        status += MXL_ControlWrite(fe, EN_AUX_3P, 1);
+                        status += MXL_ControlWrite(fe, SEL_AAF_BAND, 0);
+                }
+                if ((state->IF_OUT == 36125000UL) ||
+                        (state->IF_OUT == 36150000UL)) {
+                        status += MXL_ControlWrite(fe, EN_AAF, 1);
+                        status += MXL_ControlWrite(fe, EN_3P, 1);
+                        status += MXL_ControlWrite(fe, EN_AUX_3P, 1);
+                        status += MXL_ControlWrite(fe, SEL_AAF_BAND, 1);
+                }
+                if (state->IF_OUT > 36150000UL) {
+                        status += MXL_ControlWrite(fe, EN_AAF, 0);
+                        status += MXL_ControlWrite(fe, EN_3P, 1);
+                        status += MXL_ControlWrite(fe, EN_AUX_3P, 1);
+                        status += MXL_ControlWrite(fe, SEL_AAF_BAND, 1);
+                }
+        } else { /* Analog Mode */
+                if (state->IF_OUT >= 4000000UL && state->IF_OUT <= 5000000UL) {
+                        status += MXL_ControlWrite(fe, EN_AAF, 1);
+                        status += MXL_ControlWrite(fe, EN_3P, 1);
+                        status += MXL_ControlWrite(fe, EN_AUX_3P, 1);
+                        status += MXL_ControlWrite(fe, SEL_AAF_BAND, 0);
+                }
+                if (state->IF_OUT > 5000000UL) {
+                        status += MXL_ControlWrite(fe, EN_AAF, 0);
+                        status += MXL_ControlWrite(fe, EN_3P, 0);
+                        status += MXL_ControlWrite(fe, EN_AUX_3P, 0);
+                        status += MXL_ControlWrite(fe, SEL_AAF_BAND, 0);
+                }
+        }
+
+        /* Demod Clock Out */
+        if (state->CLOCK_OUT)
+                status += MXL_ControlWrite(fe, SEQ_ENCLK16_CLK_OUT, 1);
+        else
+                status += MXL_ControlWrite(fe, SEQ_ENCLK16_CLK_OUT, 0);
+
+        if (state->DIV_OUT == 1)
+                status += MXL_ControlWrite(fe, SEQ_SEL4_16B, 1);
+        if (state->DIV_OUT == 0)
+                status += MXL_ControlWrite(fe, SEQ_SEL4_16B, 0);
+
+        /* Crystal Control */
+        if (state->CAPSELECT)
+                status += MXL_ControlWrite(fe, XTAL_CAPSELECT, 1);
+        else
+                status += MXL_ControlWrite(fe, XTAL_CAPSELECT, 0);
+
+        if (state->Fxtal >= 12000000UL && state->Fxtal <= 16000000UL)
+                status += MXL_ControlWrite(fe, IF_SEL_DBL, 1);
+        if (state->Fxtal > 16000000UL && state->Fxtal <= 32000000UL)
+                status += MXL_ControlWrite(fe, IF_SEL_DBL, 0);
+
+        if (state->Fxtal >= 12000000UL && state->Fxtal <= 22000000UL)
+                status += MXL_ControlWrite(fe, RFSYN_R_DIV, 3);
+        if (state->Fxtal > 22000000UL && state->Fxtal <= 32000000UL)
+                status += MXL_ControlWrite(fe, RFSYN_R_DIV, 0);
+
+        /* Misc Controls */
+        if (state->Mode == 0 && state->IF_Mode == 1) /* Analog LowIF mode */
+                status += MXL_ControlWrite(fe, SEQ_EXTIQFSMPULSE, 0);
+        else
+                status += MXL_ControlWrite(fe, SEQ_EXTIQFSMPULSE, 1);
+
+        /* status += MXL_ControlRead(fe, IF_DIVVAL, &IF_DIVVAL_Val); */
+
+        /* Set TG_R_DIV */
+        status += MXL_ControlWrite(fe, TG_R_DIV,
+                MXL_Ceiling(state->Fxtal, 1000000));
+
+        /* Apply Default value to BB_INITSTATE_DLPF_TUNE */
+
+        /* RSSI Control */
+        if (state->EN_RSSI) {
+                status += MXL_ControlWrite(fe, SEQ_EXTSYNTHCALIF, 1);
+                status += MXL_ControlWrite(fe, SEQ_EXTDCCAL, 1);
+                status += MXL_ControlWrite(fe, AGC_EN_RSSI, 1);
+                status += MXL_ControlWrite(fe, RFA_ENCLKRFAGC, 1);
+
+                /* RSSI reference point */
+                status += MXL_ControlWrite(fe, RFA_RSSI_REF, 2);
+                status += MXL_ControlWrite(fe, RFA_RSSI_REFH, 3);
+                status += MXL_ControlWrite(fe, RFA_RSSI_REFL, 1);
+
+                /* TOP point */
+                status += MXL_ControlWrite(fe, RFA_FLR, 0);
+                status += MXL_ControlWrite(fe, RFA_CEIL, 12);
+        }
+
+        /* Modulation type bit settings
+         * Override the control values preset
+         */
+        if (state->Mod_Type == MXL_DVBT) /* DVB-T Mode */ {
+                state->AGC_Mode = 1; /* Single AGC Mode */
+
+                /* Enable RSSI */
+                status += MXL_ControlWrite(fe, SEQ_EXTSYNTHCALIF, 1);
+                status += MXL_ControlWrite(fe, SEQ_EXTDCCAL, 1);
+                status += MXL_ControlWrite(fe, AGC_EN_RSSI, 1);
+                status += MXL_ControlWrite(fe, RFA_ENCLKRFAGC, 1);
+
+                /* RSSI reference point */
+                status += MXL_ControlWrite(fe, RFA_RSSI_REF, 3);
+                status += MXL_ControlWrite(fe, RFA_RSSI_REFH, 5);
+                status += MXL_ControlWrite(fe, RFA_RSSI_REFL, 1);
+
+                /* TOP point */
+                status += MXL_ControlWrite(fe, RFA_FLR, 2);
+                status += MXL_ControlWrite(fe, RFA_CEIL, 13);
+                if (state->IF_OUT <= 6280000UL) /* Low IF */
+                        status += MXL_ControlWrite(fe, BB_IQSWAP, 0);
+                else /* High IF */
+                        status += MXL_ControlWrite(fe, BB_IQSWAP, 1);
+
+        }
+        if (state->Mod_Type == MXL_ATSC) /* ATSC Mode */ {
+                state->AGC_Mode = 1;    /* Single AGC Mode */
+
+                /* Enable RSSI */
+                status += MXL_ControlWrite(fe, SEQ_EXTSYNTHCALIF, 1);
+                status += MXL_ControlWrite(fe, SEQ_EXTDCCAL, 1);
+                status += MXL_ControlWrite(fe, AGC_EN_RSSI, 1);
+                status += MXL_ControlWrite(fe, RFA_ENCLKRFAGC, 1);
+
+                /* RSSI reference point */
+                status += MXL_ControlWrite(fe, RFA_RSSI_REF, 2);
+                status += MXL_ControlWrite(fe, RFA_RSSI_REFH, 4);
+                status += MXL_ControlWrite(fe, RFA_RSSI_REFL, 1);
+
+                /* TOP point */
+                status += MXL_ControlWrite(fe, RFA_FLR, 2);
+                status += MXL_ControlWrite(fe, RFA_CEIL, 13);
+                status += MXL_ControlWrite(fe, BB_INITSTATE_DLPF_TUNE, 1);
+                /* Low Zero */
+                status += MXL_ControlWrite(fe, RFSYN_CHP_GAIN, 5);
+
+                if (state->IF_OUT <= 6280000UL) /* Low IF */
+                        status += MXL_ControlWrite(fe, BB_IQSWAP, 0);
+                else /* High IF */
+                        status += MXL_ControlWrite(fe, BB_IQSWAP, 1);
+        }
+        if (state->Mod_Type == MXL_QAM) /* QAM Mode */ {
+                state->Mode = MXL_DIGITAL_MODE;
+
+                /* state->AGC_Mode = 1; */ /* Single AGC Mode */
+
+                /* Disable RSSI */      /* change here for v2.6.5 */
+                status += MXL_ControlWrite(fe, SEQ_EXTSYNTHCALIF, 1);
+                status += MXL_ControlWrite(fe, SEQ_EXTDCCAL, 1);
+                status += MXL_ControlWrite(fe, AGC_EN_RSSI, 0);
+                status += MXL_ControlWrite(fe, RFA_ENCLKRFAGC, 1);
+
+                /* RSSI reference point */
+                status += MXL_ControlWrite(fe, RFA_RSSI_REFH, 5);
+                status += MXL_ControlWrite(fe, RFA_RSSI_REF, 3);
+                status += MXL_ControlWrite(fe, RFA_RSSI_REFL, 2);
+                /* change here for v2.6.5 */
+                status += MXL_ControlWrite(fe, RFSYN_CHP_GAIN, 3);
+
+                if (state->IF_OUT <= 6280000UL) /* Low IF */
+                        status += MXL_ControlWrite(fe, BB_IQSWAP, 0);
+                else /* High IF */
+                        status += MXL_ControlWrite(fe, BB_IQSWAP, 1);
+                status += MXL_ControlWrite(fe, RFSYN_CHP_GAIN, 2);
+
+        }
+        if (state->Mod_Type == MXL_ANALOG_CABLE) {
+                /* Analog Cable Mode */
+                /* state->Mode = MXL_DIGITAL_MODE; */
+
+                state->AGC_Mode = 1; /* Single AGC Mode */
+
+                /* Disable RSSI */
+                status += MXL_ControlWrite(fe, SEQ_EXTSYNTHCALIF, 1);
+                status += MXL_ControlWrite(fe, SEQ_EXTDCCAL, 1);
+                status += MXL_ControlWrite(fe, AGC_EN_RSSI, 0);
+                status += MXL_ControlWrite(fe, RFA_ENCLKRFAGC, 1);
+                /* change for 2.6.3 */
+                status += MXL_ControlWrite(fe, AGC_IF, 1);
+                status += MXL_ControlWrite(fe, AGC_RF, 15);
+                status += MXL_ControlWrite(fe, BB_IQSWAP, 1);
+        }
+
+        if (state->Mod_Type == MXL_ANALOG_OTA) {
+                /* Analog OTA Terrestrial mode add for 2.6.7 */
+                /* state->Mode = MXL_ANALOG_MODE; */
+
+                /* Enable RSSI */
+                status += MXL_ControlWrite(fe, SEQ_EXTSYNTHCALIF, 1);
+                status += MXL_ControlWrite(fe, SEQ_EXTDCCAL, 1);
+                status += MXL_ControlWrite(fe, AGC_EN_RSSI, 1);
+                status += MXL_ControlWrite(fe, RFA_ENCLKRFAGC, 1);
+
+                /* RSSI reference point */
+                status += MXL_ControlWrite(fe, RFA_RSSI_REFH, 5);
+                status += MXL_ControlWrite(fe, RFA_RSSI_REF, 3);
+                status += MXL_ControlWrite(fe, RFA_RSSI_REFL, 2);
+                status += MXL_ControlWrite(fe, RFSYN_CHP_GAIN, 3);
+                status += MXL_ControlWrite(fe, BB_IQSWAP, 1);
+        }
+
+        /* RSSI disable */
+        if (state->EN_RSSI == 0) {
+                status += MXL_ControlWrite(fe, SEQ_EXTSYNTHCALIF, 1);
+                status += MXL_ControlWrite(fe, SEQ_EXTDCCAL, 1);
+                status += MXL_ControlWrite(fe, AGC_EN_RSSI, 0);
+                status += MXL_ControlWrite(fe, RFA_ENCLKRFAGC, 1);
+        }
+
+        return status;
+}
+
+static u16 MXL_IFSynthInit(struct dvb_frontend *fe)
+{
+        struct mxl5005s_state *state = fe->tuner_priv;
+        u16 status = 0 ;
+        u32     Fref = 0 ;
+        u32     Kdbl, intModVal ;
+        u32     fracModVal ;
+        Kdbl = 2 ;
+
+        if (state->Fxtal >= 12000000UL && state->Fxtal <= 16000000UL)
+                Kdbl = 2 ;
+        if (state->Fxtal > 16000000UL && state->Fxtal <= 32000000UL)
+                Kdbl = 1 ;
+
+        /* IF Synthesizer Control */
+        if (state->Mode == 0 && state->IF_Mode == 1) /* Analog Low IF mode */ {
+                if (state->IF_LO == 41000000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x08);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x0C);
+                        Fref = 328000000UL ;
+                }
+                if (state->IF_LO == 47000000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x08);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x08);
+                        Fref = 376000000UL ;
+                }
+                if (state->IF_LO == 54000000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x10);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x0C);
+                        Fref = 324000000UL ;
+                }
+                if (state->IF_LO == 60000000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x10);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x08);
+                        Fref = 360000000UL ;
+                }
+                if (state->IF_LO == 39250000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x08);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x0C);
+                        Fref = 314000000UL ;
+                }
+                if (state->IF_LO == 39650000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x08);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x0C);
+                        Fref = 317200000UL ;
+                }
+                if (state->IF_LO == 40150000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x08);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x0C);
+                        Fref = 321200000UL ;
+                }
+                if (state->IF_LO == 40650000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x08);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x0C);
+                        Fref = 325200000UL ;
+                }
+        }
+
+        if (state->Mode || (state->Mode == 0 && state->IF_Mode == 0)) {
+                if (state->IF_LO == 57000000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x10);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x08);
+                        Fref = 342000000UL ;
+                }
+                if (state->IF_LO == 44000000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x08);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x08);
+                        Fref = 352000000UL ;
+                }
+                if (state->IF_LO == 43750000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x08);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x08);
+                        Fref = 350000000UL ;
+                }
+                if (state->IF_LO == 36650000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x04);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x08);
+                        Fref = 366500000UL ;
+                }
+                if (state->IF_LO == 36150000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x04);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x08);
+                        Fref = 361500000UL ;
+                }
+                if (state->IF_LO == 36000000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x04);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x08);
+                        Fref = 360000000UL ;
+                }
+                if (state->IF_LO == 35250000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x04);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x08);
+                        Fref = 352500000UL ;
+                }
+                if (state->IF_LO == 34750000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x04);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x08);
+                        Fref = 347500000UL ;
+                }
+                if (state->IF_LO == 6280000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x07);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x08);
+                        Fref = 376800000UL ;
+                }
+                if (state->IF_LO == 5000000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x09);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x08);
+                        Fref = 360000000UL ;
+                }
+                if (state->IF_LO == 4500000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x06);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x08);
+                        Fref = 360000000UL ;
+                }
+                if (state->IF_LO == 4570000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x06);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x08);
+                        Fref = 365600000UL ;
+                }
+                if (state->IF_LO == 4000000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x05);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x08);
+                        Fref = 360000000UL ;
+                }
+                if (state->IF_LO == 57400000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x10);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x08);
+                        Fref = 344400000UL ;
+                }
+                if (state->IF_LO == 44400000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x08);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x08);
+                        Fref = 355200000UL ;
+                }
+                if (state->IF_LO == 44150000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x08);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x08);
+                        Fref = 353200000UL ;
+                }
+                if (state->IF_LO == 37050000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x04);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x08);
+                        Fref = 370500000UL ;
+                }
+                if (state->IF_LO == 36550000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x04);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x08);
+                        Fref = 365500000UL ;
+                }
+                if (state->IF_LO == 36125000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x04);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x08);
+                        Fref = 361250000UL ;
+                }
+                if (state->IF_LO == 6000000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x07);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x08);
+                        Fref = 360000000UL ;
+                }
+                if (state->IF_LO == 5400000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x07);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x0C);
+                        Fref = 324000000UL ;
+                }
+                if (state->IF_LO == 5380000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x07);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x0C);
+                        Fref = 322800000UL ;
+                }
+                if (state->IF_LO == 5200000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x09);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x08);
+                        Fref = 374400000UL ;
+                }
+                if (state->IF_LO == 4900000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x09);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x08);
+                        Fref = 352800000UL ;
+                }
+                if (state->IF_LO == 4400000UL) {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x06);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x08);
+                        Fref = 352000000UL ;
+                }
+                if (state->IF_LO == 4063000UL)  /* add for 2.6.8 */ {
+                        status += MXL_ControlWrite(fe, IF_DIVVAL,   0x05);
+                        status += MXL_ControlWrite(fe, IF_VCO_BIAS, 0x08);
+                        Fref = 365670000UL ;
+                }
+        }
+        /* CHCAL_INT_MOD_IF */
+        /* CHCAL_FRAC_MOD_IF */
+        intModVal = Fref / (state->Fxtal * Kdbl/2);
+        status += MXL_ControlWrite(fe, CHCAL_INT_MOD_IF, intModVal);
+
+        fracModVal = (2<<15)*(Fref/1000 - (state->Fxtal/1000 * Kdbl/2) *
+                intModVal);
+
+        fracModVal = fracModVal / ((state->Fxtal * Kdbl/2)/1000);
+        status += MXL_ControlWrite(fe, CHCAL_FRAC_MOD_IF, fracModVal);
+
+        return status ;
+}
+
+static u32 MXL_GetXtalInt(u32 Xtal_Freq)
+{
+        if ((Xtal_Freq % 1000000) == 0)
+                return (Xtal_Freq / 10000);
+        else
+                return (((Xtal_Freq / 1000000) + 1)*100);
+}
+
+static u16 MXL_TuneRF(struct dvb_frontend *fe, u32 RF_Freq)
+{
+        struct mxl5005s_state *state = fe->tuner_priv;
+        u16 status = 0;
+        u32 divider_val, E3, E4, E5, E5A;
+        u32 Fmax, Fmin, FmaxBin, FminBin;
+        u32 Kdbl_RF = 2;
+        u32 tg_divval;
+        u32 tg_lo;
+        u32 Xtal_Int;
+
+        u32 Fref_TG;
+        u32 Fvco;
+
+        Xtal_Int = MXL_GetXtalInt(state->Fxtal);
+
+        state->RF_IN = RF_Freq;
+
+        MXL_SynthRFTGLO_Calc(fe);
+
+        if (state->Fxtal >= 12000000UL && state->Fxtal <= 22000000UL)
+                Kdbl_RF = 2;
+        if (state->Fxtal > 22000000 && state->Fxtal <= 32000000)
+                Kdbl_RF = 1;
+
+        /* Downconverter Controls
+         * Look-Up Table Implementation for:
+         *      DN_POLY
+         *      DN_RFGAIN
+         *      DN_CAP_RFLPF
+         *      DN_EN_VHFUHFBAR
+         *      DN_GAIN_ADJUST
+         *  Change the boundary reference from RF_IN to RF_LO
+         */
+        if (state->RF_LO < 40000000UL)
+                return -1;
+
+        if (state->RF_LO >= 40000000UL && state->RF_LO <= 75000000UL) {
+                status += MXL_ControlWrite(fe, DN_POLY,              2);
+                status += MXL_ControlWrite(fe, DN_RFGAIN,            3);
+                status += MXL_ControlWrite(fe, DN_CAP_RFLPF,         423);
+                status += MXL_ControlWrite(fe, DN_EN_VHFUHFBAR,      1);
+                status += MXL_ControlWrite(fe, DN_GAIN_ADJUST,       1);
+        }
+        if (state->RF_LO > 75000000UL && state->RF_LO <= 100000000UL) {
+                status += MXL_ControlWrite(fe, DN_POLY,              3);
+                status += MXL_ControlWrite(fe, DN_RFGAIN,            3);
+                status += MXL_ControlWrite(fe, DN_CAP_RFLPF,         222);
+                status += MXL_ControlWrite(fe, DN_EN_VHFUHFBAR,      1);
+                status += MXL_ControlWrite(fe, DN_GAIN_ADJUST,       1);
+        }
+        if (state->RF_LO > 100000000UL && state->RF_LO <= 150000000UL) {
+                status += MXL_ControlWrite(fe, DN_POLY,              3);
+                status += MXL_ControlWrite(fe, DN_RFGAIN,            3);
+                status += MXL_ControlWrite(fe, DN_CAP_RFLPF,         147);
+                status += MXL_ControlWrite(fe, DN_EN_VHFUHFBAR,      1);
+                status += MXL_ControlWrite(fe, DN_GAIN_ADJUST,       2);
+        }
+        if (state->RF_LO > 150000000UL && state->RF_LO <= 200000000UL) {
+                status += MXL_ControlWrite(fe, DN_POLY,              3);
+                status += MXL_ControlWrite(fe, DN_RFGAIN,            3);
+                status += MXL_ControlWrite(fe, DN_CAP_RFLPF,         9);
+                status += MXL_ControlWrite(fe, DN_EN_VHFUHFBAR,      1);
+                status += MXL_ControlWrite(fe, DN_GAIN_ADJUST,       2);
+        }
+        if (state->RF_LO > 200000000UL && state->RF_LO <= 300000000UL) {
+                status += MXL_ControlWrite(fe, DN_POLY,              3);
+                status += MXL_ControlWrite(fe, DN_RFGAIN,            3);
+                status += MXL_ControlWrite(fe, DN_CAP_RFLPF,         0);
+                status += MXL_ControlWrite(fe, DN_EN_VHFUHFBAR,      1);
+                status += MXL_ControlWrite(fe, DN_GAIN_ADJUST,       3);
+        }
+        if (state->RF_LO > 300000000UL && state->RF_LO <= 650000000UL) {
+                status += MXL_ControlWrite(fe, DN_POLY,              3);
+                status += MXL_ControlWrite(fe, DN_RFGAIN,            1);
+                status += MXL_ControlWrite(fe, DN_CAP_RFLPF,         0);
+                status += MXL_ControlWrite(fe, DN_EN_VHFUHFBAR,      0);
+                status += MXL_ControlWrite(fe, DN_GAIN_ADJUST,       3);
+        }
+        if (state->RF_LO > 650000000UL && state->RF_LO <= 900000000UL) {
+                status += MXL_ControlWrite(fe, DN_POLY,              3);
+                status += MXL_ControlWrite(fe, DN_RFGAIN,            2);
+                status += MXL_ControlWrite(fe, DN_CAP_RFLPF,         0);
+                status += MXL_ControlWrite(fe, DN_EN_VHFUHFBAR,      0);
+                status += MXL_ControlWrite(fe, DN_GAIN_ADJUST,       3);
+        }
+        if (state->RF_LO > 900000000UL)
+                return -1;
+
+        /*      DN_IQTNBUF_AMP */
+        /*      DN_IQTNGNBFBIAS_BST */
+        if (state->RF_LO >= 40000000UL && state->RF_LO <= 75000000UL) {
+                status += MXL_ControlWrite(fe, DN_IQTNBUF_AMP,       1);
+                status += MXL_ControlWrite(fe, DN_IQTNGNBFBIAS_BST,  0);
+        }
+        if (state->RF_LO > 75000000UL && state->RF_LO <= 100000000UL) {
+                status += MXL_ControlWrite(fe, DN_IQTNBUF_AMP,       1);
+                status += MXL_ControlWrite(fe, DN_IQTNGNBFBIAS_BST,  0);
+        }
+        if (state->RF_LO > 100000000UL && state->RF_LO <= 150000000UL) {
+                status += MXL_ControlWrite(fe, DN_IQTNBUF_AMP,       1);
+                status += MXL_ControlWrite(fe, DN_IQTNGNBFBIAS_BST,  0);
+        }
+        if (state->RF_LO > 150000000UL && state->RF_LO <= 200000000UL) {
+                status += MXL_ControlWrite(fe, DN_IQTNBUF_AMP,       1);
+                status += MXL_ControlWrite(fe, DN_IQTNGNBFBIAS_BST,  0);
+        }
+        if (state->RF_LO > 200000000UL && state->RF_LO <= 300000000UL) {
+                status += MXL_ControlWrite(fe, DN_IQTNBUF_AMP,       1);
+                status += MXL_ControlWrite(fe, DN_IQTNGNBFBIAS_BST,  0);
+        }
+        if (state->RF_LO > 300000000UL && state->RF_LO <= 400000000UL) {
+                status += MXL_ControlWrite(fe, DN_IQTNBUF_AMP,       1);
+                status += MXL_ControlWrite(fe, DN_IQTNGNBFBIAS_BST,  0);
+        }
+        if (state->RF_LO > 400000000UL && state->RF_LO <= 450000000UL) {
+                status += MXL_ControlWrite(fe, DN_IQTNBUF_AMP,       1);
+                status += MXL_ControlWrite(fe, DN_IQTNGNBFBIAS_BST,  0);
+        }
+        if (state->RF_LO > 450000000UL && state->RF_LO <= 500000000UL) {
+                status += MXL_ControlWrite(fe, DN_IQTNBUF_AMP,       1);
+                status += MXL_ControlWrite(fe, DN_IQTNGNBFBIAS_BST,  0);
+        }
+        if (state->RF_LO > 500000000UL && state->RF_LO <= 550000000UL) {
+                status += MXL_ControlWrite(fe, DN_IQTNBUF_AMP,       1);
+                status += MXL_ControlWrite(fe, DN_IQTNGNBFBIAS_BST,  0);
+        }
+        if (state->RF_LO > 550000000UL && state->RF_LO <= 600000000UL) {
+                status += MXL_ControlWrite(fe, DN_IQTNBUF_AMP,       1);
+                status += MXL_ControlWrite(fe, DN_IQTNGNBFBIAS_BST,  0);
+        }
+        if (state->RF_LO > 600000000UL && state->RF_LO <= 650000000UL) {
+                status += MXL_ControlWrite(fe, DN_IQTNBUF_AMP,       1);
+                status += MXL_ControlWrite(fe, DN_IQTNGNBFBIAS_BST,  0);
+        }
+        if (state->RF_LO > 650000000UL && state->RF_LO <= 700000000UL) {
+                status += MXL_ControlWrite(fe, DN_IQTNBUF_AMP,       1);
+                status += MXL_ControlWrite(fe, DN_IQTNGNBFBIAS_BST,  0);
+        }
+        if (state->RF_LO > 700000000UL && state->RF_LO <= 750000000UL) {
+                status += MXL_ControlWrite(fe, DN_IQTNBUF_AMP,       1);
+                status += MXL_ControlWrite(fe, DN_IQTNGNBFBIAS_BST,  0);
+        }
+        if (state->RF_LO > 750000000UL && state->RF_LO <= 800000000UL) {
+                status += MXL_ControlWrite(fe, DN_IQTNBUF_AMP,       1);
+                status += MXL_ControlWrite(fe, DN_IQTNGNBFBIAS_BST,  0);
+        }
+        if (state->RF_LO > 800000000UL && state->RF_LO <= 850000000UL) {
+                status += MXL_ControlWrite(fe, DN_IQTNBUF_AMP,       10);
+                status += MXL_ControlWrite(fe, DN_IQTNGNBFBIAS_BST,  1);
+        }
+        if (state->RF_LO > 850000000UL && state->RF_LO <= 900000000UL) {
+                status += MXL_ControlWrite(fe, DN_IQTNBUF_AMP,       10);
+                status += MXL_ControlWrite(fe, DN_IQTNGNBFBIAS_BST,  1);
+        }
+
+        /*
+         * Set RF Synth and LO Path Control
+         *
+         * Look-Up table implementation for:
+         *      RFSYN_EN_OUTMUX
+         *      RFSYN_SEL_VCO_OUT
+         *      RFSYN_SEL_VCO_HI
+         *  RFSYN_SEL_DIVM
+         *      RFSYN_RF_DIV_BIAS
+         *      DN_SEL_FREQ
+         *
+         * Set divider_val, Fmax, Fmix to use in Equations
+         */
+        FminBin = 28000000UL ;
+        FmaxBin = 42500000UL ;
+        if (state->RF_LO >= 40000000UL && state->RF_LO <= FmaxBin) {
+                status += MXL_ControlWrite(fe, RFSYN_EN_OUTMUX,     1);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_OUT,   0);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_HI,    0);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_DIVM,      0);
+                status += MXL_ControlWrite(fe, RFSYN_RF_DIV_BIAS,   1);
+                status += MXL_ControlWrite(fe, DN_SEL_FREQ,         1);
+                divider_val = 64 ;
+                Fmax = FmaxBin ;
+                Fmin = FminBin ;
+        }
+        FminBin = 42500000UL ;
+        FmaxBin = 56000000UL ;
+        if (state->RF_LO > FminBin && state->RF_LO <= FmaxBin) {
+                status += MXL_ControlWrite(fe, RFSYN_EN_OUTMUX,     1);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_OUT,   0);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_HI,    1);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_DIVM,      0);
+                status += MXL_ControlWrite(fe, RFSYN_RF_DIV_BIAS,   1);
+                status += MXL_ControlWrite(fe, DN_SEL_FREQ,         1);
+                divider_val = 64 ;
+                Fmax = FmaxBin ;
+                Fmin = FminBin ;
+        }
+        FminBin = 56000000UL ;
+        FmaxBin = 85000000UL ;
+        if (state->RF_LO > FminBin && state->RF_LO <= FmaxBin) {
+                status += MXL_ControlWrite(fe, RFSYN_EN_OUTMUX,     0);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_OUT,   1);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_HI,    0);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_DIVM,      0);
+                status += MXL_ControlWrite(fe, RFSYN_RF_DIV_BIAS,   1);
+                status += MXL_ControlWrite(fe, DN_SEL_FREQ,         1);
+                divider_val = 32 ;
+                Fmax = FmaxBin ;
+                Fmin = FminBin ;
+        }
+        FminBin = 85000000UL ;
+        FmaxBin = 112000000UL ;
+        if (state->RF_LO > FminBin && state->RF_LO <= FmaxBin) {
+                status += MXL_ControlWrite(fe, RFSYN_EN_OUTMUX,     0);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_OUT,   1);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_HI,    1);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_DIVM,      0);
+                status += MXL_ControlWrite(fe, RFSYN_RF_DIV_BIAS,   1);
+                status += MXL_ControlWrite(fe, DN_SEL_FREQ,         1);
+                divider_val = 32 ;
+                Fmax = FmaxBin ;
+                Fmin = FminBin ;
+        }
+        FminBin = 112000000UL ;
+        FmaxBin = 170000000UL ;
+        if (state->RF_LO > FminBin && state->RF_LO <= FmaxBin) {
+                status += MXL_ControlWrite(fe, RFSYN_EN_OUTMUX,     0);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_OUT,   1);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_HI,    0);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_DIVM,      0);
+                status += MXL_ControlWrite(fe, RFSYN_RF_DIV_BIAS,   1);
+                status += MXL_ControlWrite(fe, DN_SEL_FREQ,         2);
+                divider_val = 16 ;
+                Fmax = FmaxBin ;
+                Fmin = FminBin ;
+        }
+        FminBin = 170000000UL ;
+        FmaxBin = 225000000UL ;
+        if (state->RF_LO > FminBin && state->RF_LO <= FmaxBin) {
+                status += MXL_ControlWrite(fe, RFSYN_EN_OUTMUX,     0);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_OUT,   1);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_HI,    1);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_DIVM,      0);
+                status += MXL_ControlWrite(fe, RFSYN_RF_DIV_BIAS,   1);
+                status += MXL_ControlWrite(fe, DN_SEL_FREQ,         2);
+                divider_val = 16 ;
+                Fmax = FmaxBin ;
+                Fmin = FminBin ;
+        }
+        FminBin = 225000000UL ;
+        FmaxBin = 300000000UL ;
+        if (state->RF_LO > FminBin && state->RF_LO <= FmaxBin) {
+                status += MXL_ControlWrite(fe, RFSYN_EN_OUTMUX,     0);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_OUT,   1);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_HI,    0);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_DIVM,      0);
+                status += MXL_ControlWrite(fe, RFSYN_RF_DIV_BIAS,   1);
+                status += MXL_ControlWrite(fe, DN_SEL_FREQ,         4);
+                divider_val = 8 ;
+                Fmax = 340000000UL ;
+                Fmin = FminBin ;
+        }
+        FminBin = 300000000UL ;
+        FmaxBin = 340000000UL ;
+        if (state->RF_LO > FminBin && state->RF_LO <= FmaxBin) {
+                status += MXL_ControlWrite(fe, RFSYN_EN_OUTMUX,     1);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_OUT,   0);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_HI,    0);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_DIVM,      0);
+                status += MXL_ControlWrite(fe, RFSYN_RF_DIV_BIAS,   1);
+                status += MXL_ControlWrite(fe, DN_SEL_FREQ,         0);
+                divider_val = 8 ;
+                Fmax = FmaxBin ;
+                Fmin = 225000000UL ;
+        }
+        FminBin = 340000000UL ;
+        FmaxBin = 450000000UL ;
+        if (state->RF_LO > FminBin && state->RF_LO <= FmaxBin) {
+                status += MXL_ControlWrite(fe, RFSYN_EN_OUTMUX,     1);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_OUT,   0);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_HI,    1);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_DIVM,      0);
+                status += MXL_ControlWrite(fe, RFSYN_RF_DIV_BIAS,   2);
+                status += MXL_ControlWrite(fe, DN_SEL_FREQ,         0);
+                divider_val = 8 ;
+                Fmax = FmaxBin ;
+                Fmin = FminBin ;
+        }
+        FminBin = 450000000UL ;
+        FmaxBin = 680000000UL ;
+        if (state->RF_LO > FminBin && state->RF_LO <= FmaxBin) {
+                status += MXL_ControlWrite(fe, RFSYN_EN_OUTMUX,     0);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_OUT,   1);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_HI,    0);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_DIVM,      1);
+                status += MXL_ControlWrite(fe, RFSYN_RF_DIV_BIAS,   1);
+                status += MXL_ControlWrite(fe, DN_SEL_FREQ,         0);
+                divider_val = 4 ;
+                Fmax = FmaxBin ;
+                Fmin = FminBin ;
+        }
+        FminBin = 680000000UL ;
+        FmaxBin = 900000000UL ;
+        if (state->RF_LO > FminBin && state->RF_LO <= FmaxBin) {
+                status += MXL_ControlWrite(fe, RFSYN_EN_OUTMUX,     0);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_OUT,   1);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_HI,    1);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_DIVM,      1);
+                status += MXL_ControlWrite(fe, RFSYN_RF_DIV_BIAS,   1);
+                status += MXL_ControlWrite(fe, DN_SEL_FREQ,         0);
+                divider_val = 4 ;
+                Fmax = FmaxBin ;
+                Fmin = FminBin ;
+        }
+
+        /*      CHCAL_INT_MOD_RF
+         *      CHCAL_FRAC_MOD_RF
+         *      RFSYN_LPF_R
+         *      CHCAL_EN_INT_RF
+         */
+        /* Equation E3 RFSYN_VCO_BIAS */
+        E3 = (((Fmax-state->RF_LO)/1000)*32)/((Fmax-Fmin)/1000) + 8 ;
+        status += MXL_ControlWrite(fe, RFSYN_VCO_BIAS, E3);
+
+        /* Equation E4 CHCAL_INT_MOD_RF */
+        E4 = (state->RF_LO*divider_val/1000)/(2*state->Fxtal*Kdbl_RF/1000);
+        MXL_ControlWrite(fe, CHCAL_INT_MOD_RF, E4);
+
+        /* Equation E5 CHCAL_FRAC_MOD_RF CHCAL_EN_INT_RF */
+        E5 = ((2<<17)*(state->RF_LO/10000*divider_val -
+                (E4*(2*state->Fxtal*Kdbl_RF)/10000))) /
+                (2*state->Fxtal*Kdbl_RF/10000);
+
+        status += MXL_ControlWrite(fe, CHCAL_FRAC_MOD_RF, E5);
+
+        /* Equation E5A RFSYN_LPF_R */
+        E5A = (((Fmax - state->RF_LO)/1000)*4/((Fmax-Fmin)/1000)) + 1 ;
+        status += MXL_ControlWrite(fe, RFSYN_LPF_R, E5A);
+
+        /* Euqation E5B CHCAL_EN_INIT_RF */
+        status += MXL_ControlWrite(fe, CHCAL_EN_INT_RF, ((E5 == 0) ? 1 : 0));
+        /*if (E5 == 0)
+         *      status += MXL_ControlWrite(fe, CHCAL_EN_INT_RF, 1);
+         *else
+         *      status += MXL_ControlWrite(fe, CHCAL_FRAC_MOD_RF, E5);
+         */
+
+        /*
+         * Set TG Synth
+         *
+         * Look-Up table implementation for:
+         *      TG_LO_DIVVAL
+         *      TG_LO_SELVAL
+         *
+         * Set divider_val, Fmax, Fmix to use in Equations
+         */
+        if (state->TG_LO < 33000000UL)
+                return -1;
+
+        FminBin = 33000000UL ;
+        FmaxBin = 50000000UL ;
+        if (state->TG_LO >= FminBin && state->TG_LO <= FmaxBin) {
+                status += MXL_ControlWrite(fe, TG_LO_DIVVAL,    0x6);
+                status += MXL_ControlWrite(fe, TG_LO_SELVAL,    0x0);
+                divider_val = 36 ;
+                Fmax = FmaxBin ;
+                Fmin = FminBin ;
+        }
+        FminBin = 50000000UL ;
+        FmaxBin = 67000000UL ;
+        if (state->TG_LO > FminBin && state->TG_LO <= FmaxBin) {
+                status += MXL_ControlWrite(fe, TG_LO_DIVVAL,    0x1);
+                status += MXL_ControlWrite(fe, TG_LO_SELVAL,    0x0);
+                divider_val = 24 ;
+                Fmax = FmaxBin ;
+                Fmin = FminBin ;
+        }
+        FminBin = 67000000UL ;
+        FmaxBin = 100000000UL ;
+        if (state->TG_LO > FminBin && state->TG_LO <= FmaxBin) {
+                status += MXL_ControlWrite(fe, TG_LO_DIVVAL,    0xC);
+                status += MXL_ControlWrite(fe, TG_LO_SELVAL,    0x2);
+                divider_val = 18 ;
+                Fmax = FmaxBin ;
+                Fmin = FminBin ;
+        }
+        FminBin = 100000000UL ;
+        FmaxBin = 150000000UL ;
+        if (state->TG_LO > FminBin && state->TG_LO <= FmaxBin) {
+                status += MXL_ControlWrite(fe, TG_LO_DIVVAL,    0x8);
+                status += MXL_ControlWrite(fe, TG_LO_SELVAL,    0x2);
+                divider_val = 12 ;
+                Fmax = FmaxBin ;
+                Fmin = FminBin ;
+        }
+        FminBin = 150000000UL ;
+        FmaxBin = 200000000UL ;
+        if (state->TG_LO > FminBin && state->TG_LO <= FmaxBin) {
+                status += MXL_ControlWrite(fe, TG_LO_DIVVAL,    0x0);
+                status += MXL_ControlWrite(fe, TG_LO_SELVAL,    0x2);
+                divider_val = 8 ;
+                Fmax = FmaxBin ;
+                Fmin = FminBin ;
+        }
+        FminBin = 200000000UL ;
+        FmaxBin = 300000000UL ;
+        if (state->TG_LO > FminBin && state->TG_LO <= FmaxBin) {
+                status += MXL_ControlWrite(fe, TG_LO_DIVVAL,    0x8);
+                status += MXL_ControlWrite(fe, TG_LO_SELVAL,    0x3);
+                divider_val = 6 ;
+                Fmax = FmaxBin ;
+                Fmin = FminBin ;
+        }
+        FminBin = 300000000UL ;
+        FmaxBin = 400000000UL ;
+        if (state->TG_LO > FminBin && state->TG_LO <= FmaxBin) {
+                status += MXL_ControlWrite(fe, TG_LO_DIVVAL,    0x0);
+                status += MXL_ControlWrite(fe, TG_LO_SELVAL,    0x3);
+                divider_val = 4 ;
+                Fmax = FmaxBin ;
+                Fmin = FminBin ;
+        }
+        FminBin = 400000000UL ;
+        FmaxBin = 600000000UL ;
+        if (state->TG_LO > FminBin && state->TG_LO <= FmaxBin) {
+                status += MXL_ControlWrite(fe, TG_LO_DIVVAL,    0x8);
+                status += MXL_ControlWrite(fe, TG_LO_SELVAL,    0x7);
+                divider_val = 3 ;
+                Fmax = FmaxBin ;
+                Fmin = FminBin ;
+        }
+        FminBin = 600000000UL ;
+        FmaxBin = 900000000UL ;
+        if (state->TG_LO > FminBin && state->TG_LO <= FmaxBin) {
+                status += MXL_ControlWrite(fe, TG_LO_DIVVAL,    0x0);
+                status += MXL_ControlWrite(fe, TG_LO_SELVAL,    0x7);
+                divider_val = 2 ;
+                Fmax = FmaxBin ;
+                Fmin = FminBin ;
+        }
+
+        /* TG_DIV_VAL */
+        tg_divval = (state->TG_LO*divider_val/100000) *
+                (MXL_Ceiling(state->Fxtal, 1000000) * 100) /
+                (state->Fxtal/1000);
+
+        status += MXL_ControlWrite(fe, TG_DIV_VAL, tg_divval);
+
+        if (state->TG_LO > 600000000UL)
+                status += MXL_ControlWrite(fe, TG_DIV_VAL, tg_divval + 1);
+
+        Fmax = 1800000000UL ;
+        Fmin = 1200000000UL ;
+
+        /* prevent overflow of 32 bit unsigned integer, use
+         * following equation. Edit for v2.6.4
+         */
+        /* Fref_TF = Fref_TG * 1000 */
+        Fref_TG = (state->Fxtal/1000) / MXL_Ceiling(state->Fxtal, 1000000);
+
+        /* Fvco = Fvco/10 */
+        Fvco = (state->TG_LO/10000) * divider_val * Fref_TG;
+
+        tg_lo = (((Fmax/10 - Fvco)/100)*32) / ((Fmax-Fmin)/1000)+8;
+
+        /* below equation is same as above but much harder to debug.
+         * tg_lo = ( ((Fmax/10000 * Xtal_Int)/100) -
+         * ((state->TG_LO/10000)*divider_val *
+         * (state->Fxtal/10000)/100) )*32/((Fmax-Fmin)/10000 *
+         * Xtal_Int/100) + 8;
+         */
+
+        status += MXL_ControlWrite(fe, TG_VCO_BIAS , tg_lo);
+
+        /* add for 2.6.5 Special setting for QAM */
+        if (state->Mod_Type == MXL_QAM) {
+                if (state->RF_IN < 680000000)
+                        status += MXL_ControlWrite(fe, RFSYN_CHP_GAIN, 3);
+                else
+                        status += MXL_ControlWrite(fe, RFSYN_CHP_GAIN, 2);
+        }
+
+        /* Off Chip Tracking Filter Control */
+        if (state->TF_Type == MXL_TF_OFF) {
+                /* Tracking Filter Off State; turn off all the banks */
+                status += MXL_ControlWrite(fe, DAC_A_ENABLE, 0);
+                status += MXL_ControlWrite(fe, DAC_B_ENABLE, 0);
+                status += MXL_SetGPIO(fe, 3, 1); /* Bank1 Off */
+                status += MXL_SetGPIO(fe, 1, 1); /* Bank2 Off */
+                status += MXL_SetGPIO(fe, 4, 1); /* Bank3 Off */
+        }
+
+        if (state->TF_Type == MXL_TF_C) /* Tracking Filter type C */ {
+                status += MXL_ControlWrite(fe, DAC_B_ENABLE, 1);
+                status += MXL_ControlWrite(fe, DAC_DIN_A, 0);
+
+                if (state->RF_IN >= 43000000 && state->RF_IN < 150000000) {
+                        status += MXL_ControlWrite(fe, DAC_A_ENABLE, 0);
+                        status += MXL_ControlWrite(fe, DAC_DIN_B, 0);
+                        status += MXL_SetGPIO(fe, 3, 0);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                }
+                if (state->RF_IN >= 150000000 && state->RF_IN < 280000000) {
+                        status += MXL_ControlWrite(fe, DAC_A_ENABLE, 0);
+                        status += MXL_ControlWrite(fe, DAC_DIN_B, 0);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                        status += MXL_SetGPIO(fe, 1, 0);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                }
+                if (state->RF_IN >= 280000000 && state->RF_IN < 360000000) {
+                        status += MXL_ControlWrite(fe, DAC_A_ENABLE, 0);
+                        status += MXL_ControlWrite(fe, DAC_DIN_B, 0);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                        status += MXL_SetGPIO(fe, 1, 0);
+                        status += MXL_SetGPIO(fe, 4, 0);
+                }
+                if (state->RF_IN >= 360000000 && state->RF_IN < 560000000) {
+                        status += MXL_ControlWrite(fe, DAC_A_ENABLE, 0);
+                        status += MXL_ControlWrite(fe, DAC_DIN_B, 0);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 4, 0);
+                }
+                if (state->RF_IN >= 560000000 && state->RF_IN < 580000000) {
+                        status += MXL_ControlWrite(fe, DAC_A_ENABLE, 1);
+                        status += MXL_ControlWrite(fe, DAC_DIN_B, 29);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 4, 0);
+                }
+                if (state->RF_IN >= 580000000 && state->RF_IN < 630000000) {
+                        status += MXL_ControlWrite(fe, DAC_A_ENABLE, 1);
+                        status += MXL_ControlWrite(fe, DAC_DIN_B, 0);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 4, 0);
+                }
+                if (state->RF_IN >= 630000000 && state->RF_IN < 700000000) {
+                        status += MXL_ControlWrite(fe, DAC_A_ENABLE, 1);
+                        status += MXL_ControlWrite(fe, DAC_DIN_B, 16);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                }
+                if (state->RF_IN >= 700000000 && state->RF_IN < 760000000) {
+                        status += MXL_ControlWrite(fe, DAC_A_ENABLE, 1);
+                        status += MXL_ControlWrite(fe, DAC_DIN_B, 7);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                }
+                if (state->RF_IN >= 760000000 && state->RF_IN <= 900000000) {
+                        status += MXL_ControlWrite(fe, DAC_A_ENABLE, 1);
+                        status += MXL_ControlWrite(fe, DAC_DIN_B, 0);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                }
+        }
+
+        if (state->TF_Type == MXL_TF_C_H) {
+
+                /* Tracking Filter type C-H for Hauppauge only */
+                status += MXL_ControlWrite(fe, DAC_DIN_A, 0);
+
+                if (state->RF_IN >= 43000000 && state->RF_IN < 150000000) {
+                        status += MXL_ControlWrite(fe, DAC_A_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 0);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                }
+                if (state->RF_IN >= 150000000 && state->RF_IN < 280000000) {
+                        status += MXL_ControlWrite(fe, DAC_A_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 3, 0);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                }
+                if (state->RF_IN >= 280000000 && state->RF_IN < 360000000) {
+                        status += MXL_ControlWrite(fe, DAC_A_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 3, 0);
+                        status += MXL_SetGPIO(fe, 1, 0);
+                }
+                if (state->RF_IN >= 360000000 && state->RF_IN < 560000000) {
+                        status += MXL_ControlWrite(fe, DAC_A_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                        status += MXL_SetGPIO(fe, 1, 0);
+                }
+                if (state->RF_IN >= 560000000 && state->RF_IN < 580000000) {
+                        status += MXL_ControlWrite(fe, DAC_A_ENABLE, 1);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                        status += MXL_SetGPIO(fe, 1, 0);
+                }
+                if (state->RF_IN >= 580000000 && state->RF_IN < 630000000) {
+                        status += MXL_ControlWrite(fe, DAC_A_ENABLE, 1);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                        status += MXL_SetGPIO(fe, 1, 0);
+                }
+                if (state->RF_IN >= 630000000 && state->RF_IN < 700000000) {
+                        status += MXL_ControlWrite(fe, DAC_A_ENABLE, 1);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                }
+                if (state->RF_IN >= 700000000 && state->RF_IN < 760000000) {
+                        status += MXL_ControlWrite(fe, DAC_A_ENABLE, 1);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                }
+                if (state->RF_IN >= 760000000 && state->RF_IN <= 900000000) {
+                        status += MXL_ControlWrite(fe, DAC_A_ENABLE, 1);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                }
+        }
+
+        if (state->TF_Type == MXL_TF_D) { /* Tracking Filter type D */
+
+                status += MXL_ControlWrite(fe, DAC_DIN_B, 0);
+
+                if (state->RF_IN >= 43000000 && state->RF_IN < 174000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 0);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                }
+                if (state->RF_IN >= 174000000 && state->RF_IN < 250000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 0);
+                        status += MXL_SetGPIO(fe, 1, 0);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                }
+                if (state->RF_IN >= 250000000 && state->RF_IN < 310000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 1, 0);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                }
+                if (state->RF_IN >= 310000000 && state->RF_IN < 360000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 1, 0);
+                        status += MXL_SetGPIO(fe, 3, 0);
+                }
+                if (state->RF_IN >= 360000000 && state->RF_IN < 470000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 3, 0);
+                }
+                if (state->RF_IN >= 470000000 && state->RF_IN < 640000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 1);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 3, 0);
+                }
+                if (state->RF_IN >= 640000000 && state->RF_IN <= 900000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 1);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                }
+        }
+
+        if (state->TF_Type == MXL_TF_D_L) {
+
+                /* Tracking Filter type D-L for Lumanate ONLY change 2.6.3 */
+                status += MXL_ControlWrite(fe, DAC_DIN_A, 0);
+
+                /* if UHF and terrestrial => Turn off Tracking Filter */
+                if (state->RF_IN >= 471000000 &&
+                        (state->RF_IN - 471000000)%6000000 != 0) {
+                        /* Turn off all the banks */
+                        status += MXL_SetGPIO(fe, 3, 1);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_ControlWrite(fe, DAC_A_ENABLE, 0);
+                        status += MXL_ControlWrite(fe, AGC_IF, 10);
+                } else {
+                        /* if VHF or cable => Turn on Tracking Filter */
+                        if (state->RF_IN >= 43000000 &&
+                                state->RF_IN < 140000000) {
+
+                                status += MXL_ControlWrite(fe, DAC_A_ENABLE, 0);
+                                status += MXL_SetGPIO(fe, 4, 1);
+                                status += MXL_SetGPIO(fe, 1, 1);
+                                status += MXL_SetGPIO(fe, 3, 0);
+                        }
+                        if (state->RF_IN >= 140000000 &&
+                                state->RF_IN < 240000000) {
+                                status += MXL_ControlWrite(fe, DAC_A_ENABLE, 0);
+                                status += MXL_SetGPIO(fe, 4, 1);
+                                status += MXL_SetGPIO(fe, 1, 0);
+                                status += MXL_SetGPIO(fe, 3, 0);
+                        }
+                        if (state->RF_IN >= 240000000 &&
+                                state->RF_IN < 340000000) {
+                                status += MXL_ControlWrite(fe, DAC_A_ENABLE, 0);
+                                status += MXL_SetGPIO(fe, 4, 0);
+                                status += MXL_SetGPIO(fe, 1, 1);
+                                status += MXL_SetGPIO(fe, 3, 0);
+                        }
+                        if (state->RF_IN >= 340000000 &&
+                                state->RF_IN < 430000000) {
+                                status += MXL_ControlWrite(fe, DAC_A_ENABLE, 0);
+                                status += MXL_SetGPIO(fe, 4, 0);
+                                status += MXL_SetGPIO(fe, 1, 0);
+                                status += MXL_SetGPIO(fe, 3, 1);
+                        }
+                        if (state->RF_IN >= 430000000 &&
+                                state->RF_IN < 470000000) {
+                                status += MXL_ControlWrite(fe, DAC_A_ENABLE, 1);
+                                status += MXL_SetGPIO(fe, 4, 1);
+                                status += MXL_SetGPIO(fe, 1, 0);
+                                status += MXL_SetGPIO(fe, 3, 1);
+                        }
+                        if (state->RF_IN >= 470000000 &&
+                                state->RF_IN < 570000000) {
+                                status += MXL_ControlWrite(fe, DAC_A_ENABLE, 1);
+                                status += MXL_SetGPIO(fe, 4, 0);
+                                status += MXL_SetGPIO(fe, 1, 0);
+                                status += MXL_SetGPIO(fe, 3, 1);
+                        }
+                        if (state->RF_IN >= 570000000 &&
+                                state->RF_IN < 620000000) {
+                                status += MXL_ControlWrite(fe, DAC_A_ENABLE, 0);
+                                status += MXL_SetGPIO(fe, 4, 0);
+                                status += MXL_SetGPIO(fe, 1, 1);
+                                status += MXL_SetGPIO(fe, 3, 1);
+                        }
+                        if (state->RF_IN >= 620000000 &&
+                                state->RF_IN < 760000000) {
+                                status += MXL_ControlWrite(fe, DAC_A_ENABLE, 1);
+                                status += MXL_SetGPIO(fe, 4, 0);
+                                status += MXL_SetGPIO(fe, 1, 1);
+                                status += MXL_SetGPIO(fe, 3, 1);
+                        }
+                        if (state->RF_IN >= 760000000 &&
+                                state->RF_IN <= 900000000) {
+                                status += MXL_ControlWrite(fe, DAC_A_ENABLE, 1);
+                                status += MXL_SetGPIO(fe, 4, 1);
+                                status += MXL_SetGPIO(fe, 1, 1);
+                                status += MXL_SetGPIO(fe, 3, 1);
+                        }
+                }
+        }
+
+        if (state->TF_Type == MXL_TF_E) /* Tracking Filter type E */ {
+
+                status += MXL_ControlWrite(fe, DAC_DIN_B, 0);
+
+                if (state->RF_IN >= 43000000 && state->RF_IN < 174000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 0);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                }
+                if (state->RF_IN >= 174000000 && state->RF_IN < 250000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 0);
+                        status += MXL_SetGPIO(fe, 1, 0);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                }
+                if (state->RF_IN >= 250000000 && state->RF_IN < 310000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 1, 0);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                }
+                if (state->RF_IN >= 310000000 && state->RF_IN < 360000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 1, 0);
+                        status += MXL_SetGPIO(fe, 3, 0);
+                }
+                if (state->RF_IN >= 360000000 && state->RF_IN < 470000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 3, 0);
+                }
+                if (state->RF_IN >= 470000000 && state->RF_IN < 640000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 1);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 3, 0);
+                }
+                if (state->RF_IN >= 640000000 && state->RF_IN <= 900000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 1);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                }
+        }
+
+        if (state->TF_Type == MXL_TF_F) {
+
+                /* Tracking Filter type F */
+                status += MXL_ControlWrite(fe, DAC_DIN_B, 0);
+
+                if (state->RF_IN >= 43000000 && state->RF_IN < 160000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 0);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                }
+                if (state->RF_IN >= 160000000 && state->RF_IN < 210000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 0);
+                        status += MXL_SetGPIO(fe, 1, 0);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                }
+                if (state->RF_IN >= 210000000 && state->RF_IN < 300000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 1, 0);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                }
+                if (state->RF_IN >= 300000000 && state->RF_IN < 390000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 1, 0);
+                        status += MXL_SetGPIO(fe, 3, 0);
+                }
+                if (state->RF_IN >= 390000000 && state->RF_IN < 515000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 3, 0);
+                }
+                if (state->RF_IN >= 515000000 && state->RF_IN < 650000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 1);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 3, 0);
+                }
+                if (state->RF_IN >= 650000000 && state->RF_IN <= 900000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 1);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                }
+        }
+
+        if (state->TF_Type == MXL_TF_E_2) {
+
+                /* Tracking Filter type E_2 */
+                status += MXL_ControlWrite(fe, DAC_DIN_B, 0);
+
+                if (state->RF_IN >= 43000000 && state->RF_IN < 174000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 0);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                }
+                if (state->RF_IN >= 174000000 && state->RF_IN < 250000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 0);
+                        status += MXL_SetGPIO(fe, 1, 0);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                }
+                if (state->RF_IN >= 250000000 && state->RF_IN < 350000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 1, 0);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                }
+                if (state->RF_IN >= 350000000 && state->RF_IN < 400000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 1, 0);
+                        status += MXL_SetGPIO(fe, 3, 0);
+                }
+                if (state->RF_IN >= 400000000 && state->RF_IN < 570000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 3, 0);
+                }
+                if (state->RF_IN >= 570000000 && state->RF_IN < 770000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 1);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 3, 0);
+                }
+                if (state->RF_IN >= 770000000 && state->RF_IN <= 900000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 1);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                }
+        }
+
+        if (state->TF_Type == MXL_TF_G) {
+
+                /* Tracking Filter type G add for v2.6.8 */
+                status += MXL_ControlWrite(fe, DAC_DIN_B, 0);
+
+                if (state->RF_IN >= 50000000 && state->RF_IN < 190000000) {
+
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 0);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                }
+                if (state->RF_IN >= 190000000 && state->RF_IN < 280000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 0);
+                        status += MXL_SetGPIO(fe, 1, 0);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                }
+                if (state->RF_IN >= 280000000 && state->RF_IN < 350000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 1, 0);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                }
+                if (state->RF_IN >= 350000000 && state->RF_IN < 400000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 1, 0);
+                        status += MXL_SetGPIO(fe, 3, 0);
+                }
+                if (state->RF_IN >= 400000000 && state->RF_IN < 470000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 1);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 1, 0);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                }
+                if (state->RF_IN >= 470000000 && state->RF_IN < 640000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 3, 0);
+                }
+                if (state->RF_IN >= 640000000 && state->RF_IN < 820000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 1);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 3, 0);
+                }
+                if (state->RF_IN >= 820000000 && state->RF_IN <= 900000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 1);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                }
+        }
+
+        if (state->TF_Type == MXL_TF_E_NA) {
+
+                /* Tracking Filter type E-NA for Empia ONLY change for 2.6.8 */
+                status += MXL_ControlWrite(fe, DAC_DIN_B, 0);
+
+                /* if UHF and terrestrial=> Turn off Tracking Filter */
+                if (state->RF_IN >= 471000000 &&
+                        (state->RF_IN - 471000000)%6000000 != 0) {
+
+                        /* Turn off all the banks */
+                        status += MXL_SetGPIO(fe, 3, 1);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 0);
+
+                        /* 2.6.12 Turn on RSSI */
+                        status += MXL_ControlWrite(fe, SEQ_EXTSYNTHCALIF, 1);
+                        status += MXL_ControlWrite(fe, SEQ_EXTDCCAL, 1);
+                        status += MXL_ControlWrite(fe, AGC_EN_RSSI, 1);
+                        status += MXL_ControlWrite(fe, RFA_ENCLKRFAGC, 1);
+
+                        /* RSSI reference point */
+                        status += MXL_ControlWrite(fe, RFA_RSSI_REFH, 5);
+                        status += MXL_ControlWrite(fe, RFA_RSSI_REF, 3);
+                        status += MXL_ControlWrite(fe, RFA_RSSI_REFL, 2);
+
+                        /* following parameter is from analog OTA mode,
+                         * can be change to seek better performance */
+                        status += MXL_ControlWrite(fe, RFSYN_CHP_GAIN, 3);
+                } else {
+                /* if VHF or Cable =>  Turn on Tracking Filter */
+
+                /* 2.6.12 Turn off RSSI */
+                status += MXL_ControlWrite(fe, AGC_EN_RSSI, 0);
+
+                /* change back from above condition */
+                status += MXL_ControlWrite(fe, RFSYN_CHP_GAIN, 5);
+
+
+                if (state->RF_IN >= 43000000 && state->RF_IN < 174000000) {
+
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 0);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                }
+                if (state->RF_IN >= 174000000 && state->RF_IN < 250000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 0);
+                        status += MXL_SetGPIO(fe, 1, 0);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                }
+                if (state->RF_IN >= 250000000 && state->RF_IN < 350000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 1, 0);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                }
+                if (state->RF_IN >= 350000000 && state->RF_IN < 400000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 1, 0);
+                        status += MXL_SetGPIO(fe, 3, 0);
+                }
+                if (state->RF_IN >= 400000000 && state->RF_IN < 570000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 0);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 3, 0);
+                }
+                if (state->RF_IN >= 570000000 && state->RF_IN < 770000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 1);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 3, 0);
+                }
+                if (state->RF_IN >= 770000000 && state->RF_IN <= 900000000) {
+                        status += MXL_ControlWrite(fe, DAC_B_ENABLE, 1);
+                        status += MXL_SetGPIO(fe, 4, 1);
+                        status += MXL_SetGPIO(fe, 1, 1);
+                        status += MXL_SetGPIO(fe, 3, 1);
+                }
+                }
+        }
+        return status ;
+}
+
+static u16 MXL_SetGPIO(struct dvb_frontend *fe, u8 GPIO_Num, u8 GPIO_Val)
+{
+        u16 status = 0;
+
+        if (GPIO_Num == 1)
+                status += MXL_ControlWrite(fe, GPIO_1B, GPIO_Val ? 0 : 1);
+
+        /* GPIO2 is not available */
+
+        if (GPIO_Num == 3) {
+                if (GPIO_Val == 1) {
+                        status += MXL_ControlWrite(fe, GPIO_3, 0);
+                        status += MXL_ControlWrite(fe, GPIO_3B, 0);
+                }
+                if (GPIO_Val == 0) {
+                        status += MXL_ControlWrite(fe, GPIO_3, 1);
+                        status += MXL_ControlWrite(fe, GPIO_3B, 1);
+                }
+                if (GPIO_Val == 3) { /* tri-state */
+                        status += MXL_ControlWrite(fe, GPIO_3, 0);
+                        status += MXL_ControlWrite(fe, GPIO_3B, 1);
+                }
+        }
+        if (GPIO_Num == 4) {
+                if (GPIO_Val == 1) {
+                        status += MXL_ControlWrite(fe, GPIO_4, 0);
+                        status += MXL_ControlWrite(fe, GPIO_4B, 0);
+                }
+                if (GPIO_Val == 0) {
+                        status += MXL_ControlWrite(fe, GPIO_4, 1);
+                        status += MXL_ControlWrite(fe, GPIO_4B, 1);
+                }
+                if (GPIO_Val == 3) { /* tri-state */
+                        status += MXL_ControlWrite(fe, GPIO_4, 0);
+                        status += MXL_ControlWrite(fe, GPIO_4B, 1);
+                }
+        }
+
+        return status;
+}
+
+static u16 MXL_ControlWrite(struct dvb_frontend *fe, u16 ControlNum, u32 value)
+{
+        u16 status = 0;
+
+        /* Will write ALL Matching Control Name */
+        /* Write Matching INIT Control */
+        status += MXL_ControlWrite_Group(fe, ControlNum, value, 1);
+        /* Write Matching CH Control */
+        status += MXL_ControlWrite_Group(fe, ControlNum, value, 2);
+#ifdef _MXL_INTERNAL
+        /* Write Matching MXL Control */
+        status += MXL_ControlWrite_Group(fe, ControlNum, value, 3);
+#endif
+        return status;
+}
+
+static u16 MXL_ControlWrite_Group(struct dvb_frontend *fe, u16 controlNum,
+        u32 value, u16 controlGroup)
+{
+        struct mxl5005s_state *state = fe->tuner_priv;
+        u16 i, j, k;
+        u32 highLimit;
+        u32 ctrlVal;
+
+        if (controlGroup == 1) /* Initial Control */ {
+
+                for (i = 0; i < state->Init_Ctrl_Num; i++) {
+
+                        if (controlNum == state->Init_Ctrl[i].Ctrl_Num) {
+
+                                highLimit = 1 << state->Init_Ctrl[i].size;
+                                if (value < highLimit) {
+                                        for (j = 0; j < state->Init_Ctrl[i].size; j++) {
+                                                state->Init_Ctrl[i].val[j] = (u8)((value >> j) & 0x01);
+                                                MXL_RegWriteBit(fe, (u8)(state->Init_Ctrl[i].addr[j]),
+                                                        (u8)(state->Init_Ctrl[i].bit[j]),
+                                                        (u8)((value>>j) & 0x01));
+                                        }
+                                        ctrlVal = 0;
+                                        for (k = 0; k < state->Init_Ctrl[i].size; k++)
+                                                ctrlVal += state->Init_Ctrl[i].val[k] * (1 << k);
+                                } else
+                                        return -1;
+                        }
+                }
+        }
+        if (controlGroup == 2) /* Chan change Control */ {
+
+                for (i = 0; i < state->CH_Ctrl_Num; i++) {
+
+                        if (controlNum == state->CH_Ctrl[i].Ctrl_Num) {
+
+                                highLimit = 1 << state->CH_Ctrl[i].size;
+                                if (value < highLimit) {
+                                        for (j = 0; j < state->CH_Ctrl[i].size; j++) {
+                                                state->CH_Ctrl[i].val[j] = (u8)((value >> j) & 0x01);
+                                                MXL_RegWriteBit(fe, (u8)(state->CH_Ctrl[i].addr[j]),
+                                                        (u8)(state->CH_Ctrl[i].bit[j]),
+                                                        (u8)((value>>j) & 0x01));
+                                        }
+                                        ctrlVal = 0;
+                                        for (k = 0; k < state->CH_Ctrl[i].size; k++)
+                                                ctrlVal += state->CH_Ctrl[i].val[k] * (1 << k);
+                                } else
+                                        return -1;
+                        }
+                }
+        }
+#ifdef _MXL_INTERNAL
+        if (controlGroup == 3) /* Maxlinear Control */ {
+
+                for (i = 0; i < state->MXL_Ctrl_Num; i++) {
+
+                        if (controlNum == state->MXL_Ctrl[i].Ctrl_Num) {
+
+                                highLimit = (1 << state->MXL_Ctrl[i].size);
+                                if (value < highLimit) {
+                                        for (j = 0; j < state->MXL_Ctrl[i].size; j++) {
+                                                state->MXL_Ctrl[i].val[j] = (u8)((value >> j) & 0x01);
+                                                MXL_RegWriteBit(fe, (u8)(state->MXL_Ctrl[i].addr[j]),
+                                                        (u8)(state->MXL_Ctrl[i].bit[j]),
+                                                        (u8)((value>>j) & 0x01));
+                                        }
+                                        ctrlVal = 0;
+                                        for (k = 0; k < state->MXL_Ctrl[i].size; k++)
+                                                ctrlVal += state->MXL_Ctrl[i].val[k] * (1 << k);
+                                } else
+                                        return -1;
+                        }
+                }
+        }
+#endif
+        return 0 ; /* successful return */
+}
+
+static u16 MXL_RegRead(struct dvb_frontend *fe, u8 RegNum, u8 *RegVal)
+{
+        struct mxl5005s_state *state = fe->tuner_priv;
+        int i ;
+
+        for (i = 0; i < 104; i++) {
+                if (RegNum == state->TunerRegs[i].Reg_Num) {
+                        *RegVal = (u8)(state->TunerRegs[i].Reg_Val);
+                        return 0;
+                }
+        }
+
+        return 1;
+}
+
+static u16 MXL_ControlRead(struct dvb_frontend *fe, u16 controlNum, u32 *value)
+{
+        struct mxl5005s_state *state = fe->tuner_priv;
+        u32 ctrlVal ;
+        u16 i, k ;
+
+        for (i = 0; i < state->Init_Ctrl_Num ; i++) {
+
+                if (controlNum == state->Init_Ctrl[i].Ctrl_Num) {
+
+                        ctrlVal = 0;
+                        for (k = 0; k < state->Init_Ctrl[i].size; k++)
+                                ctrlVal += state->Init_Ctrl[i].val[k] * (1<<k);
+                        *value = ctrlVal;
+                        return 0;
+                }
+        }
+
+        for (i = 0; i < state->CH_Ctrl_Num ; i++) {
+
+                if (controlNum == state->CH_Ctrl[i].Ctrl_Num) {
+
+                        ctrlVal = 0;
+                        for (k = 0; k < state->CH_Ctrl[i].size; k++)
+                                ctrlVal += state->CH_Ctrl[i].val[k] * (1 << k);
+                        *value = ctrlVal;
+                        return 0;
+
+                }
+        }
+
+#ifdef _MXL_INTERNAL
+        for (i = 0; i < state->MXL_Ctrl_Num ; i++) {
+
+                if (controlNum == state->MXL_Ctrl[i].Ctrl_Num) {
+
+                        ctrlVal = 0;
+                        for (k = 0; k < state->MXL_Ctrl[i].size; k++)
+                                ctrlVal += state->MXL_Ctrl[i].val[k] * (1<<k);
+                        *value = ctrlVal;
+                        return 0;
+
+                }
+        }
+#endif
+        return 1;
+}
+
+static void MXL_RegWriteBit(struct dvb_frontend *fe, u8 address, u8 bit,
+        u8 bitVal)
+{
+        struct mxl5005s_state *state = fe->tuner_priv;
+        int i ;
+
+        const u8 AND_MAP[8] = {
+                0xFE, 0xFD, 0xFB, 0xF7,
+                0xEF, 0xDF, 0xBF, 0x7F } ;
+
+        const u8 OR_MAP[8] = {
+                0x01, 0x02, 0x04, 0x08,
+                0x10, 0x20, 0x40, 0x80 } ;
+
+        for (i = 0; i < state->TunerRegs_Num; i++) {
+                if (state->TunerRegs[i].Reg_Num == address) {
+                        if (bitVal)
+                                state->TunerRegs[i].Reg_Val |= OR_MAP[bit];
+                        else
+                                state->TunerRegs[i].Reg_Val &= AND_MAP[bit];
+                        break ;
+                }
+        }
+}
+
+static u32 MXL_Ceiling(u32 value, u32 resolution)
+{
+        return (value/resolution + (value % resolution > 0 ? 1 : 0));
+}
+
+/* Retrieve the Initialzation Registers */
+static u16 MXL_GetInitRegister(struct dvb_frontend *fe, u8 *RegNum,
+        u8 *RegVal, int *count)
+{
+        u16 status = 0;
+        int i ;
+
+        u8 RegAddr[] = {
+                11, 12, 13, 22, 32, 43, 44, 53, 56, 59, 73,
+                76, 77, 91, 134, 135, 137, 147,
+                156, 166, 167, 168, 25 };
+
+        *count = sizeof(RegAddr) / sizeof(u8);
+
+        status += MXL_BlockInit(fe);
+
+        for (i = 0 ; i < *count; i++) {
+                RegNum[i] = RegAddr[i];
+                status += MXL_RegRead(fe, RegNum[i], &RegVal[i]);
+        }
+
+        return status;
+}
+
+static u16 MXL_GetCHRegister(struct dvb_frontend *fe, u8 *RegNum, u8 *RegVal,
+        int *count)
+{
+        u16 status = 0;
+        int i ;
+
+/* add 77, 166, 167, 168 register for 2.6.12 */
+#ifdef _MXL_PRODUCTION
+        u8 RegAddr[] = {14, 15, 16, 17, 22, 43, 65, 68, 69, 70, 73, 92, 93, 106,
+           107, 108, 109, 110, 111, 112, 136, 138, 149, 77, 166, 167, 168 } ;
+#else
+        u8 RegAddr[] = {14, 15, 16, 17, 22, 43, 68, 69, 70, 73, 92, 93, 106,
+           107, 108, 109, 110, 111, 112, 136, 138, 149, 77, 166, 167, 168 } ;
+        /*
+        u8 RegAddr[171];
+        for (i = 0; i <= 170; i++)
+                RegAddr[i] = i;
+        */
+#endif
+
+        *count = sizeof(RegAddr) / sizeof(u8);
+
+        for (i = 0 ; i < *count; i++) {
+                RegNum[i] = RegAddr[i];
+                status += MXL_RegRead(fe, RegNum[i], &RegVal[i]);
+        }
+
+        return status;
+}
+
+static u16 MXL_GetCHRegister_ZeroIF(struct dvb_frontend *fe, u8 *RegNum,
+        u8 *RegVal, int *count)
+{
+        u16 status = 0;
+        int i;
+
+        u8 RegAddr[] = {43, 136};
+
+        *count = sizeof(RegAddr) / sizeof(u8);
+
+        for (i = 0; i < *count; i++) {
+                RegNum[i] = RegAddr[i];
+                status += MXL_RegRead(fe, RegNum[i], &RegVal[i]);
+        }
+
+        return status;
+}
+
+static u16 MXL_GetMasterControl(u8 *MasterReg, int state)
+{
+        if (state == 1) /* Load_Start */
+                *MasterReg = 0xF3;
+        if (state == 2) /* Power_Down */
+                *MasterReg = 0x41;
+        if (state == 3) /* Synth_Reset */
+                *MasterReg = 0xB1;
+        if (state == 4) /* Seq_Off */
+                *MasterReg = 0xF1;
+
+        return 0;
+}
+
+#ifdef _MXL_PRODUCTION
+static u16 MXL_VCORange_Test(struct dvb_frontend *fe, int VCO_Range)
+{
+        struct mxl5005s_state *state = fe->tuner_priv;
+        u16 status = 0 ;
+
+        if (VCO_Range == 1) {
+                status += MXL_ControlWrite(fe, RFSYN_EN_DIV, 1);
+                status += MXL_ControlWrite(fe, RFSYN_EN_OUTMUX, 0);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_DIVM, 0);
+                status += MXL_ControlWrite(fe, RFSYN_DIVM, 1);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_OUT, 1);
+                status += MXL_ControlWrite(fe, RFSYN_RF_DIV_BIAS, 1);
+                status += MXL_ControlWrite(fe, DN_SEL_FREQ, 0);
+                if (state->Mode == 0 && state->IF_Mode == 1) {
+                        /* Analog Low IF Mode */
+                        status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_HI, 1);
+                        status += MXL_ControlWrite(fe, RFSYN_VCO_BIAS, 8);
+                        status += MXL_ControlWrite(fe, CHCAL_INT_MOD_RF, 56);
+                        status += MXL_ControlWrite(fe,
+                                CHCAL_FRAC_MOD_RF, 180224);
+                }
+                if (state->Mode == 0 && state->IF_Mode == 0) {
+                        /* Analog Zero IF Mode */
+                        status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_HI, 1);
+                        status += MXL_ControlWrite(fe, RFSYN_VCO_BIAS, 8);
+                        status += MXL_ControlWrite(fe, CHCAL_INT_MOD_RF, 56);
+                        status += MXL_ControlWrite(fe,
+                                CHCAL_FRAC_MOD_RF, 222822);
+                }
+                if (state->Mode == 1) /* Digital Mode */ {
+                        status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_HI, 1);
+                        status += MXL_ControlWrite(fe, RFSYN_VCO_BIAS, 8);
+                        status += MXL_ControlWrite(fe, CHCAL_INT_MOD_RF, 56);
+                        status += MXL_ControlWrite(fe,
+                                CHCAL_FRAC_MOD_RF, 229376);
+                }
+        }
+
+        if (VCO_Range == 2) {
+                status += MXL_ControlWrite(fe, RFSYN_EN_DIV, 1);
+                status += MXL_ControlWrite(fe, RFSYN_EN_OUTMUX, 0);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_DIVM, 0);
+                status += MXL_ControlWrite(fe, RFSYN_DIVM, 1);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_OUT, 1);
+                status += MXL_ControlWrite(fe, RFSYN_RF_DIV_BIAS, 1);
+                status += MXL_ControlWrite(fe, DN_SEL_FREQ, 0);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_HI, 1);
+                status += MXL_ControlWrite(fe, RFSYN_VCO_BIAS, 40);
+                status += MXL_ControlWrite(fe, CHCAL_INT_MOD_RF, 41);
+                if (state->Mode == 0 && state->IF_Mode == 1) {
+                        /* Analog Low IF Mode */
+                        status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_HI, 1);
+                        status += MXL_ControlWrite(fe, RFSYN_VCO_BIAS, 40);
+                        status += MXL_ControlWrite(fe, CHCAL_INT_MOD_RF, 42);
+                        status += MXL_ControlWrite(fe,
+                                CHCAL_FRAC_MOD_RF, 206438);
+                }
+                if (state->Mode == 0 && state->IF_Mode == 0) {
+                        /* Analog Zero IF Mode */
+                        status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_HI, 1);
+                        status += MXL_ControlWrite(fe, RFSYN_VCO_BIAS, 40);
+                        status += MXL_ControlWrite(fe, CHCAL_INT_MOD_RF, 42);
+                        status += MXL_ControlWrite(fe,
+                                CHCAL_FRAC_MOD_RF, 206438);
+                }
+                if (state->Mode == 1) /* Digital Mode */ {
+                        status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_HI, 1);
+                        status += MXL_ControlWrite(fe, RFSYN_VCO_BIAS, 40);
+                        status += MXL_ControlWrite(fe, CHCAL_INT_MOD_RF, 41);
+                        status += MXL_ControlWrite(fe,
+                                CHCAL_FRAC_MOD_RF, 16384);
+                }
+        }
+
+        if (VCO_Range == 3) {
+                status += MXL_ControlWrite(fe, RFSYN_EN_DIV, 1);
+                status += MXL_ControlWrite(fe, RFSYN_EN_OUTMUX, 0);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_DIVM, 0);
+                status += MXL_ControlWrite(fe, RFSYN_DIVM, 1);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_OUT, 1);
+                status += MXL_ControlWrite(fe, RFSYN_RF_DIV_BIAS, 1);
+                status += MXL_ControlWrite(fe, DN_SEL_FREQ, 0);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_HI, 0);
+                status += MXL_ControlWrite(fe, RFSYN_VCO_BIAS, 8);
+                status += MXL_ControlWrite(fe, CHCAL_INT_MOD_RF, 42);
+                if (state->Mode == 0 && state->IF_Mode == 1) {
+                        /* Analog Low IF Mode */
+                        status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_HI, 0);
+                        status += MXL_ControlWrite(fe, RFSYN_VCO_BIAS, 8);
+                        status += MXL_ControlWrite(fe, CHCAL_INT_MOD_RF, 44);
+                        status += MXL_ControlWrite(fe,
+                                CHCAL_FRAC_MOD_RF, 173670);
+                }
+                if (state->Mode == 0 && state->IF_Mode == 0) {
+                        /* Analog Zero IF Mode */
+                        status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_HI, 0);
+                        status += MXL_ControlWrite(fe, RFSYN_VCO_BIAS, 8);
+                        status += MXL_ControlWrite(fe, CHCAL_INT_MOD_RF, 44);
+                        status += MXL_ControlWrite(fe,
+                                CHCAL_FRAC_MOD_RF, 173670);
+                }
+                if (state->Mode == 1) /* Digital Mode */ {
+                        status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_HI, 0);
+                        status += MXL_ControlWrite(fe, RFSYN_VCO_BIAS, 8);
+                        status += MXL_ControlWrite(fe, CHCAL_INT_MOD_RF, 42);
+                        status += MXL_ControlWrite(fe,
+                                CHCAL_FRAC_MOD_RF, 245760);
+                }
+        }
+
+        if (VCO_Range == 4) {
+                status += MXL_ControlWrite(fe, RFSYN_EN_DIV, 1);
+                status += MXL_ControlWrite(fe, RFSYN_EN_OUTMUX, 0);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_DIVM, 0);
+                status += MXL_ControlWrite(fe, RFSYN_DIVM, 1);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_OUT, 1);
+                status += MXL_ControlWrite(fe, RFSYN_RF_DIV_BIAS, 1);
+                status += MXL_ControlWrite(fe, DN_SEL_FREQ, 0);
+                status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_HI, 0);
+                status += MXL_ControlWrite(fe, RFSYN_VCO_BIAS, 40);
+                status += MXL_ControlWrite(fe, CHCAL_INT_MOD_RF, 27);
+                if (state->Mode == 0 && state->IF_Mode == 1) {
+                        /* Analog Low IF Mode */
+                        status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_HI, 0);
+                        status += MXL_ControlWrite(fe, RFSYN_VCO_BIAS, 40);
+                        status += MXL_ControlWrite(fe, CHCAL_INT_MOD_RF, 27);
+                        status += MXL_ControlWrite(fe,
+                                CHCAL_FRAC_MOD_RF, 206438);
+                }
+                if (state->Mode == 0 && state->IF_Mode == 0) {
+                        /* Analog Zero IF Mode */
+                        status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_HI, 0);
+                        status += MXL_ControlWrite(fe, RFSYN_VCO_BIAS, 40);
+                        status += MXL_ControlWrite(fe, CHCAL_INT_MOD_RF, 27);
+                        status += MXL_ControlWrite(fe,
+                                CHCAL_FRAC_MOD_RF, 206438);
+                }
+                if (state->Mode == 1) /* Digital Mode */ {
+                        status += MXL_ControlWrite(fe, RFSYN_SEL_VCO_HI, 0);
+                        status += MXL_ControlWrite(fe, RFSYN_VCO_BIAS, 40);
+                        status += MXL_ControlWrite(fe, CHCAL_INT_MOD_RF, 27);
+                        status += MXL_ControlWrite(fe,
+                                CHCAL_FRAC_MOD_RF, 212992);
+                }
+        }
+
+        return status;
+}
+
+static u16 MXL_Hystersis_Test(struct dvb_frontend *fe, int Hystersis)
+{
+        struct mxl5005s_state *state = fe->tuner_priv;
+        u16 status = 0;
+
+        if (Hystersis == 1)
+                status += MXL_ControlWrite(fe, DN_BYPASS_AGC_I2C, 1);
+
+        return status;
+}
+#endif
+/* End: Reference driver code found in the Realtek driver that
+ * is copyright MaxLinear */
+
+/* ----------------------------------------------------------------
+ * Begin: Everything after here is new code to adapt the
+ * proprietary Realtek driver into a Linux API tuner.
+ * Copyright (C) 2008 Steven Toth <stoth@hauppauge.com>
+ */
+static int mxl5005s_reset(struct dvb_frontend *fe)
+{
+        struct mxl5005s_state *state = fe->tuner_priv;
+        int ret = 0;
+
+        u8 buf[2] = { 0xff, 0x00 };
+        struct i2c_msg msg = { .addr = state->config->i2c_address, .flags = 0,
+                               .buf = buf, .len = 2 };
+
+        dprintk(2, "%s()\n", __func__);
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
+
+        if (i2c_transfer(state->i2c, &msg, 1) != 1) {
+                printk(KERN_WARNING "mxl5005s I2C reset failed\n");
+                ret = -EREMOTEIO;
+        }
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 0);
+
+        return ret;
+}
+
+/* Write a single byte to a single reg, latch the value if required by
+ * following the transaction with the latch byte.
+ */
+static int mxl5005s_writereg(struct dvb_frontend *fe, u8 reg, u8 val, int latch)
+{
+        struct mxl5005s_state *state = fe->tuner_priv;
+        u8 buf[3] = { reg, val, MXL5005S_LATCH_BYTE };
+        struct i2c_msg msg = { .addr = state->config->i2c_address, .flags = 0,
+                               .buf = buf, .len = 3 };
+
+        if (latch == 0)
+                msg.len = 2;
+
+        dprintk(2, "%s(0x%x, 0x%x, 0x%x)\n", __func__, reg, val, msg.addr);
+
+        if (i2c_transfer(state->i2c, &msg, 1) != 1) {
+                printk(KERN_WARNING "mxl5005s I2C write failed\n");
+                return -EREMOTEIO;
+        }
+        return 0;
+}
+
+static int mxl5005s_writeregs(struct dvb_frontend *fe, u8 *addrtable,
+        u8 *datatable, u8 len)
+{
+        int ret = 0, i;
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
+
+        for (i = 0 ; i < len-1; i++) {
+                ret = mxl5005s_writereg(fe, addrtable[i], datatable[i], 0);
+                if (ret < 0)
+                        break;
+        }
+
+        ret = mxl5005s_writereg(fe, addrtable[i], datatable[i], 1);
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 0);
+
+        return ret;
+}
+
+static int mxl5005s_init(struct dvb_frontend *fe)
+{
+        dprintk(1, "%s()\n", __func__);
+        return mxl5005s_reconfigure(fe, MXL_QAM, MXL5005S_BANDWIDTH_6MHZ);
+}
+
+static int mxl5005s_reconfigure(struct dvb_frontend *fe, u32 mod_type,
+        u32 bandwidth)
+{
+        struct mxl5005s_state *state = fe->tuner_priv;
+
+        u8 AddrTable[MXL5005S_REG_WRITING_TABLE_LEN_MAX];
+        u8 ByteTable[MXL5005S_REG_WRITING_TABLE_LEN_MAX];
+        int TableLen;
+
+        dprintk(1, "%s(type=%d, bw=%d)\n", __func__, mod_type, bandwidth);
+
+        mxl5005s_reset(fe);
+
+        /* Tuner initialization stage 0 */
+        MXL_GetMasterControl(ByteTable, MC_SYNTH_RESET);
+        AddrTable[0] = MASTER_CONTROL_ADDR;
+        ByteTable[0] |= state->config->AgcMasterByte;
+
+        mxl5005s_writeregs(fe, AddrTable, ByteTable, 1);
+
+        mxl5005s_AssignTunerMode(fe, mod_type, bandwidth);
+
+        /* Tuner initialization stage 1 */
+        MXL_GetInitRegister(fe, AddrTable, ByteTable, &TableLen);
+
+        mxl5005s_writeregs(fe, AddrTable, ByteTable, TableLen);
+
+        return 0;
+}
+
+static int mxl5005s_AssignTunerMode(struct dvb_frontend *fe, u32 mod_type,
+        u32 bandwidth)
+{
+        struct mxl5005s_state *state = fe->tuner_priv;
+        struct mxl5005s_config *c = state->config;
+
+        InitTunerControls(fe);
+
+        /* Set MxL5005S parameters. */
+        MXL5005_TunerConfig(
+                fe,
+                c->mod_mode,
+                c->if_mode,
+                bandwidth,
+                c->if_freq,
+                c->xtal_freq,
+                c->agc_mode,
+                c->top,
+                c->output_load,
+                c->clock_out,
+                c->div_out,
+                c->cap_select,
+                c->rssi_enable,
+                mod_type,
+                c->tracking_filter);
+
+        return 0;
+}
+
+static int mxl5005s_set_params(struct dvb_frontend *fe,
+                               struct dvb_frontend_parameters *params)
+{
+        struct mxl5005s_state *state = fe->tuner_priv;
+        u32 req_mode, req_bw = 0;
+        int ret;
+
+        dprintk(1, "%s()\n", __func__);
+
+        if (fe->ops.info.type == FE_ATSC) {
+                switch (params->u.vsb.modulation) {
+                case VSB_8:
+                        req_mode = MXL_ATSC; break;
+                default:
+                case QAM_64:
+                case QAM_256:
+                case QAM_AUTO:
+                        req_mode = MXL_QAM; break;
+                }
+        } else
+                req_mode = MXL_DVBT;
+
+        /* Change tuner for new modulation type if reqd */
+        if (req_mode != state->current_mode) {
+                switch (req_mode) {
+                case VSB_8:
+                case QAM_64:
+                case QAM_256:
+                case QAM_AUTO:
+                        req_bw  = MXL5005S_BANDWIDTH_6MHZ;
+                        break;
+                default:
+                        /* Assume DVB-T */
+                        switch (params->u.ofdm.bandwidth) {
+                        case BANDWIDTH_6_MHZ:
+                                req_bw  = MXL5005S_BANDWIDTH_6MHZ;
+                                break;
+                        case BANDWIDTH_7_MHZ:
+                                req_bw  = MXL5005S_BANDWIDTH_7MHZ;
+                                break;
+                        case BANDWIDTH_AUTO:
+                        case BANDWIDTH_8_MHZ:
+                                req_bw  = MXL5005S_BANDWIDTH_8MHZ;
+                                break;
+                        }
+                }
+
+                state->current_mode = req_mode;
+                ret = mxl5005s_reconfigure(fe, req_mode, req_bw);
+
+        } else
+                ret = 0;
+
+        if (ret == 0) {
+                dprintk(1, "%s() freq=%d\n", __func__, params->frequency);
+                ret = mxl5005s_SetRfFreqHz(fe, params->frequency);
+        }
+
+        return ret;
+}
+
+static int mxl5005s_get_frequency(struct dvb_frontend *fe, u32 *frequency)
+{
+        struct mxl5005s_state *state = fe->tuner_priv;
+        dprintk(1, "%s()\n", __func__);
+
+        *frequency = state->RF_IN;
+
+        return 0;
+}
+
+static int mxl5005s_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth)
+{
+        struct mxl5005s_state *state = fe->tuner_priv;
+        dprintk(1, "%s()\n", __func__);
+
+        *bandwidth = state->Chan_Bandwidth;
+
+        return 0;
+}
+
+static int mxl5005s_release(struct dvb_frontend *fe)
+{
+        dprintk(1, "%s()\n", __func__);
+        kfree(fe->tuner_priv);
+        fe->tuner_priv = NULL;
+        return 0;
+}
+
+static const struct dvb_tuner_ops mxl5005s_tuner_ops = {
+        .info = {
+                .name           = "MaxLinear MXL5005S",
+                .frequency_min  =  48000000,
+                .frequency_max  = 860000000,
+                .frequency_step =     50000,
+        },
+
+        .release       = mxl5005s_release,
+        .init          = mxl5005s_init,
+
+        .set_params    = mxl5005s_set_params,
+        .get_frequency = mxl5005s_get_frequency,
+        .get_bandwidth = mxl5005s_get_bandwidth,
+};
+
+struct dvb_frontend *mxl5005s_attach(struct dvb_frontend *fe,
+                                     struct i2c_adapter *i2c,
+                                     struct mxl5005s_config *config)
+{
+        struct mxl5005s_state *state = NULL;
+        dprintk(1, "%s()\n", __func__);
+
+        state = kzalloc(sizeof(struct mxl5005s_state), GFP_KERNEL);
+        if (state == NULL)
+                return NULL;
+
+        state->frontend = fe;
+        state->config = config;
+        state->i2c = i2c;
+        state->current_mode = MXL_QAM;
+
+        printk(KERN_INFO "MXL5005S: Attached at address 0x%02x\n",
+                config->i2c_address);
+
+        memcpy(&fe->ops.tuner_ops, &mxl5005s_tuner_ops,
+                sizeof(struct dvb_tuner_ops));
+
+        fe->tuner_priv = state;
+        return fe;
+}
+EXPORT_SYMBOL(mxl5005s_attach);
+
+MODULE_DESCRIPTION("MaxLinear MXL5005S silicon tuner driver");
+MODULE_AUTHOR("Steven Toth");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/common/tuners/mxl5005s.h b/drivers/media/common/tuners/mxl5005s.h
new file mode 100644
index 000000000000..396db150bf0c
--- /dev/null
+++ b/drivers/media/common/tuners/mxl5005s.h
@@ -0,0 +1,131 @@
+/*
+    MaxLinear MXL5005S VSB/QAM/DVBT tuner driver
+
+    Copyright (C) 2008 MaxLinear
+    Copyright (C) 2008 Steven Toth <stoth@hauppauge.com>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef __MXL5005S_H
+#define __MXL5005S_H
+
+#include <linux/i2c.h>
+#include "dvb_frontend.h"
+
+struct mxl5005s_config {
+
+        /* 7 bit i2c address */
+        u8 i2c_address;
+
+#define IF_FREQ_4570000HZ    4570000
+#define IF_FREQ_4571429HZ    4571429
+#define IF_FREQ_5380000HZ    5380000
+#define IF_FREQ_36000000HZ  36000000
+#define IF_FREQ_36125000HZ  36125000
+#define IF_FREQ_36166667HZ  36166667
+#define IF_FREQ_44000000HZ  44000000
+        u32 if_freq;
+
+#define CRYSTAL_FREQ_4000000HZ    4000000
+#define CRYSTAL_FREQ_16000000HZ  16000000
+#define CRYSTAL_FREQ_25000000HZ  25000000
+#define CRYSTAL_FREQ_28800000HZ  28800000
+        u32 xtal_freq;
+
+#define MXL_DUAL_AGC   0
+#define MXL_SINGLE_AGC 1
+        u8 agc_mode;
+
+#define MXL_TF_DEFAULT  0
+#define MXL_TF_OFF      1
+#define MXL_TF_C        2
+#define MXL_TF_C_H      3
+#define MXL_TF_D        4
+#define MXL_TF_D_L      5
+#define MXL_TF_E        6
+#define MXL_TF_F        7
+#define MXL_TF_E_2      8
+#define MXL_TF_E_NA     9
+#define MXL_TF_G        10
+        u8 tracking_filter;
+
+#define MXL_RSSI_DISABLE        0
+#define MXL_RSSI_ENABLE         1
+        u8 rssi_enable;
+
+#define MXL_CAP_SEL_DISABLE     0
+#define MXL_CAP_SEL_ENABLE      1
+        u8 cap_select;
+
+#define MXL_DIV_OUT_1   0
+#define MXL_DIV_OUT_4   1
+        u8 div_out;
+
+#define MXL_CLOCK_OUT_DISABLE   0
+#define MXL_CLOCK_OUT_ENABLE    1
+        u8 clock_out;
+
+#define MXL5005S_IF_OUTPUT_LOAD_200_OHM 200
+#define MXL5005S_IF_OUTPUT_LOAD_300_OHM 300
+        u32 output_load;
+
+#define MXL5005S_TOP_5P5   55
+#define MXL5005S_TOP_7P2   72
+#define MXL5005S_TOP_9P2   92
+#define MXL5005S_TOP_11P0 110
+#define MXL5005S_TOP_12P9 129
+#define MXL5005S_TOP_14P7 147
+#define MXL5005S_TOP_16P8 168
+#define MXL5005S_TOP_19P4 194
+#define MXL5005S_TOP_21P2 212
+#define MXL5005S_TOP_23P2 232
+#define MXL5005S_TOP_25P2 252
+#define MXL5005S_TOP_27P1 271
+#define MXL5005S_TOP_29P2 292
+#define MXL5005S_TOP_31P7 317
+#define MXL5005S_TOP_34P9 349
+        u32 top;
+
+#define MXL_ANALOG_MODE  0
+#define MXL_DIGITAL_MODE 1
+        u8 mod_mode;
+
+#define MXL_ZERO_IF 0
+#define MXL_LOW_IF  1
+        u8 if_mode;
+
+        /* Stuff I don't know what to do with */
+        u8 AgcMasterByte;
+};
+
+#if defined(CONFIG_MEDIA_TUNER_MXL5005S) || \
+        (defined(CONFIG_MEDIA_TUNER_MXL5005S_MODULE) && defined(MODULE))
+extern struct dvb_frontend *mxl5005s_attach(struct dvb_frontend *fe,
+                                            struct i2c_adapter *i2c,
+                                            struct mxl5005s_config *config);
+#else
+static inline struct dvb_frontend *mxl5005s_attach(struct dvb_frontend *fe,
+                                            struct i2c_adapter *i2c,
+                                            struct mxl5005s_config *config)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+        return NULL;
+}
+#endif /* CONFIG_DVB_TUNER_MXL5005S */
+
+#endif /* __MXL5005S_H */
+
diff --git a/drivers/media/common/tuners/tda18271-common.c b/drivers/media/common/tuners/tda18271-common.c
index e27a7620a32f..42b5f5d4bfe6 100644
--- a/drivers/media/common/tuners/tda18271-common.c
+++ b/drivers/media/common/tuners/tda18271-common.c
@@ -227,9 +227,8 @@ int tda18271_charge_pump_source(struct dvb_frontend *fe,
 
         regs[r_cp] &= ~0x20;
         regs[r_cp] |= ((force & 1) << 5);
-        tda18271_write_regs(fe, r_cp, 1);
 
-        return 0;
+        return tda18271_write_regs(fe, r_cp, 1);
 }
 
 int tda18271_init_regs(struct dvb_frontend *fe)
@@ -487,16 +486,15 @@ int tda18271_set_standby_mode(struct dvb_frontend *fe,
         struct tda18271_priv *priv = fe->tuner_priv;
         unsigned char *regs = priv->tda18271_regs;
 
-        tda_dbg("sm = %d, sm_lt = %d, sm_xt = %d\n", sm, sm_lt, sm_xt);
+        if (tda18271_debug & DBG_ADV)
+                tda_dbg("sm = %d, sm_lt = %d, sm_xt = %d\n", sm, sm_lt, sm_xt);
 
         regs[R_EP3]  &= ~0xe0; /* clear sm, sm_lt, sm_xt */
         regs[R_EP3]  |= sm    ? (1 << 7) : 0 |
                         sm_lt ? (1 << 6) : 0 |
                         sm_xt ? (1 << 5) : 0;
 
-        tda18271_write_regs(fe, R_EP3, 1);
-
-        return 0;
+        return tda18271_write_regs(fe, R_EP3, 1);
 }
 
 /*---------------------------------------------------------------------*/
@@ -510,7 +508,7 @@ int tda18271_calc_main_pll(struct dvb_frontend *fe, u32 freq)
         u32 div;
 
         int ret = tda18271_lookup_pll_map(fe, MAIN_PLL, &freq, &pd, &d);
-        if (ret < 0)
+        if (tda_fail(ret))
                 goto fail;
 
         regs[R_MPD]   = (0x77 & pd);
@@ -542,7 +540,7 @@ int tda18271_calc_cal_pll(struct dvb_frontend *fe, u32 freq)
         u32 div;
 
         int ret = tda18271_lookup_pll_map(fe, CAL_PLL, &freq, &pd, &d);
-        if (ret < 0)
+        if (tda_fail(ret))
                 goto fail;
 
         regs[R_CPD]   = pd;
@@ -566,7 +564,7 @@ int tda18271_calc_bp_filter(struct dvb_frontend *fe, u32 *freq)
         u8 val;
 
         int ret = tda18271_lookup_map(fe, BP_FILTER, freq, &val);
-        if (ret < 0)
+        if (tda_fail(ret))
                 goto fail;
 
         regs[R_EP1]  &= ~0x07; /* clear bp filter bits */
@@ -583,7 +581,7 @@ int tda18271_calc_km(struct dvb_frontend *fe, u32 *freq)
         u8 val;
 
         int ret = tda18271_lookup_map(fe, RF_CAL_KMCO, freq, &val);
-        if (ret < 0)
+        if (tda_fail(ret))
                 goto fail;
 
         regs[R_EB13] &= ~0x7c; /* clear k & m bits */
@@ -600,7 +598,7 @@ int tda18271_calc_rf_band(struct dvb_frontend *fe, u32 *freq)
         u8 val;
 
         int ret = tda18271_lookup_map(fe, RF_BAND, freq, &val);
-        if (ret < 0)
+        if (tda_fail(ret))
                 goto fail;
 
         regs[R_EP2]  &= ~0xe0; /* clear rf band bits */
@@ -617,7 +615,7 @@ int tda18271_calc_gain_taper(struct dvb_frontend *fe, u32 *freq)
         u8 val;
 
         int ret = tda18271_lookup_map(fe, GAIN_TAPER, freq, &val);
-        if (ret < 0)
+        if (tda_fail(ret))
                 goto fail;
 
         regs[R_EP2]  &= ~0x1f; /* clear gain taper bits */
@@ -634,7 +632,7 @@ int tda18271_calc_ir_measure(struct dvb_frontend *fe, u32 *freq)
         u8 val;
 
         int ret = tda18271_lookup_map(fe, IR_MEASURE, freq, &val);
-        if (ret < 0)
+        if (tda_fail(ret))
                 goto fail;
 
         regs[R_EP5] &= ~0x07;
diff --git a/drivers/media/common/tuners/tda18271-fe.c b/drivers/media/common/tuners/tda18271-fe.c
index b262100ae897..89c01fb1f859 100644
--- a/drivers/media/common/tuners/tda18271-fe.c
+++ b/drivers/media/common/tuners/tda18271-fe.c
@@ -51,6 +51,7 @@ static int tda18271_channel_configuration(struct dvb_frontend *fe,
 {
         struct tda18271_priv *priv = fe->tuner_priv;
         unsigned char *regs = priv->tda18271_regs;
+        int ret;
         u32 N;
 
         /* update TV broadcast parameters */
@@ -85,7 +86,9 @@ static int tda18271_channel_configuration(struct dvb_frontend *fe,
         /* update rf top / if top */
         regs[R_EB22]  = 0x00;
         regs[R_EB22] |= map->rfagc_top;
-        tda18271_write_regs(fe, R_EB22, 1);
+        ret = tda18271_write_regs(fe, R_EB22, 1);
+        if (tda_fail(ret))
+                goto fail;
 
         /* --------------------------------------------------------------- */
 
@@ -121,7 +124,9 @@ static int tda18271_channel_configuration(struct dvb_frontend *fe,
         /* agc1 has priority on agc2 */
         regs[R_EB1]  &= ~0x01;
 
-        tda18271_write_regs(fe, R_EB1, 1);
+        ret = tda18271_write_regs(fe, R_EB1, 1);
+        if (tda_fail(ret))
+                goto fail;
 
         /* --------------------------------------------------------------- */
 
@@ -141,7 +146,9 @@ static int tda18271_channel_configuration(struct dvb_frontend *fe,
                 break;
         }
 
-        tda18271_write_regs(fe, R_TM, 7);
+        ret = tda18271_write_regs(fe, R_TM, 7);
+        if (tda_fail(ret))
+                goto fail;
 
         /* force charge pump source */
         charge_pump_source(fe, 1);
@@ -158,9 +165,9 @@ static int tda18271_channel_configuration(struct dvb_frontend *fe,
                 regs[R_EP3] &= ~0x04;
         else
                 regs[R_EP3] |= 0x04;
-        tda18271_write_regs(fe, R_EP3, 1);
-
-        return 0;
+        ret = tda18271_write_regs(fe, R_EP3, 1);
+fail:
+        return ret;
 }
 
 static int tda18271_read_thermometer(struct dvb_frontend *fe)
@@ -213,11 +220,13 @@ static int tda18271c2_rf_tracking_filters_correction(struct dvb_frontend *fe,
         struct tda18271_priv *priv = fe->tuner_priv;
         struct tda18271_rf_tracking_filter_cal *map = priv->rf_cal_state;
         unsigned char *regs = priv->tda18271_regs;
-        int tm_current, rfcal_comp, approx, i;
+        int tm_current, rfcal_comp, approx, i, ret;
         u8 dc_over_dt, rf_tab;
 
         /* power up */
-        tda18271_set_standby_mode(fe, 0, 0, 0);
+        ret = tda18271_set_standby_mode(fe, 0, 0, 0);
+        if (tda_fail(ret))
+                goto fail;
 
         /* read die current temperature */
         tm_current = tda18271_read_thermometer(fe);
@@ -228,8 +237,8 @@ static int tda18271c2_rf_tracking_filters_correction(struct dvb_frontend *fe,
         rf_tab = regs[R_EB14];
 
         i = tda18271_lookup_rf_band(fe, &freq, NULL);
-        if (i < 0)
-                return -EINVAL;
+        if (tda_fail(i))
+                return i;
 
         if ((0 == map[i].rf3) || (freq / 1000 < map[i].rf2)) {
                 approx = map[i].rf_a1 *
@@ -250,35 +259,42 @@ static int tda18271c2_rf_tracking_filters_correction(struct dvb_frontend *fe,
         rfcal_comp = dc_over_dt * (tm_current - priv->tm_rfcal);
 
         regs[R_EB14] = approx + rfcal_comp;
-        tda18271_write_regs(fe, R_EB14, 1);
-
-        return 0;
+        ret = tda18271_write_regs(fe, R_EB14, 1);
+fail:
+        return ret;
 }
 
 static int tda18271_por(struct dvb_frontend *fe)
 {
         struct tda18271_priv *priv = fe->tuner_priv;
         unsigned char *regs = priv->tda18271_regs;
+        int ret;
 
         /* power up detector 1 */
         regs[R_EB12] &= ~0x20;
-        tda18271_write_regs(fe, R_EB12, 1);
+        ret = tda18271_write_regs(fe, R_EB12, 1);
+        if (tda_fail(ret))
+                goto fail;
 
         regs[R_EB18] &= ~0x80; /* turn agc1 loop on */
         regs[R_EB18] &= ~0x03; /* set agc1_gain to  6 dB */
-        tda18271_write_regs(fe, R_EB18, 1);
+        ret = tda18271_write_regs(fe, R_EB18, 1);
+        if (tda_fail(ret))
+                goto fail;
 
         regs[R_EB21] |= 0x03; /* set agc2_gain to -6 dB */
 
         /* POR mode */
-        tda18271_set_standby_mode(fe, 1, 0, 0);
+        ret = tda18271_set_standby_mode(fe, 1, 0, 0);
+        if (tda_fail(ret))
+                goto fail;
 
         /* disable 1.5 MHz low pass filter */
         regs[R_EB23] &= ~0x04; /* forcelp_fc2_en = 0 */
         regs[R_EB23] &= ~0x02; /* XXX: lp_fc[2] = 0 */
-        tda18271_write_regs(fe, R_EB21, 3);
-
-        return 0;
+        ret = tda18271_write_regs(fe, R_EB21, 3);
+fail:
+        return ret;
 }
 
 static int tda18271_calibrate_rf(struct dvb_frontend *fe, u32 freq)
@@ -389,7 +405,7 @@ static int tda18271_powerscan(struct dvb_frontend *fe,
 {
         struct tda18271_priv *priv = fe->tuner_priv;
         unsigned char *regs = priv->tda18271_regs;
-        int sgn, bcal, count, wait;
+        int sgn, bcal, count, wait, ret;
         u8 cid_target;
         u16 count_limit;
         u32 freq;
@@ -421,7 +437,9 @@ static int tda18271_powerscan(struct dvb_frontend *fe,
         tda18271_write_regs(fe, R_EP2, 1);
 
         /* read power detection info, stored in EB10 */
-        tda18271_read_extended(fe);
+        ret = tda18271_read_extended(fe);
+        if (tda_fail(ret))
+                return ret;
 
         /* algorithm initialization */
         sgn = 1;
@@ -447,7 +465,9 @@ static int tda18271_powerscan(struct dvb_frontend *fe,
                 tda18271_write_regs(fe, R_EP2, 1);
 
                 /* read power detection info, stored in EB10 */
-                tda18271_read_extended(fe);
+                ret = tda18271_read_extended(fe);
+                if (tda_fail(ret))
+                        return ret;
 
                 count += 200;
 
@@ -478,6 +498,7 @@ static int tda18271_powerscan_init(struct dvb_frontend *fe)
 {
         struct tda18271_priv *priv = fe->tuner_priv;
         unsigned char *regs = priv->tda18271_regs;
+        int ret;
 
         /* set standard to digital */
         regs[R_EP3]  &= ~0x1f; /* clear std bits */
@@ -489,10 +510,14 @@ static int tda18271_powerscan_init(struct dvb_frontend *fe)
         /* update IF output level & IF notch frequency */
         regs[R_EP4]  &= ~0x1c; /* clear if level bits */
 
-        tda18271_write_regs(fe, R_EP3, 2);
+        ret = tda18271_write_regs(fe, R_EP3, 2);
+        if (tda_fail(ret))
+                goto fail;
 
         regs[R_EB18] &= ~0x03; /* set agc1_gain to   6 dB */
-        tda18271_write_regs(fe, R_EB18, 1);
+        ret = tda18271_write_regs(fe, R_EB18, 1);
+        if (tda_fail(ret))
+                goto fail;
 
         regs[R_EB21] &= ~0x03; /* set agc2_gain to -15 dB */
 
@@ -500,9 +525,9 @@ static int tda18271_powerscan_init(struct dvb_frontend *fe)
         regs[R_EB23] |= 0x04; /* forcelp_fc2_en = 1 */
         regs[R_EB23] |= 0x02; /* lp_fc[2] = 1 */
 
-        tda18271_write_regs(fe, R_EB21, 3);
-
-        return 0;
+        ret = tda18271_write_regs(fe, R_EB21, 3);
+fail:
+        return ret;
 }
 
 static int tda18271_rf_tracking_filters_init(struct dvb_frontend *fe, u32 freq)
@@ -521,7 +546,7 @@ static int tda18271_rf_tracking_filters_init(struct dvb_frontend *fe, u32 freq)
 
         i = tda18271_lookup_rf_band(fe, &freq, NULL);
 
-        if (i < 0)
+        if (tda_fail(i))
                 return i;
 
         rf_default[RF1] = 1000 * map[i].rf1_def;
@@ -535,6 +560,8 @@ static int tda18271_rf_tracking_filters_init(struct dvb_frontend *fe, u32 freq)
 
                 /* look for optimized calibration frequency */
                 bcal = tda18271_powerscan(fe, &rf_default[rf], &rf_freq[rf]);
+                if (tda_fail(bcal))
+                        return bcal;
 
                 tda18271_calc_rf_cal(fe, &rf_freq[rf]);
                 prog_tab[rf] = regs[R_EB14];
@@ -575,22 +602,29 @@ static int tda18271_calc_rf_filter_curve(struct dvb_frontend *fe)
 {
         struct tda18271_priv *priv = fe->tuner_priv;
         unsigned int i;
+        int ret;
 
         tda_info("tda18271: performing RF tracking filter calibration\n");
 
         /* wait for die temperature stabilization */
         msleep(200);
 
-        tda18271_powerscan_init(fe);
+        ret = tda18271_powerscan_init(fe);
+        if (tda_fail(ret))
+                goto fail;
 
         /* rf band calibration */
-        for (i = 0; priv->rf_cal_state[i].rfmax != 0; i++)
+        for (i = 0; priv->rf_cal_state[i].rfmax != 0; i++) {
+                ret =
                 tda18271_rf_tracking_filters_init(fe, 1000 *
                                                   priv->rf_cal_state[i].rfmax);
+                if (tda_fail(ret))
+                        goto fail;
+        }
 
         priv->tm_rfcal = tda18271_read_thermometer(fe);
-
-        return 0;
+fail:
+        return ret;
 }
 
 /* ------------------------------------------------------------------ */
@@ -599,6 +633,7 @@ static int tda18271c2_rf_cal_init(struct dvb_frontend *fe)
 {
         struct tda18271_priv *priv = fe->tuner_priv;
         unsigned char *regs = priv->tda18271_regs;
+        int ret;
 
         /* test RF_CAL_OK to see if we need init */
         if ((regs[R_EP1] & 0x10) == 0)
@@ -607,15 +642,22 @@ static int tda18271c2_rf_cal_init(struct dvb_frontend *fe)
         if (priv->cal_initialized)
                 return 0;
 
-        tda18271_calc_rf_filter_curve(fe);
+        ret = tda18271_calc_rf_filter_curve(fe);
+        if (tda_fail(ret))
+                goto fail;
 
-        tda18271_por(fe);
+        ret = tda18271_por(fe);
+        if (tda_fail(ret))
+                goto fail;
 
         tda_info("tda18271: RF tracking filter calibration complete\n");
 
         priv->cal_initialized = true;
-
-        return 0;
+        goto end;
+fail:
+        tda_info("tda18271: RF tracking filter calibration failed!\n");
+end:
+        return ret;
 }
 
 static int tda18271c1_rf_tracking_filter_calibration(struct dvb_frontend *fe,
@@ -623,6 +665,7 @@ static int tda18271c1_rf_tracking_filter_calibration(struct dvb_frontend *fe,
 {
         struct tda18271_priv *priv = fe->tuner_priv;
         unsigned char *regs = priv->tda18271_regs;
+        int ret;
         u32 N = 0;
 
         /* calculate bp filter */
@@ -671,7 +714,10 @@ static int tda18271c1_rf_tracking_filter_calibration(struct dvb_frontend *fe,
 
         tda18271_calc_main_pll(fe, N);
 
-        tda18271_write_regs(fe, R_EP3, 11);
+        ret = tda18271_write_regs(fe, R_EP3, 11);
+        if (tda_fail(ret))
+                return ret;
+
         msleep(5); /* RF tracking filter calibration initialization */
 
         /* search for K,M,CO for RF calibration */
@@ -719,45 +765,56 @@ static int tda18271_ir_cal_init(struct dvb_frontend *fe)
 {
         struct tda18271_priv *priv = fe->tuner_priv;
         unsigned char *regs = priv->tda18271_regs;
+        int ret;
 
-        tda18271_read_regs(fe);
+        ret = tda18271_read_regs(fe);
+        if (tda_fail(ret))
+                goto fail;
 
         /* test IR_CAL_OK to see if we need init */
         if ((regs[R_EP1] & 0x08) == 0)
-                tda18271_init_regs(fe);
-
-        return 0;
+                ret = tda18271_init_regs(fe);
+fail:
+        return ret;
 }
 
 static int tda18271_init(struct dvb_frontend *fe)
 {
         struct tda18271_priv *priv = fe->tuner_priv;
+        int ret;
 
         mutex_lock(&priv->lock);
 
         /* power up */
-        tda18271_set_standby_mode(fe, 0, 0, 0);
+        ret = tda18271_set_standby_mode(fe, 0, 0, 0);
+        if (tda_fail(ret))
+                goto fail;
 
         /* initialization */
-        tda18271_ir_cal_init(fe);
+        ret = tda18271_ir_cal_init(fe);
+        if (tda_fail(ret))
+                goto fail;
 
         if (priv->id == TDA18271HDC2)
                 tda18271c2_rf_cal_init(fe);
-
+fail:
         mutex_unlock(&priv->lock);
 
-        return 0;
+        return ret;
 }
 
 static int tda18271_tune(struct dvb_frontend *fe,
                          struct tda18271_std_map_item *map, u32 freq, u32 bw)
 {
         struct tda18271_priv *priv = fe->tuner_priv;
+        int ret;
 
         tda_dbg("freq = %d, ifc = %d, bw = %d, agc_mode = %d, std = %d\n",
                 freq, map->if_freq, bw, map->agc_mode, map->std);
 
-        tda18271_init(fe);
+        ret = tda18271_init(fe);
+        if (tda_fail(ret))
+                goto fail;
 
         mutex_lock(&priv->lock);
 
@@ -769,11 +826,11 @@ static int tda18271_tune(struct dvb_frontend *fe,
                 tda18271c2_rf_tracking_filters_correction(fe, freq);
                 break;
         }
-        tda18271_channel_configuration(fe, map, freq, bw);
+        ret = tda18271_channel_configuration(fe, map, freq, bw);
 
         mutex_unlock(&priv->lock);
-
-        return 0;
+fail:
+        return ret;
 }
 
 /* ------------------------------------------------------------------ */
@@ -837,7 +894,7 @@ static int tda18271_set_params(struct dvb_frontend *fe,
 
         ret = tda18271_tune(fe, map, freq, bw);
 
-        if (ret < 0)
+        if (tda_fail(ret))
                 goto fail;
 
         priv->frequency = freq;
@@ -893,7 +950,7 @@ static int tda18271_set_analog_params(struct dvb_frontend *fe,
 
         ret = tda18271_tune(fe, map, freq, 0);
 
-        if (ret < 0)
+        if (tda_fail(ret))
                 goto fail;
 
         priv->frequency = freq;
@@ -905,16 +962,17 @@ fail:
 static int tda18271_sleep(struct dvb_frontend *fe)
 {
         struct tda18271_priv *priv = fe->tuner_priv;
+        int ret;
 
         mutex_lock(&priv->lock);
 
         /* standby mode w/ slave tuner output
          * & loop thru & xtal oscillator on */
-        tda18271_set_standby_mode(fe, 1, 0, 0);
+        ret = tda18271_set_standby_mode(fe, 1, 0, 0);
 
         mutex_unlock(&priv->lock);
 
-        return 0;
+        return ret;
 }
 
 static int tda18271_release(struct dvb_frontend *fe)
@@ -1095,10 +1153,10 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,
                 if (cfg)
                         priv->small_i2c = cfg->small_i2c;
 
-                if (tda18271_get_id(fe) < 0)
+                if (tda_fail(tda18271_get_id(fe)))
                         goto fail;
 
-                if (tda18271_assign_map_layout(fe) < 0)
+                if (tda_fail(tda18271_assign_map_layout(fe)))
                         goto fail;
 
                 mutex_lock(&priv->lock);
diff --git a/drivers/media/common/tuners/tda18271-priv.h b/drivers/media/common/tuners/tda18271-priv.h
index 2bc5eb368ea2..81a739365f8c 100644
--- a/drivers/media/common/tuners/tda18271-priv.h
+++ b/drivers/media/common/tuners/tda18271-priv.h
@@ -153,6 +153,15 @@ extern int tda18271_debug;
 #define tda_reg(fmt, arg...)  dprintk(KERN_DEBUG, DBG_REG,  fmt, ##arg)
 #define tda_cal(fmt, arg...)  dprintk(KERN_DEBUG, DBG_CAL,  fmt, ##arg)
 
+#define tda_fail(ret)                                                        \
+({                                                                           \
+        int __ret;                                                           \
+        __ret = (ret < 0);                                                   \
+        if (__ret)                                                           \
+                tda_printk(KERN_ERR, "error %d on line %d\n", ret, __LINE__);\
+        __ret;                                                               \
+})
+
 /*---------------------------------------------------------------------*/
 
 enum tda18271_map_type {
diff --git a/drivers/media/common/tuners/tea5767.c b/drivers/media/common/tuners/tea5767.c
index f6e7d7ad8424..1f5646334a8f 100644
--- a/drivers/media/common/tuners/tea5767.c
+++ b/drivers/media/common/tuners/tea5767.c
@@ -373,14 +373,14 @@ int tea5767_autodetection(struct i2c_adapter* i2c_adap, u8 i2c_addr)
 
         if ((rc = tuner_i2c_xfer_recv(&i2c, buffer, 7))< 5) {
                 printk(KERN_WARNING "It is not a TEA5767. Received %i bytes.\n", rc);
-                return EINVAL;
+                return -EINVAL;
         }
 
         /* If all bytes are the same then it's a TV tuner and not a tea5767 */
         if (buffer[0] == buffer[1] && buffer[0] == buffer[2] &&
             buffer[0] == buffer[3] && buffer[0] == buffer[4]) {
                 printk(KERN_WARNING "All bytes are equal. It is not a TEA5767\n");
-                return EINVAL;
+                return -EINVAL;
         }
 
         /*  Status bytes:
@@ -390,7 +390,7 @@ int tea5767_autodetection(struct i2c_adapter* i2c_adap, u8 i2c_addr)
          */
         if (((buffer[3] & 0x0f) != 0x00) || (buffer[4] != 0x00)) {
                 printk(KERN_WARNING "Chip ID is not zero. It is not a TEA5767\n");
-                return EINVAL;
+                return -EINVAL;
         }
 
 
diff --git a/drivers/media/common/tuners/xc5000.c b/drivers/media/common/tuners/xc5000.c
index 43d35bdb221f..ceae6db901ec 100644
--- a/drivers/media/common/tuners/xc5000.c
+++ b/drivers/media/common/tuners/xc5000.c
@@ -212,7 +212,7 @@ static void xc5000_TunerReset(struct dvb_frontend *fe)
         dprintk(1, "%s()\n", __func__);
 
         if (priv->cfg->tuner_callback) {
-                ret = priv->cfg->tuner_callback(priv->cfg->priv,
+                ret = priv->cfg->tuner_callback(priv->devptr,
                                                 XC5000_TUNER_RESET, 0);
                 if (ret)
                         printk(KERN_ERR "xc5000: reset failed\n");
@@ -900,9 +900,9 @@ static const struct dvb_tuner_ops xc5000_tuner_ops = {
         .get_status        = xc5000_get_status
 };
 
-struct dvb_frontend * xc5000_attach(struct dvb_frontend *fe,
-        struct i2c_adapter *i2c,
-        struct xc5000_config *cfg)
+struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe,
+                                   struct i2c_adapter *i2c,
+                                   struct xc5000_config *cfg, void *devptr)
 {
         struct xc5000_priv *priv = NULL;
         u16 id = 0;
@@ -916,6 +916,7 @@ struct dvb_frontend * xc5000_attach(struct dvb_frontend *fe,
         priv->cfg = cfg;
         priv->bandwidth = BANDWIDTH_6_MHZ;
         priv->i2c = i2c;
+        priv->devptr = devptr;
 
         /* Check if firmware has been loaded. It is possible that another
            instance of the driver has loaded the firmware.
diff --git a/drivers/media/common/tuners/xc5000.h b/drivers/media/common/tuners/xc5000.h
index 0ee80f9d19b8..c910715addc9 100644
--- a/drivers/media/common/tuners/xc5000.h
+++ b/drivers/media/common/tuners/xc5000.h
@@ -31,29 +31,31 @@ struct xc5000_config {
         u8   i2c_address;
         u32  if_khz;
 
-        /* For each bridge framework, when it attaches either analog or digital,
-         * it has to store a reference back to its _core equivalent structure,
-         * so that it can service the hardware by steering gpio's etc.
-         * Each bridge implementation is different so cast priv accordingly.
-         * The xc5000 driver cares not for this value, other than ensuring
-         * it's passed back to a bridge during tuner_callback().
-         */
-        void *priv;
         int  (*tuner_callback) (void *priv, int command, int arg);
 };
 
 /* xc5000 callback command */
 #define XC5000_TUNER_RESET              0
 
+/* For each bridge framework, when it attaches either analog or digital,
+ * it has to store a reference back to its _core equivalent structure,
+ * so that it can service the hardware by steering gpio's etc.
+ * Each bridge implementation is different so cast devptr accordingly.
+ * The xc5000 driver cares not for this value, other than ensuring
+ * it's passed back to a bridge during tuner_callback().
+ */
+
 #if defined(CONFIG_MEDIA_TUNER_XC5000) || \
     (defined(CONFIG_MEDIA_TUNER_XC5000_MODULE) && defined(MODULE))
 extern struct dvb_frontend* xc5000_attach(struct dvb_frontend *fe,
                                           struct i2c_adapter *i2c,
-                                          struct xc5000_config *cfg);
+                                          struct xc5000_config *cfg,
+                                          void *devptr);
 #else
 static inline struct dvb_frontend* xc5000_attach(struct dvb_frontend *fe,
                                                  struct i2c_adapter *i2c,
-                                                 struct xc5000_config *cfg)
+                                                 struct xc5000_config *cfg,
+                                                 void *devptr)
 {
         printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
         return NULL;
diff --git a/drivers/media/common/tuners/xc5000_priv.h b/drivers/media/common/tuners/xc5000_priv.h
index 13b2d19341da..ecebfe4745ad 100644
--- a/drivers/media/common/tuners/xc5000_priv.h
+++ b/drivers/media/common/tuners/xc5000_priv.h
@@ -31,6 +31,8 @@ struct xc5000_priv {
         u8  video_standard;
         u8  rf_mode;
         u8  fwloaded;
+
+        void *devptr;
 };
 
 #endif
diff --git a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
index 7b0ea3bdfafb..f9d087669d5d 100644
--- a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
+++ b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
@@ -634,7 +634,7 @@ int flexcop_frontend_init(struct flexcop_device *fc)
         }
 
         /* try the sky v2.3 (vp310/Samsung tbdu18132(tsa5059)) */
-        fc->fe = dvb_attach(vp310_mt312_attach,
+        fc->fe = dvb_attach(mt312_attach,
                 &skystar23_samsung_tbdu18132_config, i2c);
         if (fc->fe != NULL) {
                 ops = &fc->fe->ops;
diff --git a/drivers/media/dvb/bt8xx/Kconfig b/drivers/media/dvb/bt8xx/Kconfig
index d1239b8342f8..7588db1319d0 100644
--- a/drivers/media/dvb/bt8xx/Kconfig
+++ b/drivers/media/dvb/bt8xx/Kconfig
@@ -1,6 +1,7 @@
 config DVB_BT8XX
         tristate "BT8xx based PCI cards"
         depends on DVB_CORE && PCI && I2C && VIDEO_BT848
+        depends on HOTPLUG      # due to FW_LOADER
         select DVB_MT352 if !DVB_FE_CUSTOMISE
         select DVB_SP887X if !DVB_FE_CUSTOMISE
         select DVB_NXT6000 if !DVB_FE_CUSTOMISE
diff --git a/drivers/media/dvb/cinergyT2/Kconfig b/drivers/media/dvb/cinergyT2/Kconfig
index 3d778c5aba68..c03513b2ccae 100644
--- a/drivers/media/dvb/cinergyT2/Kconfig
+++ b/drivers/media/dvb/cinergyT2/Kconfig
@@ -1,6 +1,6 @@
 config DVB_CINERGYT2
         tristate "Terratec CinergyT2/qanu USB2 DVB-T receiver"
-        depends on DVB_CORE && USB
+        depends on DVB_CORE && USB && INPUT
         help
           Support for "TerraTec CinergyT2" USB2.0 Highspeed DVB Receivers
 
diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
index 8cbdb0ec67e2..588fbe105c27 100644
--- a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
+++ b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
@@ -910,15 +910,21 @@ static void dvb_ca_en50221_thread_update_delay(struct dvb_ca_private *ca)
         int curdelay = 100000000;
         int slot;
 
+        /* Beware of too high polling frequency, because one polling
+         * call might take several hundred milliseconds until timeout!
+         */
         for (slot = 0; slot < ca->slot_count; slot++) {
                 switch (ca->slot_info[slot].slot_state) {
                 default:
                 case DVB_CA_SLOTSTATE_NONE:
+                        delay = HZ * 60;  /* 60s */
+                        if (!(ca->flags & DVB_CA_EN50221_FLAG_IRQ_CAMCHANGE))
+                                delay = HZ * 5;  /* 5s */
+                        break;
                 case DVB_CA_SLOTSTATE_INVALID:
-                        delay = HZ * 60;
-                        if (!(ca->flags & DVB_CA_EN50221_FLAG_IRQ_CAMCHANGE)) {
-                                delay = HZ / 10;
-                        }
+                        delay = HZ * 60;  /* 60s */
+                        if (!(ca->flags & DVB_CA_EN50221_FLAG_IRQ_CAMCHANGE))
+                                delay = HZ / 10;  /* 100ms */
                         break;
 
                 case DVB_CA_SLOTSTATE_UNINITIALISED:
@@ -926,19 +932,17 @@ static void dvb_ca_en50221_thread_update_delay(struct dvb_ca_private *ca)
                 case DVB_CA_SLOTSTATE_VALIDATE:
                 case DVB_CA_SLOTSTATE_WAITFR:
                 case DVB_CA_SLOTSTATE_LINKINIT:
-                        delay = HZ / 10;
+                        delay = HZ / 10;  /* 100ms */
                         break;
 
                 case DVB_CA_SLOTSTATE_RUNNING:
-                        delay = HZ * 60;
-                        if (!(ca->flags & DVB_CA_EN50221_FLAG_IRQ_CAMCHANGE)) {
-                                delay = HZ / 10;
-                        }
+                        delay = HZ * 60;  /* 60s */
+                        if (!(ca->flags & DVB_CA_EN50221_FLAG_IRQ_CAMCHANGE))
+                                delay = HZ / 10;  /* 100ms */
                         if (ca->open) {
                                 if ((!ca->slot_info[slot].da_irq_supported) ||
-                                    (!(ca->flags & DVB_CA_EN50221_FLAG_IRQ_DA))) {
-                                        delay = HZ / 10;
-                                }
+                                    (!(ca->flags & DVB_CA_EN50221_FLAG_IRQ_DA)))
+                                        delay = HZ / 10;  /* 100ms */
                         }
                         break;
                 }
diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig
index 4c1cff9feb2e..cf4584e48b6d 100644
--- a/drivers/media/dvb/dvb-usb/Kconfig
+++ b/drivers/media/dvb/dvb-usb/Kconfig
@@ -1,6 +1,7 @@
 config DVB_USB
         tristate "Support for various USB DVB devices"
         depends on DVB_CORE && USB && I2C
+        depends on HOTPLUG      # due to FW_LOADER
         select FW_LOADER
         help
           By enabling this you will be able to choose the various supported
diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index 6d2384605927..c20553c4da1f 100644
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -30,7 +30,7 @@ config DVB_CX24123
           A DVB-S tuner module. Say Y when you want to support this frontend.
 
 config DVB_MT312
-        tristate "Zarlink VP310/MT312 based"
+        tristate "Zarlink VP310/MT312/ZL10313 based"
         depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
@@ -97,7 +97,7 @@ comment "DVB-T (terrestrial) frontends"
 
 config DVB_SP8870
         tristate "Spase sp8870 based"
-        depends on DVB_CORE && I2C
+        depends on DVB_CORE && I2C && HOTPLUG
         default m if DVB_FE_CUSTOMISE
         select FW_LOADER
         help
@@ -110,7 +110,7 @@ config DVB_SP8870
 
 config DVB_SP887X
         tristate "Spase sp887x based"
-        depends on DVB_CORE && I2C
+        depends on DVB_CORE && I2C && HOTPLUG
         default m if DVB_FE_CUSTOMISE
         select FW_LOADER
         help
@@ -144,7 +144,7 @@ config DVB_L64781
 
 config DVB_TDA1004X
         tristate "Philips TDA10045H/TDA10046H based"
-        depends on DVB_CORE && I2C
+        depends on DVB_CORE && I2C && HOTPLUG
         default m if DVB_FE_CUSTOMISE
         select FW_LOADER
         help
@@ -211,7 +211,7 @@ config DVB_DIB7000P
 
 config DVB_TDA10048
         tristate "Philips TDA10048HN based"
-        depends on DVB_CORE && I2C
+        depends on DVB_CORE && I2C && HOTPLUG
         default m if DVB_FE_CUSTOMISE
         select FW_LOADER
         help
@@ -253,7 +253,7 @@ comment "ATSC (North American/Korean Terrestrial/Cable DTV) frontends"
 
 config DVB_NXT200X
         tristate "NxtWave Communications NXT2002/NXT2004 based"
-        depends on DVB_CORE && I2C
+        depends on DVB_CORE && I2C && HOTPLUG
         default m if DVB_FE_CUSTOMISE
         select FW_LOADER
         help
@@ -268,7 +268,7 @@ config DVB_NXT200X
 
 config DVB_OR51211
         tristate "Oren OR51211 based"
-        depends on DVB_CORE && I2C
+        depends on DVB_CORE && I2C && HOTPLUG
         default m if DVB_FE_CUSTOMISE
         select FW_LOADER
         help
@@ -281,7 +281,7 @@ config DVB_OR51211
 
 config DVB_OR51132
         tristate "Oren OR51132 based"
-        depends on DVB_CORE && I2C
+        depends on DVB_CORE && I2C && HOTPLUG
         default m if DVB_FE_CUSTOMISE
         select FW_LOADER
         help
@@ -297,7 +297,7 @@ config DVB_OR51132
 
 config DVB_BCM3510
         tristate "Broadcom BCM3510"
-        depends on DVB_CORE && I2C
+        depends on DVB_CORE && I2C && HOTPLUG
         default m if DVB_FE_CUSTOMISE
         select FW_LOADER
         help
diff --git a/drivers/media/dvb/frontends/itd1000.c b/drivers/media/dvb/frontends/itd1000.c
index 04c562ccf990..600dad6b41ea 100644
--- a/drivers/media/dvb/frontends/itd1000.c
+++ b/drivers/media/dvb/frontends/itd1000.c
@@ -195,7 +195,7 @@ static void itd1000_set_vco(struct itd1000_state *state, u32 freq_khz)
         }
 }
 
-struct {
+static const struct {
         u32 freq;
         u8 values[10]; /* RFTR, RFST1 - RFST9 */
 } itd1000_fre_values[] = {
diff --git a/drivers/media/dvb/frontends/mt312.c b/drivers/media/dvb/frontends/mt312.c
index 081ca3398c76..5ac9b15920f8 100644
--- a/drivers/media/dvb/frontends/mt312.c
+++ b/drivers/media/dvb/frontends/mt312.c
@@ -737,7 +737,7 @@ static void mt312_release(struct dvb_frontend *fe)
 }
 
 #define MT312_SYS_CLK           90000000UL      /* 90 MHz */
-static struct dvb_frontend_ops vp310_mt312_ops = {
+static struct dvb_frontend_ops mt312_ops = {
 
         .info = {
                 .name = "Zarlink ???? DVB-S",
@@ -776,7 +776,7 @@ static struct dvb_frontend_ops vp310_mt312_ops = {
         .set_voltage = mt312_set_voltage,
 };
 
-struct dvb_frontend *vp310_mt312_attach(const struct mt312_config *config,
+struct dvb_frontend *mt312_attach(const struct mt312_config *config,
                                         struct i2c_adapter *i2c)
 {
         struct mt312_state *state = NULL;
@@ -795,7 +795,7 @@ struct dvb_frontend *vp310_mt312_attach(const struct mt312_config *config,
                 goto error;
 
         /* create dvb_frontend */
-        memcpy(&state->frontend.ops, &vp310_mt312_ops,
+        memcpy(&state->frontend.ops, &mt312_ops,
                 sizeof(struct dvb_frontend_ops));
         state->frontend.demodulator_priv = state;
 
@@ -827,12 +827,13 @@ error:
         kfree(state);
         return NULL;
 }
-EXPORT_SYMBOL(vp310_mt312_attach);
+EXPORT_SYMBOL(mt312_attach);
 
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
 
 MODULE_DESCRIPTION("Zarlink VP310/MT312/ZL10313 DVB-S Demodulator driver");
 MODULE_AUTHOR("Andreas Oberritter <obi@linuxtv.org>");
+MODULE_AUTHOR("Matthias Schwarzott <zzam@gentoo.org>");
 MODULE_LICENSE("GPL");
 
diff --git a/drivers/media/dvb/frontends/mt312.h b/drivers/media/dvb/frontends/mt312.h
index de796eab3911..29e3bb5496b8 100644
--- a/drivers/media/dvb/frontends/mt312.h
+++ b/drivers/media/dvb/frontends/mt312.h
@@ -37,10 +37,10 @@ struct mt312_config {
 };
 
 #if defined(CONFIG_DVB_MT312) || (defined(CONFIG_DVB_MT312_MODULE) && defined(MODULE))
-struct dvb_frontend *vp310_mt312_attach(const struct mt312_config *config,
+struct dvb_frontend *mt312_attach(const struct mt312_config *config,
                                         struct i2c_adapter *i2c);
 #else
-static inline struct dvb_frontend *vp310_mt312_attach(
+static inline struct dvb_frontend *mt312_attach(
         const struct mt312_config *config, struct i2c_adapter *i2c)
 {
         printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig
index ae882432dd3d..d4339b1b3b68 100644
--- a/drivers/media/dvb/ttpci/Kconfig
+++ b/drivers/media/dvb/ttpci/Kconfig
@@ -5,6 +5,7 @@ config TTPCI_EEPROM
 config DVB_AV7110
         tristate "AV7110 cards"
         depends on DVB_CORE && PCI && I2C
+        depends on HOTPLUG
         select FW_LOADER if !DVB_AV7110_FIRMWARE
         select TTPCI_EEPROM
         select VIDEO_SAA7146_VV
@@ -123,6 +124,7 @@ config DVB_BUDGET_AV
         depends on DVB_BUDGET_CORE && I2C
         select VIDEO_SAA7146_VV
         depends on VIDEO_DEV    # dependencies of VIDEO_SAA7146_VV
+        depends on HOTPLUG      # dependency of FW_LOADER
         select DVB_PLL if !DVB_FE_CUSTOMISE
         select DVB_STV0299 if !DVB_FE_CUSTOMISE
         select DVB_TDA1004X if !DVB_FE_CUSTOMISE
diff --git a/drivers/media/dvb/ttusb-dec/Kconfig b/drivers/media/dvb/ttusb-dec/Kconfig
index 83611012ef34..0712899e39a4 100644
--- a/drivers/media/dvb/ttusb-dec/Kconfig
+++ b/drivers/media/dvb/ttusb-dec/Kconfig
@@ -1,6 +1,7 @@
 config DVB_TTUSB_DEC
         tristate "Technotrend/Hauppauge USB DEC devices"
         depends on DVB_CORE && USB
+        depends on HOTPLUG      # due to FW_LOADER
         select FW_LOADER
         select CRC32
         help
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index fe743aa7f645..89d8d37838a3 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -44,6 +44,10 @@ config VIDEO_TVEEPROM
         tristate
         depends on I2C
 
+config VIDEO_TUNER
+        tristate
+        depends on MEDIA_TUNER
+
 #
 # Multimedia Video device configuration
 #
@@ -690,7 +694,7 @@ config VIDEO_MXB
         tristate "Siemens-Nixdorf 'Multimedia eXtension Board'"
         depends on PCI && VIDEO_V4L1 && I2C
         select VIDEO_SAA7146_VV
-        select MEDIA_TUNER
+        select VIDEO_TUNER
         select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO
         select VIDEO_TDA9840 if VIDEO_HELPER_CHIPS_AUTO
         select VIDEO_TEA6415C if VIDEO_HELPER_CHIPS_AUTO
@@ -906,7 +910,7 @@ config SOC_CAMERA
 
 config SOC_CAMERA_MT9M001
         tristate "mt9m001 support"
-        depends on SOC_CAMERA
+        depends on SOC_CAMERA && I2C
         select GPIO_PCA953X if MT9M001_PCA9536_SWITCH
         help
           This driver supports MT9M001 cameras from Micron, monochrome
@@ -921,7 +925,7 @@ config MT9M001_PCA9536_SWITCH
 
 config SOC_CAMERA_MT9V022
         tristate "mt9v022 support"
-        depends on SOC_CAMERA
+        depends on SOC_CAMERA && I2C
         select GPIO_PCA953X if MT9V022_PCA9536_SWITCH
         help
           This driver supports MT9V022 cameras from Micron
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index a352c6e31f0c..dff0d6abe917 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -84,7 +84,7 @@ obj-$(CONFIG_VIDEO_HEXIUM_GEMINI) += hexium_gemini.o
 obj-$(CONFIG_VIDEO_DPC) += dpc7146.o
 obj-$(CONFIG_TUNER_3036) += tuner-3036.o
 
-obj-$(CONFIG_MEDIA_TUNER) += tuner.o
+obj-$(CONFIG_VIDEO_TUNER) += tuner.o
 
 obj-$(CONFIG_VIDEOBUF_GEN) += videobuf-core.o
 obj-$(CONFIG_VIDEOBUF_DMA_SG) += videobuf-dma-sg.o
diff --git a/drivers/media/video/au0828/Kconfig b/drivers/media/video/au0828/Kconfig
index cab277fafa63..def10d086373 100644
--- a/drivers/media/video/au0828/Kconfig
+++ b/drivers/media/video/au0828/Kconfig
@@ -1,8 +1,9 @@
 
 config VIDEO_AU0828
         tristate "Auvitek AU0828 support"
-       depends on VIDEO_DEV && I2C && INPUT && DVB_CORE
+        depends on VIDEO_DEV && I2C && INPUT && DVB_CORE && USB
         select I2C_ALGOBIT
+        select VIDEO_TVEEPROM
         select DVB_AU8522 if !DVB_FE_CUSTOMIZE
         select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMIZE
         ---help---
diff --git a/drivers/media/video/au0828/au0828-dvb.c b/drivers/media/video/au0828/au0828-dvb.c
index 1371b4e4b5f1..c86a5f17eca8 100644
--- a/drivers/media/video/au0828/au0828-dvb.c
+++ b/drivers/media/video/au0828/au0828-dvb.c
@@ -337,12 +337,10 @@ int au0828_dvb_register(struct au0828_dev *dev)
                 dvb->frontend = dvb_attach(au8522_attach,
                                 &hauppauge_hvr950q_config,
                                 &dev->i2c_adap);
-                if (dvb->frontend != NULL) {
-                        hauppauge_hvr950q_tunerconfig.priv = dev;
+                if (dvb->frontend != NULL)
                         dvb_attach(xc5000_attach, dvb->frontend,
                                 &dev->i2c_adap,
-                                &hauppauge_hvr950q_tunerconfig);
-                }
+                                &hauppauge_hvr950q_tunerconfig, dev);
                 break;
         default:
                 printk(KERN_WARNING "The frontend of your DVB/ATSC card "
diff --git a/drivers/media/video/bt8xx/Kconfig b/drivers/media/video/bt8xx/Kconfig
index 7431ef6de9f1..24a34fc1f2b3 100644
--- a/drivers/media/video/bt8xx/Kconfig
+++ b/drivers/media/video/bt8xx/Kconfig
@@ -1,12 +1,13 @@
 config VIDEO_BT848
         tristate "BT848 Video For Linux"
         depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L2 && INPUT
+        depends on HOTPLUG      # due to FW_LOADER
         select I2C_ALGOBIT
         select FW_LOADER
         select VIDEO_BTCX
         select VIDEOBUF_DMA_SG
         select VIDEO_IR
-        select MEDIA_TUNER
+        select VIDEO_TUNER
         select VIDEO_TVEEPROM
         select VIDEO_MSP3400 if VIDEO_HELPER_CHIPS_AUTO
         select VIDEO_TVAUDIO if VIDEO_HELPER_CHIPS_AUTO
diff --git a/drivers/media/video/cx18/Kconfig b/drivers/media/video/cx18/Kconfig
index acc4b47f1d1d..5f942690570c 100644
--- a/drivers/media/video/cx18/Kconfig
+++ b/drivers/media/video/cx18/Kconfig
@@ -1,14 +1,17 @@
 config VIDEO_CX18
         tristate "Conexant cx23418 MPEG encoder support"
         depends on VIDEO_V4L2 && DVB_CORE && PCI && I2C && EXPERIMENTAL
+        depends on INPUT        # due to VIDEO_IR
+        depends on HOTPLUG      # due to FW_LOADER
         select I2C_ALGOBIT
         select FW_LOADER
         select VIDEO_IR
-        select MEDIA_TUNER
+        select VIDEO_TUNER
         select VIDEO_TVEEPROM
         select VIDEO_CX2341X
         select VIDEO_CS5345
         select DVB_S5H1409
+        select MEDIA_TUNER_MXL5005S
         ---help---
           This is a video4linux driver for Conexant cx23418 based
           PCI combo video recorder devices.
diff --git a/drivers/media/video/cx18/cx18-cards.c b/drivers/media/video/cx18/cx18-cards.c
index f5e3ba1f5354..553adbf2cd44 100644
--- a/drivers/media/video/cx18/cx18-cards.c
+++ b/drivers/media/video/cx18/cx18-cards.c
@@ -47,11 +47,12 @@ static struct cx18_card_tuner_i2c cx18_i2c_std = {
 static const struct cx18_card cx18_card_hvr1600_esmt = {
         .type = CX18_CARD_HVR_1600_ESMT,
         .name = "Hauppauge HVR-1600",
-        .comment = "DVB & VBI are not yet supported\n",
+        .comment = "VBI is not yet supported\n",
         .v4l2_capabilities = CX18_CAP_ENCODER,
         .hw_audio_ctrl = CX18_HW_CX23418,
         .hw_muxer = CX18_HW_CS5345,
-        .hw_all = CX18_HW_TVEEPROM | CX18_HW_TUNER | CX18_HW_CS5345,
+        .hw_all = CX18_HW_TVEEPROM | CX18_HW_TUNER |
+                  CX18_HW_CS5345 | CX18_HW_DVB,
         .video_inputs = {
                 { CX18_CARD_INPUT_VID_TUNER,  0, CX23418_COMPOSITE7 },
                 { CX18_CARD_INPUT_SVIDEO1,    1, CX23418_SVIDEO1    },
@@ -86,11 +87,12 @@ static const struct cx18_card cx18_card_hvr1600_esmt = {
 static const struct cx18_card cx18_card_hvr1600_samsung = {
         .type = CX18_CARD_HVR_1600_SAMSUNG,
         .name = "Hauppauge HVR-1600 (Preproduction)",
-        .comment = "DVB & VBI are not yet supported\n",
+        .comment = "VBI is not yet supported\n",
         .v4l2_capabilities = CX18_CAP_ENCODER,
         .hw_audio_ctrl = CX18_HW_CX23418,
         .hw_muxer = CX18_HW_CS5345,
-        .hw_all = CX18_HW_TVEEPROM | CX18_HW_TUNER | CX18_HW_CS5345,
+        .hw_all = CX18_HW_TVEEPROM | CX18_HW_TUNER |
+                  CX18_HW_CS5345 | CX18_HW_DVB,
         .video_inputs = {
                 { CX18_CARD_INPUT_VID_TUNER,  0, CX23418_COMPOSITE7 },
                 { CX18_CARD_INPUT_SVIDEO1,    1, CX23418_SVIDEO1    },
@@ -134,14 +136,15 @@ static const struct cx18_card_pci_info cx18_pci_h900[] = {
 static const struct cx18_card cx18_card_h900 = {
         .type = CX18_CARD_COMPRO_H900,
         .name = "Compro VideoMate H900",
-        .comment = "Not yet supported!\n",
-        .v4l2_capabilities = 0,
+        .comment = "DVB & VBI are not yet supported\n",
+        .v4l2_capabilities = CX18_CAP_ENCODER,
         .hw_audio_ctrl = CX18_HW_CX23418,
         .hw_all = CX18_HW_TUNER,
         .video_inputs = {
-                { CX18_CARD_INPUT_VID_TUNER,  0, CX23418_COMPOSITE7 },
-                { CX18_CARD_INPUT_SVIDEO1,    1, CX23418_SVIDEO1    },
-                { CX18_CARD_INPUT_COMPOSITE1, 1, CX23418_COMPOSITE3 },
+                { CX18_CARD_INPUT_VID_TUNER,  0, CX23418_COMPOSITE2 },
+                { CX18_CARD_INPUT_SVIDEO1,    1,
+                        CX23418_SVIDEO_LUMA3 | CX23418_SVIDEO_CHROMA4 },
+                { CX18_CARD_INPUT_COMPOSITE1, 1, CX23418_COMPOSITE1 },
         },
         .audio_inputs = {
                 { CX18_CARD_INPUT_AUD_TUNER,
@@ -163,6 +166,7 @@ static const struct cx18_card cx18_card_h900 = {
                 .tune_lane = 0,
                 .initial_emrs = 0,
         },
+        .xceive_pin = 15,
         .pci_list = cx18_pci_h900,
         .i2c = &cx18_i2c_std,
 };
@@ -200,8 +204,6 @@ static const struct cx18_card cx18_card_mpc718 = {
                 /* XC3028 tuner */
                 { .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 },
         },
-        /* tuner reset */
-        .gpio_init = { .direction = 0x1000, .initial_value = 0x1000 },
         .ddr = {
                 /* Probably Samsung K4D263238G-VC33 memory */
                 .chip_config = 0x003,
@@ -211,6 +213,7 @@ static const struct cx18_card cx18_card_mpc718 = {
                 .tune_lane = 0,
                 .initial_emrs = 2,
         },
+        .xceive_pin = 15,
         .pci_list = cx18_pci_mpc718,
         .i2c = &cx18_i2c_std,
 };
diff --git a/drivers/media/video/cx18/cx18-cards.h b/drivers/media/video/cx18/cx18-cards.h
index bca249bdd337..bccb67f0db16 100644
--- a/drivers/media/video/cx18/cx18-cards.h
+++ b/drivers/media/video/cx18/cx18-cards.h
@@ -114,8 +114,8 @@ struct cx18_card_pci_info {
 /* The mask is the set of bits used by the operation */
 
 struct cx18_gpio_init { /* set initial GPIO DIR and OUT values */
-        u16 direction;  /* DIR setting. Leave to 0 if no init is needed */
-        u16 initial_value;
+        u32 direction;  /* DIR setting. Leave to 0 if no init is needed */
+        u32 initial_value;
 };
 
 struct cx18_card_tuner {
@@ -153,6 +153,7 @@ struct cx18_card {
         struct cx18_card_audio_input radio_input;
 
         /* GPIO card-specific settings */
+        u8 xceive_pin;          /* XCeive tuner GPIO reset pin */
         struct cx18_gpio_init           gpio_init;
 
         struct cx18_card_tuner tuners[CX18_CARD_MAX_TUNERS];
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index 3f55d47bc4b9..0dd4e0529970 100644
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -164,16 +164,6 @@ MODULE_LICENSE("GPL");
 
 MODULE_VERSION(CX18_VERSION);
 
-int cx18_waitq(wait_queue_head_t *waitq)
-{
-        DEFINE_WAIT(wait);
-
-        prepare_to_wait(waitq, &wait, TASK_INTERRUPTIBLE);
-        schedule();
-        finish_wait(waitq, &wait);
-        return signal_pending(current) ? -EINTR : 0;
-}
-
 /* Generic utility functions */
 int cx18_msleep_timeout(unsigned int msecs, int intr)
 {
@@ -220,13 +210,13 @@ static void cx18_process_eeprom(struct cx18 *cx)
 
         /* Many thanks to Steven Toth from Hauppauge for providing the
            model numbers */
+        /* Note: the Samsung memory models cannot be reliably determined
+           from the model number. Use the cardtype module option if you
+           have one of these preproduction models. */
         switch (tv.model) {
-        case 74000 ... 74099:
+        case 74000 ... 74999:
                 cx->card = cx18_get_card(CX18_CARD_HVR_1600_ESMT);
                 break;
-        case 74700 ... 74799:
-                cx->card = cx18_get_card(CX18_CARD_HVR_1600_SAMSUNG);
-                break;
         case 0:
                 CX18_ERR("Invalid EEPROM\n");
                 return;
@@ -548,6 +538,7 @@ static int cx18_setup_pci(struct cx18 *cx, struct pci_dev *dev,
         return 0;
 }
 
+#ifdef MODULE
 static u32 cx18_request_module(struct cx18 *cx, u32 hw,
                 const char *name, u32 id)
 {
@@ -560,12 +551,14 @@ static u32 cx18_request_module(struct cx18 *cx, u32 hw,
         CX18_DEBUG_INFO("Loaded module %s\n", name);
         return hw;
 }
+#endif
 
 static void cx18_load_and_init_modules(struct cx18 *cx)
 {
         u32 hw = cx->card->hw_all;
         int i;
 
+#ifdef MODULE
         /* load modules */
 #ifndef CONFIG_MEDIA_TUNER
         hw = cx18_request_module(cx, hw, "tuner", CX18_HW_TUNER);
@@ -573,6 +566,7 @@ static void cx18_load_and_init_modules(struct cx18 *cx)
 #ifndef CONFIG_VIDEO_CS5345
         hw = cx18_request_module(cx, hw, "cs5345", CX18_HW_CS5345);
 #endif
+#endif
 
         /* check which i2c devices are actually found */
         for (i = 0; i < 32; i++) {
@@ -801,7 +795,7 @@ static int __devinit cx18_probe(struct pci_dev *dev,
         return 0;
 
 free_streams:
-        cx18_streams_cleanup(cx);
+        cx18_streams_cleanup(cx, 1);
 free_irq:
         free_irq(cx->dev->irq, (void *)cx);
 free_i2c:
@@ -904,14 +898,13 @@ static void cx18_remove(struct pci_dev *pci_dev)
 
         cx18_halt_firmware(cx);
 
-        cx18_streams_cleanup(cx);
+        cx18_streams_cleanup(cx, 1);
 
         exit_cx18_i2c(cx);
 
         free_irq(cx->dev->irq, (void *)cx);
 
-        if (cx->dev)
-                cx18_iounmap(cx);
+        cx18_iounmap(cx);
 
         release_mem_region(cx->base_addr, CX18_MEM_SIZE);
 
diff --git a/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h
index 2ee939193bb7..a2a6c58d12fe 100644
--- a/drivers/media/video/cx18/cx18-driver.h
+++ b/drivers/media/video/cx18/cx18-driver.h
@@ -444,9 +444,6 @@ extern spinlock_t cx18_cards_lock;
 /* Return non-zero if a signal is pending */
 int cx18_msleep_timeout(unsigned int msecs, int intr);
 
-/* Wait on queue, returns -EINTR if interrupted */
-int cx18_waitq(wait_queue_head_t *waitq);
-
 /* Read Hauppauge eeprom */
 struct tveeprom; /* forward reference */
 void cx18_read_eeprom(struct cx18 *cx, struct tveeprom *tv);
diff --git a/drivers/media/video/cx18/cx18-dvb.c b/drivers/media/video/cx18/cx18-dvb.c
index 65efe69d939a..c9744173f969 100644
--- a/drivers/media/video/cx18/cx18-dvb.c
+++ b/drivers/media/video/cx18/cx18-dvb.c
@@ -24,25 +24,27 @@
 #include "cx18-streams.h"
 #include "cx18-cards.h"
 #include "s5h1409.h"
-
-/* Wait until the MXL500X driver is merged */
-#ifdef HAVE_MXL500X
-#include "mxl500x.h"
-#endif
+#include "mxl5005s.h"
 
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
 #define CX18_REG_DMUX_NUM_PORT_0_CONTROL 0xd5a000
 
-#ifdef HAVE_MXL500X
-static struct mxl500x_config hauppauge_hvr1600_tuner = {
-        .delsys    = MXL500x_MODE_ATSC,
-        .octf      = MXL500x_OCTF_CH,
-        .xtal_freq = 16000000,
-        .iflo_freq = 5380000,
-        .ref_freq  = 322800000,
-        .rssi_ena  = MXL_RSSI_ENABLE,
-        .addr      = 0xC6 >> 1,
+static struct mxl5005s_config hauppauge_hvr1600_tuner = {
+        .i2c_address     = 0xC6 >> 1,
+        .if_freq         = IF_FREQ_5380000HZ,
+        .xtal_freq       = CRYSTAL_FREQ_16000000HZ,
+        .agc_mode        = MXL_SINGLE_AGC,
+        .tracking_filter = MXL_TF_C_H,
+        .rssi_enable     = MXL_RSSI_ENABLE,
+        .cap_select      = MXL_CAP_SEL_ENABLE,
+        .div_out         = MXL_DIV_OUT_4,
+        .clock_out       = MXL_CLOCK_OUT_DISABLE,
+        .output_load     = MXL5005S_IF_OUTPUT_LOAD_200_OHM,
+        .top             = MXL5005S_TOP_25P2,
+        .mod_mode        = MXL_DIGITAL_MODE,
+        .if_mode         = MXL_ZERO_IF,
+        .AgcMasterByte   = 0x00,
 };
 
 static struct s5h1409_config hauppauge_hvr1600_config = {
@@ -55,7 +57,6 @@ static struct s5h1409_config hauppauge_hvr1600_config = {
         .mpeg_timing   = S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK
 
 };
-#endif
 
 static int dvb_register(struct cx18_stream *stream);
 
@@ -252,21 +253,18 @@ static int dvb_register(struct cx18_stream *stream)
         int ret = 0;
 
         switch (cx->card->type) {
-/* Wait until the MXL500X driver is merged */
-#ifdef HAVE_MXL500X
         case CX18_CARD_HVR_1600_ESMT:
         case CX18_CARD_HVR_1600_SAMSUNG:
                 dvb->fe = dvb_attach(s5h1409_attach,
                         &hauppauge_hvr1600_config,
                         &cx->i2c_adap[0]);
                 if (dvb->fe != NULL) {
-                        dvb_attach(mxl500x_attach, dvb->fe,
-                                &hauppauge_hvr1600_tuner,
-                                &cx->i2c_adap[0]);
+                        dvb_attach(mxl5005s_attach, dvb->fe,
+                                &cx->i2c_adap[0],
+                                &hauppauge_hvr1600_tuner);
                         ret = 0;
                 }
                 break;
-#endif
         default:
                 /* No Digital Tv Support */
                 break;
diff --git a/drivers/media/video/cx18/cx18-fileops.c b/drivers/media/video/cx18/cx18-fileops.c
index 69303065a294..0b3141db174b 100644
--- a/drivers/media/video/cx18/cx18-fileops.c
+++ b/drivers/media/video/cx18/cx18-fileops.c
@@ -39,7 +39,7 @@
    associated VBI streams are also automatically claimed.
    Possible error returns: -EBUSY if someone else has claimed
    the stream or 0 on success. */
-int cx18_claim_stream(struct cx18_open_id *id, int type)
+static int cx18_claim_stream(struct cx18_open_id *id, int type)
 {
         struct cx18 *cx = id->cx;
         struct cx18_stream *s = &cx->streams[type];
@@ -87,7 +87,7 @@ int cx18_claim_stream(struct cx18_open_id *id, int type)
 
 /* This function releases a previously claimed stream. It will take into
    account associated VBI streams. */
-void cx18_release_stream(struct cx18_stream *s)
+static void cx18_release_stream(struct cx18_stream *s)
 {
         struct cx18 *cx = s->cx;
         struct cx18_stream *s_vbi;
@@ -662,6 +662,8 @@ int cx18_v4l2_open(struct inode *inode, struct file *filp)
         for (x = 0; cx == NULL && x < cx18_cards_active; x++) {
                 /* find out which stream this open was on */
                 for (y = 0; y < CX18_MAX_STREAMS; y++) {
+                        if (cx18_cards[x] == NULL)
+                                continue;
                         s = &cx18_cards[x]->streams[y];
                         if (s->v4l2dev && s->v4l2dev->minor == minor) {
                                 cx = cx18_cards[x];
diff --git a/drivers/media/video/cx18/cx18-fileops.h b/drivers/media/video/cx18/cx18-fileops.h
index 16cdafbd24c5..46da0282fc7d 100644
--- a/drivers/media/video/cx18/cx18-fileops.h
+++ b/drivers/media/video/cx18/cx18-fileops.h
@@ -34,12 +34,3 @@ void cx18_stop_capture(struct cx18_open_id *id, int gop_end);
 void cx18_mute(struct cx18 *cx);
 void cx18_unmute(struct cx18 *cx);
 
-/* Utilities */
-
-/* Try to claim a stream for the filehandle. Return 0 on success,
-   -EBUSY if stream already claimed. Once a stream is claimed, it
-   remains claimed until the associated filehandle is closed. */
-int cx18_claim_stream(struct cx18_open_id *id, int type);
-
-/* Release a previously claimed stream. */
-void cx18_release_stream(struct cx18_stream *s);
diff --git a/drivers/media/video/cx18/cx18-gpio.c b/drivers/media/video/cx18/cx18-gpio.c
index 19253e6b8673..bb8bc86086d0 100644
--- a/drivers/media/video/cx18/cx18-gpio.c
+++ b/drivers/media/video/cx18/cx18-gpio.c
@@ -35,6 +35,9 @@
 #define CX18_REG_GPIO_OUT2   0xc78104
 #define CX18_REG_GPIO_DIR2   0xc7810c
 
+static u32 gpio_dir;
+static u32 gpio_val;
+
 /*
  * HVR-1600 GPIO pins, courtesy of Hauppauge:
  *
@@ -44,31 +47,53 @@
  * gpio13: cs5345 reset pin
 */
 
+static void gpio_write(struct cx18 *cx)
+{
+        write_reg((gpio_dir & 0xffff) << 16, CX18_REG_GPIO_DIR1);
+        write_reg(((gpio_dir & 0xffff) << 16) | (gpio_val & 0xffff),
+                        CX18_REG_GPIO_OUT1);
+        write_reg(gpio_dir & 0xffff0000, CX18_REG_GPIO_DIR2);
+        write_reg((gpio_dir & 0xffff0000) | ((gpio_val & 0xffff0000) >> 16),
+                        CX18_REG_GPIO_OUT2);
+}
+
 void cx18_gpio_init(struct cx18 *cx)
 {
-        if (cx->card->gpio_init.direction == 0)
+        gpio_dir = cx->card->gpio_init.direction;
+        gpio_val = cx->card->gpio_init.initial_value;
+
+        if (gpio_dir == 0)
                 return;
 
-        CX18_DEBUG_INFO("GPIO initial dir: %08x out: %08x\n",
-                   read_reg(CX18_REG_GPIO_DIR1), read_reg(CX18_REG_GPIO_OUT1));
+        gpio_dir |= 1 << cx->card->xceive_pin;
+        gpio_val |= 1 << cx->card->xceive_pin;
 
-        /* init output data then direction */
-        write_reg(cx->card->gpio_init.direction << 16, CX18_REG_GPIO_DIR1);
-        write_reg(0, CX18_REG_GPIO_DIR2);
-        write_reg((cx->card->gpio_init.direction << 16) |
-                        cx->card->gpio_init.initial_value, CX18_REG_GPIO_OUT1);
-        write_reg(0, CX18_REG_GPIO_OUT2);
+        CX18_DEBUG_INFO("GPIO initial dir: %08x/%08x out: %08x/%08x\n",
+                   read_reg(CX18_REG_GPIO_DIR1), read_reg(CX18_REG_GPIO_DIR2),
+                   read_reg(CX18_REG_GPIO_OUT1), read_reg(CX18_REG_GPIO_OUT2));
+
+        gpio_write(cx);
 }
 
 /* Xceive tuner reset function */
 int cx18_reset_tuner_gpio(void *dev, int cmd, int value)
 {
         struct i2c_algo_bit_data *algo = dev;
-        struct cx18 *cx = algo->data;
-/*      int curdir, curout;*/
+        struct cx18_i2c_algo_callback_data *cb_data = algo->data;
+        struct cx18 *cx = cb_data->cx;
 
         if (cmd != XC2028_TUNER_RESET)
                 return 0;
         CX18_DEBUG_INFO("Resetting tuner\n");
+
+        gpio_dir |= 1 << cx->card->xceive_pin;
+        gpio_val &= ~(1 << cx->card->xceive_pin);
+
+        gpio_write(cx);
+        schedule_timeout_interruptible(msecs_to_jiffies(1));
+
+        gpio_val |= 1 << cx->card->xceive_pin;
+        gpio_write(cx);
+        schedule_timeout_interruptible(msecs_to_jiffies(1));
         return 0;
 }
diff --git a/drivers/media/video/cx18/cx18-i2c.c b/drivers/media/video/cx18/cx18-i2c.c
index 18c88d1e4833..4f08a4058d1a 100644
--- a/drivers/media/video/cx18/cx18-i2c.c
+++ b/drivers/media/video/cx18/cx18-i2c.c
@@ -25,6 +25,7 @@
 #include "cx18-cards.h"
 #include "cx18-gpio.h"
 #include "cx18-av-core.h"
+#include "cx18-i2c.h"
 
 #include <media/ir-kbd-i2c.h>
 
diff --git a/drivers/media/video/cx18/cx18-queue.c b/drivers/media/video/cx18/cx18-queue.c
index 65af1bb507ca..6990b77c6200 100644
--- a/drivers/media/video/cx18/cx18-queue.c
+++ b/drivers/media/video/cx18/cx18-queue.c
@@ -26,17 +26,6 @@
 #include "cx18-queue.h"
 #include "cx18-scb.h"
 
-int cx18_buf_copy_from_user(struct cx18_stream *s, struct cx18_buffer *buf,
-                const char __user *src, int copybytes)
-{
-        if (s->buf_size - buf->bytesused < copybytes)
-                copybytes = s->buf_size - buf->bytesused;
-        if (copy_from_user(buf->buf + buf->bytesused, src, copybytes))
-                return -EFAULT;
-        buf->bytesused += copybytes;
-        return copybytes;
-}
-
 void cx18_buf_swap(struct cx18_buffer *buf)
 {
         int i;
@@ -159,8 +148,9 @@ static void cx18_queue_move_buf(struct cx18_stream *s, struct cx18_queue *from,
    -ENOMEM is returned if the buffers could not be obtained, 0 if all
    buffers where obtained from the 'from' list and if non-zero then
    the number of stolen buffers is returned. */
-int cx18_queue_move(struct cx18_stream *s, struct cx18_queue *from,
-        struct cx18_queue *steal, struct cx18_queue *to, int needed_bytes)
+static int cx18_queue_move(struct cx18_stream *s, struct cx18_queue *from,
+                           struct cx18_queue *steal, struct cx18_queue *to,
+                           int needed_bytes)
 {
         unsigned long flags;
         int rc = 0;
@@ -239,12 +229,12 @@ int cx18_stream_alloc(struct cx18_stream *s)
 
         /* allocate stream buffers. Initially all buffers are in q_free. */
         for (i = 0; i < s->buffers; i++) {
-                struct cx18_buffer *buf =
-                        kzalloc(sizeof(struct cx18_buffer), GFP_KERNEL);
+                struct cx18_buffer *buf = kzalloc(sizeof(struct cx18_buffer),
+                                                GFP_KERNEL|__GFP_NOWARN);
 
                 if (buf == NULL)
                         break;
-                buf->buf = kmalloc(s->buf_size, GFP_KERNEL);
+                buf->buf = kmalloc(s->buf_size, GFP_KERNEL|__GFP_NOWARN);
                 if (buf->buf == NULL) {
                         kfree(buf);
                         break;
diff --git a/drivers/media/video/cx18/cx18-queue.h b/drivers/media/video/cx18/cx18-queue.h
index f86c8a6fa6e7..91423b9863a4 100644
--- a/drivers/media/video/cx18/cx18-queue.h
+++ b/drivers/media/video/cx18/cx18-queue.h
@@ -39,8 +39,6 @@ static inline void cx18_buf_sync_for_device(struct cx18_stream *s,
                                 s->buf_size, s->dma);
 }
 
-int cx18_buf_copy_from_user(struct cx18_stream *s, struct cx18_buffer *buf,
-        const char __user *src, int copybytes);
 void cx18_buf_swap(struct cx18_buffer *buf);
 
 /* cx18_queue utility functions */
@@ -48,8 +46,6 @@ void cx18_queue_init(struct cx18_queue *q);
 void cx18_enqueue(struct cx18_stream *s, struct cx18_buffer *buf,
         struct cx18_queue *q);
 struct cx18_buffer *cx18_dequeue(struct cx18_stream *s, struct cx18_queue *q);
-int cx18_queue_move(struct cx18_stream *s, struct cx18_queue *from,
-       struct cx18_queue *steal, struct cx18_queue *to, int needed_bytes);
 struct cx18_buffer *cx18_queue_find_buf(struct cx18_stream *s, u32 id,
         u32 bytesused);
 void cx18_flush_queues(struct cx18_stream *s);
diff --git a/drivers/media/video/cx18/cx18-streams.c b/drivers/media/video/cx18/cx18-streams.c
index afb141b2027a..4ca9d847f1b1 100644
--- a/drivers/media/video/cx18/cx18-streams.c
+++ b/drivers/media/video/cx18/cx18-streams.c
@@ -218,7 +218,7 @@ int cx18_streams_setup(struct cx18 *cx)
                 return 0;
 
         /* One or more streams could not be initialized. Clean 'em all up. */
-        cx18_streams_cleanup(cx);
+        cx18_streams_cleanup(cx, 0);
         return -ENOMEM;
 }
 
@@ -296,12 +296,12 @@ int cx18_streams_register(struct cx18 *cx)
                 return 0;
 
         /* One or more streams could not be initialized. Clean 'em all up. */
-        cx18_streams_cleanup(cx);
+        cx18_streams_cleanup(cx, 1);
         return -ENOMEM;
 }
 
 /* Unregister v4l2 devices */
-void cx18_streams_cleanup(struct cx18 *cx)
+void cx18_streams_cleanup(struct cx18 *cx, int unregister)
 {
         struct video_device *vdev;
         int type;
@@ -319,8 +319,11 @@ void cx18_streams_cleanup(struct cx18 *cx)
 
                 cx18_stream_free(&cx->streams[type]);
 
-                /* Unregister device */
-                video_unregister_device(vdev);
+                /* Unregister or release device */
+                if (unregister)
+                        video_unregister_device(vdev);
+                else
+                        video_device_release(vdev);
         }
 }
 
diff --git a/drivers/media/video/cx18/cx18-streams.h b/drivers/media/video/cx18/cx18-streams.h
index 8c7ba7d2fa79..f327e947b24f 100644
--- a/drivers/media/video/cx18/cx18-streams.h
+++ b/drivers/media/video/cx18/cx18-streams.h
@@ -24,7 +24,7 @@
 u32 cx18_find_handle(struct cx18 *cx);
 int cx18_streams_setup(struct cx18 *cx);
 int cx18_streams_register(struct cx18 *cx);
-void cx18_streams_cleanup(struct cx18 *cx);
+void cx18_streams_cleanup(struct cx18 *cx, int unregister);
 
 /* Capture related */
 int cx18_start_v4l2_encode_stream(struct cx18_stream *s);
diff --git a/drivers/media/video/cx23885/Kconfig b/drivers/media/video/cx23885/Kconfig
index cadf936c3673..7bf14c9a15c7 100644
--- a/drivers/media/video/cx23885/Kconfig
+++ b/drivers/media/video/cx23885/Kconfig
@@ -1,18 +1,20 @@
 config VIDEO_CX23885
         tristate "Conexant cx23885 (2388x successor) support"
         depends on DVB_CORE && VIDEO_DEV && PCI && I2C && INPUT
+        depends on HOTPLUG      # due to FW_LOADER
         select I2C_ALGOBIT
         select FW_LOADER
         select VIDEO_BTCX
-        select MEDIA_TUNER
+        select VIDEO_TUNER
         select VIDEO_TVEEPROM
         select VIDEO_IR
         select VIDEOBUF_DVB
         select VIDEO_CX25840
+        select VIDEO_CX2341X
+        select DVB_DIB7000P if !DVB_FE_CUSTOMISE
         select MEDIA_TUNER_MT2131 if !DVB_FE_CUSTOMISE
         select DVB_S5H1409 if !DVB_FE_CUSTOMISE
         select DVB_LGDT330X if !DVB_FE_CUSTOMISE
-        select DVB_PLL if !DVB_FE_CUSTOMISE
         select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMIZE
         select MEDIA_TUNER_TDA8290 if !DVB_FE_CUSTOMIZE
         select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMIZE
diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index 6ebf58724a01..20e05f230546 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -200,6 +200,10 @@ struct cx23885_subid cx23885_subids[] = {
                 .card      = CX23885_BOARD_HAUPPAUGE_HVR1200,
         }, {
                 .subvendor = 0x0070,
+                .subdevice = 0x71d3,
+                .card      = CX23885_BOARD_HAUPPAUGE_HVR1200,
+        }, {
+                .subvendor = 0x0070,
                 .subdevice = 0x8101,
                 .card      = CX23885_BOARD_HAUPPAUGE_HVR1700,
         }, {
@@ -245,6 +249,33 @@ static void hauppauge_eeprom(struct cx23885_dev *dev, u8 *eeprom_data)
         /* Make sure we support the board model */
         switch (tv.model)
         {
+        case 71009:
+                /* WinTV-HVR1200 (PCIe, Retail, full height)
+                 * DVB-T and basic analog */
+        case 71359:
+                /* WinTV-HVR1200 (PCIe, OEM, half height)
+                 * DVB-T and basic analog */
+        case 71439:
+                /* WinTV-HVR1200 (PCIe, OEM, half height)
+                 * DVB-T and basic analog */
+        case 71449:
+                /* WinTV-HVR1200 (PCIe, OEM, full height)
+                 * DVB-T and basic analog */
+        case 71939:
+                /* WinTV-HVR1200 (PCIe, OEM, half height)
+                 * DVB-T and basic analog */
+        case 71949:
+                /* WinTV-HVR1200 (PCIe, OEM, full height)
+                 * DVB-T and basic analog */
+        case 71959:
+                /* WinTV-HVR1200 (PCIe, OEM, full height)
+                 * DVB-T and basic analog */
+        case 71979:
+                /* WinTV-HVR1200 (PCIe, OEM, half height)
+                 * DVB-T and basic analog */
+        case 71999:
+                /* WinTV-HVR1200 (PCIe, OEM, full height)
+                 * DVB-T and basic analog */
         case 76601: /* WinTV-HVR1800lp (PCIe, Retail, No IR, Dual channel ATSC and MPEG2 HW Encoder */
         case 77001: /* WinTV-HVR1500 (Express Card, OEM, No IR, ATSC and Basic analog */
         case 77011: /* WinTV-HVR1500 (Express Card, Retail, No IR, ATSC and Basic analog */
@@ -263,8 +294,11 @@ static void hauppauge_eeprom(struct cx23885_dev *dev, u8 *eeprom_data)
         case 80019:
                 /* WinTV-HVR1400 (Express Card, Retail, IR,
                  * DVB-T and Basic analog */
+        case 81509:
+                /* WinTV-HVR1700 (PCIe, OEM, No IR, half height)
+                 * DVB-T and MPEG2 HW Encoder */
         case 81519:
-                /* WinTV-HVR1700 (PCIe, Retail, No IR, half height,
+                /* WinTV-HVR1700 (PCIe, OEM, No IR, full height)
                  * DVB-T and MPEG2 HW Encoder */
                 break;
         default:
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
index f05649727b60..022aa391937a 100644
--- a/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/drivers/media/video/cx23885/cx23885-dvb.c
@@ -37,7 +37,6 @@
 #include "lgdt330x.h"
 #include "xc5000.h"
 #include "tda10048.h"
-#include "dvb-pll.h"
 #include "tuner-xc2028.h"
 #include "tuner-simple.h"
 #include "dib7000p.h"
@@ -385,12 +384,10 @@ static int dvb_register(struct cx23885_tsport *port)
                 port->dvb.frontend = dvb_attach(s5h1409_attach,
                                                 &hauppauge_hvr1500q_config,
                                                 &dev->i2c_bus[0].i2c_adap);
-                if (port->dvb.frontend != NULL) {
-                        hauppauge_hvr1500q_tunerconfig.priv = i2c_bus;
+                if (port->dvb.frontend != NULL)
                         dvb_attach(xc5000_attach, port->dvb.frontend,
                                 &i2c_bus->i2c_adap,
-                                &hauppauge_hvr1500q_tunerconfig);
-                }
+                                &hauppauge_hvr1500q_tunerconfig, i2c_bus);
                 break;
         case CX23885_BOARD_HAUPPAUGE_HVR1500:
                 i2c_bus = &dev->i2c_bus[1];
diff --git a/drivers/media/video/cx25840/Kconfig b/drivers/media/video/cx25840/Kconfig
index 7cf29a03ed63..448f4cd0ce34 100644
--- a/drivers/media/video/cx25840/Kconfig
+++ b/drivers/media/video/cx25840/Kconfig
@@ -1,6 +1,7 @@
 config VIDEO_CX25840
         tristate "Conexant CX2584x audio/video decoders"
         depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
+        depends on HOTPLUG # due to FW_LOADER
         select FW_LOADER
         ---help---
           Support for the Conexant CX2584x audio/video decoders.
diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig
index b0d7d6a7a4cc..10e20d8196dc 100644
--- a/drivers/media/video/cx88/Kconfig
+++ b/drivers/media/video/cx88/Kconfig
@@ -2,10 +2,9 @@ config VIDEO_CX88
         tristate "Conexant 2388x (bt878 successor) support"
         depends on VIDEO_DEV && PCI && I2C && INPUT
         select I2C_ALGOBIT
-        select FW_LOADER
         select VIDEO_BTCX
         select VIDEOBUF_DMA_SG
-        select MEDIA_TUNER
+        select VIDEO_TUNER
         select VIDEO_TVEEPROM
         select VIDEO_IR
         select VIDEO_WM8775 if VIDEO_HELPER_CHIPS_AUTO
@@ -34,8 +33,9 @@ config VIDEO_CX88_ALSA
 
 config VIDEO_CX88_BLACKBIRD
         tristate "Blackbird MPEG encoder support (cx2388x + cx23416)"
-        depends on VIDEO_CX88
+        depends on VIDEO_CX88 && HOTPLUG
         select VIDEO_CX2341X
+        select FW_LOADER
         ---help---
           This adds support for MPEG encoder cards based on the
           Blackbird reference design, using the Conexant 2388x
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index 1c7fe6862a60..d96173ff1dba 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -509,9 +509,6 @@ static int attach_xc3028(u8 addr, struct cx8802_dev *dev)
         if (!fe) {
                 printk(KERN_ERR "%s/2: xc3028 attach failed\n",
                        dev->core->name);
-                dvb_frontend_detach(dev->dvb.frontend);
-                dvb_unregister_frontend(dev->dvb.frontend);
-                dev->dvb.frontend = NULL;
                 return -EINVAL;
         }
 
@@ -523,20 +520,23 @@ static int attach_xc3028(u8 addr, struct cx8802_dev *dev)
 
 static int dvb_register(struct cx8802_dev *dev)
 {
+        struct cx88_core *core = dev->core;
+
         /* init struct videobuf_dvb */
-        dev->dvb.name = dev->core->name;
+        dev->dvb.name = core->name;
         dev->ts_gen_cntrl = 0x0c;
 
         /* init frontend */
-        switch (dev->core->boardnr) {
+        switch (core->boardnr) {
         case CX88_BOARD_HAUPPAUGE_DVB_T1:
                 dev->dvb.frontend = dvb_attach(cx22702_attach,
                                                &connexant_refboard_config,
-                                               &dev->core->i2c_adap);
+                                               &core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
-                                   &dev->core->i2c_adap,
-                                   DVB_PLL_THOMSON_DTT759X);
+                        if (!dvb_attach(dvb_pll_attach, dev->dvb.frontend,
+                                        0x61, &core->i2c_adap,
+                                        DVB_PLL_THOMSON_DTT759X))
+                                goto frontend_detach;
                 }
                 break;
         case CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1:
@@ -545,11 +545,12 @@ static int dvb_register(struct cx8802_dev *dev)
         case CX88_BOARD_WINFAST_DTV1000:
                 dev->dvb.frontend = dvb_attach(cx22702_attach,
                                                &connexant_refboard_config,
-                                               &dev->core->i2c_adap);
+                                               &core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60,
-                                   &dev->core->i2c_adap,
-                                   DVB_PLL_THOMSON_DTT7579);
+                        if (!dvb_attach(dvb_pll_attach, dev->dvb.frontend,
+                                        0x60, &core->i2c_adap,
+                                        DVB_PLL_THOMSON_DTT7579))
+                                goto frontend_detach;
                 }
                 break;
         case CX88_BOARD_WINFAST_DTV2000H:
@@ -559,29 +560,32 @@ static int dvb_register(struct cx8802_dev *dev)
         case CX88_BOARD_HAUPPAUGE_HVR3000:
                 dev->dvb.frontend = dvb_attach(cx22702_attach,
                                                &hauppauge_hvr_config,
-                                               &dev->core->i2c_adap);
+                                               &core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        dvb_attach(simple_tuner_attach, dev->dvb.frontend,
-                                   &dev->core->i2c_adap, 0x61,
-                                   TUNER_PHILIPS_FMD1216ME_MK3);
+                        if (!dvb_attach(simple_tuner_attach, dev->dvb.frontend,
+                                   &core->i2c_adap, 0x61,
+                                   TUNER_PHILIPS_FMD1216ME_MK3))
+                                goto frontend_detach;
                 }
                 break;
         case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS:
                 dev->dvb.frontend = dvb_attach(mt352_attach,
                                                &dvico_fusionhdtv,
-                                               &dev->core->i2c_adap);
+                                               &core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60,
-                                   NULL, DVB_PLL_THOMSON_DTT7579);
+                        if (!dvb_attach(dvb_pll_attach, dev->dvb.frontend,
+                                        0x60, NULL, DVB_PLL_THOMSON_DTT7579))
+                                goto frontend_detach;
                         break;
                 }
                 /* ZL10353 replaces MT352 on later cards */
                 dev->dvb.frontend = dvb_attach(zl10353_attach,
                                                &dvico_fusionhdtv_plus_v1_1,
-                                               &dev->core->i2c_adap);
+                                               &core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60,
-                                   NULL, DVB_PLL_THOMSON_DTT7579);
+                        if (!dvb_attach(dvb_pll_attach, dev->dvb.frontend,
+                                        0x60, NULL, DVB_PLL_THOMSON_DTT7579))
+                                goto frontend_detach;
                 }
                 break;
         case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL:
@@ -589,28 +593,31 @@ static int dvb_register(struct cx8802_dev *dev)
                  * compatible, with a slightly different MT352 AGC gain. */
                 dev->dvb.frontend = dvb_attach(mt352_attach,
                                                &dvico_fusionhdtv_dual,
-                                               &dev->core->i2c_adap);
+                                               &core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
-                                   NULL, DVB_PLL_THOMSON_DTT7579);
+                        if (!dvb_attach(dvb_pll_attach, dev->dvb.frontend,
+                                        0x61, NULL, DVB_PLL_THOMSON_DTT7579))
+                                goto frontend_detach;
                         break;
                 }
                 /* ZL10353 replaces MT352 on later cards */
                 dev->dvb.frontend = dvb_attach(zl10353_attach,
                                                &dvico_fusionhdtv_plus_v1_1,
-                                               &dev->core->i2c_adap);
+                                               &core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
-                                   NULL, DVB_PLL_THOMSON_DTT7579);
+                        if (!dvb_attach(dvb_pll_attach, dev->dvb.frontend,
+                                        0x61, NULL, DVB_PLL_THOMSON_DTT7579))
+                                goto frontend_detach;
                 }
                 break;
         case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1:
                 dev->dvb.frontend = dvb_attach(mt352_attach,
                                                &dvico_fusionhdtv,
-                                               &dev->core->i2c_adap);
+                                               &core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
-                                   NULL, DVB_PLL_LG_Z201);
+                        if (!dvb_attach(dvb_pll_attach, dev->dvb.frontend,
+                                        0x61, NULL, DVB_PLL_LG_Z201))
+                                goto frontend_detach;
                 }
                 break;
         case CX88_BOARD_KWORLD_DVB_T:
@@ -618,10 +625,11 @@ static int dvb_register(struct cx8802_dev *dev)
         case CX88_BOARD_ADSTECH_DVB_T_PCI:
                 dev->dvb.frontend = dvb_attach(mt352_attach,
                                                &dntv_live_dvbt_config,
-                                               &dev->core->i2c_adap);
+                                               &core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
-                                   NULL, DVB_PLL_UNKNOWN_1);
+                        if (!dvb_attach(dvb_pll_attach, dev->dvb.frontend,
+                                        0x61, NULL, DVB_PLL_UNKNOWN_1))
+                                goto frontend_detach;
                 }
                 break;
         case CX88_BOARD_DNTV_LIVE_DVB_T_PRO:
@@ -630,32 +638,35 @@ static int dvb_register(struct cx8802_dev *dev)
                 dev->dvb.frontend = dvb_attach(mt352_attach, &dntv_live_dvbt_pro_config,
                                                &dev->vp3054->adap);
                 if (dev->dvb.frontend != NULL) {
-                        dvb_attach(simple_tuner_attach, dev->dvb.frontend,
-                                   &dev->core->i2c_adap, 0x61,
-                                   TUNER_PHILIPS_FMD1216ME_MK3);
+                        if (!dvb_attach(simple_tuner_attach, dev->dvb.frontend,
+                                        &core->i2c_adap, 0x61,
+                                        TUNER_PHILIPS_FMD1216ME_MK3))
+                                goto frontend_detach;
                 }
 #else
-                printk(KERN_ERR "%s/2: built without vp3054 support\n", dev->core->name);
+                printk(KERN_ERR "%s/2: built without vp3054 support\n",
+                                core->name);
 #endif
                 break;
         case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID:
                 dev->dvb.frontend = dvb_attach(zl10353_attach,
                                                &dvico_fusionhdtv_hybrid,
-                                               &dev->core->i2c_adap);
+                                               &core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        dvb_attach(simple_tuner_attach, dev->dvb.frontend,
-                                   &dev->core->i2c_adap, 0x61,
-                                   TUNER_THOMSON_FE6600);
+                        if (!dvb_attach(simple_tuner_attach, dev->dvb.frontend,
+                                   &core->i2c_adap, 0x61,
+                                   TUNER_THOMSON_FE6600))
+                                goto frontend_detach;
                 }
                 break;
         case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PRO:
                 dev->dvb.frontend = dvb_attach(zl10353_attach,
                                                &dvico_fusionhdtv_xc3028,
-                                               &dev->core->i2c_adap);
+                                               &core->i2c_adap);
                 if (dev->dvb.frontend == NULL)
                         dev->dvb.frontend = dvb_attach(mt352_attach,
                                                 &dvico_fusionhdtv_mt352_xc3028,
-                                                &dev->core->i2c_adap);
+                                                &core->i2c_adap);
                 /*
                  * On this board, the demod provides the I2C bus pullup.
                  * We must not permit gate_ctrl to be performed, or
@@ -668,19 +679,18 @@ static int dvb_register(struct cx8802_dev *dev)
                 break;
         case CX88_BOARD_PCHDTV_HD3000:
                 dev->dvb.frontend = dvb_attach(or51132_attach, &pchdtv_hd3000,
-                                               &dev->core->i2c_adap);
+                                               &core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        dvb_attach(simple_tuner_attach, dev->dvb.frontend,
-                                   &dev->core->i2c_adap, 0x61,
-                                   TUNER_THOMSON_DTT761X);
+                        if (!dvb_attach(simple_tuner_attach, dev->dvb.frontend,
+                                        &core->i2c_adap, 0x61,
+                                        TUNER_THOMSON_DTT761X))
+                                goto frontend_detach;
                 }
                 break;
         case CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q:
                 dev->ts_gen_cntrl = 0x08;
-                {
-                /* Do a hardware reset of chip before using it. */
-                struct cx88_core *core = dev->core;
 
+                /* Do a hardware reset of chip before using it. */
                 cx_clear(MO_GP0_IO, 1);
                 mdelay(100);
                 cx_set(MO_GP0_IO, 1);
@@ -690,139 +700,137 @@ static int dvb_register(struct cx8802_dev *dev)
                 fusionhdtv_3_gold.pll_rf_set = lgdt330x_pll_rf_set;
                 dev->dvb.frontend = dvb_attach(lgdt330x_attach,
                                                &fusionhdtv_3_gold,
-                                               &dev->core->i2c_adap);
+                                               &core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        dvb_attach(simple_tuner_attach, dev->dvb.frontend,
-                                   &dev->core->i2c_adap, 0x61,
-                                   TUNER_MICROTUNE_4042FI5);
-                }
+                        if (!dvb_attach(simple_tuner_attach, dev->dvb.frontend,
+                                        &core->i2c_adap, 0x61,
+                                        TUNER_MICROTUNE_4042FI5))
+                                goto frontend_detach;
                 }
                 break;
         case CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T:
                 dev->ts_gen_cntrl = 0x08;
-                {
-                /* Do a hardware reset of chip before using it. */
-                struct cx88_core *core = dev->core;
 
+                /* Do a hardware reset of chip before using it. */
                 cx_clear(MO_GP0_IO, 1);
                 mdelay(100);
                 cx_set(MO_GP0_IO, 9);
                 mdelay(200);
                 dev->dvb.frontend = dvb_attach(lgdt330x_attach,
                                                &fusionhdtv_3_gold,
-                                               &dev->core->i2c_adap);
+                                               &core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        dvb_attach(simple_tuner_attach, dev->dvb.frontend,
-                                   &dev->core->i2c_adap, 0x61,
-                                   TUNER_THOMSON_DTT761X);
-                }
+                        if (!dvb_attach(simple_tuner_attach, dev->dvb.frontend,
+                                        &core->i2c_adap, 0x61,
+                                        TUNER_THOMSON_DTT761X))
+                                goto frontend_detach;
                 }
                 break;
         case CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD:
                 dev->ts_gen_cntrl = 0x08;
-                {
-                /* Do a hardware reset of chip before using it. */
-                struct cx88_core *core = dev->core;
 
+                /* Do a hardware reset of chip before using it. */
                 cx_clear(MO_GP0_IO, 1);
                 mdelay(100);
                 cx_set(MO_GP0_IO, 1);
                 mdelay(200);
                 dev->dvb.frontend = dvb_attach(lgdt330x_attach,
                                                &fusionhdtv_5_gold,
-                                               &dev->core->i2c_adap);
+                                               &core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        dvb_attach(simple_tuner_attach, dev->dvb.frontend,
-                                   &dev->core->i2c_adap, 0x61,
-                                   TUNER_LG_TDVS_H06XF);
-                        dvb_attach(tda9887_attach, dev->dvb.frontend,
-                                   &dev->core->i2c_adap, 0x43);
-                }
+                        if (!dvb_attach(simple_tuner_attach, dev->dvb.frontend,
+                                        &core->i2c_adap, 0x61,
+                                        TUNER_LG_TDVS_H06XF))
+                                goto frontend_detach;
+                        if (!dvb_attach(tda9887_attach, dev->dvb.frontend,
+                                   &core->i2c_adap, 0x43))
+                                goto frontend_detach;
                 }
                 break;
         case CX88_BOARD_PCHDTV_HD5500:
                 dev->ts_gen_cntrl = 0x08;
-                {
-                /* Do a hardware reset of chip before using it. */
-                struct cx88_core *core = dev->core;
 
+                /* Do a hardware reset of chip before using it. */
                 cx_clear(MO_GP0_IO, 1);
                 mdelay(100);
                 cx_set(MO_GP0_IO, 1);
                 mdelay(200);
                 dev->dvb.frontend = dvb_attach(lgdt330x_attach,
                                                &pchdtv_hd5500,
-                                               &dev->core->i2c_adap);
+                                               &core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        dvb_attach(simple_tuner_attach, dev->dvb.frontend,
-                                   &dev->core->i2c_adap, 0x61,
-                                   TUNER_LG_TDVS_H06XF);
-                        dvb_attach(tda9887_attach, dev->dvb.frontend,
-                                   &dev->core->i2c_adap, 0x43);
-                }
+                        if (!dvb_attach(simple_tuner_attach, dev->dvb.frontend,
+                                        &core->i2c_adap, 0x61,
+                                        TUNER_LG_TDVS_H06XF))
+                                goto frontend_detach;
+                        if (!dvb_attach(tda9887_attach, dev->dvb.frontend,
+                                   &core->i2c_adap, 0x43))
+                                goto frontend_detach;
                 }
                 break;
         case CX88_BOARD_ATI_HDTVWONDER:
                 dev->dvb.frontend = dvb_attach(nxt200x_attach,
                                                &ati_hdtvwonder,
-                                               &dev->core->i2c_adap);
+                                               &core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        dvb_attach(simple_tuner_attach, dev->dvb.frontend,
-                                   &dev->core->i2c_adap, 0x61,
-                                   TUNER_PHILIPS_TUV1236D);
+                        if (!dvb_attach(simple_tuner_attach, dev->dvb.frontend,
+                                        &core->i2c_adap, 0x61,
+                                        TUNER_PHILIPS_TUV1236D))
+                                goto frontend_detach;
                 }
                 break;
         case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1:
         case CX88_BOARD_HAUPPAUGE_NOVASE2_S1:
                 dev->dvb.frontend = dvb_attach(cx24123_attach,
                                                &hauppauge_novas_config,
-                                               &dev->core->i2c_adap);
+                                               &core->i2c_adap);
                 if (dev->dvb.frontend) {
-                        dvb_attach(isl6421_attach, dev->dvb.frontend,
-                                   &dev->core->i2c_adap, 0x08, 0x00, 0x00);
+                        if (!dvb_attach(isl6421_attach, dev->dvb.frontend,
+                                        &core->i2c_adap, 0x08, 0x00, 0x00))
+                                goto frontend_detach;
                 }
                 break;
         case CX88_BOARD_KWORLD_DVBS_100:
                 dev->dvb.frontend = dvb_attach(cx24123_attach,
                                                &kworld_dvbs_100_config,
-                                               &dev->core->i2c_adap);
+                                               &core->i2c_adap);
                 if (dev->dvb.frontend) {
-                        dev->core->prev_set_voltage = dev->dvb.frontend->ops.set_voltage;
+                        core->prev_set_voltage = dev->dvb.frontend->ops.set_voltage;
                         dev->dvb.frontend->ops.set_voltage = kworld_dvbs_100_set_voltage;
                 }
                 break;
         case CX88_BOARD_GENIATECH_DVBS:
                 dev->dvb.frontend = dvb_attach(cx24123_attach,
                                                &geniatech_dvbs_config,
-                                               &dev->core->i2c_adap);
+                                               &core->i2c_adap);
                 if (dev->dvb.frontend) {
-                        dev->core->prev_set_voltage = dev->dvb.frontend->ops.set_voltage;
+                        core->prev_set_voltage = dev->dvb.frontend->ops.set_voltage;
                         dev->dvb.frontend->ops.set_voltage = geniatech_dvbs_set_voltage;
                 }
                 break;
         case CX88_BOARD_PINNACLE_PCTV_HD_800i:
                 dev->dvb.frontend = dvb_attach(s5h1409_attach,
                                                &pinnacle_pctv_hd_800i_config,
-                                               &dev->core->i2c_adap);
+                                               &core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
                         /* tuner_config.video_dev must point to
                          * i2c_adap.algo_data
                          */
-                        pinnacle_pctv_hd_800i_tuner_config.priv =
-                                                dev->core->i2c_adap.algo_data;
-                        dvb_attach(xc5000_attach, dev->dvb.frontend,
-                                   &dev->core->i2c_adap,
-                                   &pinnacle_pctv_hd_800i_tuner_config);
+                        if (!dvb_attach(xc5000_attach, dev->dvb.frontend,
+                                        &core->i2c_adap,
+                                        &pinnacle_pctv_hd_800i_tuner_config,
+                                        core->i2c_adap.algo_data))
+                                goto frontend_detach;
                 }
                 break;
         case CX88_BOARD_DVICO_FUSIONHDTV_5_PCI_NANO:
                 dev->dvb.frontend = dvb_attach(s5h1409_attach,
                                                 &dvico_hdtv5_pci_nano_config,
-                                                &dev->core->i2c_adap);
+                                                &core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
                         struct dvb_frontend *fe;
                         struct xc2028_config cfg = {
-                                .i2c_adap  = &dev->core->i2c_adap,
+                                .i2c_adap  = &core->i2c_adap,
                                 .i2c_addr  = 0x61,
                                 .callback  = cx88_pci_nano_callback,
                         };
@@ -841,50 +849,50 @@ static int dvb_register(struct cx8802_dev *dev)
          case CX88_BOARD_PINNACLE_HYBRID_PCTV:
                 dev->dvb.frontend = dvb_attach(zl10353_attach,
                                                &cx88_geniatech_x8000_mt,
-                                               &dev->core->i2c_adap);
+                                               &core->i2c_adap);
                 if (attach_xc3028(0x61, dev) < 0)
-                        return -EINVAL;
+                        goto frontend_detach;
                 break;
          case CX88_BOARD_GENIATECH_X8000_MT:
                 dev->ts_gen_cntrl = 0x00;
 
                 dev->dvb.frontend = dvb_attach(zl10353_attach,
                                                &cx88_geniatech_x8000_mt,
-                                               &dev->core->i2c_adap);
+                                               &core->i2c_adap);
                 if (attach_xc3028(0x61, dev) < 0)
-                        return -EINVAL;
+                        goto frontend_detach;
                 break;
          case CX88_BOARD_KWORLD_ATSC_120:
                 dev->dvb.frontend = dvb_attach(s5h1409_attach,
                                                &kworld_atsc_120_config,
-                                               &dev->core->i2c_adap);
+                                               &core->i2c_adap);
                 if (attach_xc3028(0x61, dev) < 0)
-                        return -EINVAL;
+                        goto frontend_detach;
                 break;
         case CX88_BOARD_DVICO_FUSIONHDTV_7_GOLD:
                 dev->dvb.frontend = dvb_attach(s5h1411_attach,
                                                &dvico_fusionhdtv7_config,
-                                               &dev->core->i2c_adap);
+                                               &core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
                         /* tuner_config.video_dev must point to
                          * i2c_adap.algo_data
                          */
-                        dvico_fusionhdtv7_tuner_config.priv =
-                                                dev->core->i2c_adap.algo_data;
-                        dvb_attach(xc5000_attach, dev->dvb.frontend,
-                                   &dev->core->i2c_adap,
-                                   &dvico_fusionhdtv7_tuner_config);
+                        if (!dvb_attach(xc5000_attach, dev->dvb.frontend,
+                                        &core->i2c_adap,
+                                        &dvico_fusionhdtv7_tuner_config,
+                                        core->i2c_adap.algo_data))
+                                goto frontend_detach;
                 }
                 break;
         default:
                 printk(KERN_ERR "%s/2: The frontend of your DVB/ATSC card isn't supported yet\n",
-                       dev->core->name);
+                       core->name);
                 break;
         }
         if (NULL == dev->dvb.frontend) {
                 printk(KERN_ERR
                        "%s/2: frontend initialization failed\n",
-                       dev->core->name);
+                       core->name);
                 return -EINVAL;
         }
 
@@ -892,11 +900,18 @@ static int dvb_register(struct cx8802_dev *dev)
         dev->dvb.frontend->ops.ts_bus_ctrl = cx88_dvb_bus_ctrl;
 
         /* Put the analog decoder in standby to keep it quiet */
-        cx88_call_i2c_clients (dev->core, TUNER_SET_STANDBY, NULL);
+        cx88_call_i2c_clients(core, TUNER_SET_STANDBY, NULL);
 
         /* register everything */
         return videobuf_dvb_register(&dev->dvb, THIS_MODULE, dev,
                                      &dev->pci->dev, adapter_nr);
+
+frontend_detach:
+        if (dev->dvb.frontend) {
+                dvb_frontend_detach(dev->dvb.frontend);
+                dev->dvb.frontend = NULL;
+        }
+        return -EINVAL;
 }
 
 /* ----------------------------------------------------------- */
diff --git a/drivers/media/video/em28xx/Kconfig b/drivers/media/video/em28xx/Kconfig
index c7c2896bbd8b..16a5af30e9d1 100644
--- a/drivers/media/video/em28xx/Kconfig
+++ b/drivers/media/video/em28xx/Kconfig
@@ -1,7 +1,7 @@
 config VIDEO_EM28XX
         tristate "Empia EM28xx USB video capture support"
         depends on VIDEO_DEV && I2C && INPUT
-        select MEDIA_TUNER
+        select VIDEO_TUNER
         select VIDEO_TVEEPROM
         select VIDEO_IR
         select VIDEOBUF_VMALLOC
@@ -35,7 +35,6 @@ config VIDEO_EM28XX_DVB
         select DVB_LGDT330X if !DVB_FE_CUSTOMISE
         select DVB_ZL10353 if !DVB_FE_CUSTOMISE
         select VIDEOBUF_DVB
-        select FW_LOADER
         ---help---
           This adds support for DVB cards based on the
           Empiatech em28xx chips.
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 50ccf3771204..3e4f3c7e92e7 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -420,7 +420,13 @@ struct usb_device_id em28xx_id_table [] = {
                         .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900 },
         { USB_DEVICE(0x2040, 0x6502),
                         .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900 },
-        { USB_DEVICE(0x2040, 0x6513),
+        { USB_DEVICE(0x2040, 0x6513), /* HCW HVR-980 */
+                        .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950 },
+        { USB_DEVICE(0x2040, 0x6517), /* HP  HVR-950 */
+                        .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950 },
+        { USB_DEVICE(0x2040, 0x651b), /* RP  HVR-950 */
+                        .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950 },
+        { USB_DEVICE(0x2040, 0x651f), /* HCW HVR-850 */
                         .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950 },
         { USB_DEVICE(0x0ccd, 0x0042),
                         .driver_info = EM2880_BOARD_TERRATEC_HYBRID_XS },
diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c
index 7df81575b7f2..8cf4983f0039 100644
--- a/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/drivers/media/video/em28xx/em28xx-dvb.c
@@ -251,7 +251,6 @@ static int attach_xc3028(u8 addr, struct em28xx *dev)
                 printk(KERN_ERR "%s/2: xc3028 attach failed\n",
                        dev->name);
                 dvb_frontend_detach(dev->dvb->frontend);
-                dvb_unregister_frontend(dev->dvb->frontend);
                 dev->dvb->frontend = NULL;
                 return -EINVAL;
         }
diff --git a/drivers/media/video/ivtv/Kconfig b/drivers/media/video/ivtv/Kconfig
index eec115bf9517..5d7ee8fcdd50 100644
--- a/drivers/media/video/ivtv/Kconfig
+++ b/drivers/media/video/ivtv/Kconfig
@@ -1,10 +1,12 @@
 config VIDEO_IVTV
         tristate "Conexant cx23416/cx23415 MPEG encoder/decoder support"
         depends on VIDEO_V4L1 && VIDEO_V4L2 && PCI && I2C && EXPERIMENTAL
+        depends on INPUT   # due to VIDEO_IR
+        depends on HOTPLUG # due to FW_LOADER
         select I2C_ALGOBIT
         select FW_LOADER
         select VIDEO_IR
-        select MEDIA_TUNER
+        select VIDEO_TUNER
         select VIDEO_TVEEPROM
         select VIDEO_CX2341X
         select VIDEO_CX25840
diff --git a/drivers/media/video/ivtv/ivtv-controls.c b/drivers/media/video/ivtv/ivtv-controls.c
index 8c02fa661591..c7e449f6397b 100644
--- a/drivers/media/video/ivtv/ivtv-controls.c
+++ b/drivers/media/video/ivtv/ivtv-controls.c
@@ -181,12 +181,12 @@ static int ivtv_setup_vbi_fmt(struct ivtv *itv, enum v4l2_mpeg_stream_vbi_fmt fm
                 return 0;
         }
         /* Need sliced data for mpeg insertion */
-        if (get_service_set(itv->vbi.sliced_in) == 0) {
+        if (ivtv_get_service_set(itv->vbi.sliced_in) == 0) {
                 if (itv->is_60hz)
                         itv->vbi.sliced_in->service_set = V4L2_SLICED_CAPTION_525;
                 else
                         itv->vbi.sliced_in->service_set = V4L2_SLICED_WSS_625;
-                expand_service_set(itv->vbi.sliced_in, itv->is_50hz);
+                ivtv_expand_service_set(itv->vbi.sliced_in, itv->is_50hz);
         }
         return 0;
 }
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index ed020f722b05..797e636771da 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -853,6 +853,7 @@ static int ivtv_setup_pci(struct ivtv *itv, struct pci_dev *dev,
         return 0;
 }
 
+#ifdef MODULE
 static u32 ivtv_request_module(struct ivtv *itv, u32 hw,
                 const char *name, u32 id)
 {
@@ -865,12 +866,14 @@ static u32 ivtv_request_module(struct ivtv *itv, u32 hw,
         IVTV_DEBUG_INFO("Loaded module %s\n", name);
         return hw;
 }
+#endif
 
 static void ivtv_load_and_init_modules(struct ivtv *itv)
 {
         u32 hw = itv->card->hw_all;
         unsigned i;
 
+#ifdef MODULE
         /* load modules */
 #ifndef CONFIG_MEDIA_TUNER
         hw = ivtv_request_module(itv, hw, "tuner", IVTV_HW_TUNER);
@@ -911,6 +914,7 @@ static void ivtv_load_and_init_modules(struct ivtv *itv)
 #ifndef CONFIG_VIDEO_M52790
         hw = ivtv_request_module(itv, hw, "m52790", IVTV_HW_M52790);
 #endif
+#endif
 
         /* check which i2c devices are actually found */
         for (i = 0; i < 32; i++) {
@@ -1228,7 +1232,7 @@ static int __devinit ivtv_probe(struct pci_dev *dev,
         return 0;
 
 free_streams:
-        ivtv_streams_cleanup(itv);
+        ivtv_streams_cleanup(itv, 1);
 free_irq:
         free_irq(itv->dev->irq, (void *)itv);
 free_i2c:
@@ -1373,7 +1377,7 @@ static void ivtv_remove(struct pci_dev *pci_dev)
         flush_workqueue(itv->irq_work_queues);
         destroy_workqueue(itv->irq_work_queues);
 
-        ivtv_streams_cleanup(itv);
+        ivtv_streams_cleanup(itv, 1);
         ivtv_udma_free(itv);
 
         exit_ivtv_i2c(itv);
diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c
index 2b74b0ab1477..f2fa434b677b 100644
--- a/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/drivers/media/video/ivtv/ivtv-fileops.c
@@ -987,6 +987,8 @@ int ivtv_v4l2_open(struct inode *inode, struct file *filp)
         /* Find which card this open was on */
         spin_lock(&ivtv_cards_lock);
         for (x = 0; itv == NULL && x < ivtv_cards_active; x++) {
+                if (ivtv_cards[x] == NULL)
+                        continue;
                 /* find out which stream this open was on */
                 for (y = 0; y < IVTV_MAX_STREAMS; y++) {
                         s = &ivtv_cards[x]->streams[y];
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c
index d508b5d0538c..26cc0f6699fd 100644
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -38,7 +38,7 @@
 #include <linux/dvb/audio.h>
 #include <linux/i2c-id.h>
 
-u16 service2vbi(int type)
+u16 ivtv_service2vbi(int type)
 {
         switch (type) {
                 case V4L2_SLICED_TELETEXT_B:
@@ -88,7 +88,7 @@ static u16 select_service_from_set(int field, int line, u16 set, int is_pal)
         return 0;
 }
 
-void expand_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal)
+void ivtv_expand_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal)
 {
         u16 set = fmt->service_set;
         int f, l;
@@ -115,7 +115,7 @@ static int check_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal)
         return set != 0;
 }
 
-u16 get_service_set(struct v4l2_sliced_vbi_format *fmt)
+u16 ivtv_get_service_set(struct v4l2_sliced_vbi_format *fmt)
 {
         int f, l;
         u16 set = 0;
@@ -466,7 +466,7 @@ static int ivtv_get_fmt(struct ivtv *itv, int streamtype, struct v4l2_format *fm
                         vbifmt->service_lines[0][23] = V4L2_SLICED_WSS_625;
                         vbifmt->service_lines[0][16] = V4L2_SLICED_VPS;
                 }
-                vbifmt->service_set = get_service_set(vbifmt);
+                vbifmt->service_set = ivtv_get_service_set(vbifmt);
                 break;
         }
 
@@ -481,12 +481,12 @@ static int ivtv_get_fmt(struct ivtv *itv, int streamtype, struct v4l2_format *fm
                 if (streamtype == IVTV_DEC_STREAM_TYPE_VBI) {
                         vbifmt->service_set = itv->is_50hz ? V4L2_SLICED_VBI_625 :
                                                  V4L2_SLICED_VBI_525;
-                        expand_service_set(vbifmt, itv->is_50hz);
+                        ivtv_expand_service_set(vbifmt, itv->is_50hz);
                         break;
                 }
 
                 itv->video_dec_func(itv, VIDIOC_G_FMT, fmt);
-                vbifmt->service_set = get_service_set(vbifmt);
+                vbifmt->service_set = ivtv_get_service_set(vbifmt);
                 break;
         }
         case V4L2_BUF_TYPE_VBI_OUTPUT:
@@ -640,9 +640,9 @@ static int ivtv_try_or_set_fmt(struct ivtv *itv, int streamtype,
         memset(vbifmt->reserved, 0, sizeof(vbifmt->reserved));
 
         if (vbifmt->service_set)
-                expand_service_set(vbifmt, itv->is_50hz);
+                ivtv_expand_service_set(vbifmt, itv->is_50hz);
         set = check_service_set(vbifmt, itv->is_50hz);
-        vbifmt->service_set = get_service_set(vbifmt);
+        vbifmt->service_set = ivtv_get_service_set(vbifmt);
 
         if (!set_fmt)
                 return 0;
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.h b/drivers/media/video/ivtv/ivtv-ioctl.h
index a03351b6853d..4e67f0ed1fc0 100644
--- a/drivers/media/video/ivtv/ivtv-ioctl.h
+++ b/drivers/media/video/ivtv/ivtv-ioctl.h
@@ -21,9 +21,9 @@
 #ifndef IVTV_IOCTL_H
 #define IVTV_IOCTL_H
 
-u16 service2vbi(int type);
-void expand_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal);
-u16 get_service_set(struct v4l2_sliced_vbi_format *fmt);
+u16 ivtv_service2vbi(int type);
+void ivtv_expand_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal);
+u16 ivtv_get_service_set(struct v4l2_sliced_vbi_format *fmt);
 int ivtv_v4l2_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
                     unsigned long arg);
 int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void *arg);
diff --git a/drivers/media/video/ivtv/ivtv-queue.c b/drivers/media/video/ivtv/ivtv-queue.c
index 3e1deec67a5e..fc8b1eaa333b 100644
--- a/drivers/media/video/ivtv/ivtv-queue.c
+++ b/drivers/media/video/ivtv/ivtv-queue.c
@@ -203,14 +203,14 @@ int ivtv_stream_alloc(struct ivtv_stream *s)
                 s->dma != PCI_DMA_NONE ? "DMA " : "",
                 s->name, s->buffers, s->buf_size, s->buffers * s->buf_size / 1024);
 
-        s->sg_pending = kzalloc(SGsize, GFP_KERNEL);
+        s->sg_pending = kzalloc(SGsize, GFP_KERNEL|__GFP_NOWARN);
         if (s->sg_pending == NULL) {
                 IVTV_ERR("Could not allocate sg_pending for %s stream\n", s->name);
                 return -ENOMEM;
         }
         s->sg_pending_size = 0;
 
-        s->sg_processing = kzalloc(SGsize, GFP_KERNEL);
+        s->sg_processing = kzalloc(SGsize, GFP_KERNEL|__GFP_NOWARN);
         if (s->sg_processing == NULL) {
                 IVTV_ERR("Could not allocate sg_processing for %s stream\n", s->name);
                 kfree(s->sg_pending);
@@ -219,7 +219,8 @@ int ivtv_stream_alloc(struct ivtv_stream *s)
         }
         s->sg_processing_size = 0;
 
-        s->sg_dma = kzalloc(sizeof(struct ivtv_sg_element), GFP_KERNEL);
+        s->sg_dma = kzalloc(sizeof(struct ivtv_sg_element),
+                                        GFP_KERNEL|__GFP_NOWARN);
         if (s->sg_dma == NULL) {
                 IVTV_ERR("Could not allocate sg_dma for %s stream\n", s->name);
                 kfree(s->sg_pending);
@@ -235,11 +236,12 @@ int ivtv_stream_alloc(struct ivtv_stream *s)
 
         /* allocate stream buffers. Initially all buffers are in q_free. */
         for (i = 0; i < s->buffers; i++) {
-                struct ivtv_buffer *buf = kzalloc(sizeof(struct ivtv_buffer), GFP_KERNEL);
+                struct ivtv_buffer *buf = kzalloc(sizeof(struct ivtv_buffer),
+                                                GFP_KERNEL|__GFP_NOWARN);
 
                 if (buf == NULL)
                         break;
-                buf->buf = kmalloc(s->buf_size + 256, GFP_KERNEL);
+                buf->buf = kmalloc(s->buf_size + 256, GFP_KERNEL|__GFP_NOWARN);
                 if (buf->buf == NULL) {
                         kfree(buf);
                         break;
diff --git a/drivers/media/video/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c
index 4ab8d36831ba..c47c2b945147 100644
--- a/drivers/media/video/ivtv/ivtv-streams.c
+++ b/drivers/media/video/ivtv/ivtv-streams.c
@@ -244,7 +244,7 @@ int ivtv_streams_setup(struct ivtv *itv)
                 return 0;
 
         /* One or more streams could not be initialized. Clean 'em all up. */
-        ivtv_streams_cleanup(itv);
+        ivtv_streams_cleanup(itv, 0);
         return -ENOMEM;
 }
 
@@ -304,12 +304,12 @@ int ivtv_streams_register(struct ivtv *itv)
                 return 0;
 
         /* One or more streams could not be initialized. Clean 'em all up. */
-        ivtv_streams_cleanup(itv);
+        ivtv_streams_cleanup(itv, 1);
         return -ENOMEM;
 }
 
 /* Unregister v4l2 devices */
-void ivtv_streams_cleanup(struct ivtv *itv)
+void ivtv_streams_cleanup(struct ivtv *itv, int unregister)
 {
         int type;
 
@@ -322,8 +322,11 @@ void ivtv_streams_cleanup(struct ivtv *itv)
                         continue;
 
                 ivtv_stream_free(&itv->streams[type]);
-                /* Unregister device */
-                video_unregister_device(vdev);
+                /* Unregister or release device */
+                if (unregister)
+                        video_unregister_device(vdev);
+                else
+                        video_device_release(vdev);
         }
 }
 
diff --git a/drivers/media/video/ivtv/ivtv-streams.h b/drivers/media/video/ivtv/ivtv-streams.h
index 3d76a415fbd8..a653a5136417 100644
--- a/drivers/media/video/ivtv/ivtv-streams.h
+++ b/drivers/media/video/ivtv/ivtv-streams.h
@@ -23,7 +23,7 @@
 
 int ivtv_streams_setup(struct ivtv *itv);
 int ivtv_streams_register(struct ivtv *itv);
-void ivtv_streams_cleanup(struct ivtv *itv);
+void ivtv_streams_cleanup(struct ivtv *itv, int unregister);
 
 /* Capture related */
 int ivtv_start_v4l2_encode_stream(struct ivtv_stream *s);
diff --git a/drivers/media/video/ivtv/ivtv-vbi.c b/drivers/media/video/ivtv/ivtv-vbi.c
index c151bcf5519a..71798f0da27f 100644
--- a/drivers/media/video/ivtv/ivtv-vbi.c
+++ b/drivers/media/video/ivtv/ivtv-vbi.c
@@ -169,7 +169,8 @@ static void copy_vbi_data(struct ivtv *itv, int lines, u32 pts_stamp)
                         linemask[0] |= (1 << l);
                 else
                         linemask[1] |= (1 << (l - 32));
-                dst[sd + 12 + line * 43] = service2vbi(itv->vbi.sliced_data[i].id);
+                dst[sd + 12 + line * 43] =
+                        ivtv_service2vbi(itv->vbi.sliced_data[i].id);
                 memcpy(dst + sd + 12 + line * 43 + 1, itv->vbi.sliced_data[i].data, 42);
                 line++;
         }
diff --git a/drivers/media/video/ivtv/ivtv-yuv.c b/drivers/media/video/ivtv/ivtv-yuv.c
index 62f70bd5e3cb..a9417f6e4087 100644
--- a/drivers/media/video/ivtv/ivtv-yuv.c
+++ b/drivers/media/video/ivtv/ivtv-yuv.c
@@ -908,7 +908,7 @@ static void ivtv_yuv_init(struct ivtv *itv)
         }
 
         /* We need a buffer for blanking when Y plane is offset - non-fatal if we can't get one */
-        yi->blanking_ptr = kzalloc(720 * 16, GFP_KERNEL);
+        yi->blanking_ptr = kzalloc(720 * 16, GFP_KERNEL|__GFP_NOWARN);
         if (yi->blanking_ptr) {
                 yi->blanking_dmaptr = pci_map_single(itv->dev, yi->blanking_ptr, 720*16, PCI_DMA_TODEVICE);
         } else {
diff --git a/drivers/media/video/ivtv/ivtvfb.c b/drivers/media/video/ivtv/ivtvfb.c
index df789f683e63..73be154f7f05 100644
--- a/drivers/media/video/ivtv/ivtvfb.c
+++ b/drivers/media/video/ivtv/ivtvfb.c
@@ -948,7 +948,8 @@ static int ivtvfb_init_vidmode(struct ivtv *itv)
         }
 
         /* Allocate the pseudo palette */
-        oi->ivtvfb_info.pseudo_palette = kmalloc(sizeof(u32) * 16, GFP_KERNEL);
+        oi->ivtvfb_info.pseudo_palette =
+                kmalloc(sizeof(u32) * 16, GFP_KERNEL|__GFP_NOWARN);
 
         if (!oi->ivtvfb_info.pseudo_palette) {
                 IVTVFB_ERR("abort, unable to alloc pseudo pallete\n");
@@ -1056,7 +1057,8 @@ static int ivtvfb_init_card(struct ivtv *itv)
                 return -EBUSY;
         }
 
-        itv->osd_info = kzalloc(sizeof(struct osd_info), GFP_ATOMIC);
+        itv->osd_info = kzalloc(sizeof(struct osd_info),
+                                        GFP_ATOMIC|__GFP_NOWARN);
         if (itv->osd_info == NULL) {
                 IVTVFB_ERR("Failed to allocate memory for osd_info\n");
                 return -ENOMEM;
diff --git a/drivers/media/video/mt9m001.c b/drivers/media/video/mt9m001.c
index 179e47049a45..ee43499544c1 100644
--- a/drivers/media/video/mt9m001.c
+++ b/drivers/media/video/mt9m001.c
@@ -12,15 +12,12 @@
 #include <linux/slab.h>
 #include <linux/i2c.h>
 #include <linux/log2.h>
+#include <linux/gpio.h>
 
 #include <media/v4l2-common.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/soc_camera.h>
 
-#ifdef CONFIG_MT9M001_PCA9536_SWITCH
-#include <asm/gpio.h>
-#endif
-
 /* mt9m001 i2c address 0x5d
  * The platform has to define i2c_board_info
  * and call i2c_register_board_info() */
diff --git a/drivers/media/video/mt9v022.c b/drivers/media/video/mt9v022.c
index d1391ac55096..1658fe590392 100644
--- a/drivers/media/video/mt9v022.c
+++ b/drivers/media/video/mt9v022.c
@@ -13,15 +13,12 @@
 #include <linux/i2c.h>
 #include <linux/delay.h>
 #include <linux/log2.h>
+#include <linux/gpio.h>
 
 #include <media/v4l2-common.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/soc_camera.h>
 
-#ifdef CONFIG_MT9M001_PCA9536_SWITCH
-#include <asm/gpio.h>
-#endif
-
 /* mt9v022 i2c address 0x48, 0x4c, 0x58, 0x5c
  * The platform has to define i2c_board_info
  * and call i2c_register_board_info() */
@@ -91,7 +88,7 @@ static const struct soc_camera_data_format mt9v022_monochrome_formats[] = {
 struct mt9v022 {
         struct i2c_client *client;
         struct soc_camera_device icd;
-        int model;      /* V4L2_IDENT_MT9M001* codes from v4l2-chip-ident.h */
+        int model;      /* V4L2_IDENT_MT9V022* codes from v4l2-chip-ident.h */
         int switch_gpio;
         u16 chip_control;
         unsigned char datawidth;
diff --git a/drivers/media/video/pvrusb2/Kconfig b/drivers/media/video/pvrusb2/Kconfig
index 9620c67fae77..4482b2c72ced 100644
--- a/drivers/media/video/pvrusb2/Kconfig
+++ b/drivers/media/video/pvrusb2/Kconfig
@@ -1,8 +1,10 @@
 config VIDEO_PVRUSB2
         tristate "Hauppauge WinTV-PVR USB2 support"
         depends on VIDEO_V4L2 && I2C
+        depends on VIDEO_MEDIA  # Avoids pvrusb = Y / DVB = M
+        depends on HOTPLUG      # due to FW_LOADER
         select FW_LOADER
-        select MEDIA_TUNER
+        select VIDEO_TUNER
         select VIDEO_TVEEPROM
         select VIDEO_CX2341X
         select VIDEO_SAA711X
diff --git a/drivers/media/video/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig
index 40e4c3bd2cb9..83f076abce35 100644
--- a/drivers/media/video/saa7134/Kconfig
+++ b/drivers/media/video/saa7134/Kconfig
@@ -3,7 +3,7 @@ config VIDEO_SAA7134
         depends on VIDEO_DEV && PCI && I2C && INPUT
         select VIDEOBUF_DMA_SG
         select VIDEO_IR
-        select MEDIA_TUNER
+        select VIDEO_TUNER
         select VIDEO_TVEEPROM
         select CRC32
         ---help---
@@ -27,6 +27,7 @@ config VIDEO_SAA7134_ALSA
 config VIDEO_SAA7134_DVB
         tristate "DVB/ATSC Support for saa7134 based TV cards"
         depends on VIDEO_SAA7134 && DVB_CORE
+        depends on HOTPLUG      # due to FW_LOADER
         select VIDEOBUF_DVB
         select FW_LOADER
         select DVB_PLL if !DVB_FE_CUSTOMISE
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index eec127864fe3..2c19cd0113c8 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -864,7 +864,6 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
         struct saa7134_dev *dev;
         struct saa7134_mpeg_ops *mops;
         int err;
-        int mask;
 
         if (saa7134_devcount == SAA7134_MAXBOARDS)
                 return -ENOMEM;
@@ -1065,11 +1064,6 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
         if (TUNER_ABSENT != dev->tuner_type)
                 saa7134_i2c_call_clients(dev, TUNER_SET_STANDBY, NULL);
 
-        if (card(dev).gpiomask != 0) {
-                mask = card(dev).gpiomask;
-                saa_andorl(SAA7134_GPIO_GPMODE0 >> 2,   mask, mask);
-                saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, mask, 0);
-        }
         return 0;
 
  fail4:
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index 2d16be2259db..469f93aac008 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -538,19 +538,23 @@ static int philips_tda827x_tuner_sleep(struct dvb_frontend *fe)
         return 0;
 }
 
-static void configure_tda827x_fe(struct saa7134_dev *dev, struct tda1004x_config *cdec_conf,
-                                                          struct tda827x_config *tuner_conf)
+static int configure_tda827x_fe(struct saa7134_dev *dev,
+                                struct tda1004x_config *cdec_conf,
+                                struct tda827x_config *tuner_conf)
 {
         dev->dvb.frontend = dvb_attach(tda10046_attach, cdec_conf, &dev->i2c_adap);
         if (dev->dvb.frontend) {
                 if (cdec_conf->i2c_gate)
                         dev->dvb.frontend->ops.i2c_gate_ctrl = tda8290_i2c_gate_ctrl;
-                if (dvb_attach(tda827x_attach, dev->dvb.frontend, cdec_conf->tuner_address,
-                                                        &dev->i2c_adap, tuner_conf) == NULL) {
-                        wprintk("no tda827x tuner found at addr: %02x\n",
+                if (dvb_attach(tda827x_attach, dev->dvb.frontend,
+                               cdec_conf->tuner_address,
+                               &dev->i2c_adap, tuner_conf))
+                        return 0;
+
+                wprintk("no tda827x tuner found at addr: %02x\n",
                                 cdec_conf->tuner_address);
-                }
         }
+        return -EINVAL;
 }
 
 /* ------------------------------------------------------------------ */
@@ -997,7 +1001,9 @@ static int dvb_init(struct saa7134_dev *dev)
                 break;
         case SAA7134_BOARD_FLYDVBTDUO:
         case SAA7134_BOARD_FLYDVBT_DUO_CARDBUS:
-                configure_tda827x_fe(dev, &tda827x_lifeview_config, &tda827x_cfg_0);
+                if (configure_tda827x_fe(dev, &tda827x_lifeview_config,
+                                         &tda827x_cfg_0) < 0)
+                        goto dettach_frontend;
                 break;
         case SAA7134_BOARD_PHILIPS_EUROPA:
         case SAA7134_BOARD_VIDEOMATE_DVBT_300:
@@ -1022,36 +1028,52 @@ static int dvb_init(struct saa7134_dev *dev)
                 }
                 break;
         case SAA7134_BOARD_KWORLD_DVBT_210:
-                configure_tda827x_fe(dev, &kworld_dvb_t_210_config, &tda827x_cfg_2);
+                if (configure_tda827x_fe(dev, &kworld_dvb_t_210_config,
+                                         &tda827x_cfg_2) < 0)
+                        goto dettach_frontend;
                 break;
         case SAA7134_BOARD_PHILIPS_TIGER:
-                configure_tda827x_fe(dev, &philips_tiger_config, &tda827x_cfg_0);
+                if (configure_tda827x_fe(dev, &philips_tiger_config,
+                                         &tda827x_cfg_0) < 0)
+                        goto dettach_frontend;
                 break;
         case SAA7134_BOARD_PINNACLE_PCTV_310i:
-                configure_tda827x_fe(dev, &pinnacle_pctv_310i_config, &tda827x_cfg_1);
+                if (configure_tda827x_fe(dev, &pinnacle_pctv_310i_config,
+                                         &tda827x_cfg_1) < 0)
+                        goto dettach_frontend;
                 break;
         case SAA7134_BOARD_HAUPPAUGE_HVR1110:
-                configure_tda827x_fe(dev, &hauppauge_hvr_1110_config, &tda827x_cfg_1);
+                if (configure_tda827x_fe(dev, &hauppauge_hvr_1110_config,
+                                         &tda827x_cfg_1) < 0)
+                        goto dettach_frontend;
                 break;
         case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
-                configure_tda827x_fe(dev, &asus_p7131_dual_config, &tda827x_cfg_0);
+                if (configure_tda827x_fe(dev, &asus_p7131_dual_config,
+                                         &tda827x_cfg_0) < 0)
+                        goto dettach_frontend;
                 break;
         case SAA7134_BOARD_FLYDVBT_LR301:
-                configure_tda827x_fe(dev, &tda827x_lifeview_config, &tda827x_cfg_0);
+                if (configure_tda827x_fe(dev, &tda827x_lifeview_config,
+                                         &tda827x_cfg_0) < 0)
+                        goto dettach_frontend;
                 break;
         case SAA7134_BOARD_FLYDVB_TRIO:
-                if(! use_frontend) {    /* terrestrial */
-                        configure_tda827x_fe(dev, &lifeview_trio_config, &tda827x_cfg_0);
+                if (!use_frontend) {    /* terrestrial */
+                        if (configure_tda827x_fe(dev, &lifeview_trio_config,
+                                                 &tda827x_cfg_0) < 0)
+                                goto dettach_frontend;
                 } else {                /* satellite */
                         dev->dvb.frontend = dvb_attach(tda10086_attach, &flydvbs, &dev->i2c_adap);
                         if (dev->dvb.frontend) {
                                 if (dvb_attach(tda826x_attach, dev->dvb.frontend, 0x63,
                                                                         &dev->i2c_adap, 0) == NULL) {
                                         wprintk("%s: Lifeview Trio, No tda826x found!\n", __func__);
+                                        goto dettach_frontend;
                                 }
                                 if (dvb_attach(isl6421_attach, dev->dvb.frontend, &dev->i2c_adap,
                                                                                 0x08, 0, 0) == NULL) {
                                         wprintk("%s: Lifeview Trio, No ISL6421 found!\n", __func__);
+                                        goto dettach_frontend;
                                 }
                         }
                 }
@@ -1067,15 +1089,20 @@ static int dvb_init(struct saa7134_dev *dev)
                                                                 &ads_duo_cfg) == NULL) {
                                 wprintk("no tda827x tuner found at addr: %02x\n",
                                         ads_tech_duo_config.tuner_address);
+                                goto dettach_frontend;
                         }
                 }
                 break;
         case SAA7134_BOARD_TEVION_DVBT_220RF:
-                configure_tda827x_fe(dev, &tevion_dvbt220rf_config, &tda827x_cfg_0);
+                if (configure_tda827x_fe(dev, &tevion_dvbt220rf_config,
+                                         &tda827x_cfg_0) < 0)
+                        goto dettach_frontend;
                 break;
         case SAA7134_BOARD_MEDION_MD8800_QUADRO:
                 if (!use_frontend) {     /* terrestrial */
-                        configure_tda827x_fe(dev, &md8800_dvbt_config, &tda827x_cfg_0);
+                        if (configure_tda827x_fe(dev, &md8800_dvbt_config,
+                                                 &tda827x_cfg_0) < 0)
+                                goto dettach_frontend;
                 } else {        /* satellite */
                         dev->dvb.frontend = dvb_attach(tda10086_attach,
                                                         &flydvbs, &dev->i2c_adap);
@@ -1086,16 +1113,20 @@ static int dvb_init(struct saa7134_dev *dev)
                                 struct i2c_msg msg = {.addr = 0x08, .flags = 0, .len = 1};
 
                                 if (dvb_attach(tda826x_attach, dev->dvb.frontend,
-                                                0x60, &dev->i2c_adap, 0) == NULL)
+                                                0x60, &dev->i2c_adap, 0) == NULL) {
                                         wprintk("%s: Medion Quadro, no tda826x "
                                                 "found !\n", __func__);
+                                        goto dettach_frontend;
+                                }
                                 if (dev_id != 0x08) {
                                         /* we need to open the i2c gate (we know it exists) */
                                         fe->ops.i2c_gate_ctrl(fe, 1);
                                         if (dvb_attach(isl6405_attach, fe,
-                                                        &dev->i2c_adap, 0x08, 0, 0) == NULL)
+                                                        &dev->i2c_adap, 0x08, 0, 0) == NULL) {
                                                 wprintk("%s: Medion Quadro, no ISL6405 "
                                                         "found !\n", __func__);
+                                                goto dettach_frontend;
+                                        }
                                         if (dev_id == 0x07) {
                                                 /* fire up the 2nd section of the LNB supply since
                                                    we can't do this from the other section */
@@ -1117,19 +1148,17 @@ static int dvb_init(struct saa7134_dev *dev)
         case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180:
                 dev->dvb.frontend = dvb_attach(nxt200x_attach, &avertvhda180,
                                                &dev->i2c_adap);
-                if (dev->dvb.frontend) {
+                if (dev->dvb.frontend)
                         dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
                                    NULL, DVB_PLL_TDHU2);
-                }
                 break;
         case SAA7134_BOARD_KWORLD_ATSC110:
                 dev->dvb.frontend = dvb_attach(nxt200x_attach, &kworldatsc110,
                                                &dev->i2c_adap);
-                if (dev->dvb.frontend) {
+                if (dev->dvb.frontend)
                         dvb_attach(simple_tuner_attach, dev->dvb.frontend,
                                    &dev->i2c_adap, 0x61,
                                    TUNER_PHILIPS_TUV1236D);
-                }
                 break;
         case SAA7134_BOARD_FLYDVBS_LR300:
                 dev->dvb.frontend = dvb_attach(tda10086_attach, &flydvbs,
@@ -1138,10 +1167,12 @@ static int dvb_init(struct saa7134_dev *dev)
                         if (dvb_attach(tda826x_attach, dev->dvb.frontend, 0x60,
                                        &dev->i2c_adap, 0) == NULL) {
                                 wprintk("%s: No tda826x found!\n", __func__);
+                                goto dettach_frontend;
                         }
                         if (dvb_attach(isl6421_attach, dev->dvb.frontend,
                                        &dev->i2c_adap, 0x08, 0, 0) == NULL) {
                                 wprintk("%s: No ISL6421 found!\n", __func__);
+                                goto dettach_frontend;
                         }
                 }
                 break;
@@ -1168,43 +1199,65 @@ static int dvb_init(struct saa7134_dev *dev)
                 }
                 break;
         case SAA7134_BOARD_CINERGY_HT_PCMCIA:
-                configure_tda827x_fe(dev, &cinergy_ht_config, &tda827x_cfg_0);
+                if (configure_tda827x_fe(dev, &cinergy_ht_config,
+                                         &tda827x_cfg_0) < 0)
+                        goto dettach_frontend;
                 break;
         case SAA7134_BOARD_CINERGY_HT_PCI:
-                configure_tda827x_fe(dev, &cinergy_ht_pci_config, &tda827x_cfg_0);
+                if (configure_tda827x_fe(dev, &cinergy_ht_pci_config,
+                                         &tda827x_cfg_0) < 0)
+                        goto dettach_frontend;
                 break;
         case SAA7134_BOARD_PHILIPS_TIGER_S:
-                configure_tda827x_fe(dev, &philips_tiger_s_config, &tda827x_cfg_2);
+                if (configure_tda827x_fe(dev, &philips_tiger_s_config,
+                                         &tda827x_cfg_2) < 0)
+                        goto dettach_frontend;
                 break;
         case SAA7134_BOARD_ASUS_P7131_4871:
-                configure_tda827x_fe(dev, &asus_p7131_4871_config, &tda827x_cfg_2);
+                if (configure_tda827x_fe(dev, &asus_p7131_4871_config,
+                                         &tda827x_cfg_2) < 0)
+                        goto dettach_frontend;
                 break;
         case SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA:
-                configure_tda827x_fe(dev, &asus_p7131_hybrid_lna_config, &tda827x_cfg_2);
+                if (configure_tda827x_fe(dev, &asus_p7131_hybrid_lna_config,
+                                         &tda827x_cfg_2) < 0)
+                        goto dettach_frontend;
                 break;
         case SAA7134_BOARD_AVERMEDIA_SUPER_007:
-                configure_tda827x_fe(dev, &avermedia_super_007_config, &tda827x_cfg_0);
+                if (configure_tda827x_fe(dev, &avermedia_super_007_config,
+                                         &tda827x_cfg_0) < 0)
+                        goto dettach_frontend;
                 break;
         case SAA7134_BOARD_TWINHAN_DTV_DVB_3056:
-                configure_tda827x_fe(dev, &twinhan_dtv_dvb_3056_config, &tda827x_cfg_2_sw42);
+                if (configure_tda827x_fe(dev, &twinhan_dtv_dvb_3056_config,
+                                         &tda827x_cfg_2_sw42) < 0)
+                        goto dettach_frontend;
                 break;
         case SAA7134_BOARD_PHILIPS_SNAKE:
                 dev->dvb.frontend = dvb_attach(tda10086_attach, &flydvbs,
                                                 &dev->i2c_adap);
                 if (dev->dvb.frontend) {
                         if (dvb_attach(tda826x_attach, dev->dvb.frontend, 0x60,
-                                        &dev->i2c_adap, 0) == NULL)
+                                        &dev->i2c_adap, 0) == NULL) {
                                 wprintk("%s: No tda826x found!\n", __func__);
+                                goto dettach_frontend;
+                        }
                         if (dvb_attach(lnbp21_attach, dev->dvb.frontend,
-                                        &dev->i2c_adap, 0, 0) == NULL)
+                                        &dev->i2c_adap, 0, 0) == NULL) {
                                 wprintk("%s: No lnbp21 found!\n", __func__);
+                                goto dettach_frontend;
+                        }
                 }
                 break;
         case SAA7134_BOARD_CREATIX_CTX953:
-                configure_tda827x_fe(dev, &md8800_dvbt_config, &tda827x_cfg_0);
+                if (configure_tda827x_fe(dev, &md8800_dvbt_config,
+                                         &tda827x_cfg_0) < 0)
+                        goto dettach_frontend;
                 break;
         case SAA7134_BOARD_MSI_TVANYWHERE_AD11:
-                configure_tda827x_fe(dev, &philips_tiger_s_config, &tda827x_cfg_2);
+                if (configure_tda827x_fe(dev, &philips_tiger_s_config,
+                                         &tda827x_cfg_2) < 0)
+                        goto dettach_frontend;
                 break;
         case SAA7134_BOARD_AVERMEDIA_CARDBUS_506:
                 dev->dvb.frontend = dvb_attach(mt352_attach,
@@ -1218,16 +1271,20 @@ static int dvb_init(struct saa7134_dev *dev)
                 if (dev->dvb.frontend) {
                         struct dvb_frontend *fe;
                         if (dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60,
-                                  &dev->i2c_adap, DVB_PLL_PHILIPS_SD1878_TDA8261) == NULL)
+                                  &dev->i2c_adap, DVB_PLL_PHILIPS_SD1878_TDA8261) == NULL) {
                                 wprintk("%s: MD7134 DVB-S, no SD1878 "
                                         "found !\n", __func__);
+                                goto dettach_frontend;
+                        }
                         /* we need to open the i2c gate (we know it exists) */
                         fe = dev->dvb.frontend;
                         fe->ops.i2c_gate_ctrl(fe, 1);
                         if (dvb_attach(isl6405_attach, fe,
-                                        &dev->i2c_adap, 0x08, 0, 0) == NULL)
+                                        &dev->i2c_adap, 0x08, 0, 0) == NULL) {
                                 wprintk("%s: MD7134 DVB-S, no ISL6405 "
                                         "found !\n", __func__);
+                                goto dettach_frontend;
+                        }
                         fe->ops.i2c_gate_ctrl(fe, 0);
                         dev->original_set_voltage = fe->ops.set_voltage;
                         fe->ops.set_voltage = md8800_set_voltage;
@@ -1254,10 +1311,7 @@ static int dvb_init(struct saa7134_dev *dev)
                 if (!fe) {
                         printk(KERN_ERR "%s/2: xc3028 attach failed\n",
                                dev->name);
-                        dvb_frontend_detach(dev->dvb.frontend);
-                        dvb_unregister_frontend(dev->dvb.frontend);
-                        dev->dvb.frontend = NULL;
-                        return -1;
+                        goto dettach_frontend;
                 }
         }
 
@@ -1282,6 +1336,12 @@ static int dvb_init(struct saa7134_dev *dev)
                         dev->dvb.frontend->ops.tuner_ops.sleep(dev->dvb.frontend);
         }
         return ret;
+
+dettach_frontend:
+        dvb_frontend_detach(dev->dvb.frontend);
+        dev->dvb.frontend = NULL;
+
+        return -1;
 }
 
 static int dvb_fini(struct saa7134_dev *dev)
diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c
index 9276ed997388..b12c60cf5a09 100644
--- a/drivers/media/video/stk-webcam.c
+++ b/drivers/media/video/stk-webcam.c
@@ -30,6 +30,7 @@
 #include <linux/kref.h>
 
 #include <linux/usb.h>
+#include <linux/mm.h>
 #include <linux/vmalloc.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
@@ -245,6 +246,8 @@ static int stk_initialise(struct stk_camera *dev)
                 return -1;
 }
 
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+
 /* sysfs functions */
 /*FIXME cleanup this */
 
@@ -350,6 +353,10 @@ static void stk_remove_sysfs_files(struct video_device *vdev)
         video_device_remove_file(vdev, &dev_attr_vflip);
 }
 
+#else
+#define stk_create_sysfs_files(a)
+#define stk_remove_sysfs_files(a)
+#endif
 
 /* *********************************************** */
 /*
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 6bf104ea051d..5a75788b92ae 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -40,11 +40,11 @@
         typeof(&FUNCTION) __a = symbol_request(FUNCTION); \
         if (__a) { \
                 __r = (int) __a(ARGS); \
+                symbol_put(FUNCTION); \
         } else { \
                 printk(KERN_ERR "TUNER: Unable to find " \
                                 "symbol "#FUNCTION"()\n"); \
         } \
-        symbol_put(FUNCTION); \
         __r; \
 })
 
@@ -340,16 +340,6 @@ static void tuner_i2c_address_check(struct tuner *t)
         tuner_warn("====================== WARNING! ======================\n");
 }
 
-static void attach_tda829x(struct tuner *t)
-{
-        struct tda829x_config cfg = {
-                .lna_cfg        = t->config,
-                .tuner_callback = t->tuner_callback,
-        };
-        dvb_attach(tda829x_attach,
-                   &t->fe, t->i2c->adapter, t->i2c->addr, &cfg);
-}
-
 static struct xc5000_config xc5000_cfg;
 
 static void set_type(struct i2c_client *c, unsigned int type,
@@ -385,12 +375,19 @@ static void set_type(struct i2c_client *c, unsigned int type,
 
         switch (t->type) {
         case TUNER_MT2032:
-                dvb_attach(microtune_attach,
-                           &t->fe, t->i2c->adapter, t->i2c->addr);
+                if (!dvb_attach(microtune_attach,
+                           &t->fe, t->i2c->adapter, t->i2c->addr))
+                        goto attach_failed;
                 break;
         case TUNER_PHILIPS_TDA8290:
         {
-                attach_tda829x(t);
+                struct tda829x_config cfg = {
+                        .lna_cfg        = t->config,
+                        .tuner_callback = t->tuner_callback,
+                };
+                if (!dvb_attach(tda829x_attach, &t->fe, t->i2c->adapter,
+                                t->i2c->addr, &cfg))
+                        goto attach_failed;
                 break;
         }
         case TUNER_TEA5767:
@@ -441,8 +438,9 @@ static void set_type(struct i2c_client *c, unsigned int type,
                 break;
         }
         case TUNER_TDA9887:
-                dvb_attach(tda9887_attach,
-                           &t->fe, t->i2c->adapter, t->i2c->addr);
+                if (!dvb_attach(tda9887_attach,
+                           &t->fe, t->i2c->adapter, t->i2c->addr))
+                        goto attach_failed;
                 break;
         case TUNER_XC5000:
         {
@@ -450,10 +448,10 @@ static void set_type(struct i2c_client *c, unsigned int type,
 
                 xc5000_cfg.i2c_address    = t->i2c->addr;
                 xc5000_cfg.if_khz         = 5380;
-                xc5000_cfg.priv           = c->adapter->algo_data;
                 xc5000_cfg.tuner_callback = t->tuner_callback;
                 if (!dvb_attach(xc5000_attach,
-                                &t->fe, t->i2c->adapter, &xc5000_cfg))
+                                &t->fe, t->i2c->adapter, &xc5000_cfg,
+                                c->adapter->algo_data))
                         goto attach_failed;
 
                 xc_tuner_ops = &t->fe.ops.tuner_ops;
@@ -1167,7 +1165,7 @@ static int tuner_probe(struct i2c_client *client,
                         /* If chip is not tda8290, don't register.
                            since it can be tda9887*/
                         if (tuner_symbol_probe(tda829x_probe, t->i2c->adapter,
-                                               t->i2c->addr) == 0) {
+                                               t->i2c->addr) >= 0) {
                                 tuner_dbg("tda829x detected\n");
                         } else {
                                 /* Default is being tda9887 */
@@ -1181,7 +1179,7 @@ static int tuner_probe(struct i2c_client *client,
                 case 0x60:
                         if (tuner_symbol_probe(tea5767_autodetection,
                                                t->i2c->adapter, t->i2c->addr)
-                                        != EINVAL) {
+                                        >= 0) {
                                 t->type = TUNER_TEA5767;
                                 t->mode_mask = T_RADIO;
                                 t->mode = T_STANDBY;
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index 3cf8a8e801e5..9da0e1807ffb 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -319,10 +319,12 @@ audioIC[] =
         {AUDIO_CHIP_INTERNAL, "CX25843"},
         {AUDIO_CHIP_INTERNAL, "CX23418"},
         {AUDIO_CHIP_INTERNAL, "CX23885"},
-        /* 40-42 */
+        /* 40-44 */
         {AUDIO_CHIP_INTERNAL, "CX23888"},
         {AUDIO_CHIP_INTERNAL, "SAA7131"},
         {AUDIO_CHIP_INTERNAL, "CX23887"},
+        {AUDIO_CHIP_INTERNAL, "SAA7164"},
+        {AUDIO_CHIP_INTERNAL, "AU8522"},
 };
 
 /* This list is supplied by Hauppauge. Thanks! */
@@ -341,8 +343,10 @@ static const char *decoderIC[] = {
         "CX882", "TVP5150A", "CX25840", "CX25841", "CX25842",
         /* 30-34 */
         "CX25843", "CX23418", "NEC61153", "CX23885", "CX23888",
-        /* 35-37 */
-        "SAA7131", "CX25837", "CX23887"
+        /* 35-39 */
+        "SAA7131", "CX25837", "CX23887", "CX23885A", "CX23887A",
+        /* 40-42 */
+        "SAA7164", "CX23885B", "AU8522"
 };
 
 static int hasRadioTuner(int tunerType)
diff --git a/drivers/media/video/usbvision/Kconfig b/drivers/media/video/usbvision/Kconfig
index 74e1d3075a20..fc24ef05b3f3 100644
--- a/drivers/media/video/usbvision/Kconfig
+++ b/drivers/media/video/usbvision/Kconfig
@@ -1,7 +1,7 @@
 config VIDEO_USBVISION
         tristate "USB video devices based on Nogatech NT1003/1004/1005"
         depends on I2C && VIDEO_V4L2
-        select MEDIA_TUNER
+        select VIDEO_TUNER
         select VIDEO_SAA711X if VIDEO_HELPER_CHIPS_AUTO
         ---help---
           There are more than 50 different USB video devices based on
diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
index 5515234be86a..03a87a307e32 100644
--- a/drivers/misc/sgi-xp/xp.h
+++ b/drivers/misc/sgi-xp/xp.h
@@ -157,215 +157,136 @@ struct xpc_msg {
 /*
  * Define the return values and values passed to user's callout functions.
  * (It is important to add new value codes at the end just preceding
- * xpcUnknownReason, which must have the highest numerical value.)
+ * xpUnknownReason, which must have the highest numerical value.)
  */
-enum xpc_retval {
-        xpcSuccess = 0,
+enum xp_retval {
+        xpSuccess = 0,
 
-        xpcNotConnected,        /*  1: channel is not connected */
-        xpcConnected,           /*  2: channel connected (opened) */
-        xpcRETIRED1,            /*  3: (formerly xpcDisconnected) */
+        xpNotConnected,         /*  1: channel is not connected */
+        xpConnected,            /*  2: channel connected (opened) */
+        xpRETIRED1,             /*  3: (formerly xpDisconnected) */
 
-        xpcMsgReceived,         /*  4: message received */
-        xpcMsgDelivered,        /*  5: message delivered and acknowledged */
+        xpMsgReceived,          /*  4: message received */
+        xpMsgDelivered,         /*  5: message delivered and acknowledged */
 
-        xpcRETIRED2,            /*  6: (formerly xpcTransferFailed) */
+        xpRETIRED2,             /*  6: (formerly xpTransferFailed) */
 
-        xpcNoWait,              /*  7: operation would require wait */
-        xpcRetry,               /*  8: retry operation */
-        xpcTimeout,             /*  9: timeout in xpc_allocate_msg_wait() */
-        xpcInterrupted,         /* 10: interrupted wait */
+        xpNoWait,               /*  7: operation would require wait */
+        xpRetry,                /*  8: retry operation */
+        xpTimeout,              /*  9: timeout in xpc_allocate_msg_wait() */
+        xpInterrupted,          /* 10: interrupted wait */
 
-        xpcUnequalMsgSizes,     /* 11: message size disparity between sides */
-        xpcInvalidAddress,      /* 12: invalid address */
+        xpUnequalMsgSizes,      /* 11: message size disparity between sides */
+        xpInvalidAddress,       /* 12: invalid address */
 
-        xpcNoMemory,            /* 13: no memory available for XPC structures */
-        xpcLackOfResources,     /* 14: insufficient resources for operation */
-        xpcUnregistered,        /* 15: channel is not registered */
-        xpcAlreadyRegistered,   /* 16: channel is already registered */
+        xpNoMemory,             /* 13: no memory available for XPC structures */
+        xpLackOfResources,      /* 14: insufficient resources for operation */
+        xpUnregistered,         /* 15: channel is not registered */
+        xpAlreadyRegistered,    /* 16: channel is already registered */
 
-        xpcPartitionDown,       /* 17: remote partition is down */
-        xpcNotLoaded,           /* 18: XPC module is not loaded */
-        xpcUnloading,           /* 19: this side is unloading XPC module */
+        xpPartitionDown,        /* 17: remote partition is down */
+        xpNotLoaded,            /* 18: XPC module is not loaded */
+        xpUnloading,            /* 19: this side is unloading XPC module */
 
-        xpcBadMagic,            /* 20: XPC MAGIC string not found */
+        xpBadMagic,             /* 20: XPC MAGIC string not found */
 
-        xpcReactivating,        /* 21: remote partition was reactivated */
+        xpReactivating,         /* 21: remote partition was reactivated */
 
-        xpcUnregistering,       /* 22: this side is unregistering channel */
-        xpcOtherUnregistering,  /* 23: other side is unregistering channel */
+        xpUnregistering,        /* 22: this side is unregistering channel */
+        xpOtherUnregistering,   /* 23: other side is unregistering channel */
 
-        xpcCloneKThread,        /* 24: cloning kernel thread */
-        xpcCloneKThreadFailed,  /* 25: cloning kernel thread failed */
+        xpCloneKThread,         /* 24: cloning kernel thread */
+        xpCloneKThreadFailed,   /* 25: cloning kernel thread failed */
 
-        xpcNoHeartbeat,         /* 26: remote partition has no heartbeat */
+        xpNoHeartbeat,          /* 26: remote partition has no heartbeat */
 
-        xpcPioReadError,        /* 27: PIO read error */
-        xpcPhysAddrRegFailed,   /* 28: registration of phys addr range failed */
+        xpPioReadError,         /* 27: PIO read error */
+        xpPhysAddrRegFailed,    /* 28: registration of phys addr range failed */
 
-        xpcBteDirectoryError,   /* 29: maps to BTEFAIL_DIR */
-        xpcBtePoisonError,      /* 30: maps to BTEFAIL_POISON */
-        xpcBteWriteError,       /* 31: maps to BTEFAIL_WERR */
-        xpcBteAccessError,      /* 32: maps to BTEFAIL_ACCESS */
-        xpcBtePWriteError,      /* 33: maps to BTEFAIL_PWERR */
-        xpcBtePReadError,       /* 34: maps to BTEFAIL_PRERR */
-        xpcBteTimeOutError,     /* 35: maps to BTEFAIL_TOUT */
-        xpcBteXtalkError,       /* 36: maps to BTEFAIL_XTERR */
-        xpcBteNotAvailable,     /* 37: maps to BTEFAIL_NOTAVAIL */
-        xpcBteUnmappedError,    /* 38: unmapped BTEFAIL_ error */
+        xpRETIRED3,             /* 29: (formerly xpBteDirectoryError) */
+        xpRETIRED4,             /* 30: (formerly xpBtePoisonError) */
+        xpRETIRED5,             /* 31: (formerly xpBteWriteError) */
+        xpRETIRED6,             /* 32: (formerly xpBteAccessError) */
+        xpRETIRED7,             /* 33: (formerly xpBtePWriteError) */
+        xpRETIRED8,             /* 34: (formerly xpBtePReadError) */
+        xpRETIRED9,             /* 35: (formerly xpBteTimeOutError) */
+        xpRETIRED10,            /* 36: (formerly xpBteXtalkError) */
+        xpRETIRED11,            /* 37: (formerly xpBteNotAvailable) */
+        xpRETIRED12,            /* 38: (formerly xpBteUnmappedError) */
 
-        xpcBadVersion,          /* 39: bad version number */
-        xpcVarsNotSet,          /* 40: the XPC variables are not set up */
-        xpcNoRsvdPageAddr,      /* 41: unable to get rsvd page's phys addr */
-        xpcInvalidPartid,       /* 42: invalid partition ID */
-        xpcLocalPartid,         /* 43: local partition ID */
+        xpBadVersion,           /* 39: bad version number */
+        xpVarsNotSet,           /* 40: the XPC variables are not set up */
+        xpNoRsvdPageAddr,       /* 41: unable to get rsvd page's phys addr */
+        xpInvalidPartid,        /* 42: invalid partition ID */
+        xpLocalPartid,          /* 43: local partition ID */
 
-        xpcOtherGoingDown,      /* 44: other side going down, reason unknown */
-        xpcSystemGoingDown,     /* 45: system is going down, reason unknown */
-        xpcSystemHalt,          /* 46: system is being halted */
-        xpcSystemReboot,        /* 47: system is being rebooted */
-        xpcSystemPoweroff,      /* 48: system is being powered off */
+        xpOtherGoingDown,       /* 44: other side going down, reason unknown */
+        xpSystemGoingDown,      /* 45: system is going down, reason unknown */
+        xpSystemHalt,           /* 46: system is being halted */
+        xpSystemReboot,         /* 47: system is being rebooted */
+        xpSystemPoweroff,       /* 48: system is being powered off */
 
-        xpcDisconnecting,       /* 49: channel disconnecting (closing) */
+        xpDisconnecting,        /* 49: channel disconnecting (closing) */
 
-        xpcOpenCloseError,      /* 50: channel open/close protocol error */
+        xpOpenCloseError,       /* 50: channel open/close protocol error */
 
-        xpcDisconnected,        /* 51: channel disconnected (closed) */
+        xpDisconnected,         /* 51: channel disconnected (closed) */
 
-        xpcBteSh2Start,         /* 52: BTE CRB timeout */
+        xpBteCopyError,         /* 52: bte_copy() returned error */
 
-                                /* 53: 0x1 BTE Error Response Short */
-        xpcBteSh2RspShort = xpcBteSh2Start + BTEFAIL_SH2_RESP_SHORT,
-
-                                /* 54: 0x2 BTE Error Response Long */
-        xpcBteSh2RspLong = xpcBteSh2Start + BTEFAIL_SH2_RESP_LONG,
-
-                                /* 56: 0x4 BTE Error Response DSB */
-        xpcBteSh2RspDSB = xpcBteSh2Start + BTEFAIL_SH2_RESP_DSP,
-
-                                /* 60: 0x8 BTE Error Response Access */
-        xpcBteSh2RspAccess = xpcBteSh2Start + BTEFAIL_SH2_RESP_ACCESS,
-
-                                /* 68: 0x10 BTE Error CRB timeout */
-        xpcBteSh2CRBTO = xpcBteSh2Start + BTEFAIL_SH2_CRB_TO,
-
-                                /* 84: 0x20 BTE Error NACK limit */
-        xpcBteSh2NACKLimit = xpcBteSh2Start + BTEFAIL_SH2_NACK_LIMIT,
-
-                                /* 115: BTE end */
-        xpcBteSh2End = xpcBteSh2Start + BTEFAIL_SH2_ALL,
-
-        xpcUnknownReason        /* 116: unknown reason - must be last in enum */
+        xpUnknownReason         /* 53: unknown reason - must be last in enum */
 };
 
 /*
- * Define the callout function types used by XPC to update the user on
- * connection activity and state changes (via the user function registered by
- * xpc_connect()) and to notify them of messages received and delivered (via
- * the user function registered by xpc_send_notify()).
- *
- * The two function types are xpc_channel_func and xpc_notify_func and
- * both share the following arguments, with the exception of "data", which
- * only xpc_channel_func has.
+ * Define the callout function type used by XPC to update the user on
+ * connection activity and state changes via the user function registered
+ * by xpc_connect().
  *
  * Arguments:
  *
- *      reason - reason code. (See following table.)
+ *      reason - reason code.
  *      partid - partition ID associated with condition.
  *      ch_number - channel # associated with condition.
- *      data - pointer to optional data. (See following table.)
+ *      data - pointer to optional data.
  *      key - pointer to optional user-defined value provided as the "key"
- *            argument to xpc_connect() or xpc_send_notify().
+ *            argument to xpc_connect().
  *
- * In the following table the "Optional Data" column applies to callouts made
- * to functions registered by xpc_connect(). A "NA" in that column indicates
- * that this reason code can be passed to functions registered by
- * xpc_send_notify() (i.e. they don't have data arguments).
+ * A reason code of xpConnected indicates that a connection has been
+ * established to the specified partition on the specified channel. The data
+ * argument indicates the max number of entries allowed in the message queue.
  *
- * Also, the first three reason codes in the following table indicate
- * success, whereas the others indicate failure. When a failure reason code
- * is received, one can assume that the channel is not connected.
+ * A reason code of xpMsgReceived indicates that a XPC message arrived from
+ * the specified partition on the specified channel. The data argument
+ * specifies the address of the message's payload. The user must call
+ * xpc_received() when finished with the payload.
  *
- *
- * Reason Code          | Cause                          | Optional Data
- * =====================+================================+=====================
- * xpcConnected         | connection has been established| max #of entries
- *                      | to the specified partition on  | allowed in message
- *                      | the specified channel          | queue
- * ---------------------+--------------------------------+---------------------
- * xpcMsgReceived       | an XPC message arrived from    | address of payload
- *                      | the specified partition on the |
- *                      | specified channel              | [the user must call
- *                      |                                | xpc_received() when
- *                      |                                | finished with the
- *                      |                                | payload]
- * ---------------------+--------------------------------+---------------------
- * xpcMsgDelivered      | notification that the message  | NA
- *                      | was delivered to the intended  |
- *                      | recipient and that they have   |
- *                      | acknowledged its receipt by    |
- *                      | calling xpc_received()         |
- * =====================+================================+=====================
- * xpcUnequalMsgSizes   | can't connect to the specified | NULL
- *                      | partition on the specified     |
- *                      | channel because of mismatched  |
- *                      | message sizes                  |
- * ---------------------+--------------------------------+---------------------
- * xpcNoMemory          | insufficient memory avaiable   | NULL
- *                      | to allocate message queue      |
- * ---------------------+--------------------------------+---------------------
- * xpcLackOfResources   | lack of resources to create    | NULL
- *                      | the necessary kthreads to      |
- *                      | support the channel            |
- * ---------------------+--------------------------------+---------------------
- * xpcUnregistering     | this side's user has           | NULL or NA
- *                      | unregistered by calling        |
- *                      | xpc_disconnect()               |
- * ---------------------+--------------------------------+---------------------
- * xpcOtherUnregistering| the other side's user has      | NULL or NA
- *                      | unregistered by calling        |
- *                      | xpc_disconnect()               |
- * ---------------------+--------------------------------+---------------------
- * xpcNoHeartbeat       | the other side's XPC is no     | NULL or NA
- *                      | longer heartbeating            |
- *                      |                                |
- * ---------------------+--------------------------------+---------------------
- * xpcUnloading         | this side's XPC module is      | NULL or NA
- *                      | being unloaded                 |
- *                      |                                |
- * ---------------------+--------------------------------+---------------------
- * xpcOtherUnloading    | the other side's XPC module is | NULL or NA
- *                      | is being unloaded              |
- *                      |                                |
- * ---------------------+--------------------------------+---------------------
- * xpcPioReadError      | xp_nofault_PIOR() returned an  | NULL or NA
- *                      | error while sending an IPI     |
- *                      |                                |
- * ---------------------+--------------------------------+---------------------
- * xpcInvalidAddress    | the address either received or | NULL or NA
- *                      | sent by the specified partition|
- *                      | is invalid                     |
- * ---------------------+--------------------------------+---------------------
- * xpcBteNotAvailable   | attempt to pull data from the  | NULL or NA
- * xpcBtePoisonError    | specified partition over the   |
- * xpcBteWriteError     | specified channel via a        |
- * xpcBteAccessError    | bte_copy() failed              |
- * xpcBteTimeOutError   |                                |
- * xpcBteXtalkError     |                                |
- * xpcBteDirectoryError |                                |
- * xpcBteGenericError   |                                |
- * xpcBteUnmappedError  |                                |
- * ---------------------+--------------------------------+---------------------
- * xpcUnknownReason     | the specified channel to the   | NULL or NA
- *                      | specified partition was        |
- *                      | unavailable for unknown reasons|
- * =====================+================================+=====================
+ * All other reason codes indicate failure. The data argmument is NULL.
+ * When a failure reason code is received, one can assume that the channel
+ * is not connected.
  */
-
-typedef void (*xpc_channel_func) (enum xpc_retval reason, partid_t partid,
+typedef void (*xpc_channel_func) (enum xp_retval reason, short partid,
                                   int ch_number, void *data, void *key);
 
-typedef void (*xpc_notify_func) (enum xpc_retval reason, partid_t partid,
+/*
+ * Define the callout function type used by XPC to notify the user of
+ * messages received and delivered via the user function registered by
+ * xpc_send_notify().
+ *
+ * Arguments:
+ *
+ *      reason - reason code.
+ *      partid - partition ID associated with condition.
+ *      ch_number - channel # associated with condition.
+ *      key - pointer to optional user-defined value provided as the "key"
+ *            argument to xpc_send_notify().
+ *
+ * A reason code of xpMsgDelivered indicates that the message was delivered
+ * to the intended recipient and that they have acknowledged its receipt by
+ * calling xpc_received().
+ *
+ * All other reason codes indicate failure.
+ */
+typedef void (*xpc_notify_func) (enum xp_retval reason, short partid,
                                  int ch_number, void *key);
 
 /*
@@ -401,57 +322,57 @@ struct xpc_registration {
 struct xpc_interface {
         void (*connect) (int);
         void (*disconnect) (int);
-        enum xpc_retval (*allocate) (partid_t, int, u32, void **);
-        enum xpc_retval (*send) (partid_t, int, void *);
-        enum xpc_retval (*send_notify) (partid_t, int, void *,
+        enum xp_retval (*allocate) (short, int, u32, void **);
+        enum xp_retval (*send) (short, int, void *);
+        enum xp_retval (*send_notify) (short, int, void *,
                                         xpc_notify_func, void *);
-        void (*received) (partid_t, int, void *);
-        enum xpc_retval (*partid_to_nasids) (partid_t, void *);
+        void (*received) (short, int, void *);
+        enum xp_retval (*partid_to_nasids) (short, void *);
 };
 
 extern struct xpc_interface xpc_interface;
 
 extern void xpc_set_interface(void (*)(int),
                               void (*)(int),
-                              enum xpc_retval (*)(partid_t, int, u32, void **),
-                              enum xpc_retval (*)(partid_t, int, void *),
-                              enum xpc_retval (*)(partid_t, int, void *,
+                              enum xp_retval (*)(short, int, u32, void **),
+                              enum xp_retval (*)(short, int, void *),
+                              enum xp_retval (*)(short, int, void *,
                                                   xpc_notify_func, void *),
-                              void (*)(partid_t, int, void *),
-                              enum xpc_retval (*)(partid_t, void *));
+                              void (*)(short, int, void *),
+                              enum xp_retval (*)(short, void *));
 extern void xpc_clear_interface(void);
 
-extern enum xpc_retval xpc_connect(int, xpc_channel_func, void *, u16,
+extern enum xp_retval xpc_connect(int, xpc_channel_func, void *, u16,
                                    u16, u32, u32);
 extern void xpc_disconnect(int);
 
-static inline enum xpc_retval
-xpc_allocate(partid_t partid, int ch_number, u32 flags, void **payload)
+static inline enum xp_retval
+xpc_allocate(short partid, int ch_number, u32 flags, void **payload)
 {
         return xpc_interface.allocate(partid, ch_number, flags, payload);
 }
 
-static inline enum xpc_retval
-xpc_send(partid_t partid, int ch_number, void *payload)
+static inline enum xp_retval
+xpc_send(short partid, int ch_number, void *payload)
 {
         return xpc_interface.send(partid, ch_number, payload);
 }
 
-static inline enum xpc_retval
-xpc_send_notify(partid_t partid, int ch_number, void *payload,
+static inline enum xp_retval
+xpc_send_notify(short partid, int ch_number, void *payload,
                 xpc_notify_func func, void *key)
 {
         return xpc_interface.send_notify(partid, ch_number, payload, func, key);
 }
 
 static inline void
-xpc_received(partid_t partid, int ch_number, void *payload)
+xpc_received(short partid, int ch_number, void *payload)
 {
         return xpc_interface.received(partid, ch_number, payload);
 }
 
-static inline enum xpc_retval
-xpc_partid_to_nasids(partid_t partid, void *nasids)
+static inline enum xp_retval
+xpc_partid_to_nasids(short partid, void *nasids)
 {
         return xpc_interface.partid_to_nasids(partid, nasids);
 }
diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c
index 1fbf99bae963..196480b691a1 100644
--- a/drivers/misc/sgi-xp/xp_main.c
+++ b/drivers/misc/sgi-xp/xp_main.c
@@ -42,21 +42,21 @@ EXPORT_SYMBOL_GPL(xpc_registrations);
 /*
  * Initialize the XPC interface to indicate that XPC isn't loaded.
  */
-static enum xpc_retval
+static enum xp_retval
 xpc_notloaded(void)
 {
-        return xpcNotLoaded;
+        return xpNotLoaded;
 }
 
 struct xpc_interface xpc_interface = {
         (void (*)(int))xpc_notloaded,
         (void (*)(int))xpc_notloaded,
-        (enum xpc_retval(*)(partid_t, int, u32, void **))xpc_notloaded,
-        (enum xpc_retval(*)(partid_t, int, void *))xpc_notloaded,
-        (enum xpc_retval(*)(partid_t, int, void *, xpc_notify_func, void *))
+        (enum xp_retval(*)(short, int, u32, void **))xpc_notloaded,
+        (enum xp_retval(*)(short, int, void *))xpc_notloaded,
+        (enum xp_retval(*)(short, int, void *, xpc_notify_func, void *))
             xpc_notloaded,
-        (void (*)(partid_t, int, void *))xpc_notloaded,
-        (enum xpc_retval(*)(partid_t, void *))xpc_notloaded
+        (void (*)(short, int, void *))xpc_notloaded,
+        (enum xp_retval(*)(short, void *))xpc_notloaded
 };
 EXPORT_SYMBOL_GPL(xpc_interface);
 
@@ -66,12 +66,12 @@ EXPORT_SYMBOL_GPL(xpc_interface);
 void
 xpc_set_interface(void (*connect) (int),
                   void (*disconnect) (int),
-                  enum xpc_retval (*allocate) (partid_t, int, u32, void **),
-                  enum xpc_retval (*send) (partid_t, int, void *),
-                  enum xpc_retval (*send_notify) (partid_t, int, void *,
+                  enum xp_retval (*allocate) (short, int, u32, void **),
+                  enum xp_retval (*send) (short, int, void *),
+                  enum xp_retval (*send_notify) (short, int, void *,
                                                   xpc_notify_func, void *),
-                  void (*received) (partid_t, int, void *),
-                  enum xpc_retval (*partid_to_nasids) (partid_t, void *))
+                  void (*received) (short, int, void *),
+                  enum xp_retval (*partid_to_nasids) (short, void *))
 {
         xpc_interface.connect = connect;
         xpc_interface.disconnect = disconnect;
@@ -91,16 +91,16 @@ xpc_clear_interface(void)
 {
         xpc_interface.connect = (void (*)(int))xpc_notloaded;
         xpc_interface.disconnect = (void (*)(int))xpc_notloaded;
-        xpc_interface.allocate = (enum xpc_retval(*)(partid_t, int, u32,
+        xpc_interface.allocate = (enum xp_retval(*)(short, int, u32,
                                                      void **))xpc_notloaded;
-        xpc_interface.send = (enum xpc_retval(*)(partid_t, int, void *))
+        xpc_interface.send = (enum xp_retval(*)(short, int, void *))
             xpc_notloaded;
-        xpc_interface.send_notify = (enum xpc_retval(*)(partid_t, int, void *,
+        xpc_interface.send_notify = (enum xp_retval(*)(short, int, void *,
                                                         xpc_notify_func,
                                                         void *))xpc_notloaded;
-        xpc_interface.received = (void (*)(partid_t, int, void *))
+        xpc_interface.received = (void (*)(short, int, void *))
             xpc_notloaded;
-        xpc_interface.partid_to_nasids = (enum xpc_retval(*)(partid_t, void *))
+        xpc_interface.partid_to_nasids = (enum xp_retval(*)(short, void *))
             xpc_notloaded;
 }
 EXPORT_SYMBOL_GPL(xpc_clear_interface);
@@ -123,13 +123,13 @@ EXPORT_SYMBOL_GPL(xpc_clear_interface);
  *      nentries - max #of XPC message entries a message queue can contain.
  *                 The actual number, which is determined when a connection
  *                 is established and may be less then requested, will be
- *                 passed to the user via the xpcConnected callout.
+ *                 passed to the user via the xpConnected callout.
  *      assigned_limit - max number of kthreads allowed to be processing
  *                       messages (per connection) at any given instant.
  *      idle_limit - max number of kthreads allowed to be idle at any given
  *                   instant.
  */
-enum xpc_retval
+enum xp_retval
 xpc_connect(int ch_number, xpc_channel_func func, void *key, u16 payload_size,
             u16 nentries, u32 assigned_limit, u32 idle_limit)
 {
@@ -143,12 +143,12 @@ xpc_connect(int ch_number, xpc_channel_func func, void *key, u16 payload_size,
         registration = &xpc_registrations[ch_number];
 
         if (mutex_lock_interruptible(&registration->mutex) != 0)
-                return xpcInterrupted;
+                return xpInterrupted;
 
         /* if XPC_CHANNEL_REGISTERED(ch_number) */
         if (registration->func != NULL) {
                 mutex_unlock(&registration->mutex);
-                return xpcAlreadyRegistered;
+                return xpAlreadyRegistered;
         }
 
         /* register the channel for connection */
@@ -163,7 +163,7 @@ xpc_connect(int ch_number, xpc_channel_func func, void *key, u16 payload_size,
 
         xpc_interface.connect(ch_number);
 
-        return xpcSuccess;
+        return xpSuccess;
 }
 EXPORT_SYMBOL_GPL(xpc_connect);
 
diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
index 9eb6d4a3269c..11ac267ed68f 100644
--- a/drivers/misc/sgi-xp/xpc.h
+++ b/drivers/misc/sgi-xp/xpc.h
@@ -172,13 +172,13 @@ struct xpc_vars {
                         (_version >= _XPC_VERSION(3, 1))
 
 static inline int
-xpc_hb_allowed(partid_t partid, struct xpc_vars *vars)
+xpc_hb_allowed(short partid, struct xpc_vars *vars)
 {
         return ((vars->heartbeating_to_mask & (1UL << partid)) != 0);
 }
 
 static inline void
-xpc_allow_hb(partid_t partid, struct xpc_vars *vars)
+xpc_allow_hb(short partid, struct xpc_vars *vars)
 {
         u64 old_mask, new_mask;
 
@@ -190,7 +190,7 @@ xpc_allow_hb(partid_t partid, struct xpc_vars *vars)
 }
 
 static inline void
-xpc_disallow_hb(partid_t partid, struct xpc_vars *vars)
+xpc_disallow_hb(short partid, struct xpc_vars *vars)
 {
         u64 old_mask, new_mask;
 
@@ -408,11 +408,11 @@ struct xpc_notify {
  *      messages.
  */
 struct xpc_channel {
-        partid_t partid;        /* ID of remote partition connected */
+        short partid;           /* ID of remote partition connected */
         spinlock_t lock;        /* lock for updating this structure */
         u32 flags;              /* general flags */
 
-        enum xpc_retval reason; /* reason why channel is disconnect'g */
+        enum xp_retval reason;  /* reason why channel is disconnect'g */
         int reason_line;        /* line# disconnect initiated from */
 
         u16 number;             /* channel # */
@@ -522,7 +522,7 @@ struct xpc_partition {
         spinlock_t act_lock;    /* protect updating of act_state */
         u8 act_state;           /* from XPC HB viewpoint */
         u8 remote_vars_version; /* version# of partition's vars */
-        enum xpc_retval reason; /* reason partition is deactivating */
+        enum xp_retval reason;  /* reason partition is deactivating */
         int reason_line;        /* line# deactivation initiated from */
         int reactivate_nasid;   /* nasid in partition to reactivate */
 
@@ -615,7 +615,7 @@ struct xpc_partition {
 /* interval in seconds to print 'waiting disengagement' messages */
 #define XPC_DISENGAGE_PRINTMSG_INTERVAL         10
 
-#define XPC_PARTID(_p)  ((partid_t) ((_p) - &xpc_partitions[0]))
+#define XPC_PARTID(_p)  ((short)((_p) - &xpc_partitions[0]))
 
 /* found in xp_main.c */
 extern struct xpc_registration xpc_registrations[];
@@ -646,31 +646,31 @@ extern void xpc_allow_IPI_ops(void);
 extern void xpc_restrict_IPI_ops(void);
 extern int xpc_identify_act_IRQ_sender(void);
 extern int xpc_partition_disengaged(struct xpc_partition *);
-extern enum xpc_retval xpc_mark_partition_active(struct xpc_partition *);
+extern enum xp_retval xpc_mark_partition_active(struct xpc_partition *);
 extern void xpc_mark_partition_inactive(struct xpc_partition *);
 extern void xpc_discovery(void);
 extern void xpc_check_remote_hb(void);
 extern void xpc_deactivate_partition(const int, struct xpc_partition *,
-                                     enum xpc_retval);
-extern enum xpc_retval xpc_initiate_partid_to_nasids(partid_t, void *);
+                                     enum xp_retval);
+extern enum xp_retval xpc_initiate_partid_to_nasids(short, void *);
 
 /* found in xpc_channel.c */
 extern void xpc_initiate_connect(int);
 extern void xpc_initiate_disconnect(int);
-extern enum xpc_retval xpc_initiate_allocate(partid_t, int, u32, void **);
-extern enum xpc_retval xpc_initiate_send(partid_t, int, void *);
-extern enum xpc_retval xpc_initiate_send_notify(partid_t, int, void *,
-                                                xpc_notify_func, void *);
-extern void xpc_initiate_received(partid_t, int, void *);
-extern enum xpc_retval xpc_setup_infrastructure(struct xpc_partition *);
-extern enum xpc_retval xpc_pull_remote_vars_part(struct xpc_partition *);
+extern enum xp_retval xpc_initiate_allocate(short, int, u32, void **);
+extern enum xp_retval xpc_initiate_send(short, int, void *);
+extern enum xp_retval xpc_initiate_send_notify(short, int, void *,
+                                               xpc_notify_func, void *);
+extern void xpc_initiate_received(short, int, void *);
+extern enum xp_retval xpc_setup_infrastructure(struct xpc_partition *);
+extern enum xp_retval xpc_pull_remote_vars_part(struct xpc_partition *);
 extern void xpc_process_channel_activity(struct xpc_partition *);
 extern void xpc_connected_callout(struct xpc_channel *);
 extern void xpc_deliver_msg(struct xpc_channel *);
 extern void xpc_disconnect_channel(const int, struct xpc_channel *,
-                                   enum xpc_retval, unsigned long *);
-extern void xpc_disconnect_callout(struct xpc_channel *, enum xpc_retval);
-extern void xpc_partition_going_down(struct xpc_partition *, enum xpc_retval);
+                                   enum xp_retval, unsigned long *);
+extern void xpc_disconnect_callout(struct xpc_channel *, enum xp_retval);
+extern void xpc_partition_going_down(struct xpc_partition *, enum xp_retval);
 extern void xpc_teardown_infrastructure(struct xpc_partition *);
 
 static inline void
@@ -901,7 +901,7 @@ xpc_IPI_receive(AMO_t *amo)
         return FETCHOP_LOAD_OP(TO_AMO((u64)&amo->variable), FETCHOP_CLEAR);
 }
 
-static inline enum xpc_retval
+static inline enum xp_retval
 xpc_IPI_send(AMO_t *amo, u64 flag, int nasid, int phys_cpuid, int vector)
 {
         int ret = 0;
@@ -923,7 +923,7 @@ xpc_IPI_send(AMO_t *amo, u64 flag, int nasid, int phys_cpuid, int vector)
 
         local_irq_restore(irq_flags);
 
-        return ((ret == 0) ? xpcSuccess : xpcPioReadError);
+        return ((ret == 0) ? xpSuccess : xpPioReadError);
 }
 
 /*
@@ -992,7 +992,7 @@ xpc_notify_IRQ_send(struct xpc_channel *ch, u8 ipi_flag, char *ipi_flag_string,
                     unsigned long *irq_flags)
 {
         struct xpc_partition *part = &xpc_partitions[ch->partid];
-        enum xpc_retval ret;
+        enum xp_retval ret;
 
         if (likely(part->act_state != XPC_P_DEACTIVATING)) {
                 ret = xpc_IPI_send(part->remote_IPI_amo_va,
@@ -1001,7 +1001,7 @@ xpc_notify_IRQ_send(struct xpc_channel *ch, u8 ipi_flag, char *ipi_flag_string,
                                    part->remote_IPI_phys_cpuid, SGI_XPC_NOTIFY);
                 dev_dbg(xpc_chan, "%s sent to partid=%d, channel=%d, ret=%d\n",
                         ipi_flag_string, ch->partid, ch->number, ret);
-                if (unlikely(ret != xpcSuccess)) {
+                if (unlikely(ret != xpSuccess)) {
                         if (irq_flags != NULL)
                                 spin_unlock_irqrestore(&ch->lock, *irq_flags);
                         XPC_DEACTIVATE_PARTITION(part, ret);
@@ -1123,41 +1123,10 @@ xpc_IPI_init(int index)
         return amo;
 }
 
-static inline enum xpc_retval
+static inline enum xp_retval
 xpc_map_bte_errors(bte_result_t error)
 {
-        if (error == BTE_SUCCESS)
-                return xpcSuccess;
-
-        if (is_shub2()) {
-                if (BTE_VALID_SH2_ERROR(error))
-                        return xpcBteSh2Start + error;
-                return xpcBteUnmappedError;
-        }
-        switch (error) {
-        case BTE_SUCCESS:
-                return xpcSuccess;
-        case BTEFAIL_DIR:
-                return xpcBteDirectoryError;
-        case BTEFAIL_POISON:
-                return xpcBtePoisonError;
-        case BTEFAIL_WERR:
-                return xpcBteWriteError;
-        case BTEFAIL_ACCESS:
-                return xpcBteAccessError;
-        case BTEFAIL_PWERR:
-                return xpcBtePWriteError;
-        case BTEFAIL_PRERR:
-                return xpcBtePReadError;
-        case BTEFAIL_TOUT:
-                return xpcBteTimeOutError;
-        case BTEFAIL_XTERR:
-                return xpcBteXtalkError;
-        case BTEFAIL_NOTAVAIL:
-                return xpcBteNotAvailable;
-        default:
-                return xpcBteUnmappedError;
-        }
+        return ((error == BTE_SUCCESS) ? xpSuccess : xpBteCopyError);
 }
 
 /*
diff --git a/drivers/misc/sgi-xp/xpc_channel.c b/drivers/misc/sgi-xp/xpc_channel.c
index bfcb9ea968e9..9c90c2d55c08 100644
--- a/drivers/misc/sgi-xp/xpc_channel.c
+++ b/drivers/misc/sgi-xp/xpc_channel.c
@@ -53,7 +53,7 @@ xpc_kzalloc_cacheline_aligned(size_t size, gfp_t flags, void **base)
  * Set up the initial values for the XPartition Communication channels.
  */
 static void
-xpc_initialize_channels(struct xpc_partition *part, partid_t partid)
+xpc_initialize_channels(struct xpc_partition *part, short partid)
 {
         int ch_number;
         struct xpc_channel *ch;
@@ -90,12 +90,12 @@ xpc_initialize_channels(struct xpc_partition *part, partid_t partid)
  * Setup the infrastructure necessary to support XPartition Communication
  * between the specified remote partition and the local one.
  */
-enum xpc_retval
+enum xp_retval
 xpc_setup_infrastructure(struct xpc_partition *part)
 {
         int ret, cpuid;
         struct timer_list *timer;
-        partid_t partid = XPC_PARTID(part);
+        short partid = XPC_PARTID(part);
 
         /*
          * Zero out MOST of the entry for this partition. Only the fields
@@ -114,7 +114,7 @@ xpc_setup_infrastructure(struct xpc_partition *part)
                                  GFP_KERNEL);
         if (part->channels == NULL) {
                 dev_err(xpc_chan, "can't get memory for channels\n");
-                return xpcNoMemory;
+                return xpNoMemory;
         }
 
         part->nchannels = XPC_NCHANNELS;
@@ -129,7 +129,7 @@ xpc_setup_infrastructure(struct xpc_partition *part)
                 part->channels = NULL;
                 dev_err(xpc_chan, "can't get memory for local get/put "
                         "values\n");
-                return xpcNoMemory;
+                return xpNoMemory;
         }
 
         part->remote_GPs = xpc_kzalloc_cacheline_aligned(XPC_GP_SIZE,
@@ -143,7 +143,7 @@ xpc_setup_infrastructure(struct xpc_partition *part)
                 part->local_GPs = NULL;
                 kfree(part->channels);
                 part->channels = NULL;
-                return xpcNoMemory;
+                return xpNoMemory;
         }
 
         /* allocate all the required open and close args */
@@ -159,7 +159,7 @@ xpc_setup_infrastructure(struct xpc_partition *part)
                 part->local_GPs = NULL;
                 kfree(part->channels);
                 part->channels = NULL;
-                return xpcNoMemory;
+                return xpNoMemory;
         }
 
         part->remote_openclose_args =
@@ -175,7 +175,7 @@ xpc_setup_infrastructure(struct xpc_partition *part)
                 part->local_GPs = NULL;
                 kfree(part->channels);
                 part->channels = NULL;
-                return xpcNoMemory;
+                return xpNoMemory;
         }
 
         xpc_initialize_channels(part, partid);
@@ -209,7 +209,7 @@ xpc_setup_infrastructure(struct xpc_partition *part)
                 part->local_GPs = NULL;
                 kfree(part->channels);
                 part->channels = NULL;
-                return xpcLackOfResources;
+                return xpLackOfResources;
         }
 
         /* Setup a timer to check for dropped IPIs */
@@ -243,7 +243,7 @@ xpc_setup_infrastructure(struct xpc_partition *part)
         xpc_vars_part[partid].nchannels = part->nchannels;
         xpc_vars_part[partid].magic = XPC_VP_MAGIC1;
 
-        return xpcSuccess;
+        return xpSuccess;
 }
 
 /*
@@ -254,7 +254,7 @@ xpc_setup_infrastructure(struct xpc_partition *part)
  * dst must be a cacheline aligned virtual address on this partition.
  * cnt must be an cacheline sized
  */
-static enum xpc_retval
+static enum xp_retval
 xpc_pull_remote_cachelines(struct xpc_partition *part, void *dst,
                            const void *src, size_t cnt)
 {
@@ -270,7 +270,7 @@ xpc_pull_remote_cachelines(struct xpc_partition *part, void *dst,
         bte_ret = xp_bte_copy((u64)src, (u64)dst, (u64)cnt,
                               (BTE_NORMAL | BTE_WACQUIRE), NULL);
         if (bte_ret == BTE_SUCCESS)
-                return xpcSuccess;
+                return xpSuccess;
 
         dev_dbg(xpc_chan, "xp_bte_copy() from partition %d failed, ret=%d\n",
                 XPC_PARTID(part), bte_ret);
@@ -282,7 +282,7 @@ xpc_pull_remote_cachelines(struct xpc_partition *part, void *dst,
  * Pull the remote per partition specific variables from the specified
  * partition.
  */
-enum xpc_retval
+enum xp_retval
 xpc_pull_remote_vars_part(struct xpc_partition *part)
 {
         u8 buffer[L1_CACHE_BYTES * 2];
@@ -290,8 +290,8 @@ xpc_pull_remote_vars_part(struct xpc_partition *part)
             (struct xpc_vars_part *)L1_CACHE_ALIGN((u64)buffer);
         struct xpc_vars_part *pulled_entry;
         u64 remote_entry_cacheline_pa, remote_entry_pa;
-        partid_t partid = XPC_PARTID(part);
-        enum xpc_retval ret;
+        short partid = XPC_PARTID(part);
+        enum xp_retval ret;
 
         /* pull the cacheline that contains the variables we're interested in */
 
@@ -311,7 +311,7 @@ xpc_pull_remote_vars_part(struct xpc_partition *part)
         ret = xpc_pull_remote_cachelines(part, pulled_entry_cacheline,
                                          (void *)remote_entry_cacheline_pa,
                                          L1_CACHE_BYTES);
-        if (ret != xpcSuccess) {
+        if (ret != xpSuccess) {
                 dev_dbg(xpc_chan, "failed to pull XPC vars_part from "
                         "partition %d, ret=%d\n", partid, ret);
                 return ret;
@@ -326,11 +326,11 @@ xpc_pull_remote_vars_part(struct xpc_partition *part)
                         dev_dbg(xpc_chan, "partition %d's XPC vars_part for "
                                 "partition %d has bad magic value (=0x%lx)\n",
                                 partid, sn_partition_id, pulled_entry->magic);
-                        return xpcBadMagic;
+                        return xpBadMagic;
                 }
 
                 /* they've not been initialized yet */
-                return xpcRetry;
+                return xpRetry;
         }
 
         if (xpc_vars_part[partid].magic == XPC_VP_MAGIC1) {
@@ -344,7 +344,7 @@ xpc_pull_remote_vars_part(struct xpc_partition *part)
                         dev_err(xpc_chan, "partition %d's XPC vars_part for "
                                 "partition %d are not valid\n", partid,
                                 sn_partition_id);
-                        return xpcInvalidAddress;
+                        return xpInvalidAddress;
                 }
 
                 /* the variables we imported look to be valid */
@@ -366,9 +366,9 @@ xpc_pull_remote_vars_part(struct xpc_partition *part)
         }
 
         if (pulled_entry->magic == XPC_VP_MAGIC1)
-                return xpcRetry;
+                return xpRetry;
 
-        return xpcSuccess;
+        return xpSuccess;
 }
 
 /*
@@ -379,7 +379,7 @@ xpc_get_IPI_flags(struct xpc_partition *part)
 {
         unsigned long irq_flags;
         u64 IPI_amo;
-        enum xpc_retval ret;
+        enum xp_retval ret;
 
         /*
          * See if there are any IPI flags to be handled.
@@ -398,7 +398,7 @@ xpc_get_IPI_flags(struct xpc_partition *part)
                                                  (void *)part->
                                                  remote_openclose_args_pa,
                                                  XPC_OPENCLOSE_ARGS_SIZE);
-                if (ret != xpcSuccess) {
+                if (ret != xpSuccess) {
                         XPC_DEACTIVATE_PARTITION(part, ret);
 
                         dev_dbg(xpc_chan, "failed to pull openclose args from "
@@ -414,7 +414,7 @@ xpc_get_IPI_flags(struct xpc_partition *part)
                 ret = xpc_pull_remote_cachelines(part, part->remote_GPs,
                                                  (void *)part->remote_GPs_pa,
                                                  XPC_GP_SIZE);
-                if (ret != xpcSuccess) {
+                if (ret != xpSuccess) {
                         XPC_DEACTIVATE_PARTITION(part, ret);
 
                         dev_dbg(xpc_chan, "failed to pull GPs from partition "
@@ -431,7 +431,7 @@ xpc_get_IPI_flags(struct xpc_partition *part)
 /*
  * Allocate the local message queue and the notify queue.
  */
-static enum xpc_retval
+static enum xp_retval
 xpc_allocate_local_msgqueue(struct xpc_channel *ch)
 {
         unsigned long irq_flags;
@@ -464,18 +464,18 @@ xpc_allocate_local_msgqueue(struct xpc_channel *ch)
                         ch->local_nentries = nentries;
                 }
                 spin_unlock_irqrestore(&ch->lock, irq_flags);
-                return xpcSuccess;
+                return xpSuccess;
         }
 
         dev_dbg(xpc_chan, "can't get memory for local message queue and notify "
                 "queue, partid=%d, channel=%d\n", ch->partid, ch->number);
-        return xpcNoMemory;
+        return xpNoMemory;
 }
 
 /*
  * Allocate the cached remote message queue.
  */
-static enum xpc_retval
+static enum xp_retval
 xpc_allocate_remote_msgqueue(struct xpc_channel *ch)
 {
         unsigned long irq_flags;
@@ -502,12 +502,12 @@ xpc_allocate_remote_msgqueue(struct xpc_channel *ch)
                         ch->remote_nentries = nentries;
                 }
                 spin_unlock_irqrestore(&ch->lock, irq_flags);
-                return xpcSuccess;
+                return xpSuccess;
         }
 
         dev_dbg(xpc_chan, "can't get memory for cached remote message queue, "
                 "partid=%d, channel=%d\n", ch->partid, ch->number);
-        return xpcNoMemory;
+        return xpNoMemory;
 }
 
 /*
@@ -515,20 +515,20 @@ xpc_allocate_remote_msgqueue(struct xpc_channel *ch)
  *
  * Note: Assumes all of the channel sizes are filled in.
  */
-static enum xpc_retval
+static enum xp_retval
 xpc_allocate_msgqueues(struct xpc_channel *ch)
 {
         unsigned long irq_flags;
-        enum xpc_retval ret;
+        enum xp_retval ret;
 
         DBUG_ON(ch->flags & XPC_C_SETUP);
 
         ret = xpc_allocate_local_msgqueue(ch);
-        if (ret != xpcSuccess)
+        if (ret != xpSuccess)
                 return ret;
 
         ret = xpc_allocate_remote_msgqueue(ch);
-        if (ret != xpcSuccess) {
+        if (ret != xpSuccess) {
                 kfree(ch->local_msgqueue_base);
                 ch->local_msgqueue = NULL;
                 kfree(ch->notify_queue);
@@ -540,7 +540,7 @@ xpc_allocate_msgqueues(struct xpc_channel *ch)
         ch->flags |= XPC_C_SETUP;
         spin_unlock_irqrestore(&ch->lock, irq_flags);
 
-        return xpcSuccess;
+        return xpSuccess;
 }
 
 /*
@@ -552,7 +552,7 @@ xpc_allocate_msgqueues(struct xpc_channel *ch)
 static void
 xpc_process_connect(struct xpc_channel *ch, unsigned long *irq_flags)
 {
-        enum xpc_retval ret;
+        enum xp_retval ret;
 
         DBUG_ON(!spin_is_locked(&ch->lock));
 
@@ -568,7 +568,7 @@ xpc_process_connect(struct xpc_channel *ch, unsigned long *irq_flags)
                 ret = xpc_allocate_msgqueues(ch);
                 spin_lock_irqsave(&ch->lock, *irq_flags);
 
-                if (ret != xpcSuccess)
+                if (ret != xpSuccess)
                         XPC_DISCONNECT_CHANNEL(ch, ret, irq_flags);
 
                 if (ch->flags & (XPC_C_CONNECTED | XPC_C_DISCONNECTING))
@@ -603,7 +603,7 @@ xpc_process_connect(struct xpc_channel *ch, unsigned long *irq_flags)
  * Notify those who wanted to be notified upon delivery of their message.
  */
 static void
-xpc_notify_senders(struct xpc_channel *ch, enum xpc_retval reason, s64 put)
+xpc_notify_senders(struct xpc_channel *ch, enum xp_retval reason, s64 put)
 {
         struct xpc_notify *notify;
         u8 notify_type;
@@ -748,7 +748,7 @@ xpc_process_disconnect(struct xpc_channel *ch, unsigned long *irq_flags)
 
         if (ch->flags & XPC_C_DISCONNECTINGCALLOUT_MADE) {
                 spin_unlock_irqrestore(&ch->lock, *irq_flags);
-                xpc_disconnect_callout(ch, xpcDisconnected);
+                xpc_disconnect_callout(ch, xpDisconnected);
                 spin_lock_irqsave(&ch->lock, *irq_flags);
         }
 
@@ -791,7 +791,7 @@ xpc_process_openclose_IPI(struct xpc_partition *part, int ch_number,
         struct xpc_openclose_args *args =
             &part->remote_openclose_args[ch_number];
         struct xpc_channel *ch = &part->channels[ch_number];
-        enum xpc_retval reason;
+        enum xp_retval reason;
 
         spin_lock_irqsave(&ch->lock, irq_flags);
 
@@ -871,10 +871,10 @@ again:
 
                 if (!(ch->flags & XPC_C_DISCONNECTING)) {
                         reason = args->reason;
-                        if (reason <= xpcSuccess || reason > xpcUnknownReason)
-                                reason = xpcUnknownReason;
-                        else if (reason == xpcUnregistering)
-                                reason = xpcOtherUnregistering;
+                        if (reason <= xpSuccess || reason > xpUnknownReason)
+                                reason = xpUnknownReason;
+                        else if (reason == xpUnregistering)
+                                reason = xpOtherUnregistering;
 
                         XPC_DISCONNECT_CHANNEL(ch, reason, &irq_flags);
 
@@ -961,7 +961,7 @@ again:
 
                 if (ch->flags & XPC_C_OPENREQUEST) {
                         if (args->msg_size != ch->msg_size) {
-                                XPC_DISCONNECT_CHANNEL(ch, xpcUnequalMsgSizes,
+                                XPC_DISCONNECT_CHANNEL(ch, xpUnequalMsgSizes,
                                                        &irq_flags);
                                 spin_unlock_irqrestore(&ch->lock, irq_flags);
                                 return;
@@ -991,7 +991,7 @@ again:
                         return;
                 }
                 if (!(ch->flags & XPC_C_OPENREQUEST)) {
-                        XPC_DISCONNECT_CHANNEL(ch, xpcOpenCloseError,
+                        XPC_DISCONNECT_CHANNEL(ch, xpOpenCloseError,
                                                &irq_flags);
                         spin_unlock_irqrestore(&ch->lock, irq_flags);
                         return;
@@ -1042,18 +1042,18 @@ again:
 /*
  * Attempt to establish a channel connection to a remote partition.
  */
-static enum xpc_retval
+static enum xp_retval
 xpc_connect_channel(struct xpc_channel *ch)
 {
         unsigned long irq_flags;
         struct xpc_registration *registration = &xpc_registrations[ch->number];
 
         if (mutex_trylock(&registration->mutex) == 0)
-                return xpcRetry;
+                return xpRetry;
 
         if (!XPC_CHANNEL_REGISTERED(ch->number)) {
                 mutex_unlock(&registration->mutex);
-                return xpcUnregistered;
+                return xpUnregistered;
         }
 
         spin_lock_irqsave(&ch->lock, irq_flags);
@@ -1095,10 +1095,10 @@ xpc_connect_channel(struct xpc_channel *ch)
                          * the channel lock as needed.
                          */
                         mutex_unlock(&registration->mutex);
-                        XPC_DISCONNECT_CHANNEL(ch, xpcUnequalMsgSizes,
+                        XPC_DISCONNECT_CHANNEL(ch, xpUnequalMsgSizes,
                                                &irq_flags);
                         spin_unlock_irqrestore(&ch->lock, irq_flags);
-                        return xpcUnequalMsgSizes;
+                        return xpUnequalMsgSizes;
                 }
         } else {
                 ch->msg_size = registration->msg_size;
@@ -1120,7 +1120,7 @@ xpc_connect_channel(struct xpc_channel *ch)
 
         spin_unlock_irqrestore(&ch->lock, irq_flags);
 
-        return xpcSuccess;
+        return xpSuccess;
 }
 
 /*
@@ -1203,7 +1203,7 @@ xpc_process_msg_IPI(struct xpc_partition *part, int ch_number)
                          * Notify senders that messages sent have been
                          * received and delivered by the other side.
                          */
-                        xpc_notify_senders(ch, xpcMsgDelivered,
+                        xpc_notify_senders(ch, xpMsgDelivered,
                                            ch->remote_GP.get);
                 }
 
@@ -1335,7 +1335,7 @@ xpc_process_channel_activity(struct xpc_partition *part)
  * at the same time.
  */
 void
-xpc_partition_going_down(struct xpc_partition *part, enum xpc_retval reason)
+xpc_partition_going_down(struct xpc_partition *part, enum xp_retval reason)
 {
         unsigned long irq_flags;
         int ch_number;
@@ -1375,7 +1375,7 @@ xpc_partition_going_down(struct xpc_partition *part, enum xpc_retval reason)
 void
 xpc_teardown_infrastructure(struct xpc_partition *part)
 {
-        partid_t partid = XPC_PARTID(part);
+        short partid = XPC_PARTID(part);
 
         /*
          * We start off by making this partition inaccessible to local
@@ -1428,7 +1428,7 @@ xpc_teardown_infrastructure(struct xpc_partition *part)
 void
 xpc_initiate_connect(int ch_number)
 {
-        partid_t partid;
+        short partid;
         struct xpc_partition *part;
         struct xpc_channel *ch;
 
@@ -1456,13 +1456,13 @@ xpc_connected_callout(struct xpc_channel *ch)
         /* let the registerer know that a connection has been established */
 
         if (ch->func != NULL) {
-                dev_dbg(xpc_chan, "ch->func() called, reason=xpcConnected, "
+                dev_dbg(xpc_chan, "ch->func() called, reason=xpConnected, "
                         "partid=%d, channel=%d\n", ch->partid, ch->number);
 
-                ch->func(xpcConnected, ch->partid, ch->number,
+                ch->func(xpConnected, ch->partid, ch->number,
                          (void *)(u64)ch->local_nentries, ch->key);
 
-                dev_dbg(xpc_chan, "ch->func() returned, reason=xpcConnected, "
+                dev_dbg(xpc_chan, "ch->func() returned, reason=xpConnected, "
                         "partid=%d, channel=%d\n", ch->partid, ch->number);
         }
 }
@@ -1484,7 +1484,7 @@ void
 xpc_initiate_disconnect(int ch_number)
 {
         unsigned long irq_flags;
-        partid_t partid;
+        short partid;
         struct xpc_partition *part;
         struct xpc_channel *ch;
 
@@ -1503,7 +1503,7 @@ xpc_initiate_disconnect(int ch_number)
                         if (!(ch->flags & XPC_C_DISCONNECTED)) {
                                 ch->flags |= XPC_C_WDISCONNECT;
 
-                                XPC_DISCONNECT_CHANNEL(ch, xpcUnregistering,
+                                XPC_DISCONNECT_CHANNEL(ch, xpUnregistering,
                                                        &irq_flags);
                         }
 
@@ -1528,7 +1528,7 @@ xpc_initiate_disconnect(int ch_number)
  */
 void
 xpc_disconnect_channel(const int line, struct xpc_channel *ch,
-                       enum xpc_retval reason, unsigned long *irq_flags)
+                       enum xp_retval reason, unsigned long *irq_flags)
 {
         u32 channel_was_connected = (ch->flags & XPC_C_CONNECTED);
 
@@ -1563,7 +1563,7 @@ xpc_disconnect_channel(const int line, struct xpc_channel *ch,
 
         } else if ((ch->flags & XPC_C_CONNECTEDCALLOUT_MADE) &&
                    !(ch->flags & XPC_C_DISCONNECTINGCALLOUT)) {
-                /* start a kthread that will do the xpcDisconnecting callout */
+                /* start a kthread that will do the xpDisconnecting callout */
                 xpc_create_kthreads(ch, 1, 1);
         }
 
@@ -1575,7 +1575,7 @@ xpc_disconnect_channel(const int line, struct xpc_channel *ch,
 }
 
 void
-xpc_disconnect_callout(struct xpc_channel *ch, enum xpc_retval reason)
+xpc_disconnect_callout(struct xpc_channel *ch, enum xp_retval reason)
 {
         /*
          * Let the channel's registerer know that the channel is being
@@ -1598,13 +1598,13 @@ xpc_disconnect_callout(struct xpc_channel *ch, enum xpc_retval reason)
  * Wait for a message entry to become available for the specified channel,
  * but don't wait any longer than 1 jiffy.
  */
-static enum xpc_retval
+static enum xp_retval
 xpc_allocate_msg_wait(struct xpc_channel *ch)
 {
-        enum xpc_retval ret;
+        enum xp_retval ret;
 
         if (ch->flags & XPC_C_DISCONNECTING) {
-                DBUG_ON(ch->reason == xpcInterrupted);
+                DBUG_ON(ch->reason == xpInterrupted);
                 return ch->reason;
         }
 
@@ -1614,11 +1614,11 @@ xpc_allocate_msg_wait(struct xpc_channel *ch)
 
         if (ch->flags & XPC_C_DISCONNECTING) {
                 ret = ch->reason;
-                DBUG_ON(ch->reason == xpcInterrupted);
+                DBUG_ON(ch->reason == xpInterrupted);
         } else if (ret == 0) {
-                ret = xpcTimeout;
+                ret = xpTimeout;
         } else {
-                ret = xpcInterrupted;
+                ret = xpInterrupted;
         }
 
         return ret;
@@ -1628,12 +1628,12 @@ xpc_allocate_msg_wait(struct xpc_channel *ch)
  * Allocate an entry for a message from the message queue associated with the
  * specified channel.
  */
-static enum xpc_retval
+static enum xp_retval
 xpc_allocate_msg(struct xpc_channel *ch, u32 flags,
                  struct xpc_msg **address_of_msg)
 {
         struct xpc_msg *msg;
-        enum xpc_retval ret;
+        enum xp_retval ret;
         s64 put;
 
         /* this reference will be dropped in xpc_send_msg() */
@@ -1645,7 +1645,7 @@ xpc_allocate_msg(struct xpc_channel *ch, u32 flags,
         }
         if (!(ch->flags & XPC_C_CONNECTED)) {
                 xpc_msgqueue_deref(ch);
-                return xpcNotConnected;
+                return xpNotConnected;
         }
 
         /*
@@ -1653,7 +1653,7 @@ xpc_allocate_msg(struct xpc_channel *ch, u32 flags,
          * If none are available, we'll make sure that we grab the latest
          * GP values.
          */
-        ret = xpcTimeout;
+        ret = xpTimeout;
 
         while (1) {
 
@@ -1683,16 +1683,16 @@ xpc_allocate_msg(struct xpc_channel *ch, u32 flags,
                  * that will cause the IPI handler to fetch the latest
                  * GP values as if an IPI was sent by the other side.
                  */
-                if (ret == xpcTimeout)
+                if (ret == xpTimeout)
                         xpc_IPI_send_local_msgrequest(ch);
 
                 if (flags & XPC_NOWAIT) {
                         xpc_msgqueue_deref(ch);
-                        return xpcNoWait;
+                        return xpNoWait;
                 }
 
                 ret = xpc_allocate_msg_wait(ch);
-                if (ret != xpcInterrupted && ret != xpcTimeout) {
+                if (ret != xpInterrupted && ret != xpTimeout) {
                         xpc_msgqueue_deref(ch);
                         return ret;
                 }
@@ -1711,7 +1711,7 @@ xpc_allocate_msg(struct xpc_channel *ch, u32 flags,
 
         *address_of_msg = msg;
 
-        return xpcSuccess;
+        return xpSuccess;
 }
 
 /*
@@ -1727,11 +1727,11 @@ xpc_allocate_msg(struct xpc_channel *ch, u32 flags,
  *      payload - address of the allocated payload area pointer (filled in on
  *                return) in which the user-defined message is constructed.
  */
-enum xpc_retval
-xpc_initiate_allocate(partid_t partid, int ch_number, u32 flags, void **payload)
+enum xp_retval
+xpc_initiate_allocate(short partid, int ch_number, u32 flags, void **payload)
 {
         struct xpc_partition *part = &xpc_partitions[partid];
-        enum xpc_retval ret = xpcUnknownReason;
+        enum xp_retval ret = xpUnknownReason;
         struct xpc_msg *msg = NULL;
 
         DBUG_ON(partid <= 0 || partid >= XP_MAX_PARTITIONS);
@@ -1814,11 +1814,11 @@ xpc_send_msgs(struct xpc_channel *ch, s64 initial_put)
  * local message queue's Put value and sends an IPI to the partition the
  * message is being sent to.
  */
-static enum xpc_retval
+static enum xp_retval
 xpc_send_msg(struct xpc_channel *ch, struct xpc_msg *msg, u8 notify_type,
              xpc_notify_func func, void *key)
 {
-        enum xpc_retval ret = xpcSuccess;
+        enum xp_retval ret = xpSuccess;
         struct xpc_notify *notify = notify;
         s64 put, msg_number = msg->number;
 
@@ -1908,12 +1908,12 @@ xpc_send_msg(struct xpc_channel *ch, struct xpc_msg *msg, u8 notify_type,
  *      payload - pointer to the payload area allocated via
  *                      xpc_initiate_allocate().
  */
-enum xpc_retval
-xpc_initiate_send(partid_t partid, int ch_number, void *payload)
+enum xp_retval
+xpc_initiate_send(short partid, int ch_number, void *payload)
 {
         struct xpc_partition *part = &xpc_partitions[partid];
         struct xpc_msg *msg = XPC_MSG_ADDRESS(payload);
-        enum xpc_retval ret;
+        enum xp_retval ret;
 
         dev_dbg(xpc_chan, "msg=0x%p, partid=%d, channel=%d\n", (void *)msg,
                 partid, ch_number);
@@ -1957,13 +1957,13 @@ xpc_initiate_send(partid_t partid, int ch_number, void *payload)
  *                receipt. THIS FUNCTION MUST BE NON-BLOCKING.
  *      key - user-defined key to be passed to the function when it's called.
  */
-enum xpc_retval
-xpc_initiate_send_notify(partid_t partid, int ch_number, void *payload,
+enum xp_retval
+xpc_initiate_send_notify(short partid, int ch_number, void *payload,
                          xpc_notify_func func, void *key)
 {
         struct xpc_partition *part = &xpc_partitions[partid];
         struct xpc_msg *msg = XPC_MSG_ADDRESS(payload);
-        enum xpc_retval ret;
+        enum xp_retval ret;
 
         dev_dbg(xpc_chan, "msg=0x%p, partid=%d, channel=%d\n", (void *)msg,
                 partid, ch_number);
@@ -1985,7 +1985,7 @@ xpc_pull_remote_msg(struct xpc_channel *ch, s64 get)
         struct xpc_msg *remote_msg, *msg;
         u32 msg_index, nmsgs;
         u64 msg_offset;
-        enum xpc_retval ret;
+        enum xp_retval ret;
 
         if (mutex_lock_interruptible(&ch->msg_to_pull_mutex) != 0) {
                 /* we were interrupted by a signal */
@@ -2012,7 +2012,7 @@ xpc_pull_remote_msg(struct xpc_channel *ch, s64 get)
 
                 ret = xpc_pull_remote_cachelines(part, msg, remote_msg,
                                                  nmsgs * ch->msg_size);
-                if (ret != xpcSuccess) {
+                if (ret != xpSuccess) {
 
                         dev_dbg(xpc_chan, "failed to pull %d msgs starting with"
                                 " msg %ld from partition %d, channel=%d, "
@@ -2112,7 +2112,7 @@ xpc_deliver_msg(struct xpc_channel *ch)
                                 ch->number);
 
                         /* deliver the message to its intended recipient */
-                        ch->func(xpcMsgReceived, ch->partid, ch->number,
+                        ch->func(xpMsgReceived, ch->partid, ch->number,
                                  &msg->payload, ch->key);
 
                         dev_dbg(xpc_chan, "ch->func() returned, msg=0x%p, "
@@ -2203,7 +2203,7 @@ xpc_acknowledge_msgs(struct xpc_channel *ch, s64 initial_get, u8 msg_flags)
  *                      xpc_initiate_allocate().
  */
 void
-xpc_initiate_received(partid_t partid, int ch_number, void *payload)
+xpc_initiate_received(short partid, int ch_number, void *payload)
 {
         struct xpc_partition *part = &xpc_partitions[partid];
         struct xpc_channel *ch;
diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
index f673ba90eb0e..08256ed0d9a6 100644
--- a/drivers/misc/sgi-xp/xpc_main.c
+++ b/drivers/misc/sgi-xp/xpc_main.c
@@ -315,13 +315,13 @@ xpc_initiate_discovery(void *ignore)
  * the XPC per partition variables from the remote partition and waiting for
  * the remote partition to pull ours.
  */
-static enum xpc_retval
+static enum xp_retval
 xpc_make_first_contact(struct xpc_partition *part)
 {
-        enum xpc_retval ret;
+        enum xp_retval ret;
 
-        while ((ret = xpc_pull_remote_vars_part(part)) != xpcSuccess) {
-                if (ret != xpcRetry) {
+        while ((ret = xpc_pull_remote_vars_part(part)) != xpSuccess) {
+                if (ret != xpRetry) {
                         XPC_DEACTIVATE_PARTITION(part, ret);
                         return ret;
                 }
@@ -406,7 +406,7 @@ xpc_partition_up(struct xpc_partition *part)
 
         dev_dbg(xpc_chan, "activating partition %d\n", XPC_PARTID(part));
 
-        if (xpc_setup_infrastructure(part) != xpcSuccess)
+        if (xpc_setup_infrastructure(part) != xpSuccess)
                 return;
 
         /*
@@ -418,7 +418,7 @@ xpc_partition_up(struct xpc_partition *part)
 
         (void)xpc_part_ref(part);       /* this will always succeed */
 
-        if (xpc_make_first_contact(part) == xpcSuccess)
+        if (xpc_make_first_contact(part) == xpSuccess)
                 xpc_channel_mgr(part);
 
         xpc_part_deref(part);
@@ -429,7 +429,7 @@ xpc_partition_up(struct xpc_partition *part)
 static int
 xpc_activating(void *__partid)
 {
-        partid_t partid = (u64)__partid;
+        short partid = (u64)__partid;
         struct xpc_partition *part = &xpc_partitions[partid];
         unsigned long irq_flags;
 
@@ -470,7 +470,7 @@ xpc_activating(void *__partid)
 
                 spin_lock_irqsave(&part->act_lock, irq_flags);
                 part->act_state = XPC_P_INACTIVE;
-                XPC_SET_REASON(part, xpcPhysAddrRegFailed, __LINE__);
+                XPC_SET_REASON(part, xpPhysAddrRegFailed, __LINE__);
                 spin_unlock_irqrestore(&part->act_lock, irq_flags);
                 part->remote_rp_pa = 0;
                 return 0;
@@ -488,7 +488,7 @@ xpc_activating(void *__partid)
         xpc_disallow_hb(partid, xpc_vars);
         xpc_mark_partition_inactive(part);
 
-        if (part->reason == xpcReactivating) {
+        if (part->reason == xpReactivating) {
                 /* interrupting ourselves results in activating partition */
                 xpc_IPI_send_reactivate(part);
         }
@@ -499,7 +499,7 @@ xpc_activating(void *__partid)
 void
 xpc_activate_partition(struct xpc_partition *part)
 {
-        partid_t partid = XPC_PARTID(part);
+        short partid = XPC_PARTID(part);
         unsigned long irq_flags;
         struct task_struct *kthread;
 
@@ -508,7 +508,7 @@ xpc_activate_partition(struct xpc_partition *part)
         DBUG_ON(part->act_state != XPC_P_INACTIVE);
 
         part->act_state = XPC_P_ACTIVATION_REQ;
-        XPC_SET_REASON(part, xpcCloneKThread, __LINE__);
+        XPC_SET_REASON(part, xpCloneKThread, __LINE__);
 
         spin_unlock_irqrestore(&part->act_lock, irq_flags);
 
@@ -517,7 +517,7 @@ xpc_activate_partition(struct xpc_partition *part)
         if (IS_ERR(kthread)) {
                 spin_lock_irqsave(&part->act_lock, irq_flags);
                 part->act_state = XPC_P_INACTIVE;
-                XPC_SET_REASON(part, xpcCloneKThreadFailed, __LINE__);
+                XPC_SET_REASON(part, xpCloneKThreadFailed, __LINE__);
                 spin_unlock_irqrestore(&part->act_lock, irq_flags);
         }
 }
@@ -541,7 +541,7 @@ xpc_activate_partition(struct xpc_partition *part)
 irqreturn_t
 xpc_notify_IRQ_handler(int irq, void *dev_id)
 {
-        partid_t partid = (partid_t) (u64)dev_id;
+        short partid = (short)(u64)dev_id;
         struct xpc_partition *part = &xpc_partitions[partid];
 
         DBUG_ON(partid <= 0 || partid >= XP_MAX_PARTITIONS);
@@ -643,7 +643,7 @@ xpc_kthread_waitmsgs(struct xpc_partition *part, struct xpc_channel *ch)
 static int
 xpc_kthread_start(void *args)
 {
-        partid_t partid = XPC_UNPACK_ARG1(args);
+        short partid = XPC_UNPACK_ARG1(args);
         u16 ch_number = XPC_UNPACK_ARG2(args);
         struct xpc_partition *part = &xpc_partitions[partid];
         struct xpc_channel *ch;
@@ -696,7 +696,7 @@ xpc_kthread_start(void *args)
                 ch->flags |= XPC_C_DISCONNECTINGCALLOUT;
                 spin_unlock_irqrestore(&ch->lock, irq_flags);
 
-                xpc_disconnect_callout(ch, xpcDisconnecting);
+                xpc_disconnect_callout(ch, xpDisconnecting);
 
                 spin_lock_irqsave(&ch->lock, irq_flags);
                 ch->flags |= XPC_C_DISCONNECTINGCALLOUT_MADE;
@@ -776,7 +776,7 @@ xpc_create_kthreads(struct xpc_channel *ch, int needed,
                          * then we'll deadlock if all other kthreads assigned
                          * to this channel are blocked in the channel's
                          * registerer, because the only thing that will unblock
-                         * them is the xpcDisconnecting callout that this
+                         * them is the xpDisconnecting callout that this
                          * failed kthread_run() would have made.
                          */
 
@@ -796,7 +796,7 @@ xpc_create_kthreads(struct xpc_channel *ch, int needed,
                                  * to function.
                                  */
                                 spin_lock_irqsave(&ch->lock, irq_flags);
-                                XPC_DISCONNECT_CHANNEL(ch, xpcLackOfResources,
+                                XPC_DISCONNECT_CHANNEL(ch, xpLackOfResources,
                                                        &irq_flags);
                                 spin_unlock_irqrestore(&ch->lock, irq_flags);
                         }
@@ -809,7 +809,7 @@ void
 xpc_disconnect_wait(int ch_number)
 {
         unsigned long irq_flags;
-        partid_t partid;
+        short partid;
         struct xpc_partition *part;
         struct xpc_channel *ch;
         int wakeup_channel_mgr;
@@ -857,9 +857,9 @@ xpc_disconnect_wait(int ch_number)
 }
 
 static void
-xpc_do_exit(enum xpc_retval reason)
+xpc_do_exit(enum xp_retval reason)
 {
-        partid_t partid;
+        short partid;
         int active_part_count, printed_waiting_msg = 0;
         struct xpc_partition *part;
         unsigned long printmsg_time, disengage_request_timeout = 0;
@@ -955,7 +955,7 @@ xpc_do_exit(enum xpc_retval reason)
         del_timer_sync(&xpc_hb_timer);
         DBUG_ON(xpc_vars->heartbeating_to_mask != 0);
 
-        if (reason == xpcUnloading) {
+        if (reason == xpUnloading) {
                 /* take ourselves off of the reboot_notifier_list */
                 (void)unregister_reboot_notifier(&xpc_reboot_notifier);
 
@@ -981,20 +981,20 @@ xpc_do_exit(enum xpc_retval reason)
 static int
 xpc_system_reboot(struct notifier_block *nb, unsigned long event, void *unused)
 {
-        enum xpc_retval reason;
+        enum xp_retval reason;
 
         switch (event) {
         case SYS_RESTART:
-                reason = xpcSystemReboot;
+                reason = xpSystemReboot;
                 break;
         case SYS_HALT:
-                reason = xpcSystemHalt;
+                reason = xpSystemHalt;
                 break;
         case SYS_POWER_OFF:
-                reason = xpcSystemPoweroff;
+                reason = xpSystemPoweroff;
                 break;
         default:
-                reason = xpcSystemGoingDown;
+                reason = xpSystemGoingDown;
         }
 
         xpc_do_exit(reason);
@@ -1008,7 +1008,7 @@ static void
 xpc_die_disengage(void)
 {
         struct xpc_partition *part;
-        partid_t partid;
+        short partid;
         unsigned long engaged;
         long time, printmsg_time, disengage_request_timeout;
 
@@ -1124,7 +1124,7 @@ int __init
 xpc_init(void)
 {
         int ret;
-        partid_t partid;
+        short partid;
         struct xpc_partition *part;
         struct task_struct *kthread;
         size_t buf_size;
@@ -1279,7 +1279,7 @@ xpc_init(void)
                 /* mark this new thread as a non-starter */
                 complete(&xpc_discovery_exited);
 
-                xpc_do_exit(xpcUnloading);
+                xpc_do_exit(xpUnloading);
                 return -EBUSY;
         }
 
@@ -1297,7 +1297,7 @@ module_init(xpc_init);
 void __exit
 xpc_exit(void)
 {
-        xpc_do_exit(xpcUnloading);
+        xpc_do_exit(xpUnloading);
 }
 
 module_exit(xpc_exit);
diff --git a/drivers/misc/sgi-xp/xpc_partition.c b/drivers/misc/sgi-xp/xpc_partition.c
index acd3fd4285d7..7dd4b5812c42 100644
--- a/drivers/misc/sgi-xp/xpc_partition.c
+++ b/drivers/misc/sgi-xp/xpc_partition.c
@@ -403,7 +403,7 @@ xpc_check_remote_hb(void)
 {
         struct xpc_vars *remote_vars;
         struct xpc_partition *part;
-        partid_t partid;
+        short partid;
         bte_result_t bres;
 
         remote_vars = (struct xpc_vars *)xpc_remote_copy_buffer;
@@ -444,7 +444,7 @@ xpc_check_remote_hb(void)
                      (remote_vars->heartbeat_offline == 0)) ||
                     !xpc_hb_allowed(sn_partition_id, remote_vars)) {
 
-                        XPC_DEACTIVATE_PARTITION(part, xpcNoHeartbeat);
+                        XPC_DEACTIVATE_PARTITION(part, xpNoHeartbeat);
                         continue;
                 }
 
@@ -459,7 +459,7 @@ xpc_check_remote_hb(void)
  * is large enough to contain a copy of their reserved page header and
  * part_nasids mask.
  */
-static enum xpc_retval
+static enum xp_retval
 xpc_get_remote_rp(int nasid, u64 *discovered_nasids,
                   struct xpc_rsvd_page *remote_rp, u64 *remote_rp_pa)
 {
@@ -469,7 +469,7 @@ xpc_get_remote_rp(int nasid, u64 *discovered_nasids,
 
         *remote_rp_pa = xpc_get_rsvd_page_pa(nasid);
         if (*remote_rp_pa == 0)
-                return xpcNoRsvdPageAddr;
+                return xpNoRsvdPageAddr;
 
         /* pull over the reserved page header and part_nasids mask */
         bres = xp_bte_copy(*remote_rp_pa, (u64)remote_rp,
@@ -489,18 +489,18 @@ xpc_get_remote_rp(int nasid, u64 *discovered_nasids,
 
         if (remote_rp->partid < 1 ||
             remote_rp->partid > (XP_MAX_PARTITIONS - 1)) {
-                return xpcInvalidPartid;
+                return xpInvalidPartid;
         }
 
         if (remote_rp->partid == sn_partition_id)
-                return xpcLocalPartid;
+                return xpLocalPartid;
 
         if (XPC_VERSION_MAJOR(remote_rp->version) !=
             XPC_VERSION_MAJOR(XPC_RP_VERSION)) {
-                return xpcBadVersion;
+                return xpBadVersion;
         }
 
-        return xpcSuccess;
+        return xpSuccess;
 }
 
 /*
@@ -509,13 +509,13 @@ xpc_get_remote_rp(int nasid, u64 *discovered_nasids,
  * remote_vars points to a buffer that is cacheline aligned for BTE copies and
  * assumed to be of size XPC_RP_VARS_SIZE.
  */
-static enum xpc_retval
+static enum xp_retval
 xpc_get_remote_vars(u64 remote_vars_pa, struct xpc_vars *remote_vars)
 {
         int bres;
 
         if (remote_vars_pa == 0)
-                return xpcVarsNotSet;
+                return xpVarsNotSet;
 
         /* pull over the cross partition variables */
         bres = xp_bte_copy(remote_vars_pa, (u64)remote_vars, XPC_RP_VARS_SIZE,
@@ -525,10 +525,10 @@ xpc_get_remote_vars(u64 remote_vars_pa, struct xpc_vars *remote_vars)
 
         if (XPC_VERSION_MAJOR(remote_vars->version) !=
             XPC_VERSION_MAJOR(XPC_V_VERSION)) {
-                return xpcBadVersion;
+                return xpBadVersion;
         }
 
-        return xpcSuccess;
+        return xpSuccess;
 }
 
 /*
@@ -604,16 +604,16 @@ xpc_identify_act_IRQ_req(int nasid)
         int reactivate = 0;
         int stamp_diff;
         struct timespec remote_rp_stamp = { 0, 0 };
-        partid_t partid;
+        short partid;
         struct xpc_partition *part;
-        enum xpc_retval ret;
+        enum xp_retval ret;
 
         /* pull over the reserved page structure */
 
         remote_rp = (struct xpc_rsvd_page *)xpc_remote_copy_buffer;
 
         ret = xpc_get_remote_rp(nasid, NULL, remote_rp, &remote_rp_pa);
-        if (ret != xpcSuccess) {
+        if (ret != xpSuccess) {
                 dev_warn(xpc_part, "unable to get reserved page from nasid %d, "
                          "which sent interrupt, reason=%d\n", nasid, ret);
                 return;
@@ -632,7 +632,7 @@ xpc_identify_act_IRQ_req(int nasid)
         remote_vars = (struct xpc_vars *)xpc_remote_copy_buffer;
 
         ret = xpc_get_remote_vars(remote_vars_pa, remote_vars);
-        if (ret != xpcSuccess) {
+        if (ret != xpSuccess) {
 
                 dev_warn(xpc_part, "unable to get XPC variables from nasid %d, "
                          "which sent interrupt, reason=%d\n", nasid, ret);
@@ -699,7 +699,7 @@ xpc_identify_act_IRQ_req(int nasid)
                                           &remote_rp_stamp, remote_rp_pa,
                                           remote_vars_pa, remote_vars);
                 part->reactivate_nasid = nasid;
-                XPC_DEACTIVATE_PARTITION(part, xpcReactivating);
+                XPC_DEACTIVATE_PARTITION(part, xpReactivating);
                 return;
         }
 
@@ -754,11 +754,11 @@ xpc_identify_act_IRQ_req(int nasid)
 
         if (reactivate) {
                 part->reactivate_nasid = nasid;
-                XPC_DEACTIVATE_PARTITION(part, xpcReactivating);
+                XPC_DEACTIVATE_PARTITION(part, xpReactivating);
 
         } else if (XPC_SUPPORTS_DISENGAGE_REQUEST(part->remote_vars_version) &&
                    xpc_partition_disengage_requested(1UL << partid)) {
-                XPC_DEACTIVATE_PARTITION(part, xpcOtherGoingDown);
+                XPC_DEACTIVATE_PARTITION(part, xpOtherGoingDown);
         }
 }
 
@@ -825,7 +825,7 @@ xpc_identify_act_IRQ_sender(void)
 int
 xpc_partition_disengaged(struct xpc_partition *part)
 {
-        partid_t partid = XPC_PARTID(part);
+        short partid = XPC_PARTID(part);
         int disengaged;
 
         disengaged = (xpc_partition_engaged(1UL << partid) == 0);
@@ -870,20 +870,20 @@ xpc_partition_disengaged(struct xpc_partition *part)
 /*
  * Mark specified partition as active.
  */
-enum xpc_retval
+enum xp_retval
 xpc_mark_partition_active(struct xpc_partition *part)
 {
         unsigned long irq_flags;
-        enum xpc_retval ret;
+        enum xp_retval ret;
 
         dev_dbg(xpc_part, "setting partition %d to ACTIVE\n", XPC_PARTID(part));
 
         spin_lock_irqsave(&part->act_lock, irq_flags);
         if (part->act_state == XPC_P_ACTIVATING) {
                 part->act_state = XPC_P_ACTIVE;
-                ret = xpcSuccess;
+                ret = xpSuccess;
         } else {
-                DBUG_ON(part->reason == xpcSuccess);
+                DBUG_ON(part->reason == xpSuccess);
                 ret = part->reason;
         }
         spin_unlock_irqrestore(&part->act_lock, irq_flags);
@@ -896,7 +896,7 @@ xpc_mark_partition_active(struct xpc_partition *part)
  */
 void
 xpc_deactivate_partition(const int line, struct xpc_partition *part,
-                         enum xpc_retval reason)
+                         enum xp_retval reason)
 {
         unsigned long irq_flags;
 
@@ -905,15 +905,15 @@ xpc_deactivate_partition(const int line, struct xpc_partition *part,
         if (part->act_state == XPC_P_INACTIVE) {
                 XPC_SET_REASON(part, reason, line);
                 spin_unlock_irqrestore(&part->act_lock, irq_flags);
-                if (reason == xpcReactivating) {
+                if (reason == xpReactivating) {
                         /* we interrupt ourselves to reactivate partition */
                         xpc_IPI_send_reactivate(part);
                 }
                 return;
         }
         if (part->act_state == XPC_P_DEACTIVATING) {
-                if ((part->reason == xpcUnloading && reason != xpcUnloading) ||
-                    reason == xpcReactivating) {
+                if ((part->reason == xpUnloading && reason != xpUnloading) ||
+                    reason == xpReactivating) {
                         XPC_SET_REASON(part, reason, line);
                 }
                 spin_unlock_irqrestore(&part->act_lock, irq_flags);
@@ -982,10 +982,10 @@ xpc_discovery(void)
         int max_regions;
         int nasid;
         struct xpc_rsvd_page *rp;
-        partid_t partid;
+        short partid;
         struct xpc_partition *part;
         u64 *discovered_nasids;
-        enum xpc_retval ret;
+        enum xp_retval ret;
 
         remote_rp = xpc_kmalloc_cacheline_aligned(XPC_RP_HEADER_SIZE +
                                                   xp_nasid_mask_bytes,
@@ -1063,12 +1063,12 @@ xpc_discovery(void)
 
                         ret = xpc_get_remote_rp(nasid, discovered_nasids,
                                                 remote_rp, &remote_rp_pa);
-                        if (ret != xpcSuccess) {
+                        if (ret != xpSuccess) {
                                 dev_dbg(xpc_part, "unable to get reserved page "
                                         "from nasid %d, reason=%d\n", nasid,
                                         ret);
 
-                                if (ret == xpcLocalPartid)
+                                if (ret == xpLocalPartid)
                                         break;
 
                                 continue;
@@ -1082,7 +1082,7 @@ xpc_discovery(void)
                         /* pull over the cross partition variables */
 
                         ret = xpc_get_remote_vars(remote_vars_pa, remote_vars);
-                        if (ret != xpcSuccess) {
+                        if (ret != xpSuccess) {
                                 dev_dbg(xpc_part, "unable to get XPC variables "
                                         "from nasid %d, reason=%d\n", nasid,
                                         ret);
@@ -1116,7 +1116,7 @@ xpc_discovery(void)
                                         "register xp_addr region 0x%016lx\n",
                                         partid, remote_vars->amos_page_pa);
 
-                                XPC_SET_REASON(part, xpcPhysAddrRegFailed,
+                                XPC_SET_REASON(part, xpPhysAddrRegFailed,
                                                __LINE__);
                                 break;
                         }
@@ -1151,8 +1151,8 @@ xpc_discovery(void)
  * Given a partid, get the nasids owned by that partition from the
  * remote partition's reserved page.
  */
-enum xpc_retval
-xpc_initiate_partid_to_nasids(partid_t partid, void *nasid_mask)
+enum xp_retval
+xpc_initiate_partid_to_nasids(short partid, void *nasid_mask)
 {
         struct xpc_partition *part;
         u64 part_nasid_pa;
@@ -1160,7 +1160,7 @@ xpc_initiate_partid_to_nasids(partid_t partid, void *nasid_mask)
 
         part = &xpc_partitions[partid];
         if (part->remote_rp_pa == 0)
-                return xpcPartitionDown;
+                return xpPartitionDown;
 
         memset(nasid_mask, 0, XP_NASID_MASK_BYTES);
 
diff --git a/drivers/misc/sgi-xp/xpnet.c b/drivers/misc/sgi-xp/xpnet.c
index a9543c65814d..822dc8e8d7f0 100644
--- a/drivers/misc/sgi-xp/xpnet.c
+++ b/drivers/misc/sgi-xp/xpnet.c
@@ -166,7 +166,7 @@ struct device *xpnet = &xpnet_dbg_subname;
  * Packet was recevied by XPC and forwarded to us.
  */
 static void
-xpnet_receive(partid_t partid, int channel, struct xpnet_message *msg)
+xpnet_receive(short partid, int channel, struct xpnet_message *msg)
 {
         struct sk_buff *skb;
         bte_result_t bret;
@@ -282,7 +282,7 @@ xpnet_receive(partid_t partid, int channel, struct xpnet_message *msg)
  * state or message reception on a connection.
  */
 static void
-xpnet_connection_activity(enum xpc_retval reason, partid_t partid, int channel,
+xpnet_connection_activity(enum xp_retval reason, short partid, int channel,
                           void *data, void *key)
 {
         long bp;
@@ -291,13 +291,13 @@ xpnet_connection_activity(enum xpc_retval reason, partid_t partid, int channel,
         DBUG_ON(channel != XPC_NET_CHANNEL);
 
         switch (reason) {
-        case xpcMsgReceived:    /* message received */
+        case xpMsgReceived:     /* message received */
                 DBUG_ON(data == NULL);
 
                 xpnet_receive(partid, channel, (struct xpnet_message *)data);
                 break;
 
-        case xpcConnected:      /* connection completed to a partition */
+        case xpConnected:       /* connection completed to a partition */
                 spin_lock_bh(&xpnet_broadcast_lock);
                 xpnet_broadcast_partitions |= 1UL << (partid - 1);
                 bp = xpnet_broadcast_partitions;
@@ -330,7 +330,7 @@ xpnet_connection_activity(enum xpc_retval reason, partid_t partid, int channel,
 static int
 xpnet_dev_open(struct net_device *dev)
 {
-        enum xpc_retval ret;
+        enum xp_retval ret;
 
         dev_dbg(xpnet, "calling xpc_connect(%d, 0x%p, NULL, %ld, %ld, %ld, "
                 "%ld)\n", XPC_NET_CHANNEL, xpnet_connection_activity,
@@ -340,7 +340,7 @@ xpnet_dev_open(struct net_device *dev)
         ret = xpc_connect(XPC_NET_CHANNEL, xpnet_connection_activity, NULL,
                           XPNET_MSG_SIZE, XPNET_MSG_NENTRIES,
                           XPNET_MAX_KTHREADS, XPNET_MAX_IDLE_KTHREADS);
-        if (ret != xpcSuccess) {
+        if (ret != xpSuccess) {
                 dev_err(xpnet, "ifconfig up of %s failed on XPC connect, "
                         "ret=%d\n", dev->name, ret);
 
@@ -407,7 +407,7 @@ xpnet_dev_get_stats(struct net_device *dev)
  * release the skb and then release our pending message structure.
  */
 static void
-xpnet_send_completed(enum xpc_retval reason, partid_t partid, int channel,
+xpnet_send_completed(enum xp_retval reason, short partid, int channel,
                      void *__qm)
 {
         struct xpnet_pending_msg *queued_msg = (struct xpnet_pending_msg *)__qm;
@@ -439,12 +439,12 @@ static int
 xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct xpnet_pending_msg *queued_msg;
-        enum xpc_retval ret;
+        enum xp_retval ret;
         struct xpnet_message *msg;
         u64 start_addr, end_addr;
         long dp;
         u8 second_mac_octet;
-        partid_t dest_partid;
+        short dest_partid;
         struct xpnet_dev_private *priv;
         u16 embedded_bytes;
 
@@ -528,7 +528,7 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
                 ret = xpc_allocate(dest_partid, XPC_NET_CHANNEL,
                                    XPC_NOWAIT, (void **)&msg);
-                if (unlikely(ret != xpcSuccess))
+                if (unlikely(ret != xpSuccess))
                         continue;
 
                 msg->embedded_bytes = embedded_bytes;
@@ -557,7 +557,7 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
                 ret = xpc_send_notify(dest_partid, XPC_NET_CHANNEL, msg,
                                       xpnet_send_completed, queued_msg);
-                if (unlikely(ret != xpcSuccess)) {
+                if (unlikely(ret != xpSuccess)) {
                         atomic_dec(&queued_msg->use_count);
                         continue;
                 }
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index 7fb02e177a3d..299118de8933 100644
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -187,7 +187,7 @@ struct sdhci_host {
         struct mmc_request      *mrq;           /* Current request */
         struct mmc_command      *cmd;           /* Current command */
         struct mmc_data         *data;          /* Current data request */
-        int                     data_early:1;   /* Data finished before cmd */
+        unsigned int            data_early:1;   /* Data finished before cmd */
 
         struct scatterlist      *cur_sg;        /* We're working on this */
         int                     num_sg;         /* Entries left */
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 009e8fdcfe5c..02d5165b147c 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2425,7 +2425,7 @@ config CHELSIO_T3
 
 config EHEA
         tristate "eHEA Ethernet support"
-        depends on IBMEBUS && INET && SPARSEMEM
+        depends on IBMEBUS && INET && SPARSEMEM && MEMORY_HOTPLUG
         select INET_LRO
         ---help---
           This driver supports the IBM pSeries eHEA ethernet adapter.
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index 0afe522b8f7b..9c2394d49428 100644
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -1,7 +1,7 @@
 /*
  * Copyright(c) 2005 - 2006 Attansic Corporation. All rights reserved.
  * Copyright(c) 2006 - 2007 Chris Snook <csnook@redhat.com>
- * Copyright(c) 2006 Jay Cliburn <jcliburn@gmail.com>
+ * Copyright(c) 2006 - 2008 Jay Cliburn <jcliburn@gmail.com>
  *
  * Derived from Intel e1000 driver
  * Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.
@@ -36,7 +36,6 @@
  * A very incomplete list of things that need to be dealt with:
  *
  * TODO:
- * Wake on LAN.
  * Add more ethtool functions.
  * Fix abstruse irq enable/disable condition described here:
  *      http://marc.theaimsgroup.com/?l=linux-netdev&m=116398508500553&w=2
@@ -638,21 +637,18 @@ static s32 atl1_phy_leave_power_saving(struct atl1_hw *hw)
 }
 
 /*
- *TODO: do something or get rid of this
+ * Force the PHY into power saving mode using vendor magic.
  */
 #ifdef CONFIG_PM
-static s32 atl1_phy_enter_power_saving(struct atl1_hw *hw)
+static void atl1_phy_enter_power_saving(struct atl1_hw *hw)
 {
-/*    s32 ret_val;
- *    u16 phy_data;
- */
+        atl1_write_phy_reg(hw, MII_DBG_ADDR, 0);
+        atl1_write_phy_reg(hw, MII_DBG_DATA, 0x124E);
+        atl1_write_phy_reg(hw, MII_DBG_ADDR, 2);
+        atl1_write_phy_reg(hw, MII_DBG_DATA, 0x3000);
+        atl1_write_phy_reg(hw, MII_DBG_ADDR, 3);
+        atl1_write_phy_reg(hw, MII_DBG_DATA, 0);
 
-/*
-    ret_val = atl1_write_phy_reg(hw, ...);
-    ret_val = atl1_write_phy_reg(hw, ...);
-    ....
-*/
-        return 0;
 }
 #endif
 
@@ -2784,64 +2780,93 @@ static int atl1_suspend(struct pci_dev *pdev, pm_message_t state)
         struct atl1_hw *hw = &adapter->hw;
         u32 ctrl = 0;
         u32 wufc = adapter->wol;
+        u32 val;
+        int retval;
+        u16 speed;
+        u16 duplex;
 
         netif_device_detach(netdev);
         if (netif_running(netdev))
                 atl1_down(adapter);
 
+        retval = pci_save_state(pdev);
+        if (retval)
+                return retval;
+
         atl1_read_phy_reg(hw, MII_BMSR, (u16 *) & ctrl);
         atl1_read_phy_reg(hw, MII_BMSR, (u16 *) & ctrl);
-        if (ctrl & BMSR_LSTATUS)
+        val = ctrl & BMSR_LSTATUS;
+        if (val)
                 wufc &= ~ATLX_WUFC_LNKC;
 
-        /* reduce speed to 10/100M */
-        if (wufc) {
-                atl1_phy_enter_power_saving(hw);
-                /* if resume, let driver to re- setup link */
-                hw->phy_configured = false;
-                atl1_set_mac_addr(hw);
-                atlx_set_multi(netdev);
+        if (val && wufc) {
+                val = atl1_get_speed_and_duplex(hw, &speed, &duplex);
+                if (val) {
+                        if (netif_msg_ifdown(adapter))
+                                dev_printk(KERN_DEBUG, &pdev->dev,
+                                        "error getting speed/duplex\n");
+                        goto disable_wol;
+                }
 
                 ctrl = 0;
-                /* turn on magic packet wol */
-                if (wufc & ATLX_WUFC_MAG)
-                        ctrl = WOL_MAGIC_EN | WOL_MAGIC_PME_EN;
 
-                /* turn on Link change WOL */
-                if (wufc & ATLX_WUFC_LNKC)
-                        ctrl |= (WOL_LINK_CHG_EN | WOL_LINK_CHG_PME_EN);
+                /* enable magic packet WOL */
+                if (wufc & ATLX_WUFC_MAG)
+                        ctrl |= (WOL_MAGIC_EN | WOL_MAGIC_PME_EN);
                 iowrite32(ctrl, hw->hw_addr + REG_WOL_CTRL);
-
-                /* turn on all-multi mode if wake on multicast is enabled */
-                ctrl = ioread32(hw->hw_addr + REG_MAC_CTRL);
-                ctrl &= ~MAC_CTRL_DBG;
-                ctrl &= ~MAC_CTRL_PROMIS_EN;
-                if (wufc & ATLX_WUFC_MC)
-                        ctrl |= MAC_CTRL_MC_ALL_EN;
-                else
-                        ctrl &= ~MAC_CTRL_MC_ALL_EN;
-
-                /* turn on broadcast mode if wake on-BC is enabled */
-                if (wufc & ATLX_WUFC_BC)
+                ioread32(hw->hw_addr + REG_WOL_CTRL);
+
+                /* configure the mac */
+                ctrl = MAC_CTRL_RX_EN;
+                ctrl |= ((u32)((speed == SPEED_1000) ? MAC_CTRL_SPEED_1000 :
+                        MAC_CTRL_SPEED_10_100) << MAC_CTRL_SPEED_SHIFT);
+                if (duplex == FULL_DUPLEX)
+                        ctrl |= MAC_CTRL_DUPLX;
+                ctrl |= (((u32)adapter->hw.preamble_len &
+                        MAC_CTRL_PRMLEN_MASK) << MAC_CTRL_PRMLEN_SHIFT);
+                if (adapter->vlgrp)
+                        ctrl |= MAC_CTRL_RMV_VLAN;
+                if (wufc & ATLX_WUFC_MAG)
                         ctrl |= MAC_CTRL_BC_EN;
-                else
-                        ctrl &= ~MAC_CTRL_BC_EN;
-
-                /* enable RX */
-                ctrl |= MAC_CTRL_RX_EN;
                 iowrite32(ctrl, hw->hw_addr + REG_MAC_CTRL);
-                pci_enable_wake(pdev, PCI_D3hot, 1);
-                pci_enable_wake(pdev, PCI_D3cold, 1);
-        } else {
-                iowrite32(0, hw->hw_addr + REG_WOL_CTRL);
-                pci_enable_wake(pdev, PCI_D3hot, 0);
-                pci_enable_wake(pdev, PCI_D3cold, 0);
+                ioread32(hw->hw_addr + REG_MAC_CTRL);
+
+                /* poke the PHY */
+                ctrl = ioread32(hw->hw_addr + REG_PCIE_PHYMISC);
+                ctrl |= PCIE_PHYMISC_FORCE_RCV_DET;
+                iowrite32(ctrl, hw->hw_addr + REG_PCIE_PHYMISC);
+                ioread32(hw->hw_addr + REG_PCIE_PHYMISC);
+
+                pci_enable_wake(pdev, pci_choose_state(pdev, state), 1);
+                goto exit;
         }
 
-        pci_save_state(pdev);
+        if (!val && wufc) {
+                ctrl |= (WOL_LINK_CHG_EN | WOL_LINK_CHG_PME_EN);
+                iowrite32(ctrl, hw->hw_addr + REG_WOL_CTRL);
+                ioread32(hw->hw_addr + REG_WOL_CTRL);
+                iowrite32(0, hw->hw_addr + REG_MAC_CTRL);
+                ioread32(hw->hw_addr + REG_MAC_CTRL);
+                hw->phy_configured = false;
+                pci_enable_wake(pdev, pci_choose_state(pdev, state), 1);
+                goto exit;
+        }
+
+disable_wol:
+        iowrite32(0, hw->hw_addr + REG_WOL_CTRL);
+        ioread32(hw->hw_addr + REG_WOL_CTRL);
+        ctrl = ioread32(hw->hw_addr + REG_PCIE_PHYMISC);
+        ctrl |= PCIE_PHYMISC_FORCE_RCV_DET;
+        iowrite32(ctrl, hw->hw_addr + REG_PCIE_PHYMISC);
+        ioread32(hw->hw_addr + REG_PCIE_PHYMISC);
+        atl1_phy_enter_power_saving(hw);
+        hw->phy_configured = false;
+        pci_enable_wake(pdev, pci_choose_state(pdev, state), 0);
+exit:
+        if (netif_running(netdev))
+                pci_disable_msi(adapter->pdev);
         pci_disable_device(pdev);
-
-        pci_set_power_state(pdev, PCI_D3hot);
+        pci_set_power_state(pdev, pci_choose_state(pdev, state));
 
         return 0;
 }
@@ -2855,20 +2880,26 @@ static int atl1_resume(struct pci_dev *pdev)
         pci_set_power_state(pdev, PCI_D0);
         pci_restore_state(pdev);
 
-        /* FIXME: check and handle */
         err = pci_enable_device(pdev);
+        if (err) {
+                if (netif_msg_ifup(adapter))
+                        dev_printk(KERN_DEBUG, &pdev->dev,
+                                "error enabling pci device\n");
+                return err;
+        }
+
+        pci_set_master(pdev);
+        iowrite32(0, adapter->hw.hw_addr + REG_WOL_CTRL);
         pci_enable_wake(pdev, PCI_D3hot, 0);
         pci_enable_wake(pdev, PCI_D3cold, 0);
 
-        iowrite32(0, adapter->hw.hw_addr + REG_WOL_CTRL);
-        atl1_reset(adapter);
+        atl1_reset_hw(&adapter->hw);
+        adapter->cmb.cmb->int_stats = 0;
 
         if (netif_running(netdev))
                 atl1_up(adapter);
         netif_device_attach(netdev);
 
-        atl1_via_workaround(adapter);
-
         return 0;
 }
 #else
@@ -2876,6 +2907,13 @@ static int atl1_resume(struct pci_dev *pdev)
 #define atl1_resume NULL
 #endif
 
+static void atl1_shutdown(struct pci_dev *pdev)
+{
+#ifdef CONFIG_PM
+        atl1_suspend(pdev, PMSG_SUSPEND);
+#endif
+}
+
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void atl1_poll_controller(struct net_device *netdev)
 {
@@ -3122,7 +3160,8 @@ static struct pci_driver atl1_driver = {
         .probe = atl1_probe,
         .remove = __devexit_p(atl1_remove),
         .suspend = atl1_suspend,
-        .resume = atl1_resume
+        .resume = atl1_resume,
+        .shutdown = atl1_shutdown
 };
 
 /*
diff --git a/drivers/net/atlx/atl1.h b/drivers/net/atlx/atl1.h
index 51893d66eae1..a5015b14a429 100644
--- a/drivers/net/atlx/atl1.h
+++ b/drivers/net/atlx/atl1.h
@@ -1,7 +1,7 @@
 /*
  * Copyright(c) 2005 - 2006 Attansic Corporation. All rights reserved.
  * Copyright(c) 2006 - 2007 Chris Snook <csnook@redhat.com>
- * Copyright(c) 2006 Jay Cliburn <jcliburn@gmail.com>
+ * Copyright(c) 2006 - 2008 Jay Cliburn <jcliburn@gmail.com>
  *
  * Derived from Intel e1000 driver
  * Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.
diff --git a/drivers/net/atlx/atlx.c b/drivers/net/atlx/atlx.c
index f06b854e2501..b3e7fcf0f6e7 100644
--- a/drivers/net/atlx/atlx.c
+++ b/drivers/net/atlx/atlx.c
@@ -2,7 +2,7 @@
  *
  * Copyright(c) 2005 - 2006 Attansic Corporation. All rights reserved.
  * Copyright(c) 2006 - 2007 Chris Snook <csnook@redhat.com>
- * Copyright(c) 2006 Jay Cliburn <jcliburn@gmail.com>
+ * Copyright(c) 2006 - 2008 Jay Cliburn <jcliburn@gmail.com>
  * Copyright(c) 2007 Atheros Corporation. All rights reserved.
  *
  * Derived from Intel e1000 driver
diff --git a/drivers/net/atlx/atlx.h b/drivers/net/atlx/atlx.h
index 3be7c09734d4..297a03da6b7f 100644
--- a/drivers/net/atlx/atlx.h
+++ b/drivers/net/atlx/atlx.h
@@ -2,7 +2,7 @@
  *
  * Copyright(c) 2005 - 2006 Attansic Corporation. All rights reserved.
  * Copyright(c) 2006 - 2007 Chris Snook <csnook@redhat.com>
- * Copyright(c) 2006 Jay Cliburn <jcliburn@gmail.com>
+ * Copyright(c) 2006 - 2008 Jay Cliburn <jcliburn@gmail.com>
  * Copyright(c) 2007 Atheros Corporation. All rights reserved.
  *
  * Derived from Intel e1000 driver
@@ -29,7 +29,7 @@
 #include <linux/module.h>
 #include <linux/types.h>
 
-#define ATLX_DRIVER_VERSION "2.1.1"
+#define ATLX_DRIVER_VERSION "2.1.3"
 MODULE_AUTHOR("Xiong Huang <xiong.huang@atheros.com>, \
         Chris Snook <csnook@redhat.com>, Jay Cliburn <jcliburn@gmail.com>");
 MODULE_LICENSE("GPL");
@@ -460,6 +460,9 @@ MODULE_VERSION(ATLX_DRIVER_VERSION);
 #define MII_ATLX_PSSR_100MBS            0x4000  /* 01=100Mbs */
 #define MII_ATLX_PSSR_1000MBS           0x8000  /* 10=1000Mbs */
 
+#define MII_DBG_ADDR                    0x1D
+#define MII_DBG_DATA                    0x1E
+
 /* PCI Command Register Bit Definitions */
 #define PCI_REG_COMMAND                 0x04    /* PCI Command Register */
 #define CMD_IO_SPACE                    0x0001
diff --git a/drivers/net/cxgb3/adapter.h b/drivers/net/cxgb3/adapter.h
index 4fdb13f8447b..acebe431d068 100644
--- a/drivers/net/cxgb3/adapter.h
+++ b/drivers/net/cxgb3/adapter.h
@@ -71,6 +71,7 @@ enum {				/* adapter flags */
         USING_MSIX = (1 << 2),
         QUEUES_BOUND = (1 << 3),
         TP_PARITY_INIT = (1 << 4),
+        NAPI_INIT = (1 << 5),
 };
 
 struct fl_pg_chunk {
diff --git a/drivers/net/cxgb3/common.h b/drivers/net/cxgb3/common.h
index 91ee7277b813..579bee42a5cb 100644
--- a/drivers/net/cxgb3/common.h
+++ b/drivers/net/cxgb3/common.h
@@ -698,6 +698,7 @@ void mac_prep(struct cmac *mac, struct adapter *adapter, int index);
 void early_hw_init(struct adapter *adapter, const struct adapter_info *ai);
 int t3_prep_adapter(struct adapter *adapter, const struct adapter_info *ai,
                     int reset);
+int t3_replay_prep_adapter(struct adapter *adapter);
 void t3_led_ready(struct adapter *adapter);
 void t3_fatal_err(struct adapter *adapter);
 void t3_set_vlan_accel(struct adapter *adapter, unsigned int ports, int on);
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index ce949d5fae39..3a3127216791 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -421,6 +421,13 @@ static void init_napi(struct adapter *adap)
                         netif_napi_add(qs->netdev, &qs->napi, qs->napi.poll,
                                        64);
         }
+
+        /*
+         * netif_napi_add() can be called only once per napi_struct because it
+         * adds each new napi_struct to a list.  Be careful not to call it a
+         * second time, e.g., during EEH recovery, by making a note of it.
+         */
+        adap->flags |= NAPI_INIT;
 }
 
 /*
@@ -896,7 +903,8 @@ static int cxgb_up(struct adapter *adap)
                         goto out;
 
                 setup_rss(adap);
-                init_napi(adap);
+                if (!(adap->flags & NAPI_INIT))
+                        init_napi(adap);
                 adap->flags |= FULL_INIT_DONE;
         }
 
@@ -999,7 +1007,7 @@ static int offload_open(struct net_device *dev)
                 return 0;
 
         if (!adap_up && (err = cxgb_up(adapter)) < 0)
-                return err;
+                goto out;
 
         t3_tp_set_offload_mode(adapter, 1);
         tdev->lldev = adapter->port[0];
@@ -1061,10 +1069,8 @@ static int cxgb_open(struct net_device *dev)
         int other_ports = adapter->open_device_map & PORT_MASK;
         int err;
 
-        if (!adapter->open_device_map && (err = cxgb_up(adapter)) < 0) {
-                quiesce_rx(adapter);
+        if (!adapter->open_device_map && (err = cxgb_up(adapter)) < 0)
                 return err;
-        }
 
         set_bit(pi->port_id, &adapter->open_device_map);
         if (is_offload(adapter) && !ofld_disable) {
@@ -2424,14 +2430,11 @@ static pci_ers_result_t t3_io_error_detected(struct pci_dev *pdev,
             test_bit(OFFLOAD_DEVMAP_BIT, &adapter->open_device_map))
                 offload_close(&adapter->tdev);
 
-        /* Free sge resources */
-        t3_free_sge_resources(adapter);
-
         adapter->flags &= ~FULL_INIT_DONE;
 
         pci_disable_device(pdev);
 
-        /* Request a slot slot reset. */
+        /* Request a slot reset. */
         return PCI_ERS_RESULT_NEED_RESET;
 }
 
@@ -2448,13 +2451,20 @@ static pci_ers_result_t t3_io_slot_reset(struct pci_dev *pdev)
         if (pci_enable_device(pdev)) {
                 dev_err(&pdev->dev,
                         "Cannot re-enable PCI device after reset.\n");
-                return PCI_ERS_RESULT_DISCONNECT;
+                goto err;
         }
         pci_set_master(pdev);
+        pci_restore_state(pdev);
 
-        t3_prep_adapter(adapter, adapter->params.info, 1);
+        /* Free sge resources */
+        t3_free_sge_resources(adapter);
+
+        if (t3_replay_prep_adapter(adapter))
+                goto err;
 
         return PCI_ERS_RESULT_RECOVERED;
+err:
+        return PCI_ERS_RESULT_DISCONNECT;
 }
 
 /**
@@ -2483,13 +2493,6 @@ static void t3_io_resume(struct pci_dev *pdev)
                         netif_device_attach(netdev);
                 }
         }
-
-        if (is_offload(adapter)) {
-                __set_bit(OFFLOAD_DEVMAP_BIT, &adapter->registered_device_map);
-                if (offload_open(adapter->port[0]))
-                        printk(KERN_WARNING
-                               "Could not bring back offload capabilities\n");
-        }
 }
 
 static struct pci_error_handlers t3_err_handler = {
@@ -2608,6 +2611,7 @@ static int __devinit init_one(struct pci_dev *pdev,
         }
 
         pci_set_master(pdev);
+        pci_save_state(pdev);
 
         mmio_start = pci_resource_start(pdev, 0);
         mmio_len = pci_resource_len(pdev, 0);
diff --git a/drivers/net/cxgb3/regs.h b/drivers/net/cxgb3/regs.h
index 02dbbb300929..567178879345 100644
--- a/drivers/net/cxgb3/regs.h
+++ b/drivers/net/cxgb3/regs.h
@@ -444,6 +444,14 @@
 
 #define A_PCIE_CFG 0x88
 
+#define S_ENABLELINKDWNDRST    21
+#define V_ENABLELINKDWNDRST(x) ((x) << S_ENABLELINKDWNDRST)
+#define F_ENABLELINKDWNDRST    V_ENABLELINKDWNDRST(1U)
+
+#define S_ENABLELINKDOWNRST    20
+#define V_ENABLELINKDOWNRST(x) ((x) << S_ENABLELINKDOWNRST)
+#define F_ENABLELINKDOWNRST    V_ENABLELINKDOWNRST(1U)
+
 #define S_PCIE_CLIDECEN    16
 #define V_PCIE_CLIDECEN(x) ((x) << S_PCIE_CLIDECEN)
 #define F_PCIE_CLIDECEN    V_PCIE_CLIDECEN(1U)
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c
index 98a6bbd11d4c..796eb305cdc3 100644
--- a/drivers/net/cxgb3/sge.c
+++ b/drivers/net/cxgb3/sge.c
@@ -539,6 +539,31 @@ static void *alloc_ring(struct pci_dev *pdev, size_t nelem, size_t elem_size,
 }
 
 /**
+ *      t3_reset_qset - reset a sge qset
+ *      @q: the queue set
+ *
+ *      Reset the qset structure.
+ *      the NAPI structure is preserved in the event of
+ *      the qset's reincarnation, for example during EEH recovery.
+ */
+static void t3_reset_qset(struct sge_qset *q)
+{
+        if (q->adap &&
+            !(q->adap->flags & NAPI_INIT)) {
+                memset(q, 0, sizeof(*q));
+                return;
+        }
+
+        q->adap = NULL;
+        memset(&q->rspq, 0, sizeof(q->rspq));
+        memset(q->fl, 0, sizeof(struct sge_fl) * SGE_RXQ_PER_SET);
+        memset(q->txq, 0, sizeof(struct sge_txq) * SGE_TXQ_PER_SET);
+        q->txq_stopped = 0;
+        memset(&q->tx_reclaim_timer, 0, sizeof(q->tx_reclaim_timer));
+}
+
+
+/**
  *      free_qset - free the resources of an SGE queue set
  *      @adapter: the adapter owning the queue set
  *      @q: the queue set
@@ -594,7 +619,7 @@ static void t3_free_qset(struct adapter *adapter, struct sge_qset *q)
                                   q->rspq.desc, q->rspq.phys_addr);
         }
 
-        memset(q, 0, sizeof(*q));
+        t3_reset_qset(q);
 }
 
 /**
@@ -1365,7 +1390,7 @@ static void restart_ctrlq(unsigned long data)
  */
 int t3_mgmt_tx(struct adapter *adap, struct sk_buff *skb)
 {
-        int ret; 
+        int ret;
         local_bh_disable();
         ret = ctrl_xmit(adap, &adap->sge.qs[0].txq[TXQ_CTRL], skb);
         local_bh_enable();
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
index a99496a431c4..d405a932c73a 100644
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
@@ -3264,6 +3264,7 @@ static void config_pcie(struct adapter *adap)
 
         t3_write_reg(adap, A_PCIE_PEX_ERR, 0xffffffff);
         t3_set_reg_field(adap, A_PCIE_CFG, 0,
+                         F_ENABLELINKDWNDRST | F_ENABLELINKDOWNRST |
                          F_PCIE_DMASTOPEN | F_PCIE_CLIDECEN);
 }
 
@@ -3655,3 +3656,30 @@ void t3_led_ready(struct adapter *adapter)
         t3_set_reg_field(adapter, A_T3DBG_GPIO_EN, F_GPIO0_OUT_VAL,
                          F_GPIO0_OUT_VAL);
 }
+
+int t3_replay_prep_adapter(struct adapter *adapter)
+{
+        const struct adapter_info *ai = adapter->params.info;
+        unsigned int i, j = 0;
+        int ret;
+
+        early_hw_init(adapter, ai);
+        ret = init_parity(adapter);
+        if (ret)
+                return ret;
+
+        for_each_port(adapter, i) {
+                struct port_info *p = adap2pinfo(adapter, i);
+                while (!adapter->params.vpd.port_type[j])
+                        ++j;
+
+                p->port_type->phy_prep(&p->phy, adapter, ai->phy_base_addr + j,
+                                        ai->mdio_ops);
+
+                p->phy.ops->power_down(&p->phy, 1);
+                ++j;
+        }
+
+return 0;
+}
+
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index e6fe2614ea6d..d45bcd2660af 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -117,6 +117,9 @@ typedef struct board_info {
 
         struct mutex     addr_lock;     /* phy and eeprom access lock */
 
+        struct delayed_work phy_poll;
+        struct net_device  *ndev;
+
         spinlock_t lock;
 
         struct mii_if_info mii;
@@ -297,6 +300,10 @@ static void dm9000_set_io(struct board_info *db, int byte_width)
         }
 }
 
+static void dm9000_schedule_poll(board_info_t *db)
+{
+        schedule_delayed_work(&db->phy_poll, HZ * 2);
+}
 
 /* Our watchdog timed out. Called by the networking layer */
 static void dm9000_timeout(struct net_device *dev)
@@ -465,6 +472,17 @@ static const struct ethtool_ops dm9000_ethtool_ops = {
         .set_eeprom             = dm9000_set_eeprom,
 };
 
+static void
+dm9000_poll_work(struct work_struct *w)
+{
+        struct delayed_work *dw = container_of(w, struct delayed_work, work);
+        board_info_t *db = container_of(dw, board_info_t, phy_poll);
+
+        mii_check_media(&db->mii, netif_msg_link(db), 0);
+        
+        if (netif_running(db->ndev))
+                dm9000_schedule_poll(db);
+}
 
 /* dm9000_release_board
  *
@@ -503,7 +521,7 @@ dm9000_release_board(struct platform_device *pdev, struct board_info *db)
 /*
  * Search DM9000 board, allocate space and register it
  */
-static int
+static int __devinit
 dm9000_probe(struct platform_device *pdev)
 {
         struct dm9000_plat_data *pdata = pdev->dev.platform_data;
@@ -525,17 +543,21 @@ dm9000_probe(struct platform_device *pdev)
 
         SET_NETDEV_DEV(ndev, &pdev->dev);
 
-        dev_dbg(&pdev->dev, "dm9000_probe()");
+        dev_dbg(&pdev->dev, "dm9000_probe()\n");
 
         /* setup board info structure */
         db = (struct board_info *) ndev->priv;
         memset(db, 0, sizeof (*db));
 
         db->dev = &pdev->dev;
+        db->ndev = ndev;
 
         spin_lock_init(&db->lock);
         mutex_init(&db->addr_lock);
 
+        INIT_DELAYED_WORK(&db->phy_poll, dm9000_poll_work);
+
+
         if (pdev->num_resources < 2) {
                 ret = -ENODEV;
                 goto out;
@@ -761,6 +783,8 @@ dm9000_open(struct net_device *dev)
 
         mii_check_media(&db->mii, netif_msg_link(db), 1);
         netif_start_queue(dev);
+        
+        dm9000_schedule_poll(db);
 
         return 0;
 }
@@ -879,6 +903,8 @@ dm9000_stop(struct net_device *ndev)
         if (netif_msg_ifdown(db))
                 dev_dbg(db->dev, "shutting down %s\n", ndev->name);
 
+        cancel_delayed_work(&db->phy_poll);
+
         netif_stop_queue(ndev);
         netif_carrier_off(ndev);
 
@@ -1288,6 +1314,8 @@ dm9000_phy_read(struct net_device *dev, int phy_reg_unused, int reg)
         spin_unlock_irqrestore(&db->lock,flags);
 
         mutex_unlock(&db->addr_lock);
+
+        dm9000_dbg(db, 5, "phy_read[%02x] -> %04x\n", reg, ret);
         return ret;
 }
 
@@ -1301,6 +1329,7 @@ dm9000_phy_write(struct net_device *dev, int phyaddr_unused, int reg, int value)
         unsigned long flags;
         unsigned long reg_save;
 
+        dm9000_dbg(db, 5, "phy_write[%02x] = %04x\n", reg, value);
         mutex_lock(&db->addr_lock);
 
         spin_lock_irqsave(&db->lock,flags);
@@ -1372,7 +1401,7 @@ dm9000_drv_resume(struct platform_device *dev)
         return 0;
 }
 
-static int
+static int __devexit
 dm9000_drv_remove(struct platform_device *pdev)
 {
         struct net_device *ndev = platform_get_drvdata(pdev);
@@ -1393,7 +1422,7 @@ static struct platform_driver dm9000_driver = {
                 .owner   = THIS_MODULE,
         },
         .probe   = dm9000_probe,
-        .remove  = dm9000_drv_remove,
+        .remove  = __devexit_p(dm9000_drv_remove),
         .suspend = dm9000_drv_suspend,
         .resume  = dm9000_drv_resume,
 };
diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ehea/ehea.h
index f5dacceab95b..fe872fbd671e 100644
--- a/drivers/net/ehea/ehea.h
+++ b/drivers/net/ehea/ehea.h
@@ -40,7 +40,7 @@
 #include <asm/io.h>
 
 #define DRV_NAME        "ehea"
-#define DRV_VERSION     "EHEA_0090"
+#define DRV_VERSION     "EHEA_0091"
 
 /* eHEA capability flags */
 #define DLPAR_PORT_ADD_REM 1
@@ -118,6 +118,13 @@
 #define EHEA_MR_ACC_CTRL       0x00800000
 
 #define EHEA_BUSMAP_START      0x8000000000000000ULL
+#define EHEA_INVAL_ADDR        0xFFFFFFFFFFFFFFFFULL
+#define EHEA_DIR_INDEX_SHIFT 13                   /* 8k Entries in 64k block */
+#define EHEA_TOP_INDEX_SHIFT (EHEA_DIR_INDEX_SHIFT * 2)
+#define EHEA_MAP_ENTRIES (1 << EHEA_DIR_INDEX_SHIFT)
+#define EHEA_MAP_SIZE (0x10000)                   /* currently fixed map size */
+#define EHEA_INDEX_MASK (EHEA_MAP_ENTRIES - 1)
+
 
 #define EHEA_WATCH_DOG_TIMEOUT 10*HZ
 
@@ -192,10 +199,20 @@ struct h_epas {
                                    set to 0 if unused */
 };
 
-struct ehea_busmap {
-        unsigned int entries;           /* total number of entries */
-        unsigned int valid_sections;    /* number of valid sections */
-        u64 *vaddr;
+/*
+ * Memory map data structures
+ */
+struct ehea_dir_bmap
+{
+        u64 ent[EHEA_MAP_ENTRIES];
+};
+struct ehea_top_bmap
+{
+        struct ehea_dir_bmap *dir[EHEA_MAP_ENTRIES];
+};
+struct ehea_bmap
+{
+        struct ehea_top_bmap *top[EHEA_MAP_ENTRIES];
 };
 
 struct ehea_qp;
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index f9bc21c74b59..d1b6d4e7495d 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -35,6 +35,7 @@
 #include <linux/if_ether.h>
 #include <linux/notifier.h>
 #include <linux/reboot.h>
+#include <linux/memory.h>
 #include <asm/kexec.h>
 #include <linux/mutex.h>
 
@@ -3503,6 +3504,24 @@ void ehea_crash_handler(void)
                                               0, H_DEREG_BCMC);
 }
 
+static int ehea_mem_notifier(struct notifier_block *nb,
+                             unsigned long action, void *data)
+{
+        switch (action) {
+        case MEM_OFFLINE:
+                ehea_info("memory has been removed");
+                ehea_rereg_mrs(NULL);
+                break;
+        default:
+                break;
+        }
+        return NOTIFY_OK;
+}
+
+static struct notifier_block ehea_mem_nb = {
+        .notifier_call = ehea_mem_notifier,
+};
+
 static int ehea_reboot_notifier(struct notifier_block *nb,
                                 unsigned long action, void *unused)
 {
@@ -3581,6 +3600,10 @@ int __init ehea_module_init(void)
         if (ret)
                 ehea_info("failed registering reboot notifier");
 
+        ret = register_memory_notifier(&ehea_mem_nb);
+        if (ret)
+                ehea_info("failed registering memory remove notifier");
+
         ret = crash_shutdown_register(&ehea_crash_handler);
         if (ret)
                 ehea_info("failed registering crash handler");
@@ -3604,6 +3627,7 @@ int __init ehea_module_init(void)
 out3:
         ibmebus_unregister_driver(&ehea_driver);
 out2:
+        unregister_memory_notifier(&ehea_mem_nb);
         unregister_reboot_notifier(&ehea_reboot_nb);
         crash_shutdown_unregister(&ehea_crash_handler);
 out:
@@ -3621,6 +3645,7 @@ static void __exit ehea_module_exit(void)
         ret = crash_shutdown_unregister(&ehea_crash_handler);
         if (ret)
                 ehea_info("failed unregistering crash handler");
+        unregister_memory_notifier(&ehea_mem_nb);
         kfree(ehea_fw_handles.arr);
         kfree(ehea_bcmc_regs.arr);
         ehea_destroy_busmap();
diff --git a/drivers/net/ehea/ehea_qmr.c b/drivers/net/ehea/ehea_qmr.c
index d522e905f460..140f05baafd8 100644
--- a/drivers/net/ehea/ehea_qmr.c
+++ b/drivers/net/ehea/ehea_qmr.c
@@ -31,8 +31,8 @@
 #include "ehea_phyp.h"
 #include "ehea_qmr.h"
 
+struct ehea_bmap *ehea_bmap = NULL;
 
-struct ehea_busmap ehea_bmap = { 0, 0, NULL };
 
 
 static void *hw_qpageit_get_inc(struct hw_queue *queue)
@@ -559,125 +559,253 @@ int ehea_destroy_qp(struct ehea_qp *qp)
         return 0;
 }
 
-int ehea_create_busmap(void)
+static inline int ehea_calc_index(unsigned long i, unsigned long s)
 {
-        u64 vaddr = EHEA_BUSMAP_START;
-        unsigned long high_section_index = 0;
-        int i;
+        return (i >> s) & EHEA_INDEX_MASK;
+}
 
-        /*
-         * Sections are not in ascending order -> Loop over all sections and
-         * find the highest PFN to compute the required map size.
-        */
-        ehea_bmap.valid_sections = 0;
+static inline int ehea_init_top_bmap(struct ehea_top_bmap *ehea_top_bmap,
+                                     int dir)
+{
+        if(!ehea_top_bmap->dir[dir]) {
+                ehea_top_bmap->dir[dir] =
+                        kzalloc(sizeof(struct ehea_dir_bmap), GFP_KERNEL);
+                if (!ehea_top_bmap->dir[dir])
+                        return -ENOMEM;
+        }
+        return 0;
+}
 
-        for (i = 0; i < NR_MEM_SECTIONS; i++)
-                if (valid_section_nr(i))
-                        high_section_index = i;
+static inline int ehea_init_bmap(struct ehea_bmap *ehea_bmap, int top, int dir)
+{
+        if(!ehea_bmap->top[top]) {
+                ehea_bmap->top[top] =
+                        kzalloc(sizeof(struct ehea_top_bmap), GFP_KERNEL);
+                if (!ehea_bmap->top[top])
+                        return -ENOMEM;
+        }
+        return ehea_init_top_bmap(ehea_bmap->top[top], dir);
+}
 
-        ehea_bmap.entries = high_section_index + 1;
-        ehea_bmap.vaddr = vmalloc(ehea_bmap.entries * sizeof(*ehea_bmap.vaddr));
+static int ehea_create_busmap_callback(unsigned long pfn,
+                                       unsigned long nr_pages, void *arg)
+{
+        unsigned long i, mr_len, start_section, end_section;
+        start_section = (pfn * PAGE_SIZE) / EHEA_SECTSIZE;
+        end_section = start_section + ((nr_pages * PAGE_SIZE) / EHEA_SECTSIZE);
+        mr_len = *(unsigned long *)arg;
 
-        if (!ehea_bmap.vaddr)
+        ehea_bmap = kzalloc(sizeof(struct ehea_bmap), GFP_KERNEL);
+        if (!ehea_bmap)
                 return -ENOMEM;
 
-        for (i = 0 ; i < ehea_bmap.entries; i++) {
-                unsigned long pfn = section_nr_to_pfn(i);
+        for (i = start_section; i < end_section; i++) {
+                int ret;
+                int top, dir, idx;
+                u64 vaddr;
+
+                top = ehea_calc_index(i, EHEA_TOP_INDEX_SHIFT);
+                dir = ehea_calc_index(i, EHEA_DIR_INDEX_SHIFT);
+
+                ret = ehea_init_bmap(ehea_bmap, top, dir);
+                if(ret)
+                        return ret;
 
-                if (pfn_valid(pfn)) {
-                        ehea_bmap.vaddr[i] = vaddr;
-                        vaddr += EHEA_SECTSIZE;
-                        ehea_bmap.valid_sections++;
-                } else
-                        ehea_bmap.vaddr[i] = 0;
+                idx = i & EHEA_INDEX_MASK;
+                vaddr = EHEA_BUSMAP_START + mr_len + i * EHEA_SECTSIZE;
+
+                ehea_bmap->top[top]->dir[dir]->ent[idx] = vaddr;
         }
 
+        mr_len += nr_pages * PAGE_SIZE;
+        *(unsigned long *)arg = mr_len;
+
         return 0;
 }
 
+static unsigned long ehea_mr_len;
+
+static DEFINE_MUTEX(ehea_busmap_mutex);
+
+int ehea_create_busmap(void)
+{
+        int ret;
+        mutex_lock(&ehea_busmap_mutex);
+        ehea_mr_len = 0;
+        ret = walk_memory_resource(0, 1ULL << MAX_PHYSMEM_BITS, &ehea_mr_len,
+                                   ehea_create_busmap_callback);
+        mutex_unlock(&ehea_busmap_mutex);
+        return ret;
+}
+
 void ehea_destroy_busmap(void)
 {
-        vfree(ehea_bmap.vaddr);
+        int top, dir;
+        mutex_lock(&ehea_busmap_mutex);
+        if (!ehea_bmap)
+                goto out_destroy;
+
+        for (top = 0; top < EHEA_MAP_ENTRIES; top++) {
+                if (!ehea_bmap->top[top])
+                        continue;
+
+                for (dir = 0; dir < EHEA_MAP_ENTRIES; dir++) {
+                        if (!ehea_bmap->top[top]->dir[dir])
+                                continue;
+
+                        kfree(ehea_bmap->top[top]->dir[dir]);
+                }
+
+                kfree(ehea_bmap->top[top]);
+        }
+
+        kfree(ehea_bmap);
+        ehea_bmap = NULL;
+out_destroy:    
+        mutex_unlock(&ehea_busmap_mutex);
 }
 
 u64 ehea_map_vaddr(void *caddr)
 {
-        u64 mapped_addr;
-        unsigned long index = __pa(caddr) >> SECTION_SIZE_BITS;
-
-        if (likely(index < ehea_bmap.entries)) {
-                mapped_addr = ehea_bmap.vaddr[index];
-                if (likely(mapped_addr))
-                        mapped_addr |= (((unsigned long)caddr)
-                                        & (EHEA_SECTSIZE - 1));
-                else
-                        mapped_addr = -1;
-        } else
-                mapped_addr = -1;
-
-        if (unlikely(mapped_addr == -1))
-                if (!test_and_set_bit(__EHEA_STOP_XFER, &ehea_driver_flags))
-                        schedule_work(&ehea_rereg_mr_task);
-
-        return mapped_addr;
+        int top, dir, idx;
+        unsigned long index, offset;
+
+        if (!ehea_bmap)
+                return EHEA_INVAL_ADDR;
+
+        index = virt_to_abs(caddr) >> SECTION_SIZE_BITS;
+        top = (index >> EHEA_TOP_INDEX_SHIFT) & EHEA_INDEX_MASK;
+        if (!ehea_bmap->top[top])
+                return EHEA_INVAL_ADDR;
+
+        dir = (index >> EHEA_DIR_INDEX_SHIFT) & EHEA_INDEX_MASK;
+        if (!ehea_bmap->top[top]->dir[dir])
+                return EHEA_INVAL_ADDR;
+
+        idx = index & EHEA_INDEX_MASK;
+        if (!ehea_bmap->top[top]->dir[dir]->ent[idx])
+                return EHEA_INVAL_ADDR;
+
+        offset = (unsigned long)caddr & (EHEA_SECTSIZE - 1);
+        return ehea_bmap->top[top]->dir[dir]->ent[idx] | offset;
+}
+
+static inline void *ehea_calc_sectbase(int top, int dir, int idx)
+{
+        unsigned long ret = idx;
+        ret |= dir << EHEA_DIR_INDEX_SHIFT;
+        ret |= top << EHEA_TOP_INDEX_SHIFT;
+        return abs_to_virt(ret << SECTION_SIZE_BITS);
+}
+
+static u64 ehea_reg_mr_section(int top, int dir, int idx, u64 *pt,
+                               struct ehea_adapter *adapter,
+                               struct ehea_mr *mr)
+{
+        void *pg;
+        u64 j, m, hret;
+        unsigned long k = 0;
+        u64 pt_abs = virt_to_abs(pt);
+
+        void *sectbase = ehea_calc_sectbase(top, dir, idx);
+
+        for (j = 0; j < (EHEA_PAGES_PER_SECTION / EHEA_MAX_RPAGE); j++) {
+
+                for (m = 0; m < EHEA_MAX_RPAGE; m++) {
+                        pg = sectbase + ((k++) * EHEA_PAGESIZE);
+                        pt[m] = virt_to_abs(pg);
+                }
+                hret = ehea_h_register_rpage_mr(adapter->handle, mr->handle, 0,
+                                                0, pt_abs, EHEA_MAX_RPAGE);
+
+                if ((hret != H_SUCCESS)
+                    && (hret != H_PAGE_REGISTERED)) {
+                        ehea_h_free_resource(adapter->handle, mr->handle,
+                                             FORCE_FREE);
+                        ehea_error("register_rpage_mr failed");
+                        return hret;
+                }
+        }
+        return hret;
+}
+
+static u64 ehea_reg_mr_sections(int top, int dir, u64 *pt,
+                                struct ehea_adapter *adapter,
+                                struct ehea_mr *mr)
+{
+        u64 hret = H_SUCCESS;
+        int idx;
+
+        for (idx = 0; idx < EHEA_MAP_ENTRIES; idx++) {
+                if (!ehea_bmap->top[top]->dir[dir]->ent[idx])
+                        continue;
+                
+                hret = ehea_reg_mr_section(top, dir, idx, pt, adapter, mr);
+                if ((hret != H_SUCCESS) && (hret != H_PAGE_REGISTERED))
+                                return hret;
+        }
+        return hret;
+}
+
+static u64 ehea_reg_mr_dir_sections(int top, u64 *pt,
+                                    struct ehea_adapter *adapter,
+                                    struct ehea_mr *mr)
+{
+        u64 hret = H_SUCCESS;
+        int dir;
+
+        for (dir = 0; dir < EHEA_MAP_ENTRIES; dir++) {
+                if (!ehea_bmap->top[top]->dir[dir])
+                        continue;
+
+                hret = ehea_reg_mr_sections(top, dir, pt, adapter, mr);
+                if ((hret != H_SUCCESS) && (hret != H_PAGE_REGISTERED))
+                                return hret;
+        }
+        return hret;
 }
 
 int ehea_reg_kernel_mr(struct ehea_adapter *adapter, struct ehea_mr *mr)
 {
         int ret;
         u64 *pt;
-        void *pg;
-        u64 hret, pt_abs, i, j, m, mr_len;
+        u64 hret;
         u32 acc_ctrl = EHEA_MR_ACC_CTRL;
 
-        mr_len = ehea_bmap.valid_sections * EHEA_SECTSIZE;
+        unsigned long top;
 
-        pt =  kzalloc(PAGE_SIZE, GFP_KERNEL);
+        pt = kzalloc(PAGE_SIZE, GFP_KERNEL);
         if (!pt) {
                 ehea_error("no mem");
                 ret = -ENOMEM;
                 goto out;
         }
-        pt_abs = virt_to_abs(pt);
 
-        hret = ehea_h_alloc_resource_mr(adapter->handle,
-                                        EHEA_BUSMAP_START, mr_len,
-                                        acc_ctrl, adapter->pd,
+        hret = ehea_h_alloc_resource_mr(adapter->handle, EHEA_BUSMAP_START,
+                                        ehea_mr_len, acc_ctrl, adapter->pd,
                                         &mr->handle, &mr->lkey);
+
         if (hret != H_SUCCESS) {
                 ehea_error("alloc_resource_mr failed");
                 ret = -EIO;
                 goto out;
         }
 
-        for (i = 0 ; i < ehea_bmap.entries; i++)
-                if (ehea_bmap.vaddr[i]) {
-                        void *sectbase = __va(i << SECTION_SIZE_BITS);
-                        unsigned long k = 0;
-
-                        for (j = 0; j < (EHEA_PAGES_PER_SECTION /
-                                         EHEA_MAX_RPAGE); j++) {
-
-                                for (m = 0; m < EHEA_MAX_RPAGE; m++) {
-                                        pg = sectbase + ((k++) * EHEA_PAGESIZE);
-                                        pt[m] = virt_to_abs(pg);
-                                }
-
-                                hret = ehea_h_register_rpage_mr(adapter->handle,
-                                                                mr->handle,
-                                                                0, 0, pt_abs,
-                                                                EHEA_MAX_RPAGE);
-                                if ((hret != H_SUCCESS)
-                                    && (hret != H_PAGE_REGISTERED)) {
-                                        ehea_h_free_resource(adapter->handle,
-                                                             mr->handle,
-                                                             FORCE_FREE);
-                                        ehea_error("register_rpage_mr failed");
-                                        ret = -EIO;
-                                        goto out;
-                                }
-                        }
-                }
+        if (!ehea_bmap) {
+                ehea_h_free_resource(adapter->handle, mr->handle, FORCE_FREE);
+                ehea_error("no busmap available");
+                ret = -EIO;
+                goto out;
+        }
+
+        for (top = 0; top < EHEA_MAP_ENTRIES; top++) {
+                if (!ehea_bmap->top[top])
+                        continue;
+
+                hret = ehea_reg_mr_dir_sections(top, pt, adapter, mr);
+                if((hret != H_PAGE_REGISTERED) && (hret != H_SUCCESS))
+                        break;
+        }
 
         if (hret != H_SUCCESS) {
                 ehea_h_free_resource(adapter->handle, mr->handle, FORCE_FREE);
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 6f22f068d6ee..25bdd0832df5 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -635,6 +635,8 @@ static void free_skb_resources(struct gfar_private *priv)
                         dev_kfree_skb_any(priv->tx_skbuff[i]);
                         priv->tx_skbuff[i] = NULL;
                 }
+
+                txbdp++;
         }
 
         kfree(priv->tx_skbuff);
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index ef63c8d2bd7e..c91b12ea26ad 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -144,11 +144,13 @@ struct myri10ge_tx_buf {
         char *req_bytes;
         struct myri10ge_tx_buffer_state *info;
         int mask;               /* number of transmit slots -1  */
-        int boundary;           /* boundary transmits cannot cross */
         int req ____cacheline_aligned;  /* transmit slots submitted     */
         int pkt_start;          /* packets started */
+        int stop_queue;
+        int linearized;
         int done ____cacheline_aligned; /* transmit slots completed     */
         int pkt_done;           /* packets completed */
+        int wake_queue;
 };
 
 struct myri10ge_rx_done {
@@ -160,29 +162,50 @@ struct myri10ge_rx_done {
         struct net_lro_desc lro_desc[MYRI10GE_MAX_LRO_DESCRIPTORS];
 };
 
-struct myri10ge_priv {
-        int running;            /* running?             */
-        int csum_flag;          /* rx_csums?            */
+struct myri10ge_slice_netstats {
+        unsigned long rx_packets;
+        unsigned long tx_packets;
+        unsigned long rx_bytes;
+        unsigned long tx_bytes;
+        unsigned long rx_dropped;
+        unsigned long tx_dropped;
+};
+
+struct myri10ge_slice_state {
         struct myri10ge_tx_buf tx;      /* transmit ring        */
         struct myri10ge_rx_buf rx_small;
         struct myri10ge_rx_buf rx_big;
         struct myri10ge_rx_done rx_done;
+        struct net_device *dev;
+        struct napi_struct napi;
+        struct myri10ge_priv *mgp;
+        struct myri10ge_slice_netstats stats;
+        __be32 __iomem *irq_claim;
+        struct mcp_irq_data *fw_stats;
+        dma_addr_t fw_stats_bus;
+        int watchdog_tx_done;
+        int watchdog_tx_req;
+};
+
+struct myri10ge_priv {
+        struct myri10ge_slice_state ss;
+        int tx_boundary;        /* boundary transmits cannot cross */
+        int running;            /* running?             */
+        int csum_flag;          /* rx_csums?            */
         int small_bytes;
         int big_bytes;
+        int max_intr_slots;
         struct net_device *dev;
-        struct napi_struct napi;
         struct net_device_stats stats;
+        spinlock_t stats_lock;
         u8 __iomem *sram;
         int sram_size;
         unsigned long board_span;
         unsigned long iomem_base;
-        __be32 __iomem *irq_claim;
         __be32 __iomem *irq_deassert;
         char *mac_addr_string;
         struct mcp_cmd_response *cmd;
         dma_addr_t cmd_bus;
-        struct mcp_irq_data *fw_stats;
-        dma_addr_t fw_stats_bus;
         struct pci_dev *pdev;
         int msi_enabled;
         u32 link_state;
@@ -191,20 +214,16 @@ struct myri10ge_priv {
         __be32 __iomem *intr_coal_delay_ptr;
         int mtrr;
         int wc_enabled;
-        int wake_queue;
-        int stop_queue;
         int down_cnt;
         wait_queue_head_t down_wq;
         struct work_struct watchdog_work;
         struct timer_list watchdog_timer;
-        int watchdog_tx_done;
-        int watchdog_tx_req;
-        int watchdog_pause;
         int watchdog_resets;
-        int tx_linearized;
+        int watchdog_pause;
         int pause;
         char *fw_name;
         char eeprom_strings[MYRI10GE_EEPROM_STRINGS_SIZE];
+        char *product_code_string;
         char fw_version[128];
         int fw_ver_major;
         int fw_ver_minor;
@@ -228,58 +247,54 @@ static char *myri10ge_fw_aligned = "myri10ge_eth_z8e.dat";
 
 static char *myri10ge_fw_name = NULL;
 module_param(myri10ge_fw_name, charp, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(myri10ge_fw_name, "Firmware image name\n");
+MODULE_PARM_DESC(myri10ge_fw_name, "Firmware image name");
 
 static int myri10ge_ecrc_enable = 1;
 module_param(myri10ge_ecrc_enable, int, S_IRUGO);
-MODULE_PARM_DESC(myri10ge_ecrc_enable, "Enable Extended CRC on PCI-E\n");
-
-static int myri10ge_max_intr_slots = 1024;
-module_param(myri10ge_max_intr_slots, int, S_IRUGO);
-MODULE_PARM_DESC(myri10ge_max_intr_slots, "Interrupt queue slots\n");
+MODULE_PARM_DESC(myri10ge_ecrc_enable, "Enable Extended CRC on PCI-E");
 
 static int myri10ge_small_bytes = -1;   /* -1 == auto */
 module_param(myri10ge_small_bytes, int, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(myri10ge_small_bytes, "Threshold of small packets\n");
+MODULE_PARM_DESC(myri10ge_small_bytes, "Threshold of small packets");
 
 static int myri10ge_msi = 1;    /* enable msi by default */
 module_param(myri10ge_msi, int, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(myri10ge_msi, "Enable Message Signalled Interrupts\n");
+MODULE_PARM_DESC(myri10ge_msi, "Enable Message Signalled Interrupts");
 
 static int myri10ge_intr_coal_delay = 75;
 module_param(myri10ge_intr_coal_delay, int, S_IRUGO);
-MODULE_PARM_DESC(myri10ge_intr_coal_delay, "Interrupt coalescing delay\n");
+MODULE_PARM_DESC(myri10ge_intr_coal_delay, "Interrupt coalescing delay");
 
 static int myri10ge_flow_control = 1;
 module_param(myri10ge_flow_control, int, S_IRUGO);
-MODULE_PARM_DESC(myri10ge_flow_control, "Pause parameter\n");
+MODULE_PARM_DESC(myri10ge_flow_control, "Pause parameter");
 
 static int myri10ge_deassert_wait = 1;
 module_param(myri10ge_deassert_wait, int, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(myri10ge_deassert_wait,
-                 "Wait when deasserting legacy interrupts\n");
+                 "Wait when deasserting legacy interrupts");
 
 static int myri10ge_force_firmware = 0;
 module_param(myri10ge_force_firmware, int, S_IRUGO);
 MODULE_PARM_DESC(myri10ge_force_firmware,
-                 "Force firmware to assume aligned completions\n");
+                 "Force firmware to assume aligned completions");
 
 static int myri10ge_initial_mtu = MYRI10GE_MAX_ETHER_MTU - ETH_HLEN;
 module_param(myri10ge_initial_mtu, int, S_IRUGO);
-MODULE_PARM_DESC(myri10ge_initial_mtu, "Initial MTU\n");
+MODULE_PARM_DESC(myri10ge_initial_mtu, "Initial MTU");
 
 static int myri10ge_napi_weight = 64;
 module_param(myri10ge_napi_weight, int, S_IRUGO);
-MODULE_PARM_DESC(myri10ge_napi_weight, "Set NAPI weight\n");
+MODULE_PARM_DESC(myri10ge_napi_weight, "Set NAPI weight");
 
 static int myri10ge_watchdog_timeout = 1;
 module_param(myri10ge_watchdog_timeout, int, S_IRUGO);
-MODULE_PARM_DESC(myri10ge_watchdog_timeout, "Set watchdog timeout\n");
+MODULE_PARM_DESC(myri10ge_watchdog_timeout, "Set watchdog timeout");
 
 static int myri10ge_max_irq_loops = 1048576;
 module_param(myri10ge_max_irq_loops, int, S_IRUGO);
 MODULE_PARM_DESC(myri10ge_max_irq_loops,
-                 "Set stuck legacy IRQ detection threshold\n");
+                 "Set stuck legacy IRQ detection threshold");
 
 #define MYRI10GE_MSG_DEFAULT NETIF_MSG_LINK
 
@@ -289,21 +304,22 @@ MODULE_PARM_DESC(myri10ge_debug, "Debug level (0=none,...,16=all)");
 
 static int myri10ge_lro = 1;
 module_param(myri10ge_lro, int, S_IRUGO);
-MODULE_PARM_DESC(myri10ge_lro, "Enable large receive offload\n");
+MODULE_PARM_DESC(myri10ge_lro, "Enable large receive offload");
 
 static int myri10ge_lro_max_pkts = MYRI10GE_LRO_MAX_PKTS;
 module_param(myri10ge_lro_max_pkts, int, S_IRUGO);
-MODULE_PARM_DESC(myri10ge_lro, "Number of LRO packets to be aggregated\n");
+MODULE_PARM_DESC(myri10ge_lro_max_pkts,
+                 "Number of LRO packets to be aggregated");
 
 static int myri10ge_fill_thresh = 256;
 module_param(myri10ge_fill_thresh, int, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(myri10ge_fill_thresh, "Number of empty rx slots allowed\n");
+MODULE_PARM_DESC(myri10ge_fill_thresh, "Number of empty rx slots allowed");
 
 static int myri10ge_reset_recover = 1;
 
 static int myri10ge_wcfifo = 0;
 module_param(myri10ge_wcfifo, int, S_IRUGO);
-MODULE_PARM_DESC(myri10ge_wcfifo, "Enable WC Fifo when WC is enabled\n");
+MODULE_PARM_DESC(myri10ge_wcfifo, "Enable WC Fifo when WC is enabled");
 
 #define MYRI10GE_FW_OFFSET 1024*1024
 #define MYRI10GE_HIGHPART_TO_U32(X) \
@@ -359,8 +375,10 @@ myri10ge_send_cmd(struct myri10ge_priv *mgp, u32 cmd,
                 for (sleep_total = 0;
                      sleep_total < 1000
                      && response->result == htonl(MYRI10GE_NO_RESPONSE_RESULT);
-                     sleep_total += 10)
+                     sleep_total += 10) {
                         udelay(10);
+                        mb();
+                }
         } else {
                 /* use msleep for most command */
                 for (sleep_total = 0;
@@ -420,6 +438,10 @@ static int myri10ge_read_mac_addr(struct myri10ge_priv *mgp)
                                 ptr += 1;
                         }
                 }
+                if (memcmp(ptr, "PC=", 3) == 0) {
+                        ptr += 3;
+                        mgp->product_code_string = ptr;
+                }
                 if (memcmp((const void *)ptr, "SN=", 3) == 0) {
                         ptr += 3;
                         mgp->serial_number = simple_strtoul(ptr, &ptr, 10);
@@ -442,7 +464,7 @@ abort:
 static void myri10ge_dummy_rdma(struct myri10ge_priv *mgp, int enable)
 {
         char __iomem *submit;
-        __be32 buf[16];
+        __be32 buf[16] __attribute__ ((__aligned__(8)));
         u32 dma_low, dma_high;
         int i;
 
@@ -609,13 +631,38 @@ static int myri10ge_adopt_running_firmware(struct myri10ge_priv *mgp)
         return status;
 }
 
+int myri10ge_get_firmware_capabilities(struct myri10ge_priv *mgp)
+{
+        struct myri10ge_cmd cmd;
+        int status;
+
+        /* probe for IPv6 TSO support */
+        mgp->features = NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_TSO;
+        status = myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_MAX_TSO6_HDR_SIZE,
+                                   &cmd, 0);
+        if (status == 0) {
+                mgp->max_tso6 = cmd.data0;
+                mgp->features |= NETIF_F_TSO6;
+        }
+
+        status = myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_RX_RING_SIZE, &cmd, 0);
+        if (status != 0) {
+                dev_err(&mgp->pdev->dev,
+                        "failed MXGEFW_CMD_GET_RX_RING_SIZE\n");
+                return -ENXIO;
+        }
+
+        mgp->max_intr_slots = 2 * (cmd.data0 / sizeof(struct mcp_dma_addr));
+
+        return 0;
+}
+
 static int myri10ge_load_firmware(struct myri10ge_priv *mgp)
 {
         char __iomem *submit;
-        __be32 buf[16];
+        __be32 buf[16] __attribute__ ((__aligned__(8)));
         u32 dma_low, dma_high, size;
         int status, i;
-        struct myri10ge_cmd cmd;
 
         size = 0;
         status = myri10ge_load_hotplug_firmware(mgp, &size);
@@ -635,7 +682,7 @@ static int myri10ge_load_firmware(struct myri10ge_priv *mgp)
                 }
                 dev_info(&mgp->pdev->dev,
                          "Successfully adopted running firmware\n");
-                if (mgp->tx.boundary == 4096) {
+                if (mgp->tx_boundary == 4096) {
                         dev_warn(&mgp->pdev->dev,
                                  "Using firmware currently running on NIC"
                                  ".  For optimal\n");
@@ -646,7 +693,9 @@ static int myri10ge_load_firmware(struct myri10ge_priv *mgp)
                 }
 
                 mgp->fw_name = "adopted";
-                mgp->tx.boundary = 2048;
+                mgp->tx_boundary = 2048;
+                myri10ge_dummy_rdma(mgp, 1);
+                status = myri10ge_get_firmware_capabilities(mgp);
                 return status;
         }
 
@@ -681,26 +730,18 @@ static int myri10ge_load_firmware(struct myri10ge_priv *mgp)
         msleep(1);
         mb();
         i = 0;
-        while (mgp->cmd->data != MYRI10GE_NO_CONFIRM_DATA && i < 20) {
-                msleep(1);
+        while (mgp->cmd->data != MYRI10GE_NO_CONFIRM_DATA && i < 9) {
+                msleep(1 << i);
                 i++;
         }
         if (mgp->cmd->data != MYRI10GE_NO_CONFIRM_DATA) {
                 dev_err(&mgp->pdev->dev, "handoff failed\n");
                 return -ENXIO;
         }
-        dev_info(&mgp->pdev->dev, "handoff confirmed\n");
         myri10ge_dummy_rdma(mgp, 1);
+        status = myri10ge_get_firmware_capabilities(mgp);
 
-        /* probe for IPv6 TSO support */
-        mgp->features = NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_TSO;
-        status = myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_MAX_TSO6_HDR_SIZE,
-                                   &cmd, 0);
-        if (status == 0) {
-                mgp->max_tso6 = cmd.data0;
-                mgp->features |= NETIF_F_TSO6;
-        }
-        return 0;
+        return status;
 }
 
 static int myri10ge_update_mac_address(struct myri10ge_priv *mgp, u8 * addr)
@@ -772,7 +813,7 @@ static int myri10ge_dma_test(struct myri10ge_priv *mgp, int test_type)
          * transfers took to complete.
          */
 
-        len = mgp->tx.boundary;
+        len = mgp->tx_boundary;
 
         cmd.data0 = MYRI10GE_LOWPART_TO_U32(dmatest_bus);
         cmd.data1 = MYRI10GE_HIGHPART_TO_U32(dmatest_bus);
@@ -834,17 +875,17 @@ static int myri10ge_reset(struct myri10ge_priv *mgp)
 
         /* Now exchange information about interrupts  */
 
-        bytes = myri10ge_max_intr_slots * sizeof(*mgp->rx_done.entry);
-        memset(mgp->rx_done.entry, 0, bytes);
+        bytes = mgp->max_intr_slots * sizeof(*mgp->ss.rx_done.entry);
+        memset(mgp->ss.rx_done.entry, 0, bytes);
         cmd.data0 = (u32) bytes;
         status = myri10ge_send_cmd(mgp, MXGEFW_CMD_SET_INTRQ_SIZE, &cmd, 0);
-        cmd.data0 = MYRI10GE_LOWPART_TO_U32(mgp->rx_done.bus);
-        cmd.data1 = MYRI10GE_HIGHPART_TO_U32(mgp->rx_done.bus);
+        cmd.data0 = MYRI10GE_LOWPART_TO_U32(mgp->ss.rx_done.bus);
+        cmd.data1 = MYRI10GE_HIGHPART_TO_U32(mgp->ss.rx_done.bus);
         status |= myri10ge_send_cmd(mgp, MXGEFW_CMD_SET_INTRQ_DMA, &cmd, 0);
 
         status |=
             myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_IRQ_ACK_OFFSET, &cmd, 0);
-        mgp->irq_claim = (__iomem __be32 *) (mgp->sram + cmd.data0);
+        mgp->ss.irq_claim = (__iomem __be32 *) (mgp->sram + cmd.data0);
         status |= myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_IRQ_DEASSERT_OFFSET,
                                     &cmd, 0);
         mgp->irq_deassert = (__iomem __be32 *) (mgp->sram + cmd.data0);
@@ -858,17 +899,17 @@ static int myri10ge_reset(struct myri10ge_priv *mgp)
         }
         put_be32(htonl(mgp->intr_coal_delay), mgp->intr_coal_delay_ptr);
 
-        memset(mgp->rx_done.entry, 0, bytes);
+        memset(mgp->ss.rx_done.entry, 0, bytes);
 
         /* reset mcp/driver shared state back to 0 */
-        mgp->tx.req = 0;
-        mgp->tx.done = 0;
-        mgp->tx.pkt_start = 0;
-        mgp->tx.pkt_done = 0;
-        mgp->rx_big.cnt = 0;
-        mgp->rx_small.cnt = 0;
-        mgp->rx_done.idx = 0;
-        mgp->rx_done.cnt = 0;
+        mgp->ss.tx.req = 0;
+        mgp->ss.tx.done = 0;
+        mgp->ss.tx.pkt_start = 0;
+        mgp->ss.tx.pkt_done = 0;
+        mgp->ss.rx_big.cnt = 0;
+        mgp->ss.rx_small.cnt = 0;
+        mgp->ss.rx_done.idx = 0;
+        mgp->ss.rx_done.cnt = 0;
         mgp->link_changes = 0;
         status = myri10ge_update_mac_address(mgp, mgp->dev->dev_addr);
         myri10ge_change_pause(mgp, mgp->pause);
@@ -1020,9 +1061,10 @@ myri10ge_unmap_rx_page(struct pci_dev *pdev,
                                  * page into an skb */
 
 static inline int
-myri10ge_rx_done(struct myri10ge_priv *mgp, struct myri10ge_rx_buf *rx,
+myri10ge_rx_done(struct myri10ge_slice_state *ss, struct myri10ge_rx_buf *rx,
                  int bytes, int len, __wsum csum)
 {
+        struct myri10ge_priv *mgp = ss->mgp;
         struct sk_buff *skb;
         struct skb_frag_struct rx_frags[MYRI10GE_MAX_FRAGS_PER_FRAME];
         int i, idx, hlen, remainder;
@@ -1052,11 +1094,10 @@ myri10ge_rx_done(struct myri10ge_priv *mgp, struct myri10ge_rx_buf *rx,
                 rx_frags[0].page_offset += MXGEFW_PAD;
                 rx_frags[0].size -= MXGEFW_PAD;
                 len -= MXGEFW_PAD;
-                lro_receive_frags(&mgp->rx_done.lro_mgr, rx_frags,
+                lro_receive_frags(&ss->rx_done.lro_mgr, rx_frags,
                                   len, len,
-                                 /* opaque, will come back in get_frag_header */
-                                  (void *)(__force unsigned long)csum,
-                                  csum);
+                                  /* opaque, will come back in get_frag_header */
+                                  (void *)(__force unsigned long)csum, csum);
                 return 1;
         }
 
@@ -1096,10 +1137,11 @@ myri10ge_rx_done(struct myri10ge_priv *mgp, struct myri10ge_rx_buf *rx,
         return 1;
 }
 
-static inline void myri10ge_tx_done(struct myri10ge_priv *mgp, int mcp_index)
+static inline void
+myri10ge_tx_done(struct myri10ge_slice_state *ss, int mcp_index)
 {
-        struct pci_dev *pdev = mgp->pdev;
-        struct myri10ge_tx_buf *tx = &mgp->tx;
+        struct pci_dev *pdev = ss->mgp->pdev;
+        struct myri10ge_tx_buf *tx = &ss->tx;
         struct sk_buff *skb;
         int idx, len;
 
@@ -1117,8 +1159,8 @@ static inline void myri10ge_tx_done(struct myri10ge_priv *mgp, int mcp_index)
                 len = pci_unmap_len(&tx->info[idx], len);
                 pci_unmap_len_set(&tx->info[idx], len, 0);
                 if (skb) {
-                        mgp->stats.tx_bytes += skb->len;
-                        mgp->stats.tx_packets++;
+                        ss->stats.tx_bytes += skb->len;
+                        ss->stats.tx_packets++;
                         dev_kfree_skb_irq(skb);
                         if (len)
                                 pci_unmap_single(pdev,
@@ -1134,16 +1176,18 @@ static inline void myri10ge_tx_done(struct myri10ge_priv *mgp, int mcp_index)
                 }
         }
         /* start the queue if we've stopped it */
-        if (netif_queue_stopped(mgp->dev)
+        if (netif_queue_stopped(ss->dev)
             && tx->req - tx->done < (tx->mask >> 1)) {
-                mgp->wake_queue++;
-                netif_wake_queue(mgp->dev);
+                tx->wake_queue++;
+                netif_wake_queue(ss->dev);
         }
 }
 
-static inline int myri10ge_clean_rx_done(struct myri10ge_priv *mgp, int budget)
+static inline int
+myri10ge_clean_rx_done(struct myri10ge_slice_state *ss, int budget)
 {
-        struct myri10ge_rx_done *rx_done = &mgp->rx_done;
+        struct myri10ge_rx_done *rx_done = &ss->rx_done;
+        struct myri10ge_priv *mgp = ss->mgp;
         unsigned long rx_bytes = 0;
         unsigned long rx_packets = 0;
         unsigned long rx_ok;
@@ -1159,40 +1203,40 @@ static inline int myri10ge_clean_rx_done(struct myri10ge_priv *mgp, int budget)
                 rx_done->entry[idx].length = 0;
                 checksum = csum_unfold(rx_done->entry[idx].checksum);
                 if (length <= mgp->small_bytes)
-                        rx_ok = myri10ge_rx_done(mgp, &mgp->rx_small,
+                        rx_ok = myri10ge_rx_done(ss, &ss->rx_small,
                                                  mgp->small_bytes,
                                                  length, checksum);
                 else
-                        rx_ok = myri10ge_rx_done(mgp, &mgp->rx_big,
+                        rx_ok = myri10ge_rx_done(ss, &ss->rx_big,
                                                  mgp->big_bytes,
                                                  length, checksum);
                 rx_packets += rx_ok;
                 rx_bytes += rx_ok * (unsigned long)length;
                 cnt++;
-                idx = cnt & (myri10ge_max_intr_slots - 1);
+                idx = cnt & (mgp->max_intr_slots - 1);
                 work_done++;
         }
         rx_done->idx = idx;
         rx_done->cnt = cnt;
-        mgp->stats.rx_packets += rx_packets;
-        mgp->stats.rx_bytes += rx_bytes;
+        ss->stats.rx_packets += rx_packets;
+        ss->stats.rx_bytes += rx_bytes;
 
         if (myri10ge_lro)
                 lro_flush_all(&rx_done->lro_mgr);
 
         /* restock receive rings if needed */
-        if (mgp->rx_small.fill_cnt - mgp->rx_small.cnt < myri10ge_fill_thresh)
-                myri10ge_alloc_rx_pages(mgp, &mgp->rx_small,
+        if (ss->rx_small.fill_cnt - ss->rx_small.cnt < myri10ge_fill_thresh)
+                myri10ge_alloc_rx_pages(mgp, &ss->rx_small,
                                         mgp->small_bytes + MXGEFW_PAD, 0);
-        if (mgp->rx_big.fill_cnt - mgp->rx_big.cnt < myri10ge_fill_thresh)
-                myri10ge_alloc_rx_pages(mgp, &mgp->rx_big, mgp->big_bytes, 0);
+        if (ss->rx_big.fill_cnt - ss->rx_big.cnt < myri10ge_fill_thresh)
+                myri10ge_alloc_rx_pages(mgp, &ss->rx_big, mgp->big_bytes, 0);
 
         return work_done;
 }
 
 static inline void myri10ge_check_statblock(struct myri10ge_priv *mgp)
 {
-        struct mcp_irq_data *stats = mgp->fw_stats;
+        struct mcp_irq_data *stats = mgp->ss.fw_stats;
 
         if (unlikely(stats->stats_updated)) {
                 unsigned link_up = ntohl(stats->link_up);
@@ -1219,9 +1263,9 @@ static inline void myri10ge_check_statblock(struct myri10ge_priv *mgp)
                         }
                 }
                 if (mgp->rdma_tags_available !=
-                    ntohl(mgp->fw_stats->rdma_tags_available)) {
+                    ntohl(stats->rdma_tags_available)) {
                         mgp->rdma_tags_available =
-                            ntohl(mgp->fw_stats->rdma_tags_available);
+                            ntohl(stats->rdma_tags_available);
                         printk(KERN_WARNING "myri10ge: %s: RDMA timed out! "
                                "%d tags left\n", mgp->dev->name,
                                mgp->rdma_tags_available);
@@ -1234,26 +1278,27 @@ static inline void myri10ge_check_statblock(struct myri10ge_priv *mgp)
 
 static int myri10ge_poll(struct napi_struct *napi, int budget)
 {
-        struct myri10ge_priv *mgp =
-            container_of(napi, struct myri10ge_priv, napi);
-        struct net_device *netdev = mgp->dev;
+        struct myri10ge_slice_state *ss =
+            container_of(napi, struct myri10ge_slice_state, napi);
+        struct net_device *netdev = ss->mgp->dev;
         int work_done;
 
         /* process as many rx events as NAPI will allow */
-        work_done = myri10ge_clean_rx_done(mgp, budget);
+        work_done = myri10ge_clean_rx_done(ss, budget);
 
         if (work_done < budget) {
                 netif_rx_complete(netdev, napi);
-                put_be32(htonl(3), mgp->irq_claim);
+                put_be32(htonl(3), ss->irq_claim);
         }
         return work_done;
 }
 
 static irqreturn_t myri10ge_intr(int irq, void *arg)
 {
-        struct myri10ge_priv *mgp = arg;
-        struct mcp_irq_data *stats = mgp->fw_stats;
-        struct myri10ge_tx_buf *tx = &mgp->tx;
+        struct myri10ge_slice_state *ss = arg;
+        struct myri10ge_priv *mgp = ss->mgp;
+        struct mcp_irq_data *stats = ss->fw_stats;
+        struct myri10ge_tx_buf *tx = &ss->tx;
         u32 send_done_count;
         int i;
 
@@ -1264,7 +1309,7 @@ static irqreturn_t myri10ge_intr(int irq, void *arg)
         /* low bit indicates receives are present, so schedule
          * napi poll handler */
         if (stats->valid & 1)
-                netif_rx_schedule(mgp->dev, &mgp->napi);
+                netif_rx_schedule(ss->dev, &ss->napi);
 
         if (!mgp->msi_enabled) {
                 put_be32(0, mgp->irq_deassert);
@@ -1281,7 +1326,7 @@ static irqreturn_t myri10ge_intr(int irq, void *arg)
                 /* check for transmit completes and receives */
                 send_done_count = ntohl(stats->send_done_count);
                 if (send_done_count != tx->pkt_done)
-                        myri10ge_tx_done(mgp, (int)send_done_count);
+                        myri10ge_tx_done(ss, (int)send_done_count);
                 if (unlikely(i > myri10ge_max_irq_loops)) {
                         printk(KERN_WARNING "myri10ge: %s: irq stuck?\n",
                                mgp->dev->name);
@@ -1296,16 +1341,46 @@ static irqreturn_t myri10ge_intr(int irq, void *arg)
 
         myri10ge_check_statblock(mgp);
 
-        put_be32(htonl(3), mgp->irq_claim + 1);
+        put_be32(htonl(3), ss->irq_claim + 1);
         return (IRQ_HANDLED);
 }
 
 static int
 myri10ge_get_settings(struct net_device *netdev, struct ethtool_cmd *cmd)
 {
+        struct myri10ge_priv *mgp = netdev_priv(netdev);
+        char *ptr;
+        int i;
+
         cmd->autoneg = AUTONEG_DISABLE;
         cmd->speed = SPEED_10000;
         cmd->duplex = DUPLEX_FULL;
+
+        /*
+         * parse the product code to deterimine the interface type
+         * (CX4, XFP, Quad Ribbon Fiber) by looking at the character
+         * after the 3rd dash in the driver's cached copy of the
+         * EEPROM's product code string.
+         */
+        ptr = mgp->product_code_string;
+        if (ptr == NULL) {
+                printk(KERN_ERR "myri10ge: %s: Missing product code\n",
+                       netdev->name);
+                return 0;
+        }
+        for (i = 0; i < 3; i++, ptr++) {
+                ptr = strchr(ptr, '-');
+                if (ptr == NULL) {
+                        printk(KERN_ERR "myri10ge: %s: Invalid product "
+                               "code %s\n", netdev->name,
+                               mgp->product_code_string);
+                        return 0;
+                }
+        }
+        if (*ptr == 'R' || *ptr == 'Q') {
+                /* We've found either an XFP or quad ribbon fiber */
+                cmd->port = PORT_FIBRE;
+        }
         return 0;
 }
 
@@ -1324,6 +1399,7 @@ static int
 myri10ge_get_coalesce(struct net_device *netdev, struct ethtool_coalesce *coal)
 {
         struct myri10ge_priv *mgp = netdev_priv(netdev);
+
         coal->rx_coalesce_usecs = mgp->intr_coal_delay;
         return 0;
 }
@@ -1370,10 +1446,10 @@ myri10ge_get_ringparam(struct net_device *netdev,
 {
         struct myri10ge_priv *mgp = netdev_priv(netdev);
 
-        ring->rx_mini_max_pending = mgp->rx_small.mask + 1;
-        ring->rx_max_pending = mgp->rx_big.mask + 1;
+        ring->rx_mini_max_pending = mgp->ss.rx_small.mask + 1;
+        ring->rx_max_pending = mgp->ss.rx_big.mask + 1;
         ring->rx_jumbo_max_pending = 0;
-        ring->tx_max_pending = mgp->rx_small.mask + 1;
+        ring->tx_max_pending = mgp->ss.rx_small.mask + 1;
         ring->rx_mini_pending = ring->rx_mini_max_pending;
         ring->rx_pending = ring->rx_max_pending;
         ring->rx_jumbo_pending = ring->rx_jumbo_max_pending;
@@ -1383,6 +1459,7 @@ myri10ge_get_ringparam(struct net_device *netdev,
 static u32 myri10ge_get_rx_csum(struct net_device *netdev)
 {
         struct myri10ge_priv *mgp = netdev_priv(netdev);
+
         if (mgp->csum_flag)
                 return 1;
         else
@@ -1392,6 +1469,7 @@ static u32 myri10ge_get_rx_csum(struct net_device *netdev)
 static int myri10ge_set_rx_csum(struct net_device *netdev, u32 csum_enabled)
 {
         struct myri10ge_priv *mgp = netdev_priv(netdev);
+
         if (csum_enabled)
                 mgp->csum_flag = MXGEFW_FLAGS_CKSUM;
         else
@@ -1411,7 +1489,7 @@ static int myri10ge_set_tso(struct net_device *netdev, u32 tso_enabled)
         return 0;
 }
 
-static const char myri10ge_gstrings_stats[][ETH_GSTRING_LEN] = {
+static const char myri10ge_gstrings_main_stats[][ETH_GSTRING_LEN] = {
         "rx_packets", "tx_packets", "rx_bytes", "tx_bytes", "rx_errors",
         "tx_errors", "rx_dropped", "tx_dropped", "multicast", "collisions",
         "rx_length_errors", "rx_over_errors", "rx_crc_errors",
@@ -1421,28 +1499,39 @@ static const char myri10ge_gstrings_stats[][ETH_GSTRING_LEN] = {
         /* device-specific stats */
         "tx_boundary", "WC", "irq", "MSI",
         "read_dma_bw_MBs", "write_dma_bw_MBs", "read_write_dma_bw_MBs",
-        "serial_number", "tx_pkt_start", "tx_pkt_done",
-        "tx_req", "tx_done", "rx_small_cnt", "rx_big_cnt",
-        "wake_queue", "stop_queue", "watchdog_resets", "tx_linearized",
+        "serial_number", "watchdog_resets",
         "link_changes", "link_up", "dropped_link_overflow",
         "dropped_link_error_or_filtered",
         "dropped_pause", "dropped_bad_phy", "dropped_bad_crc32",
         "dropped_unicast_filtered", "dropped_multicast_filtered",
         "dropped_runt", "dropped_overrun", "dropped_no_small_buffer",
-        "dropped_no_big_buffer", "LRO aggregated", "LRO flushed",
+        "dropped_no_big_buffer"
+};
+
+static const char myri10ge_gstrings_slice_stats[][ETH_GSTRING_LEN] = {
+        "----------- slice ---------",
+        "tx_pkt_start", "tx_pkt_done", "tx_req", "tx_done",
+        "rx_small_cnt", "rx_big_cnt",
+        "wake_queue", "stop_queue", "tx_linearized", "LRO aggregated",
+            "LRO flushed",
         "LRO avg aggr", "LRO no_desc"
 };
 
 #define MYRI10GE_NET_STATS_LEN      21
-#define MYRI10GE_STATS_LEN      ARRAY_SIZE(myri10ge_gstrings_stats)
+#define MYRI10GE_MAIN_STATS_LEN  ARRAY_SIZE(myri10ge_gstrings_main_stats)
+#define MYRI10GE_SLICE_STATS_LEN  ARRAY_SIZE(myri10ge_gstrings_slice_stats)
 
 static void
 myri10ge_get_strings(struct net_device *netdev, u32 stringset, u8 * data)
 {
         switch (stringset) {
         case ETH_SS_STATS:
-                memcpy(data, *myri10ge_gstrings_stats,
-                       sizeof(myri10ge_gstrings_stats));
+                memcpy(data, *myri10ge_gstrings_main_stats,
+                       sizeof(myri10ge_gstrings_main_stats));
+                data += sizeof(myri10ge_gstrings_main_stats);
+                memcpy(data, *myri10ge_gstrings_slice_stats,
+                       sizeof(myri10ge_gstrings_slice_stats));
+                data += sizeof(myri10ge_gstrings_slice_stats);
                 break;
         }
 }
@@ -1451,7 +1540,7 @@ static int myri10ge_get_sset_count(struct net_device *netdev, int sset)
 {
         switch (sset) {
         case ETH_SS_STATS:
-                return MYRI10GE_STATS_LEN;
+                return MYRI10GE_MAIN_STATS_LEN + MYRI10GE_SLICE_STATS_LEN;
         default:
                 return -EOPNOTSUPP;
         }
@@ -1462,12 +1551,13 @@ myri10ge_get_ethtool_stats(struct net_device *netdev,
                            struct ethtool_stats *stats, u64 * data)
 {
         struct myri10ge_priv *mgp = netdev_priv(netdev);
+        struct myri10ge_slice_state *ss;
         int i;
 
         for (i = 0; i < MYRI10GE_NET_STATS_LEN; i++)
                 data[i] = ((unsigned long *)&mgp->stats)[i];
 
-        data[i++] = (unsigned int)mgp->tx.boundary;
+        data[i++] = (unsigned int)mgp->tx_boundary;
         data[i++] = (unsigned int)mgp->wc_enabled;
         data[i++] = (unsigned int)mgp->pdev->irq;
         data[i++] = (unsigned int)mgp->msi_enabled;
@@ -1475,40 +1565,44 @@ myri10ge_get_ethtool_stats(struct net_device *netdev,
         data[i++] = (unsigned int)mgp->write_dma;
         data[i++] = (unsigned int)mgp->read_write_dma;
         data[i++] = (unsigned int)mgp->serial_number;
-        data[i++] = (unsigned int)mgp->tx.pkt_start;
-        data[i++] = (unsigned int)mgp->tx.pkt_done;
-        data[i++] = (unsigned int)mgp->tx.req;
-        data[i++] = (unsigned int)mgp->tx.done;
-        data[i++] = (unsigned int)mgp->rx_small.cnt;
-        data[i++] = (unsigned int)mgp->rx_big.cnt;
-        data[i++] = (unsigned int)mgp->wake_queue;
-        data[i++] = (unsigned int)mgp->stop_queue;
         data[i++] = (unsigned int)mgp->watchdog_resets;
-        data[i++] = (unsigned int)mgp->tx_linearized;
         data[i++] = (unsigned int)mgp->link_changes;
-        data[i++] = (unsigned int)ntohl(mgp->fw_stats->link_up);
-        data[i++] = (unsigned int)ntohl(mgp->fw_stats->dropped_link_overflow);
-        data[i++] =
-            (unsigned int)ntohl(mgp->fw_stats->dropped_link_error_or_filtered);
-        data[i++] = (unsigned int)ntohl(mgp->fw_stats->dropped_pause);
-        data[i++] = (unsigned int)ntohl(mgp->fw_stats->dropped_bad_phy);
-        data[i++] = (unsigned int)ntohl(mgp->fw_stats->dropped_bad_crc32);
+
+        /* firmware stats are useful only in the first slice */
+        ss = &mgp->ss;
+        data[i++] = (unsigned int)ntohl(ss->fw_stats->link_up);
+        data[i++] = (unsigned int)ntohl(ss->fw_stats->dropped_link_overflow);
         data[i++] =
-            (unsigned int)ntohl(mgp->fw_stats->dropped_unicast_filtered);
+            (unsigned int)ntohl(ss->fw_stats->dropped_link_error_or_filtered);
+        data[i++] = (unsigned int)ntohl(ss->fw_stats->dropped_pause);
+        data[i++] = (unsigned int)ntohl(ss->fw_stats->dropped_bad_phy);
+        data[i++] = (unsigned int)ntohl(ss->fw_stats->dropped_bad_crc32);
+        data[i++] = (unsigned int)ntohl(ss->fw_stats->dropped_unicast_filtered);
         data[i++] =
-            (unsigned int)ntohl(mgp->fw_stats->dropped_multicast_filtered);
-        data[i++] = (unsigned int)ntohl(mgp->fw_stats->dropped_runt);
-        data[i++] = (unsigned int)ntohl(mgp->fw_stats->dropped_overrun);
-        data[i++] = (unsigned int)ntohl(mgp->fw_stats->dropped_no_small_buffer);
-        data[i++] = (unsigned int)ntohl(mgp->fw_stats->dropped_no_big_buffer);
-        data[i++] = mgp->rx_done.lro_mgr.stats.aggregated;
-        data[i++] = mgp->rx_done.lro_mgr.stats.flushed;
-        if (mgp->rx_done.lro_mgr.stats.flushed)
-                data[i++] = mgp->rx_done.lro_mgr.stats.aggregated /
-                    mgp->rx_done.lro_mgr.stats.flushed;
+            (unsigned int)ntohl(ss->fw_stats->dropped_multicast_filtered);
+        data[i++] = (unsigned int)ntohl(ss->fw_stats->dropped_runt);
+        data[i++] = (unsigned int)ntohl(ss->fw_stats->dropped_overrun);
+        data[i++] = (unsigned int)ntohl(ss->fw_stats->dropped_no_small_buffer);
+        data[i++] = (unsigned int)ntohl(ss->fw_stats->dropped_no_big_buffer);
+
+        data[i++] = 0;
+        data[i++] = (unsigned int)ss->tx.pkt_start;
+        data[i++] = (unsigned int)ss->tx.pkt_done;
+        data[i++] = (unsigned int)ss->tx.req;
+        data[i++] = (unsigned int)ss->tx.done;
+        data[i++] = (unsigned int)ss->rx_small.cnt;
+        data[i++] = (unsigned int)ss->rx_big.cnt;
+        data[i++] = (unsigned int)ss->tx.wake_queue;
+        data[i++] = (unsigned int)ss->tx.stop_queue;
+        data[i++] = (unsigned int)ss->tx.linearized;
+        data[i++] = ss->rx_done.lro_mgr.stats.aggregated;
+        data[i++] = ss->rx_done.lro_mgr.stats.flushed;
+        if (ss->rx_done.lro_mgr.stats.flushed)
+                data[i++] = ss->rx_done.lro_mgr.stats.aggregated /
+                    ss->rx_done.lro_mgr.stats.flushed;
         else
                 data[i++] = 0;
-        data[i++] = mgp->rx_done.lro_mgr.stats.no_desc;
+        data[i++] = ss->rx_done.lro_mgr.stats.no_desc;
 }
 
 static void myri10ge_set_msglevel(struct net_device *netdev, u32 value)
@@ -1544,19 +1638,17 @@ static const struct ethtool_ops myri10ge_ethtool_ops = {
         .get_msglevel = myri10ge_get_msglevel
 };
 
-static int myri10ge_allocate_rings(struct net_device *dev)
+static int myri10ge_allocate_rings(struct myri10ge_slice_state *ss)
 {
-        struct myri10ge_priv *mgp;
+        struct myri10ge_priv *mgp = ss->mgp;
         struct myri10ge_cmd cmd;
+        struct net_device *dev = mgp->dev;
         int tx_ring_size, rx_ring_size;
         int tx_ring_entries, rx_ring_entries;
         int i, status;
         size_t bytes;
 
-        mgp = netdev_priv(dev);
-
         /* get ring sizes */
-
         status = myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_SEND_RING_SIZE, &cmd, 0);
         tx_ring_size = cmd.data0;
         status |= myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_RX_RING_SIZE, &cmd, 0);
@@ -1566,144 +1658,142 @@ static int myri10ge_allocate_rings(struct net_device *dev)
 
         tx_ring_entries = tx_ring_size / sizeof(struct mcp_kreq_ether_send);
         rx_ring_entries = rx_ring_size / sizeof(struct mcp_dma_addr);
-        mgp->tx.mask = tx_ring_entries - 1;
-        mgp->rx_small.mask = mgp->rx_big.mask = rx_ring_entries - 1;
+        ss->tx.mask = tx_ring_entries - 1;
+        ss->rx_small.mask = ss->rx_big.mask = rx_ring_entries - 1;
 
         status = -ENOMEM;
 
         /* allocate the host shadow rings */
 
         bytes = 8 + (MYRI10GE_MAX_SEND_DESC_TSO + 4)
-            * sizeof(*mgp->tx.req_list);
-        mgp->tx.req_bytes = kzalloc(bytes, GFP_KERNEL);
-        if (mgp->tx.req_bytes == NULL)
+            * sizeof(*ss->tx.req_list);
+        ss->tx.req_bytes = kzalloc(bytes, GFP_KERNEL);
+        if (ss->tx.req_bytes == NULL)
                 goto abort_with_nothing;
 
         /* ensure req_list entries are aligned to 8 bytes */
-        mgp->tx.req_list = (struct mcp_kreq_ether_send *)
-            ALIGN((unsigned long)mgp->tx.req_bytes, 8);
+        ss->tx.req_list = (struct mcp_kreq_ether_send *)
+            ALIGN((unsigned long)ss->tx.req_bytes, 8);
 
-        bytes = rx_ring_entries * sizeof(*mgp->rx_small.shadow);
-        mgp->rx_small.shadow = kzalloc(bytes, GFP_KERNEL);
-        if (mgp->rx_small.shadow == NULL)
+        bytes = rx_ring_entries * sizeof(*ss->rx_small.shadow);
+        ss->rx_small.shadow = kzalloc(bytes, GFP_KERNEL);
+        if (ss->rx_small.shadow == NULL)
                 goto abort_with_tx_req_bytes;
 
-        bytes = rx_ring_entries * sizeof(*mgp->rx_big.shadow);
-        mgp->rx_big.shadow = kzalloc(bytes, GFP_KERNEL);
-        if (mgp->rx_big.shadow == NULL)
+        bytes = rx_ring_entries * sizeof(*ss->rx_big.shadow);
+        ss->rx_big.shadow = kzalloc(bytes, GFP_KERNEL);
+        if (ss->rx_big.shadow == NULL)
                 goto abort_with_rx_small_shadow;
 
         /* allocate the host info rings */
 
-        bytes = tx_ring_entries * sizeof(*mgp->tx.info);
-        mgp->tx.info = kzalloc(bytes, GFP_KERNEL);
-        if (mgp->tx.info == NULL)
+        bytes = tx_ring_entries * sizeof(*ss->tx.info);
+        ss->tx.info = kzalloc(bytes, GFP_KERNEL);
+        if (ss->tx.info == NULL)
                 goto abort_with_rx_big_shadow;
 
-        bytes = rx_ring_entries * sizeof(*mgp->rx_small.info);
-        mgp->rx_small.info = kzalloc(bytes, GFP_KERNEL);
-        if (mgp->rx_small.info == NULL)
+        bytes = rx_ring_entries * sizeof(*ss->rx_small.info);
+        ss->rx_small.info = kzalloc(bytes, GFP_KERNEL);
+        if (ss->rx_small.info == NULL)
                 goto abort_with_tx_info;
 
-        bytes = rx_ring_entries * sizeof(*mgp->rx_big.info);
-        mgp->rx_big.info = kzalloc(bytes, GFP_KERNEL);
-        if (mgp->rx_big.info == NULL)
+        bytes = rx_ring_entries * sizeof(*ss->rx_big.info);
+        ss->rx_big.info = kzalloc(bytes, GFP_KERNEL);
+        if (ss->rx_big.info == NULL)
                 goto abort_with_rx_small_info;
 
         /* Fill the receive rings */
-        mgp->rx_big.cnt = 0;
-        mgp->rx_small.cnt = 0;
-        mgp->rx_big.fill_cnt = 0;
-        mgp->rx_small.fill_cnt = 0;
-        mgp->rx_small.page_offset = MYRI10GE_ALLOC_SIZE;
-        mgp->rx_big.page_offset = MYRI10GE_ALLOC_SIZE;
-        mgp->rx_small.watchdog_needed = 0;
-        mgp->rx_big.watchdog_needed = 0;
-        myri10ge_alloc_rx_pages(mgp, &mgp->rx_small,
+        ss->rx_big.cnt = 0;
+        ss->rx_small.cnt = 0;
+        ss->rx_big.fill_cnt = 0;
+        ss->rx_small.fill_cnt = 0;
+        ss->rx_small.page_offset = MYRI10GE_ALLOC_SIZE;
+        ss->rx_big.page_offset = MYRI10GE_ALLOC_SIZE;
+        ss->rx_small.watchdog_needed = 0;
+        ss->rx_big.watchdog_needed = 0;
+        myri10ge_alloc_rx_pages(mgp, &ss->rx_small,
                                 mgp->small_bytes + MXGEFW_PAD, 0);
 
-        if (mgp->rx_small.fill_cnt < mgp->rx_small.mask + 1) {
+        if (ss->rx_small.fill_cnt < ss->rx_small.mask + 1) {
                 printk(KERN_ERR "myri10ge: %s: alloced only %d small bufs\n",
-                       dev->name, mgp->rx_small.fill_cnt);
+                       dev->name, ss->rx_small.fill_cnt);
                 goto abort_with_rx_small_ring;
         }
 
-        myri10ge_alloc_rx_pages(mgp, &mgp->rx_big, mgp->big_bytes, 0);
-        if (mgp->rx_big.fill_cnt < mgp->rx_big.mask + 1) {
+        myri10ge_alloc_rx_pages(mgp, &ss->rx_big, mgp->big_bytes, 0);
+        if (ss->rx_big.fill_cnt < ss->rx_big.mask + 1) {
                 printk(KERN_ERR "myri10ge: %s: alloced only %d big bufs\n",
-                       dev->name, mgp->rx_big.fill_cnt);
+                       dev->name, ss->rx_big.fill_cnt);
                 goto abort_with_rx_big_ring;
         }
 
         return 0;
 
 abort_with_rx_big_ring:
-        for (i = mgp->rx_big.cnt; i < mgp->rx_big.fill_cnt; i++) {
-                int idx = i & mgp->rx_big.mask;
-                myri10ge_unmap_rx_page(mgp->pdev, &mgp->rx_big.info[idx],
+        for (i = ss->rx_big.cnt; i < ss->rx_big.fill_cnt; i++) {
+                int idx = i & ss->rx_big.mask;
+                myri10ge_unmap_rx_page(mgp->pdev, &ss->rx_big.info[idx],
                                        mgp->big_bytes);
-                put_page(mgp->rx_big.info[idx].page);
+                put_page(ss->rx_big.info[idx].page);
         }
 
 abort_with_rx_small_ring:
-        for (i = mgp->rx_small.cnt; i < mgp->rx_small.fill_cnt; i++) {
-                int idx = i & mgp->rx_small.mask;
-                myri10ge_unmap_rx_page(mgp->pdev, &mgp->rx_small.info[idx],
+        for (i = ss->rx_small.cnt; i < ss->rx_small.fill_cnt; i++) {
+                int idx = i & ss->rx_small.mask;
+                myri10ge_unmap_rx_page(mgp->pdev, &ss->rx_small.info[idx],
                                        mgp->small_bytes + MXGEFW_PAD);
-                put_page(mgp->rx_small.info[idx].page);
+                put_page(ss->rx_small.info[idx].page);
         }
 
-        kfree(mgp->rx_big.info);
+        kfree(ss->rx_big.info);
 
 abort_with_rx_small_info:
-        kfree(mgp->rx_small.info);
+        kfree(ss->rx_small.info);
 
 abort_with_tx_info:
-        kfree(mgp->tx.info);
+        kfree(ss->tx.info);
 
 abort_with_rx_big_shadow:
-        kfree(mgp->rx_big.shadow);
+        kfree(ss->rx_big.shadow);
 
 abort_with_rx_small_shadow:
-        kfree(mgp->rx_small.shadow);
+        kfree(ss->rx_small.shadow);
 
 abort_with_tx_req_bytes:
-        kfree(mgp->tx.req_bytes);
-        mgp->tx.req_bytes = NULL;
-        mgp->tx.req_list = NULL;
+        kfree(ss->tx.req_bytes);
+        ss->tx.req_bytes = NULL;
+        ss->tx.req_list = NULL;
 
 abort_with_nothing:
         return status;
 }
 
-static void myri10ge_free_rings(struct net_device *dev)
+static void myri10ge_free_rings(struct myri10ge_slice_state *ss)
 {
-        struct myri10ge_priv *mgp;
+        struct myri10ge_priv *mgp = ss->mgp;
         struct sk_buff *skb;
         struct myri10ge_tx_buf *tx;
         int i, len, idx;
 
-        mgp = netdev_priv(dev);
-
-        for (i = mgp->rx_big.cnt; i < mgp->rx_big.fill_cnt; i++) {
-                idx = i & mgp->rx_big.mask;
-                if (i == mgp->rx_big.fill_cnt - 1)
-                        mgp->rx_big.info[idx].page_offset = MYRI10GE_ALLOC_SIZE;
-                myri10ge_unmap_rx_page(mgp->pdev, &mgp->rx_big.info[idx],
+        for (i = ss->rx_big.cnt; i < ss->rx_big.fill_cnt; i++) {
+                idx = i & ss->rx_big.mask;
+                if (i == ss->rx_big.fill_cnt - 1)
+                        ss->rx_big.info[idx].page_offset = MYRI10GE_ALLOC_SIZE;
+                myri10ge_unmap_rx_page(mgp->pdev, &ss->rx_big.info[idx],
                                        mgp->big_bytes);
-                put_page(mgp->rx_big.info[idx].page);
+                put_page(ss->rx_big.info[idx].page);
         }
 
-        for (i = mgp->rx_small.cnt; i < mgp->rx_small.fill_cnt; i++) {
-                idx = i & mgp->rx_small.mask;
-                if (i == mgp->rx_small.fill_cnt - 1)
-                        mgp->rx_small.info[idx].page_offset =
+        for (i = ss->rx_small.cnt; i < ss->rx_small.fill_cnt; i++) {
+                idx = i & ss->rx_small.mask;
+                if (i == ss->rx_small.fill_cnt - 1)
+                        ss->rx_small.info[idx].page_offset =
                             MYRI10GE_ALLOC_SIZE;
-                myri10ge_unmap_rx_page(mgp->pdev, &mgp->rx_small.info[idx],
+                myri10ge_unmap_rx_page(mgp->pdev, &ss->rx_small.info[idx],
                                        mgp->small_bytes + MXGEFW_PAD);
-                put_page(mgp->rx_small.info[idx].page);
+                put_page(ss->rx_small.info[idx].page);
         }
-        tx = &mgp->tx;
+        tx = &ss->tx;
         while (tx->done != tx->req) {
                 idx = tx->done & tx->mask;
                 skb = tx->info[idx].skb;
@@ -1714,7 +1804,7 @@ static void myri10ge_free_rings(struct net_device *dev)
                 len = pci_unmap_len(&tx->info[idx], len);
                 pci_unmap_len_set(&tx->info[idx], len, 0);
                 if (skb) {
-                        mgp->stats.tx_dropped++;
+                        ss->stats.tx_dropped++;
                         dev_kfree_skb_any(skb);
                         if (len)
                                 pci_unmap_single(mgp->pdev,
@@ -1729,19 +1819,19 @@ static void myri10ge_free_rings(struct net_device *dev)
                                                PCI_DMA_TODEVICE);
                 }
         }
-        kfree(mgp->rx_big.info);
+        kfree(ss->rx_big.info);
 
-        kfree(mgp->rx_small.info);
+        kfree(ss->rx_small.info);
 
-        kfree(mgp->tx.info);
+        kfree(ss->tx.info);
 
-        kfree(mgp->rx_big.shadow);
+        kfree(ss->rx_big.shadow);
 
-        kfree(mgp->rx_small.shadow);
+        kfree(ss->rx_small.shadow);
 
-        kfree(mgp->tx.req_bytes);
-        mgp->tx.req_bytes = NULL;
-        mgp->tx.req_list = NULL;
+        kfree(ss->tx.req_bytes);
+        ss->tx.req_bytes = NULL;
+        ss->tx.req_list = NULL;
 }
 
 static int myri10ge_request_irq(struct myri10ge_priv *mgp)
@@ -1840,13 +1930,11 @@ myri10ge_get_frag_header(struct skb_frag_struct *frag, void **mac_hdr,
 
 static int myri10ge_open(struct net_device *dev)
 {
-        struct myri10ge_priv *mgp;
+        struct myri10ge_priv *mgp = netdev_priv(dev);
         struct myri10ge_cmd cmd;
         struct net_lro_mgr *lro_mgr;
         int status, big_pow2;
 
-        mgp = netdev_priv(dev);
-
         if (mgp->running != MYRI10GE_ETH_STOPPED)
                 return -EBUSY;
 
@@ -1883,16 +1971,16 @@ static int myri10ge_open(struct net_device *dev)
         /* get the lanai pointers to the send and receive rings */
 
         status |= myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_SEND_OFFSET, &cmd, 0);
-        mgp->tx.lanai =
+        mgp->ss.tx.lanai =
             (struct mcp_kreq_ether_send __iomem *)(mgp->sram + cmd.data0);
 
         status |=
             myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_SMALL_RX_OFFSET, &cmd, 0);
-        mgp->rx_small.lanai =
+        mgp->ss.rx_small.lanai =
             (struct mcp_kreq_ether_recv __iomem *)(mgp->sram + cmd.data0);
 
         status |= myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_BIG_RX_OFFSET, &cmd, 0);
-        mgp->rx_big.lanai =
+        mgp->ss.rx_big.lanai =
             (struct mcp_kreq_ether_recv __iomem *)(mgp->sram + cmd.data0);
 
         if (status != 0) {
@@ -1904,15 +1992,15 @@ static int myri10ge_open(struct net_device *dev)
         }
 
         if (myri10ge_wcfifo && mgp->wc_enabled) {
-                mgp->tx.wc_fifo = (u8 __iomem *) mgp->sram + MXGEFW_ETH_SEND_4;
-                mgp->rx_small.wc_fifo =
+                mgp->ss.tx.wc_fifo = (u8 __iomem *) mgp->sram + MXGEFW_ETH_SEND_4;
+                mgp->ss.rx_small.wc_fifo =
                     (u8 __iomem *) mgp->sram + MXGEFW_ETH_RECV_SMALL;
-                mgp->rx_big.wc_fifo =
+                mgp->ss.rx_big.wc_fifo =
                     (u8 __iomem *) mgp->sram + MXGEFW_ETH_RECV_BIG;
         } else {
-                mgp->tx.wc_fifo = NULL;
-                mgp->rx_small.wc_fifo = NULL;
-                mgp->rx_big.wc_fifo = NULL;
+                mgp->ss.tx.wc_fifo = NULL;
+                mgp->ss.rx_small.wc_fifo = NULL;
+                mgp->ss.rx_big.wc_fifo = NULL;
         }
 
         /* Firmware needs the big buff size as a power of 2.  Lie and
@@ -1929,7 +2017,7 @@ static int myri10ge_open(struct net_device *dev)
                 mgp->big_bytes = big_pow2;
         }
 
-        status = myri10ge_allocate_rings(dev);
+        status = myri10ge_allocate_rings(&mgp->ss);
         if (status != 0)
                 goto abort_with_irq;
 
@@ -1948,12 +2036,12 @@ static int myri10ge_open(struct net_device *dev)
                 goto abort_with_rings;
         }
 
-        cmd.data0 = MYRI10GE_LOWPART_TO_U32(mgp->fw_stats_bus);
-        cmd.data1 = MYRI10GE_HIGHPART_TO_U32(mgp->fw_stats_bus);
+        cmd.data0 = MYRI10GE_LOWPART_TO_U32(mgp->ss.fw_stats_bus);
+        cmd.data1 = MYRI10GE_HIGHPART_TO_U32(mgp->ss.fw_stats_bus);
         cmd.data2 = sizeof(struct mcp_irq_data);
         status = myri10ge_send_cmd(mgp, MXGEFW_CMD_SET_STATS_DMA_V2, &cmd, 0);
         if (status == -ENOSYS) {
-                dma_addr_t bus = mgp->fw_stats_bus;
+                dma_addr_t bus = mgp->ss.fw_stats_bus;
                 bus += offsetof(struct mcp_irq_data, send_done_count);
                 cmd.data0 = MYRI10GE_LOWPART_TO_U32(bus);
                 cmd.data1 = MYRI10GE_HIGHPART_TO_U32(bus);
@@ -1974,20 +2062,20 @@ static int myri10ge_open(struct net_device *dev)
         mgp->link_state = ~0U;
         mgp->rdma_tags_available = 15;
 
-        lro_mgr = &mgp->rx_done.lro_mgr;
+        lro_mgr = &mgp->ss.rx_done.lro_mgr;
         lro_mgr->dev = dev;
         lro_mgr->features = LRO_F_NAPI;
         lro_mgr->ip_summed = CHECKSUM_COMPLETE;
         lro_mgr->ip_summed_aggr = CHECKSUM_UNNECESSARY;
         lro_mgr->max_desc = MYRI10GE_MAX_LRO_DESCRIPTORS;
-        lro_mgr->lro_arr = mgp->rx_done.lro_desc;
+        lro_mgr->lro_arr = mgp->ss.rx_done.lro_desc;
         lro_mgr->get_frag_header = myri10ge_get_frag_header;
         lro_mgr->max_aggr = myri10ge_lro_max_pkts;
         lro_mgr->frag_align_pad = 2;
         if (lro_mgr->max_aggr > MAX_SKB_FRAGS)
                 lro_mgr->max_aggr = MAX_SKB_FRAGS;
 
-        napi_enable(&mgp->napi);        /* must happen prior to any irq */
+        napi_enable(&mgp->ss.napi);     /* must happen prior to any irq */
 
         status = myri10ge_send_cmd(mgp, MXGEFW_CMD_ETHERNET_UP, &cmd, 0);
         if (status) {
@@ -1996,8 +2084,8 @@ static int myri10ge_open(struct net_device *dev)
                 goto abort_with_rings;
         }
 
-        mgp->wake_queue = 0;
-        mgp->stop_queue = 0;
+        mgp->ss.tx.wake_queue = 0;
+        mgp->ss.tx.stop_queue = 0;
         mgp->running = MYRI10GE_ETH_RUNNING;
         mgp->watchdog_timer.expires = jiffies + myri10ge_watchdog_timeout * HZ;
         add_timer(&mgp->watchdog_timer);
@@ -2005,7 +2093,7 @@ static int myri10ge_open(struct net_device *dev)
         return 0;
 
 abort_with_rings:
-        myri10ge_free_rings(dev);
+        myri10ge_free_rings(&mgp->ss);
 
 abort_with_irq:
         myri10ge_free_irq(mgp);
@@ -2017,21 +2105,19 @@ abort_with_nothing:
 
 static int myri10ge_close(struct net_device *dev)
 {
-        struct myri10ge_priv *mgp;
+        struct myri10ge_priv *mgp = netdev_priv(dev);
         struct myri10ge_cmd cmd;
         int status, old_down_cnt;
 
-        mgp = netdev_priv(dev);
-
         if (mgp->running != MYRI10GE_ETH_RUNNING)
                 return 0;
 
-        if (mgp->tx.req_bytes == NULL)
+        if (mgp->ss.tx.req_bytes == NULL)
                 return 0;
 
         del_timer_sync(&mgp->watchdog_timer);
         mgp->running = MYRI10GE_ETH_STOPPING;
-        napi_disable(&mgp->napi);
+        napi_disable(&mgp->ss.napi);
         netif_carrier_off(dev);
         netif_stop_queue(dev);
         old_down_cnt = mgp->down_cnt;
@@ -2047,7 +2133,7 @@ static int myri10ge_close(struct net_device *dev)
 
         netif_tx_disable(dev);
         myri10ge_free_irq(mgp);
-        myri10ge_free_rings(dev);
+        myri10ge_free_rings(&mgp->ss);
 
         mgp->running = MYRI10GE_ETH_STOPPED;
         return 0;
@@ -2143,7 +2229,7 @@ myri10ge_submit_req_wc(struct myri10ge_tx_buf *tx,
 
 /*
  * Transmit a packet.  We need to split the packet so that a single
- * segment does not cross myri10ge->tx.boundary, so this makes segment
+ * segment does not cross myri10ge->tx_boundary, so this makes segment
  * counting tricky.  So rather than try to count segments up front, we
  * just give up if there are too few segments to hold a reasonably
  * fragmented packet currently available.  If we run
@@ -2154,8 +2240,9 @@ myri10ge_submit_req_wc(struct myri10ge_tx_buf *tx,
 static int myri10ge_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct myri10ge_priv *mgp = netdev_priv(dev);
+        struct myri10ge_slice_state *ss;
         struct mcp_kreq_ether_send *req;
-        struct myri10ge_tx_buf *tx = &mgp->tx;
+        struct myri10ge_tx_buf *tx;
         struct skb_frag_struct *frag;
         dma_addr_t bus;
         u32 low;
@@ -2166,6 +2253,9 @@ static int myri10ge_xmit(struct sk_buff *skb, struct net_device *dev)
         int cum_len, seglen, boundary, rdma_count;
         u8 flags, odd_flag;
 
+        /* always transmit through slot 0 */
+        ss = &mgp->ss;
+        tx = &ss->tx;
 again:
         req = tx->req_list;
         avail = tx->mask - 1 - (tx->req - tx->done);
@@ -2180,7 +2270,7 @@ again:
 
         if ((unlikely(avail < max_segments))) {
                 /* we are out of transmit resources */
-                mgp->stop_queue++;
+                tx->stop_queue++;
                 netif_stop_queue(dev);
                 return 1;
         }
@@ -2242,7 +2332,7 @@ again:
                         if (skb_padto(skb, ETH_ZLEN)) {
                                 /* The packet is gone, so we must
                                  * return 0 */
-                                mgp->stats.tx_dropped += 1;
+                                ss->stats.tx_dropped += 1;
                                 return 0;
                         }
                         /* adjust the len to account for the zero pad
@@ -2284,7 +2374,7 @@ again:
 
         while (1) {
                 /* Break the SKB or Fragment up into pieces which
-                 * do not cross mgp->tx.boundary */
+                 * do not cross mgp->tx_boundary */
                 low = MYRI10GE_LOWPART_TO_U32(bus);
                 high_swapped = htonl(MYRI10GE_HIGHPART_TO_U32(bus));
                 while (len) {
@@ -2294,7 +2384,8 @@ again:
                         if (unlikely(count == max_segments))
                                 goto abort_linearize;
 
-                        boundary = (low + tx->boundary) & ~(tx->boundary - 1);
+                        boundary =
+                            (low + mgp->tx_boundary) & ~(mgp->tx_boundary - 1);
                         seglen = boundary - low;
                         if (seglen > len)
                                 seglen = len;
@@ -2378,7 +2469,7 @@ again:
                 myri10ge_submit_req_wc(tx, tx->req_list, count);
         tx->pkt_start++;
         if ((avail - count) < MXGEFW_MAX_SEND_DESC) {
-                mgp->stop_queue++;
+                tx->stop_queue++;
                 netif_stop_queue(dev);
         }
         dev->trans_start = jiffies;
@@ -2420,12 +2511,12 @@ abort_linearize:
         if (skb_linearize(skb))
                 goto drop;
 
-        mgp->tx_linearized++;
+        tx->linearized++;
         goto again;
 
 drop:
         dev_kfree_skb_any(skb);
-        mgp->stats.tx_dropped += 1;
+        ss->stats.tx_dropped += 1;
         return 0;
 
 }
@@ -2433,7 +2524,7 @@ drop:
 static int myri10ge_sw_tso(struct sk_buff *skb, struct net_device *dev)
 {
         struct sk_buff *segs, *curr;
-        struct myri10ge_priv *mgp = dev->priv;
+        struct myri10ge_priv *mgp = netdev_priv(dev);
         int status;
 
         segs = skb_gso_segment(skb, dev->features & ~NETIF_F_TSO6);
@@ -2473,14 +2564,13 @@ static struct net_device_stats *myri10ge_get_stats(struct net_device *dev)
 
 static void myri10ge_set_multicast_list(struct net_device *dev)
 {
+        struct myri10ge_priv *mgp = netdev_priv(dev);
         struct myri10ge_cmd cmd;
-        struct myri10ge_priv *mgp;
         struct dev_mc_list *mc_list;
         __be32 data[2] = { 0, 0 };
         int err;
         DECLARE_MAC_BUF(mac);
 
-        mgp = netdev_priv(dev);
         /* can be called from atomic contexts,
          * pass 1 to force atomicity in myri10ge_send_cmd() */
         myri10ge_change_promisc(mgp, dev->flags & IFF_PROMISC, 1);
@@ -2616,13 +2706,14 @@ static void myri10ge_enable_ecrc(struct myri10ge_priv *mgp)
         ext_type = (val & PCI_EXP_FLAGS_TYPE) >> 4;
         if (ext_type != PCI_EXP_TYPE_ROOT_PORT) {
                 if (myri10ge_ecrc_enable > 1) {
-                        struct pci_dev *old_bridge = bridge;
+                        struct pci_dev *prev_bridge, *old_bridge = bridge;
 
                         /* Walk the hierarchy up to the root port
                          * where ECRC has to be enabled */
                         do {
+                                prev_bridge = bridge;
                                 bridge = bridge->bus->self;
-                                if (!bridge) {
+                                if (!bridge || prev_bridge == bridge) {
                                         dev_err(dev,
                                                 "Failed to find root port"
                                                 " to force ECRC\n");
@@ -2681,9 +2772,9 @@ static void myri10ge_enable_ecrc(struct myri10ge_priv *mgp)
  * already been enabled, then it must use a firmware image which works
  * around unaligned completion packets (myri10ge_ethp_z8e.dat), and it
  * should also ensure that it never gives the device a Read-DMA which is
- * larger than 2KB by setting the tx.boundary to 2KB.  If ECRC is
+ * larger than 2KB by setting the tx_boundary to 2KB.  If ECRC is
  * enabled, then the driver should use the aligned (myri10ge_eth_z8e.dat)
- * firmware image, and set tx.boundary to 4KB.
+ * firmware image, and set tx_boundary to 4KB.
  */
 
 static void myri10ge_firmware_probe(struct myri10ge_priv *mgp)
@@ -2692,7 +2783,7 @@ static void myri10ge_firmware_probe(struct myri10ge_priv *mgp)
         struct device *dev = &pdev->dev;
         int status;
 
-        mgp->tx.boundary = 4096;
+        mgp->tx_boundary = 4096;
         /*
          * Verify the max read request size was set to 4KB
          * before trying the test with 4KB.
@@ -2704,7 +2795,7 @@ static void myri10ge_firmware_probe(struct myri10ge_priv *mgp)
         }
         if (status != 4096) {
                 dev_warn(dev, "Max Read Request size != 4096 (%d)\n", status);
-                mgp->tx.boundary = 2048;
+                mgp->tx_boundary = 2048;
         }
         /*
          * load the optimized firmware (which assumes aligned PCIe
@@ -2737,7 +2828,7 @@ static void myri10ge_firmware_probe(struct myri10ge_priv *mgp)
                          "Please install up to date fw\n");
 abort:
         /* fall back to using the unaligned firmware */
-        mgp->tx.boundary = 2048;
+        mgp->tx_boundary = 2048;
         mgp->fw_name = myri10ge_fw_unaligned;
 
 }
@@ -2758,7 +2849,7 @@ static void myri10ge_select_firmware(struct myri10ge_priv *mgp)
                 if (link_width < 8) {
                         dev_info(&mgp->pdev->dev, "PCIE x%d Link\n",
                                  link_width);
-                        mgp->tx.boundary = 4096;
+                        mgp->tx_boundary = 4096;
                         mgp->fw_name = myri10ge_fw_aligned;
                 } else {
                         myri10ge_firmware_probe(mgp);
@@ -2767,12 +2858,12 @@ static void myri10ge_select_firmware(struct myri10ge_priv *mgp)
                 if (myri10ge_force_firmware == 1) {
                         dev_info(&mgp->pdev->dev,
                                  "Assuming aligned completions (forced)\n");
-                        mgp->tx.boundary = 4096;
+                        mgp->tx_boundary = 4096;
                         mgp->fw_name = myri10ge_fw_aligned;
                 } else {
                         dev_info(&mgp->pdev->dev,
                                  "Assuming unaligned completions (forced)\n");
-                        mgp->tx.boundary = 2048;
+                        mgp->tx_boundary = 2048;
                         mgp->fw_name = myri10ge_fw_unaligned;
                 }
         }
@@ -2889,6 +2980,7 @@ static void myri10ge_watchdog(struct work_struct *work)
 {
         struct myri10ge_priv *mgp =
             container_of(work, struct myri10ge_priv, watchdog_work);
+        struct myri10ge_tx_buf *tx;
         u32 reboot;
         int status;
         u16 cmd, vendor;
@@ -2938,15 +3030,16 @@ static void myri10ge_watchdog(struct work_struct *work)
 
                 printk(KERN_ERR "myri10ge: %s: device timeout, resetting\n",
                        mgp->dev->name);
+                tx = &mgp->ss.tx;
                 printk(KERN_INFO "myri10ge: %s: %d %d %d %d %d\n",
-                       mgp->dev->name, mgp->tx.req, mgp->tx.done,
-                       mgp->tx.pkt_start, mgp->tx.pkt_done,
-                       (int)ntohl(mgp->fw_stats->send_done_count));
+                       mgp->dev->name, tx->req, tx->done,
+                       tx->pkt_start, tx->pkt_done,
+                       (int)ntohl(mgp->ss.fw_stats->send_done_count));
                 msleep(2000);
                 printk(KERN_INFO "myri10ge: %s: %d %d %d %d %d\n",
-                       mgp->dev->name, mgp->tx.req, mgp->tx.done,
-                       mgp->tx.pkt_start, mgp->tx.pkt_done,
-                       (int)ntohl(mgp->fw_stats->send_done_count));
+                       mgp->dev->name, tx->req, tx->done,
+                       tx->pkt_start, tx->pkt_done,
+                       (int)ntohl(mgp->ss.fw_stats->send_done_count));
         }
         rtnl_lock();
         myri10ge_close(mgp->dev);
@@ -2969,28 +3062,31 @@ static void myri10ge_watchdog(struct work_struct *work)
 static void myri10ge_watchdog_timer(unsigned long arg)
 {
         struct myri10ge_priv *mgp;
+        struct myri10ge_slice_state *ss;
         u32 rx_pause_cnt;
 
         mgp = (struct myri10ge_priv *)arg;
 
-        if (mgp->rx_small.watchdog_needed) {
-                myri10ge_alloc_rx_pages(mgp, &mgp->rx_small,
+        rx_pause_cnt = ntohl(mgp->ss.fw_stats->dropped_pause);
+
+        ss = &mgp->ss;
+        if (ss->rx_small.watchdog_needed) {
+                myri10ge_alloc_rx_pages(mgp, &ss->rx_small,
                                         mgp->small_bytes + MXGEFW_PAD, 1);
-                if (mgp->rx_small.fill_cnt - mgp->rx_small.cnt >=
+                if (ss->rx_small.fill_cnt - ss->rx_small.cnt >=
                     myri10ge_fill_thresh)
-                        mgp->rx_small.watchdog_needed = 0;
+                        ss->rx_small.watchdog_needed = 0;
         }
-        if (mgp->rx_big.watchdog_needed) {
-                myri10ge_alloc_rx_pages(mgp, &mgp->rx_big, mgp->big_bytes, 1);
-                if (mgp->rx_big.fill_cnt - mgp->rx_big.cnt >=
+        if (ss->rx_big.watchdog_needed) {
+                myri10ge_alloc_rx_pages(mgp, &ss->rx_big, mgp->big_bytes, 1);
+                if (ss->rx_big.fill_cnt - ss->rx_big.cnt >=
                     myri10ge_fill_thresh)
-                        mgp->rx_big.watchdog_needed = 0;
+                        ss->rx_big.watchdog_needed = 0;
         }
-        rx_pause_cnt = ntohl(mgp->fw_stats->dropped_pause);
 
-        if (mgp->tx.req != mgp->tx.done &&
-            mgp->tx.done == mgp->watchdog_tx_done &&
-            mgp->watchdog_tx_req != mgp->watchdog_tx_done) {
+        if (ss->tx.req != ss->tx.done &&
+            ss->tx.done == ss->watchdog_tx_done &&
+            ss->watchdog_tx_req != ss->watchdog_tx_done) {
                 /* nic seems like it might be stuck.. */
                 if (rx_pause_cnt != mgp->watchdog_pause) {
                         if (net_ratelimit())
@@ -3005,8 +3101,8 @@ static void myri10ge_watchdog_timer(unsigned long arg)
         /* rearm timer */
         mod_timer(&mgp->watchdog_timer,
                   jiffies + myri10ge_watchdog_timeout * HZ);
-        mgp->watchdog_tx_done = mgp->tx.done;
-        mgp->watchdog_tx_req = mgp->tx.req;
+        ss->watchdog_tx_done = ss->tx.done;
+        ss->watchdog_tx_req = ss->tx.req;
         mgp->watchdog_pause = rx_pause_cnt;
 }
 
@@ -3030,7 +3126,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         mgp = netdev_priv(netdev);
         mgp->dev = netdev;
-        netif_napi_add(netdev, &mgp->napi, myri10ge_poll, myri10ge_napi_weight);
+        netif_napi_add(netdev, &mgp->ss.napi, myri10ge_poll, myri10ge_napi_weight);
         mgp->pdev = pdev;
         mgp->csum_flag = MXGEFW_FLAGS_CKSUM;
         mgp->pause = myri10ge_flow_control;
@@ -3076,9 +3172,9 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (mgp->cmd == NULL)
                 goto abort_with_netdev;
 
-        mgp->fw_stats = dma_alloc_coherent(&pdev->dev, sizeof(*mgp->fw_stats),
-                                           &mgp->fw_stats_bus, GFP_KERNEL);
-        if (mgp->fw_stats == NULL)
+        mgp->ss.fw_stats = dma_alloc_coherent(&pdev->dev, sizeof(*mgp->ss.fw_stats),
+                                           &mgp->ss.fw_stats_bus, GFP_KERNEL);
+        if (mgp->ss.fw_stats == NULL)
                 goto abort_with_cmd;
 
         mgp->board_span = pci_resource_len(pdev, 0);
@@ -3118,12 +3214,12 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 netdev->dev_addr[i] = mgp->mac_addr[i];
 
         /* allocate rx done ring */
-        bytes = myri10ge_max_intr_slots * sizeof(*mgp->rx_done.entry);
-        mgp->rx_done.entry = dma_alloc_coherent(&pdev->dev, bytes,
-                                                &mgp->rx_done.bus, GFP_KERNEL);
-        if (mgp->rx_done.entry == NULL)
+        bytes = mgp->max_intr_slots * sizeof(*mgp->ss.rx_done.entry);
+        mgp->ss.rx_done.entry = dma_alloc_coherent(&pdev->dev, bytes,
+                                                &mgp->ss.rx_done.bus, GFP_KERNEL);
+        if (mgp->ss.rx_done.entry == NULL)
                 goto abort_with_ioremap;
-        memset(mgp->rx_done.entry, 0, bytes);
+        memset(mgp->ss.rx_done.entry, 0, bytes);
 
         myri10ge_select_firmware(mgp);
 
@@ -3183,7 +3279,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         }
         dev_info(dev, "%s IRQ %d, tx bndry %d, fw %s, WC %s\n",
                  (mgp->msi_enabled ? "MSI" : "xPIC"),
-                 netdev->irq, mgp->tx.boundary, mgp->fw_name,
+                 netdev->irq, mgp->tx_boundary, mgp->fw_name,
                  (mgp->wc_enabled ? "Enabled" : "Disabled"));
 
         return 0;
@@ -3195,9 +3291,9 @@ abort_with_firmware:
         myri10ge_dummy_rdma(mgp, 0);
 
 abort_with_rx_done:
-        bytes = myri10ge_max_intr_slots * sizeof(*mgp->rx_done.entry);
+        bytes = mgp->max_intr_slots * sizeof(*mgp->ss.rx_done.entry);
         dma_free_coherent(&pdev->dev, bytes,
-                          mgp->rx_done.entry, mgp->rx_done.bus);
+                          mgp->ss.rx_done.entry, mgp->ss.rx_done.bus);
 
 abort_with_ioremap:
         iounmap(mgp->sram);
@@ -3207,8 +3303,8 @@ abort_with_wc:
         if (mgp->mtrr >= 0)
                 mtrr_del(mgp->mtrr, mgp->iomem_base, mgp->board_span);
 #endif
-        dma_free_coherent(&pdev->dev, sizeof(*mgp->fw_stats),
-                          mgp->fw_stats, mgp->fw_stats_bus);
+        dma_free_coherent(&pdev->dev, sizeof(*mgp->ss.fw_stats),
+                          mgp->ss.fw_stats, mgp->ss.fw_stats_bus);
 
 abort_with_cmd:
         dma_free_coherent(&pdev->dev, sizeof(*mgp->cmd),
@@ -3246,9 +3342,9 @@ static void myri10ge_remove(struct pci_dev *pdev)
         /* avoid a memory leak */
         pci_restore_state(pdev);
 
-        bytes = myri10ge_max_intr_slots * sizeof(*mgp->rx_done.entry);
+        bytes = mgp->max_intr_slots * sizeof(*mgp->ss.rx_done.entry);
         dma_free_coherent(&pdev->dev, bytes,
-                          mgp->rx_done.entry, mgp->rx_done.bus);
+                          mgp->ss.rx_done.entry, mgp->ss.rx_done.bus);
 
         iounmap(mgp->sram);
 
@@ -3256,8 +3352,8 @@ static void myri10ge_remove(struct pci_dev *pdev)
         if (mgp->mtrr >= 0)
                 mtrr_del(mgp->mtrr, mgp->iomem_base, mgp->board_span);
 #endif
-        dma_free_coherent(&pdev->dev, sizeof(*mgp->fw_stats),
-                          mgp->fw_stats, mgp->fw_stats_bus);
+        dma_free_coherent(&pdev->dev, sizeof(*mgp->ss.fw_stats),
+                          mgp->ss.fw_stats, mgp->ss.fw_stats_bus);
 
         dma_free_coherent(&pdev->dev, sizeof(*mgp->cmd),
                           mgp->cmd, mgp->cmd_bus);
diff --git a/drivers/net/myri10ge/myri10ge_mcp.h b/drivers/net/myri10ge/myri10ge_mcp.h
index 58e57178c563..fdbeeee07372 100644
--- a/drivers/net/myri10ge/myri10ge_mcp.h
+++ b/drivers/net/myri10ge/myri10ge_mcp.h
@@ -10,7 +10,7 @@ struct mcp_dma_addr {
         __be32 low;
 };
 
-/* 4 Bytes.  8 Bytes for NDIS drivers. */
+/* 4 Bytes */
 struct mcp_slot {
         __sum16 checksum;
         __be16 length;
@@ -144,6 +144,7 @@ enum myri10ge_mcp_cmd_type {
          * a power of 2 number of entries.  */
 
         MXGEFW_CMD_SET_INTRQ_SIZE,      /* in bytes */
+#define MXGEFW_CMD_SET_INTRQ_SIZE_FLAG_NO_STRICT_SIZE_CHECK  (1 << 31)
 
         /* command to bring ethernet interface up.  Above parameters
          * (plus mtu & mac address) must have been exchanged prior
@@ -221,10 +222,14 @@ enum myri10ge_mcp_cmd_type {
         MXGEFW_CMD_GET_MAX_RSS_QUEUES,
         MXGEFW_CMD_ENABLE_RSS_QUEUES,
         /* data0 = number of slices n (0, 1, ..., n-1) to enable
-         * data1 = interrupt mode. 0=share one INTx/MSI, 1=use one MSI-X per queue.
+         * data1 = interrupt mode.
+         * 0=share one INTx/MSI, 1=use one MSI-X per queue.
          * If all queues share one interrupt, the driver must have set
          * RSS_SHARED_INTERRUPT_DMA before enabling queues.
          */
+#define MXGEFW_SLICE_INTR_MODE_SHARED 0
+#define MXGEFW_SLICE_INTR_MODE_ONE_PER_SLICE 1
+
         MXGEFW_CMD_GET_RSS_SHARED_INTERRUPT_MASK_OFFSET,
         MXGEFW_CMD_SET_RSS_SHARED_INTERRUPT_DMA,
         /* data0, data1 = bus address lsw, msw */
@@ -241,10 +246,14 @@ enum myri10ge_mcp_cmd_type {
          * 0: disable rss.  nic does not distribute receive packets.
          * 1: enable rss.  nic distributes receive packets among queues.
          * data1 = hash type
-         * 1: IPV4
-         * 2: TCP_IPV4
-         * 3: IPV4 | TCP_IPV4
+         * 1: IPV4            (required by RSS)
+         * 2: TCP_IPV4        (required by RSS)
+         * 3: IPV4 | TCP_IPV4 (required by RSS)
+         * 4: source port
          */
+#define MXGEFW_RSS_HASH_TYPE_IPV4      0x1
+#define MXGEFW_RSS_HASH_TYPE_TCP_IPV4  0x2
+#define MXGEFW_RSS_HASH_TYPE_SRC_PORT  0x4
 
         MXGEFW_CMD_GET_MAX_TSO6_HDR_SIZE,
         /* Return data = the max. size of the entire headers of a IPv6 TSO packet.
@@ -260,6 +269,8 @@ enum myri10ge_mcp_cmd_type {
          * 0: Linux/FreeBSD style (NIC default)
          * 1: NDIS/NetBSD style
          */
+#define MXGEFW_TSO_MODE_LINUX  0
+#define MXGEFW_TSO_MODE_NDIS   1
 
         MXGEFW_CMD_MDIO_READ,
         /* data0 = dev_addr (PMA/PMD or PCS ...), data1 = register/addr */
@@ -286,6 +297,38 @@ enum myri10ge_mcp_cmd_type {
         /* Return data = NIC memory offset of mcp_vpump_public_global */
         MXGEFW_CMD_RESET_VPUMP,
         /* Resets the VPUMP state */
+
+        MXGEFW_CMD_SET_RSS_MCP_SLOT_TYPE,
+        /* data0 = mcp_slot type to use.
+         * 0 = the default 4B mcp_slot
+         * 1 = 8B mcp_slot_8
+         */
+#define MXGEFW_RSS_MCP_SLOT_TYPE_MIN        0
+#define MXGEFW_RSS_MCP_SLOT_TYPE_WITH_HASH  1
+
+        MXGEFW_CMD_SET_THROTTLE_FACTOR,
+        /* set the throttle factor for ethp_z8e
+         * data0 = throttle_factor
+         * throttle_factor = 256 * pcie-raw-speed / tx_speed
+         * tx_speed = 256 * pcie-raw-speed / throttle_factor
+         *
+         * For PCI-E x8: pcie-raw-speed == 16Gb/s
+         * For PCI-E x4: pcie-raw-speed == 8Gb/s
+         *
+         * ex1: throttle_factor == 0x1a0 (416), tx_speed == 1.23GB/s == 9.846 Gb/s
+         * ex2: throttle_factor == 0x200 (512), tx_speed == 1.0GB/s == 8 Gb/s
+         *
+         * with tx_boundary == 2048, max-throttle-factor == 8191 => min-speed == 500Mb/s
+         * with tx_boundary == 4096, max-throttle-factor == 4095 => min-speed == 1Gb/s
+         */
+
+        MXGEFW_CMD_VPUMP_UP,
+        /* Allocates VPump Connection, Send Request and Zero copy buffer address tables */
+        MXGEFW_CMD_GET_VPUMP_CLK,
+        /* Get the lanai clock */
+
+        MXGEFW_CMD_GET_DCA_OFFSET,
+        /* offset of dca control for WDMAs */
 };
 
 enum myri10ge_mcp_cmd_status {
@@ -302,7 +345,8 @@ enum myri10ge_mcp_cmd_status {
         MXGEFW_CMD_ERROR_UNALIGNED,
         MXGEFW_CMD_ERROR_NO_MDIO,
         MXGEFW_CMD_ERROR_XFP_FAILURE,
-        MXGEFW_CMD_ERROR_XFP_ABSENT
+        MXGEFW_CMD_ERROR_XFP_ABSENT,
+        MXGEFW_CMD_ERROR_BAD_PCIE_LINK
 };
 
 #define MXGEFW_OLD_IRQ_DATA_LEN 40
diff --git a/drivers/net/myri10ge/myri10ge_mcp_gen_header.h b/drivers/net/myri10ge/myri10ge_mcp_gen_header.h
index 16a810dd6d51..07d65c2cbb24 100644
--- a/drivers/net/myri10ge/myri10ge_mcp_gen_header.h
+++ b/drivers/net/myri10ge/myri10ge_mcp_gen_header.h
@@ -1,30 +1,6 @@
 #ifndef __MYRI10GE_MCP_GEN_HEADER_H__
 #define __MYRI10GE_MCP_GEN_HEADER_H__
 
-/* this file define a standard header used as a first entry point to
- * exchange information between firmware/driver and driver.  The
- * header structure can be anywhere in the mcp. It will usually be in
- * the .data section, because some fields needs to be initialized at
- * compile time.
- * The 32bit word at offset MX_HEADER_PTR_OFFSET in the mcp must
- * contains the location of the header.
- *
- * Typically a MCP will start with the following:
- * .text
- * .space 52    ! to help catch MEMORY_INT errors
- * bt start     ! jump to real code
- * nop
- * .long _gen_mcp_header
- *
- * The source will have a definition like:
- *
- * mcp_gen_header_t gen_mcp_header = {
- * .header_length = sizeof(mcp_gen_header_t),
- * .mcp_type = MCP_TYPE_XXX,
- * .version = "something $Id: mcp_gen_header.h,v 1.2 2006/05/13 10:04:35 bgoglin Exp $",
- * .mcp_globals = (unsigned)&Globals
- * };
- */
 
 #define MCP_HEADER_PTR_OFFSET  0x3c
 
@@ -32,13 +8,14 @@
 #define MCP_TYPE_PCIE 0x70636965        /* "PCIE" pcie-only MCP */
 #define MCP_TYPE_ETH 0x45544820 /* "ETH " */
 #define MCP_TYPE_MCP0 0x4d435030        /* "MCP0" */
+#define MCP_TYPE_DFLT 0x20202020        /* "    " */
 
 struct mcp_gen_header {
         /* the first 4 fields are filled at compile time */
         unsigned header_length;
         __be32 mcp_type;
         char version[128];
-        unsigned mcp_globals;   /* pointer to mcp-type specific structure */
+        unsigned mcp_private;   /* pointer to mcp-type specific structure */
 
         /* filled by the MCP at run-time */
         unsigned sram_size;
@@ -53,6 +30,18 @@ struct mcp_gen_header {
          *
          * Never remove any field.  Keep everything naturally align.
          */
+
+        /* Specifies if the running mcp is mcp0, 1, or 2. */
+        unsigned char mcp_index;
+        unsigned char disable_rabbit;
+        unsigned char unaligned_tlp;
+        unsigned char pad1;
+        unsigned counters_addr;
+        unsigned copy_block_info;       /* for small mcps loaded with "lload -d" */
+        unsigned short handoff_id_major;        /* must be equal */
+        unsigned short handoff_id_caps; /* bitfield: new mcp must have superset */
+        unsigned msix_table_addr;       /* start address of msix table in firmware */
+        /* 8 */
 };
 
 #endif                          /* __MYRI10GE_MCP_GEN_HEADER_H__ */
diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index 57cfd72ffdf7..918f802fe089 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -865,7 +865,6 @@ static int link_status_1g_serdes(struct niu *np, int *link_up_p)
         return 0;
 }
 
-
 static int link_status_10g_serdes(struct niu *np, int *link_up_p)
 {
         unsigned long flags;
@@ -900,7 +899,6 @@ static int link_status_10g_serdes(struct niu *np, int *link_up_p)
         return 0;
 }
 
-
 static int link_status_1g_rgmii(struct niu *np, int *link_up_p)
 {
         struct niu_link_config *lp = &np->link_config;
@@ -957,7 +955,6 @@ out:
         return err;
 }
 
-
 static int bcm8704_reset(struct niu *np)
 {
         int err, limit;
@@ -1357,8 +1354,6 @@ static int mii_reset(struct niu *np)
         return 0;
 }
 
-
-
 static int xcvr_init_1g_rgmii(struct niu *np)
 {
         int err;
@@ -1419,7 +1414,6 @@ static int xcvr_init_1g_rgmii(struct niu *np)
         return 0;
 }
 
-
 static int mii_init_common(struct niu *np)
 {
         struct niu_link_config *lp = &np->link_config;
@@ -7008,31 +7002,20 @@ static int __devinit niu_phy_type_prop_decode(struct niu *np,
         return 0;
 }
 
-/* niu board models have a trailing dash version incremented
- * with HW rev change. Need to ingnore the  dash version while
- * checking for match
- *
- * for example, for the 10G card the current vpd.board_model
- * is 501-5283-04, of which -04 is the  dash version and have
- * to be ignored
- */
-static int niu_board_model_match(struct niu *np, const char *model)
-{
-        return !strncmp(np->vpd.board_model, model, strlen(model));
-}
-
 static int niu_pci_vpd_get_nports(struct niu *np)
 {
         int ports = 0;
 
-        if ((niu_board_model_match(np, NIU_QGC_LP_BM_STR)) ||
-            (niu_board_model_match(np, NIU_QGC_PEM_BM_STR)) ||
-            (niu_board_model_match(np, NIU_ALONSO_BM_STR))) {
+        if ((!strcmp(np->vpd.model, NIU_QGC_LP_MDL_STR)) ||
+            (!strcmp(np->vpd.model, NIU_QGC_PEM_MDL_STR)) ||
+            (!strcmp(np->vpd.model, NIU_MARAMBA_MDL_STR)) ||
+            (!strcmp(np->vpd.model, NIU_KIMI_MDL_STR)) ||
+            (!strcmp(np->vpd.model, NIU_ALONSO_MDL_STR))) {
                 ports = 4;
-        } else if ((niu_board_model_match(np, NIU_2XGF_LP_BM_STR)) ||
-                   (niu_board_model_match(np, NIU_2XGF_PEM_BM_STR)) ||
-                   (niu_board_model_match(np, NIU_FOXXY_BM_STR)) ||
-                   (niu_board_model_match(np, NIU_2XGF_MRVL_BM_STR))) {
+        } else if ((!strcmp(np->vpd.model, NIU_2XGF_LP_MDL_STR)) ||
+                   (!strcmp(np->vpd.model, NIU_2XGF_PEM_MDL_STR)) ||
+                   (!strcmp(np->vpd.model, NIU_FOXXY_MDL_STR)) ||
+                   (!strcmp(np->vpd.model, NIU_2XGF_MRVL_MDL_STR))) {
                 ports = 2;
         }
 
@@ -7053,8 +7036,8 @@ static void __devinit niu_pci_vpd_validate(struct niu *np)
                 return;
         }
 
-        if (!strcmp(np->vpd.model, "SUNW,CP3220") ||
-            !strcmp(np->vpd.model, "SUNW,CP3260")) {
+        if (!strcmp(np->vpd.model, NIU_ALONSO_MDL_STR) ||
+            !strcmp(np->vpd.model, NIU_KIMI_MDL_STR)) {
                 np->flags |= NIU_FLAGS_10G;
                 np->flags &= ~NIU_FLAGS_FIBER;
                 np->flags |= NIU_FLAGS_XCVR_SERDES;
@@ -7065,7 +7048,7 @@ static void __devinit niu_pci_vpd_validate(struct niu *np)
                 }
                 if (np->flags & NIU_FLAGS_10G)
                          np->mac_xcvr = MAC_XCVR_XPCS;
-        } else if (niu_board_model_match(np, NIU_FOXXY_BM_STR)) {
+        } else if (!strcmp(np->vpd.model, NIU_FOXXY_MDL_STR)) {
                 np->flags |= (NIU_FLAGS_10G | NIU_FLAGS_FIBER |
                               NIU_FLAGS_HOTPLUG_PHY);
         } else if (niu_phy_type_prop_decode(np, np->vpd.phy_type)) {
@@ -7541,8 +7524,8 @@ static int __devinit walk_phys(struct niu *np, struct niu_parent *parent)
         u32 val;
         int err;
 
-        if (!strcmp(np->vpd.model, "SUNW,CP3220") ||
-            !strcmp(np->vpd.model, "SUNW,CP3260")) {
+        if (!strcmp(np->vpd.model, NIU_ALONSO_MDL_STR) ||
+            !strcmp(np->vpd.model, NIU_KIMI_MDL_STR)) {
                 num_10g = 0;
                 num_1g = 2;
                 parent->plat_type = PLAT_TYPE_ATCA_CP3220;
@@ -7551,7 +7534,7 @@ static int __devinit walk_phys(struct niu *np, struct niu_parent *parent)
                        phy_encode(PORT_TYPE_1G, 1) |
                        phy_encode(PORT_TYPE_1G, 2) |
                        phy_encode(PORT_TYPE_1G, 3));
-        } else if (niu_board_model_match(np, NIU_FOXXY_BM_STR)) {
+        } else if (!strcmp(np->vpd.model, NIU_FOXXY_MDL_STR)) {
                 num_10g = 2;
                 num_1g = 0;
                 parent->num_ports = 2;
@@ -7946,6 +7929,7 @@ static int __devinit niu_get_of_props(struct niu *np)
         struct device_node *dp;
         const char *phy_type;
         const u8 *mac_addr;
+        const char *model;
         int prop_len;
 
         if (np->parent->plat_type == PLAT_TYPE_NIU)
@@ -8000,6 +7984,11 @@ static int __devinit niu_get_of_props(struct niu *np)
 
         memcpy(dev->dev_addr, dev->perm_addr, dev->addr_len);
 
+        model = of_get_property(dp, "model", &prop_len);
+
+        if (model)
+                strcpy(np->vpd.model, model);
+
         return 0;
 #else
         return -EINVAL;
diff --git a/drivers/net/niu.h b/drivers/net/niu.h
index 97ffbe137bcb..12fd570b9423 100644
--- a/drivers/net/niu.h
+++ b/drivers/net/niu.h
@@ -2946,6 +2946,15 @@ struct rx_ring_info {
 #define NIU_ALONSO_BM_STR       "373-0202"
 #define NIU_FOXXY_BM_STR        "501-7961"
 #define NIU_2XGF_MRVL_BM_STR    "SK-6E82"
+#define NIU_QGC_LP_MDL_STR      "SUNW,pcie-qgc"
+#define NIU_2XGF_LP_MDL_STR     "SUNW,pcie-2xgf"
+#define NIU_QGC_PEM_MDL_STR     "SUNW,pcie-qgc-pem"
+#define NIU_2XGF_PEM_MDL_STR    "SUNW,pcie-2xgf-pem"
+#define NIU_ALONSO_MDL_STR      "SUNW,CP3220"
+#define NIU_KIMI_MDL_STR        "SUNW,CP3260"
+#define NIU_MARAMBA_MDL_STR     "SUNW,pcie-neptune"
+#define NIU_FOXXY_MDL_STR       "SUNW,pcie-rfem"
+#define NIU_2XGF_MRVL_MDL_STR   "SysKonnect,pcie-2xgf"
 
 #define NIU_VPD_MIN_MAJOR       3
 #define NIU_VPD_MIN_MINOR       4
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index d3207c0da895..1f4ca2b54a73 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -2458,6 +2458,7 @@ ppp_create_interface(int unit, int *retp)
 
 out3:
         atomic_dec(&ppp_unit_count);
+        unregister_netdev(dev);
 out2:
         mutex_unlock(&all_ppp_mutex);
         free_netdev(dev);
diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c
index 244d7830c92a..79359919335b 100644
--- a/drivers/net/pppol2tp.c
+++ b/drivers/net/pppol2tp.c
@@ -1621,9 +1621,16 @@ out_no_ppp:
 end:
         release_sock(sk);
 
-        if (error != 0)
-                PRINTK(session ? session->debug : -1, PPPOL2TP_MSG_CONTROL, KERN_WARNING,
-                       "%s: connect failed: %d\n", session->name, error);
+        if (error != 0) {
+                if (session)
+                        PRINTK(session->debug,
+                                PPPOL2TP_MSG_CONTROL, KERN_WARNING,
+                                "%s: connect failed: %d\n",
+                                session->name, error);
+                else
+                        PRINTK(-1, PPPOL2TP_MSG_CONTROL, KERN_WARNING,
+                                "connect failed: %d\n", error);
+        }
 
         return error;
 }
diff --git a/drivers/net/ps3_gelic_wireless.c b/drivers/net/ps3_gelic_wireless.c
index 0d32123085e9..1dae1f2ed813 100644
--- a/drivers/net/ps3_gelic_wireless.c
+++ b/drivers/net/ps3_gelic_wireless.c
@@ -2474,6 +2474,8 @@ static void gelic_wl_free(struct gelic_wl_info *wl)
 
         pr_debug("%s: <-\n", __func__);
 
+        free_page((unsigned long)wl->buf);
+
         pr_debug("%s: destroy queues\n", __func__);
         destroy_workqueue(wl->eurus_cmd_queue);
         destroy_workqueue(wl->event_queue);
diff --git a/drivers/net/sfc/Makefile b/drivers/net/sfc/Makefile
index 0f023447eafd..1d2daeec7ac1 100644
--- a/drivers/net/sfc/Makefile
+++ b/drivers/net/sfc/Makefile
@@ -1,5 +1,5 @@
 sfc-y                   += efx.o falcon.o tx.o rx.o falcon_xmac.o \
-                           i2c-direct.o ethtool.o xfp_phy.o mdio_10g.o \
-                           tenxpress.o boards.o sfe4001.o
+                           i2c-direct.o selftest.o ethtool.o xfp_phy.o \
+                           mdio_10g.o tenxpress.o boards.o sfe4001.o
 
 obj-$(CONFIG_SFC)       += sfc.o
diff --git a/drivers/net/sfc/boards.h b/drivers/net/sfc/boards.h
index f56341d428e1..695764dc2e64 100644
--- a/drivers/net/sfc/boards.h
+++ b/drivers/net/sfc/boards.h
@@ -22,5 +22,7 @@ enum efx_board_type {
 extern int efx_set_board_info(struct efx_nic *efx, u16 revision_info);
 extern int sfe4001_poweron(struct efx_nic *efx);
 extern void sfe4001_poweroff(struct efx_nic *efx);
+/* Are we putting the PHY into flash config mode */
+extern unsigned int sfe4001_phy_flash_cfg;
 
 #endif
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index 59edcf793c19..418f2e53a95b 100644
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
@@ -1873,6 +1873,7 @@ static int efx_init_struct(struct efx_nic *efx, struct efx_nic_type *type,
                 tx_queue->queue = i;
                 tx_queue->buffer = NULL;
                 tx_queue->channel = &efx->channel[0]; /* for safety */
+                tx_queue->tso_headers_free = NULL;
         }
         for (i = 0; i < EFX_MAX_RX_QUEUES; i++) {
                 rx_queue = &efx->rx_queue[i];
@@ -2071,7 +2072,8 @@ static int __devinit efx_pci_probe(struct pci_dev *pci_dev,
         net_dev = alloc_etherdev(sizeof(*efx));
         if (!net_dev)
                 return -ENOMEM;
-        net_dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG | NETIF_F_HIGHDMA;
+        net_dev->features |= (NETIF_F_IP_CSUM | NETIF_F_SG |
+                              NETIF_F_HIGHDMA | NETIF_F_TSO);
         if (lro)
                 net_dev->features |= NETIF_F_LRO;
         efx = net_dev->priv;
diff --git a/drivers/net/sfc/enum.h b/drivers/net/sfc/enum.h
index 43663a4619da..c53290d08e2b 100644
--- a/drivers/net/sfc/enum.h
+++ b/drivers/net/sfc/enum.h
@@ -10,6 +10,55 @@
 #ifndef EFX_ENUM_H
 #define EFX_ENUM_H
 
+/**
+ * enum efx_loopback_mode - loopback modes
+ * @LOOPBACK_NONE: no loopback
+ * @LOOPBACK_XGMII: loopback within MAC at XGMII level
+ * @LOOPBACK_XGXS: loopback within MAC at XGXS level
+ * @LOOPBACK_XAUI: loopback within MAC at XAUI level
+ * @LOOPBACK_PHYXS: loopback within PHY at PHYXS level
+ * @LOOPBACK_PCS: loopback within PHY at PCS level
+ * @LOOPBACK_PMAPMD: loopback within PHY at PMAPMD level
+ * @LOOPBACK_NETWORK: reflecting loopback (even further than furthest!)
+ */
+/* Please keep in order and up-to-date w.r.t the following two #defines */
+enum efx_loopback_mode {
+        LOOPBACK_NONE = 0,
+        LOOPBACK_MAC = 1,
+        LOOPBACK_XGMII = 2,
+        LOOPBACK_XGXS = 3,
+        LOOPBACK_XAUI = 4,
+        LOOPBACK_PHY = 5,
+        LOOPBACK_PHYXS = 6,
+        LOOPBACK_PCS = 7,
+        LOOPBACK_PMAPMD = 8,
+        LOOPBACK_NETWORK = 9,
+        LOOPBACK_MAX
+};
+
+#define LOOPBACK_TEST_MAX LOOPBACK_PMAPMD
+
+extern const char *efx_loopback_mode_names[];
+#define LOOPBACK_MODE_NAME(mode)                        \
+        STRING_TABLE_LOOKUP(mode, efx_loopback_mode)
+#define LOOPBACK_MODE(efx)                              \
+        LOOPBACK_MODE_NAME(efx->loopback_mode)
+
+/* These loopbacks occur within the controller */
+#define LOOPBACKS_10G_INTERNAL ((1 << LOOPBACK_XGMII)| \
+                                (1 << LOOPBACK_XGXS) | \
+                                (1 << LOOPBACK_XAUI))
+
+#define LOOPBACK_MASK(_efx)                     \
+        (1 << (_efx)->loopback_mode)
+
+#define LOOPBACK_INTERNAL(_efx)                                         \
+        ((LOOPBACKS_10G_INTERNAL & LOOPBACK_MASK(_efx)) ? 1 : 0)
+
+#define LOOPBACK_OUT_OF(_from, _to, _mask)              \
+        (((LOOPBACK_MASK(_from) & (_mask)) &&           \
+          ((LOOPBACK_MASK(_to) & (_mask)) == 0)) ? 1 : 0)
+
 /*****************************************************************************/
 
 /**
diff --git a/drivers/net/sfc/ethtool.c b/drivers/net/sfc/ethtool.c
index ad541badbd98..e2c75d101610 100644
--- a/drivers/net/sfc/ethtool.c
+++ b/drivers/net/sfc/ethtool.c
@@ -12,12 +12,26 @@
 #include <linux/ethtool.h>
 #include <linux/rtnetlink.h>
 #include "net_driver.h"
+#include "selftest.h"
 #include "efx.h"
 #include "ethtool.h"
 #include "falcon.h"
 #include "gmii.h"
 #include "mac.h"
 
+const char *efx_loopback_mode_names[] = {
+        [LOOPBACK_NONE]         = "NONE",
+        [LOOPBACK_MAC]          = "MAC",
+        [LOOPBACK_XGMII]        = "XGMII",
+        [LOOPBACK_XGXS]         = "XGXS",
+        [LOOPBACK_XAUI]         = "XAUI",
+        [LOOPBACK_PHY]          = "PHY",
+        [LOOPBACK_PHYXS]        = "PHY(XS)",
+        [LOOPBACK_PCS]          = "PHY(PCS)",
+        [LOOPBACK_PMAPMD]       = "PHY(PMAPMD)",
+        [LOOPBACK_NETWORK]      = "NETWORK",
+};
+
 static int efx_ethtool_set_tx_csum(struct net_device *net_dev, u32 enable);
 
 struct ethtool_string {
@@ -217,23 +231,179 @@ static void efx_ethtool_get_drvinfo(struct net_device *net_dev,
         strlcpy(info->bus_info, pci_name(efx->pci_dev), sizeof(info->bus_info));
 }
 
+/**
+ * efx_fill_test - fill in an individual self-test entry
+ * @test_index:         Index of the test
+ * @strings:            Ethtool strings, or %NULL
+ * @data:               Ethtool test results, or %NULL
+ * @test:               Pointer to test result (used only if data != %NULL)
+ * @unit_format:        Unit name format (e.g. "channel\%d")
+ * @unit_id:            Unit id (e.g. 0 for "channel0")
+ * @test_format:        Test name format (e.g. "loopback.\%s.tx.sent")
+ * @test_id:            Test id (e.g. "PHY" for "loopback.PHY.tx_sent")
+ *
+ * Fill in an individual self-test entry.
+ */
+static void efx_fill_test(unsigned int test_index,
+                          struct ethtool_string *strings, u64 *data,
+                          int *test, const char *unit_format, int unit_id,
+                          const char *test_format, const char *test_id)
+{
+        struct ethtool_string unit_str, test_str;
+
+        /* Fill data value, if applicable */
+        if (data)
+                data[test_index] = *test;
+
+        /* Fill string, if applicable */
+        if (strings) {
+                snprintf(unit_str.name, sizeof(unit_str.name),
+                         unit_format, unit_id);
+                snprintf(test_str.name, sizeof(test_str.name),
+                         test_format, test_id);
+                snprintf(strings[test_index].name,
+                         sizeof(strings[test_index].name),
+                         "%-9s%-17s", unit_str.name, test_str.name);
+        }
+}
+
+#define EFX_PORT_NAME "port%d", 0
+#define EFX_CHANNEL_NAME(_channel) "channel%d", _channel->channel
+#define EFX_TX_QUEUE_NAME(_tx_queue) "txq%d", _tx_queue->queue
+#define EFX_RX_QUEUE_NAME(_rx_queue) "rxq%d", _rx_queue->queue
+#define EFX_LOOPBACK_NAME(_mode, _counter)                      \
+        "loopback.%s." _counter, LOOPBACK_MODE_NAME(mode)
+
+/**
+ * efx_fill_loopback_test - fill in a block of loopback self-test entries
+ * @efx:                Efx NIC
+ * @lb_tests:           Efx loopback self-test results structure
+ * @mode:               Loopback test mode
+ * @test_index:         Starting index of the test
+ * @strings:            Ethtool strings, or %NULL
+ * @data:               Ethtool test results, or %NULL
+ */
+static int efx_fill_loopback_test(struct efx_nic *efx,
+                                  struct efx_loopback_self_tests *lb_tests,
+                                  enum efx_loopback_mode mode,
+                                  unsigned int test_index,
+                                  struct ethtool_string *strings, u64 *data)
+{
+        struct efx_tx_queue *tx_queue;
+
+        efx_for_each_tx_queue(tx_queue, efx) {
+                efx_fill_test(test_index++, strings, data,
+                              &lb_tests->tx_sent[tx_queue->queue],
+                              EFX_TX_QUEUE_NAME(tx_queue),
+                              EFX_LOOPBACK_NAME(mode, "tx_sent"));
+                efx_fill_test(test_index++, strings, data,
+                              &lb_tests->tx_done[tx_queue->queue],
+                              EFX_TX_QUEUE_NAME(tx_queue),
+                              EFX_LOOPBACK_NAME(mode, "tx_done"));
+        }
+        efx_fill_test(test_index++, strings, data,
+                      &lb_tests->rx_good,
+                      EFX_PORT_NAME,
+                      EFX_LOOPBACK_NAME(mode, "rx_good"));
+        efx_fill_test(test_index++, strings, data,
+                      &lb_tests->rx_bad,
+                      EFX_PORT_NAME,
+                      EFX_LOOPBACK_NAME(mode, "rx_bad"));
+
+        return test_index;
+}
+
+/**
+ * efx_ethtool_fill_self_tests - get self-test details
+ * @efx:                Efx NIC
+ * @tests:              Efx self-test results structure, or %NULL
+ * @strings:            Ethtool strings, or %NULL
+ * @data:               Ethtool test results, or %NULL
+ */
+static int efx_ethtool_fill_self_tests(struct efx_nic *efx,
+                                       struct efx_self_tests *tests,
+                                       struct ethtool_string *strings,
+                                       u64 *data)
+{
+        struct efx_channel *channel;
+        unsigned int n = 0;
+        enum efx_loopback_mode mode;
+
+        /* Interrupt */
+        efx_fill_test(n++, strings, data, &tests->interrupt,
+                      "core", 0, "interrupt", NULL);
+
+        /* Event queues */
+        efx_for_each_channel(channel, efx) {
+                efx_fill_test(n++, strings, data,
+                              &tests->eventq_dma[channel->channel],
+                              EFX_CHANNEL_NAME(channel),
+                              "eventq.dma", NULL);
+                efx_fill_test(n++, strings, data,
+                              &tests->eventq_int[channel->channel],
+                              EFX_CHANNEL_NAME(channel),
+                              "eventq.int", NULL);
+                efx_fill_test(n++, strings, data,
+                              &tests->eventq_poll[channel->channel],
+                              EFX_CHANNEL_NAME(channel),
+                              "eventq.poll", NULL);
+        }
+
+        /* PHY presence */
+        efx_fill_test(n++, strings, data, &tests->phy_ok,
+                      EFX_PORT_NAME, "phy_ok", NULL);
+
+        /* Loopback tests */
+        efx_fill_test(n++, strings, data, &tests->loopback_speed,
+                      EFX_PORT_NAME, "loopback.speed", NULL);
+        efx_fill_test(n++, strings, data, &tests->loopback_full_duplex,
+                      EFX_PORT_NAME, "loopback.full_duplex", NULL);
+        for (mode = LOOPBACK_NONE; mode < LOOPBACK_TEST_MAX; mode++) {
+                if (!(efx->loopback_modes & (1 << mode)))
+                        continue;
+                n = efx_fill_loopback_test(efx,
+                                           &tests->loopback[mode], mode, n,
+                                           strings, data);
+        }
+
+        return n;
+}
+
 static int efx_ethtool_get_stats_count(struct net_device *net_dev)
 {
         return EFX_ETHTOOL_NUM_STATS;
 }
 
+static int efx_ethtool_self_test_count(struct net_device *net_dev)
+{
+        struct efx_nic *efx = net_dev->priv;
+
+        return efx_ethtool_fill_self_tests(efx, NULL, NULL, NULL);
+}
+
 static void efx_ethtool_get_strings(struct net_device *net_dev,
                                     u32 string_set, u8 *strings)
 {
+        struct efx_nic *efx = net_dev->priv;
         struct ethtool_string *ethtool_strings =
                 (struct ethtool_string *)strings;
         int i;
 
-        if (string_set == ETH_SS_STATS)
+        switch (string_set) {
+        case ETH_SS_STATS:
                 for (i = 0; i < EFX_ETHTOOL_NUM_STATS; i++)
                         strncpy(ethtool_strings[i].name,
                                 efx_ethtool_stats[i].name,
                                 sizeof(ethtool_strings[i].name));
+                break;
+        case ETH_SS_TEST:
+                efx_ethtool_fill_self_tests(efx, NULL,
+                                            ethtool_strings, NULL);
+                break;
+        default:
+                /* No other string sets */
+                break;
+        }
 }
 
 static void efx_ethtool_get_stats(struct net_device *net_dev,
@@ -272,6 +442,22 @@ static void efx_ethtool_get_stats(struct net_device *net_dev,
         }
 }
 
+static int efx_ethtool_set_tso(struct net_device *net_dev, u32 enable)
+{
+        int rc;
+
+        /* Our TSO requires TX checksumming, so force TX checksumming
+         * on when TSO is enabled.
+         */
+        if (enable) {
+                rc = efx_ethtool_set_tx_csum(net_dev, 1);
+                if (rc)
+                        return rc;
+        }
+
+        return ethtool_op_set_tso(net_dev, enable);
+}
+
 static int efx_ethtool_set_tx_csum(struct net_device *net_dev, u32 enable)
 {
         struct efx_nic *efx = net_dev->priv;
@@ -283,6 +469,15 @@ static int efx_ethtool_set_tx_csum(struct net_device *net_dev, u32 enable)
 
         efx_flush_queues(efx);
 
+        /* Our TSO requires TX checksumming, so disable TSO when
+         * checksumming is disabled
+         */
+        if (!enable) {
+                rc = efx_ethtool_set_tso(net_dev, 0);
+                if (rc)
+                        return rc;
+        }
+
         return 0;
 }
 
@@ -305,6 +500,64 @@ static u32 efx_ethtool_get_rx_csum(struct net_device *net_dev)
         return efx->rx_checksum_enabled;
 }
 
+static void efx_ethtool_self_test(struct net_device *net_dev,
+                                  struct ethtool_test *test, u64 *data)
+{
+        struct efx_nic *efx = net_dev->priv;
+        struct efx_self_tests efx_tests;
+        int offline, already_up;
+        int rc;
+
+        ASSERT_RTNL();
+        if (efx->state != STATE_RUNNING) {
+                rc = -EIO;
+                goto fail1;
+        }
+
+        /* We need rx buffers and interrupts. */
+        already_up = (efx->net_dev->flags & IFF_UP);
+        if (!already_up) {
+                rc = dev_open(efx->net_dev);
+                if (rc) {
+                        EFX_ERR(efx, "failed opening device.\n");
+                        goto fail2;
+                }
+        }
+
+        memset(&efx_tests, 0, sizeof(efx_tests));
+        offline = (test->flags & ETH_TEST_FL_OFFLINE);
+
+        /* Perform online self tests first */
+        rc = efx_online_test(efx, &efx_tests);
+        if (rc)
+                goto out;
+
+        /* Perform offline tests only if online tests passed */
+        if (offline) {
+                /* Stop the kernel from sending packets during the test. */
+                efx_stop_queue(efx);
+                rc = efx_flush_queues(efx);
+                if (!rc)
+                        rc = efx_offline_test(efx, &efx_tests,
+                                              efx->loopback_modes);
+                efx_wake_queue(efx);
+        }
+
+ out:
+        if (!already_up)
+                dev_close(efx->net_dev);
+
+        EFX_LOG(efx, "%s all %sline self-tests\n",
+                rc == 0 ? "passed" : "failed", offline ? "off" : "on");
+
+ fail2:
+ fail1:
+        /* Fill ethtool results structures */
+        efx_ethtool_fill_self_tests(efx, &efx_tests, NULL, data);
+        if (rc)
+                test->flags |= ETH_TEST_FL_FAILED;
+}
+
 /* Restart autonegotiation */
 static int efx_ethtool_nway_reset(struct net_device *net_dev)
 {
@@ -451,8 +704,12 @@ struct ethtool_ops efx_ethtool_ops = {
         .set_tx_csum            = efx_ethtool_set_tx_csum,
         .get_sg                 = ethtool_op_get_sg,
         .set_sg                 = ethtool_op_set_sg,
+        .get_tso                = ethtool_op_get_tso,
+        .set_tso                = efx_ethtool_set_tso,
         .get_flags              = ethtool_op_get_flags,
         .set_flags              = ethtool_op_set_flags,
+        .self_test_count        = efx_ethtool_self_test_count,
+        .self_test              = efx_ethtool_self_test,
         .get_strings            = efx_ethtool_get_strings,
         .phys_id                = efx_ethtool_phys_id,
         .get_stats_count        = efx_ethtool_get_stats_count,
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c
index 46db549ce580..b57cc68058c0 100644
--- a/drivers/net/sfc/falcon.c
+++ b/drivers/net/sfc/falcon.c
@@ -1129,6 +1129,7 @@ static void falcon_handle_driver_event(struct efx_channel *channel,
         case RX_RECOVERY_EV_DECODE:
                 EFX_ERR(efx, "channel %d seen DRIVER RX_RESET event. "
                         "Resetting.\n", channel->channel);
+                atomic_inc(&efx->rx_reset);
                 efx_schedule_reset(efx,
                                    EFX_WORKAROUND_6555(efx) ?
                                    RESET_TYPE_RX_RECOVERY :
@@ -1731,7 +1732,8 @@ void falcon_drain_tx_fifo(struct efx_nic *efx)
         efx_oword_t temp;
         int count;
 
-        if (FALCON_REV(efx) < FALCON_REV_B0)
+        if ((FALCON_REV(efx) < FALCON_REV_B0) ||
+            (efx->loopback_mode != LOOPBACK_NONE))
                 return;
 
         falcon_read(efx, &temp, MAC0_CTRL_REG_KER);
@@ -2091,6 +2093,8 @@ static int falcon_probe_phy(struct efx_nic *efx)
                         efx->phy_type);
                 return -1;
         }
+
+        efx->loopback_modes = LOOPBACKS_10G_INTERNAL | efx->phy_op->loopbacks;
         return 0;
 }
 
@@ -2468,14 +2472,12 @@ int falcon_probe_nic(struct efx_nic *efx)
  fail5:
         falcon_free_buffer(efx, &efx->irq_status);
  fail4:
-        /* fall-thru */
  fail3:
         if (nic_data->pci_dev2) {
                 pci_dev_put(nic_data->pci_dev2);
                 nic_data->pci_dev2 = NULL;
         }
  fail2:
-        /* fall-thru */
  fail1:
         kfree(efx->nic_data);
         return rc;
diff --git a/drivers/net/sfc/falcon_hwdefs.h b/drivers/net/sfc/falcon_hwdefs.h
index 0485a63eaff6..06e2d68fc3d1 100644
--- a/drivers/net/sfc/falcon_hwdefs.h
+++ b/drivers/net/sfc/falcon_hwdefs.h
@@ -636,6 +636,14 @@
 #define XX_HIDRVA_WIDTH 1
 #define XX_LODRVA_LBN 8
 #define XX_LODRVA_WIDTH 1
+#define XX_LPBKD_LBN 3
+#define XX_LPBKD_WIDTH 1
+#define XX_LPBKC_LBN 2
+#define XX_LPBKC_WIDTH 1
+#define XX_LPBKB_LBN 1
+#define XX_LPBKB_WIDTH 1
+#define XX_LPBKA_LBN 0
+#define XX_LPBKA_WIDTH 1
 
 #define XX_TXDRV_CTL_REG_MAC 0x12
 #define XX_DEQD_LBN 28
@@ -656,8 +664,14 @@
 #define XX_DTXA_WIDTH 4
 
 /* XAUI XGXS core status register */
-#define XX_FORCE_SIG_DECODE_FORCED 0xff
 #define XX_CORE_STAT_REG_MAC 0x16
+#define XX_FORCE_SIG_LBN 24
+#define XX_FORCE_SIG_WIDTH 8
+#define XX_FORCE_SIG_DECODE_FORCED 0xff
+#define XX_XGXS_LB_EN_LBN 23
+#define XX_XGXS_LB_EN_WIDTH 1
+#define XX_XGMII_LB_EN_LBN 22
+#define XX_XGMII_LB_EN_WIDTH 1
 #define XX_ALIGN_DONE_LBN 20
 #define XX_ALIGN_DONE_WIDTH 1
 #define XX_SYNC_STAT_LBN 16
diff --git a/drivers/net/sfc/falcon_xmac.c b/drivers/net/sfc/falcon_xmac.c
index aa7521b24a5d..a74b7931a3c4 100644
--- a/drivers/net/sfc/falcon_xmac.c
+++ b/drivers/net/sfc/falcon_xmac.c
@@ -32,7 +32,7 @@
         (FALCON_XMAC_REGBANK + ((mac_reg) * FALCON_XMAC_REG_SIZE))
 
 void falcon_xmac_writel(struct efx_nic *efx,
-                        efx_dword_t *value, unsigned int mac_reg)
+                         efx_dword_t *value, unsigned int mac_reg)
 {
         efx_oword_t temp;
 
@@ -69,6 +69,10 @@ static int falcon_reset_xmac(struct efx_nic *efx)
                 udelay(10);
         }
 
+        /* This often fails when DSP is disabled, ignore it */
+        if (sfe4001_phy_flash_cfg != 0)
+                return 0;
+
         EFX_ERR(efx, "timed out waiting for XMAC core reset\n");
         return -ETIMEDOUT;
 }
@@ -223,7 +227,7 @@ static int falcon_xgmii_status(struct efx_nic *efx)
         /* The ISR latches, so clear it and re-read */
         falcon_xmac_readl(efx, &reg, XM_MGT_INT_REG_MAC_B0);
         falcon_xmac_readl(efx, &reg, XM_MGT_INT_REG_MAC_B0);
-        
+
         if (EFX_DWORD_FIELD(reg, XM_LCLFLT) ||
             EFX_DWORD_FIELD(reg, XM_RMTFLT)) {
                 EFX_INFO(efx, "MGT_INT: "EFX_DWORD_FMT"\n", EFX_DWORD_VAL(reg));
@@ -237,7 +241,7 @@ static void falcon_mask_status_intr(struct efx_nic *efx, int enable)
 {
         efx_dword_t reg;
 
-        if (FALCON_REV(efx) < FALCON_REV_B0)
+        if ((FALCON_REV(efx) < FALCON_REV_B0) || LOOPBACK_INTERNAL(efx))
                 return;
 
         /* Flush the ISR */
@@ -284,6 +288,9 @@ int falcon_xaui_link_ok(struct efx_nic *efx)
         efx_dword_t reg;
         int align_done, sync_status, link_ok = 0;
 
+        if (LOOPBACK_INTERNAL(efx))
+                return 1;
+
         /* Read link status */
         falcon_xmac_readl(efx, &reg, XX_CORE_STAT_REG_MAC);
 
@@ -374,6 +381,61 @@ static void falcon_reconfigure_xmac_core(struct efx_nic *efx)
         falcon_xmac_writel(efx, &reg, XM_ADR_HI_REG_MAC);
 }
 
+static void falcon_reconfigure_xgxs_core(struct efx_nic *efx)
+{
+        efx_dword_t reg;
+        int xgxs_loopback = (efx->loopback_mode == LOOPBACK_XGXS) ? 1 : 0;
+        int xaui_loopback = (efx->loopback_mode == LOOPBACK_XAUI) ? 1 : 0;
+        int xgmii_loopback =
+                (efx->loopback_mode == LOOPBACK_XGMII) ? 1 : 0;
+
+        /* XGXS block is flaky and will need to be reset if moving
+         * into our out of XGMII, XGXS or XAUI loopbacks. */
+        if (EFX_WORKAROUND_5147(efx)) {
+                int old_xgmii_loopback, old_xgxs_loopback, old_xaui_loopback;
+                int reset_xgxs;
+
+                falcon_xmac_readl(efx, &reg, XX_CORE_STAT_REG_MAC);
+                old_xgxs_loopback = EFX_DWORD_FIELD(reg, XX_XGXS_LB_EN);
+                old_xgmii_loopback = EFX_DWORD_FIELD(reg, XX_XGMII_LB_EN);
+
+                falcon_xmac_readl(efx, &reg, XX_SD_CTL_REG_MAC);
+                old_xaui_loopback = EFX_DWORD_FIELD(reg, XX_LPBKA);
+
+                /* The PHY driver may have turned XAUI off */
+                reset_xgxs = ((xgxs_loopback != old_xgxs_loopback) ||
+                              (xaui_loopback != old_xaui_loopback) ||
+                              (xgmii_loopback != old_xgmii_loopback));
+                if (reset_xgxs) {
+                        falcon_xmac_readl(efx, &reg, XX_PWR_RST_REG_MAC);
+                        EFX_SET_DWORD_FIELD(reg, XX_RSTXGXSTX_EN, 1);
+                        EFX_SET_DWORD_FIELD(reg, XX_RSTXGXSRX_EN, 1);
+                        falcon_xmac_writel(efx, &reg, XX_PWR_RST_REG_MAC);
+                        udelay(1);
+                        EFX_SET_DWORD_FIELD(reg, XX_RSTXGXSTX_EN, 0);
+                        EFX_SET_DWORD_FIELD(reg, XX_RSTXGXSRX_EN, 0);
+                        falcon_xmac_writel(efx, &reg, XX_PWR_RST_REG_MAC);
+                        udelay(1);
+                }
+        }
+
+        falcon_xmac_readl(efx, &reg, XX_CORE_STAT_REG_MAC);
+        EFX_SET_DWORD_FIELD(reg, XX_FORCE_SIG,
+                            (xgxs_loopback || xaui_loopback) ?
+                            XX_FORCE_SIG_DECODE_FORCED : 0);
+        EFX_SET_DWORD_FIELD(reg, XX_XGXS_LB_EN, xgxs_loopback);
+        EFX_SET_DWORD_FIELD(reg, XX_XGMII_LB_EN, xgmii_loopback);
+        falcon_xmac_writel(efx, &reg, XX_CORE_STAT_REG_MAC);
+
+        falcon_xmac_readl(efx, &reg, XX_SD_CTL_REG_MAC);
+        EFX_SET_DWORD_FIELD(reg, XX_LPBKD, xaui_loopback);
+        EFX_SET_DWORD_FIELD(reg, XX_LPBKC, xaui_loopback);
+        EFX_SET_DWORD_FIELD(reg, XX_LPBKB, xaui_loopback);
+        EFX_SET_DWORD_FIELD(reg, XX_LPBKA, xaui_loopback);
+        falcon_xmac_writel(efx, &reg, XX_SD_CTL_REG_MAC);
+}
+
+
 /* Try and bring the Falcon side of the Falcon-Phy XAUI link fails
  * to come back up. Bash it until it comes back up */
 static int falcon_check_xaui_link_up(struct efx_nic *efx)
@@ -382,7 +444,8 @@ static int falcon_check_xaui_link_up(struct efx_nic *efx)
         tries = EFX_WORKAROUND_5147(efx) ? 5 : 1;
         max_tries = tries;
 
-        if (efx->phy_type == PHY_TYPE_NONE)
+        if ((efx->loopback_mode == LOOPBACK_NETWORK) ||
+            (efx->phy_type == PHY_TYPE_NONE))
                 return 0;
 
         while (tries) {
@@ -408,8 +471,13 @@ void falcon_reconfigure_xmac(struct efx_nic *efx)
         falcon_mask_status_intr(efx, 0);
 
         falcon_deconfigure_mac_wrapper(efx);
+
+        efx->tx_disabled = LOOPBACK_INTERNAL(efx);
         efx->phy_op->reconfigure(efx);
+
+        falcon_reconfigure_xgxs_core(efx);
         falcon_reconfigure_xmac_core(efx);
+
         falcon_reconfigure_mac_wrapper(efx);
 
         /* Ensure XAUI link is up */
@@ -491,13 +559,15 @@ void falcon_update_stats_xmac(struct efx_nic *efx)
                 (mac_stats->rx_bytes - mac_stats->rx_good_bytes);
 }
 
-#define EFX_XAUI_RETRAIN_MAX 8
-
 int falcon_check_xmac(struct efx_nic *efx)
 {
         unsigned xaui_link_ok;
         int rc;
 
+        if ((efx->loopback_mode == LOOPBACK_NETWORK) ||
+            (efx->phy_type == PHY_TYPE_NONE))
+                return 0;
+
         falcon_mask_status_intr(efx, 0);
         xaui_link_ok = falcon_xaui_link_ok(efx);
 
diff --git a/drivers/net/sfc/mdio_10g.c b/drivers/net/sfc/mdio_10g.c
index dc06bb0aa575..c4f540e93b79 100644
--- a/drivers/net/sfc/mdio_10g.c
+++ b/drivers/net/sfc/mdio_10g.c
@@ -44,6 +44,9 @@ static int mdio_clause45_check_mmd(struct efx_nic *efx, int mmd,
         int status;
         int phy_id = efx->mii.phy_id;
 
+        if (LOOPBACK_INTERNAL(efx))
+                return 0;
+
         /* Read MMD STATUS2 to check it is responding. */
         status = mdio_clause45_read(efx, phy_id, mmd, MDIO_MMDREG_STAT2);
         if (((status >> MDIO_MMDREG_STAT2_PRESENT_LBN) &
@@ -164,6 +167,22 @@ int mdio_clause45_links_ok(struct efx_nic *efx, unsigned int mmd_mask)
         int mmd = 0;
         int good;
 
+        /* If the port is in loopback, then we should only consider a subset
+         * of mmd's */
+        if (LOOPBACK_INTERNAL(efx))
+                return 1;
+        else if (efx->loopback_mode == LOOPBACK_NETWORK)
+                return 0;
+        else if (efx->loopback_mode == LOOPBACK_PHYXS)
+                mmd_mask &= ~(MDIO_MMDREG_DEVS0_PHYXS |
+                              MDIO_MMDREG_DEVS0_PCS |
+                              MDIO_MMDREG_DEVS0_PMAPMD);
+        else if (efx->loopback_mode == LOOPBACK_PCS)
+                mmd_mask &= ~(MDIO_MMDREG_DEVS0_PCS |
+                              MDIO_MMDREG_DEVS0_PMAPMD);
+        else if (efx->loopback_mode == LOOPBACK_PMAPMD)
+                mmd_mask &= ~MDIO_MMDREG_DEVS0_PMAPMD;
+
         while (mmd_mask) {
                 if (mmd_mask & 1) {
                         /* Double reads because link state is latched, and a
@@ -182,6 +201,65 @@ int mdio_clause45_links_ok(struct efx_nic *efx, unsigned int mmd_mask)
         return ok;
 }
 
+void mdio_clause45_transmit_disable(struct efx_nic *efx)
+{
+        int phy_id = efx->mii.phy_id;
+        int ctrl1, ctrl2;
+
+        ctrl1 = ctrl2 = mdio_clause45_read(efx, phy_id, MDIO_MMD_PMAPMD,
+                                           MDIO_MMDREG_TXDIS);
+        if (efx->tx_disabled)
+                ctrl2 |= (1 << MDIO_MMDREG_TXDIS_GLOBAL_LBN);
+        else
+                ctrl1 &= ~(1 << MDIO_MMDREG_TXDIS_GLOBAL_LBN);
+        if (ctrl1 != ctrl2)
+                mdio_clause45_write(efx, phy_id, MDIO_MMD_PMAPMD,
+                                    MDIO_MMDREG_TXDIS, ctrl2);
+}
+
+void mdio_clause45_phy_reconfigure(struct efx_nic *efx)
+{
+        int phy_id = efx->mii.phy_id;
+        int ctrl1, ctrl2;
+
+        /* Handle (with debouncing) PMA/PMD loopback */
+        ctrl1 = ctrl2 = mdio_clause45_read(efx, phy_id, MDIO_MMD_PMAPMD,
+                                           MDIO_MMDREG_CTRL1);
+
+        if (efx->loopback_mode == LOOPBACK_PMAPMD)
+                ctrl2 |= (1 << MDIO_PMAPMD_CTRL1_LBACK_LBN);
+        else
+                ctrl2 &= ~(1 << MDIO_PMAPMD_CTRL1_LBACK_LBN);
+
+        if (ctrl1 != ctrl2)
+                mdio_clause45_write(efx, phy_id, MDIO_MMD_PMAPMD,
+                                    MDIO_MMDREG_CTRL1, ctrl2);
+
+        /* Handle (with debouncing) PCS loopback */
+        ctrl1 = ctrl2 = mdio_clause45_read(efx, phy_id, MDIO_MMD_PCS,
+                                           MDIO_MMDREG_CTRL1);
+        if (efx->loopback_mode == LOOPBACK_PCS)
+                ctrl2 |= (1 << MDIO_MMDREG_CTRL1_LBACK_LBN);
+        else
+                ctrl2 &= ~(1 << MDIO_MMDREG_CTRL1_LBACK_LBN);
+
+        if (ctrl1 != ctrl2)
+                mdio_clause45_write(efx, phy_id, MDIO_MMD_PCS,
+                                    MDIO_MMDREG_CTRL1, ctrl2);
+
+        /* Handle (with debouncing) PHYXS network loopback */
+        ctrl1 = ctrl2 = mdio_clause45_read(efx, phy_id, MDIO_MMD_PHYXS,
+                                           MDIO_MMDREG_CTRL1);
+        if (efx->loopback_mode == LOOPBACK_NETWORK)
+                ctrl2 |= (1 << MDIO_MMDREG_CTRL1_LBACK_LBN);
+        else
+                ctrl2 &= ~(1 << MDIO_MMDREG_CTRL1_LBACK_LBN);
+
+        if (ctrl1 != ctrl2)
+                mdio_clause45_write(efx, phy_id, MDIO_MMD_PHYXS,
+                                    MDIO_MMDREG_CTRL1, ctrl2);
+}
+
 /**
  * mdio_clause45_get_settings - Read (some of) the PHY settings over MDIO.
  * @efx:                Efx NIC
diff --git a/drivers/net/sfc/mdio_10g.h b/drivers/net/sfc/mdio_10g.h
index 2214b6d820a7..cb99f3f4491c 100644
--- a/drivers/net/sfc/mdio_10g.h
+++ b/drivers/net/sfc/mdio_10g.h
@@ -44,11 +44,16 @@
 #define MDIO_MMDREG_DEVS1       (6)
 #define MDIO_MMDREG_CTRL2       (7)
 #define MDIO_MMDREG_STAT2       (8)
+#define MDIO_MMDREG_TXDIS       (9)
 
 /* Bits in MMDREG_CTRL1 */
 /* Reset */
 #define MDIO_MMDREG_CTRL1_RESET_LBN     (15)
 #define MDIO_MMDREG_CTRL1_RESET_WIDTH   (1)
+/* Loopback */
+/* Loopback bit for WIS, PCS, PHYSX and DTEXS */
+#define MDIO_MMDREG_CTRL1_LBACK_LBN     (14)
+#define MDIO_MMDREG_CTRL1_LBACK_WIDTH   (1)
 
 /* Bits in MMDREG_STAT1 */
 #define MDIO_MMDREG_STAT1_FAULT_LBN     (7)
@@ -56,6 +61,9 @@
 /* Link state */
 #define MDIO_MMDREG_STAT1_LINK_LBN      (2)
 #define MDIO_MMDREG_STAT1_LINK_WIDTH    (1)
+/* Low power ability */
+#define MDIO_MMDREG_STAT1_LPABLE_LBN    (1)
+#define MDIO_MMDREG_STAT1_LPABLE_WIDTH  (1)
 
 /* Bits in ID reg */
 #define MDIO_ID_REV(_id32)      (_id32 & 0xf)
@@ -76,6 +84,14 @@
 #define MDIO_MMDREG_STAT2_PRESENT_LBN   (14)
 #define MDIO_MMDREG_STAT2_PRESENT_WIDTH (2)
 
+/* Bits in MMDREG_TXDIS */
+#define MDIO_MMDREG_TXDIS_GLOBAL_LBN    (0)
+#define MDIO_MMDREG_TXDIS_GLOBAL_WIDTH  (1)
+
+/* MMD-specific bits, ordered by MMD, then register */
+#define MDIO_PMAPMD_CTRL1_LBACK_LBN     (0)
+#define MDIO_PMAPMD_CTRL1_LBACK_WIDTH   (1)
+
 /* PMA type (4 bits) */
 #define MDIO_PMAPMD_CTRL2_10G_CX4       (0x0)
 #define MDIO_PMAPMD_CTRL2_10G_EW        (0x1)
@@ -95,7 +111,7 @@
 #define MDIO_PMAPMD_CTRL2_10_BT         (0xf)
 #define MDIO_PMAPMD_CTRL2_TYPE_MASK     (0xf)
 
-/* /\* PHY XGXS lane state *\/ */
+/* PHY XGXS lane state */
 #define MDIO_PHYXS_LANE_STATE           (0x18)
 #define MDIO_PHYXS_LANE_ALIGNED_LBN     (12)
 
@@ -217,6 +233,12 @@ int mdio_clause45_check_mmds(struct efx_nic *efx,
 extern int mdio_clause45_links_ok(struct efx_nic *efx,
                                   unsigned int mmd_mask);
 
+/* Generic transmit disable support though PMAPMD */
+extern void mdio_clause45_transmit_disable(struct efx_nic *efx);
+
+/* Generic part of reconfigure: set/clear loopback bits */
+extern void mdio_clause45_phy_reconfigure(struct efx_nic *efx);
+
 /* Read (some of) the PHY settings over MDIO */
 extern void mdio_clause45_get_settings(struct efx_nic *efx,
                                        struct ethtool_cmd *ecmd);
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h
index c505482c2520..59f261b4171f 100644
--- a/drivers/net/sfc/net_driver.h
+++ b/drivers/net/sfc/net_driver.h
@@ -134,6 +134,8 @@ struct efx_special_buffer {
  *      Set only on the final fragment of a packet; %NULL for all other
  *      fragments.  When this fragment completes, then we can free this
  *      skb.
+ * @tsoh: The associated TSO header structure, or %NULL if this
+ *      buffer is not a TSO header.
  * @dma_addr: DMA address of the fragment.
  * @len: Length of this fragment.
  *      This field is zero when the queue slot is empty.
@@ -144,6 +146,7 @@ struct efx_special_buffer {
  */
 struct efx_tx_buffer {
         const struct sk_buff *skb;
+        struct efx_tso_header *tsoh;
         dma_addr_t dma_addr;
         unsigned short len;
         unsigned char continuation;
@@ -187,6 +190,13 @@ struct efx_tx_buffer {
  *      variable indicates that the queue is full.  This is to
  *      avoid cache-line ping-pong between the xmit path and the
  *      completion path.
+ * @tso_headers_free: A list of TSO headers allocated for this TX queue
+ *      that are not in use, and so available for new TSO sends. The list
+ *      is protected by the TX queue lock.
+ * @tso_bursts: Number of times TSO xmit invoked by kernel
+ * @tso_long_headers: Number of packets with headers too long for standard
+ *      blocks
+ * @tso_packets: Number of packets via the TSO xmit path
  */
 struct efx_tx_queue {
         /* Members which don't change on the fast path */
@@ -206,6 +216,10 @@ struct efx_tx_queue {
         unsigned int insert_count ____cacheline_aligned_in_smp;
         unsigned int write_count;
         unsigned int old_read_count;
+        struct efx_tso_header *tso_headers_free;
+        unsigned int tso_bursts;
+        unsigned int tso_long_headers;
+        unsigned int tso_packets;
 };
 
 /**
@@ -434,6 +448,9 @@ struct efx_board {
         struct efx_blinker blinker;
 };
 
+#define STRING_TABLE_LOOKUP(val, member)        \
+        member ## _names[val]
+
 enum efx_int_mode {
         /* Be careful if altering to correct macro below */
         EFX_INT_MODE_MSIX = 0,
@@ -506,6 +523,7 @@ enum efx_fc_type {
  * @check_hw: Check hardware
  * @reset_xaui: Reset XAUI side of PHY for (software sequenced reset)
  * @mmds: MMD presence mask
+ * @loopbacks: Supported loopback modes mask
  */
 struct efx_phy_operations {
         int (*init) (struct efx_nic *efx);
@@ -515,6 +533,7 @@ struct efx_phy_operations {
         int (*check_hw) (struct efx_nic *efx);
         void (*reset_xaui) (struct efx_nic *efx);
         int mmds;
+        unsigned loopbacks;
 };
 
 /*
@@ -653,7 +672,6 @@ union efx_multicast_hash {
  * @phy_op: PHY interface
  * @phy_data: PHY private data (including PHY-specific stats)
  * @mii: PHY interface
- * @phy_powered: PHY power state
  * @tx_disabled: PHY transmitter turned off
  * @link_up: Link status
  * @link_options: Link options (MII/GMII format)
@@ -662,6 +680,9 @@ union efx_multicast_hash {
  * @multicast_hash: Multicast hash table
  * @flow_control: Flow control flags - separate RX/TX so can't use link_options
  * @reconfigure_work: work item for dealing with PHY events
+ * @loopback_mode: Loopback status
+ * @loopback_modes: Supported loopback mode bitmask
+ * @loopback_selftest: Offline self-test private state
  *
  * The @priv field of the corresponding &struct net_device points to
  * this.
@@ -721,6 +742,7 @@ struct efx_nic {
         struct efx_phy_operations *phy_op;
         void *phy_data;
         struct mii_if_info mii;
+        unsigned tx_disabled;
 
         int link_up;
         unsigned int link_options;
@@ -732,6 +754,10 @@ struct efx_nic {
         struct work_struct reconfigure_work;
 
         atomic_t rx_reset;
+        enum efx_loopback_mode loopback_mode;
+        unsigned int loopback_modes;
+
+        void *loopback_selftest;
 };
 
 /**
diff --git a/drivers/net/sfc/rx.c b/drivers/net/sfc/rx.c
index 551299b462ae..670622373ddf 100644
--- a/drivers/net/sfc/rx.c
+++ b/drivers/net/sfc/rx.c
@@ -19,6 +19,7 @@
 #include "rx.h"
 #include "efx.h"
 #include "falcon.h"
+#include "selftest.h"
 #include "workarounds.h"
 
 /* Number of RX descriptors pushed at once. */
@@ -683,6 +684,15 @@ void __efx_rx_packet(struct efx_channel *channel,
         struct sk_buff *skb;
         int lro = efx->net_dev->features & NETIF_F_LRO;
 
+        /* If we're in loopback test, then pass the packet directly to the
+         * loopback layer, and free the rx_buf here
+         */
+        if (unlikely(efx->loopback_selftest)) {
+                efx_loopback_rx_packet(efx, rx_buf->data, rx_buf->len);
+                efx_free_rx_buffer(efx, rx_buf);
+                goto done;
+        }
+
         if (rx_buf->skb) {
                 prefetch(skb_shinfo(rx_buf->skb));
 
@@ -736,7 +746,6 @@ void __efx_rx_packet(struct efx_channel *channel,
         /* Update allocation strategy method */
         channel->rx_alloc_level += RX_ALLOC_FACTOR_SKB;
 
-        /* fall-thru */
 done:
         efx->net_dev->last_rx = jiffies;
 }
diff --git a/drivers/net/sfc/selftest.c b/drivers/net/sfc/selftest.c
new file mode 100644
index 000000000000..cbda15946e8f
--- /dev/null
+++ b/drivers/net/sfc/selftest.c
@@ -0,0 +1,717 @@
+/****************************************************************************
+ * Driver for Solarflare Solarstorm network controllers and boards
+ * Copyright 2005-2006 Fen Systems Ltd.
+ * Copyright 2006-2008 Solarflare Communications Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation, incorporated herein by reference.
+ */
+
+#include <linux/netdevice.h>
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/kernel_stat.h>
+#include <linux/pci.h>
+#include <linux/ethtool.h>
+#include <linux/ip.h>
+#include <linux/in.h>
+#include <linux/udp.h>
+#include <linux/rtnetlink.h>
+#include <asm/io.h>
+#include "net_driver.h"
+#include "ethtool.h"
+#include "efx.h"
+#include "falcon.h"
+#include "selftest.h"
+#include "boards.h"
+#include "workarounds.h"
+#include "mac.h"
+
+/*
+ * Loopback test packet structure
+ *
+ * The self-test should stress every RSS vector, and unfortunately
+ * Falcon only performs RSS on TCP/UDP packets.
+ */
+struct efx_loopback_payload {
+        struct ethhdr header;
+        struct iphdr ip;
+        struct udphdr udp;
+        __be16 iteration;
+        const char msg[64];
+} __attribute__ ((packed));
+
+/* Loopback test source MAC address */
+static const unsigned char payload_source[ETH_ALEN] = {
+        0x00, 0x0f, 0x53, 0x1b, 0x1b, 0x1b,
+};
+
+static const char *payload_msg =
+        "Hello world! This is an Efx loopback test in progress!";
+
+/**
+ * efx_selftest_state - persistent state during a selftest
+ * @flush:              Drop all packets in efx_loopback_rx_packet
+ * @packet_count:       Number of packets being used in this test
+ * @skbs:               An array of skbs transmitted
+ * @rx_good:            RX good packet count
+ * @rx_bad:             RX bad packet count
+ * @payload:            Payload used in tests
+ */
+struct efx_selftest_state {
+        int flush;
+        int packet_count;
+        struct sk_buff **skbs;
+        atomic_t rx_good;
+        atomic_t rx_bad;
+        struct efx_loopback_payload payload;
+};
+
+/**************************************************************************
+ *
+ * Configurable values
+ *
+ **************************************************************************/
+
+/* Level of loopback testing
+ *
+ * The maximum packet burst length is 16**(n-1), i.e.
+ *
+ * - Level 0 : no packets
+ * - Level 1 : 1 packet
+ * - Level 2 : 17 packets (1 * 1 packet, 1 * 16 packets)
+ * - Level 3 : 273 packets (1 * 1 packet, 1 * 16 packet, 1 * 256 packets)
+ *
+ */
+static unsigned int loopback_test_level = 3;
+
+/**************************************************************************
+ *
+ * Interrupt and event queue testing
+ *
+ **************************************************************************/
+
+/* Test generation and receipt of interrupts */
+static int efx_test_interrupts(struct efx_nic *efx,
+                               struct efx_self_tests *tests)
+{
+        struct efx_channel *channel;
+
+        EFX_LOG(efx, "testing interrupts\n");
+        tests->interrupt = -1;
+
+        /* Reset interrupt flag */
+        efx->last_irq_cpu = -1;
+        smp_wmb();
+
+        /* ACK each interrupting event queue. Receiving an interrupt due to
+         * traffic before a test event is raised is considered a pass */
+        efx_for_each_channel_with_interrupt(channel, efx) {
+                if (channel->work_pending)
+                        efx_process_channel_now(channel);
+                if (efx->last_irq_cpu >= 0)
+                        goto success;
+        }
+
+        falcon_generate_interrupt(efx);
+
+        /* Wait for arrival of test interrupt. */
+        EFX_LOG(efx, "waiting for test interrupt\n");
+        schedule_timeout_uninterruptible(HZ / 10);
+        if (efx->last_irq_cpu >= 0)
+                goto success;
+
+        EFX_ERR(efx, "timed out waiting for interrupt\n");
+        return -ETIMEDOUT;
+
+ success:
+        EFX_LOG(efx, "test interrupt (mode %d) seen on CPU%d\n",
+                efx->interrupt_mode, efx->last_irq_cpu);
+        tests->interrupt = 1;
+        return 0;
+}
+
+/* Test generation and receipt of non-interrupting events */
+static int efx_test_eventq(struct efx_channel *channel,
+                           struct efx_self_tests *tests)
+{
+        unsigned int magic;
+
+        /* Channel specific code, limited to 20 bits */
+        magic = (0x00010150 + channel->channel);
+        EFX_LOG(channel->efx, "channel %d testing event queue with code %x\n",
+                channel->channel, magic);
+
+        tests->eventq_dma[channel->channel] = -1;
+        tests->eventq_int[channel->channel] = 1;        /* fake pass */
+        tests->eventq_poll[channel->channel] = 1;       /* fake pass */
+
+        /* Reset flag and zero magic word */
+        channel->efx->last_irq_cpu = -1;
+        channel->eventq_magic = 0;
+        smp_wmb();
+
+        falcon_generate_test_event(channel, magic);
+        udelay(1);
+
+        efx_process_channel_now(channel);
+        if (channel->eventq_magic != magic) {
+                EFX_ERR(channel->efx, "channel %d  failed to see test event\n",
+                        channel->channel);
+                return -ETIMEDOUT;
+        } else {
+                tests->eventq_dma[channel->channel] = 1;
+        }
+
+        return 0;
+}
+
+/* Test generation and receipt of interrupting events */
+static int efx_test_eventq_irq(struct efx_channel *channel,
+                               struct efx_self_tests *tests)
+{
+        unsigned int magic, count;
+
+        /* Channel specific code, limited to 20 bits */
+        magic = (0x00010150 + channel->channel);
+        EFX_LOG(channel->efx, "channel %d testing event queue with code %x\n",
+                channel->channel, magic);
+
+        tests->eventq_dma[channel->channel] = -1;
+        tests->eventq_int[channel->channel] = -1;
+        tests->eventq_poll[channel->channel] = -1;
+
+        /* Reset flag and zero magic word */
+        channel->efx->last_irq_cpu = -1;
+        channel->eventq_magic = 0;
+        smp_wmb();
+
+        falcon_generate_test_event(channel, magic);
+
+        /* Wait for arrival of interrupt */
+        count = 0;
+        do {
+                schedule_timeout_uninterruptible(HZ / 100);
+
+                if (channel->work_pending)
+                        efx_process_channel_now(channel);
+
+                if (channel->eventq_magic == magic)
+                        goto eventq_ok;
+        } while (++count < 2);
+
+        EFX_ERR(channel->efx, "channel %d timed out waiting for event queue\n",
+                channel->channel);
+
+        /* See if interrupt arrived */
+        if (channel->efx->last_irq_cpu >= 0) {
+                EFX_ERR(channel->efx, "channel %d saw interrupt on CPU%d "
+                        "during event queue test\n", channel->channel,
+                        raw_smp_processor_id());
+                tests->eventq_int[channel->channel] = 1;
+        }
+
+        /* Check to see if event was received even if interrupt wasn't */
+        efx_process_channel_now(channel);
+        if (channel->eventq_magic == magic) {
+                EFX_ERR(channel->efx, "channel %d event was generated, but "
+                        "failed to trigger an interrupt\n", channel->channel);
+                tests->eventq_dma[channel->channel] = 1;
+        }
+
+        return -ETIMEDOUT;
+ eventq_ok:
+        EFX_LOG(channel->efx, "channel %d event queue passed\n",
+                channel->channel);
+        tests->eventq_dma[channel->channel] = 1;
+        tests->eventq_int[channel->channel] = 1;
+        tests->eventq_poll[channel->channel] = 1;
+        return 0;
+}
+
+/**************************************************************************
+ *
+ * PHY testing
+ *
+ **************************************************************************/
+
+/* Check PHY presence by reading the PHY ID registers */
+static int efx_test_phy(struct efx_nic *efx,
+                        struct efx_self_tests *tests)
+{
+        u16 physid1, physid2;
+        struct mii_if_info *mii = &efx->mii;
+        struct net_device *net_dev = efx->net_dev;
+
+        if (efx->phy_type == PHY_TYPE_NONE)
+                return 0;
+
+        EFX_LOG(efx, "testing PHY presence\n");
+        tests->phy_ok = -1;
+
+        physid1 = mii->mdio_read(net_dev, mii->phy_id, MII_PHYSID1);
+        physid2 = mii->mdio_read(net_dev, mii->phy_id, MII_PHYSID2);
+
+        if ((physid1 != 0x0000) && (physid1 != 0xffff) &&
+            (physid2 != 0x0000) && (physid2 != 0xffff)) {
+                EFX_LOG(efx, "found MII PHY %d ID 0x%x:%x\n",
+                        mii->phy_id, physid1, physid2);
+                tests->phy_ok = 1;
+                return 0;
+        }
+
+        EFX_ERR(efx, "no MII PHY present with ID %d\n", mii->phy_id);
+        return -ENODEV;
+}
+
+/**************************************************************************
+ *
+ * Loopback testing
+ * NB Only one loopback test can be executing concurrently.
+ *
+ **************************************************************************/
+
+/* Loopback test RX callback
+ * This is called for each received packet during loopback testing.
+ */
+void efx_loopback_rx_packet(struct efx_nic *efx,
+                            const char *buf_ptr, int pkt_len)
+{
+        struct efx_selftest_state *state = efx->loopback_selftest;
+        struct efx_loopback_payload *received;
+        struct efx_loopback_payload *payload;
+
+        BUG_ON(!buf_ptr);
+
+        /* If we are just flushing, then drop the packet */
+        if ((state == NULL) || state->flush)
+                return;
+
+        payload = &state->payload;
+        
+        received = (struct efx_loopback_payload *)(char *) buf_ptr;
+        received->ip.saddr = payload->ip.saddr;
+        received->ip.check = payload->ip.check;
+        
+        /* Check that header exists */
+        if (pkt_len < sizeof(received->header)) {
+                EFX_ERR(efx, "saw runt RX packet (length %d) in %s loopback "
+                        "test\n", pkt_len, LOOPBACK_MODE(efx));
+                goto err;
+        }
+
+        /* Check that the ethernet header exists */
+        if (memcmp(&received->header, &payload->header, ETH_HLEN) != 0) {
+                EFX_ERR(efx, "saw non-loopback RX packet in %s loopback test\n",
+                        LOOPBACK_MODE(efx));
+                goto err;
+        }
+
+        /* Check packet length */
+        if (pkt_len != sizeof(*payload)) {
+                EFX_ERR(efx, "saw incorrect RX packet length %d (wanted %d) in "
+                        "%s loopback test\n", pkt_len, (int)sizeof(*payload),
+                        LOOPBACK_MODE(efx));
+                goto err;
+        }
+
+        /* Check that IP header matches */
+        if (memcmp(&received->ip, &payload->ip, sizeof(payload->ip)) != 0) {
+                EFX_ERR(efx, "saw corrupted IP header in %s loopback test\n",
+                        LOOPBACK_MODE(efx));
+                goto err;
+        }
+
+        /* Check that msg and padding matches */
+        if (memcmp(&received->msg, &payload->msg, sizeof(received->msg)) != 0) {
+                EFX_ERR(efx, "saw corrupted RX packet in %s loopback test\n",
+                        LOOPBACK_MODE(efx));
+                goto err;
+        }
+
+        /* Check that iteration matches */
+        if (received->iteration != payload->iteration) {
+                EFX_ERR(efx, "saw RX packet from iteration %d (wanted %d) in "
+                        "%s loopback test\n", ntohs(received->iteration),
+                        ntohs(payload->iteration), LOOPBACK_MODE(efx));
+                goto err;
+        }
+
+        /* Increase correct RX count */
+        EFX_TRACE(efx, "got loopback RX in %s loopback test\n",
+                  LOOPBACK_MODE(efx));
+
+        atomic_inc(&state->rx_good);
+        return;
+
+ err:
+#ifdef EFX_ENABLE_DEBUG
+        if (atomic_read(&state->rx_bad) == 0) {
+                EFX_ERR(efx, "received packet:\n");
+                print_hex_dump(KERN_ERR, "", DUMP_PREFIX_OFFSET, 0x10, 1,
+                               buf_ptr, pkt_len, 0);
+                EFX_ERR(efx, "expected packet:\n");
+                print_hex_dump(KERN_ERR, "", DUMP_PREFIX_OFFSET, 0x10, 1,
+                               &state->payload, sizeof(state->payload), 0);
+        }
+#endif
+        atomic_inc(&state->rx_bad);
+}
+
+/* Initialise an efx_selftest_state for a new iteration */
+static void efx_iterate_state(struct efx_nic *efx)
+{
+        struct efx_selftest_state *state = efx->loopback_selftest;
+        struct net_device *net_dev = efx->net_dev;
+        struct efx_loopback_payload *payload = &state->payload;
+
+        /* Initialise the layerII header */
+        memcpy(&payload->header.h_dest, net_dev->dev_addr, ETH_ALEN);
+        memcpy(&payload->header.h_source, &payload_source, ETH_ALEN);
+        payload->header.h_proto = htons(ETH_P_IP);
+
+        /* saddr set later and used as incrementing count */
+        payload->ip.daddr = htonl(INADDR_LOOPBACK);
+        payload->ip.ihl = 5;
+        payload->ip.check = htons(0xdead);
+        payload->ip.tot_len = htons(sizeof(*payload) - sizeof(struct ethhdr));
+        payload->ip.version = IPVERSION;
+        payload->ip.protocol = IPPROTO_UDP;
+
+        /* Initialise udp header */
+        payload->udp.source = 0;
+        payload->udp.len = htons(sizeof(*payload) - sizeof(struct ethhdr) -
+                                 sizeof(struct iphdr));
+        payload->udp.check = 0; /* checksum ignored */
+
+        /* Fill out payload */
+        payload->iteration = htons(ntohs(payload->iteration) + 1);
+        memcpy(&payload->msg, payload_msg, sizeof(payload_msg));
+
+        /* Fill out remaining state members */
+        atomic_set(&state->rx_good, 0);
+        atomic_set(&state->rx_bad, 0);
+        smp_wmb();
+}
+
+static int efx_tx_loopback(struct efx_tx_queue *tx_queue)
+{
+        struct efx_nic *efx = tx_queue->efx;
+        struct efx_selftest_state *state = efx->loopback_selftest;
+        struct efx_loopback_payload *payload;
+        struct sk_buff *skb;
+        int i, rc;
+
+        /* Transmit N copies of buffer */
+        for (i = 0; i < state->packet_count; i++) {
+                /* Allocate an skb, holding an extra reference for 
+                 * transmit completion counting */
+                skb = alloc_skb(sizeof(state->payload), GFP_KERNEL);
+                if (!skb)
+                        return -ENOMEM;
+                state->skbs[i] = skb;
+                skb_get(skb);
+
+                /* Copy the payload in, incrementing the source address to
+                 * exercise the rss vectors */
+                payload = ((struct efx_loopback_payload *)
+                           skb_put(skb, sizeof(state->payload)));
+                memcpy(payload, &state->payload, sizeof(state->payload));
+                payload->ip.saddr = htonl(INADDR_LOOPBACK | (i << 2));
+
+                /* Ensure everything we've written is visible to the
+                 * interrupt handler. */
+                smp_wmb();
+
+                if (NET_DEV_REGISTERED(efx))
+                        netif_tx_lock_bh(efx->net_dev);
+                rc = efx_xmit(efx, tx_queue, skb);
+                if (NET_DEV_REGISTERED(efx))
+                        netif_tx_unlock_bh(efx->net_dev);
+
+                if (rc != NETDEV_TX_OK) {
+                        EFX_ERR(efx, "TX queue %d could not transmit packet %d "
+                                "of %d in %s loopback test\n", tx_queue->queue,
+                                i + 1, state->packet_count, LOOPBACK_MODE(efx));
+
+                        /* Defer cleaning up the other skbs for the caller */
+                        kfree_skb(skb);
+                        return -EPIPE;
+                }
+        }
+
+        return 0;
+}
+
+static int efx_rx_loopback(struct efx_tx_queue *tx_queue,
+                           struct efx_loopback_self_tests *lb_tests)
+{
+        struct efx_nic *efx = tx_queue->efx;
+        struct efx_selftest_state *state = efx->loopback_selftest;
+        struct sk_buff *skb;
+        int tx_done = 0, rx_good, rx_bad;
+        int i, rc = 0;
+
+        if (NET_DEV_REGISTERED(efx))
+                netif_tx_lock_bh(efx->net_dev);
+
+        /* Count the number of tx completions, and decrement the refcnt. Any
+         * skbs not already completed will be free'd when the queue is flushed */
+        for (i=0; i < state->packet_count; i++) {
+                skb = state->skbs[i];
+                if (skb && !skb_shared(skb))
+                        ++tx_done;
+                dev_kfree_skb_any(skb);
+        }
+
+        if (NET_DEV_REGISTERED(efx))
+                netif_tx_unlock_bh(efx->net_dev);
+
+        /* Check TX completion and received packet counts */
+        rx_good = atomic_read(&state->rx_good);
+        rx_bad = atomic_read(&state->rx_bad);
+        if (tx_done != state->packet_count) {
+                /* Don't free the skbs; they will be picked up on TX
+                 * overflow or channel teardown.
+                 */
+                EFX_ERR(efx, "TX queue %d saw only %d out of an expected %d "
+                        "TX completion events in %s loopback test\n",
+                        tx_queue->queue, tx_done, state->packet_count,
+                        LOOPBACK_MODE(efx));
+                rc = -ETIMEDOUT;
+                /* Allow to fall through so we see the RX errors as well */
+        }
+
+        /* We may always be up to a flush away from our desired packet total */
+        if (rx_good != state->packet_count) {
+                EFX_LOG(efx, "TX queue %d saw only %d out of an expected %d "
+                        "received packets in %s loopback test\n",
+                        tx_queue->queue, rx_good, state->packet_count,
+                        LOOPBACK_MODE(efx));
+                rc = -ETIMEDOUT;
+                /* Fall through */
+        }
+
+        /* Update loopback test structure */
+        lb_tests->tx_sent[tx_queue->queue] += state->packet_count;
+        lb_tests->tx_done[tx_queue->queue] += tx_done;
+        lb_tests->rx_good += rx_good;
+        lb_tests->rx_bad += rx_bad;
+
+        return rc;
+}
+
+static int
+efx_test_loopback(struct efx_tx_queue *tx_queue,
+                  struct efx_loopback_self_tests *lb_tests)
+{
+        struct efx_nic *efx = tx_queue->efx;
+        struct efx_selftest_state *state = efx->loopback_selftest;
+        struct efx_channel *channel;
+        int i, rc = 0;
+
+        for (i = 0; i < loopback_test_level; i++) {
+                /* Determine how many packets to send */
+                state->packet_count = (efx->type->txd_ring_mask + 1) / 3;
+                state->packet_count = min(1 << (i << 2), state->packet_count);
+                state->skbs = kzalloc(sizeof(state->skbs[0]) *
+                                      state->packet_count, GFP_KERNEL);
+                state->flush = 0;
+
+                EFX_LOG(efx, "TX queue %d testing %s loopback with %d "
+                        "packets\n", tx_queue->queue, LOOPBACK_MODE(efx),
+                        state->packet_count);
+
+                efx_iterate_state(efx);
+                rc = efx_tx_loopback(tx_queue);
+                
+                /* NAPI polling is not enabled, so process channels synchronously */
+                schedule_timeout_uninterruptible(HZ / 50);
+                efx_for_each_channel_with_interrupt(channel, efx) {
+                        if (channel->work_pending)
+                                efx_process_channel_now(channel);
+                }
+
+                rc |= efx_rx_loopback(tx_queue, lb_tests);
+                kfree(state->skbs);
+
+                if (rc) {
+                        /* Wait a while to ensure there are no packets
+                         * floating around after a failure. */
+                        schedule_timeout_uninterruptible(HZ / 10);
+                        return rc;
+                }
+        }
+
+        EFX_LOG(efx, "TX queue %d passed %s loopback test with a burst length "
+                "of %d packets\n", tx_queue->queue, LOOPBACK_MODE(efx),
+                state->packet_count);
+
+        return rc;
+}
+
+static int efx_test_loopbacks(struct efx_nic *efx,
+                              struct efx_self_tests *tests,
+                              unsigned int loopback_modes)
+{
+        struct efx_selftest_state *state = efx->loopback_selftest;
+        struct ethtool_cmd ecmd, ecmd_loopback;
+        struct efx_tx_queue *tx_queue;
+        enum efx_loopback_mode old_mode, mode;
+        int count, rc = 0, link_up;
+        
+        rc = efx_ethtool_get_settings(efx->net_dev, &ecmd);
+        if (rc) {
+                EFX_ERR(efx, "could not get GMII settings\n");
+                return rc;
+        }
+        old_mode = efx->loopback_mode;
+
+        /* Disable autonegotiation for the purposes of loopback */
+        memcpy(&ecmd_loopback, &ecmd, sizeof(ecmd_loopback));
+        if (ecmd_loopback.autoneg == AUTONEG_ENABLE) {
+                ecmd_loopback.autoneg = AUTONEG_DISABLE;
+                ecmd_loopback.duplex = DUPLEX_FULL;
+                ecmd_loopback.speed = SPEED_10000;
+        }
+
+        rc = efx_ethtool_set_settings(efx->net_dev, &ecmd_loopback);
+        if (rc) {
+                EFX_ERR(efx, "could not disable autonegotiation\n");
+                goto out;
+        }
+        tests->loopback_speed = ecmd_loopback.speed;
+        tests->loopback_full_duplex = ecmd_loopback.duplex;
+
+        /* Test all supported loopback modes */
+        for (mode = LOOPBACK_NONE; mode < LOOPBACK_TEST_MAX; mode++) {
+                if (!(loopback_modes & (1 << mode)))
+                        continue;
+
+                /* Move the port into the specified loopback mode. */
+                state->flush = 1;
+                efx->loopback_mode = mode;
+                efx_reconfigure_port(efx);
+
+                /* Wait for the PHY to signal the link is up */
+                count = 0;
+                do {
+                        struct efx_channel *channel = &efx->channel[0];
+
+                        falcon_check_xmac(efx);
+                        schedule_timeout_uninterruptible(HZ / 10);
+                        if (channel->work_pending)
+                                efx_process_channel_now(channel);
+                        /* Wait for PHY events to be processed */
+                        flush_workqueue(efx->workqueue);
+                        rmb();
+
+                        /* efx->link_up can be 1 even if the XAUI link is down,
+                         * (bug5762). Usually, it's not worth bothering with the
+                         * difference, but for selftests, we need that extra
+                         * guarantee that the link is really, really, up.
+                         */
+                        link_up = efx->link_up;
+                        if (!falcon_xaui_link_ok(efx))
+                                link_up = 0;
+
+                } while ((++count < 20) && !link_up);
+
+                /* The link should now be up. If it isn't, there is no point
+                 * in attempting a loopback test */
+                if (!link_up) {
+                        EFX_ERR(efx, "loopback %s never came up\n",
+                                LOOPBACK_MODE(efx));
+                        rc = -EIO;
+                        goto out;
+                }
+
+                EFX_LOG(efx, "link came up in %s loopback in %d iterations\n",
+                        LOOPBACK_MODE(efx), count);
+
+                /* Test every TX queue */
+                efx_for_each_tx_queue(tx_queue, efx) {
+                        rc |= efx_test_loopback(tx_queue,
+                                                &tests->loopback[mode]);
+                        if (rc)
+                                goto out;
+                }
+        }
+
+ out:
+        /* Take out of loopback and restore PHY settings */
+        state->flush = 1;
+        efx->loopback_mode = old_mode;
+        efx_ethtool_set_settings(efx->net_dev, &ecmd);
+
+        return rc;
+}
+
+/**************************************************************************
+ *
+ * Entry points
+ *
+ *************************************************************************/
+
+/* Online (i.e. non-disruptive) testing
+ * This checks interrupt generation, event delivery and PHY presence. */
+int efx_online_test(struct efx_nic *efx, struct efx_self_tests *tests)
+{
+        struct efx_channel *channel;
+        int rc = 0;
+
+        EFX_LOG(efx, "performing online self-tests\n");
+
+        rc |= efx_test_interrupts(efx, tests);
+        efx_for_each_channel(channel, efx) {
+                if (channel->has_interrupt)
+                        rc |= efx_test_eventq_irq(channel, tests);
+                else
+                        rc |= efx_test_eventq(channel, tests);
+        }
+        rc |= efx_test_phy(efx, tests);
+
+        if (rc)
+                EFX_ERR(efx, "failed online self-tests\n");
+
+        return rc;
+}
+
+/* Offline (i.e. disruptive) testing
+ * This checks MAC and PHY loopback on the specified port. */
+int efx_offline_test(struct efx_nic *efx,
+                     struct efx_self_tests *tests, unsigned int loopback_modes)
+{
+        struct efx_selftest_state *state;
+        int rc = 0;
+
+        EFX_LOG(efx, "performing offline self-tests\n");
+
+        /* Create a selftest_state structure to hold state for the test */
+        state = kzalloc(sizeof(*state), GFP_KERNEL);
+        if (state == NULL) {
+                rc = -ENOMEM;
+                goto out;
+        }
+
+        /* Set the port loopback_selftest member. From this point on
+         * all received packets will be dropped. Mark the state as
+         * "flushing" so all inflight packets are dropped */
+        BUG_ON(efx->loopback_selftest);
+        state->flush = 1;
+        efx->loopback_selftest = (void *)state;
+
+        rc = efx_test_loopbacks(efx, tests, loopback_modes);
+
+        efx->loopback_selftest = NULL;
+        wmb();
+        kfree(state);
+
+ out:
+        if (rc)
+                EFX_ERR(efx, "failed offline self-tests\n");
+
+        return rc;
+}
+
diff --git a/drivers/net/sfc/selftest.h b/drivers/net/sfc/selftest.h
new file mode 100644
index 000000000000..f6999c2b622d
--- /dev/null
+++ b/drivers/net/sfc/selftest.h
@@ -0,0 +1,50 @@
+/****************************************************************************
+ * Driver for Solarflare Solarstorm network controllers and boards
+ * Copyright 2005-2006 Fen Systems Ltd.
+ * Copyright 2006-2008 Solarflare Communications Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation, incorporated herein by reference.
+ */
+
+#ifndef EFX_SELFTEST_H
+#define EFX_SELFTEST_H
+
+#include "net_driver.h"
+
+/*
+ * Self tests
+ */
+
+struct efx_loopback_self_tests {
+        int tx_sent[EFX_MAX_TX_QUEUES];
+        int tx_done[EFX_MAX_TX_QUEUES];
+        int rx_good;
+        int rx_bad;
+};
+
+/* Efx self test results
+ * For fields which are not counters, 1 indicates success and -1
+ * indicates failure.
+ */
+struct efx_self_tests {
+        int interrupt;
+        int eventq_dma[EFX_MAX_CHANNELS];
+        int eventq_int[EFX_MAX_CHANNELS];
+        int eventq_poll[EFX_MAX_CHANNELS];
+        int phy_ok;
+        int loopback_speed;
+        int loopback_full_duplex;
+        struct efx_loopback_self_tests loopback[LOOPBACK_TEST_MAX];
+};
+
+extern void efx_loopback_rx_packet(struct efx_nic *efx,
+                                   const char *buf_ptr, int pkt_len);
+extern int efx_online_test(struct efx_nic *efx,
+                           struct efx_self_tests *tests);
+extern int efx_offline_test(struct efx_nic *efx,
+                            struct efx_self_tests *tests,
+                            unsigned int loopback_modes);
+
+#endif /* EFX_SELFTEST_H */
diff --git a/drivers/net/sfc/sfe4001.c b/drivers/net/sfc/sfe4001.c
index 11fa9fb8f48b..725d1a539c49 100644
--- a/drivers/net/sfc/sfe4001.c
+++ b/drivers/net/sfc/sfe4001.c
@@ -130,6 +130,15 @@ void sfe4001_poweroff(struct efx_nic *efx)
         (void) efx_i2c_read(i2c, MAX6647, RSL, &in, 1);
 }
 
+/* The P0_EN_3V3X line on SFE4001 boards (from A2 onward) is connected
+ * to the FLASH_CFG_1 input on the DSP.  We must keep it high at power-
+ * up to allow writing the flash (done through MDIO from userland).
+ */
+unsigned int sfe4001_phy_flash_cfg;
+module_param_named(phy_flash_cfg, sfe4001_phy_flash_cfg, uint, 0444);
+MODULE_PARM_DESC(phy_flash_cfg,
+                 "Force PHY to enter flash configuration mode");
+
 /* This board uses an I2C expander to provider power to the PHY, which needs to
  * be turned on before the PHY can be used.
  * Context: Process context, rtnl lock held
@@ -203,6 +212,8 @@ int sfe4001_poweron(struct efx_nic *efx)
                 out = 0xff & ~((1 << P0_EN_1V2_LBN) | (1 << P0_EN_2V5_LBN) |
                                (1 << P0_EN_3V3X_LBN) | (1 << P0_EN_5V_LBN) |
                                (1 << P0_X_TRST_LBN));
+                if (sfe4001_phy_flash_cfg)
+                        out |= 1 << P0_EN_3V3X_LBN;
 
                 rc = efx_i2c_write(i2c, PCA9539, P0_OUT, &out, 1);
                 if (rc)
@@ -226,6 +237,9 @@ int sfe4001_poweron(struct efx_nic *efx)
                 if (in & (1 << P1_AFE_PWD_LBN))
                         goto done;
 
+                /* DSP doesn't look powered in flash config mode */
+                if (sfe4001_phy_flash_cfg)
+                        goto done;
         } while (++count < 20);
 
         EFX_INFO(efx, "timed out waiting for power\n");
diff --git a/drivers/net/sfc/tenxpress.c b/drivers/net/sfc/tenxpress.c
index a2e9f79e47b1..b1cd6deec01f 100644
--- a/drivers/net/sfc/tenxpress.c
+++ b/drivers/net/sfc/tenxpress.c
@@ -24,6 +24,11 @@
                                  MDIO_MMDREG_DEVS0_PCS    | \
                                  MDIO_MMDREG_DEVS0_PHYXS)
 
+#define TENXPRESS_LOOPBACKS ((1 << LOOPBACK_PHYXS) |    \
+                             (1 << LOOPBACK_PCS) |      \
+                             (1 << LOOPBACK_PMAPMD) |   \
+                             (1 << LOOPBACK_NETWORK))
+
 /* We complain if we fail to see the link partner as 10G capable this many
  * times in a row (must be > 1 as sampling the autoneg. registers is racy)
  */
@@ -72,6 +77,10 @@
 #define PMA_PMD_BIST_RXD_LBN    (1)
 #define PMA_PMD_BIST_AFE_LBN    (0)
 
+/* Special Software reset register */
+#define PMA_PMD_EXT_CTRL_REG 49152
+#define PMA_PMD_EXT_SSR_LBN 15
+
 #define BIST_MAX_DELAY  (1000)
 #define BIST_POLL_DELAY (10)
 
@@ -86,6 +95,11 @@
 #define PCS_TEST_SELECT_REG 0xd807      /* PRM 10.5.8 */
 #define CLK312_EN_LBN 3
 
+/* PHYXS registers */
+#define PHYXS_TEST1         (49162)
+#define LOOPBACK_NEAR_LBN   (8)
+#define LOOPBACK_NEAR_WIDTH (1)
+
 /* Boot status register */
 #define PCS_BOOT_STATUS_REG     (0xd000)
 #define PCS_BOOT_FATAL_ERR_LBN  (0)
@@ -106,7 +120,9 @@ MODULE_PARM_DESC(crc_error_reset_threshold,
 
 struct tenxpress_phy_data {
         enum tenxpress_state state;
+        enum efx_loopback_mode loopback_mode;
         atomic_t bad_crc_count;
+        int tx_disabled;
         int bad_lp_tries;
 };
 
@@ -199,10 +215,12 @@ static int tenxpress_phy_init(struct efx_nic *efx)
 
         tenxpress_set_state(efx, TENXPRESS_STATUS_NORMAL);
 
-        rc = mdio_clause45_wait_reset_mmds(efx,
-                                           TENXPRESS_REQUIRED_DEVS);
-        if (rc < 0)
-                goto fail;
+        if (!sfe4001_phy_flash_cfg) {
+                rc = mdio_clause45_wait_reset_mmds(efx,
+                                                   TENXPRESS_REQUIRED_DEVS);
+                if (rc < 0)
+                        goto fail;
+        }
 
         rc = mdio_clause45_check_mmds(efx, TENXPRESS_REQUIRED_DEVS, 0);
         if (rc < 0)
@@ -225,6 +243,35 @@ static int tenxpress_phy_init(struct efx_nic *efx)
         return rc;
 }
 
+static int tenxpress_special_reset(struct efx_nic *efx)
+{
+        int rc, reg;
+
+        EFX_TRACE(efx, "%s\n", __func__);
+
+        /* Initiate reset */
+        reg = mdio_clause45_read(efx, efx->mii.phy_id,
+                                 MDIO_MMD_PMAPMD, PMA_PMD_EXT_CTRL_REG);
+        reg |= (1 << PMA_PMD_EXT_SSR_LBN);
+        mdio_clause45_write(efx, efx->mii.phy_id, MDIO_MMD_PMAPMD,
+                            PMA_PMD_EXT_CTRL_REG, reg);
+
+        msleep(200);
+
+        /* Wait for the blocks to come out of reset */
+        rc = mdio_clause45_wait_reset_mmds(efx,
+                                           TENXPRESS_REQUIRED_DEVS);
+        if (rc < 0)
+                return rc;
+
+        /* Try and reconfigure the device */
+        rc = tenxpress_init(efx);
+        if (rc < 0)
+                return rc;
+
+        return 0;
+}
+
 static void tenxpress_set_bad_lp(struct efx_nic *efx, int bad_lp)
 {
         struct tenxpress_phy_data *pd = efx->phy_data;
@@ -299,11 +346,46 @@ static int tenxpress_link_ok(struct efx_nic *efx, int check_lp)
         return ok;
 }
 
+static void tenxpress_phyxs_loopback(struct efx_nic *efx)
+{
+        int phy_id = efx->mii.phy_id;
+        int ctrl1, ctrl2;
+
+        ctrl1 = ctrl2 = mdio_clause45_read(efx, phy_id, MDIO_MMD_PHYXS,
+                                           PHYXS_TEST1);
+        if (efx->loopback_mode == LOOPBACK_PHYXS)
+                ctrl2 |= (1 << LOOPBACK_NEAR_LBN);
+        else
+                ctrl2 &= ~(1 << LOOPBACK_NEAR_LBN);
+        if (ctrl1 != ctrl2)
+                mdio_clause45_write(efx, phy_id, MDIO_MMD_PHYXS,
+                                    PHYXS_TEST1, ctrl2);
+}
+
 static void tenxpress_phy_reconfigure(struct efx_nic *efx)
 {
+        struct tenxpress_phy_data *phy_data = efx->phy_data;
+        int loop_change = LOOPBACK_OUT_OF(phy_data, efx,
+                                          TENXPRESS_LOOPBACKS);
+
         if (!tenxpress_state_is(efx, TENXPRESS_STATUS_NORMAL))
                 return;
 
+        /* When coming out of transmit disable, coming out of low power
+         * mode, or moving out of any PHY internal loopback mode,
+         * perform a special software reset */
+        if ((phy_data->tx_disabled && !efx->tx_disabled) ||
+            loop_change) {
+                (void) tenxpress_special_reset(efx);
+                falcon_reset_xaui(efx);
+        }
+
+        mdio_clause45_transmit_disable(efx);
+        mdio_clause45_phy_reconfigure(efx);
+        tenxpress_phyxs_loopback(efx);
+
+        phy_data->tx_disabled = efx->tx_disabled;
+        phy_data->loopback_mode = efx->loopback_mode;
         efx->link_up = tenxpress_link_ok(efx, 0);
         efx->link_options = GM_LPA_10000FULL;
 }
@@ -431,4 +513,5 @@ struct efx_phy_operations falcon_tenxpress_phy_ops = {
         .clear_interrupt  = tenxpress_phy_clear_interrupt,
         .reset_xaui       = tenxpress_reset_xaui,
         .mmds             = TENXPRESS_REQUIRED_DEVS,
+        .loopbacks        = TENXPRESS_LOOPBACKS,
 };
diff --git a/drivers/net/sfc/tx.c b/drivers/net/sfc/tx.c
index fbb866b2185e..9b436f5b4888 100644
--- a/drivers/net/sfc/tx.c
+++ b/drivers/net/sfc/tx.c
@@ -82,6 +82,46 @@ static inline void efx_dequeue_buffer(struct efx_tx_queue *tx_queue,
         }
 }
 
+/**
+ * struct efx_tso_header - a DMA mapped buffer for packet headers
+ * @next: Linked list of free ones.
+ *      The list is protected by the TX queue lock.
+ * @dma_unmap_len: Length to unmap for an oversize buffer, or 0.
+ * @dma_addr: The DMA address of the header below.
+ *
+ * This controls the memory used for a TSO header.  Use TSOH_DATA()
+ * to find the packet header data.  Use TSOH_SIZE() to calculate the
+ * total size required for a given packet header length.  TSO headers
+ * in the free list are exactly %TSOH_STD_SIZE bytes in size.
+ */
+struct efx_tso_header {
+        union {
+                struct efx_tso_header *next;
+                size_t unmap_len;
+        };
+        dma_addr_t dma_addr;
+};
+
+static int efx_enqueue_skb_tso(struct efx_tx_queue *tx_queue,
+                               const struct sk_buff *skb);
+static void efx_fini_tso(struct efx_tx_queue *tx_queue);
+static void efx_tsoh_heap_free(struct efx_tx_queue *tx_queue,
+                               struct efx_tso_header *tsoh);
+
+static inline void efx_tsoh_free(struct efx_tx_queue *tx_queue,
+                                 struct efx_tx_buffer *buffer)
+{
+        if (buffer->tsoh) {
+                if (likely(!buffer->tsoh->unmap_len)) {
+                        buffer->tsoh->next = tx_queue->tso_headers_free;
+                        tx_queue->tso_headers_free = buffer->tsoh;
+                } else {
+                        efx_tsoh_heap_free(tx_queue, buffer->tsoh);
+                }
+                buffer->tsoh = NULL;
+        }
+}
+
 
 /*
  * Add a socket buffer to a TX queue
@@ -114,6 +154,9 @@ static inline int efx_enqueue_skb(struct efx_tx_queue *tx_queue,
 
         EFX_BUG_ON_PARANOID(tx_queue->write_count != tx_queue->insert_count);
 
+        if (skb_shinfo((struct sk_buff *)skb)->gso_size)
+                return efx_enqueue_skb_tso(tx_queue, skb);
+
         /* Get size of the initial fragment */
         len = skb_headlen(skb);
 
@@ -166,6 +209,8 @@ static inline int efx_enqueue_skb(struct efx_tx_queue *tx_queue,
                         insert_ptr = (tx_queue->insert_count &
                                       efx->type->txd_ring_mask);
                         buffer = &tx_queue->buffer[insert_ptr];
+                        efx_tsoh_free(tx_queue, buffer);
+                        EFX_BUG_ON_PARANOID(buffer->tsoh);
                         EFX_BUG_ON_PARANOID(buffer->skb);
                         EFX_BUG_ON_PARANOID(buffer->len);
                         EFX_BUG_ON_PARANOID(buffer->continuation != 1);
@@ -432,6 +477,9 @@ void efx_fini_tx_queue(struct efx_tx_queue *tx_queue)
 
         efx_release_tx_buffers(tx_queue);
 
+        /* Free up TSO header cache */
+        efx_fini_tso(tx_queue);
+
         /* Release queue's stop on port, if any */
         if (tx_queue->stopped) {
                 tx_queue->stopped = 0;
@@ -450,3 +498,619 @@ void efx_remove_tx_queue(struct efx_tx_queue *tx_queue)
 }
 
 
+/* Efx TCP segmentation acceleration.
+ *
+ * Why?  Because by doing it here in the driver we can go significantly
+ * faster than the GSO.
+ *
+ * Requires TX checksum offload support.
+ */
+
+/* Number of bytes inserted at the start of a TSO header buffer,
+ * similar to NET_IP_ALIGN.
+ */
+#if defined(__i386__) || defined(__x86_64__)
+#define TSOH_OFFSET     0
+#else
+#define TSOH_OFFSET     NET_IP_ALIGN
+#endif
+
+#define TSOH_BUFFER(tsoh)       ((u8 *)(tsoh + 1) + TSOH_OFFSET)
+
+/* Total size of struct efx_tso_header, buffer and padding */
+#define TSOH_SIZE(hdr_len)                                      \
+        (sizeof(struct efx_tso_header) + TSOH_OFFSET + hdr_len)
+
+/* Size of blocks on free list.  Larger blocks must be allocated from
+ * the heap.
+ */
+#define TSOH_STD_SIZE           128
+
+#define PTR_DIFF(p1, p2)  ((u8 *)(p1) - (u8 *)(p2))
+#define ETH_HDR_LEN(skb)  (skb_network_header(skb) - (skb)->data)
+#define SKB_TCP_OFF(skb)  PTR_DIFF(tcp_hdr(skb), (skb)->data)
+#define SKB_IPV4_OFF(skb) PTR_DIFF(ip_hdr(skb), (skb)->data)
+
+/**
+ * struct tso_state - TSO state for an SKB
+ * @remaining_len: Bytes of data we've yet to segment
+ * @seqnum: Current sequence number
+ * @packet_space: Remaining space in current packet
+ * @ifc: Input fragment cursor.
+ *      Where we are in the current fragment of the incoming SKB.  These
+ *      values get updated in place when we split a fragment over
+ *      multiple packets.
+ * @p: Parameters.
+ *      These values are set once at the start of the TSO send and do
+ *      not get changed as the routine progresses.
+ *
+ * The state used during segmentation.  It is put into this data structure
+ * just to make it easy to pass into inline functions.
+ */
+struct tso_state {
+        unsigned remaining_len;
+        unsigned seqnum;
+        unsigned packet_space;
+
+        struct {
+                /* DMA address of current position */
+                dma_addr_t dma_addr;
+                /* Remaining length */
+                unsigned int len;
+                /* DMA address and length of the whole fragment */
+                unsigned int unmap_len;
+                dma_addr_t unmap_addr;
+                struct page *page;
+                unsigned page_off;
+        } ifc;
+
+        struct {
+                /* The number of bytes of header */
+                unsigned int header_length;
+
+                /* The number of bytes to put in each outgoing segment. */
+                int full_packet_size;
+
+                /* Current IPv4 ID, host endian. */
+                unsigned ipv4_id;
+        } p;
+};
+
+
+/*
+ * Verify that our various assumptions about sk_buffs and the conditions
+ * under which TSO will be attempted hold true.
+ */
+static inline void efx_tso_check_safe(const struct sk_buff *skb)
+{
+        EFX_BUG_ON_PARANOID(skb->protocol != htons(ETH_P_IP));
+        EFX_BUG_ON_PARANOID(((struct ethhdr *)skb->data)->h_proto !=
+                            skb->protocol);
+        EFX_BUG_ON_PARANOID(ip_hdr(skb)->protocol != IPPROTO_TCP);
+        EFX_BUG_ON_PARANOID((PTR_DIFF(tcp_hdr(skb), skb->data)
+                             + (tcp_hdr(skb)->doff << 2u)) >
+                            skb_headlen(skb));
+}
+
+
+/*
+ * Allocate a page worth of efx_tso_header structures, and string them
+ * into the tx_queue->tso_headers_free linked list. Return 0 or -ENOMEM.
+ */
+static int efx_tsoh_block_alloc(struct efx_tx_queue *tx_queue)
+{
+
+        struct pci_dev *pci_dev = tx_queue->efx->pci_dev;
+        struct efx_tso_header *tsoh;
+        dma_addr_t dma_addr;
+        u8 *base_kva, *kva;
+
+        base_kva = pci_alloc_consistent(pci_dev, PAGE_SIZE, &dma_addr);
+        if (base_kva == NULL) {
+                EFX_ERR(tx_queue->efx, "Unable to allocate page for TSO"
+                        " headers\n");
+                return -ENOMEM;
+        }
+
+        /* pci_alloc_consistent() allocates pages. */
+        EFX_BUG_ON_PARANOID(dma_addr & (PAGE_SIZE - 1u));
+
+        for (kva = base_kva; kva < base_kva + PAGE_SIZE; kva += TSOH_STD_SIZE) {
+                tsoh = (struct efx_tso_header *)kva;
+                tsoh->dma_addr = dma_addr + (TSOH_BUFFER(tsoh) - base_kva);
+                tsoh->next = tx_queue->tso_headers_free;
+                tx_queue->tso_headers_free = tsoh;
+        }
+
+        return 0;
+}
+
+
+/* Free up a TSO header, and all others in the same page. */
+static void efx_tsoh_block_free(struct efx_tx_queue *tx_queue,
+                                struct efx_tso_header *tsoh,
+                                struct pci_dev *pci_dev)
+{
+        struct efx_tso_header **p;
+        unsigned long base_kva;
+        dma_addr_t base_dma;
+
+        base_kva = (unsigned long)tsoh & PAGE_MASK;
+        base_dma = tsoh->dma_addr & PAGE_MASK;
+
+        p = &tx_queue->tso_headers_free;
+        while (*p != NULL)
+                if (((unsigned long)*p & PAGE_MASK) == base_kva)
+                        *p = (*p)->next;
+                else
+                        p = &(*p)->next;
+
+        pci_free_consistent(pci_dev, PAGE_SIZE, (void *)base_kva, base_dma);
+}
+
+static struct efx_tso_header *
+efx_tsoh_heap_alloc(struct efx_tx_queue *tx_queue, size_t header_len)
+{
+        struct efx_tso_header *tsoh;
+
+        tsoh = kmalloc(TSOH_SIZE(header_len), GFP_ATOMIC | GFP_DMA);
+        if (unlikely(!tsoh))
+                return NULL;
+
+        tsoh->dma_addr = pci_map_single(tx_queue->efx->pci_dev,
+                                        TSOH_BUFFER(tsoh), header_len,
+                                        PCI_DMA_TODEVICE);
+        if (unlikely(pci_dma_mapping_error(tsoh->dma_addr))) {
+                kfree(tsoh);
+                return NULL;
+        }
+
+        tsoh->unmap_len = header_len;
+        return tsoh;
+}
+
+static void
+efx_tsoh_heap_free(struct efx_tx_queue *tx_queue, struct efx_tso_header *tsoh)
+{
+        pci_unmap_single(tx_queue->efx->pci_dev,
+                         tsoh->dma_addr, tsoh->unmap_len,
+                         PCI_DMA_TODEVICE);
+        kfree(tsoh);
+}
+
+/**
+ * efx_tx_queue_insert - push descriptors onto the TX queue
+ * @tx_queue:           Efx TX queue
+ * @dma_addr:           DMA address of fragment
+ * @len:                Length of fragment
+ * @skb:                Only non-null for end of last segment
+ * @end_of_packet:      True if last fragment in a packet
+ * @unmap_addr:         DMA address of fragment for unmapping
+ * @unmap_len:          Only set this in last segment of a fragment
+ *
+ * Push descriptors onto the TX queue.  Return 0 on success or 1 if
+ * @tx_queue full.
+ */
+static int efx_tx_queue_insert(struct efx_tx_queue *tx_queue,
+                               dma_addr_t dma_addr, unsigned len,
+                               const struct sk_buff *skb, int end_of_packet,
+                               dma_addr_t unmap_addr, unsigned unmap_len)
+{
+        struct efx_tx_buffer *buffer;
+        struct efx_nic *efx = tx_queue->efx;
+        unsigned dma_len, fill_level, insert_ptr, misalign;
+        int q_space;
+
+        EFX_BUG_ON_PARANOID(len <= 0);
+
+        fill_level = tx_queue->insert_count - tx_queue->old_read_count;
+        /* -1 as there is no way to represent all descriptors used */
+        q_space = efx->type->txd_ring_mask - 1 - fill_level;
+
+        while (1) {
+                if (unlikely(q_space-- <= 0)) {
+                        /* It might be that completions have happened
+                         * since the xmit path last checked.  Update
+                         * the xmit path's copy of read_count.
+                         */
+                        ++tx_queue->stopped;
+                        /* This memory barrier protects the change of
+                         * stopped from the access of read_count. */
+                        smp_mb();
+                        tx_queue->old_read_count =
+                                *(volatile unsigned *)&tx_queue->read_count;
+                        fill_level = (tx_queue->insert_count
+                                      - tx_queue->old_read_count);
+                        q_space = efx->type->txd_ring_mask - 1 - fill_level;
+                        if (unlikely(q_space-- <= 0))
+                                return 1;
+                        smp_mb();
+                        --tx_queue->stopped;
+                }
+
+                insert_ptr = tx_queue->insert_count & efx->type->txd_ring_mask;
+                buffer = &tx_queue->buffer[insert_ptr];
+                ++tx_queue->insert_count;
+
+                EFX_BUG_ON_PARANOID(tx_queue->insert_count -
+                                    tx_queue->read_count >
+                                    efx->type->txd_ring_mask);
+
+                efx_tsoh_free(tx_queue, buffer);
+                EFX_BUG_ON_PARANOID(buffer->len);
+                EFX_BUG_ON_PARANOID(buffer->unmap_len);
+                EFX_BUG_ON_PARANOID(buffer->skb);
+                EFX_BUG_ON_PARANOID(buffer->continuation != 1);
+                EFX_BUG_ON_PARANOID(buffer->tsoh);
+
+                buffer->dma_addr = dma_addr;
+
+                /* Ensure we do not cross a boundary unsupported by H/W */
+                dma_len = (~dma_addr & efx->type->tx_dma_mask) + 1;
+
+                misalign = (unsigned)dma_addr & efx->type->bug5391_mask;
+                if (misalign && dma_len + misalign > 512)
+                        dma_len = 512 - misalign;
+
+                /* If there is enough space to send then do so */
+                if (dma_len >= len)
+                        break;
+
+                buffer->len = dma_len; /* Don't set the other members */
+                dma_addr += dma_len;
+                len -= dma_len;
+        }
+
+        EFX_BUG_ON_PARANOID(!len);
+        buffer->len = len;
+        buffer->skb = skb;
+        buffer->continuation = !end_of_packet;
+        buffer->unmap_addr = unmap_addr;
+        buffer->unmap_len = unmap_len;
+        return 0;
+}
+
+
+/*
+ * Put a TSO header into the TX queue.
+ *
+ * This is special-cased because we know that it is small enough to fit in
+ * a single fragment, and we know it doesn't cross a page boundary.  It
+ * also allows us to not worry about end-of-packet etc.
+ */
+static inline void efx_tso_put_header(struct efx_tx_queue *tx_queue,
+                                      struct efx_tso_header *tsoh, unsigned len)
+{
+        struct efx_tx_buffer *buffer;
+
+        buffer = &tx_queue->buffer[tx_queue->insert_count &
+                                   tx_queue->efx->type->txd_ring_mask];
+        efx_tsoh_free(tx_queue, buffer);
+        EFX_BUG_ON_PARANOID(buffer->len);
+        EFX_BUG_ON_PARANOID(buffer->unmap_len);
+        EFX_BUG_ON_PARANOID(buffer->skb);
+        EFX_BUG_ON_PARANOID(buffer->continuation != 1);
+        EFX_BUG_ON_PARANOID(buffer->tsoh);
+        buffer->len = len;
+        buffer->dma_addr = tsoh->dma_addr;
+        buffer->tsoh = tsoh;
+
+        ++tx_queue->insert_count;
+}
+
+
+/* Remove descriptors put into a tx_queue. */
+static void efx_enqueue_unwind(struct efx_tx_queue *tx_queue)
+{
+        struct efx_tx_buffer *buffer;
+
+        /* Work backwards until we hit the original insert pointer value */
+        while (tx_queue->insert_count != tx_queue->write_count) {
+                --tx_queue->insert_count;
+                buffer = &tx_queue->buffer[tx_queue->insert_count &
+                                           tx_queue->efx->type->txd_ring_mask];
+                efx_tsoh_free(tx_queue, buffer);
+                EFX_BUG_ON_PARANOID(buffer->skb);
+                buffer->len = 0;
+                buffer->continuation = 1;
+                if (buffer->unmap_len) {
+                        pci_unmap_page(tx_queue->efx->pci_dev,
+                                       buffer->unmap_addr,
+                                       buffer->unmap_len, PCI_DMA_TODEVICE);
+                        buffer->unmap_len = 0;
+                }
+        }
+}
+
+
+/* Parse the SKB header and initialise state. */
+static inline void tso_start(struct tso_state *st, const struct sk_buff *skb)
+{
+        /* All ethernet/IP/TCP headers combined size is TCP header size
+         * plus offset of TCP header relative to start of packet.
+         */
+        st->p.header_length = ((tcp_hdr(skb)->doff << 2u)
+                               + PTR_DIFF(tcp_hdr(skb), skb->data));
+        st->p.full_packet_size = (st->p.header_length
+                                  + skb_shinfo(skb)->gso_size);
+
+        st->p.ipv4_id = ntohs(ip_hdr(skb)->id);
+        st->seqnum = ntohl(tcp_hdr(skb)->seq);
+
+        EFX_BUG_ON_PARANOID(tcp_hdr(skb)->urg);
+        EFX_BUG_ON_PARANOID(tcp_hdr(skb)->syn);
+        EFX_BUG_ON_PARANOID(tcp_hdr(skb)->rst);
+
+        st->packet_space = st->p.full_packet_size;
+        st->remaining_len = skb->len - st->p.header_length;
+}
+
+
+/**
+ * tso_get_fragment - record fragment details and map for DMA
+ * @st:                 TSO state
+ * @efx:                Efx NIC
+ * @data:               Pointer to fragment data
+ * @len:                Length of fragment
+ *
+ * Record fragment details and map for DMA.  Return 0 on success, or
+ * -%ENOMEM if DMA mapping fails.
+ */
+static inline int tso_get_fragment(struct tso_state *st, struct efx_nic *efx,
+                                   int len, struct page *page, int page_off)
+{
+
+        st->ifc.unmap_addr = pci_map_page(efx->pci_dev, page, page_off,
+                                          len, PCI_DMA_TODEVICE);
+        if (likely(!pci_dma_mapping_error(st->ifc.unmap_addr))) {
+                st->ifc.unmap_len = len;
+                st->ifc.len = len;
+                st->ifc.dma_addr = st->ifc.unmap_addr;
+                st->ifc.page = page;
+                st->ifc.page_off = page_off;
+                return 0;
+        }
+        return -ENOMEM;
+}
+
+
+/**
+ * tso_fill_packet_with_fragment - form descriptors for the current fragment
+ * @tx_queue:           Efx TX queue
+ * @skb:                Socket buffer
+ * @st:                 TSO state
+ *
+ * Form descriptors for the current fragment, until we reach the end
+ * of fragment or end-of-packet.  Return 0 on success, 1 if not enough
+ * space in @tx_queue.
+ */
+static inline int tso_fill_packet_with_fragment(struct efx_tx_queue *tx_queue,
+                                                const struct sk_buff *skb,
+                                                struct tso_state *st)
+{
+
+        int n, end_of_packet, rc;
+
+        if (st->ifc.len == 0)
+                return 0;
+        if (st->packet_space == 0)
+                return 0;
+
+        EFX_BUG_ON_PARANOID(st->ifc.len <= 0);
+        EFX_BUG_ON_PARANOID(st->packet_space <= 0);
+
+        n = min(st->ifc.len, st->packet_space);
+
+        st->packet_space -= n;
+        st->remaining_len -= n;
+        st->ifc.len -= n;
+        st->ifc.page_off += n;
+        end_of_packet = st->remaining_len == 0 || st->packet_space == 0;
+
+        rc = efx_tx_queue_insert(tx_queue, st->ifc.dma_addr, n,
+                                 st->remaining_len ? NULL : skb,
+                                 end_of_packet, st->ifc.unmap_addr,
+                                 st->ifc.len ? 0 : st->ifc.unmap_len);
+
+        st->ifc.dma_addr += n;
+
+        return rc;
+}
+
+
+/**
+ * tso_start_new_packet - generate a new header and prepare for the new packet
+ * @tx_queue:           Efx TX queue
+ * @skb:                Socket buffer
+ * @st:                 TSO state
+ *
+ * Generate a new header and prepare for the new packet.  Return 0 on
+ * success, or -1 if failed to alloc header.
+ */
+static inline int tso_start_new_packet(struct efx_tx_queue *tx_queue,
+                                       const struct sk_buff *skb,
+                                       struct tso_state *st)
+{
+        struct efx_tso_header *tsoh;
+        struct iphdr *tsoh_iph;
+        struct tcphdr *tsoh_th;
+        unsigned ip_length;
+        u8 *header;
+
+        /* Allocate a DMA-mapped header buffer. */
+        if (likely(TSOH_SIZE(st->p.header_length) <= TSOH_STD_SIZE)) {
+                if (tx_queue->tso_headers_free == NULL)
+                        if (efx_tsoh_block_alloc(tx_queue))
+                                return -1;
+                EFX_BUG_ON_PARANOID(!tx_queue->tso_headers_free);
+                tsoh = tx_queue->tso_headers_free;
+                tx_queue->tso_headers_free = tsoh->next;
+                tsoh->unmap_len = 0;
+        } else {
+                tx_queue->tso_long_headers++;
+                tsoh = efx_tsoh_heap_alloc(tx_queue, st->p.header_length);
+                if (unlikely(!tsoh))
+                        return -1;
+        }
+
+        header = TSOH_BUFFER(tsoh);
+        tsoh_th = (struct tcphdr *)(header + SKB_TCP_OFF(skb));
+        tsoh_iph = (struct iphdr *)(header + SKB_IPV4_OFF(skb));
+
+        /* Copy and update the headers. */
+        memcpy(header, skb->data, st->p.header_length);
+
+        tsoh_th->seq = htonl(st->seqnum);
+        st->seqnum += skb_shinfo(skb)->gso_size;
+        if (st->remaining_len > skb_shinfo(skb)->gso_size) {
+                /* This packet will not finish the TSO burst. */
+                ip_length = st->p.full_packet_size - ETH_HDR_LEN(skb);
+                tsoh_th->fin = 0;
+                tsoh_th->psh = 0;
+        } else {
+                /* This packet will be the last in the TSO burst. */
+                ip_length = (st->p.header_length - ETH_HDR_LEN(skb)
+                             + st->remaining_len);
+                tsoh_th->fin = tcp_hdr(skb)->fin;
+                tsoh_th->psh = tcp_hdr(skb)->psh;
+        }
+        tsoh_iph->tot_len = htons(ip_length);
+
+        /* Linux leaves suitable gaps in the IP ID space for us to fill. */
+        tsoh_iph->id = htons(st->p.ipv4_id);
+        st->p.ipv4_id++;
+
+        st->packet_space = skb_shinfo(skb)->gso_size;
+        ++tx_queue->tso_packets;
+
+        /* Form a descriptor for this header. */
+        efx_tso_put_header(tx_queue, tsoh, st->p.header_length);
+
+        return 0;
+}
+
+
+/**
+ * efx_enqueue_skb_tso - segment and transmit a TSO socket buffer
+ * @tx_queue:           Efx TX queue
+ * @skb:                Socket buffer
+ *
+ * Context: You must hold netif_tx_lock() to call this function.
+ *
+ * Add socket buffer @skb to @tx_queue, doing TSO or return != 0 if
+ * @skb was not enqueued.  In all cases @skb is consumed.  Return
+ * %NETDEV_TX_OK or %NETDEV_TX_BUSY.
+ */
+static int efx_enqueue_skb_tso(struct efx_tx_queue *tx_queue,
+                               const struct sk_buff *skb)
+{
+        int frag_i, rc, rc2 = NETDEV_TX_OK;
+        struct tso_state state;
+        skb_frag_t *f;
+
+        /* Verify TSO is safe - these checks should never fail. */
+        efx_tso_check_safe(skb);
+
+        EFX_BUG_ON_PARANOID(tx_queue->write_count != tx_queue->insert_count);
+
+        tso_start(&state, skb);
+
+        /* Assume that skb header area contains exactly the headers, and
+         * all payload is in the frag list.
+         */
+        if (skb_headlen(skb) == state.p.header_length) {
+                /* Grab the first payload fragment. */
+                EFX_BUG_ON_PARANOID(skb_shinfo(skb)->nr_frags < 1);
+                frag_i = 0;
+                f = &skb_shinfo(skb)->frags[frag_i];
+                rc = tso_get_fragment(&state, tx_queue->efx,
+                                      f->size, f->page, f->page_offset);
+                if (rc)
+                        goto mem_err;
+        } else {
+                /* It may look like this code fragment assumes that the
+                 * skb->data portion does not cross a page boundary, but
+                 * that is not the case.  It is guaranteed to be direct
+                 * mapped memory, and therefore is physically contiguous,
+                 * and so DMA will work fine.  kmap_atomic() on this region
+                 * will just return the direct mapping, so that will work
+                 * too.
+                 */
+                int page_off = (unsigned long)skb->data & (PAGE_SIZE - 1);
+                int hl = state.p.header_length;
+                rc = tso_get_fragment(&state, tx_queue->efx,
+                                      skb_headlen(skb) - hl,
+                                      virt_to_page(skb->data), page_off + hl);
+                if (rc)
+                        goto mem_err;
+                frag_i = -1;
+        }
+
+        if (tso_start_new_packet(tx_queue, skb, &state) < 0)
+                goto mem_err;
+
+        while (1) {
+                rc = tso_fill_packet_with_fragment(tx_queue, skb, &state);
+                if (unlikely(rc))
+                        goto stop;
+
+                /* Move onto the next fragment? */
+                if (state.ifc.len == 0) {
+                        if (++frag_i >= skb_shinfo(skb)->nr_frags)
+                                /* End of payload reached. */
+                                break;
+                        f = &skb_shinfo(skb)->frags[frag_i];
+                        rc = tso_get_fragment(&state, tx_queue->efx,
+                                              f->size, f->page, f->page_offset);
+                        if (rc)
+                                goto mem_err;
+                }
+
+                /* Start at new packet? */
+                if (state.packet_space == 0 &&
+                    tso_start_new_packet(tx_queue, skb, &state) < 0)
+                        goto mem_err;
+        }
+
+        /* Pass off to hardware */
+        falcon_push_buffers(tx_queue);
+
+        tx_queue->tso_bursts++;
+        return NETDEV_TX_OK;
+
+ mem_err:
+        EFX_ERR(tx_queue->efx, "Out of memory for TSO headers, or PCI mapping"
+                " error\n");
+        dev_kfree_skb_any((struct sk_buff *)skb);
+        goto unwind;
+
+ stop:
+        rc2 = NETDEV_TX_BUSY;
+
+        /* Stop the queue if it wasn't stopped before. */
+        if (tx_queue->stopped == 1)
+                efx_stop_queue(tx_queue->efx);
+
+ unwind:
+        efx_enqueue_unwind(tx_queue);
+        return rc2;
+}
+
+
+/*
+ * Free up all TSO datastructures associated with tx_queue. This
+ * routine should be called only once the tx_queue is both empty and
+ * will no longer be used.
+ */
+static void efx_fini_tso(struct efx_tx_queue *tx_queue)
+{
+        unsigned i;
+
+        if (tx_queue->buffer)
+                for (i = 0; i <= tx_queue->efx->type->txd_ring_mask; ++i)
+                        efx_tsoh_free(tx_queue, &tx_queue->buffer[i]);
+
+        while (tx_queue->tso_headers_free != NULL)
+                efx_tsoh_block_free(tx_queue, tx_queue->tso_headers_free,
+                                    tx_queue->efx->pci_dev);
+}
diff --git a/drivers/net/sfc/xfp_phy.c b/drivers/net/sfc/xfp_phy.c
index 66dd5bf1eaa9..3b9f9ddbc372 100644
--- a/drivers/net/sfc/xfp_phy.c
+++ b/drivers/net/sfc/xfp_phy.c
@@ -24,6 +24,10 @@
                            MDIO_MMDREG_DEVS0_PMAPMD |   \
                            MDIO_MMDREG_DEVS0_PHYXS)
 
+#define XFP_LOOPBACKS ((1 << LOOPBACK_PCS) |            \
+                       (1 << LOOPBACK_PMAPMD) |         \
+                       (1 << LOOPBACK_NETWORK))
+
 /****************************************************************************/
 /* Quake-specific MDIO registers */
 #define MDIO_QUAKE_LED0_REG     (0xD006)
@@ -35,6 +39,10 @@ void xfp_set_led(struct efx_nic *p, int led, int mode)
                             mode);
 }
 
+struct xfp_phy_data {
+        int tx_disabled;
+};
+
 #define XFP_MAX_RESET_TIME 500
 #define XFP_RESET_WAIT 10
 
@@ -72,18 +80,31 @@ static int xfp_reset_phy(struct efx_nic *efx)
 
 static int xfp_phy_init(struct efx_nic *efx)
 {
+        struct xfp_phy_data *phy_data;
         u32 devid = mdio_clause45_read_id(efx, MDIO_MMD_PHYXS);
         int rc;
 
+        phy_data = kzalloc(sizeof(struct xfp_phy_data), GFP_KERNEL);
+        efx->phy_data = (void *) phy_data;
+
         EFX_INFO(efx, "XFP: PHY ID reg %x (OUI %x model %x revision"
                  " %x)\n", devid, MDIO_ID_OUI(devid), MDIO_ID_MODEL(devid),
                  MDIO_ID_REV(devid));
 
+        phy_data->tx_disabled = efx->tx_disabled;
+
         rc = xfp_reset_phy(efx);
 
         EFX_INFO(efx, "XFP: PHY init %s.\n",
                  rc ? "failed" : "successful");
+        if (rc < 0)
+                goto fail;
 
+        return 0;
+
+ fail:
+        kfree(efx->phy_data);
+        efx->phy_data = NULL;
         return rc;
 }
 
@@ -110,6 +131,16 @@ static int xfp_phy_check_hw(struct efx_nic *efx)
 
 static void xfp_phy_reconfigure(struct efx_nic *efx)
 {
+        struct xfp_phy_data *phy_data = efx->phy_data;
+
+        /* Reset the PHY when moving from tx off to tx on */
+        if (phy_data->tx_disabled && !efx->tx_disabled)
+                xfp_reset_phy(efx);
+
+        mdio_clause45_transmit_disable(efx);
+        mdio_clause45_phy_reconfigure(efx);
+
+        phy_data->tx_disabled = efx->tx_disabled;
         efx->link_up = xfp_link_ok(efx);
         efx->link_options = GM_LPA_10000FULL;
 }
@@ -119,6 +150,10 @@ static void xfp_phy_fini(struct efx_nic *efx)
 {
         /* Clobber the LED if it was blinking */
         efx->board_info.blink(efx, 0);
+
+        /* Free the context block */
+        kfree(efx->phy_data);
+        efx->phy_data = NULL;
 }
 
 struct efx_phy_operations falcon_xfp_phy_ops = {
@@ -129,4 +164,5 @@ struct efx_phy_operations falcon_xfp_phy_ops = {
         .clear_interrupt = xfp_phy_clear_interrupt,
         .reset_xaui      = efx_port_dummy_op_void,
         .mmds            = XFP_REQUIRED_DEVS,
+        .loopbacks       = XFP_LOOPBACKS,
 };
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
index 7bb3ba9bcbd8..c0a5eea20007 100644
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
@@ -1966,13 +1966,13 @@ struct sky2_status_le {
 struct tx_ring_info {
         struct sk_buff  *skb;
         DECLARE_PCI_UNMAP_ADDR(mapaddr);
-        DECLARE_PCI_UNMAP_ADDR(maplen);
+        DECLARE_PCI_UNMAP_LEN(maplen);
 };
 
 struct rx_ring_info {
         struct sk_buff  *skb;
         dma_addr_t      data_addr;
-        DECLARE_PCI_UNMAP_ADDR(data_size);
+        DECLARE_PCI_UNMAP_LEN(data_size);
         dma_addr_t      frag_addr[ETH_JUMBO_MTU >> PAGE_SHIFT];
 };
 
diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
index 8005dd16fb4e..d5140aed7b79 100644
--- a/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@ -150,11 +150,9 @@ config HDLC_FR
 
 config HDLC_PPP
         tristate "Synchronous Point-to-Point Protocol (PPP) support"
-        depends on HDLC && BROKEN
+        depends on HDLC
         help
           Generic HDLC driver supporting PPP over WAN connections.
-          This module is currently broken and will cause a kernel panic
-          when a device configured in PPP mode is activated.
 
           It will be replaced by new PPP implementation in Linux 2.6.26.
 
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index 45ddfc9763cc..b0fce1387eaf 100644
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@ -629,7 +629,7 @@ static void sppp_channel_init(struct channel_data *chan)
         d->base_addr = chan->cosa->datareg;
         d->irq = chan->cosa->irq;
         d->dma = chan->cosa->dma;
-        d->priv = chan;
+        d->ml_priv = chan;
         sppp_attach(&chan->pppdev);
         if (register_netdev(d)) {
                 printk(KERN_WARNING "%s: register_netdev failed.\n", d->name);
@@ -650,7 +650,7 @@ static void sppp_channel_delete(struct channel_data *chan)
 
 static int cosa_sppp_open(struct net_device *d)
 {
-        struct channel_data *chan = d->priv;
+        struct channel_data *chan = d->ml_priv;
         int err;
         unsigned long flags;
 
@@ -690,7 +690,7 @@ static int cosa_sppp_open(struct net_device *d)
 
 static int cosa_sppp_tx(struct sk_buff *skb, struct net_device *dev)
 {
-        struct channel_data *chan = dev->priv;
+        struct channel_data *chan = dev->ml_priv;
 
         netif_stop_queue(dev);
 
@@ -701,7 +701,7 @@ static int cosa_sppp_tx(struct sk_buff *skb, struct net_device *dev)
 
 static void cosa_sppp_timeout(struct net_device *dev)
 {
-        struct channel_data *chan = dev->priv;
+        struct channel_data *chan = dev->ml_priv;
 
         if (test_bit(RXBIT, &chan->cosa->rxtx)) {
                 chan->stats.rx_errors++;
@@ -720,7 +720,7 @@ static void cosa_sppp_timeout(struct net_device *dev)
 
 static int cosa_sppp_close(struct net_device *d)
 {
-        struct channel_data *chan = d->priv;
+        struct channel_data *chan = d->ml_priv;
         unsigned long flags;
 
         netif_stop_queue(d);
@@ -800,7 +800,7 @@ static int sppp_tx_done(struct channel_data *chan, int size)
 
 static struct net_device_stats *cosa_net_stats(struct net_device *dev)
 {
-        struct channel_data *chan = dev->priv;
+        struct channel_data *chan = dev->ml_priv;
         return &chan->stats;
 }
 
@@ -1217,7 +1217,7 @@ static int cosa_sppp_ioctl(struct net_device *dev, struct ifreq *ifr,
         int cmd)
 {
         int rv;
-        struct channel_data *chan = dev->priv;
+        struct channel_data *chan = dev->ml_priv;
         rv = cosa_ioctl_common(chan->cosa, chan, cmd, (unsigned long)ifr->ifr_data);
         if (rv == -ENOIOCTLCMD) {
                 return sppp_do_ioctl(dev, ifr, cmd);
diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c
index 10396d9686f4..00308337928e 100644
--- a/drivers/net/wan/hdlc_ppp.c
+++ b/drivers/net/wan/hdlc_ppp.c
@@ -45,7 +45,7 @@ static int ppp_open(struct net_device *dev)
         int (*old_ioctl)(struct net_device *, struct ifreq *, int);
         int result;
 
-        dev->priv = &state(hdlc)->syncppp_ptr;
+        dev->ml_priv = &state(hdlc)->syncppp_ptr;
         state(hdlc)->syncppp_ptr = &state(hdlc)->pppdev;
         state(hdlc)->pppdev.dev = dev;
 
diff --git a/drivers/net/wan/hostess_sv11.c b/drivers/net/wan/hostess_sv11.c
index 83dbc924fcb5..f3065d3473fd 100644
--- a/drivers/net/wan/hostess_sv11.c
+++ b/drivers/net/wan/hostess_sv11.c
@@ -75,7 +75,7 @@ static void hostess_input(struct z8530_channel *c, struct sk_buff *skb)
  
 static int hostess_open(struct net_device *d)
 {
-        struct sv11_device *sv11=d->priv;
+        struct sv11_device *sv11=d->ml_priv;
         int err = -1;
         
         /*
@@ -128,7 +128,7 @@ static int hostess_open(struct net_device *d)
 
 static int hostess_close(struct net_device *d)
 {
-        struct sv11_device *sv11=d->priv;
+        struct sv11_device *sv11=d->ml_priv;
         /*
          *      Discard new frames
          */
@@ -159,14 +159,14 @@ static int hostess_close(struct net_device *d)
 
 static int hostess_ioctl(struct net_device *d, struct ifreq *ifr, int cmd)
 {
-        /* struct sv11_device *sv11=d->priv;
+        /* struct sv11_device *sv11=d->ml_priv;
            z8530_ioctl(d,&sv11->sync.chanA,ifr,cmd) */
         return sppp_do_ioctl(d, ifr,cmd);
 }
 
 static struct net_device_stats *hostess_get_stats(struct net_device *d)
 {
-        struct sv11_device *sv11=d->priv;
+        struct sv11_device *sv11=d->ml_priv;
         if(sv11)
                 return z8530_get_stats(&sv11->sync.chanA);
         else
@@ -179,7 +179,7 @@ static struct net_device_stats *hostess_get_stats(struct net_device *d)
  
 static int hostess_queue_xmit(struct sk_buff *skb, struct net_device *d)
 {
-        struct sv11_device *sv11=d->priv;
+        struct sv11_device *sv11=d->ml_priv;
         return z8530_queue_xmit(&sv11->sync.chanA, skb);
 }
 
@@ -325,6 +325,7 @@ static struct sv11_device *sv11_init(int iobase, int irq)
                 /* 
                  *      Initialise the PPP components
                  */
+                d->ml_priv = sv;
                 sppp_attach(&sv->netdev);
                 
                 /*
@@ -333,7 +334,6 @@ static struct sv11_device *sv11_init(int iobase, int irq)
                 
                 d->base_addr = iobase;
                 d->irq = irq;
-                d->priv = sv;
                 
                 if(register_netdev(d))
                 {
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
index 6635ecef36e5..62133cee446a 100644
--- a/drivers/net/wan/lmc/lmc_main.c
+++ b/drivers/net/wan/lmc/lmc_main.c
@@ -891,6 +891,7 @@ static int __devinit lmc_init_one(struct pci_dev *pdev,
 
     /* Initialize the sppp layer */
     /* An ioctl can cause a subsequent detach for raw frame interface */
+    dev->ml_priv = sc;
     sc->if_type = LMC_PPP;
     sc->check = 0xBEAFCAFE;
     dev->base_addr = pci_resource_start(pdev, 0);
diff --git a/drivers/net/wan/sealevel.c b/drivers/net/wan/sealevel.c
index 11276bf3149f..44a89df1b8bf 100644
--- a/drivers/net/wan/sealevel.c
+++ b/drivers/net/wan/sealevel.c
@@ -241,6 +241,7 @@ static inline struct slvl_device *slvl_alloc(int iobase, int irq)
                 return NULL;
 
         sv = d->priv;
+        d->ml_priv = sv;
         sv->if_ptr = &sv->pppdev;
         sv->pppdev.dev = d;
         d->base_addr = iobase;
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index d3406830c8e3..62a3d8f8563e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -666,7 +666,7 @@ static void iwl3945_rx_reply_rx(struct iwl3945_priv *priv,
         rx_status.flag = 0;
         rx_status.mactime = le64_to_cpu(rx_end->timestamp);
         rx_status.freq =
-                ieee80211_frequency_to_channel(le16_to_cpu(rx_hdr->channel));
+                ieee80211_channel_to_frequency(le16_to_cpu(rx_hdr->channel));
         rx_status.band = (rx_hdr->phy_flags & RX_RES_PHY_FLAGS_BAND_24_MSK) ?
                                 IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
index b608e1ca8b40..c9847b1a67f7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
@@ -163,8 +163,8 @@ struct iwl4965_lq_sta {
         struct dentry *rs_sta_dbgfs_tx_agg_tid_en_file;
 #endif
         struct iwl4965_rate dbg_fixed;
-        struct iwl_priv *drv;
 #endif
+        struct iwl_priv *drv;
 };
 
 static void rs_rate_scale_perform(struct iwl_priv *priv,
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index 17f629fb96ff..bf19eb8aafd0 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -3978,7 +3978,7 @@ static void iwl4965_rx_reply_rx(struct iwl_priv *priv,
 
         rx_status.mactime = le64_to_cpu(rx_start->timestamp);
         rx_status.freq =
-                ieee80211_frequency_to_channel(le16_to_cpu(rx_start->channel));
+                ieee80211_channel_to_frequency(le16_to_cpu(rx_start->channel));
         rx_status.band = (rx_start->phy_flags & RX_RES_PHY_FLAGS_BAND_24_MSK) ?
                                 IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;
         rx_status.rate_idx =
diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c
index 04c2638d75ad..9196825ed1b5 100644
--- a/drivers/net/wireless/prism54/islpci_dev.c
+++ b/drivers/net/wireless/prism54/islpci_dev.c
@@ -388,8 +388,15 @@ islpci_open(struct net_device *ndev)
 
         netif_start_queue(ndev);
 
-        /* Turn off carrier unless we know we have associated */
-        netif_carrier_off(ndev);
+        /* Turn off carrier if in STA or Ad-hoc mode. It will be turned on
+         * once the firmware receives a trap of being associated
+         * (GEN_OID_LINKSTATE). In other modes (AP or WDS or monitor) we
+         * should just leave the carrier on as its expected the firmware
+         * won't send us a trigger. */
+        if (priv->iw_mode == IW_MODE_INFRA || priv->iw_mode == IW_MODE_ADHOC)
+                netif_carrier_off(ndev);
+        else
+                netif_carrier_on(ndev);
 
         return 0;
 }
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 8d8657fb64dd..b22c02737185 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -1032,8 +1032,10 @@ static int rt2x00lib_initialize(struct rt2x00_dev *rt2x00dev)
          * Initialize the device.
          */
         status = rt2x00dev->ops->lib->initialize(rt2x00dev);
-        if (status)
-                goto exit;
+        if (status) {
+                rt2x00queue_uninitialize(rt2x00dev);
+                return status;
+        }
 
         __set_bit(DEVICE_INITIALIZED, &rt2x00dev->flags);
 
@@ -1043,11 +1045,6 @@ static int rt2x00lib_initialize(struct rt2x00_dev *rt2x00dev)
         rt2x00rfkill_register(rt2x00dev);
 
         return 0;
-
-exit:
-        rt2x00lib_uninitialize(rt2x00dev);
-
-        return status;
 }
 
 int rt2x00lib_start(struct rt2x00_dev *rt2x00dev)
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c
index 7867ec64bd2c..971af2546b59 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
@@ -314,13 +314,14 @@ int rt2x00pci_initialize(struct rt2x00_dev *rt2x00dev)
         if (status) {
                 ERROR(rt2x00dev, "IRQ %d allocation failed (error %d).\n",
                       pci_dev->irq, status);
-                return status;
+                goto exit;
         }
 
         return 0;
 
 exit:
-        rt2x00pci_uninitialize(rt2x00dev);
+        queue_for_each(rt2x00dev, queue)
+                rt2x00pci_free_queue_dma(rt2x00dev, queue);
 
         return status;
 }
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index ae12dcdd3c24..14bc7b281659 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -2366,6 +2366,7 @@ static int rt61pci_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb,
 {
         struct rt2x00_dev *rt2x00dev = hw->priv;
         struct rt2x00_intf *intf = vif_to_intf(control->vif);
+        struct queue_entry_priv_pci_tx *priv_tx;
         struct skb_frame_desc *skbdesc;
         unsigned int beacon_base;
         u32 reg;
@@ -2373,21 +2374,8 @@ static int rt61pci_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb,
         if (unlikely(!intf->beacon))
                 return -ENOBUFS;
 
-        /*
-         * We need to append the descriptor in front of the
-         * beacon frame.
-         */
-        if (skb_headroom(skb) < intf->beacon->queue->desc_size) {
-                if (pskb_expand_head(skb, intf->beacon->queue->desc_size,
-                                     0, GFP_ATOMIC))
-                        return -ENOMEM;
-        }
-
-        /*
-         * Add the descriptor in front of the skb.
-         */
-        skb_push(skb, intf->beacon->queue->desc_size);
-        memset(skb->data, 0, intf->beacon->queue->desc_size);
+        priv_tx = intf->beacon->priv_data;
+        memset(priv_tx->desc, 0, intf->beacon->queue->desc_size);
 
         /*
          * Fill in skb descriptor
@@ -2395,9 +2383,9 @@ static int rt61pci_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb,
         skbdesc = get_skb_frame_desc(skb);
         memset(skbdesc, 0, sizeof(*skbdesc));
         skbdesc->flags |= FRAME_DESC_DRIVER_GENERATED;
-        skbdesc->data = skb->data + intf->beacon->queue->desc_size;
-        skbdesc->data_len = skb->len - intf->beacon->queue->desc_size;
-        skbdesc->desc = skb->data;
+        skbdesc->data = skb->data;
+        skbdesc->data_len = skb->len;
+        skbdesc->desc = priv_tx->desc;
         skbdesc->desc_len = intf->beacon->queue->desc_size;
         skbdesc->entry = intf->beacon;
 
@@ -2425,7 +2413,10 @@ static int rt61pci_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb,
          */
         beacon_base = HW_BEACON_OFFSET(intf->beacon->entry_idx);
         rt2x00pci_register_multiwrite(rt2x00dev, beacon_base,
-                                      skb->data, skb->len);
+                                      skbdesc->desc, skbdesc->desc_len);
+        rt2x00pci_register_multiwrite(rt2x00dev,
+                                      beacon_base + skbdesc->desc_len,
+                                      skbdesc->data, skbdesc->data_len);
         rt61pci_kick_tx_queue(rt2x00dev, control->queue);
 
         return 0;
@@ -2490,7 +2481,7 @@ static const struct data_queue_desc rt61pci_queue_tx = {
 
 static const struct data_queue_desc rt61pci_queue_bcn = {
         .entry_num              = 4 * BEACON_ENTRIES,
-        .data_size              = MGMT_FRAME_SIZE,
+        .data_size              = 0, /* No DMA required for beacons */
         .desc_size              = TXINFO_SIZE,
         .priv_size              = sizeof(struct queue_entry_priv_pci_tx),
 };
diff --git a/drivers/net/wireless/wavelan.c b/drivers/net/wireless/wavelan.c
index 03384a43186b..49ae97003952 100644
--- a/drivers/net/wireless/wavelan.c
+++ b/drivers/net/wireless/wavelan.c
@@ -908,9 +908,9 @@ static void wv_psa_show(psa_t * p)
              p->psa_call_code[3], p->psa_call_code[4], p->psa_call_code[5],
              p->psa_call_code[6], p->psa_call_code[7]);
 #ifdef DEBUG_SHOW_UNUSED
-        printk(KERN_DEBUG "psa_reserved[]: %02X:%02X:%02X:%02X\n",
+        printk(KERN_DEBUG "psa_reserved[]: %02X:%02X\n",
                p->psa_reserved[0],
-               p->psa_reserved[1], p->psa_reserved[2], p->psa_reserved[3]);
+               p->psa_reserved[1]);
 #endif                          /* DEBUG_SHOW_UNUSED */
         printk(KERN_DEBUG "psa_conf_status: %d, ", p->psa_conf_status);
         printk("psa_crc: 0x%02x%02x, ", p->psa_crc[0], p->psa_crc[1]);
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c
index baf74015751c..b584c0ecc62d 100644
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
@@ -1074,11 +1074,9 @@ wv_psa_show(psa_t *	p)
          p->psa_call_code[6],
          p->psa_call_code[7]);
 #ifdef DEBUG_SHOW_UNUSED
-  printk(KERN_DEBUG "psa_reserved[]: %02X:%02X:%02X:%02X\n",
+  printk(KERN_DEBUG "psa_reserved[]: %02X:%02X\n",
          p->psa_reserved[0],
-         p->psa_reserved[1],
-         p->psa_reserved[2],
-         p->psa_reserved[3]);
+         p->psa_reserved[1]);
 #endif  /* DEBUG_SHOW_UNUSED */
   printk(KERN_DEBUG "psa_conf_status: %d, ", p->psa_conf_status);
   printk("psa_crc: 0x%02x%02x, ", p->psa_crc[0], p->psa_crc[1]);
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
index 5316074f39f0..12e24f04dddf 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
@@ -889,9 +889,13 @@ static void tx_urb_complete(struct urb *urb)
         }
 free_urb:
         skb = (struct sk_buff *)urb->context;
-        zd_mac_tx_to_dev(skb, urb->status);
+        /*
+         * grab 'usb' pointer before handing off the skb (since
+         * it might be freed by zd_mac_tx_to_dev or mac80211)
+         */
         cb = (struct zd_tx_skb_control_block *)skb->cb;
         usb = &zd_hw_mac(cb->hw)->chip.usb;
+        zd_mac_tx_to_dev(skb, urb->status);
         free_tx_urb(usb, urb);
         tx_dec_submitted_urbs(usb);
         return;
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 9bd7c4a31253..23ffb7c0caf2 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -65,6 +65,9 @@ struct property *of_find_property(const struct device_node *np,
 {
         struct property *pp;
 
+        if (!np)
+                return NULL;
+
         read_lock(&devtree_lock);
         for (pp = np->properties; pp != 0; pp = pp->next) {
                 if (of_prop_cmp(pp->name, name) == 0) {
diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c
index efcbf4b4579f..2450b3a393ff 100644
--- a/drivers/oprofile/cpu_buffer.c
+++ b/drivers/oprofile/cpu_buffer.c
@@ -27,7 +27,7 @@
 #include "buffer_sync.h"
 #include "oprof.h"
 
-DEFINE_PER_CPU_SHARED_ALIGNED(struct oprofile_cpu_buffer, cpu_buffer);
+DEFINE_PER_CPU(struct oprofile_cpu_buffer, cpu_buffer);
 
 static void wq_sync_buffer(struct work_struct *work);
 
diff --git a/drivers/oprofile/cpu_buffer.h b/drivers/oprofile/cpu_buffer.h
index 13588174311d..c3e366b52261 100644
--- a/drivers/oprofile/cpu_buffer.h
+++ b/drivers/oprofile/cpu_buffer.h
@@ -46,7 +46,7 @@ struct oprofile_cpu_buffer {
         unsigned long sample_invalid_eip;
         int cpu;
         struct delayed_work work;
-} ____cacheline_aligned;
+};
 
 DECLARE_PER_CPU(struct oprofile_cpu_buffer, cpu_buffer);
 
diff --git a/drivers/parisc/asp.c b/drivers/parisc/asp.c
index 558420bc9f88..821369135369 100644
--- a/drivers/parisc/asp.c
+++ b/drivers/parisc/asp.c
@@ -88,7 +88,7 @@ asp_init_chip(struct parisc_device *dev)
         ret = -EBUSY;
         dev->irq = gsc_claim_irq(&gsc_irq, ASP_GSC_IRQ);
         if (dev->irq < 0) {
-                printk(KERN_ERR "%s(): cannot get GSC irq\n", __FUNCTION__);
+                printk(KERN_ERR "%s(): cannot get GSC irq\n", __func__);
                 goto out;
         }
 
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index 07d2a8d4498f..b30e38f3a50d 100644
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
@@ -359,7 +359,7 @@ ccio_alloc_range(struct ioc *ioc, struct device *dev, size_t size)
         BUG_ON((pages_needed * IOVP_SIZE) > DMA_CHUNK_SIZE);
      
         DBG_RES("%s() size: %d pages_needed %d\n", 
-                __FUNCTION__, size, pages_needed);
+                __func__, size, pages_needed);
 
         /*
         ** "seek and ye shall find"...praying never hurts either...
@@ -395,16 +395,16 @@ ccio_alloc_range(struct ioc *ioc, struct device *dev, size_t size)
 #endif
         } else {
                 panic("%s: %s() Too many pages to map. pages_needed: %u\n",
-                       __FILE__,  __FUNCTION__, pages_needed);
+                       __FILE__,  __func__, pages_needed);
         }
 
         panic("%s: %s() I/O MMU is out of mapping resources.\n", __FILE__,
-              __FUNCTION__);
+              __func__);
         
 resource_found:
         
         DBG_RES("%s() res_idx %d res_hint: %d\n",
-                __FUNCTION__, res_idx, ioc->res_hint);
+                __func__, res_idx, ioc->res_hint);
 
 #ifdef CCIO_SEARCH_TIME
         {
@@ -450,7 +450,7 @@ ccio_free_range(struct ioc *ioc, dma_addr_t iova, unsigned long pages_mapped)
         BUG_ON(pages_mapped > BITS_PER_LONG);
 
         DBG_RES("%s():  res_idx: %d pages_mapped %d\n", 
-                __FUNCTION__, res_idx, pages_mapped);
+                __func__, res_idx, pages_mapped);
 
 #ifdef CCIO_MAP_STATS
         ioc->used_pages -= pages_mapped;
@@ -474,7 +474,7 @@ ccio_free_range(struct ioc *ioc, dma_addr_t iova, unsigned long pages_mapped)
 #endif
         } else {
                 panic("%s:%s() Too many pages to unmap.\n", __FILE__,
-                      __FUNCTION__);
+                      __func__);
         }
 }
 
@@ -775,7 +775,7 @@ ccio_map_single(struct device *dev, void *addr, size_t size,
         pdir_start = &(ioc->pdir_base[idx]);
 
         DBG_RUN("%s() 0x%p -> 0x%lx size: %0x%x\n",
-                __FUNCTION__, addr, (long)iovp | offset, size);
+                __func__, addr, (long)iovp | offset, size);
 
         /* If not cacheline aligned, force SAFE_DMA on the whole mess */
         if((size % L1_CACHE_BYTES) || ((unsigned long)addr % L1_CACHE_BYTES))
@@ -820,7 +820,7 @@ ccio_unmap_single(struct device *dev, dma_addr_t iova, size_t size,
         ioc = GET_IOC(dev);
 
         DBG_RUN("%s() iovp 0x%lx/%x\n",
-                __FUNCTION__, (long)iova, size);
+                __func__, (long)iova, size);
 
         iova ^= offset;        /* clear offset bits */
         size += offset;
@@ -922,7 +922,7 @@ ccio_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
         BUG_ON(!dev);
         ioc = GET_IOC(dev);
         
-        DBG_RUN_SG("%s() START %d entries\n", __FUNCTION__, nents);
+        DBG_RUN_SG("%s() START %d entries\n", __func__, nents);
 
         /* Fast path single entry scatterlists. */
         if (nents == 1) {
@@ -966,7 +966,7 @@ ccio_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
 
         BUG_ON(coalesced != filled);
 
-        DBG_RUN_SG("%s() DONE %d mappings\n", __FUNCTION__, filled);
+        DBG_RUN_SG("%s() DONE %d mappings\n", __func__, filled);
 
         for (i = 0; i < filled; i++)
                 current_len += sg_dma_len(sglist + i);
@@ -995,7 +995,7 @@ ccio_unmap_sg(struct device *dev, struct scatterlist *sglist, int nents,
         ioc = GET_IOC(dev);
 
         DBG_RUN_SG("%s() START %d entries,  %08lx,%x\n",
-                __FUNCTION__, nents, sg_virt_addr(sglist), sglist->length);
+                __func__, nents, sg_virt_addr(sglist), sglist->length);
 
 #ifdef CCIO_MAP_STATS
         ioc->usg_calls++;
@@ -1011,7 +1011,7 @@ ccio_unmap_sg(struct device *dev, struct scatterlist *sglist, int nents,
                 ++sglist;
         }
 
-        DBG_RUN_SG("%s() DONE (nents %d)\n", __FUNCTION__, nents);
+        DBG_RUN_SG("%s() DONE (nents %d)\n", __func__, nents);
 }
 
 static struct hppa_dma_ops ccio_ops = {
@@ -1225,7 +1225,7 @@ static int
 ccio_get_iotlb_size(struct parisc_device *dev)
 {
         if (dev->spa_shift == 0) {
-                panic("%s() : Can't determine I/O TLB size.\n", __FUNCTION__);
+                panic("%s() : Can't determine I/O TLB size.\n", __func__);
         }
         return (1 << dev->spa_shift);
 }
@@ -1315,7 +1315,7 @@ ccio_ioc_init(struct ioc *ioc)
         BUG_ON((1 << get_order(ioc->pdir_size)) != (ioc->pdir_size >> PAGE_SHIFT));
 
         DBG_INIT("%s() hpa 0x%p mem %luMB IOV %dMB (%d bits)\n",
-                        __FUNCTION__, ioc->ioc_regs,
+                        __func__, ioc->ioc_regs,
                         (unsigned long) num_physpages >> (20 - PAGE_SHIFT),
                         iova_space_size>>20,
                         iov_order + PAGE_SHIFT);
@@ -1323,7 +1323,7 @@ ccio_ioc_init(struct ioc *ioc)
         ioc->pdir_base = (u64 *)__get_free_pages(GFP_KERNEL, 
                                                  get_order(ioc->pdir_size));
         if(NULL == ioc->pdir_base) {
-                panic("%s() could not allocate I/O Page Table\n", __FUNCTION__);
+                panic("%s() could not allocate I/O Page Table\n", __func__);
         }
         memset(ioc->pdir_base, 0, ioc->pdir_size);
 
@@ -1332,12 +1332,12 @@ ccio_ioc_init(struct ioc *ioc)
 
         /* resource map size dictated by pdir_size */
         ioc->res_size = (ioc->pdir_size / sizeof(u64)) >> 3;
-        DBG_INIT("%s() res_size 0x%x\n", __FUNCTION__, ioc->res_size);
+        DBG_INIT("%s() res_size 0x%x\n", __func__, ioc->res_size);
         
         ioc->res_map = (u8 *)__get_free_pages(GFP_KERNEL, 
                                               get_order(ioc->res_size));
         if(NULL == ioc->res_map) {
-                panic("%s() could not allocate resource map\n", __FUNCTION__);
+                panic("%s() could not allocate resource map\n", __func__);
         }
         memset(ioc->res_map, 0, ioc->res_size);
 
@@ -1409,7 +1409,7 @@ ccio_init_resource(struct resource *res, char *name, void __iomem *ioaddr)
         result = insert_resource(&iomem_resource, res);
         if (result < 0) {
                 printk(KERN_ERR "%s() failed to claim CCIO bus address space (%08lx,%08lx)\n", 
-                        __FUNCTION__, res->start, res->end);
+                        __func__, res->start, res->end);
         }
 }
 
diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c
index d9c6322a721b..fd56128525d1 100644
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
@@ -180,7 +180,7 @@ static int dino_cfg_read(struct pci_bus *bus, unsigned int devfn, int where,
         void __iomem *base_addr = d->hba.base_addr;
         unsigned long flags;
 
-        DBG("%s: %p, %d, %d, %d\n", __FUNCTION__, base_addr, devfn, where,
+        DBG("%s: %p, %d, %d, %d\n", __func__, base_addr, devfn, where,
                                                                         size);
         spin_lock_irqsave(&d->dinosaur_pen, flags);
 
@@ -215,7 +215,7 @@ static int dino_cfg_write(struct pci_bus *bus, unsigned int devfn, int where,
         void __iomem *base_addr = d->hba.base_addr;
         unsigned long flags;
 
-        DBG("%s: %p, %d, %d, %d\n", __FUNCTION__, base_addr, devfn, where,
+        DBG("%s: %p, %d, %d, %d\n", __func__, base_addr, devfn, where,
                                                                         size);
         spin_lock_irqsave(&d->dinosaur_pen, flags);
 
@@ -301,7 +301,7 @@ static void dino_disable_irq(unsigned int irq)
         struct dino_device *dino_dev = irq_desc[irq].chip_data;
         int local_irq = gsc_find_local_irq(irq, dino_dev->global_irq, DINO_LOCAL_IRQS);
 
-        DBG(KERN_WARNING "%s(0x%p, %d)\n", __FUNCTION__, dino_dev, irq);
+        DBG(KERN_WARNING "%s(0x%p, %d)\n", __func__, dino_dev, irq);
 
         /* Clear the matching bit in the IMR register */
         dino_dev->imr &= ~(DINO_MASK_IRQ(local_irq));
@@ -314,7 +314,7 @@ static void dino_enable_irq(unsigned int irq)
         int local_irq = gsc_find_local_irq(irq, dino_dev->global_irq, DINO_LOCAL_IRQS);
         u32 tmp;
 
-        DBG(KERN_WARNING "%s(0x%p, %d)\n", __FUNCTION__, dino_dev, irq);
+        DBG(KERN_WARNING "%s(0x%p, %d)\n", __func__, dino_dev, irq);
 
         /*
         ** clear pending IRQ bits
@@ -340,7 +340,7 @@ static void dino_enable_irq(unsigned int irq)
         tmp = __raw_readl(dino_dev->hba.base_addr+DINO_ILR);
         if (tmp & DINO_MASK_IRQ(local_irq)) {
                 DBG(KERN_WARNING "%s(): IRQ asserted! (ILR 0x%x)\n",
-                                __FUNCTION__, tmp);
+                                __func__, tmp);
                 gsc_writel(dino_dev->txn_data, dino_dev->txn_addr);
         }
 }
@@ -388,7 +388,7 @@ ilr_again:
                 int local_irq = __ffs(mask);
                 int irq = dino_dev->global_irq[local_irq];
                 DBG(KERN_DEBUG "%s(%d, %p) mask 0x%x\n",
-                        __FUNCTION__, irq, intr_dev, mask);
+                        __func__, irq, intr_dev, mask);
                 __do_IRQ(irq);
                 mask &= ~(1 << local_irq);
         } while (mask);
@@ -566,7 +566,7 @@ dino_fixup_bus(struct pci_bus *bus)
         int port_base = HBA_PORT_BASE(dino_dev->hba.hba_num);
 
         DBG(KERN_WARNING "%s(0x%p) bus %d platform_data 0x%p\n",
-            __FUNCTION__, bus, bus->secondary, 
+            __func__, bus, bus->secondary,
             bus->bridge->platform_data);
 
         /* Firmware doesn't set up card-mode dino, so we have to */
diff --git a/drivers/parisc/gsc.c b/drivers/parisc/gsc.c
index 1b3e3fd12d95..f7d088b897ee 100644
--- a/drivers/parisc/gsc.c
+++ b/drivers/parisc/gsc.c
@@ -112,7 +112,7 @@ static void gsc_asic_disable_irq(unsigned int irq)
         int local_irq = gsc_find_local_irq(irq, irq_dev->global_irq, 32);
         u32 imr;
 
-        DEBPRINTK(KERN_DEBUG "%s(%d) %s: IMR 0x%x\n", __FUNCTION__, irq,
+        DEBPRINTK(KERN_DEBUG "%s(%d) %s: IMR 0x%x\n", __func__, irq,
                         irq_dev->name, imr);
 
         /* Disable the IRQ line by clearing the bit in the IMR */
@@ -127,7 +127,7 @@ static void gsc_asic_enable_irq(unsigned int irq)
         int local_irq = gsc_find_local_irq(irq, irq_dev->global_irq, 32);
         u32 imr;
 
-        DEBPRINTK(KERN_DEBUG "%s(%d) %s: IMR 0x%x\n", __FUNCTION__, irq,
+        DEBPRINTK(KERN_DEBUG "%s(%d) %s: IMR 0x%x\n", __func__, irq,
                         irq_dev->name, imr);
 
         /* Enable the IRQ line by setting the bit in the IMR */
diff --git a/drivers/parisc/lasi.c b/drivers/parisc/lasi.c
index cb3d28176129..bee510098ce8 100644
--- a/drivers/parisc/lasi.c
+++ b/drivers/parisc/lasi.c
@@ -193,7 +193,7 @@ lasi_init_chip(struct parisc_device *dev)
         dev->irq = gsc_alloc_irq(&gsc_irq);
         if (dev->irq < 0) {
                 printk(KERN_ERR "%s(): cannot get GSC irq\n",
-                                __FUNCTION__);
+                                __func__);
                 kfree(lasi);
                 return -EBUSY;
         }
diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c
index 66ce61048361..a28c8946deaa 100644
--- a/drivers/parisc/lba_pci.c
+++ b/drivers/parisc/lba_pci.c
@@ -377,12 +377,12 @@ static int elroy_cfg_read(struct pci_bus *bus, unsigned int devfn, int pos, int
                 /* original - Generate config cycle on broken elroy
                   with risk we will miss PCI bus errors. */
                 *data = lba_rd_cfg(d, tok, pos, size);
-                DBG_CFG("%s(%x+%2x) -> 0x%x (a)\n", __FUNCTION__, tok, pos, *data);
+                DBG_CFG("%s(%x+%2x) -> 0x%x (a)\n", __func__, tok, pos, *data);
                 return 0;
         }
 
         if (LBA_SKIP_PROBE(d) && !lba_device_present(bus->secondary, devfn, d)) {
-                DBG_CFG("%s(%x+%2x) -> -1 (b)\n", __FUNCTION__, tok, pos);
+                DBG_CFG("%s(%x+%2x) -> -1 (b)\n", __func__, tok, pos);
                 /* either don't want to look or know device isn't present. */
                 *data = ~0U;
                 return(0);
@@ -398,7 +398,7 @@ static int elroy_cfg_read(struct pci_bus *bus, unsigned int devfn, int pos, int
         case 2: *data = READ_REG16(data_reg + (pos & 2)); break;
         case 4: *data = READ_REG32(data_reg); break;
         }
-        DBG_CFG("%s(%x+%2x) -> 0x%x (c)\n", __FUNCTION__, tok, pos, *data);
+        DBG_CFG("%s(%x+%2x) -> 0x%x (c)\n", __func__, tok, pos, *data);
         return 0;
 }
 
@@ -441,16 +441,16 @@ static int elroy_cfg_write(struct pci_bus *bus, unsigned int devfn, int pos, int
         if (!LBA_SKIP_PROBE(d)) {
                 /* Original Workaround */
                 lba_wr_cfg(d, tok, pos, (u32) data, size);
-                DBG_CFG("%s(%x+%2x) = 0x%x (a)\n", __FUNCTION__, tok, pos,data);
+                DBG_CFG("%s(%x+%2x) = 0x%x (a)\n", __func__, tok, pos,data);
                 return 0;
         }
 
         if (LBA_SKIP_PROBE(d) && (!lba_device_present(bus->secondary, devfn, d))) {
-                DBG_CFG("%s(%x+%2x) = 0x%x (b)\n", __FUNCTION__, tok, pos,data);
+                DBG_CFG("%s(%x+%2x) = 0x%x (b)\n", __func__, tok, pos,data);
                 return 1; /* New Workaround */
         }
 
-        DBG_CFG("%s(%x+%2x) = 0x%x (c)\n", __FUNCTION__, tok, pos, data);
+        DBG_CFG("%s(%x+%2x) = 0x%x (c)\n", __func__, tok, pos, data);
 
         /* Basic Algorithm */
         LBA_CFG_ADDR_SETUP(d, tok | pos);
@@ -521,7 +521,7 @@ static int mercury_cfg_write(struct pci_bus *bus, unsigned int devfn, int pos, i
         if ((pos > 255) || (devfn > 255))
                 return -EINVAL;
 
-        DBG_CFG("%s(%x+%2x) <- 0x%x (c)\n", __FUNCTION__, tok, pos, data);
+        DBG_CFG("%s(%x+%2x) <- 0x%x (c)\n", __func__, tok, pos, data);
 
         LBA_CFG_TR4_ADDR_SETUP(d, tok | pos);
         switch(size) {
@@ -890,7 +890,7 @@ LBA_PORT_IN(32, 0)
 #define LBA_PORT_OUT(size, mask) \
 static void lba_astro_out##size (struct pci_hba_data *d, u16 addr, u##size val) \
 { \
-        DBG_PORT("%s(0x%p, 0x%x, 0x%x)\n", __FUNCTION__, d, addr, val); \
+        DBG_PORT("%s(0x%p, 0x%x, 0x%x)\n", __func__, d, addr, val); \
         WRITE_REG##size(val, astro_iop_base + addr); \
         if (LBA_DEV(d)->hw_rev < 3) \
                 lba_t32 = READ_U32(d->base_addr + LBA_FUNC_ID); \
@@ -932,7 +932,7 @@ static struct pci_port_ops lba_astro_port_ops = {
 static u##size lba_pat_in##size (struct pci_hba_data *l, u16 addr) \
 { \
         u##size t; \
-        DBG_PORT("%s(0x%p, 0x%x) ->", __FUNCTION__, l, addr); \
+        DBG_PORT("%s(0x%p, 0x%x) ->", __func__, l, addr); \
         t = READ_REG##size(PIOP_TO_GMMIO(LBA_DEV(l), addr)); \
         DBG_PORT(" 0x%x\n", t); \
         return (t); \
@@ -948,7 +948,7 @@ LBA_PORT_IN(32, 0)
 static void lba_pat_out##size (struct pci_hba_data *l, u16 addr, u##size val) \
 { \
         void __iomem *where = PIOP_TO_GMMIO(LBA_DEV(l), addr); \
-        DBG_PORT("%s(0x%p, 0x%x, 0x%x)\n", __FUNCTION__, l, addr, val); \
+        DBG_PORT("%s(0x%p, 0x%x, 0x%x)\n", __func__, l, addr, val); \
         WRITE_REG##size(val, where); \
         /* flush the I/O down to the elroy at least */ \
         lba_t32 = READ_U32(l->base_addr + LBA_FUNC_ID); \
@@ -1584,7 +1584,7 @@ void lba_set_iregs(struct parisc_device *lba, u32 ibase, u32 imask)
         WARN_ON((ibase & 0x001fffff) != 0);
         WARN_ON((imask & 0x001fffff) != 0);
         
-        DBG("%s() ibase 0x%x imask 0x%x\n", __FUNCTION__, ibase, imask);
+        DBG("%s() ibase 0x%x imask 0x%x\n", __func__, ibase, imask);
         WRITE_REG32( imask, base_addr + LBA_IMASK);
         WRITE_REG32( ibase, base_addr + LBA_IBASE);
         iounmap(base_addr);
diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c
index 703b85edb004..f9b12664f9fb 100644
--- a/drivers/parisc/led.c
+++ b/drivers/parisc/led.c
@@ -569,7 +569,7 @@ int __init register_led_driver(int model, unsigned long cmd_reg, unsigned long d
 
         default:
                 printk(KERN_ERR "%s: Wrong LCD/LED model %d !\n",
-                       __FUNCTION__, lcd_info.model);
+                       __func__, lcd_info.model);
                 return 1;
         }
         
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index afc849bd3f58..bc73b96346ff 100644
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -384,7 +384,7 @@ sba_search_bitmap(struct ioc *ioc, struct device *dev,
                 }
                 mask = RESMAP_MASK(bits_wanted) >> bitshiftcnt;
 
-                DBG_RES("%s() o %ld %p", __FUNCTION__, o, res_ptr);
+                DBG_RES("%s() o %ld %p", __func__, o, res_ptr);
                 while(res_ptr < res_end)
                 { 
                         DBG_RES("    %p %lx %lx\n", res_ptr, mask, *res_ptr);
@@ -454,7 +454,7 @@ sba_alloc_range(struct ioc *ioc, struct device *dev, size_t size)
 #endif
 
         DBG_RES("%s(%x) %d -> %lx hint %x/%x\n",
-                __FUNCTION__, size, pages_needed, pide,
+                __func__, size, pages_needed, pide,
                 (uint) ((unsigned long) ioc->res_hint - (unsigned long) ioc->res_map),
                 ioc->res_bitshift );
 
@@ -497,7 +497,7 @@ sba_free_range(struct ioc *ioc, dma_addr_t iova, size_t size)
         unsigned long m = RESMAP_MASK(bits_not_wanted) >> (pide & (BITS_PER_LONG - 1));
 
         DBG_RES("%s( ,%x,%x) %x/%lx %x %p %lx\n",
-                __FUNCTION__, (uint) iova, size,
+                __func__, (uint) iova, size,
                 bits_not_wanted, m, pide, res_ptr, *res_ptr);
 
 #ifdef SBA_COLLECT_STATS
@@ -740,7 +740,7 @@ sba_map_single(struct device *dev, void *addr, size_t size,
         iovp = (dma_addr_t) pide << IOVP_SHIFT;
 
         DBG_RUN("%s() 0x%p -> 0x%lx\n",
-                __FUNCTION__, addr, (long) iovp | offset);
+                __func__, addr, (long) iovp | offset);
 
         pdir_start = &(ioc->pdir_base[pide]);
 
@@ -798,7 +798,7 @@ sba_unmap_single(struct device *dev, dma_addr_t iova, size_t size,
         unsigned long flags; 
         dma_addr_t offset;
 
-        DBG_RUN("%s() iovp 0x%lx/%x\n", __FUNCTION__, (long) iova, size);
+        DBG_RUN("%s() iovp 0x%lx/%x\n", __func__, (long) iova, size);
 
         ioc = GET_IOC(dev);
         offset = iova & ~IOVP_MASK;
@@ -937,7 +937,7 @@ sba_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
         int coalesced, filled = 0;
         unsigned long flags;
 
-        DBG_RUN_SG("%s() START %d entries\n", __FUNCTION__, nents);
+        DBG_RUN_SG("%s() START %d entries\n", __func__, nents);
 
         ioc = GET_IOC(dev);
 
@@ -998,7 +998,7 @@ sba_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
 
         spin_unlock_irqrestore(&ioc->res_lock, flags);
 
-        DBG_RUN_SG("%s() DONE %d mappings\n", __FUNCTION__, filled);
+        DBG_RUN_SG("%s() DONE %d mappings\n", __func__, filled);
 
         return filled;
 }
@@ -1023,7 +1023,7 @@ sba_unmap_sg(struct device *dev, struct scatterlist *sglist, int nents,
 #endif
 
         DBG_RUN_SG("%s() START %d entries,  %p,%x\n",
-                __FUNCTION__, nents, sg_virt_addr(sglist), sglist->length);
+                __func__, nents, sg_virt_addr(sglist), sglist->length);
 
         ioc = GET_IOC(dev);
 
@@ -1047,7 +1047,7 @@ sba_unmap_sg(struct device *dev, struct scatterlist *sglist, int nents,
                 ++sglist;
         }
 
-        DBG_RUN_SG("%s() DONE (nents %d)\n", __FUNCTION__,  nents);
+        DBG_RUN_SG("%s() DONE (nents %d)\n", __func__,  nents);
 
 #ifdef ASSERT_PDIR_SANITY
         spin_lock_irqsave(&ioc->res_lock, flags);
@@ -1118,7 +1118,7 @@ sba_alloc_pdir(unsigned int pdir_size)
         pdir_base = __get_free_pages(GFP_KERNEL, pdir_order);
         if (NULL == (void *) pdir_base) {
                 panic("%s() could not allocate I/O Page Table\n",
-                        __FUNCTION__);
+                        __func__);
         }
 
         /* If this is not PA8700 (PCX-W2)
@@ -1261,7 +1261,7 @@ sba_ioc_init_pluto(struct parisc_device *sba, struct ioc *ioc, int ioc_num)
         ioc->pdir_size = (iova_space_size / IOVP_SIZE) * sizeof(u64);
 
         DBG_INIT("%s() hpa 0x%p IOV %dMB (%d bits)\n",
-                __FUNCTION__, ioc->ioc_hpa, iova_space_size >> 20,
+                __func__, ioc->ioc_hpa, iova_space_size >> 20,
                 iov_order + PAGE_SHIFT);
 
         ioc->pdir_base = (void *) __get_free_pages(GFP_KERNEL,
@@ -1272,7 +1272,7 @@ sba_ioc_init_pluto(struct parisc_device *sba, struct ioc *ioc, int ioc_num)
         memset(ioc->pdir_base, 0, ioc->pdir_size);
 
         DBG_INIT("%s() pdir %p size %x\n",
-                        __FUNCTION__, ioc->pdir_base, ioc->pdir_size);
+                        __func__, ioc->pdir_base, ioc->pdir_size);
 
 #ifdef SBA_HINT_SUPPORT
         ioc->hint_shift_pdir = iov_order + PAGE_SHIFT;
@@ -1354,7 +1354,7 @@ sba_ioc_init_pluto(struct parisc_device *sba, struct ioc *ioc, int ioc_num)
 
         if (agp_found && sba_reserve_agpgart) {
                 printk(KERN_INFO "%s: reserving %dMb of IOVA space for agpgart\n",
-                       __FUNCTION__, (iova_space_size/2) >> 20);
+                       __func__, (iova_space_size/2) >> 20);
                 ioc->pdir_size /= 2;
                 ioc->pdir_base[PDIR_INDEX(iova_space_size/2)] = SBA_AGPGART_COOKIE;
         }
@@ -1406,7 +1406,7 @@ sba_ioc_init(struct parisc_device *sba, struct ioc *ioc, int ioc_num)
         ioc->pdir_size = pdir_size = (iova_space_size/IOVP_SIZE) * sizeof(u64);
 
         DBG_INIT("%s() hpa 0x%lx mem %ldMB IOV %dMB (%d bits)\n",
-                        __FUNCTION__,
+                        __func__,
                         ioc->ioc_hpa,
                         (unsigned long) num_physpages >> (20 - PAGE_SHIFT),
                         iova_space_size>>20,
@@ -1415,7 +1415,7 @@ sba_ioc_init(struct parisc_device *sba, struct ioc *ioc, int ioc_num)
         ioc->pdir_base = sba_alloc_pdir(pdir_size);
 
         DBG_INIT("%s() pdir %p size %x\n",
-                        __FUNCTION__, ioc->pdir_base, pdir_size);
+                        __func__, ioc->pdir_base, pdir_size);
 
 #ifdef SBA_HINT_SUPPORT
         /* FIXME : DMA HINTs not used */
@@ -1443,7 +1443,7 @@ sba_ioc_init(struct parisc_device *sba, struct ioc *ioc, int ioc_num)
 #endif
 
         DBG_INIT("%s() IOV base 0x%lx mask 0x%0lx\n",
-                __FUNCTION__, ioc->ibase, ioc->imask);
+                __func__, ioc->ibase, ioc->imask);
 
         /*
         ** FIXME: Hint registers are programmed with default hint
@@ -1470,7 +1470,7 @@ sba_ioc_init(struct parisc_device *sba, struct ioc *ioc, int ioc_num)
 
         ioc->ibase = 0; /* used by SBA_IOVA and related macros */       
 
-        DBG_INIT("%s() DONE\n", __FUNCTION__);
+        DBG_INIT("%s() DONE\n", __func__);
 }
 
 
@@ -1544,7 +1544,7 @@ printk("sba_hw_init(): mem_boot 0x%x 0x%x 0x%x 0x%x\n", PAGE0->mem_boot.hpa,
         if (!IS_PLUTO(sba_dev->dev)) {
                 ioc_ctl = READ_REG(sba_dev->sba_hpa+IOC_CTRL);
                 DBG_INIT("%s() hpa 0x%lx ioc_ctl 0x%Lx ->",
-                        __FUNCTION__, sba_dev->sba_hpa, ioc_ctl);
+                        __func__, sba_dev->sba_hpa, ioc_ctl);
                 ioc_ctl &= ~(IOC_CTRL_RM | IOC_CTRL_NC | IOC_CTRL_CE);
                 ioc_ctl |= IOC_CTRL_DD | IOC_CTRL_D4 | IOC_CTRL_TC;
                         /* j6700 v1.6 firmware sets 0x294f */
@@ -1675,7 +1675,7 @@ sba_common_init(struct sba_device *sba_dev)
 
                 res_size >>= 3;  /* convert bit count to byte count */
                 DBG_INIT("%s() res_size 0x%x\n",
-                        __FUNCTION__, res_size);
+                        __func__, res_size);
 
                 sba_dev->ioc[i].res_size = res_size;
                 sba_dev->ioc[i].res_map = (char *) __get_free_pages(GFP_KERNEL, get_order(res_size));
@@ -1688,7 +1688,7 @@ sba_common_init(struct sba_device *sba_dev)
                 if (NULL == sba_dev->ioc[i].res_map)
                 {
                         panic("%s:%s() could not allocate resource map\n",
-                              __FILE__, __FUNCTION__ );
+                              __FILE__, __func__ );
                 }
 
                 memset(sba_dev->ioc[i].res_map, 0, res_size);
@@ -1725,7 +1725,7 @@ sba_common_init(struct sba_device *sba_dev)
 #endif
 
                 DBG_INIT("%s() %d res_map %x %p\n",
-                        __FUNCTION__, i, res_size, sba_dev->ioc[i].res_map);
+                        __func__, i, res_size, sba_dev->ioc[i].res_map);
         }
 
         spin_lock_init(&sba_dev->sba_lock);
diff --git a/drivers/parisc/wax.c b/drivers/parisc/wax.c
index 813c2c24ab1e..892a83bbe73d 100644
--- a/drivers/parisc/wax.c
+++ b/drivers/parisc/wax.c
@@ -93,7 +93,7 @@ wax_init_chip(struct parisc_device *dev)
         dev->irq = gsc_claim_irq(&gsc_irq, WAX_GSC_IRQ);
         if (dev->irq < 0) {
                 printk(KERN_ERR "%s(): cannot get GSC irq\n",
-                                __FUNCTION__);
+                                __func__);
                 kfree(wax);
                 return -EBUSY;
         }
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 1fd8bb765702..66c0fd21894b 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -49,7 +49,7 @@
 
 #define DEFAULT_DOMAIN_ADDRESS_WIDTH 48
 
-#define DMAR_OPERATION_TIMEOUT (HZ*60) /* 1m */
+#define DMAR_OPERATION_TIMEOUT ((cycles_t) tsc_khz*10*1000) /* 10sec */
 
 #define DOMAIN_MAX_ADDR(gaw) ((((u64)1) << gaw) - 1)
 
@@ -490,12 +490,12 @@ static int iommu_alloc_root_entry(struct intel_iommu *iommu)
 
 #define IOMMU_WAIT_OP(iommu, offset, op, cond, sts) \
 {\
-        unsigned long start_time = jiffies;\
+        cycles_t start_time = get_cycles();\
         while (1) {\
                 sts = op (iommu->reg + offset);\
                 if (cond)\
                         break;\
-                if (time_after(jiffies, start_time + DMAR_OPERATION_TIMEOUT))\
+                if (DMAR_OPERATION_TIMEOUT < (get_cycles() - start_time))\
                         panic("DMAR hardware is malfunctioning\n");\
                 cpu_relax();\
         }\
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index 72f7476930c8..9d6fc8e6285d 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -19,8 +19,31 @@
 #include <linux/pci-acpi.h>
 #include "pci.h"
 
-static u32 ctrlset_buf[3] = {0, 0, 0};
-static u32 global_ctrlsets = 0;
+struct acpi_osc_data {
+        acpi_handle handle;
+        u32 ctrlset_buf[3];
+        u32 global_ctrlsets;
+        struct list_head sibiling;
+};
+static LIST_HEAD(acpi_osc_data_list);
+
+static struct acpi_osc_data *acpi_get_osc_data(acpi_handle handle)
+{
+        struct acpi_osc_data *data;
+
+        list_for_each_entry(data, &acpi_osc_data_list, sibiling) {
+                if (data->handle == handle)
+                        return data;
+        }
+        data = kzalloc(sizeof(*data), GFP_KERNEL);
+        if (!data)
+                return NULL;
+        INIT_LIST_HEAD(&data->sibiling);
+        data->handle = handle;
+        list_add_tail(&data->sibiling, &acpi_osc_data_list);
+        return data;
+}
+
 static u8 OSC_UUID[16] = {0x5B, 0x4D, 0xDB, 0x33, 0xF7, 0x1F, 0x1C, 0x40, 0x96, 0x57, 0x74, 0x41, 0xC0, 0x3D, 0xD7, 0x66};
 
 static acpi_status  
@@ -37,8 +60,27 @@ acpi_query_osc (
         union acpi_object       *out_obj;
         u32                     osc_dw0;
         acpi_status *ret_status = (acpi_status *)retval;
+        struct acpi_osc_data *osc_data;
+        u32 flags = (unsigned long)context, temp;
+        acpi_handle tmp;
+
+        status = acpi_get_handle(handle, "_OSC", &tmp);
+        if (ACPI_FAILURE(status))
+                return status;
+
+        osc_data = acpi_get_osc_data(handle);
+        if (!osc_data) {
+                printk(KERN_ERR "acpi osc data array is full\n");
+                return AE_ERROR;
+        }
+
+        osc_data->ctrlset_buf[OSC_SUPPORT_TYPE] |= (flags & OSC_SUPPORT_MASKS);
+
+        /* do _OSC query for all possible controls */
+        temp = osc_data->ctrlset_buf[OSC_CONTROL_TYPE];
+        osc_data->ctrlset_buf[OSC_QUERY_TYPE] = OSC_QUERY_ENABLE;
+        osc_data->ctrlset_buf[OSC_CONTROL_TYPE] = OSC_CONTROL_MASKS;
 
-        
         /* Setting up input parameters */
         input.count = 4;
         input.pointer = in_params;
@@ -51,13 +93,11 @@ acpi_query_osc (
         in_params[2].integer.value      = 3;
         in_params[3].type               = ACPI_TYPE_BUFFER;
         in_params[3].buffer.length      = 12;
-        in_params[3].buffer.pointer     = (u8 *)context;
+        in_params[3].buffer.pointer     = (u8 *)osc_data->ctrlset_buf;
 
         status = acpi_evaluate_object(handle, "_OSC", &input, &output);
-        if (ACPI_FAILURE (status)) {
-                *ret_status = status;
-                return status;
-        }
+        if (ACPI_FAILURE(status))
+                goto out_nofree;
         out_obj = output.pointer;
 
         if (out_obj->type != ACPI_TYPE_BUFFER) {
@@ -76,7 +116,8 @@ acpi_query_osc (
                         printk(KERN_DEBUG "_OSC invalid revision\n"); 
                 if (osc_dw0 & OSC_CAPABILITIES_MASK_ERROR) {
                         /* Update Global Control Set */
-                        global_ctrlsets = *((u32 *)(out_obj->buffer.pointer+8));
+                        osc_data->global_ctrlsets =
+                                *((u32 *)(out_obj->buffer.pointer + 8));
                         status = AE_OK;
                         goto query_osc_out;
                 }
@@ -85,12 +126,21 @@ acpi_query_osc (
         }
 
         /* Update Global Control Set */
-        global_ctrlsets = *((u32 *)(out_obj->buffer.pointer + 8));
+        osc_data->global_ctrlsets = *((u32 *)(out_obj->buffer.pointer + 8));
         status = AE_OK;
 
 query_osc_out:
         kfree(output.pointer);
+out_nofree:
         *ret_status = status;
+
+        osc_data->ctrlset_buf[OSC_QUERY_TYPE] = !OSC_QUERY_ENABLE;
+        osc_data->ctrlset_buf[OSC_CONTROL_TYPE] = temp;
+        if (ACPI_FAILURE(status)) {
+                /* no osc support at all */
+                osc_data->ctrlset_buf[OSC_SUPPORT_TYPE] = 0;
+        }
+
         return status;
 }
 
@@ -165,28 +215,15 @@ run_osc_out:
  **/
 acpi_status __pci_osc_support_set(u32 flags, const char *hid)
 {
-        u32 temp;
-        acpi_status retval;
+        acpi_status retval = AE_NOT_FOUND;
 
         if (!(flags & OSC_SUPPORT_MASKS)) {
                 return AE_TYPE;
         }
-        ctrlset_buf[OSC_SUPPORT_TYPE] |= (flags & OSC_SUPPORT_MASKS);
-
-        /* do _OSC query for all possible controls */
-        temp = ctrlset_buf[OSC_CONTROL_TYPE];
-        ctrlset_buf[OSC_QUERY_TYPE] = OSC_QUERY_ENABLE;
-        ctrlset_buf[OSC_CONTROL_TYPE] = OSC_CONTROL_MASKS;
         acpi_get_devices(hid,
                         acpi_query_osc,
-                        ctrlset_buf,
+                        (void *)(unsigned long)flags,
                         (void **) &retval );
-        ctrlset_buf[OSC_QUERY_TYPE] = !OSC_QUERY_ENABLE;
-        ctrlset_buf[OSC_CONTROL_TYPE] = temp;
-        if (ACPI_FAILURE(retval)) {
-                /* no osc support at all */
-                ctrlset_buf[OSC_SUPPORT_TYPE] = 0;
-        }
         return AE_OK;
 }
 
@@ -201,19 +238,31 @@ acpi_status pci_osc_control_set(acpi_handle handle, u32 flags)
 {
         acpi_status     status;
         u32             ctrlset;
+        acpi_handle tmp;
+        struct acpi_osc_data *osc_data;
+
+        status = acpi_get_handle(handle, "_OSC", &tmp);
+        if (ACPI_FAILURE(status))
+                return status;
+
+        osc_data = acpi_get_osc_data(handle);
+        if (!osc_data) {
+                printk(KERN_ERR "acpi osc data array is full\n");
+                return AE_ERROR;
+        }
 
         ctrlset = (flags & OSC_CONTROL_MASKS);
         if (!ctrlset) {
                 return AE_TYPE;
         }
-        if (ctrlset_buf[OSC_SUPPORT_TYPE] && 
-                ((global_ctrlsets & ctrlset) != ctrlset)) {
+        if (osc_data->ctrlset_buf[OSC_SUPPORT_TYPE] &&
+                ((osc_data->global_ctrlsets & ctrlset) != ctrlset)) {
                 return AE_SUPPORT;
         }
-        ctrlset_buf[OSC_CONTROL_TYPE] |= ctrlset;
-        status = acpi_run_osc(handle, ctrlset_buf);
+        osc_data->ctrlset_buf[OSC_CONTROL_TYPE] |= ctrlset;
+        status = acpi_run_osc(handle, osc_data->ctrlset_buf);
         if (ACPI_FAILURE (status)) {
-                ctrlset_buf[OSC_CONTROL_TYPE] &= ~ctrlset;
+                osc_data->ctrlset_buf[OSC_CONTROL_TYPE] &= ~ctrlset;
         }
         
         return status;
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index afd914ebe215..dabb563f51d9 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -1503,8 +1503,7 @@ static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_f
                     (f->device == dev->device || f->device == (u16) PCI_ANY_ID)) {
 #ifdef DEBUG
                         dev_dbg(&dev->dev, "calling ");
-                        print_fn_descriptor_symbol("%s()\n",
-                                (unsigned long) f->hook);
+                        print_fn_descriptor_symbol("%s\n", f->hook);
 #endif
                         f->hook(dev);
                 }
@@ -1826,6 +1825,7 @@ static void __devinit nv_msi_ht_cap_quirk(struct pci_dev *dev)
         }
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID, nv_msi_ht_cap_quirk);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AL, PCI_ANY_ID, nv_msi_ht_cap_quirk);
 
 static void __devinit quirk_msi_intx_disable_bug(struct pci_dev *dev)
 {
diff --git a/drivers/pnp/base.h b/drivers/pnp/base.h
index 4fe7c58f57e9..886dac823ed6 100644
--- a/drivers/pnp/base.h
+++ b/drivers/pnp/base.h
@@ -19,6 +19,7 @@ void pnp_remove_card(struct pnp_card *card);
 int pnp_add_card_device(struct pnp_card *card, struct pnp_dev *dev);
 void pnp_remove_card_device(struct pnp_dev *dev);
 
+struct pnp_option *pnp_build_option(int priority);
 struct pnp_option *pnp_register_independent_option(struct pnp_dev *dev);
 struct pnp_option *pnp_register_dependent_option(struct pnp_dev *dev,
                                                  int priority);
diff --git a/drivers/pnp/interface.c b/drivers/pnp/interface.c
index 5d9301de1778..5695a79f3a52 100644
--- a/drivers/pnp/interface.c
+++ b/drivers/pnp/interface.c
@@ -424,7 +424,7 @@ pnp_set_current_resources(struct device *dmdev, struct device_attribute *attr,
                                 start = simple_strtoul(buf, &buf, 0);
                                 pnp_res = pnp_add_irq_resource(dev, start, 0);
                                 if (pnp_res)
-                                        nirq++;
+                                        pnp_res->index = nirq++;
                                 continue;
                         }
                         if (!strnicmp(buf, "dma", 3)) {
diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index d049a2279fea..e2b7de4cb05e 100644
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -111,6 +111,113 @@ static void quirk_sb16audio_resources(struct pnp_dev *dev)
                 dev_info(&dev->dev, "SB audio device quirk - increased port range\n");
 }
 
+static struct pnp_option *quirk_isapnp_mpu_options(struct pnp_dev *dev)
+{
+        struct pnp_option *head = NULL;
+        struct pnp_option *prev = NULL;
+        struct pnp_option *res;
+
+        /*
+         * Build a functional IRQ-less variant of each MPU option.
+         */
+
+        for (res = dev->dependent; res; res = res->next) {
+                struct pnp_option *curr;
+                struct pnp_port *port;
+                struct pnp_port *copy;
+
+                port = res->port;
+                if (!port || !res->irq)
+                        continue;
+
+                copy = pnp_alloc(sizeof *copy);
+                if (!copy)
+                        break;
+
+                copy->min = port->min;
+                copy->max = port->max;
+                copy->align = port->align;
+                copy->size = port->size;
+                copy->flags = port->flags;
+
+                curr = pnp_build_option(PNP_RES_PRIORITY_FUNCTIONAL);
+                if (!curr) {
+                        kfree(copy);
+                        break;
+                }
+                curr->port = copy;
+
+                if (prev)
+                        prev->next = curr;
+                else
+                        head = curr;
+                prev = curr;
+        }
+        if (head)
+                dev_info(&dev->dev, "adding IRQ-less MPU options\n");
+
+        return head;
+}
+
+static void quirk_ad1815_mpu_resources(struct pnp_dev *dev)
+{
+        struct pnp_option *res;
+        struct pnp_irq *irq;
+
+        /*
+         * Distribute the independent IRQ over the dependent options
+         */
+
+        res = dev->independent;
+        if (!res)
+                return;
+
+        irq = res->irq;
+        if (!irq || irq->next)
+                return;
+
+        res = dev->dependent;
+        if (!res)
+                return;
+
+        while (1) {
+                struct pnp_irq *copy;
+
+                copy = pnp_alloc(sizeof *copy);
+                if (!copy)
+                        break;
+
+                memcpy(copy->map, irq->map, sizeof copy->map);
+                copy->flags = irq->flags;
+
+                copy->next = res->irq; /* Yes, this is NULL */
+                res->irq = copy;
+
+                if (!res->next)
+                        break;
+                res = res->next;
+        }
+        kfree(irq);
+
+        res->next = quirk_isapnp_mpu_options(dev);
+
+        res = dev->independent;
+        res->irq = NULL;
+}
+
+static void quirk_isapnp_mpu_resources(struct pnp_dev *dev)
+{
+        struct pnp_option *res;
+
+        res = dev->dependent;
+        if (!res)
+                return;
+
+        while (res->next)
+                res = res->next;
+
+        res->next = quirk_isapnp_mpu_options(dev);
+}
 
 #include <linux/pci.h>
 
@@ -205,6 +312,11 @@ static struct pnp_fixup pnp_fixups[] = {
         {"CTL0043", quirk_sb16audio_resources},
         {"CTL0044", quirk_sb16audio_resources},
         {"CTL0045", quirk_sb16audio_resources},
+        /* Add IRQ-less MPU options */
+        {"ADS7151", quirk_ad1815_mpu_resources},
+        {"ADS7181", quirk_isapnp_mpu_resources},
+        {"AZT0002", quirk_isapnp_mpu_resources},
+        /* PnP resources that might overlap PCI BARs */
         {"PNP0c01", quirk_system_pci_resources},
         {"PNP0c02", quirk_system_pci_resources},
         {""}
@@ -212,20 +324,15 @@ static struct pnp_fixup pnp_fixups[] = {
 
 void pnp_fixup_device(struct pnp_dev *dev)
 {
-        int i = 0;
-        void (*quirk)(struct pnp_dev *);
-
-        while (*pnp_fixups[i].id) {
-                if (compare_pnp_id(dev->id, pnp_fixups[i].id)) {
-                        quirk = pnp_fixups[i].quirk_function;
+        struct pnp_fixup *f;
 
+        for (f = pnp_fixups; *f->id; f++) {
+                if (!compare_pnp_id(dev->id, f->id))
+                        continue;
 #ifdef DEBUG
-                        dev_dbg(&dev->dev, "calling ");
-                        print_fn_descriptor_symbol("%s()\n",
-                                (unsigned long) *quirk);
+                dev_dbg(&dev->dev, "%s: calling ", f->id);
+                print_fn_descriptor_symbol("%s\n", f->quirk_function);
 #endif
-                        (*quirk)(dev);
-                }
-                i++;
+                f->quirk_function(dev);
         }
 }
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index 2041620d5682..390b50096e30 100644
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -28,7 +28,7 @@ static int pnp_reserve_mem[16] = {[0 ... 15] = -1 };	/* reserve (don't use) some
  * option registration
  */
 
-static struct pnp_option *pnp_build_option(int priority)
+struct pnp_option *pnp_build_option(int priority)
 {
         struct pnp_option *option = pnp_alloc(sizeof(struct pnp_option));
 
diff --git a/drivers/pnp/support.c b/drivers/pnp/support.c
index 3eba85ed729c..95b076c18c07 100644
--- a/drivers/pnp/support.c
+++ b/drivers/pnp/support.c
@@ -45,10 +45,10 @@ void pnp_eisa_id_to_string(u32 id, char *str)
         str[0] = 'A' + ((id >> 26) & 0x3f) - 1;
         str[1] = 'A' + ((id >> 21) & 0x1f) - 1;
         str[2] = 'A' + ((id >> 16) & 0x1f) - 1;
-        str[3] = hex_asc((id >> 12) & 0xf);
-        str[4] = hex_asc((id >>  8) & 0xf);
-        str[5] = hex_asc((id >>  4) & 0xf);
-        str[6] = hex_asc((id >>  0) & 0xf);
+        str[3] = hex_asc_hi(id >> 8);
+        str[4] = hex_asc_lo(id >> 8);
+        str[5] = hex_asc_hi(id);
+        str[6] = hex_asc_lo(id);
         str[7] = '\0';
 }
 
diff --git a/drivers/rtc/rtc-lib.c b/drivers/rtc/rtc-lib.c
index ba795a4db1e9..9f996ec881ce 100644
--- a/drivers/rtc/rtc-lib.c
+++ b/drivers/rtc/rtc-lib.c
@@ -51,7 +51,7 @@ EXPORT_SYMBOL(rtc_year_days);
  */
 void rtc_time_to_tm(unsigned long time, struct rtc_time *tm)
 {
-        register int days, month, year;
+        unsigned int days, month, year;
 
         days = time / 86400;
         time -= days * 86400;
diff --git a/drivers/rtc/rtc-m41t80.c b/drivers/rtc/rtc-m41t80.c
index 316bfaa80872..a3e0880b38fb 100644
--- a/drivers/rtc/rtc-m41t80.c
+++ b/drivers/rtc/rtc-m41t80.c
@@ -15,6 +15,7 @@
 
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/i2c.h>
@@ -803,6 +804,7 @@ static int m41t80_probe(struct i2c_client *client,
 
 #ifdef CONFIG_RTC_DRV_M41T80_WDT
         if (clientdata->features & M41T80_FEATURE_HT) {
+                save_client = client;
                 rc = misc_register(&wdt_dev);
                 if (rc)
                         goto exit;
@@ -811,7 +813,6 @@ static int m41t80_probe(struct i2c_client *client,
                         misc_deregister(&wdt_dev);
                         goto exit;
                 }
-                save_client = client;
         }
 #endif
         return 0;
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index ac6d4d3218b3..8ba3f135da22 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -925,6 +925,8 @@ static void dasd_handle_killed_request(struct ccw_device *cdev,
         struct dasd_ccw_req *cqr;
         struct dasd_device *device;
 
+        if (!intparm)
+                return;
         cqr = (struct dasd_ccw_req *) intparm;
         if (cqr->status != DASD_CQR_IN_IO) {
                 MESSAGE(KERN_DEBUG,
@@ -976,17 +978,16 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,
         if (IS_ERR(irb)) {
                 switch (PTR_ERR(irb)) {
                 case -EIO:
-                        dasd_handle_killed_request(cdev, intparm);
                         break;
                 case -ETIMEDOUT:
                         printk(KERN_WARNING"%s(%s): request timed out\n",
                                __func__, cdev->dev.bus_id);
-                        //FIXME - dasd uses own timeout interface...
                         break;
                 default:
                         printk(KERN_WARNING"%s(%s): unknown error %ld\n",
                                __func__, cdev->dev.bus_id, PTR_ERR(irb));
                 }
+                dasd_handle_killed_request(cdev, intparm);
                 return;
         }
 
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
index f4fb40257348..d774e79476fe 100644
--- a/drivers/s390/block/dasd_devmap.c
+++ b/drivers/s390/block/dasd_devmap.c
@@ -86,10 +86,10 @@ static DEFINE_SPINLOCK(dasd_devmap_lock);
 static struct list_head dasd_hashlists[256];
 int dasd_max_devindex;
 
-static struct dasd_devmap *dasd_add_busid(char *, int);
+static struct dasd_devmap *dasd_add_busid(const char *, int);
 
 static inline int
-dasd_hash_busid(char *bus_id)
+dasd_hash_busid(const char *bus_id)
 {
         int hash, i;
 
@@ -394,7 +394,7 @@ dasd_parse(void)
  * devices.
  */
 static struct dasd_devmap *
-dasd_add_busid(char *bus_id, int features)
+dasd_add_busid(const char *bus_id, int features)
 {
         struct dasd_devmap *devmap, *new, *tmp;
         int hash;
@@ -430,7 +430,7 @@ dasd_add_busid(char *bus_id, int features)
  * Find devmap for device with given bus_id.
  */
 static struct dasd_devmap *
-dasd_find_busid(char *bus_id)
+dasd_find_busid(const char *bus_id)
 {
         struct dasd_devmap *devmap, *tmp;
         int hash;
@@ -452,7 +452,7 @@ dasd_find_busid(char *bus_id)
  * Check if busid has been added to the list of dasd ranges.
  */
 int
-dasd_busid_known(char *bus_id)
+dasd_busid_known(const char *bus_id)
 {
         return IS_ERR(dasd_find_busid(bus_id)) ? -ENOENT : 0;
 }
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h
index 6c624bf44617..fb2f931cf844 100644
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
@@ -598,7 +598,7 @@ struct dasd_device *dasd_device_from_cdev_locked(struct ccw_device *);
 struct dasd_device *dasd_device_from_devindex(int);
 
 int dasd_parse(void);
-int dasd_busid_known(char *);
+int dasd_busid_known(const char *);
 
 /* externals in dasd_gendisk.c */
 int  dasd_gendisk_init(void);
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index 7ad8cf157641..76e44eb7c47f 100644
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -76,32 +76,9 @@ const char *tape_op_verbose[TO_SIZE] =
         [TO_KEKL_QUERY] = "KLQ",[TO_RDC] = "RDC",
 };
 
-static int
-busid_to_int(char *bus_id)
+static int devid_to_int(struct ccw_dev_id *dev_id)
 {
-        int     dec;
-        int     d;
-        char *  s;
-
-        for(s = bus_id, d = 0; *s != '\0' && *s != '.'; s++)
-                d = (d * 10) + (*s - '0');
-        dec = d;
-        for(s++, d = 0; *s != '\0' && *s != '.'; s++)
-                d = (d * 10) + (*s - '0');
-        dec = (dec << 8) + d;
-
-        for(s++; *s != '\0'; s++) {
-                if (*s >= '0' && *s <= '9') {
-                        d = *s - '0';
-                } else if (*s >= 'a' && *s <= 'f') {
-                        d = *s - 'a' + 10;
-                } else {
-                        d = *s - 'A' + 10;
-                }
-                dec = (dec << 4) + d;
-        }
-
-        return dec;
+        return dev_id->devno + (dev_id->ssid << 16);
 }
 
 /*
@@ -551,6 +528,7 @@ tape_generic_probe(struct ccw_device *cdev)
 {
         struct tape_device *device;
         int ret;
+        struct ccw_dev_id dev_id;
 
         device = tape_alloc_device();
         if (IS_ERR(device))
@@ -565,7 +543,8 @@ tape_generic_probe(struct ccw_device *cdev)
         cdev->dev.driver_data = device;
         cdev->handler = __tape_do_irq;
         device->cdev = cdev;
-        device->cdev_id = busid_to_int(cdev->dev.bus_id);
+        ccw_device_get_id(cdev, &dev_id);
+        device->cdev_id = devid_to_int(&dev_id);
         PRINT_INFO("tape device %s found\n", cdev->dev.bus_id);
         return ret;
 }
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c
index d364e0bfae12..e8487347e4d4 100644
--- a/drivers/s390/char/vmlogrdr.c
+++ b/drivers/s390/char/vmlogrdr.c
@@ -858,7 +858,7 @@ static int __init vmlogrdr_init(void)
         for (i=0; i < MAXMINOR; ++i ) {
                 sys_ser[i].buffer = (char *) get_zeroed_page(GFP_KERNEL);
                 if (!sys_ser[i].buffer) {
-                        rc = ENOMEM;
+                        rc = -ENOMEM;
                         break;
                 }
                 sys_ser[i].current_position = sys_ser[i].buffer;
diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c
index 9c21b8f43f9b..a4a5f2efea48 100644
--- a/drivers/s390/cio/blacklist.c
+++ b/drivers/s390/cio/blacklist.c
@@ -19,7 +19,6 @@
 
 #include <asm/cio.h>
 #include <asm/uaccess.h>
-#include <asm/cio.h>
 
 #include "blacklist.h"
 #include "cio.h"
diff --git a/drivers/s390/cio/device_pgid.c b/drivers/s390/cio/device_pgid.c
index ba559053402e..5cf7be008e98 100644
--- a/drivers/s390/cio/device_pgid.c
+++ b/drivers/s390/cio/device_pgid.c
@@ -243,16 +243,10 @@ __ccw_device_do_pgid(struct ccw_device *cdev, __u8 func)
         /* Setup sense path group id channel program. */
         cdev->private->pgid[0].inf.fc = func;
         ccw = cdev->private->iccws;
-        if (!cdev->private->flags.pgid_single) {
-                cdev->private->pgid[0].inf.fc |= SPID_FUNC_MULTI_PATH;
-                ccw->cmd_code = CCW_CMD_SUSPEND_RECONN;
-                ccw->cda = 0;
-                ccw->count = 0;
-                ccw->flags = CCW_FLAG_SLI | CCW_FLAG_CC;
-                ccw++;
-        } else
+        if (cdev->private->flags.pgid_single)
                 cdev->private->pgid[0].inf.fc |= SPID_FUNC_SINGLE_PATH;
-
+        else
+                cdev->private->pgid[0].inf.fc |= SPID_FUNC_MULTI_PATH;
         ccw->cmd_code = CCW_CMD_SET_PGID;
         ccw->cda = (__u32) __pa (&cdev->private->pgid[0]);
         ccw->count = sizeof (struct pgid);
diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c
index f5215fd4b73d..1dca1775f4b1 100644
--- a/drivers/scsi/aha152x.c
+++ b/drivers/scsi/aha152x.c
@@ -3830,7 +3830,7 @@ static int __init aha152x_init(void)
                         iounmap(p);
                 }
                 if (!ok && setup_count == 0)
-                        return 0;
+                        return -ENODEV;
 
                 printk(KERN_INFO "aha152x: BIOS test: passed, ");
 #else
@@ -3909,14 +3909,14 @@ static int __init aha152x_init(void)
 #endif
         }
 
-        return 1;
+        return 0;
 }
 
 static void __exit aha152x_exit(void)
 {
-        struct aha152x_hostdata *hd;
+        struct aha152x_hostdata *hd, *tmp;
 
-        list_for_each_entry(hd, &aha152x_host_list, host_list) {
+        list_for_each_entry_safe(hd, tmp, &aha152x_host_list, host_list) {
                 struct Scsi_Host *shost = container_of((void *)hd, struct Scsi_Host, hostdata);
 
                 aha152x_release(shost);
diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
index 8e2e964af668..46771d4c81bd 100644
--- a/drivers/scsi/gdth.c
+++ b/drivers/scsi/gdth.c
@@ -550,7 +550,6 @@ static int __init gdth_search_isa(ulong32 bios_adr)
 #endif /* CONFIG_ISA */
 
 #ifdef CONFIG_PCI
-static bool gdth_pci_registered;
 
 static bool gdth_search_vortex(ushort device)
 {
@@ -3724,6 +3723,8 @@ static void gdth_log_event(gdth_evt_data *dvr, char *buffer)
 }
 
 #ifdef GDTH_STATISTICS
+static unchar   gdth_timer_running;
+
 static void gdth_timeout(ulong data)
 {
     ulong32 i;
@@ -3731,7 +3732,10 @@ static void gdth_timeout(ulong data)
     gdth_ha_str *ha;
     ulong flags;
 
-    BUG_ON(list_empty(&gdth_instances));
+    if(unlikely(list_empty(&gdth_instances))) {
+            gdth_timer_running = 0;
+            return;
+    }
 
     ha = list_first_entry(&gdth_instances, gdth_ha_str, list);
     spin_lock_irqsave(&ha->smp_lock, flags);
@@ -3751,6 +3755,22 @@ static void gdth_timeout(ulong data)
     add_timer(&gdth_timer);
     spin_unlock_irqrestore(&ha->smp_lock, flags);
 }
+
+static void gdth_timer_init(void)
+{
+        if (gdth_timer_running)
+                return;
+        gdth_timer_running = 1;
+        TRACE2(("gdth_detect(): Initializing timer !\n"));
+        gdth_timer.expires = jiffies + HZ;
+        gdth_timer.data = 0L;
+        gdth_timer.function = gdth_timeout;
+        add_timer(&gdth_timer);
+}
+#else
+static inline void gdth_timer_init(void)
+{
+}
 #endif
 
 static void __init internal_setup(char *str,int *ints)
@@ -4735,6 +4755,7 @@ static int __init gdth_isa_probe_one(ulong32 isa_bios)
         if (error)
                 goto out_free_coal_stat;
         list_add_tail(&ha->list, &gdth_instances);
+        gdth_timer_init();
 
         scsi_scan_host(shp);
 
@@ -4865,6 +4886,7 @@ static int __init gdth_eisa_probe_one(ushort eisa_slot)
         if (error)
                 goto out_free_coal_stat;
         list_add_tail(&ha->list, &gdth_instances);
+        gdth_timer_init();
 
         scsi_scan_host(shp);
 
@@ -5011,6 +5033,7 @@ static int gdth_pci_probe_one(gdth_pci_str *pcistr,
         list_add_tail(&ha->list, &gdth_instances);
 
         pci_set_drvdata(ha->pdev, ha);
+        gdth_timer_init();
 
         scsi_scan_host(shp);
 
@@ -5110,6 +5133,7 @@ static int __init gdth_init(void)
         /* initializations */
         gdth_polling = TRUE;
         gdth_clear_events();
+        init_timer(&gdth_timer);
 
         /* As default we do not probe for EISA or ISA controllers */
         if (probe_eisa_isa) {
@@ -5132,23 +5156,17 @@ static int __init gdth_init(void)
 
 #ifdef CONFIG_PCI
         /* scanning for PCI controllers */
-        if (pci_register_driver(&gdth_pci_driver) == 0)
-                gdth_pci_registered = true;
+        if (pci_register_driver(&gdth_pci_driver)) {
+                gdth_ha_str *ha;
+
+                list_for_each_entry(ha, &gdth_instances, list)
+                        gdth_remove_one(ha);
+                return -ENODEV;
+        }
 #endif /* CONFIG_PCI */
 
         TRACE2(("gdth_detect() %d controller detected\n", gdth_ctr_count));
 
-        if (list_empty(&gdth_instances))
-                return -ENODEV;
-
-#ifdef GDTH_STATISTICS
-        TRACE2(("gdth_detect(): Initializing timer !\n"));
-        init_timer(&gdth_timer);
-        gdth_timer.expires = jiffies + HZ;
-        gdth_timer.data = 0L;
-        gdth_timer.function = gdth_timeout;
-        add_timer(&gdth_timer);
-#endif
         major = register_chrdev(0,"gdth", &gdth_fops);
         register_reboot_notifier(&gdth_notifier);
         gdth_polling = FALSE;
@@ -5167,8 +5185,7 @@ static void __exit gdth_exit(void)
 #endif
 
 #ifdef CONFIG_PCI
-        if (gdth_pci_registered)
-                pci_unregister_driver(&gdth_pci_driver);
+        pci_unregister_driver(&gdth_pci_driver);
 #endif
 
         list_for_each_entry(ha, &gdth_instances, list)
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index 010c1b9b178c..b43bf1d60dac 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -730,7 +730,9 @@ static int __iscsi_complete_pdu(struct iscsi_conn *conn, struct iscsi_hdr *hdr,
                                 if (iscsi_recv_pdu(conn->cls_conn, hdr, data,
                                                    datalen))
                                         rc = ISCSI_ERR_CONN_FAILED;
-                        }
+                        } else
+                                mod_timer(&conn->transport_timer,
+                                          jiffies + conn->recv_timeout);
                         iscsi_free_mgmt_task(conn, mtask);
                         break;
                 default:
@@ -1453,19 +1455,20 @@ static void iscsi_check_transport_timeouts(unsigned long data)
 {
         struct iscsi_conn *conn = (struct iscsi_conn *)data;
         struct iscsi_session *session = conn->session;
-        unsigned long timeout, next_timeout = 0, last_recv;
+        unsigned long recv_timeout, next_timeout = 0, last_recv;
 
         spin_lock(&session->lock);
         if (session->state != ISCSI_STATE_LOGGED_IN)
                 goto done;
 
-        timeout = conn->recv_timeout;
-        if (!timeout)
+        recv_timeout = conn->recv_timeout;
+        if (!recv_timeout)
                 goto done;
 
-        timeout *= HZ;
+        recv_timeout *= HZ;
         last_recv = conn->last_recv;
-        if (time_before_eq(last_recv + timeout + (conn->ping_timeout * HZ),
+        if (conn->ping_mtask &&
+            time_before_eq(conn->last_ping + (conn->ping_timeout * HZ),
                            jiffies)) {
                 iscsi_conn_printk(KERN_ERR, conn, "ping timeout of %d secs "
                                   "expired, last rx %lu, last ping %lu, "
@@ -1476,15 +1479,13 @@ static void iscsi_check_transport_timeouts(unsigned long data)
                 return;
         }
 
-        if (time_before_eq(last_recv + timeout, jiffies)) {
-                if (time_before_eq(conn->last_ping, last_recv)) {
-                        /* send a ping to try to provoke some traffic */
-                        debug_scsi("Sending nopout as ping on conn %p\n", conn);
-                        iscsi_send_nopout(conn, NULL);
-                }
-                next_timeout = last_recv + timeout + (conn->ping_timeout * HZ);
+        if (time_before_eq(last_recv + recv_timeout, jiffies)) {
+                /* send a ping to try to provoke some traffic */
+                debug_scsi("Sending nopout as ping on conn %p\n", conn);
+                iscsi_send_nopout(conn, NULL);
+                next_timeout = conn->last_ping + (conn->ping_timeout * HZ);
         } else
-                next_timeout = last_recv + timeout;
+                next_timeout = last_recv + recv_timeout;
 
         debug_scsi("Setting next tmo %lu\n", next_timeout);
         mod_timer(&conn->transport_timer, next_timeout);
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index fa060932d2b4..51e2f299dbbb 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -2007,7 +2007,7 @@ qla1280_set_defaults(struct scsi_qla_host *ha)
                 nv->bus[bus].config_2.req_ack_active_negation = 1;
                 nv->bus[bus].config_2.data_line_active_negation = 1;
                 nv->bus[bus].selection_timeout = 250;
-                nv->bus[bus].max_queue_depth = 256;
+                nv->bus[bus].max_queue_depth = 32;
 
                 if (IS_ISP1040(ha)) {
                         nv->bus[bus].bus_reset_delay = 3;
@@ -2051,7 +2051,7 @@ qla1280_config_target(struct scsi_qla_host *ha, int bus, int target)
         status = qla1280_mailbox_command(ha, 0x0f, mb);
 
         /* Save Tag queuing enable flag. */
-        flag = (BIT_0 << target) & mb[0];
+        flag = (BIT_0 << target);
         if (nv->bus[bus].target[target].parameter.tag_queuing)
                 ha->bus_settings[bus].qtag_enables |= flag;
 
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 36acbcca2d48..62e6eb136a3c 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -976,11 +976,15 @@ config SERIAL_68328_RTS_CTS
         depends on SERIAL_68328
 
 config SERIAL_COLDFIRE
-        bool "ColdFire serial support"
+        bool "ColdFire serial support (DEPRECATED)"
         depends on COLDFIRE
         help
           This driver supports the built-in serial ports of the Motorola ColdFire
           family of CPUs.
+          This driver is deprecated because it supports only the old interface
+          for serial drivers and features like magic keys are not working.
+          Please switch to the new style driver because this driver will be
+          removed soon.
 
 config SERIAL_MCF
         bool "Coldfire serial support (new style driver)"
diff --git a/drivers/serial/mcfserial.c b/drivers/serial/mcfserial.c
index 43af40d59b8a..56007cc8a9b3 100644
--- a/drivers/serial/mcfserial.c
+++ b/drivers/serial/mcfserial.c
@@ -1,3 +1,4 @@
+#warning This driver is deprecated. Check Kconfig for details.
 /*
  * mcfserial.c -- serial driver for ColdFire internal UARTS.
  *
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index fae9e8f3d092..66ec5d8808de 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -126,7 +126,6 @@ config SPI_MPC52xx_PSC
 config SPI_MPC83xx
         tristate "Freescale MPC83xx/QUICC Engine SPI controller"
         depends on SPI_MASTER && (PPC_83xx || QUICC_ENGINE) && EXPERIMENTAL
-        select SPI_BITBANG
         help
           This enables using the Freescale MPC83xx and QUICC Engine SPI
           controllers in master mode.
diff --git a/drivers/spi/mpc52xx_psc_spi.c b/drivers/spi/mpc52xx_psc_spi.c
index 90729469d481..681d62325d3d 100644
--- a/drivers/spi/mpc52xx_psc_spi.c
+++ b/drivers/spi/mpc52xx_psc_spi.c
@@ -1,5 +1,5 @@
 /*
- * MPC52xx SPC in SPI mode driver.
+ * MPC52xx PSC in SPI mode driver.
  *
  * Maintainer: Dragos Carp
  *
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c
index 654bb58be630..0c452c46ab07 100644
--- a/drivers/spi/pxa2xx_spi.c
+++ b/drivers/spi/pxa2xx_spi.c
@@ -1567,7 +1567,7 @@ static int pxa2xx_spi_resume(struct platform_device *pdev)
         int status = 0;
 
         /* Enable the SSP clock */
-        clk_disable(ssp->clk);
+        clk_enable(ssp->clk);
 
         /* Start the queue running */
         status = start_queue(drv_data);
diff --git a/drivers/spi/spi_mpc83xx.c b/drivers/spi/spi_mpc83xx.c
index 189f706b9e4b..6832da6f7109 100644
--- a/drivers/spi/spi_mpc83xx.c
+++ b/drivers/spi/spi_mpc83xx.c
@@ -49,6 +49,7 @@ struct mpc83xx_spi_reg {
 #define SPMODE_LEN(x)           ((x) << 20)
 #define SPMODE_PM(x)            ((x) << 16)
 #define SPMODE_OP               (1 << 14)
+#define SPMODE_CG(x)            ((x) << 7)
 
 /*
  * Default for SPI Mode:
@@ -67,10 +68,6 @@ struct mpc83xx_spi_reg {
 
 /* SPI Controller driver's private data. */
 struct mpc83xx_spi {
-        /* bitbang has to be first */
-        struct spi_bitbang bitbang;
-        struct completion done;
-
         struct mpc83xx_spi_reg __iomem *base;
 
         /* rx & tx bufs from the spi_transfer */
@@ -82,7 +79,7 @@ struct mpc83xx_spi {
         u32(*get_tx) (struct mpc83xx_spi *);
 
         unsigned int count;
-        u32 irq;
+        int irq;
 
         unsigned nsecs;         /* (clock cycle time)/2 */
 
@@ -94,6 +91,25 @@ struct mpc83xx_spi {
 
         void (*activate_cs) (u8 cs, u8 polarity);
         void (*deactivate_cs) (u8 cs, u8 polarity);
+
+        u8 busy;
+
+        struct workqueue_struct *workqueue;
+        struct work_struct work;
+
+        struct list_head queue;
+        spinlock_t lock;
+
+        struct completion done;
+};
+
+struct spi_mpc83xx_cs {
+        /* functions to deal with different sized buffers */
+        void (*get_rx) (u32 rx_data, struct mpc83xx_spi *);
+        u32 (*get_tx) (struct mpc83xx_spi *);
+        u32 rx_shift;           /* RX data reg shift when in qe mode */
+        u32 tx_shift;           /* TX data reg shift when in qe mode */
+        u32 hw_mode;            /* Holds HW mode register settings */
 };
 
 static inline void mpc83xx_spi_write_reg(__be32 __iomem * reg, u32 val)
@@ -137,6 +153,7 @@ static void mpc83xx_spi_chipselect(struct spi_device *spi, int value)
 {
         struct mpc83xx_spi *mpc83xx_spi;
         u8 pol = spi->mode & SPI_CS_HIGH ? 1 : 0;
+        struct spi_mpc83xx_cs   *cs = spi->controller_state;
 
         mpc83xx_spi = spi_master_get_devdata(spi->master);
 
@@ -147,50 +164,26 @@ static void mpc83xx_spi_chipselect(struct spi_device *spi, int value)
 
         if (value == BITBANG_CS_ACTIVE) {
                 u32 regval = mpc83xx_spi_read_reg(&mpc83xx_spi->base->mode);
-                u32 len = spi->bits_per_word;
-                u8 pm;
 
-                if (len == 32)
-                        len = 0;
-                else
-                        len = len - 1;
-
-                /* mask out bits we are going to set */
-                regval &= ~(SPMODE_CP_BEGIN_EDGECLK | SPMODE_CI_INACTIVEHIGH
-                                | SPMODE_LEN(0xF) | SPMODE_DIV16
-                                | SPMODE_PM(0xF) | SPMODE_REV | SPMODE_LOOP);
-
-                if (spi->mode & SPI_CPHA)
-                        regval |= SPMODE_CP_BEGIN_EDGECLK;
-                if (spi->mode & SPI_CPOL)
-                        regval |= SPMODE_CI_INACTIVEHIGH;
-                if (!(spi->mode & SPI_LSB_FIRST))
-                        regval |= SPMODE_REV;
-                if (spi->mode & SPI_LOOP)
-                        regval |= SPMODE_LOOP;
-
-                regval |= SPMODE_LEN(len);
-
-                if ((mpc83xx_spi->spibrg / spi->max_speed_hz) >= 64) {
-                        pm = mpc83xx_spi->spibrg / (spi->max_speed_hz * 64) - 1;
-                        if (pm > 0x0f) {
-                                dev_err(&spi->dev, "Requested speed is too "
-                                        "low: %d Hz. Will use %d Hz instead.\n",
-                                        spi->max_speed_hz,
-                                        mpc83xx_spi->spibrg / 1024);
-                                pm = 0x0f;
-                        }
-                        regval |= SPMODE_PM(pm) | SPMODE_DIV16;
-                } else {
-                        pm = mpc83xx_spi->spibrg / (spi->max_speed_hz * 4);
-                        if (pm)
-                                pm--;
-                        regval |= SPMODE_PM(pm);
+                mpc83xx_spi->rx_shift = cs->rx_shift;
+                mpc83xx_spi->tx_shift = cs->tx_shift;
+                mpc83xx_spi->get_rx = cs->get_rx;
+                mpc83xx_spi->get_tx = cs->get_tx;
+
+                if (cs->hw_mode != regval) {
+                        unsigned long flags;
+                        void *tmp_ptr = &mpc83xx_spi->base->mode;
+
+                        regval = cs->hw_mode;
+                        /* Turn off IRQs locally to minimize time that
+                         * SPI is disabled
+                         */
+                        local_irq_save(flags);
+                        /* Turn off SPI unit prior changing mode */
+                        mpc83xx_spi_write_reg(tmp_ptr, regval & ~SPMODE_ENABLE);
+                        mpc83xx_spi_write_reg(tmp_ptr, regval);
+                        local_irq_restore(flags);
                 }
-
-                /* Turn off SPI unit prior changing mode */
-                mpc83xx_spi_write_reg(&mpc83xx_spi->base->mode, 0);
-                mpc83xx_spi_write_reg(&mpc83xx_spi->base->mode, regval);
                 if (mpc83xx_spi->activate_cs)
                         mpc83xx_spi->activate_cs(spi->chip_select, pol);
         }
@@ -201,8 +194,9 @@ int mpc83xx_spi_setup_transfer(struct spi_device *spi, struct spi_transfer *t)
 {
         struct mpc83xx_spi *mpc83xx_spi;
         u32 regval;
-        u8 bits_per_word;
+        u8 bits_per_word, pm;
         u32 hz;
+        struct spi_mpc83xx_cs   *cs = spi->controller_state;
 
         mpc83xx_spi = spi_master_get_devdata(spi->master);
 
@@ -223,61 +217,191 @@ int mpc83xx_spi_setup_transfer(struct spi_device *spi, struct spi_transfer *t)
             || ((bits_per_word > 16) && (bits_per_word != 32)))
                 return -EINVAL;
 
-        mpc83xx_spi->rx_shift = 0;
-        mpc83xx_spi->tx_shift = 0;
+        if (!hz)
+                hz = spi->max_speed_hz;
+
+        cs->rx_shift = 0;
+        cs->tx_shift = 0;
         if (bits_per_word <= 8) {
-                mpc83xx_spi->get_rx = mpc83xx_spi_rx_buf_u8;
-                mpc83xx_spi->get_tx = mpc83xx_spi_tx_buf_u8;
+                cs->get_rx = mpc83xx_spi_rx_buf_u8;
+                cs->get_tx = mpc83xx_spi_tx_buf_u8;
                 if (mpc83xx_spi->qe_mode) {
-                        mpc83xx_spi->rx_shift = 16;
-                        mpc83xx_spi->tx_shift = 24;
+                        cs->rx_shift = 16;
+                        cs->tx_shift = 24;
                 }
         } else if (bits_per_word <= 16) {
-                mpc83xx_spi->get_rx = mpc83xx_spi_rx_buf_u16;
-                mpc83xx_spi->get_tx = mpc83xx_spi_tx_buf_u16;
+                cs->get_rx = mpc83xx_spi_rx_buf_u16;
+                cs->get_tx = mpc83xx_spi_tx_buf_u16;
                 if (mpc83xx_spi->qe_mode) {
-                        mpc83xx_spi->rx_shift = 16;
-                        mpc83xx_spi->tx_shift = 16;
+                        cs->rx_shift = 16;
+                        cs->tx_shift = 16;
                 }
         } else if (bits_per_word <= 32) {
-                mpc83xx_spi->get_rx = mpc83xx_spi_rx_buf_u32;
-                mpc83xx_spi->get_tx = mpc83xx_spi_tx_buf_u32;
+                cs->get_rx = mpc83xx_spi_rx_buf_u32;
+                cs->get_tx = mpc83xx_spi_tx_buf_u32;
         } else
                 return -EINVAL;
 
         if (mpc83xx_spi->qe_mode && spi->mode & SPI_LSB_FIRST) {
-                mpc83xx_spi->tx_shift = 0;
+                cs->tx_shift = 0;
                 if (bits_per_word <= 8)
-                        mpc83xx_spi->rx_shift = 8;
+                        cs->rx_shift = 8;
                 else
-                        mpc83xx_spi->rx_shift = 0;
+                        cs->rx_shift = 0;
         }
 
-        /* nsecs = (clock period)/2 */
-        if (!hz)
-                hz = spi->max_speed_hz;
-        mpc83xx_spi->nsecs = (1000000000 / 2) / hz;
-        if (mpc83xx_spi->nsecs > MAX_UDELAY_MS * 1000)
-                return -EINVAL;
+        mpc83xx_spi->rx_shift = cs->rx_shift;
+        mpc83xx_spi->tx_shift = cs->tx_shift;
+        mpc83xx_spi->get_rx = cs->get_rx;
+        mpc83xx_spi->get_tx = cs->get_tx;
 
         if (bits_per_word == 32)
                 bits_per_word = 0;
         else
                 bits_per_word = bits_per_word - 1;
 
-        regval = mpc83xx_spi_read_reg(&mpc83xx_spi->base->mode);
-
         /* mask out bits we are going to set */
-        regval &= ~(SPMODE_LEN(0xF) | SPMODE_REV);
-        regval |= SPMODE_LEN(bits_per_word);
-        if (!(spi->mode & SPI_LSB_FIRST))
-                regval |= SPMODE_REV;
+        cs->hw_mode &= ~(SPMODE_LEN(0xF) | SPMODE_DIV16
+                                  | SPMODE_PM(0xF));
+
+        cs->hw_mode |= SPMODE_LEN(bits_per_word);
+
+        if ((mpc83xx_spi->spibrg / hz) >= 64) {
+                pm = mpc83xx_spi->spibrg / (hz * 64) - 1;
+                if (pm > 0x0f) {
+                        dev_err(&spi->dev, "Requested speed is too "
+                                "low: %d Hz. Will use %d Hz instead.\n",
+                                hz, mpc83xx_spi->spibrg / 1024);
+                        pm = 0x0f;
+                }
+                cs->hw_mode |= SPMODE_PM(pm) | SPMODE_DIV16;
+        } else {
+                pm = mpc83xx_spi->spibrg / (hz * 4);
+                if (pm)
+                        pm--;
+                cs->hw_mode |= SPMODE_PM(pm);
+        }
+        regval =  mpc83xx_spi_read_reg(&mpc83xx_spi->base->mode);
+        if (cs->hw_mode != regval) {
+                unsigned long flags;
+                void *tmp_ptr = &mpc83xx_spi->base->mode;
+
+                regval = cs->hw_mode;
+                /* Turn off IRQs locally to minimize time
+                 * that SPI is disabled
+                 */
+                local_irq_save(flags);
+                /* Turn off SPI unit prior changing mode */
+                mpc83xx_spi_write_reg(tmp_ptr, regval & ~SPMODE_ENABLE);
+                mpc83xx_spi_write_reg(tmp_ptr, regval);
+                local_irq_restore(flags);
+        }
+        return 0;
+}
 
-        /* Turn off SPI unit prior changing mode */
-        mpc83xx_spi_write_reg(&mpc83xx_spi->base->mode, 0);
-        mpc83xx_spi_write_reg(&mpc83xx_spi->base->mode, regval);
+static int mpc83xx_spi_bufs(struct spi_device *spi, struct spi_transfer *t)
+{
+        struct mpc83xx_spi *mpc83xx_spi;
+        u32 word, len, bits_per_word;
 
-        return 0;
+        mpc83xx_spi = spi_master_get_devdata(spi->master);
+
+        mpc83xx_spi->tx = t->tx_buf;
+        mpc83xx_spi->rx = t->rx_buf;
+        bits_per_word = spi->bits_per_word;
+        if (t->bits_per_word)
+                bits_per_word = t->bits_per_word;
+        len = t->len;
+        if (bits_per_word > 8)
+                len /= 2;
+        if (bits_per_word > 16)
+                len /= 2;
+        mpc83xx_spi->count = len;
+        INIT_COMPLETION(mpc83xx_spi->done);
+
+        /* enable rx ints */
+        mpc83xx_spi_write_reg(&mpc83xx_spi->base->mask, SPIM_NE);
+
+        /* transmit word */
+        word = mpc83xx_spi->get_tx(mpc83xx_spi);
+        mpc83xx_spi_write_reg(&mpc83xx_spi->base->transmit, word);
+
+        wait_for_completion(&mpc83xx_spi->done);
+
+        /* disable rx ints */
+        mpc83xx_spi_write_reg(&mpc83xx_spi->base->mask, 0);
+
+        return mpc83xx_spi->count;
+}
+
+static void mpc83xx_spi_work(struct work_struct *work)
+{
+        struct mpc83xx_spi *mpc83xx_spi =
+                container_of(work, struct mpc83xx_spi, work);
+
+        spin_lock_irq(&mpc83xx_spi->lock);
+        mpc83xx_spi->busy = 1;
+        while (!list_empty(&mpc83xx_spi->queue)) {
+                struct spi_message *m;
+                struct spi_device *spi;
+                struct spi_transfer *t = NULL;
+                unsigned cs_change;
+                int status, nsecs = 50;
+
+                m = container_of(mpc83xx_spi->queue.next,
+                                struct spi_message, queue);
+                list_del_init(&m->queue);
+                spin_unlock_irq(&mpc83xx_spi->lock);
+
+                spi = m->spi;
+                cs_change = 1;
+                status = 0;
+                list_for_each_entry(t, &m->transfers, transfer_list) {
+                        if (t->bits_per_word || t->speed_hz) {
+                                /* Don't allow changes if CS is active */
+                                status = -EINVAL;
+
+                                if (cs_change)
+                                        status = mpc83xx_spi_setup_transfer(spi, t);
+                                if (status < 0)
+                                        break;
+                        }
+
+                        if (cs_change)
+                                mpc83xx_spi_chipselect(spi, BITBANG_CS_ACTIVE);
+                        cs_change = t->cs_change;
+                        if (t->len)
+                                status = mpc83xx_spi_bufs(spi, t);
+                        if (status) {
+                                status = -EMSGSIZE;
+                                break;
+                        }
+                        m->actual_length += t->len;
+
+                        if (t->delay_usecs)
+                                udelay(t->delay_usecs);
+
+                        if (cs_change) {
+                                ndelay(nsecs);
+                                mpc83xx_spi_chipselect(spi, BITBANG_CS_INACTIVE);
+                                ndelay(nsecs);
+                        }
+                }
+
+                m->status = status;
+                m->complete(m->context);
+
+                if (status || !cs_change) {
+                        ndelay(nsecs);
+                        mpc83xx_spi_chipselect(spi, BITBANG_CS_INACTIVE);
+                }
+
+                mpc83xx_spi_setup_transfer(spi, NULL);
+
+                spin_lock_irq(&mpc83xx_spi->lock);
+        }
+        mpc83xx_spi->busy = 0;
+        spin_unlock_irq(&mpc83xx_spi->lock);
 }
 
 /* the spi->mode bits understood by this driver: */
@@ -286,9 +410,10 @@ int mpc83xx_spi_setup_transfer(struct spi_device *spi, struct spi_transfer *t)
 
 static int mpc83xx_spi_setup(struct spi_device *spi)
 {
-        struct spi_bitbang *bitbang;
         struct mpc83xx_spi *mpc83xx_spi;
         int retval;
+        u32 hw_mode;
+        struct spi_mpc83xx_cs   *cs = spi->controller_state;
 
         if (spi->mode & ~MODEBITS) {
                 dev_dbg(&spi->dev, "setup: unsupported mode bits %x\n",
@@ -299,63 +424,56 @@ static int mpc83xx_spi_setup(struct spi_device *spi)
         if (!spi->max_speed_hz)
                 return -EINVAL;
 
-        bitbang = spi_master_get_devdata(spi->master);
+        if (!cs) {
+                cs = kzalloc(sizeof *cs, GFP_KERNEL);
+                if (!cs)
+                        return -ENOMEM;
+                spi->controller_state = cs;
+        }
         mpc83xx_spi = spi_master_get_devdata(spi->master);
 
         if (!spi->bits_per_word)
                 spi->bits_per_word = 8;
 
+        hw_mode = cs->hw_mode; /* Save orginal settings */
+        cs->hw_mode = mpc83xx_spi_read_reg(&mpc83xx_spi->base->mode);
+        /* mask out bits we are going to set */
+        cs->hw_mode &= ~(SPMODE_CP_BEGIN_EDGECLK | SPMODE_CI_INACTIVEHIGH
+                         | SPMODE_REV | SPMODE_LOOP);
+
+        if (spi->mode & SPI_CPHA)
+                cs->hw_mode |= SPMODE_CP_BEGIN_EDGECLK;
+        if (spi->mode & SPI_CPOL)
+                cs->hw_mode |= SPMODE_CI_INACTIVEHIGH;
+        if (!(spi->mode & SPI_LSB_FIRST))
+                cs->hw_mode |= SPMODE_REV;
+        if (spi->mode & SPI_LOOP)
+                cs->hw_mode |= SPMODE_LOOP;
+
         retval = mpc83xx_spi_setup_transfer(spi, NULL);
-        if (retval < 0)
+        if (retval < 0) {
+                cs->hw_mode = hw_mode; /* Restore settings */
                 return retval;
+        }
 
-        dev_dbg(&spi->dev, "%s, mode %d, %u bits/w, %u nsec\n",
+        dev_dbg(&spi->dev, "%s, mode %d, %u bits/w, %u Hz\n",
                 __func__, spi->mode & (SPI_CPOL | SPI_CPHA),
-                spi->bits_per_word, 2 * mpc83xx_spi->nsecs);
-
+                spi->bits_per_word, spi->max_speed_hz);
+#if 0 /* Don't think this is needed */
         /* NOTE we _need_ to call chipselect() early, ideally with adapter
          * setup, unless the hardware defaults cooperate to avoid confusion
          * between normal (active low) and inverted chipselects.
          */
 
         /* deselect chip (low or high) */
-        spin_lock(&bitbang->lock);
-        if (!bitbang->busy) {
-                bitbang->chipselect(spi, BITBANG_CS_INACTIVE);
-                ndelay(mpc83xx_spi->nsecs);
-        }
-        spin_unlock(&bitbang->lock);
-
+        spin_lock(&mpc83xx_spi->lock);
+        if (!mpc83xx_spi->busy)
+                mpc83xx_spi_chipselect(spi, BITBANG_CS_INACTIVE);
+        spin_unlock(&mpc83xx_spi->lock);
+#endif
         return 0;
 }
 
-static int mpc83xx_spi_bufs(struct spi_device *spi, struct spi_transfer *t)
-{
-        struct mpc83xx_spi *mpc83xx_spi;
-        u32 word;
-
-        mpc83xx_spi = spi_master_get_devdata(spi->master);
-
-        mpc83xx_spi->tx = t->tx_buf;
-        mpc83xx_spi->rx = t->rx_buf;
-        mpc83xx_spi->count = t->len;
-        INIT_COMPLETION(mpc83xx_spi->done);
-
-        /* enable rx ints */
-        mpc83xx_spi_write_reg(&mpc83xx_spi->base->mask, SPIM_NE);
-
-        /* transmit word */
-        word = mpc83xx_spi->get_tx(mpc83xx_spi);
-        mpc83xx_spi_write_reg(&mpc83xx_spi->base->transmit, word);
-
-        wait_for_completion(&mpc83xx_spi->done);
-
-        /* disable rx ints */
-        mpc83xx_spi_write_reg(&mpc83xx_spi->base->mask, 0);
-
-        return t->len - mpc83xx_spi->count;
-}
-
 irqreturn_t mpc83xx_spi_irq(s32 irq, void *context_data)
 {
         struct mpc83xx_spi *mpc83xx_spi = context_data;
@@ -395,6 +513,28 @@ irqreturn_t mpc83xx_spi_irq(s32 irq, void *context_data)
 
         return ret;
 }
+static int mpc83xx_spi_transfer(struct spi_device *spi,
+                                struct spi_message *m)
+{
+        struct mpc83xx_spi *mpc83xx_spi = spi_master_get_devdata(spi->master);
+        unsigned long flags;
+
+        m->actual_length = 0;
+        m->status = -EINPROGRESS;
+
+        spin_lock_irqsave(&mpc83xx_spi->lock, flags);
+        list_add_tail(&m->queue, &mpc83xx_spi->queue);
+        queue_work(mpc83xx_spi->workqueue, &mpc83xx_spi->work);
+        spin_unlock_irqrestore(&mpc83xx_spi->lock, flags);
+
+        return 0;
+}
+
+
+static void mpc83xx_spi_cleanup(struct spi_device *spi)
+{
+        kfree(spi->controller_state);
+}
 
 static int __init mpc83xx_spi_probe(struct platform_device *dev)
 {
@@ -426,11 +566,11 @@ static int __init mpc83xx_spi_probe(struct platform_device *dev)
                 ret = -ENODEV;
                 goto free_master;
         }
+        master->setup = mpc83xx_spi_setup;
+        master->transfer = mpc83xx_spi_transfer;
+        master->cleanup = mpc83xx_spi_cleanup;
+
         mpc83xx_spi = spi_master_get_devdata(master);
-        mpc83xx_spi->bitbang.master = spi_master_get(master);
-        mpc83xx_spi->bitbang.chipselect = mpc83xx_spi_chipselect;
-        mpc83xx_spi->bitbang.setup_transfer = mpc83xx_spi_setup_transfer;
-        mpc83xx_spi->bitbang.txrx_bufs = mpc83xx_spi_bufs;
         mpc83xx_spi->activate_cs = pdata->activate_cs;
         mpc83xx_spi->deactivate_cs = pdata->deactivate_cs;
         mpc83xx_spi->qe_mode = pdata->qe_mode;
@@ -445,7 +585,6 @@ static int __init mpc83xx_spi_probe(struct platform_device *dev)
                 mpc83xx_spi->tx_shift = 24;
         }
 
-        mpc83xx_spi->bitbang.master->setup = mpc83xx_spi_setup;
         init_completion(&mpc83xx_spi->done);
 
         mpc83xx_spi->base = ioremap(r->start, r->end - r->start + 1);
@@ -483,11 +622,21 @@ static int __init mpc83xx_spi_probe(struct platform_device *dev)
                 regval |= SPMODE_OP;
 
         mpc83xx_spi_write_reg(&mpc83xx_spi->base->mode, regval);
+        spin_lock_init(&mpc83xx_spi->lock);
+        init_completion(&mpc83xx_spi->done);
+        INIT_WORK(&mpc83xx_spi->work, mpc83xx_spi_work);
+        INIT_LIST_HEAD(&mpc83xx_spi->queue);
 
-        ret = spi_bitbang_start(&mpc83xx_spi->bitbang);
-
-        if (ret != 0)
+        mpc83xx_spi->workqueue = create_singlethread_workqueue(
+                master->dev.parent->bus_id);
+        if (mpc83xx_spi->workqueue == NULL) {
+                ret = -EBUSY;
                 goto free_irq;
+        }
+
+        ret = spi_register_master(master);
+        if (ret < 0)
+                goto unreg_master;
 
         printk(KERN_INFO
                "%s: MPC83xx SPI Controller driver at 0x%p (irq = %d)\n",
@@ -495,6 +644,8 @@ static int __init mpc83xx_spi_probe(struct platform_device *dev)
 
         return ret;
 
+unreg_master:
+        destroy_workqueue(mpc83xx_spi->workqueue);
 free_irq:
         free_irq(mpc83xx_spi->irq, mpc83xx_spi);
 unmap_io:
@@ -515,10 +666,12 @@ static int __exit mpc83xx_spi_remove(struct platform_device *dev)
         master = platform_get_drvdata(dev);
         mpc83xx_spi = spi_master_get_devdata(master);
 
-        spi_bitbang_stop(&mpc83xx_spi->bitbang);
+        flush_workqueue(mpc83xx_spi->workqueue);
+        destroy_workqueue(mpc83xx_spi->workqueue);
+        spi_unregister_master(master);
+
         free_irq(mpc83xx_spi->irq, mpc83xx_spi);
         iounmap(mpc83xx_spi->base);
-        spi_master_put(mpc83xx_spi->bitbang.master);
 
         return 0;
 }
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index cefe7f2c6f75..63c34043b4d9 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1248,6 +1248,9 @@ static struct usb_device_id acm_ids[] = {
         { USB_DEVICE(0x22b8, 0x7000), /* Motorola Q Phone */
         .driver_info = NO_UNION_NORMAL, /* has no union descriptor */
         },
+        { USB_DEVICE(0x0803, 0x3095), /* Zoom Telephonics Model 3095F USB MODEM */
+        .driver_info = NO_UNION_NORMAL, /* has no union descriptor */
+        },
 
         /* control interfaces with various AT-command sets */
         { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,
diff --git a/drivers/usb/core/endpoint.c b/drivers/usb/core/endpoint.c
index 99e5a68a3f12..fae55a31e26d 100644
--- a/drivers/usb/core/endpoint.c
+++ b/drivers/usb/core/endpoint.c
@@ -156,6 +156,10 @@ static struct attribute *ep_dev_attrs[] = {
 static struct attribute_group ep_dev_attr_grp = {
         .attrs = ep_dev_attrs,
 };
+static struct attribute_group *ep_dev_groups[] = {
+        &ep_dev_attr_grp,
+        NULL
+};
 
 static int usb_endpoint_major_init(void)
 {
@@ -298,6 +302,7 @@ int usb_create_ep_files(struct device *parent,
 
         ep_dev->desc = &endpoint->desc;
         ep_dev->udev = udev;
+        ep_dev->dev.groups = ep_dev_groups;
         ep_dev->dev.devt = MKDEV(usb_endpoint_major, ep_dev->minor);
         ep_dev->dev.class = ep_class->class;
         ep_dev->dev.parent = parent;
@@ -309,9 +314,6 @@ int usb_create_ep_files(struct device *parent,
         retval = device_register(&ep_dev->dev);
         if (retval)
                 goto error_chrdev;
-        retval = sysfs_create_group(&ep_dev->dev.kobj, &ep_dev_attr_grp);
-        if (retval)
-                goto error_group;
 
         /* create the symlink to the old-style "ep_XX" directory */
         sprintf(name, "ep_%02x", endpoint->desc.bEndpointAddress);
@@ -322,8 +324,6 @@ int usb_create_ep_files(struct device *parent,
         return retval;
 
 error_link:
-        sysfs_remove_group(&ep_dev->dev.kobj, &ep_dev_attr_grp);
-error_group:
         device_unregister(&ep_dev->dev);
         destroy_endpoint_class();
         return retval;
@@ -348,7 +348,6 @@ void usb_remove_ep_files(struct usb_host_endpoint *endpoint)
 
                 sprintf(name, "ep_%02x", endpoint->desc.bEndpointAddress);
                 sysfs_remove_link(&ep_dev->dev.parent->kobj, name);
-                sysfs_remove_group(&ep_dev->dev.kobj, &ep_dev_attr_grp);
                 device_unregister(&ep_dev->dev);
                 endpoint->ep_dev = NULL;
                 destroy_endpoint_class();
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 3e69266e1f4d..fe47d145255a 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -1607,6 +1607,7 @@ free_interfaces:
                 intf->dev.driver = NULL;
                 intf->dev.bus = &usb_bus_type;
                 intf->dev.type = &usb_if_device_type;
+                intf->dev.groups = usb_interface_groups;
                 intf->dev.dma_mask = dev->dev.dma_mask;
                 device_initialize(&intf->dev);
                 mark_quiesced(intf);
diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
index 5b20a60de8ba..c783cb111847 100644
--- a/drivers/usb/core/sysfs.c
+++ b/drivers/usb/core/sysfs.c
@@ -538,6 +538,46 @@ static struct attribute_group dev_attr_grp = {
         .attrs = dev_attrs,
 };
 
+/* When modifying this list, be sure to modify dev_string_attrs_are_visible()
+ * accordingly.
+ */
+static struct attribute *dev_string_attrs[] = {
+        &dev_attr_manufacturer.attr,
+        &dev_attr_product.attr,
+        &dev_attr_serial.attr,
+        NULL
+};
+
+static mode_t dev_string_attrs_are_visible(struct kobject *kobj,
+                struct attribute *a, int n)
+{
+        struct usb_device *udev = to_usb_device(
+                        container_of(kobj, struct device, kobj));
+
+        if (a == &dev_attr_manufacturer.attr) {
+                if (udev->manufacturer == NULL)
+                        return 0;
+        } else if (a == &dev_attr_product.attr) {
+                if (udev->product == NULL)
+                        return 0;
+        } else if (a == &dev_attr_serial.attr) {
+                if (udev->serial == NULL)
+                        return 0;
+        }
+        return a->mode;
+}
+
+static struct attribute_group dev_string_attr_grp = {
+        .attrs =        dev_string_attrs,
+        .is_visible =   dev_string_attrs_are_visible,
+};
+
+struct attribute_group *usb_device_groups[] = {
+        &dev_attr_grp,
+        &dev_string_attr_grp,
+        NULL
+};
+
 /* Binary descriptors */
 
 static ssize_t
@@ -591,10 +631,9 @@ int usb_create_sysfs_dev_files(struct usb_device *udev)
         struct device *dev = &udev->dev;
         int retval;
 
-        retval = sysfs_create_group(&dev->kobj, &dev_attr_grp);
-        if (retval)
-                return retval;
-
+        /* Unforunately these attributes cannot be created before
+         * the uevent is broadcast.
+         */
         retval = device_create_bin_file(dev, &dev_bin_attr_descriptors);
         if (retval)
                 goto error;
@@ -607,21 +646,6 @@ int usb_create_sysfs_dev_files(struct usb_device *udev)
         if (retval)
                 goto error;
 
-        if (udev->manufacturer) {
-                retval = device_create_file(dev, &dev_attr_manufacturer);
-                if (retval)
-                        goto error;
-        }
-        if (udev->product) {
-                retval = device_create_file(dev, &dev_attr_product);
-                if (retval)
-                        goto error;
-        }
-        if (udev->serial) {
-                retval = device_create_file(dev, &dev_attr_serial);
-                if (retval)
-                        goto error;
-        }
         retval = usb_create_ep_files(dev, &udev->ep0, udev);
         if (retval)
                 goto error;
@@ -636,13 +660,9 @@ void usb_remove_sysfs_dev_files(struct usb_device *udev)
         struct device *dev = &udev->dev;
 
         usb_remove_ep_files(&udev->ep0);
-        device_remove_file(dev, &dev_attr_manufacturer);
-        device_remove_file(dev, &dev_attr_product);
-        device_remove_file(dev, &dev_attr_serial);
         remove_power_attributes(dev);
         remove_persist_attributes(dev);
         device_remove_bin_file(dev, &dev_bin_attr_descriptors);
-        sysfs_remove_group(&dev->kobj, &dev_attr_grp);
 }
 
 /* Interface Accociation Descriptor fields */
@@ -688,17 +708,15 @@ static ssize_t show_interface_string(struct device *dev,
                 struct device_attribute *attr, char *buf)
 {
         struct usb_interface *intf;
-        struct usb_device *udev;
-        int len;
+        char *string;
 
         intf = to_usb_interface(dev);
-        udev = interface_to_usbdev(intf);
-        len = snprintf(buf, 256, "%s", intf->cur_altsetting->string);
-        if (len < 0)
+        string = intf->cur_altsetting->string;
+        barrier();              /* The altsetting might change! */
+
+        if (!string)
                 return 0;
-        buf[len] = '\n';
-        buf[len+1] = 0;
-        return len+1;
+        return sprintf(buf, "%s\n", string);
 }
 static DEVICE_ATTR(interface, S_IRUGO, show_interface_string, NULL);
 
@@ -727,18 +745,6 @@ static ssize_t show_modalias(struct device *dev,
 }
 static DEVICE_ATTR(modalias, S_IRUGO, show_modalias, NULL);
 
-static struct attribute *intf_assoc_attrs[] = {
-        &dev_attr_iad_bFirstInterface.attr,
-        &dev_attr_iad_bInterfaceCount.attr,
-        &dev_attr_iad_bFunctionClass.attr,
-        &dev_attr_iad_bFunctionSubClass.attr,
-        &dev_attr_iad_bFunctionProtocol.attr,
-        NULL,
-};
-static struct attribute_group intf_assoc_attr_grp = {
-        .attrs = intf_assoc_attrs,
-};
-
 static struct attribute *intf_attrs[] = {
         &dev_attr_bInterfaceNumber.attr,
         &dev_attr_bAlternateSetting.attr,
@@ -753,6 +759,37 @@ static struct attribute_group intf_attr_grp = {
         .attrs = intf_attrs,
 };
 
+static struct attribute *intf_assoc_attrs[] = {
+        &dev_attr_iad_bFirstInterface.attr,
+        &dev_attr_iad_bInterfaceCount.attr,
+        &dev_attr_iad_bFunctionClass.attr,
+        &dev_attr_iad_bFunctionSubClass.attr,
+        &dev_attr_iad_bFunctionProtocol.attr,
+        NULL,
+};
+
+static mode_t intf_assoc_attrs_are_visible(struct kobject *kobj,
+                struct attribute *a, int n)
+{
+        struct usb_interface *intf = to_usb_interface(
+                        container_of(kobj, struct device, kobj));
+
+        if (intf->intf_assoc == NULL)
+                return 0;
+        return a->mode;
+}
+
+static struct attribute_group intf_assoc_attr_grp = {
+        .attrs =        intf_assoc_attrs,
+        .is_visible =   intf_assoc_attrs_are_visible,
+};
+
+struct attribute_group *usb_interface_groups[] = {
+        &intf_attr_grp,
+        &intf_assoc_attr_grp,
+        NULL
+};
+
 static inline void usb_create_intf_ep_files(struct usb_interface *intf,
                 struct usb_device *udev)
 {
@@ -777,23 +814,21 @@ static inline void usb_remove_intf_ep_files(struct usb_interface *intf)
 
 int usb_create_sysfs_intf_files(struct usb_interface *intf)
 {
-        struct device *dev = &intf->dev;
         struct usb_device *udev = interface_to_usbdev(intf);
         struct usb_host_interface *alt = intf->cur_altsetting;
         int retval;
 
         if (intf->sysfs_files_created)
                 return 0;
-        retval = sysfs_create_group(&dev->kobj, &intf_attr_grp);
-        if (retval)
-                return retval;
 
+        /* The interface string may be present in some altsettings
+         * and missing in others.  Hence its attribute cannot be created
+         * before the uevent is broadcast.
+         */
         if (alt->string == NULL)
                 alt->string = usb_cache_string(udev, alt->desc.iInterface);
         if (alt->string)
-                retval = device_create_file(dev, &dev_attr_interface);
-        if (intf->intf_assoc)
-                retval = sysfs_create_group(&dev->kobj, &intf_assoc_attr_grp);
+                retval = device_create_file(&intf->dev, &dev_attr_interface);
         usb_create_intf_ep_files(intf, udev);
         intf->sysfs_files_created = 1;
         return 0;
@@ -807,7 +842,5 @@ void usb_remove_sysfs_intf_files(struct usb_interface *intf)
                 return;
         usb_remove_intf_ep_files(intf);
         device_remove_file(dev, &dev_attr_interface);
-        sysfs_remove_group(&dev->kobj, &intf_attr_grp);
-        sysfs_remove_group(&intf->dev.kobj, &intf_assoc_attr_grp);
         intf->sysfs_files_created = 0;
 }
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 1f0db51190cc..325774375837 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -291,6 +291,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
         device_initialize(&dev->dev);
         dev->dev.bus = &usb_bus_type;
         dev->dev.type = &usb_device_type;
+        dev->dev.groups = usb_device_groups;
         dev->dev.dma_mask = bus->controller->dma_mask;
         set_dev_node(&dev->dev, dev_to_node(bus->controller));
         dev->state = USB_STATE_ATTACHED;
diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h
index 1bf8ccb9c58d..1a8bc21c335e 100644
--- a/drivers/usb/core/usb.h
+++ b/drivers/usb/core/usb.h
@@ -130,6 +130,10 @@ static inline int is_active(const struct usb_interface *f)
 /* for labeling diagnostics */
 extern const char *usbcore_name;
 
+/* sysfs stuff */
+extern struct attribute_group *usb_device_groups[];
+extern struct attribute_group *usb_interface_groups[];
+
 /* usbfs stuff */
 extern struct mutex usbfs_mutex;
 extern struct usb_driver usbfs_driver;
diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c
index ce337cb5d137..f261d2a9a5f0 100644
--- a/drivers/usb/gadget/amd5536udc.c
+++ b/drivers/usb/gadget/amd5536udc.c
@@ -3251,7 +3251,7 @@ static int udc_pci_probe(
         /* pci setup */
         if (pci_enable_device(pdev) < 0) {
                 kfree(dev);
-                dev = 0;
+                dev = NULL;
                 retval = -ENODEV;
                 goto finished;
         }
@@ -3264,7 +3264,7 @@ static int udc_pci_probe(
         if (!request_mem_region(resource, len, name)) {
                 dev_dbg(&pdev->dev, "pci device used already\n");
                 kfree(dev);
-                dev = 0;
+                dev = NULL;
                 retval = -EBUSY;
                 goto finished;
         }
@@ -3274,7 +3274,7 @@ static int udc_pci_probe(
         if (dev->virt_addr == NULL) {
                 dev_dbg(&pdev->dev, "start address cannot be mapped\n");
                 kfree(dev);
-                dev = 0;
+                dev = NULL;
                 retval = -EFAULT;
                 goto finished;
         }
@@ -3282,7 +3282,7 @@ static int udc_pci_probe(
         if (!pdev->irq) {
                 dev_err(&dev->pdev->dev, "irq not set\n");
                 kfree(dev);
-                dev = 0;
+                dev = NULL;
                 retval = -ENODEV;
                 goto finished;
         }
@@ -3290,7 +3290,7 @@ static int udc_pci_probe(
         if (request_irq(pdev->irq, udc_irq, IRQF_SHARED, name, dev) != 0) {
                 dev_dbg(&dev->pdev->dev, "request_irq(%d) fail\n", pdev->irq);
                 kfree(dev);
-                dev = 0;
+                dev = NULL;
                 retval = -EBUSY;
                 goto finished;
         }
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index e756023362c2..07e5a0b5dcda 100644
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -649,7 +649,13 @@ static int usba_ep_disable(struct usb_ep *_ep)
 
         if (!ep->desc) {
                 spin_unlock_irqrestore(&udc->lock, flags);
-                DBG(DBG_ERR, "ep_disable: %s not enabled\n", ep->ep.name);
+                /* REVISIT because this driver disables endpoints in
+                 * reset_all_endpoints() before calling disconnect(),
+                 * most gadget drivers would trigger this non-error ...
+                 */
+                if (udc->gadget.speed != USB_SPEED_UNKNOWN)
+                        DBG(DBG_ERR, "ep_disable: %s not enabled\n",
+                                        ep->ep.name);
                 return -EINVAL;
         }
         ep->desc = NULL;
@@ -1032,8 +1038,6 @@ static struct usba_udc the_udc = {
                         .release        = nop_release,
                 },
         },
-
-        .lock   = SPIN_LOCK_UNLOCKED,
 };
 
 /*
@@ -1052,6 +1056,12 @@ static void reset_all_endpoints(struct usba_udc *udc)
                 request_complete(ep, req, -ECONNRESET);
         }
 
+        /* NOTE:  normally, the next call to the gadget driver is in
+         * charge of disabling endpoints... usually disconnect().
+         * The exception would be entering a high speed test mode.
+         *
+         * FIXME remove this code ... and retest thoroughly.
+         */
         list_for_each_entry(ep, &udc->gadget.ep_list, ep.ep_list) {
                 if (ep->desc) {
                         spin_unlock(&udc->lock);
@@ -1219,7 +1229,7 @@ static inline bool feature_is_ep_halt(struct usb_ctrlrequest *crq)
 static int handle_ep0_setup(struct usba_udc *udc, struct usba_ep *ep,
                 struct usb_ctrlrequest *crq)
 {
-        int retval = 0;;
+        int retval = 0;
 
         switch (crq->bRequest) {
         case USB_REQ_GET_STATUS: {
@@ -1693,6 +1703,14 @@ static irqreturn_t usba_udc_irq(int irq, void *devid)
                 usba_writel(udc, INT_CLR, USBA_END_OF_RESET);
                 reset_all_endpoints(udc);
 
+                if (udc->gadget.speed != USB_SPEED_UNKNOWN
+                                && udc->driver->disconnect) {
+                        udc->gadget.speed = USB_SPEED_UNKNOWN;
+                        spin_unlock(&udc->lock);
+                        udc->driver->disconnect(&udc->gadget);
+                        spin_lock(&udc->lock);
+                }
+
                 if (status & USBA_HIGH_SPEED) {
                         DBG(DBG_BUS, "High-speed bus reset detected\n");
                         udc->gadget.speed = USB_SPEED_HIGH;
@@ -1716,9 +1734,13 @@ static irqreturn_t usba_udc_irq(int irq, void *devid)
                                 | USBA_DET_SUSPEND
                                 | USBA_END_OF_RESUME));
 
+                /*
+                 * Unclear why we hit this irregularly, e.g. in usbtest,
+                 * but it's clearly harmless...
+                 */
                 if (!(usba_ep_readl(ep0, CFG) & USBA_EPT_MAPPED))
-                        dev_warn(&udc->pdev->dev,
-                                 "WARNING: EP0 configuration is invalid!\n");
+                        dev_dbg(&udc->pdev->dev,
+                                 "ODD: EP0 configuration is invalid!\n");
         }
 
         spin_unlock(&udc->lock);
@@ -1751,9 +1773,11 @@ static irqreturn_t usba_vbus_irq(int irq, void *devid)
                         reset_all_endpoints(udc);
                         toggle_bias(0);
                         usba_writel(udc, CTRL, USBA_DISABLE_MASK);
-                        spin_unlock(&udc->lock);
-                        udc->driver->disconnect(&udc->gadget);
-                        spin_lock(&udc->lock);
+                        if (udc->driver->disconnect) {
+                                spin_unlock(&udc->lock);
+                                udc->driver->disconnect(&udc->gadget);
+                                spin_lock(&udc->lock);
+                        }
                 }
                 udc->vbus_prev = vbus;
         }
@@ -1825,7 +1849,7 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
 
         if (!udc->pdev)
                 return -ENODEV;
-        if (driver != udc->driver)
+        if (driver != udc->driver || !driver->unbind)
                 return -EINVAL;
 
         if (udc->vbus_pin != -1)
@@ -1840,6 +1864,9 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
         toggle_bias(0);
         usba_writel(udc, CTRL, USBA_DISABLE_MASK);
 
+        if (udc->driver->disconnect)
+                udc->driver->disconnect(&udc->gadget);
+
         driver->unbind(&udc->gadget);
         udc->gadget.dev.driver = NULL;
         udc->driver = NULL;
@@ -1879,6 +1906,7 @@ static int __init usba_udc_probe(struct platform_device *pdev)
                 goto err_get_hclk;
         }
 
+        spin_lock_init(&udc->lock);
         udc->pdev = pdev;
         udc->pclk = pclk;
         udc->hclk = hclk;
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index 75eba202f737..499b7a23f351 100644
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -1546,7 +1546,6 @@ static __init void udc_init_data(struct pxa_udc *dev)
         INIT_LIST_HEAD(&dev->gadget.ep0->ep_list);
         dev->udc_usb_ep[0].pxa_ep = &dev->pxa_ep[0];
         ep0_idle(dev);
-        strcpy(dev->dev->bus_id, "");
 
         /* PXA endpoints init */
         for (i = 0; i < NR_PXA_ENDPOINTS; i++) {
@@ -1746,13 +1745,10 @@ static void handle_ep0_ctrl_req(struct pxa_udc *udc,
                 ep_err(ep, "wrong to have extra bytes for setup : 0x%08x\n", i);
         }
 
-        le16_to_cpus(&u.r.wValue);
-        le16_to_cpus(&u.r.wIndex);
-        le16_to_cpus(&u.r.wLength);
-
         ep_dbg(ep, "SETUP %02x.%02x v%04x i%04x l%04x\n",
                 u.r.bRequestType, u.r.bRequest,
-                u.r.wValue, u.r.wIndex, u.r.wLength);
+                le16_to_cpu(u.r.wValue), le16_to_cpu(u.r.wIndex),
+                le16_to_cpu(u.r.wLength));
         if (unlikely(have_extrabytes))
                 goto stall;
 
@@ -2296,7 +2292,8 @@ static void pxa_udc_shutdown(struct platform_device *_dev)
 {
         struct pxa_udc *udc = platform_get_drvdata(_dev);
 
-        udc_disable(udc);
+        if (udc_readl(udc, UDCCR) & UDCCR_UDE)
+                udc_disable(udc);
 }
 
 #ifdef CONFIG_PM
@@ -2361,9 +2358,8 @@ static int pxa_udc_resume(struct platform_device *_dev)
          * Upon exit from sleep mode and before clearing OTGPH,
          * Software must configure the USB OTG pad, UDC, and UHC
          * to the state they were in before entering sleep mode.
-         *
-         * Should be : PSSR |= PSSR_OTGPH;
          */
+        PSSR |= PSSR_OTGPH;
 
         return 0;
 }
@@ -2387,6 +2383,9 @@ static struct platform_driver udc_driver = {
 
 static int __init udc_init(void)
 {
+        if (!cpu_is_pxa27x())
+                return -ENODEV;
+
         printk(KERN_INFO "%s: version %s\n", driver_name, DRIVER_VERSION);
         return platform_driver_probe(&udc_driver, pxa_udc_probe);
 }
diff --git a/drivers/usb/gadget/pxa27x_udc.h b/drivers/usb/gadget/pxa27x_udc.h
index 1d1b7936ee11..97453db924ff 100644
--- a/drivers/usb/gadget/pxa27x_udc.h
+++ b/drivers/usb/gadget/pxa27x_udc.h
@@ -484,4 +484,12 @@ static inline struct pxa_udc *to_gadget_udc(struct usb_gadget *gadget)
 #define ep_warn(ep, fmt, arg...) \
         dev_warn(ep->dev->dev, "%s:%s:" fmt, EPNAME(ep), __func__, ## arg)
 
+/*
+ * Cannot include pxa-regs.h, as register names are similar.
+ * So PSSR is redefined here. This should be removed once UDC registers will
+ * be gone from pxa-regs.h.
+ */
+#define PSSR            __REG(0x40F00004)       /* Power Manager Sleep Status */
+#define PSSR_OTGPH      (1 << 6)                /* OTG Peripheral Hold */
+
 #endif /* __LINUX_USB_GADGET_PXA27X_H */
diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c
index 54cdd6f94034..fa019fa73334 100644
--- a/drivers/usb/gadget/serial.c
+++ b/drivers/usb/gadget/serial.c
@@ -14,7 +14,6 @@
  * This software is distributed under the terms of the GNU General
  * Public License ("GPL") as published by the Free Software Foundation,
  * either version 2 of that License or (at your option) any later version.
- *
  */
 
 #include <linux/kernel.h>
@@ -33,7 +32,7 @@
 /* Defines */
 
 #define GS_VERSION_STR                  "v2.2"
-#define GS_VERSION_NUM                  0x0202
+#define GS_VERSION_NUM                  0x2200
 
 #define GS_LONG_NAME                    "Gadget Serial"
 #define GS_SHORT_NAME                   "g_serial"
@@ -41,7 +40,11 @@
 #define GS_MAJOR                        127
 #define GS_MINOR_START                  0
 
-#define GS_NUM_PORTS                    16
+/* REVISIT only one port is supported for now;
+ * see gs_{send,recv}_packet() ... no multiplexing,
+ * and no support for multiple ACM devices.
+ */
+#define GS_NUM_PORTS                    1
 
 #define GS_NUM_CONFIGS                  1
 #define GS_NO_CONFIG_ID                 0
@@ -65,6 +68,9 @@
 
 #define GS_DEFAULT_USE_ACM              0
 
+/* 9600-8-N-1 ... matches init_termios.c_cflag and defaults
+ * expected by "usbser.sys" on MS-Windows.
+ */
 #define GS_DEFAULT_DTE_RATE             9600
 #define GS_DEFAULT_DATA_BITS            8
 #define GS_DEFAULT_PARITY               USB_CDC_NO_PARITY
@@ -107,10 +113,6 @@ static int debug = 1;
 #define GS_NOTIFY_MAXPACKET             8
 
 
-/* Structures */
-
-struct gs_dev;
-
 /* circular buffer */
 struct gs_buf {
         unsigned int            buf_size;
@@ -119,12 +121,6 @@ struct gs_buf {
         char                    *buf_put;
 };
 
-/* list of requests */
-struct gs_req_entry {
-        struct list_head        re_entry;
-        struct usb_request      *re_req;
-};
-
 /* the port structure holds info for each port, one for each minor number */
 struct gs_port {
         struct gs_dev           *port_dev;      /* pointer to device struct */
@@ -164,26 +160,7 @@ struct gs_dev {
 
 /* Functions */
 
-/* module */
-static int __init gs_module_init(void);
-static void __exit gs_module_exit(void);
-
-/* tty driver */
-static int gs_open(struct tty_struct *tty, struct file *file);
-static void gs_close(struct tty_struct *tty, struct file *file);
-static int gs_write(struct tty_struct *tty,
-        const unsigned char *buf, int count);
-static int gs_put_char(struct tty_struct *tty, unsigned char ch);
-static void gs_flush_chars(struct tty_struct *tty);
-static int gs_write_room(struct tty_struct *tty);
-static int gs_chars_in_buffer(struct tty_struct *tty);
-static void gs_throttle(struct tty_struct * tty);
-static void gs_unthrottle(struct tty_struct * tty);
-static void gs_break(struct tty_struct *tty, int break_state);
-static int  gs_ioctl(struct tty_struct *tty, struct file *file,
-        unsigned int cmd, unsigned long arg);
-static void gs_set_termios(struct tty_struct *tty, struct ktermios *old);
-
+/* tty driver internals */
 static int gs_send(struct gs_dev *dev);
 static int gs_send_packet(struct gs_dev *dev, char *packet,
         unsigned int size);
@@ -192,19 +169,7 @@ static int gs_recv_packet(struct gs_dev *dev, char *packet,
 static void gs_read_complete(struct usb_ep *ep, struct usb_request *req);
 static void gs_write_complete(struct usb_ep *ep, struct usb_request *req);
 
-/* gadget driver */
-static int gs_bind(struct usb_gadget *gadget);
-static void gs_unbind(struct usb_gadget *gadget);
-static int gs_setup(struct usb_gadget *gadget,
-        const struct usb_ctrlrequest *ctrl);
-static int gs_setup_standard(struct usb_gadget *gadget,
-        const struct usb_ctrlrequest *ctrl);
-static int gs_setup_class(struct usb_gadget *gadget,
-        const struct usb_ctrlrequest *ctrl);
-static void gs_setup_complete(struct usb_ep *ep, struct usb_request *req);
-static void gs_setup_complete_set_line_coding(struct usb_ep *ep,
-        struct usb_request *req);
-static void gs_disconnect(struct usb_gadget *gadget);
+/* gadget driver internals */
 static int gs_set_config(struct gs_dev *dev, unsigned config);
 static void gs_reset_config(struct gs_dev *dev);
 static int gs_build_config_buf(u8 *buf, struct usb_gadget *g,
@@ -214,10 +179,6 @@ static struct usb_request *gs_alloc_req(struct usb_ep *ep, unsigned int len,
         gfp_t kmalloc_flags);
 static void gs_free_req(struct usb_ep *ep, struct usb_request *req);
 
-static struct gs_req_entry *gs_alloc_req_entry(struct usb_ep *ep, unsigned len,
-        gfp_t kmalloc_flags);
-static void gs_free_req_entry(struct usb_ep *ep, struct gs_req_entry *req);
-
 static int gs_alloc_ports(struct gs_dev *dev, gfp_t kmalloc_flags);
 static void gs_free_ports(struct gs_dev *dev);
 
@@ -232,62 +193,15 @@ static unsigned int gs_buf_put(struct gs_buf *gb, const char *buf,
 static unsigned int gs_buf_get(struct gs_buf *gb, char *buf,
         unsigned int count);
 
-/* external functions */
-extern int net2280_set_fifo_mode(struct usb_gadget *gadget, int mode);
-
 
 /* Globals */
 
 static struct gs_dev *gs_device;
 
-static const char *EP_IN_NAME;
-static const char *EP_OUT_NAME;
-static const char *EP_NOTIFY_NAME;
-
 static struct mutex gs_open_close_lock[GS_NUM_PORTS];
 
-static unsigned int read_q_size = GS_DEFAULT_READ_Q_SIZE;
-static unsigned int write_q_size = GS_DEFAULT_WRITE_Q_SIZE;
-
-static unsigned int write_buf_size = GS_DEFAULT_WRITE_BUF_SIZE;
-
-static unsigned int use_acm = GS_DEFAULT_USE_ACM;
-
-
-/* tty driver struct */
-static const struct tty_operations gs_tty_ops = {
-        .open =                 gs_open,
-        .close =                gs_close,
-        .write =                gs_write,
-        .put_char =             gs_put_char,
-        .flush_chars =          gs_flush_chars,
-        .write_room =           gs_write_room,
-        .ioctl =                gs_ioctl,
-        .set_termios =          gs_set_termios,
-        .throttle =             gs_throttle,
-        .unthrottle =           gs_unthrottle,
-        .break_ctl =            gs_break,
-        .chars_in_buffer =      gs_chars_in_buffer,
-};
-static struct tty_driver *gs_tty_driver;
-
-/* gadget driver struct */
-static struct usb_gadget_driver gs_gadget_driver = {
-#ifdef CONFIG_USB_GADGET_DUALSPEED
-        .speed =                USB_SPEED_HIGH,
-#else
-        .speed =                USB_SPEED_FULL,
-#endif /* CONFIG_USB_GADGET_DUALSPEED */
-        .function =             GS_LONG_NAME,
-        .bind =                 gs_bind,
-        .unbind =               gs_unbind,
-        .setup =                gs_setup,
-        .disconnect =           gs_disconnect,
-        .driver = {
-                .name =         GS_SHORT_NAME,
-        },
-};
 
+/*-------------------------------------------------------------------------*/
 
 /* USB descriptors */
 
@@ -304,7 +218,6 @@ static char manufacturer[50];
 static struct usb_string gs_strings[] = {
         { GS_MANUFACTURER_STR_ID, manufacturer },
         { GS_PRODUCT_STR_ID, GS_LONG_NAME },
-        { GS_SERIAL_STR_ID, "0" },
         { GS_BULK_CONFIG_STR_ID, "Gadget Serial Bulk" },
         { GS_ACM_CONFIG_STR_ID, "Gadget Serial CDC ACM" },
         { GS_CONTROL_STR_ID, "Gadget Serial Control" },
@@ -327,7 +240,6 @@ static struct usb_device_descriptor gs_device_desc = {
         .idProduct =            __constant_cpu_to_le16(GS_PRODUCT_ID),
         .iManufacturer =        GS_MANUFACTURER_STR_ID,
         .iProduct =             GS_PRODUCT_STR_ID,
-        .iSerialNumber =        GS_SERIAL_STR_ID,
         .bNumConfigurations =   GS_NUM_CONFIGS,
 };
 
@@ -364,7 +276,7 @@ static const struct usb_interface_descriptor gs_bulk_interface_desc = {
         .bDescriptorType =      USB_DT_INTERFACE,
         .bInterfaceNumber =     GS_BULK_INTERFACE_ID,
         .bNumEndpoints =        2,
-        .bInterfaceClass =      USB_CLASS_CDC_DATA,
+        .bInterfaceClass =      USB_CLASS_VENDOR_SPEC,
         .bInterfaceSubClass =   0,
         .bInterfaceProtocol =   0,
         .iInterface =           GS_DATA_STR_ID,
@@ -521,6 +433,8 @@ static const struct usb_descriptor_header *gs_acm_highspeed_function[] = {
 };
 
 
+/*-------------------------------------------------------------------------*/
+
 /* Module */
 MODULE_DESCRIPTION(GS_LONG_NAME);
 MODULE_AUTHOR("Al Borchers");
@@ -531,84 +445,23 @@ module_param(debug, int, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(debug, "Enable debugging, 0=off, 1=on");
 #endif
 
+static unsigned int read_q_size = GS_DEFAULT_READ_Q_SIZE;
 module_param(read_q_size, uint, S_IRUGO);
 MODULE_PARM_DESC(read_q_size, "Read request queue size, default=32");
 
+static unsigned int write_q_size = GS_DEFAULT_WRITE_Q_SIZE;
 module_param(write_q_size, uint, S_IRUGO);
 MODULE_PARM_DESC(write_q_size, "Write request queue size, default=32");
 
+static unsigned int write_buf_size = GS_DEFAULT_WRITE_BUF_SIZE;
 module_param(write_buf_size, uint, S_IRUGO);
 MODULE_PARM_DESC(write_buf_size, "Write buffer size, default=8192");
 
+static unsigned int use_acm = GS_DEFAULT_USE_ACM;
 module_param(use_acm, uint, S_IRUGO);
 MODULE_PARM_DESC(use_acm, "Use CDC ACM, 0=no, 1=yes, default=no");
 
-module_init(gs_module_init);
-module_exit(gs_module_exit);
-
-/*
-*  gs_module_init
-*
-*  Register as a USB gadget driver and a tty driver.
-*/
-static int __init gs_module_init(void)
-{
-        int i;
-        int retval;
-
-        retval = usb_gadget_register_driver(&gs_gadget_driver);
-        if (retval) {
-                pr_err("gs_module_init: cannot register gadget driver, "
-                        "ret=%d\n", retval);
-                return retval;
-        }
-
-        gs_tty_driver = alloc_tty_driver(GS_NUM_PORTS);
-        if (!gs_tty_driver)
-                return -ENOMEM;
-        gs_tty_driver->owner = THIS_MODULE;
-        gs_tty_driver->driver_name = GS_SHORT_NAME;
-        gs_tty_driver->name = "ttygs";
-        gs_tty_driver->major = GS_MAJOR;
-        gs_tty_driver->minor_start = GS_MINOR_START;
-        gs_tty_driver->type = TTY_DRIVER_TYPE_SERIAL;
-        gs_tty_driver->subtype = SERIAL_TYPE_NORMAL;
-        gs_tty_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
-        gs_tty_driver->init_termios = tty_std_termios;
-        gs_tty_driver->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL;
-        tty_set_operations(gs_tty_driver, &gs_tty_ops);
-
-        for (i=0; i < GS_NUM_PORTS; i++)
-                mutex_init(&gs_open_close_lock[i]);
-
-        retval = tty_register_driver(gs_tty_driver);
-        if (retval) {
-                usb_gadget_unregister_driver(&gs_gadget_driver);
-                put_tty_driver(gs_tty_driver);
-                pr_err("gs_module_init: cannot register tty driver, "
-                                "ret=%d\n", retval);
-                return retval;
-        }
-
-        pr_info("gs_module_init: %s %s loaded\n",
-                        GS_LONG_NAME, GS_VERSION_STR);
-        return 0;
-}
-
-/*
-* gs_module_exit
-*
-* Unregister as a tty driver and a USB gadget driver.
-*/
-static void __exit gs_module_exit(void)
-{
-        tty_unregister_driver(gs_tty_driver);
-        put_tty_driver(gs_tty_driver);
-        usb_gadget_unregister_driver(&gs_gadget_driver);
-
-        pr_info("gs_module_exit: %s %s unloaded\n",
-                        GS_LONG_NAME, GS_VERSION_STR);
-}
+/*-------------------------------------------------------------------------*/
 
 /* TTY Driver */
 
@@ -753,15 +606,15 @@ exit_unlock_dev:
  * gs_close
  */
 
-#define GS_WRITE_FINISHED_EVENT_SAFELY(p)                       \
-({                                                              \
-        int cond;                                               \
-                                                                \
-        spin_lock_irq(&(p)->port_lock);                         \
-        cond = !(p)->port_dev || !gs_buf_data_avail((p)->port_write_buf); \
-        spin_unlock_irq(&(p)->port_lock);                       \
-        cond;                                                   \
-})
+static int gs_write_finished_event_safely(struct gs_port *p)
+{
+        int cond;
+
+        spin_lock_irq(&(p)->port_lock);
+        cond = !(p)->port_dev || !gs_buf_data_avail((p)->port_write_buf);
+        spin_unlock_irq(&(p)->port_lock);
+        return cond;
+}
 
 static void gs_close(struct tty_struct *tty, struct file *file)
 {
@@ -807,7 +660,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
         if (gs_buf_data_avail(port->port_write_buf) > 0) {
                 spin_unlock_irq(&port->port_lock);
                 wait_event_interruptible_timeout(port->port_write_wait,
-                                        GS_WRITE_FINISHED_EVENT_SAFELY(port),
+                                        gs_write_finished_event_safely(port),
                                         GS_CLOSE_TIMEOUT * HZ);
                 spin_lock_irq(&port->port_lock);
         }
@@ -1065,6 +918,23 @@ static void gs_set_termios(struct tty_struct *tty, struct ktermios *old)
 {
 }
 
+static const struct tty_operations gs_tty_ops = {
+        .open =                 gs_open,
+        .close =                gs_close,
+        .write =                gs_write,
+        .put_char =             gs_put_char,
+        .flush_chars =          gs_flush_chars,
+        .write_room =           gs_write_room,
+        .ioctl =                gs_ioctl,
+        .set_termios =          gs_set_termios,
+        .throttle =             gs_throttle,
+        .unthrottle =           gs_unthrottle,
+        .break_ctl =            gs_break,
+        .chars_in_buffer =      gs_chars_in_buffer,
+};
+
+/*-------------------------------------------------------------------------*/
+
 /*
 * gs_send
 *
@@ -1080,7 +950,6 @@ static int gs_send(struct gs_dev *dev)
         unsigned long flags;
         struct usb_ep *ep;
         struct usb_request *req;
-        struct gs_req_entry *req_entry;
 
         if (dev == NULL) {
                 pr_err("gs_send: NULL device pointer\n");
@@ -1093,10 +962,8 @@ static int gs_send(struct gs_dev *dev)
 
         while(!list_empty(&dev->dev_req_list)) {
 
-                req_entry = list_entry(dev->dev_req_list.next,
-                        struct gs_req_entry, re_entry);
-
-                req = req_entry->re_req;
+                req = list_entry(dev->dev_req_list.next,
+                                struct usb_request, list);
 
                 len = gs_send_packet(dev, req->buf, ep->maxpacket);
 
@@ -1106,7 +973,7 @@ static int gs_send(struct gs_dev *dev)
                                         *((unsigned char *)req->buf),
                                         *((unsigned char *)req->buf+1),
                                         *((unsigned char *)req->buf+2));
-                        list_del(&req_entry->re_entry);
+                        list_del(&req->list);
                         req->length = len;
                         spin_unlock_irqrestore(&dev->dev_lock, flags);
                         if ((ret=usb_ep_queue(ep, req, GFP_ATOMIC))) {
@@ -1289,7 +1156,6 @@ requeue:
 static void gs_write_complete(struct usb_ep *ep, struct usb_request *req)
 {
         struct gs_dev *dev = ep->driver_data;
-        struct gs_req_entry *gs_req = req->context;
 
         if (dev == NULL) {
                 pr_err("gs_write_complete: NULL device pointer\n");
@@ -1300,13 +1166,8 @@ static void gs_write_complete(struct usb_ep *ep, struct usb_request *req)
         case 0:
                 /* normal completion */
 requeue:
-                if (gs_req == NULL) {
-                        pr_err("gs_write_complete: NULL request pointer\n");
-                        return;
-                }
-
                 spin_lock(&dev->dev_lock);
-                list_add(&gs_req->re_entry, &dev->dev_req_list);
+                list_add(&req->list, &dev->dev_req_list);
                 spin_unlock(&dev->dev_lock);
 
                 gs_send(dev);
@@ -1328,9 +1189,39 @@ requeue:
         }
 }
 
+/*-------------------------------------------------------------------------*/
+
 /* Gadget Driver */
 
 /*
+ * gs_unbind
+ *
+ * Called on module unload.  Frees the control request and device
+ * structure.
+ */
+static void /* __init_or_exit */ gs_unbind(struct usb_gadget *gadget)
+{
+        struct gs_dev *dev = get_gadget_data(gadget);
+
+        gs_device = NULL;
+
+        /* read/write requests already freed, only control request remains */
+        if (dev != NULL) {
+                if (dev->dev_ctrl_req != NULL) {
+                        gs_free_req(gadget->ep0, dev->dev_ctrl_req);
+                        dev->dev_ctrl_req = NULL;
+                }
+                gs_reset_config(dev);
+                gs_free_ports(dev);
+                kfree(dev);
+                set_gadget_data(gadget, NULL);
+        }
+
+        pr_info("gs_unbind: %s %s unbound\n", GS_LONG_NAME,
+                GS_VERSION_STR);
+}
+
+/*
  * gs_bind
  *
  * Called on module load.  Allocates and initializes the device
@@ -1362,19 +1253,23 @@ static int __init gs_bind(struct usb_gadget *gadget)
                         __constant_cpu_to_le16(GS_VERSION_NUM|0x0099);
         }
 
+        dev = kzalloc(sizeof(struct gs_dev), GFP_KERNEL);
+        if (dev == NULL)
+                return -ENOMEM;
+
         usb_ep_autoconfig_reset(gadget);
 
         ep = usb_ep_autoconfig(gadget, &gs_fullspeed_in_desc);
         if (!ep)
                 goto autoconf_fail;
-        EP_IN_NAME = ep->name;
-        ep->driver_data = ep;   /* claim the endpoint */
+        dev->dev_in_ep = ep;
+        ep->driver_data = dev;  /* claim the endpoint */
 
         ep = usb_ep_autoconfig(gadget, &gs_fullspeed_out_desc);
         if (!ep)
                 goto autoconf_fail;
-        EP_OUT_NAME = ep->name;
-        ep->driver_data = ep;   /* claim the endpoint */
+        dev->dev_out_ep = ep;
+        ep->driver_data = dev;  /* claim the endpoint */
 
         if (use_acm) {
                 ep = usb_ep_autoconfig(gadget, &gs_fullspeed_notify_desc);
@@ -1384,8 +1279,8 @@ static int __init gs_bind(struct usb_gadget *gadget)
                 }
                 gs_device_desc.idProduct = __constant_cpu_to_le16(
                                                 GS_CDC_PRODUCT_ID),
-                EP_NOTIFY_NAME = ep->name;
-                ep->driver_data = ep;   /* claim the endpoint */
+                dev->dev_notify_ep = ep;
+                ep->driver_data = dev;  /* claim the endpoint */
         }
 
         gs_device_desc.bDeviceClass = use_acm
@@ -1415,9 +1310,7 @@ static int __init gs_bind(struct usb_gadget *gadget)
                 gs_acm_config_desc.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
         }
 
-        gs_device = dev = kzalloc(sizeof(struct gs_dev), GFP_KERNEL);
-        if (dev == NULL)
-                return -ENOMEM;
+        gs_device = dev;
 
         snprintf(manufacturer, sizeof(manufacturer), "%s %s with %s",
                 init_utsname()->sysname, init_utsname()->release,
@@ -1441,8 +1334,6 @@ static int __init gs_bind(struct usb_gadget *gadget)
                 gs_unbind(gadget);
                 return -ENOMEM;
         }
-        dev->dev_ctrl_req->complete = gs_setup_complete;
-
         gadget->ep0->driver_data = dev;
 
         pr_info("gs_bind: %s %s bound\n",
@@ -1451,99 +1342,11 @@ static int __init gs_bind(struct usb_gadget *gadget)
         return 0;
 
 autoconf_fail:
+        kfree(dev);
         pr_err("gs_bind: cannot autoconfigure on %s\n", gadget->name);
         return -ENODEV;
 }
 
-/*
- * gs_unbind
- *
- * Called on module unload.  Frees the control request and device
- * structure.
- */
-static void /* __init_or_exit */ gs_unbind(struct usb_gadget *gadget)
-{
-        struct gs_dev *dev = get_gadget_data(gadget);
-
-        gs_device = NULL;
-
-        /* read/write requests already freed, only control request remains */
-        if (dev != NULL) {
-                if (dev->dev_ctrl_req != NULL) {
-                        gs_free_req(gadget->ep0, dev->dev_ctrl_req);
-                        dev->dev_ctrl_req = NULL;
-                }
-                gs_free_ports(dev);
-                if (dev->dev_notify_ep)
-                        usb_ep_disable(dev->dev_notify_ep);
-                if (dev->dev_in_ep)
-                        usb_ep_disable(dev->dev_in_ep);
-                if (dev->dev_out_ep)
-                        usb_ep_disable(dev->dev_out_ep);
-                kfree(dev);
-                set_gadget_data(gadget, NULL);
-        }
-
-        pr_info("gs_unbind: %s %s unbound\n", GS_LONG_NAME,
-                GS_VERSION_STR);
-}
-
-/*
- * gs_setup
- *
- * Implements all the control endpoint functionality that's not
- * handled in hardware or the hardware driver.
- *
- * Returns the size of the data sent to the host, or a negative
- * error number.
- */
-static int gs_setup(struct usb_gadget *gadget,
-        const struct usb_ctrlrequest *ctrl)
-{
-        int ret = -EOPNOTSUPP;
-        struct gs_dev *dev = get_gadget_data(gadget);
-        struct usb_request *req = dev->dev_ctrl_req;
-        u16 wIndex = le16_to_cpu(ctrl->wIndex);
-        u16 wValue = le16_to_cpu(ctrl->wValue);
-        u16 wLength = le16_to_cpu(ctrl->wLength);
-
-        req->complete = gs_setup_complete;
-
-        switch (ctrl->bRequestType & USB_TYPE_MASK) {
-        case USB_TYPE_STANDARD:
-                ret = gs_setup_standard(gadget,ctrl);
-                break;
-
-        case USB_TYPE_CLASS:
-                ret = gs_setup_class(gadget,ctrl);
-                break;
-
-        default:
-                pr_err("gs_setup: unknown request, type=%02x, request=%02x, "
-                        "value=%04x, index=%04x, length=%d\n",
-                        ctrl->bRequestType, ctrl->bRequest,
-                        wValue, wIndex, wLength);
-                break;
-        }
-
-        /* respond with data transfer before status phase? */
-        if (ret >= 0) {
-                req->length = ret;
-                req->zero = ret < wLength
-                                && (ret % gadget->ep0->maxpacket) == 0;
-                ret = usb_ep_queue(gadget->ep0, req, GFP_ATOMIC);
-                if (ret < 0) {
-                        pr_err("gs_setup: cannot queue response, ret=%d\n",
-                                ret);
-                        req->status = 0;
-                        gs_setup_complete(gadget->ep0, req);
-                }
-        }
-
-        /* device either stalls (ret < 0) or reports success */
-        return ret;
-}
-
 static int gs_setup_standard(struct usb_gadget *gadget,
         const struct usb_ctrlrequest *ctrl)
 {
@@ -1673,6 +1476,42 @@ set_interface_done:
         return ret;
 }
 
+static void gs_setup_complete_set_line_coding(struct usb_ep *ep,
+                struct usb_request *req)
+{
+        struct gs_dev *dev = ep->driver_data;
+        struct gs_port *port = dev->dev_port[0]; /* ACM only has one port */
+
+        switch (req->status) {
+        case 0:
+                /* normal completion */
+                if (req->actual != sizeof(port->port_line_coding))
+                        usb_ep_set_halt(ep);
+                else if (port) {
+                        struct usb_cdc_line_coding      *value = req->buf;
+
+                        /* REVISIT:  we currently just remember this data.
+                         * If we change that, (a) validate it first, then
+                         * (b) update whatever hardware needs updating.
+                         */
+                        spin_lock(&port->port_lock);
+                        port->port_line_coding = *value;
+                        spin_unlock(&port->port_lock);
+                }
+                break;
+
+        case -ESHUTDOWN:
+                /* disconnect */
+                gs_free_req(ep, req);
+                break;
+
+        default:
+                /* unexpected */
+                break;
+        }
+        return;
+}
+
 static int gs_setup_class(struct usb_gadget *gadget,
         const struct usb_ctrlrequest *ctrl)
 {
@@ -1734,52 +1573,72 @@ static int gs_setup_class(struct usb_gadget *gadget,
         return ret;
 }
 
-static void gs_setup_complete_set_line_coding(struct usb_ep *ep,
-                struct usb_request *req)
+/*
+ * gs_setup_complete
+ */
+static void gs_setup_complete(struct usb_ep *ep, struct usb_request *req)
 {
-        struct gs_dev *dev = ep->driver_data;
-        struct gs_port *port = dev->dev_port[0]; /* ACM only has one port */
+        if (req->status || req->actual != req->length) {
+                pr_err("gs_setup_complete: status error, status=%d, "
+                        "actual=%d, length=%d\n",
+                        req->status, req->actual, req->length);
+        }
+}
 
-        switch (req->status) {
-        case 0:
-                /* normal completion */
-                if (req->actual != sizeof(port->port_line_coding))
-                        usb_ep_set_halt(ep);
-                else if (port) {
-                        struct usb_cdc_line_coding      *value = req->buf;
+/*
+ * gs_setup
+ *
+ * Implements all the control endpoint functionality that's not
+ * handled in hardware or the hardware driver.
+ *
+ * Returns the size of the data sent to the host, or a negative
+ * error number.
+ */
+static int gs_setup(struct usb_gadget *gadget,
+        const struct usb_ctrlrequest *ctrl)
+{
+        int             ret = -EOPNOTSUPP;
+        struct gs_dev   *dev = get_gadget_data(gadget);
+        struct usb_request *req = dev->dev_ctrl_req;
+        u16             wIndex = le16_to_cpu(ctrl->wIndex);
+        u16             wValue = le16_to_cpu(ctrl->wValue);
+        u16             wLength = le16_to_cpu(ctrl->wLength);
 
-                        /* REVISIT:  we currently just remember this data.
-                         * If we change that, (a) validate it first, then
-                         * (b) update whatever hardware needs updating.
-                         */
-                        spin_lock(&port->port_lock);
-                        port->port_line_coding = *value;
-                        spin_unlock(&port->port_lock);
-                }
+        req->complete = gs_setup_complete;
+
+        switch (ctrl->bRequestType & USB_TYPE_MASK) {
+        case USB_TYPE_STANDARD:
+                ret = gs_setup_standard(gadget, ctrl);
                 break;
 
-        case -ESHUTDOWN:
-                /* disconnect */
-                gs_free_req(ep, req);
+        case USB_TYPE_CLASS:
+                ret = gs_setup_class(gadget, ctrl);
                 break;
 
         default:
-                /* unexpected */
+                pr_err("gs_setup: unknown request, type=%02x, request=%02x, "
+                        "value=%04x, index=%04x, length=%d\n",
+                        ctrl->bRequestType, ctrl->bRequest,
+                        wValue, wIndex, wLength);
                 break;
         }
-        return;
-}
 
-/*
- * gs_setup_complete
- */
-static void gs_setup_complete(struct usb_ep *ep, struct usb_request *req)
-{
-        if (req->status || req->actual != req->length) {
-                pr_err("gs_setup_complete: status error, status=%d, "
-                        "actual=%d, length=%d\n",
-                        req->status, req->actual, req->length);
+        /* respond with data transfer before status phase? */
+        if (ret >= 0) {
+                req->length = ret;
+                req->zero = ret < wLength
+                                && (ret % gadget->ep0->maxpacket) == 0;
+                ret = usb_ep_queue(gadget->ep0, req, GFP_ATOMIC);
+                if (ret < 0) {
+                        pr_err("gs_setup: cannot queue response, ret=%d\n",
+                                ret);
+                        req->status = 0;
+                        gs_setup_complete(gadget->ep0, req);
+                }
         }
+
+        /* device either stalls (ret < 0) or reports success */
+        return ret;
 }
 
 /*
@@ -1811,6 +1670,23 @@ static void gs_disconnect(struct usb_gadget *gadget)
         pr_info("gs_disconnect: %s disconnected\n", GS_LONG_NAME);
 }
 
+static struct usb_gadget_driver gs_gadget_driver = {
+#ifdef CONFIG_USB_GADGET_DUALSPEED
+        .speed =                USB_SPEED_HIGH,
+#else
+        .speed =                USB_SPEED_FULL,
+#endif /* CONFIG_USB_GADGET_DUALSPEED */
+        .function =             GS_LONG_NAME,
+        .bind =                 gs_bind,
+        .unbind =               gs_unbind,
+        .setup =                gs_setup,
+        .disconnect =           gs_disconnect,
+        .driver = {
+                .name =         GS_SHORT_NAME,
+                .owner =        THIS_MODULE,
+        },
+};
+
 /*
  * gs_set_config
  *
@@ -1826,9 +1702,8 @@ static int gs_set_config(struct gs_dev *dev, unsigned config)
         int ret = 0;
         struct usb_gadget *gadget = dev->dev_gadget;
         struct usb_ep *ep;
-        struct usb_endpoint_descriptor *ep_desc;
+        struct usb_endpoint_descriptor *out, *in, *notify;
         struct usb_request *req;
-        struct gs_req_entry *req_entry;
 
         if (dev == NULL) {
                 pr_err("gs_set_config: NULL device pointer\n");
@@ -1846,86 +1721,62 @@ static int gs_set_config(struct gs_dev *dev, unsigned config)
         case GS_BULK_CONFIG_ID:
                 if (use_acm)
                         return -EINVAL;
-                /* device specific optimizations */
-                if (gadget_is_net2280(gadget))
-                        net2280_set_fifo_mode(gadget, 1);
                 break;
         case GS_ACM_CONFIG_ID:
                 if (!use_acm)
                         return -EINVAL;
-                /* device specific optimizations */
-                if (gadget_is_net2280(gadget))
-                        net2280_set_fifo_mode(gadget, 1);
                 break;
         default:
                 return -EINVAL;
         }
 
-        dev->dev_config = config;
-
-        gadget_for_each_ep(ep, gadget) {
-
-                if (EP_NOTIFY_NAME
-                && strcmp(ep->name, EP_NOTIFY_NAME) == 0) {
-                        ep_desc = choose_ep_desc(gadget,
+        in = choose_ep_desc(gadget,
+                        &gs_highspeed_in_desc,
+                        &gs_fullspeed_in_desc);
+        out = choose_ep_desc(gadget,
+                        &gs_highspeed_out_desc,
+                        &gs_fullspeed_out_desc);
+        notify = dev->dev_notify_ep
+                ? choose_ep_desc(gadget,
                                 &gs_highspeed_notify_desc,
-                                &gs_fullspeed_notify_desc);
-                        ret = usb_ep_enable(ep,ep_desc);
-                        if (ret == 0) {
-                                ep->driver_data = dev;
-                                dev->dev_notify_ep = ep;
-                                dev->dev_notify_ep_desc = ep_desc;
-                        } else {
-                                pr_err("gs_set_config: cannot enable NOTIFY "
-                                        "endpoint %s, ret=%d\n",
-                                        ep->name, ret);
-                                goto exit_reset_config;
-                        }
-                }
-
-                else if (strcmp(ep->name, EP_IN_NAME) == 0) {
-                        ep_desc = choose_ep_desc(gadget,
-                                &gs_highspeed_in_desc,
-                                &gs_fullspeed_in_desc);
-                        ret = usb_ep_enable(ep,ep_desc);
-                        if (ret == 0) {
-                                ep->driver_data = dev;
-                                dev->dev_in_ep = ep;
-                                dev->dev_in_ep_desc = ep_desc;
-                        } else {
-                                pr_err("gs_set_config: cannot enable IN "
-                                        "endpoint %s, ret=%d\n",
-                                        ep->name, ret);
-                                goto exit_reset_config;
-                        }
-                }
+                                &gs_fullspeed_notify_desc)
+                : NULL;
 
-                else if (strcmp(ep->name, EP_OUT_NAME) == 0) {
-                        ep_desc = choose_ep_desc(gadget,
-                                &gs_highspeed_out_desc,
-                                &gs_fullspeed_out_desc);
-                        ret = usb_ep_enable(ep,ep_desc);
-                        if (ret == 0) {
-                                ep->driver_data = dev;
-                                dev->dev_out_ep = ep;
-                                dev->dev_out_ep_desc = ep_desc;
-                        } else {
-                                pr_err("gs_set_config: cannot enable OUT "
-                                        "endpoint %s, ret=%d\n",
-                                        ep->name, ret);
-                                goto exit_reset_config;
-                        }
-                }
+        ret = usb_ep_enable(dev->dev_in_ep, in);
+        if (ret == 0) {
+                dev->dev_in_ep_desc = in;
+        } else {
+                pr_debug("%s: cannot enable %s %s, ret=%d\n",
+                        __func__, "IN", dev->dev_in_ep->name, ret);
+                return ret;
+        }
 
+        ret = usb_ep_enable(dev->dev_out_ep, out);
+        if (ret == 0) {
+                dev->dev_out_ep_desc = out;
+        } else {
+                pr_debug("%s: cannot enable %s %s, ret=%d\n",
+                        __func__, "OUT", dev->dev_out_ep->name, ret);
+fail0:
+                usb_ep_disable(dev->dev_in_ep);
+                return ret;
         }
 
-        if (dev->dev_in_ep == NULL || dev->dev_out_ep == NULL
-        || (config != GS_BULK_CONFIG_ID && dev->dev_notify_ep == NULL)) {
-                pr_err("gs_set_config: cannot find endpoints\n");
-                ret = -ENODEV;
-                goto exit_reset_config;
+        if (notify) {
+                ret = usb_ep_enable(dev->dev_notify_ep, notify);
+                if (ret == 0) {
+                        dev->dev_notify_ep_desc = notify;
+                } else {
+                        pr_debug("%s: cannot enable %s %s, ret=%d\n",
+                                __func__, "NOTIFY",
+                                dev->dev_notify_ep->name, ret);
+                        usb_ep_disable(dev->dev_out_ep);
+                        goto fail0;
+                }
         }
 
+        dev->dev_config = config;
+
         /* allocate and queue read requests */
         ep = dev->dev_out_ep;
         for (i=0; i<read_q_size && ret == 0; i++) {
@@ -1946,9 +1797,10 @@ static int gs_set_config(struct gs_dev *dev, unsigned config)
         /* allocate write requests, and put on free list */
         ep = dev->dev_in_ep;
         for (i=0; i<write_q_size; i++) {
-                if ((req_entry=gs_alloc_req_entry(ep, ep->maxpacket, GFP_ATOMIC))) {
-                        req_entry->re_req->complete = gs_write_complete;
-                        list_add(&req_entry->re_entry, &dev->dev_req_list);
+                req = gs_alloc_req(ep, ep->maxpacket, GFP_ATOMIC);
+                if (req) {
+                        req->complete = gs_write_complete;
+                        list_add(&req->list, &dev->dev_req_list);
                 } else {
                         pr_err("gs_set_config: cannot allocate "
                                         "write requests\n");
@@ -1986,7 +1838,7 @@ exit_reset_config:
  */
 static void gs_reset_config(struct gs_dev *dev)
 {
-        struct gs_req_entry *req_entry;
+        struct usb_request *req;
 
         if (dev == NULL) {
                 pr_err("gs_reset_config: NULL device pointer\n");
@@ -2000,26 +1852,18 @@ static void gs_reset_config(struct gs_dev *dev)
 
         /* free write requests on the free list */
         while(!list_empty(&dev->dev_req_list)) {
-                req_entry = list_entry(dev->dev_req_list.next,
-                        struct gs_req_entry, re_entry);
-                list_del(&req_entry->re_entry);
-                gs_free_req_entry(dev->dev_in_ep, req_entry);
+                req = list_entry(dev->dev_req_list.next,
+                                struct usb_request, list);
+                list_del(&req->list);
+                gs_free_req(dev->dev_in_ep, req);
         }
 
         /* disable endpoints, forcing completion of pending i/o; */
         /* completion handlers free their requests in this case */
-        if (dev->dev_notify_ep) {
+        if (dev->dev_notify_ep)
                 usb_ep_disable(dev->dev_notify_ep);
-                dev->dev_notify_ep = NULL;
-        }
-        if (dev->dev_in_ep) {
-                usb_ep_disable(dev->dev_in_ep);
-                dev->dev_in_ep = NULL;
-        }
-        if (dev->dev_out_ep) {
-                usb_ep_disable(dev->dev_out_ep);
-                dev->dev_out_ep = NULL;
-        }
+        usb_ep_disable(dev->dev_in_ep);
+        usb_ep_disable(dev->dev_out_ep);
 }
 
 /*
@@ -2113,46 +1957,6 @@ static void gs_free_req(struct usb_ep *ep, struct usb_request *req)
 }
 
 /*
- * gs_alloc_req_entry
- *
- * Allocates a request and its buffer, using the given
- * endpoint, buffer len, and kmalloc flags.
- */
-static struct gs_req_entry *
-gs_alloc_req_entry(struct usb_ep *ep, unsigned len, gfp_t kmalloc_flags)
-{
-        struct gs_req_entry     *req;
-
-        req = kmalloc(sizeof(struct gs_req_entry), kmalloc_flags);
-        if (req == NULL)
-                return NULL;
-
-        req->re_req = gs_alloc_req(ep, len, kmalloc_flags);
-        if (req->re_req == NULL) {
-                kfree(req);
-                return NULL;
-        }
-
-        req->re_req->context = req;
-
-        return req;
-}
-
-/*
- * gs_free_req_entry
- *
- * Frees a request and its buffer.
- */
-static void gs_free_req_entry(struct usb_ep *ep, struct gs_req_entry *req)
-{
-        if (ep != NULL && req != NULL) {
-                if (req->re_req != NULL)
-                        gs_free_req(ep, req->re_req);
-                kfree(req);
-        }
-}
-
-/*
  * gs_alloc_ports
  *
  * Allocate all ports and set the gs_dev struct to point to them.
@@ -2233,6 +2037,8 @@ static void gs_free_ports(struct gs_dev *dev)
         }
 }
 
+/*-------------------------------------------------------------------------*/
+
 /* Circular Buffer */
 
 /*
@@ -2393,3 +2199,77 @@ gs_buf_get(struct gs_buf *gb, char *buf, unsigned int count)
 
         return count;
 }
+
+/*-------------------------------------------------------------------------*/
+
+static struct tty_driver *gs_tty_driver;
+
+/*
+ *  gs_module_init
+ *
+ *  Register as a USB gadget driver and a tty driver.
+ */
+static int __init gs_module_init(void)
+{
+        int i;
+        int retval;
+
+        retval = usb_gadget_register_driver(&gs_gadget_driver);
+        if (retval) {
+                pr_err("gs_module_init: cannot register gadget driver, "
+                        "ret=%d\n", retval);
+                return retval;
+        }
+
+        gs_tty_driver = alloc_tty_driver(GS_NUM_PORTS);
+        if (!gs_tty_driver)
+                return -ENOMEM;
+        gs_tty_driver->owner = THIS_MODULE;
+        gs_tty_driver->driver_name = GS_SHORT_NAME;
+        gs_tty_driver->name = "ttygs";
+        gs_tty_driver->major = GS_MAJOR;
+        gs_tty_driver->minor_start = GS_MINOR_START;
+        gs_tty_driver->type = TTY_DRIVER_TYPE_SERIAL;
+        gs_tty_driver->subtype = SERIAL_TYPE_NORMAL;
+        gs_tty_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
+        gs_tty_driver->init_termios = tty_std_termios;
+        /* must match GS_DEFAULT_DTE_RATE and friends */
+        gs_tty_driver->init_termios.c_cflag =
+                B9600 | CS8 | CREAD | HUPCL | CLOCAL;
+        gs_tty_driver->init_termios.c_ispeed = GS_DEFAULT_DTE_RATE;
+        gs_tty_driver->init_termios.c_ospeed = GS_DEFAULT_DTE_RATE;
+        tty_set_operations(gs_tty_driver, &gs_tty_ops);
+
+        for (i = 0; i < GS_NUM_PORTS; i++)
+                mutex_init(&gs_open_close_lock[i]);
+
+        retval = tty_register_driver(gs_tty_driver);
+        if (retval) {
+                usb_gadget_unregister_driver(&gs_gadget_driver);
+                put_tty_driver(gs_tty_driver);
+                pr_err("gs_module_init: cannot register tty driver, "
+                                "ret=%d\n", retval);
+                return retval;
+        }
+
+        pr_info("gs_module_init: %s %s loaded\n",
+                        GS_LONG_NAME, GS_VERSION_STR);
+        return 0;
+}
+module_init(gs_module_init);
+
+/*
+ * gs_module_exit
+ *
+ * Unregister as a tty driver and a USB gadget driver.
+ */
+static void __exit gs_module_exit(void)
+{
+        tty_unregister_driver(gs_tty_driver);
+        put_tty_driver(gs_tty_driver);
+        usb_gadget_unregister_driver(&gs_gadget_driver);
+
+        pr_info("gs_module_exit: %s %s unloaded\n",
+                        GS_LONG_NAME, GS_VERSION_STR);
+}
+module_exit(gs_module_exit);
diff --git a/drivers/usb/host/isp1760-hcd.c b/drivers/usb/host/isp1760-hcd.c
index 4ba96c1e060c..c9cec8738261 100644
--- a/drivers/usb/host/isp1760-hcd.c
+++ b/drivers/usb/host/isp1760-hcd.c
@@ -988,7 +988,7 @@ static void do_atl_int(struct usb_hcd *usb_hcd)
                          * This did not trigger for a long time now.
                          */
                         printk(KERN_ERR "Reloading ptd %p/%p... qh %p readed: "
-                                        "%d of %d done: %08x cur: %08x\n", qtd,
+                                        "%d of %zu done: %08x cur: %08x\n", qtd,
                                         urb, qh, PTD_XFERRED_LENGTH(dw3),
                                         qtd->length, done_map,
                                         (1 << queue_entry));
@@ -1088,7 +1088,7 @@ static void do_atl_int(struct usb_hcd *usb_hcd)
                 } else if (usb_pipebulk(urb->pipe) && (length < qtd->length)) {
                         /* short BULK received */
 
-                        printk(KERN_ERR "short bulk, %d instead %d\n", length,
+                        printk(KERN_ERR "short bulk, %d instead %zu\n", length,
                                         qtd->length);
                         if (urb->transfer_flags & URB_SHORT_NOT_OK) {
                                 urb->status = -EREMOTEIO;
diff --git a/drivers/usb/host/isp1760-if.c b/drivers/usb/host/isp1760-if.c
index 73fb2a38f1e4..440bf94f0d4c 100644
--- a/drivers/usb/host/isp1760-if.c
+++ b/drivers/usb/host/isp1760-if.c
@@ -256,7 +256,7 @@ static struct pci_driver isp1761_pci_driver = {
 
 static int __init isp1760_init(void)
 {
-        int ret;
+        int ret = -ENODEV;
 
         init_kmem_once();
 
diff --git a/drivers/usb/host/ohci-sm501.c b/drivers/usb/host/ohci-sm501.c
index 77204f001b9a..e899a77dfb83 100644
--- a/drivers/usb/host/ohci-sm501.c
+++ b/drivers/usb/host/ohci-sm501.c
@@ -90,7 +90,7 @@ static int ohci_hcd_sm501_drv_probe(struct platform_device *pdev)
         struct device *dev = &pdev->dev;
         struct resource *res, *mem;
         int retval, irq;
-        struct usb_hcd *hcd = 0;
+        struct usb_hcd *hcd = NULL;
 
         irq = retval = platform_get_irq(pdev, 0);
         if (retval < 0)
diff --git a/drivers/usb/misc/ldusb.c b/drivers/usb/misc/ldusb.c
index 7aafd53fbcab..189a9db03509 100644
--- a/drivers/usb/misc/ldusb.c
+++ b/drivers/usb/misc/ldusb.c
@@ -63,9 +63,6 @@
 #define USB_DEVICE_ID_VERNIER_CYCLOPS   0x0004
 #define USB_DEVICE_ID_VERNIER_LCSPEC    0x0006
 
-#define USB_VENDOR_ID_MICROCHIP         0x04d8
-#define USB_DEVICE_ID_PICDEM            0x000c
-
 #ifdef CONFIG_USB_DYNAMIC_MINORS
 #define USB_LD_MINOR_BASE       0
 #else
@@ -92,7 +89,6 @@ static struct usb_device_id ld_usb_table [] = {
         { USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP) },
         { USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP) },
         { USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_CYCLOPS) },
-        { USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICDEM) },
         { USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LCSPEC) },
         { }                                     /* Terminating entry */
 };
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index 742be3c35947..054dedd28127 100644
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -856,6 +856,11 @@ test_ctrl_queue (struct usbtest_dev *dev, struct usbtest_param *param)
                 struct urb              *u;
                 struct usb_ctrlrequest  req;
                 struct subcase          *reqp;
+
+                /* sign of this variable means:
+                 *  -: tested code must return this (negative) error code
+                 *  +: tested code may return this (negative too) error code
+                 */
                 int                     expected = 0;
 
                 /* requests here are mostly expected to succeed on any
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 2cffec85ee7e..9ba64ccc1359 100644
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -447,6 +447,15 @@ config USB_SERIAL_MOS7840
           To compile this driver as a module, choose M here: the
           module will be called mos7840.  If unsure, choose N.
 
+config USB_SERIAL_MOTOROLA
+        tristate "USB Motorola Phone modem driver"
+        ---help---
+          Say Y here if you want to use a Motorola phone with a USB
+          connector as a modem link.
+
+          To compile this driver as a module, choose M here: the
+          module will be called moto_modem.  If unsure, choose N.
+
 config USB_SERIAL_NAVMAN
         tristate "USB Navman GPS device"
         help
diff --git a/drivers/usb/serial/Makefile b/drivers/usb/serial/Makefile
index 756859510d8c..17a762ab6769 100644
--- a/drivers/usb/serial/Makefile
+++ b/drivers/usb/serial/Makefile
@@ -39,6 +39,7 @@ obj-$(CONFIG_USB_SERIAL_KOBIL_SCT)		+= kobil_sct.o
 obj-$(CONFIG_USB_SERIAL_MCT_U232)               += mct_u232.o
 obj-$(CONFIG_USB_SERIAL_MOS7720)                += mos7720.o
 obj-$(CONFIG_USB_SERIAL_MOS7840)                += mos7840.o
+obj-$(CONFIG_USB_SERIAL_MOTOROLA)               += moto_modem.o
 obj-$(CONFIG_USB_SERIAL_NAVMAN)                 += navman.o
 obj-$(CONFIG_USB_SERIAL_OMNINET)                += omninet.o
 obj-$(CONFIG_USB_SERIAL_OPTION)                 += option.o
diff --git a/drivers/usb/serial/moto_modem.c b/drivers/usb/serial/moto_modem.c
new file mode 100644
index 000000000000..2e8e05462ef7
--- /dev/null
+++ b/drivers/usb/serial/moto_modem.c
@@ -0,0 +1,70 @@
+/*
+ * Motorola USB Phone driver
+ *
+ * Copyright (C) 2008 Greg Kroah-Hartman <greg@kroah.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ * {sigh}
+ * Mororola should be using the CDC ACM USB spec, but instead
+ * they try to just "do their own thing"...  This driver should handle a
+ * few phones in which a basic "dumb serial connection" is needed to be
+ * able to get a connection through to them.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/tty.h>
+#include <linux/module.h>
+#include <linux/usb.h>
+#include <linux/usb/serial.h>
+
+static struct usb_device_id id_table [] = {
+        { USB_DEVICE(0x05c6, 0x3197) }, /* unknown Motorola phone */
+        { USB_DEVICE(0x0c44, 0x0022) }, /* unknown Mororola phone */
+        { USB_DEVICE(0x22b8, 0x2a64) }, /* Motorola KRZR K1m */
+        { },
+};
+MODULE_DEVICE_TABLE(usb, id_table);
+
+static struct usb_driver moto_driver = {
+        .name =         "moto-modem",
+        .probe =        usb_serial_probe,
+        .disconnect =   usb_serial_disconnect,
+        .id_table =     id_table,
+        .no_dynamic_id =        1,
+};
+
+static struct usb_serial_driver moto_device = {
+        .driver = {
+                .owner =        THIS_MODULE,
+                .name =         "moto-modem",
+        },
+        .id_table =             id_table,
+        .num_ports =            1,
+};
+
+static int __init moto_init(void)
+{
+        int retval;
+
+        retval = usb_serial_register(&moto_device);
+        if (retval)
+                return retval;
+        retval = usb_register(&moto_driver);
+        if (retval)
+                usb_serial_deregister(&moto_device);
+        return retval;
+}
+
+static void __exit moto_exit(void)
+{
+        usb_deregister(&moto_driver);
+        usb_serial_deregister(&moto_device);
+}
+
+module_init(moto_init);
+module_exit(moto_exit);
+MODULE_LICENSE("GPL");
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index e4be2d442b1e..e7e016e60333 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -154,8 +154,6 @@ static int  option_send_setup(struct usb_serial_port *port);
 #define NOVATELWIRELESS_PRODUCT_MC727           0x4100
 #define NOVATELWIRELESS_PRODUCT_MC950D          0x4400
 
-#define NOVATELWIRELESS_PRODUCT_U727            0x5010
-
 /* FUTURE NOVATEL PRODUCTS */
 #define NOVATELWIRELESS_PRODUCT_EVDO_1          0x6000
 #define NOVATELWIRELESS_PRODUCT_HSPA_1          0x7000
@@ -184,6 +182,9 @@ static int  option_send_setup(struct usb_serial_port *port);
 #define AXESSTEL_VENDOR_ID                      0x1726
 #define AXESSTEL_PRODUCT_MV110H                 0x1000
 
+#define ONDA_VENDOR_ID                          0x19d2
+#define ONDA_PRODUCT_ET502HS                    0x0002
+
 #define BANDRICH_VENDOR_ID                      0x1A8D
 #define BANDRICH_PRODUCT_C100_1                 0x1002
 #define BANDRICH_PRODUCT_C100_2                 0x1003
@@ -269,7 +270,6 @@ static struct usb_device_id option_ids[] = {
         { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU870D) }, /* Novatel EU850D/EU860D/EU870D */
         { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC950D) }, /* Novatel MC930D/MC950D */
         { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC727) }, /* Novatel MC727/U727/USB727 */
-        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U727) }, /* Novatel U727 */
         { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_1) }, /* Novatel EVDO product */
         { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_1) }, /* Novatel HSPA product */
         { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EMBEDDED_1) }, /* Novatel Embedded product */
@@ -293,14 +293,17 @@ static struct usb_device_id option_ids[] = {
         { USB_DEVICE(DELL_VENDOR_ID, 0x8133) }, /* Dell Wireless 5720 == Novatel EV620 CDMA/EV-DO */
         { USB_DEVICE(DELL_VENDOR_ID, 0x8136) }, /* Dell Wireless HSDPA 5520 == Novatel Expedite EU860D */
         { USB_DEVICE(DELL_VENDOR_ID, 0x8137) }, /* Dell Wireless HSDPA 5520 */
+        { USB_DEVICE(DELL_VENDOR_ID, 0x8138) }, /* Dell Wireless 5520 Voda I Mobile Broadband (3G HSDPA) Minicard */
         { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_E100A) },
         { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_500A) },
         { USB_DEVICE(AXESSTEL_VENDOR_ID, AXESSTEL_PRODUCT_MV110H) },
+        { USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_ET502HS) },
         { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_1) },
         { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_2) },
         { USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC680) },
         { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */
         { USB_DEVICE(MAXON_VENDOR_ID, 0x6280) }, /* BP3-USB & BP3-EXT HSDPA */
+        { USB_DEVICE(0x19d2, 0x0001) },         /* Telstra NextG CDMA */
         { } /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, option_ids);
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index a0ed889230aa..1b09578cbb10 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -401,6 +401,14 @@ UNUSUAL_DEV(  0x04a5, 0x3010, 0x0100, 0x0100,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_IGNORE_RESIDUE ),
 
+#ifdef CONFIG_USB_STORAGE_CYPRESS_ATACB
+UNUSUAL_DEV(  0x04b4, 0x6830, 0x0000, 0x9999,
+                "Cypress",
+                "Cypress AT2LP",
+                US_SC_CYP_ATACB, US_PR_BULK, NULL,
+                0),
+#endif
+
 /* Reported by Simon Levitt <simon@whattf.com>
  * This entry needs Sub and Proto fields */
 UNUSUAL_DEV(  0x04b8, 0x0601, 0x0100, 0x0100,
@@ -539,17 +547,6 @@ UNUSUAL_DEV(  0x04e6, 0x0101, 0x0200, 0x0200,
                 "CD-RW Device",
                 US_SC_8020, US_PR_CB, NULL, 0),
 
-/* Entry and supporting patch by Theodore Kilgore <kilgota@auburn.edu>.
- * Device uses standards-violating 32-byte Bulk Command Block Wrappers and
- * reports itself as "Proprietary SCSI Bulk." Cf. device entry 0x084d:0x0011.
- */
-
-UNUSUAL_DEV(  0x04fc, 0x80c2, 0x0100, 0x0100,
-                "Kobian Mercury",
-                "Binocam DCB-132",
-                US_SC_DEVICE, US_PR_DEVICE, NULL,
-                US_FL_BULK32),
-
 #ifdef CONFIG_USB_STORAGE_USBAT
 UNUSUAL_DEV(  0x04e6, 0x1010, 0x0000, 0x9999,
                 "Shuttle/SCM",
@@ -565,6 +562,16 @@ UNUSUAL_DEV(  0x04e8, 0x507c, 0x0220, 0x0220,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_MAX_SECTORS_64),
 
+/* Entry and supporting patch by Theodore Kilgore <kilgota@auburn.edu>.
+ * Device uses standards-violating 32-byte Bulk Command Block Wrappers and
+ * reports itself as "Proprietary SCSI Bulk." Cf. device entry 0x084d:0x0011.
+ */
+UNUSUAL_DEV(  0x04fc, 0x80c2, 0x0100, 0x0100,
+                "Kobian Mercury",
+                "Binocam DCB-132",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_BULK32),
+
 /* Reported by Bob Sass <rls@vectordb.com> -- only rev 1.33 tested */
 UNUSUAL_DEV(  0x050d, 0x0115, 0x0133, 0x0133,
                 "Belkin",
@@ -1304,6 +1311,16 @@ UNUSUAL_DEV( 0x0ace, 0x20ff, 0x0101, 0x0101,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_IGNORE_DEVICE ),
 
+/* Reported by F. Aben <f.aben@option.com>
+ * This device (wrongly) has a vendor-specific device descriptor.
+ * The entry is needed so usb-storage can bind to it's mass-storage
+ * interface as an interface driver */
+UNUSUAL_DEV( 0x0af0, 0x7401, 0x0000, 0x0000,
+                "Option",
+                "GI 0401 SD-Card",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                0 ),
+
 #ifdef CONFIG_USB_STORAGE_ISD200
 UNUSUAL_DEV(  0x0bf6, 0xa001, 0x0100, 0x0110,
                 "ATI",
@@ -1361,13 +1378,6 @@ UNUSUAL_DEV( 0x0d96, 0x410a, 0x0001, 0xffff,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_FIX_INQUIRY),
 
-/* Reported by Rohan Hart <rohan.hart17@gmail.com> */
-UNUSUAL_DEV(  0x2770, 0x915d, 0x0010, 0x0010,
-                "INTOVA",
-                "Pixtreme",
-                US_SC_DEVICE, US_PR_DEVICE, NULL,
-                US_FL_FIX_CAPACITY ),
-
 /*
  * Entry for Jenoptik JD 5200z3
  *
@@ -1684,6 +1694,16 @@ UNUSUAL_DEV(  0x1652, 0x6600, 0x0201, 0x0201,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_IGNORE_RESIDUE ),
 
+/* Reported by Mauro Andreolini <andreoli@weblab.ing.unimo.it>
+ * This entry is needed to bypass the ZeroCD mechanism
+ * and to properly load as a modem device.
+ */
+UNUSUAL_DEV(  0x19d2, 0x2000, 0x0000, 0x0000,
+                "Onda ET502HS",
+                "USB MMC Storage",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_IGNORE_DEVICE),
+
 /* patch submitted by Davide Perini <perini.davide@dpsoftware.org>
  * and Renato Perini <rperini@email.it>
  */
@@ -1721,6 +1741,13 @@ UNUSUAL_DEV(  0x2735, 0x100b, 0x0000, 0x9999,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_GO_SLOW ),
 
+/* Reported by Rohan Hart <rohan.hart17@gmail.com> */
+UNUSUAL_DEV(  0x2770, 0x915d, 0x0010, 0x0010,
+                "INTOVA",
+                "Pixtreme",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_FIX_CAPACITY ),
+
 /*
  * David Härdeman <david@2gen.com>
  * The key makes the SCSI stack print confusing (but harmless) messages
@@ -1745,14 +1772,6 @@ UNUSUAL_DEV(  0xed06, 0x4500, 0x0001, 0x0001,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_CAPACITY_HEURISTICS),
 
-#ifdef CONFIG_USB_STORAGE_CYPRESS_ATACB
-UNUSUAL_DEV(  0x04b4, 0x6830, 0x0000, 0x9999,
-                "Cypress",
-                "Cypress AT2LP",
-                US_SC_CYP_ATACB, US_PR_BULK, NULL,
-                0),
-#endif
-
 /* Control/Bulk transport for all SubClass values */
 USUAL_DEV(US_SC_RBC, US_PR_CB, USB_US_TYPE_STOR),
 USUAL_DEV(US_SC_8020, US_PR_CB, USB_US_TYPE_STOR),
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index bb1dadaa4a23..2cdaf1ff8315 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -171,7 +171,6 @@ config FB_SYS_FOPS
 config FB_DEFERRED_IO
         bool
         depends on FB
-        default y
 
 config FB_METRONOME
         tristate
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index 8ffdf3578768..b004036d4087 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -441,14 +441,15 @@ static int atmel_lcdfb_set_par(struct fb_info *info)
 
         value = DIV_ROUND_UP(clk_value_khz, PICOS2KHZ(info->var.pixclock));
 
-        value = (value / 2) - 1;
-        dev_dbg(info->device, "  * programming CLKVAL = 0x%08lx\n", value);
-
-        if (value <= 0) {
+        if (value < 2) {
                 dev_notice(info->device, "Bypassing pixel clock divider\n");
                 lcdc_writel(sinfo, ATMEL_LCDC_LCDCON1, ATMEL_LCDC_BYPASS);
         } else {
-                lcdc_writel(sinfo, ATMEL_LCDC_LCDCON1, value << ATMEL_LCDC_CLKVAL_OFFSET);
+                value = (value / 2) - 1;
+                dev_dbg(info->device, "  * programming CLKVAL = 0x%08lx\n",
+                                value);
+                lcdc_writel(sinfo, ATMEL_LCDC_LCDCON1,
+                                value << ATMEL_LCDC_CLKVAL_OFFSET);
                 info->var.pixclock = KHZ2PICOS(clk_value_khz / (2 * (value + 1)));
                 dev_dbg(info->device, "  updated pixclk:     %lu KHz\n",
                                         PICOS2KHZ(info->var.pixclock));
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index ad31983b43eb..5fa8b76673cb 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -1853,6 +1853,8 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
         struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
         struct display *p = &fb_display[vc->vc_num];
         int scroll_partial = info->flags & FBINFO_PARTIAL_PAN_OK;
+        unsigned short saved_ec;
+        int ret;
 
         if (fbcon_is_inactive(vc, info))
                 return -EINVAL;
@@ -1865,6 +1867,11 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
          *           whole screen (prevents flicker).
          */
 
+        saved_ec = vc->vc_video_erase_char;
+        vc->vc_video_erase_char = vc->vc_scrl_erase_char;
+
+        ret = 0;
+
         switch (dir) {
         case SM_UP:
                 if (count > vc->vc_rows)        /* Maximum realistic size */
@@ -1883,7 +1890,7 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
                                                         (b - count)),
                                     vc->vc_scrl_erase_char,
                                     vc->vc_size_row * count);
-                        return 1;
+                        ret = 1;
                         break;
 
                 case SCROLL_WRAP_MOVE:
@@ -1955,7 +1962,8 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
                                                         (b - count)),
                                     vc->vc_scrl_erase_char,
                                     vc->vc_size_row * count);
-                        return 1;
+                        ret = 1;
+                        break;
                 }
                 break;
 
@@ -1974,7 +1982,7 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
                                                         t),
                                     vc->vc_scrl_erase_char,
                                     vc->vc_size_row * count);
-                        return 1;
+                        ret = 1;
                         break;
 
                 case SCROLL_WRAP_MOVE:
@@ -2044,10 +2052,13 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
                                                         t),
                                     vc->vc_scrl_erase_char,
                                     vc->vc_size_row * count);
-                        return 1;
+                        ret = 1;
+                        break;
                 }
+                break;
         }
-        return 0;
+        vc->vc_video_erase_char = saved_ec;
+        return ret;
 }
 
 
@@ -2507,6 +2518,9 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h,
                         c = vc->vc_video_erase_char;
                         vc->vc_video_erase_char =
                             ((c & 0xfe00) >> 1) | (c & 0xff);
+                        c = vc->vc_def_color;
+                        vc->vc_scrl_erase_char =
+                            ((c & 0xFE00) >> 1) | (c & 0xFF);
                         vc->vc_attr >>= 1;
                 }
         } else if (!vc->vc_hi_font_mask && cnt == 512) {
@@ -2537,9 +2551,14 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h,
                         if (vc->vc_can_do_color) {
                                 vc->vc_video_erase_char =
                                     ((c & 0xff00) << 1) | (c & 0xff);
+                                c = vc->vc_def_color;
+                                vc->vc_scrl_erase_char =
+                                    ((c & 0xFF00) << 1) | (c & 0xFF);
                                 vc->vc_attr <<= 1;
-                        } else
+                        } else {
                                 vc->vc_video_erase_char = c & ~0x100;
+                                vc->vc_scrl_erase_char = c & ~0x100;
+                        }
                 }
 
         }
diff --git a/drivers/video/geode/lxfb_ops.c b/drivers/video/geode/lxfb_ops.c
index cd9d4cc26954..aaef9165ec9b 100644
--- a/drivers/video/geode/lxfb_ops.c
+++ b/drivers/video/geode/lxfb_ops.c
@@ -63,54 +63,32 @@ static const struct {
   { 0x00014284,  19688 },
   { 0x00011104,  20400 },
   { 0x00016363,  23625 },
-  { 0x00015303,  24380 },
   { 0x000031AC,  24923 },
   { 0x0000215D,  25175 },
   { 0x00001087,  27000 },
   { 0x0000216C,  28322 },
   { 0x0000218D,  28560 },
-  { 0x00010041,  29913 },
   { 0x000010C9,  31200 },
   { 0x00003147,  31500 },
-  { 0x000141A1,  32400 },
   { 0x000010A7,  33032 },
-  { 0x00012182,  33375 },
-  { 0x000141B1,  33750 },
   { 0x00002159,  35112 },
   { 0x00004249,  35500 },
   { 0x00000057,  36000 },
-  { 0x000141E1,  37125 },
   { 0x0000219A,  37889 },
   { 0x00002158,  39168 },
   { 0x00000045,  40000 },
-  { 0x000131A1,  40500 },
-  { 0x00010061,  42301 },
   { 0x00000089,  43163 },
-  { 0x00012151,  43875 },
   { 0x000010E7,  44900 },
   { 0x00002136,  45720 },
-  { 0x000152E1,  47250 },
-  { 0x00010071,  48000 },
   { 0x00003207,  49500 },
   { 0x00002187,  50000 },
-  { 0x00014291,  50625 },
-  { 0x00011101,  51188 },
-  { 0x00017481,  54563 },
   { 0x00004286,  56250 },
-  { 0x00014170,  57375 },
-  { 0x00016210,  58500 },
   { 0x000010E5,  60065 },
-  { 0x00013140,  62796 },
   { 0x00004214,  65000 },
-  { 0x00016250,  65250 },
   { 0x00001105,  68179 },
-  { 0x000141C0,  69600 },
-  { 0x00015220,  70160 },
-  { 0x00010050,  72000 },
   { 0x000031E4,  74250 },
   { 0x00003183,  75000 },
   { 0x00004284,  78750 },
-  { 0x00012130,  80052 },
   { 0x00001104,  81600 },
   { 0x00006363,  94500 },
   { 0x00005303,  97520 },
diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig
index 9de1c114f809..39ac49e0682c 100644
--- a/drivers/video/logo/Kconfig
+++ b/drivers/video/logo/Kconfig
@@ -27,6 +27,16 @@ config LOGO_LINUX_CLUT224
         bool "Standard 224-color Linux logo"
         default y
 
+config LOGO_BLACKFIN_VGA16
+        bool "16-colour Blackfin Processor Linux logo"
+        depends on BLACKFIN
+        default y
+
+config LOGO_BLACKFIN_CLUT224
+        bool "224-colour Blackfin Processor Linux logo"
+        depends on BLACKFIN
+        default y
+
 config LOGO_DEC_CLUT224
         bool "224-color Digital Equipment Corporation Linux logo"
         depends on MACH_DECSTATION || ALPHA
diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile
index a5fc4edf84e6..b91251d1fe41 100644
--- a/drivers/video/logo/Makefile
+++ b/drivers/video/logo/Makefile
@@ -4,6 +4,8 @@ obj-$(CONFIG_LOGO)			+= logo.o
 obj-$(CONFIG_LOGO_LINUX_MONO)           += logo_linux_mono.o
 obj-$(CONFIG_LOGO_LINUX_VGA16)          += logo_linux_vga16.o
 obj-$(CONFIG_LOGO_LINUX_CLUT224)        += logo_linux_clut224.o
+obj-$(CONFIG_LOGO_BLACKFIN_CLUT224)     += logo_blackfin_clut224.o
+obj-$(CONFIG_LOGO_BLACKFIN_VGA16)       += logo_blackfin_vga16.o
 obj-$(CONFIG_LOGO_DEC_CLUT224)          += logo_dec_clut224.o
 obj-$(CONFIG_LOGO_MAC_CLUT224)          += logo_mac_clut224.o
 obj-$(CONFIG_LOGO_PARISC_CLUT224)       += logo_parisc_clut224.o
diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c
index fc72684aae5a..2e85a2b52d05 100644
--- a/drivers/video/logo/logo.c
+++ b/drivers/video/logo/logo.c
@@ -24,6 +24,8 @@
 extern const struct linux_logo logo_linux_mono;
 extern const struct linux_logo logo_linux_vga16;
 extern const struct linux_logo logo_linux_clut224;
+extern const struct linux_logo logo_blackfin_vga16;
+extern const struct linux_logo logo_blackfin_clut224;
 extern const struct linux_logo logo_dec_clut224;
 extern const struct linux_logo logo_mac_clut224;
 extern const struct linux_logo logo_parisc_clut224;
@@ -65,6 +67,10 @@ const struct linux_logo * __init_refok fb_find_logo(int depth)
                 /* Generic Linux logo */
                 logo = &logo_linux_vga16;
 #endif
+#ifdef CONFIG_LOGO_BLACKFIN_VGA16
+                /* Blackfin processor logo */
+                logo = &logo_blackfin_vga16;
+#endif
 #ifdef CONFIG_LOGO_SUPERH_VGA16
                 /* SuperH Linux logo */
                 logo = &logo_superh_vga16;
@@ -76,6 +82,10 @@ const struct linux_logo * __init_refok fb_find_logo(int depth)
                 /* Generic Linux logo */
                 logo = &logo_linux_clut224;
 #endif
+#ifdef CONFIG_LOGO_BLACKFIN_CLUT224
+                /* Blackfin Linux logo */
+                logo = &logo_blackfin_clut224;
+#endif
 #ifdef CONFIG_LOGO_DEC_CLUT224
                 /* DEC Linux logo on MIPS/MIPS64 or ALPHA */
                 logo = &logo_dec_clut224;
diff --git a/drivers/video/logo/logo_blackfin_clut224.ppm b/drivers/video/logo/logo_blackfin_clut224.ppm
new file mode 100644
index 000000000000..dc9a50a14477
--- /dev/null
+++ b/drivers/video/logo/logo_blackfin_clut224.ppm
@@ -0,0 +1,1127 @@
+P3
+# This was generated by the GIMP & Netpbm tools
+# gimp linux_bf.svg (create 80x80 save as linux_bf.ppm)
+# pnmquant 224 linux_bf.ppm | pnmnoraw > logo_blackfin_clut224.ppm
+#
+80 80
+255
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+1 1 1  3 3 3  4 6 6  6 6 6  4 6 6  3 3 3
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  2 2 2  10 10 10  26 26 27
+44 44 45  66 66 66  78 81 81  78 81 81  75 75 76  60 60 60
+39 39 39  20 20 20  6 6 6  1 1 1  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  2 2 2  14 14 14  47 47 47  84 84 84  75 75 76
+47 47 47  12 12 12  0 0 0  0 0 0  0 0 0  20 20 20
+53 54 54  81 81 82  74 74 74  31 31 31  6 6 6  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+4 4 4  34 34 35  84 84 84  60 60 60  4 4 4  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  17 18 18  75 75 76  66 66 66  17 18 18
+1 1 1  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  3 3 3
+42 42 43  84 84 84  8 8 8  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 3 3  36 40 40  10 16 16  0 0 0  31 31 31  84 84 84
+29 29 30  2 2 2  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  1 1 1  26 27 27
+84 84 84  3 3 3  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+15 19 19  114 115 115  110 114 114  44 46 46  0 0 0  12 12 12
+90 87 86  24 24 24  1 1 1  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  8 8 8  75 75 76
+14 14 14  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+30 40 40  133 133 133  129 130 130  78 85 85  23 31 30  0 0 0
+19 19 19  78 81 81  13 13 13  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  26 27 27  81 81 82
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+36 40 40  89 90 91  55 63 63  23 31 30  4 6 6  0 0 0
+0 0 0  60 60 60  47 47 47  2 2 2  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  2 2 2  53 54 54  34 34 35
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+4 10 10  7 9 9  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  1 1 1  84 84 84  13 13 13  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  4 6 6  78 81 81  2 2 2
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  65 64 64  36 36 36  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  10 11 11  81 81 82  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  12 12 12  67 70 70  4 4 4  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  16 16 16  81 81 82  0 0 0
+0 0 0  0 0 0  4 10 10  44 50 50  18 21 21  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 1 1  78 85 85  120 121 122  7 9 9  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  82 82 81  12 12 12  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  19 19 19  81 81 82  0 0 0
+0 0 0  2 2 2  8 8 8  55 63 63  108 110 110  52 58 58
+0 0 0  0 0 0  0 0 0  0 0 0  42 42 43  129 130 130
+140 142 143  114 115 115  110 114 114  129 130 130  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  75 75 76  24 24 24  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  19 19 19  74 74 74  0 0 0
+4 6 6  167 168 167  196 196 197  196 196 197  61 65 66  78 85 85
+0 0 0  0 0 0  0 0 0  118 118 118  202 202 203  219 219 219
+219 219 219  214 214 215  187 187 188  78 85 85  29 33 34  0 0 0
+0 0 0  0 0 0  0 0 0  60 60 60  39 39 39  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  19 19 19  72 71 71  0 0 0
+185 185 184  244 245 245  250 251 252  251 251 252  247 248 249  36 36 36
+0 0 0  0 0 0  13 13 13  243 243 241  252 252 252  253 253 253
+253 253 253  252 252 252  247 247 246  193 193 194  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  42 42 43  50 51 51  1 1 1
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  19 19 19  78 81 81  0 0 0
+247 247 246  193 193 194  95 97 97  193 193 194  255 255 255  237 237 238
+0 0 0  0 0 0  202 202 203  255 255 255  247 247 246  108 107 107
+82 85 86  167 168 167  255 255 255  248 248 249  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  34 34 35  56 56 56  2 2 2
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  19 19 19  78 81 81  0 0 0
+250 250 251  50 51 51  153 154 155  150 151 151  244 245 245  244 245 245
+44 50 50  84 89 89  153 154 155  255 255 255  140 142 143  0 0 0
+149 149 150  156 155 156  237 237 238  254 254 254  67 70 70  0 0 0
+0 0 0  0 0 0  0 0 0  39 39 39  47 47 47  1 1 1
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  19 19 19  81 81 82  0 0 0
+248 248 249  34 34 35  72 71 71  165 165 165  202 202 203  244 245 245
+10 16 16  82 85 86  89 90 91  255 255 255  95 97 97  0 0 0
+0 0 0  53 54 54  177 177 174  255 255 255  127 127 126  0 0 0
+0 0 0  0 0 0  0 0 0  39 39 39  36 36 36  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  14 14 14  78 81 81  0 0 0
+243 243 243  89 90 91  0 0 0  36 40 40  201 147 55  241 205 27
+241 205 27  241 205 27  241 205 27  238 192 33  108 110 110  0 0 0
+0 0 0  0 0 0  191 190 190  254 254 254  34 34 35  0 0 0
+0 0 0  0 0 0  0 0 0  42 42 43  42 42 43  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  10 10 10  75 75 76  0 0 0
+202 202 203  218 217 217  21 19 17  230 165 41  199 129 48  213 157 40
+244 212 23  243 206 27  180 121 62  243 206 27  244 209 25  226 179 40
+15 10 7  103 103 103  254 254 254  251 251 252  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  17 18 18  58 58 58  2 2 2
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  9 9 9  84 84 84  0 0 0
+0 0 0  226 226 219  213 157 40  244 209 25  245 211 23  245 211 23
+245 214 38  245 214 38  245 211 23  245 211 23  245 211 23  244 212 23
+244 212 23  241 205 27  226 179 40  196 196 197  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  74 74 74  4 6 6
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  7 7 7  84 84 84  0 0 0
+54 42 32  213 157 40  243 206 27  245 211 23  245 211 23  245 211 23
+245 215 41  245 214 35  245 211 23  245 211 23  245 214 35  245 215 41
+245 214 35  245 211 23  245 211 23  238 204 29  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  81 81 82  12 12 12
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  4 6 6  74 74 74  0 0 0
+201 147 55  241 205 27  245 211 23  245 211 23  245 211 23  245 213 29
+245 214 38  245 211 23  245 211 23  245 214 35  245 215 41  245 215 41
+245 213 29  142 83 36  142 83 36  244 209 25  1 1 1  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  74 74 74  25 25 26
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  4 4 4  72 71 71  6 6 6
+213 157 40  244 209 25  245 211 23  245 211 23  245 211 23  245 213 29
+244 212 23  245 211 23  245 214 35  245 215 41  245 215 41  245 213 29
+142 83 36  142 83 36  238 192 33  241 205 27  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  44 44 44  49 50 50
+2 2 2  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  3 3 3  65 64 64  17 18 18
+199 129 48  199 129 48  245 211 23  245 211 23  245 211 23  245 211 23
+245 211 23  244 212 23  245 214 38  245 214 38  142 83 36  142 83 36
+142 83 36  245 211 23  244 210 23  230 165 41  0 0 0  0 0 0
+78 81 81  114 115 115  73 79 79  0 0 0  3 3 3  81 81 82
+9 9 9  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  1 1 1  49 50 50  29 29 30
+90 87 86  199 129 48  173 101 51  173 101 51  245 211 23  245 211 23
+245 211 23  230 165 41  142 83 36  142 83 36  142 83 36  245 211 23
+244 210 23  241 205 27  230 165 41  175 173 165  3 3 3  0 0 0
+44 46 46  118 118 118  118 118 118  108 110 110  0 0 0  75 75 76
+28 28 28  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  1 1 1  52 53 53  26 26 27
+118 118 118  175 173 165  199 129 48  173 101 51  173 101 51  173 101 51
+173 101 51  142 83 36  173 101 51  245 211 23  244 209 25  238 204 29
+213 157 40  214 196 166  227 227 227  214 214 215  120 121 122  0 0 0
+0 0 0  108 110 110  118 118 118  118 118 118  0 0 0  23 23 23
+66 66 66  4 6 6  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  7 7 7  75 75 76  4 4 4
+127 127 126  205 205 205  181 181 181  199 129 48  226 179 40  244 209 25
+244 209 25  244 209 25  243 206 27  238 192 33  213 157 40  187 166 103
+234 234 234  248 248 249  251 252 252  248 248 249  214 214 215  0 0 0
+0 0 0  0 0 0  103 103 103  100 103 103  0 0 0  0 0 0
+78 81 81  24 24 24  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  26 27 27  82 82 81  0 0 0
+146 146 147  234 234 234  222 221 221  178 178 179  180 121 62  213 157 40
+213 157 40  213 157 40  201 147 55  180 121 62  219 219 219  243 243 241
+253 253 253  255 255 255  255 255 255  255 255 255  250 250 251  120 121 122
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+20 20 20  72 71 71  8 8 8  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  10 10 10  75 75 76  22 22 22  0 0 0
+205 205 205  253 253 253  247 248 249  212 211 212  178 178 179  161 161 162
+165 165 165  181 181 181  205 205 205  227 227 227  244 245 245  254 254 254
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  239 239 240
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  67 70 70  39 39 39  2 2 2  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  4 4 4  50 51 51  60 60 60  0 0 0  16 16 16
+249 250 251  255 255 255  255 255 255  240 240 240  209 210 210  193 193 194
+200 200 197  212 211 212  231 231 231  246 247 248  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  253 253 253
+153 154 155  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  3 3 3  84 84 84  20 20 20  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+2 2 2  33 33 34  81 81 82  0 0 0  0 0 0  231 231 231
+255 255 255  255 255 255  255 255 255  253 253 253  234 234 234  222 221 221
+227 227 227  237 237 238  250 250 251  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+240 240 240  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  26 27 27  72 71 71  8 8 8  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  1 1 1
+21 21 22  84 84 84  7 7 7  0 0 0  150 151 151  252 252 252
+255 255 255  255 255 255  255 255 255  255 255 255  252 252 252  244 245 245
+246 247 248  253 253 253  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+251 251 252  9 9 9  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  65 64 64  47 47 47  3 3 3
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  12 12 12
+75 75 76  26 26 27  0 0 0  1 1 1  239 239 240  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  202 202 203  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  84 84 84  28 28 29
+1 1 1  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  4 4 4  55 55 55
+60 60 60  0 0 0  0 0 0  95 97 97  248 248 249  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  244 245 245  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  14 14 14  82 82 81
+15 15 15  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  1 1 1  29 29 30  84 84 84
+0 0 0  0 0 0  0 0 0  156 155 156  247 247 246  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  247 247 246  240 240 240  232 232 233  232 232 233
+243 243 243  253 253 253  53 54 54  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  44 44 44
+60 60 60  6 6 6  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  10 10 10  81 81 82  14 14 14
+0 0 0  0 0 0  6 6 6  150 151 151  214 214 215  250 251 252
+255 255 255  255 255 255  255 255 255  246 247 248  218 217 217  214 214 215
+218 217 217  244 245 245  255 255 255  255 255 255  255 255 255  250 248 249
+232 232 233  214 214 215  196 196 197  182 183 184  181 181 181  181 181 181
+187 187 188  240 240 240  232 232 233  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+78 81 81  34 34 35  1 1 1  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  1 1 1  39 39 39  74 74 74  0 0 0
+0 0 0  0 0 0  60 60 60  161 161 162  200 200 197  229 229 230
+251 251 252  255 255 255  255 255 255  255 255 255  243 243 241  214 214 215
+248 248 249  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
+239 239 240  214 214 215  193 193 194  182 183 184  178 178 179  176 177 177
+176 177 177  182 183 184  248 248 249  14 14 14  0 0 0  61 65 66
+10 16 16  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+10 10 10  84 84 84  13 13 13  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  10 11 11  82 82 81  7 7 7  0 0 0
+0 0 0  0 0 0  165 165 165  229 229 230  249 250 251  254 254 254
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  253 253 253  240 240 240  227 227 227  205 205 205
+181 181 181  176 177 177  191 190 190  227 227 227  0 0 0  44 50 50
+84 89 89  61 65 66  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  58 58 58  49 50 50  3 3 3  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  1 1 1  36 36 36  66 66 66  0 0 0  29 33 34
+0 3 3  26 27 27  234 234 234  254 254 254  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+254 254 254  253 253 254  252 253 253  253 253 254  253 254 254  253 254 254
+254 254 254  255 255 255  255 255 255  255 255 255  255 255 255  251 251 252
+227 227 227  187 187 188  176 177 177  222 221 221  13 13 13  0 0 0
+12 15 14  73 79 79  36 40 40  0 0 0  0 0 0  0 0 0
+0 0 0  1 1 1  90 87 86  17 18 18  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  7 7 7  78 81 81  12 12 12  23 31 30  52 58 58
+0 0 0  209 210 210  253 253 253  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
+251 251 252  150 151 151  103 103 103  129 130 130  196 196 197  250 250 251
+252 252 253  254 254 254  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  240 240 240  193 193 194  196 196 197  229 229 230  0 0 0
+0 0 0  4 10 10  30 40 40  0 3 3  0 0 0  0 0 0
+0 0 0  0 0 0  47 47 47  53 54 54  3 3 3  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  23 23 23  81 81 82  0 0 0  52 58 58  36 40 40
+42 42 43  250 250 251  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
+227 227 227  7 7 7  7 7 7  7 7 7  7 7 7  44 44 45
+156 155 156  249 250 251  253 253 253  254 254 254  255 255 255  255 255 255
+255 255 255  255 255 255  247 247 246  222 221 221  239 239 240  0 0 0
+30 40 40  44 50 50  23 31 30  29 33 34  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  90 87 86  16 16 16  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+2 2 2  50 51 51  42 42 43  29 33 34  52 58 58  0 0 0
+232 232 233  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
+250 251 252  44 44 44  7 7 7  7 7 7  7 7 7  7 7 7
+7 7 7  56 56 56  209 210 210  252 252 253  254 254 254  255 255 255
+255 255 255  255 255 255  255 255 255  254 253 253  249 250 251  146 146 147
+36 40 40  44 50 50  36 40 40  67 70 70  61 65 66  0 0 0
+0 0 0  0 0 0  0 0 0  55 55 55  44 44 45  1 1 1
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+10 10 10  81 81 82  1 1 1  52 58 58  44 50 50  52 53 53
+251 251 252  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  254 254 254
+253 253 253  187 187 188  8 8 8  7 7 7  7 7 7  7 7 7
+7 7 7  7 7 7  19 19 19  178 178 179  252 252 253  254 254 254
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  237 237 238
+10 16 16  30 40 40  0 3 3  23 31 30  84 89 89  0 0 0
+0 0 0  0 0 0  0 0 0  3 3 3  81 81 82  9 9 9
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+29 29 30  72 71 71  10 16 16  52 58 58  0 0 0  222 221 221
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+254 254 254  251 251 252  95 97 97  7 7 7  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  10 10 10  161 161 162  251 252 252
+254 254 254  255 255 255  255 255 255  255 255 255  255 255 255  248 248 249
+0 0 0  0 0 0  0 0 0  0 0 0  84 89 89  0 3 3
+0 0 0  0 0 0  0 0 0  0 0 0  74 74 74  26 27 27
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  4 4 4
+65 64 64  20 20 20  20 25 25  30 40 40  0 0 0  247 247 246
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  253 253 254  222 221 221  9 9 9  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  8 8 8  149 149 150
+252 252 253  254 254 254  255 255 255  255 255 255  255 255 255  252 252 252
+0 0 0  0 0 0  0 0 0  0 0 0  73 79 79  12 15 14
+0 0 0  0 0 0  0 0 0  0 0 0  36 36 36  58 58 58
+3 3 3  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  20 20 20
+74 74 74  0 0 0  4 10 10  4 10 10  36 36 36  252 252 252
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  227 227 227  253 253 253  255 255 255
+255 255 255  254 254 254  250 251 252  65 64 64  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  8 8 8
+146 146 147  251 252 252  254 254 254  255 255 255  255 255 255  253 254 254
+0 0 0  0 0 0  0 0 0  0 0 0  52 58 58  10 16 16
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  82 82 81
+9 9 9  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  4 6 6  65 64 64
+25 25 25  0 3 3  30 40 40  0 0 0  187 187 188  254 254 254
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  193 193 194  253 252 252  255 255 255
+255 255 255  255 255 255  252 253 253  129 130 130  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+8 8 8  149 149 150  252 252 253  254 254 254  255 255 255  254 254 254
+52 53 53  0 0 0  0 0 0  0 0 0  20 25 25  2 5 4
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  81 81 82
+20 20 20  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  26 26 27  81 81 82
+0 0 0  18 21 21  73 79 79  0 0 0  237 237 238  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  182 183 184  255 255 255  255 255 255
+255 255 255  255 255 255  253 253 253  176 177 177  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+7 7 7  8 8 8  153 154 155  251 252 252  254 254 254  255 255 255
+150 151 151  0 0 0  0 0 0  0 0 0  20 25 25  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  65 64 64
+33 33 34  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  6 6 6  67 70 70  20 20 20
+0 0 0  23 31 30  82 85 86  0 0 0  247 247 246  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  182 183 184  255 255 255  255 255 255
+255 255 255  255 255 255  253 254 254  214 214 215  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+7 7 7  7 7 7  8 8 8  156 155 156  252 252 253  254 254 254
+167 168 167  0 0 0  0 0 0  0 0 0  67 70 70  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  47 47 47
+44 44 44  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  21 21 22  75 75 76  0 0 0
+0 0 0  29 33 34  84 89 89  0 0 0  248 248 249  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  248 248 249  181 181 181  255 255 255  255 255 255
+255 255 255  255 255 255  254 254 254  240 240 240  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  8 8 8  161 161 162  251 252 252
+185 185 184  4 4 4  0 0 0  10 11 11  100 103 103  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  36 36 36
+55 55 55  2 2 2  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  33 33 34  50 51 51  0 0 0
+0 0 0  9 11 11  82 85 86  10 16 16  248 248 249  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  245 244 245  179 180 181  255 255 255  255 255 255
+255 255 255  255 255 255  254 254 254  251 252 252  20 20 20  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  10 10 10  161 161 162
+205 205 205  17 18 18  0 0 0  95 97 97  78 81 81  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  36 36 36
+53 54 54  1 1 1  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  31 31 31  58 58 58  0 0 0
+0 0 0  0 0 0  67 70 70  78 81 81  248 248 249  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  234 234 234  179 180 181  255 255 255  255 255 255
+255 255 255  255 255 255  254 254 254  251 252 252  23 23 23  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+10 11 11  84 84 84  161 161 162  209 210 210  229 229 230  237 237 238
+202 202 203  26 26 27  9 11 11  44 50 50  0 0 0  4 6 6
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  52 53 53
+39 39 39  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  23 23 23  78 81 81  213 157 40
+243 206 27  243 206 27  54 42 32  73 79 79  222 221 221  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  238 238 236  178 178 179  255 255 255  255 255 255
+255 255 255  255 255 255  254 254 254  251 252 253  36 36 36  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  84 84 84
+222 221 221  251 252 252  252 253 253  253 253 253  253 254 254  252 252 253
+146 146 147  140 142 143  156 155 156  110 114 114  26 27 27  82 85 86
+84 89 89  95 97 97  36 40 40  0 0 0  0 0 0  74 74 74
+23 23 23  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  2 2 2  14 14 14
+24 24 24  26 26 27  26 26 27  26 26 27  25 25 26  21 21 22
+7 7 7  0 0 0  1 1 1  34 34 35  238 192 33  244 210 23
+244 212 23  244 212 23  244 210 23  88 79 47  200 200 197  254 254 254
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  244 245 245  179 180 181  255 255 255  255 255 255
+255 255 255  255 255 255  254 254 254  252 252 253  36 36 36  7 7 7
+7 7 7  7 7 7  7 7 7  8 8 8  149 149 150  251 251 252
+252 252 253  253 253 253  253 253 253  250 248 249  239 223 156  239 223 156
+120 121 122  182 183 184  176 177 177  120 121 122  33 33 34  3 3 3
+0 0 0  67 70 70  146 146 147  20 25 25  1 1 1  82 82 81
+9 9 9  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  19 19 19  89 90 91
+146 146 147  150 151 151  150 151 151  150 151 151  150 151 151  129 130 130
+58 58 58  6 6 6  14 14 14  201 147 55  245 211 23  245 213 29
+245 214 35  245 215 41  245 213 29  244 210 23  142 83 36  232 232 233
+254 254 254  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  185 185 184  255 255 255  255 255 255
+255 255 255  255 255 255  254 254 254  251 252 252  50 51 51  7 7 7
+7 7 7  7 7 7  7 7 7  146 146 147  251 252 252  252 253 253
+251 252 253  239 239 240  171 168 154  129 130 130  137 136 134  175 173 165
+221 218 200  65 64 64  22 22 22  186 186 187  114 115 115  26 26 27
+2 2 2  0 0 0  61 65 66  31 33 27  238 192 33  108 96 91
+9 9 9  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  2 2 2  52 53 53  178 178 179
+21 21 22  7 7 7  7 7 7  7 7 7  7 7 7  118 118 118
+137 136 134  36 36 36  65 64 64  243 206 27  244 212 23  245 215 41
+245 215 41  245 215 41  245 215 41  244 209 25  244 209 25  1 1 1
+219 219 219  253 253 253  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  214 214 215  255 255 255  255 255 255
+255 255 255  255 255 255  254 254 254  252 252 253  50 51 51  7 7 7
+7 7 7  7 7 7  84 84 84  250 251 252  252 253 253  251 251 252
+167 168 167  22 22 22  7 7 7  7 7 7  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  34 34 35  187 187 188  103 103 103
+29 29 30  3 3 3  7 9 9  238 204 29  245 215 41  245 214 35
+28 28 28  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  7 7 7  90 87 86  178 178 179
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  16 16 16
+193 193 194  133 133 133  187 166 103  245 218 76  245 218 76  245 216 51
+245 216 51  245 218 76  246 224 96  245 218 76  245 218 76  245 218 76
+25 25 25  186 186 187  252 252 252  254 254 254  254 254 254  253 254 254
+254 254 254  254 254 254  254 254 254  246 247 248  254 254 254  253 254 254
+254 254 254  254 254 254  253 254 254  251 252 252  36 36 36  7 7 7
+7 7 7  20 20 20  229 229 230  253 253 253  252 253 253  178 178 179
+10 10 10  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  42 42 43  196 196 197
+118 118 118  33 33 34  238 204 29  245 215 41  245 215 41  245 215 41
+49 50 50  1 1 1  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  17 18 18  120 121 122  137 136 134
+7 7 7  7 7 7  34 34 35  20 20 20  7 7 7  7 7 7
+202 202 203  209 206 202  193 187 162  193 187 162  248 234 156  245 218 76
+245 218 76  248 234 156  193 187 162  193 187 162  193 187 162  214 196 166
+240 219 129  95 97 97  196 196 197  186 186 187  187 187 188  196 196 197
+252 252 253  251 252 253  212 211 212  187 187 188  196 196 197  251 252 252
+218 217 217  187 187 188  191 190 190  250 251 252  24 24 24  7 7 7
+7 7 7  110 114 114  252 252 253  253 254 254  250 251 252  89 90 91
+89 90 91  129 130 130  127 127 126  44 44 44  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  49 50 50
+202 202 203  214 196 166  245 216 51  245 214 38  245 214 35  245 214 38
+58 58 58  2 2 2  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  31 31 31  156 155 156  82 82 81
+7 7 7  10 10 10  237 237 238  66 66 66  7 7 7  25 25 25
+247 248 249  81 81 82  7 7 7  31 31 31  247 237 174  245 218 76
+246 226 108  200 200 197  7 7 7  7 7 7  7 7 7  137 136 134
+247 237 174  193 193 194  72 71 71  7 7 7  7 7 7  8 8 8
+196 196 197  250 251 252  67 70 70  7 7 7  84 84 84  244 245 245
+47 47 47  7 7 7  118 118 118  249 250 251  12 12 12  7 7 7
+9 9 9  218 217 217  253 253 253  254 254 254  252 253 253  251 251 252
+249 250 251  237 237 238  95 97 97  9 9 9  15 15 15  95 97 97
+47 47 47  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+66 66 66  240 230 197  246 226 108  245 214 38  245 211 23  244 212 23
+65 64 64  3 3 3  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  2 2 2  52 53 53  185 185 184  25 25 25
+7 7 7  60 60 60  240 240 240  14 14 14  7 7 7  84 84 84
+247 248 249  23 23 23  7 7 7  94 91 88  248 234 156  245 218 76
+248 234 156  127 127 126  7 7 7  7 7 7  7 7 7  167 168 167
+251 248 240  65 64 64  7 7 7  7 7 7  7 7 7  7 7 7
+84 84 84  243 243 243  15 15 15  7 7 7  140 142 143  146 146 147
+7 7 7  33 33 34  237 237 238  243 243 243  21 21 22  120 121 122
+218 217 217  252 252 253  254 254 254  253 253 254  252 253 253  251 252 252
+247 248 249  72 71 71  7 7 7  58 58 58  222 221 221  248 248 249
+75 75 76  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+7 7 7  82 82 81  246 239 193  246 226 108  245 216 51  245 214 38
+238 192 33  21 21 22  1 1 1  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  8 8 8  90 87 86  182 183 184  7 7 7
+7 7 7  120 121 122  187 187 188  7 7 7  7 7 7  146 146 147
+205 205 205  7 7 7  7 7 7  153 153 148  240 219 129  246 224 96
+246 239 193  39 39 39  60 60 60  108 110 110  7 7 7  202 202 203
+227 227 227  7 7 7  7 7 7  205 205 205  89 90 91  7 7 7
+120 121 122  193 193 194  7 7 7  7 7 7  186 186 187  25 25 25
+7 7 7  167 168 167  251 251 252  243 243 243  214 214 215  250 251 252
+251 252 253  254 254 254  253 253 253  219 219 219  140 140 139  140 140 139
+118 118 118  7 7 7  52 53 53  237 237 238  247 247 246  176 177 177
+8 8 8  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+7 7 7  7 7 7  95 97 97  246 239 193  246 226 108  245 216 51
+245 214 38  201 147 55  31 31 31  103 103 103  103 103 103  72 71 71
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  17 18 18  127 127 126  140 140 139  7 7 7
+7 7 7  17 18 18  17 18 18  7 7 7  95 97 97  244 245 245
+146 146 147  7 7 7  7 7 7  200 200 197  246 226 108  240 219 129
+194 194 184  7 7 7  140 140 139  89 90 91  7 7 7  232 232 233
+165 165 165  7 7 7  31 31 31  249 250 251  39 39 39  7 7 7
+176 177 177  133 133 133  7 7 7  22 22 22  108 110 110  7 7 7
+72 71 71  251 252 252  252 253 253  250 251 252  247 248 249  205 205 205
+251 252 253  254 254 254  252 252 253  84 84 84  7 7 7  7 7 7
+7 7 7  7 7 7  140 142 143  247 248 249  140 140 139  14 14 14
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  16 16 16
+14 14 14  7 7 7  7 7 7  114 115 115  246 239 193  246 224 96
+245 216 51  245 216 51  243 235 220  176 177 177  185 185 184  229 229 230
+47 47 47  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  31 31 31  156 155 156  90 87 86  7 7 7
+7 7 7  7 7 7  7 7 7  31 31 31  243 243 241  247 247 246
+84 84 84  7 7 7  26 27 27  246 239 193  246 226 108  248 234 156
+108 110 110  7 7 7  212 211 212  44 44 44  22 22 22  249 250 251
+108 107 107  7 7 7  89 90 91  238 238 236  114 115 115  118 118 118
+231 231 231  75 75 76  7 7 7  34 34 35  10 11 11  12 12 12
+214 214 215  253 253 253  253 253 253  200 200 197  31 31 31  103 103 103
+252 252 253  252 253 253  218 217 217  9 9 9  7 7 7  7 7 7
+7 7 7  7 7 7  25 25 25  39 39 39  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  103 103 103  234 234 234
+181 181 181  7 7 7  7 7 7  7 7 7  133 133 133  247 237 174
+246 224 96  246 226 108  185 185 184  177 177 174  153 154 155  181 181 181
+140 140 139  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  1 1 1  49 50 50  186 186 187  28 28 28  7 7 7
+12 12 12  22 22 22  7 7 7  7 7 7  108 107 107  247 247 246
+25 25 25  7 7 7  90 87 86  247 237 174  246 226 108  246 239 193
+28 28 28  44 44 44  237 237 238  9 9 9  53 54 54  249 250 251
+49 50 50  7 7 7  153 153 148  249 241 199  214 196 166  185 185 184
+229 229 230  19 19 19  7 7 7  7 7 7  7 7 7  103 103 103
+251 252 253  254 254 254  253 253 253  150 151 151  7 7 7  187 187 188
+252 252 253  251 251 252  103 103 103  7 7 7  7 7 7  7 7 7
+7 7 7  23 23 23  17 18 18  7 7 7  7 7 7  7 7 7
+7 7 7  7 7 7  12 12 12  153 153 148  246 239 193  249 241 199
+161 161 162  9 9 9  84 84 84  108 110 110  25 25 25  153 153 148
+247 237 174  246 224 96  218 217 217  165 165 165  182 183 184  193 193 194
+114 115 115  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  4 4 4  74 74 74  181 181 181  7 7 7  7 7 7
+110 114 114  200 200 197  7 7 7  7 7 7  60 60 60  209 210 210
+7 7 7  7 7 7  146 146 147  248 234 156  248 234 156  177 177 174
+7 7 7  118 118 118  193 193 194  7 7 7  84 84 84  232 232 233
+8 8 8  7 7 7  209 210 210  221 218 200  193 187 162  219 219 219
+200 200 197  7 7 7  7 7 7  7 7 7  7 7 7  95 97 97
+251 252 252  254 254 254  252 253 253  118 118 118  29 29 30  247 248 249
+252 252 253  227 227 227  16 16 16  7 7 7  7 7 7  7 7 7
+100 103 103  218 217 217  219 218 214  7 7 7  7 7 7  7 7 7
+7 7 7  21 21 22  185 185 184  246 239 193  248 234 156  240 230 197
+60 60 60  194 194 184  246 239 193  249 241 199  137 136 134  10 10 10
+171 168 154  248 234 156  248 234 156  226 226 219  209 210 210  249 241 199
+28 28 28  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  13 13 13  108 110 110  146 146 147  7 7 7  7 7 7
+167 168 167  140 140 139  7 7 7  7 7 7  120 121 122  146 146 147
+7 7 7  7 7 7  194 194 184  240 219 129  247 237 174  95 97 97
+7 7 7  95 97 97  90 87 86  7 7 7  118 118 118  176 177 177
+7 7 7  28 28 28  248 248 249  44 44 45  7 7 7  167 168 167
+140 140 139  7 7 7  36 36 36  74 74 74  7 7 7  65 64 64
+251 252 253  254 254 254  251 252 252  81 81 82  108 110 110  251 252 252
+251 251 252  127 127 126  7 7 7  7 7 7  8 8 8  140 140 139
+181 181 181  140 140 139  221 218 200  7 7 7  7 7 7  7 7 7
+34 34 35  209 210 210  231 231 231  246 239 193  247 237 174  194 194 184
+227 227 227  249 241 199  240 219 129  248 234 156  153 153 148  7 7 7
+13 13 13  185 185 184  248 234 156  245 218 76  245 216 51  245 214 38
+31 31 31  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  31 31 31  153 154 155  89 90 91  7 7 7  8 8 8
+232 232 233  82 82 81  7 7 7  7 7 7  179 180 181  89 90 91
+7 7 7  24 24 24  243 235 220  248 234 156  240 230 197  20 20 20
+7 7 7  7 7 7  7 7 7  7 7 7  149 149 150  118 118 118
+7 7 7  90 87 86  229 229 230  7 7 7  7 7 7  229 229 230
+82 82 81  7 7 7  95 97 97  100 103 103  7 7 7  34 34 35
+251 252 252  253 253 254  251 251 252  47 47 47  193 193 194  251 252 252
+239 239 240  23 23 23  7 7 7  13 13 13  165 165 165  234 234 234
+149 149 150  146 114 101  200 200 197  7 7 7  7 7 7  52 53 53
+227 227 227  167 168 167  16 16 16  214 196 166  248 234 156  243 235 220
+219 219 219  156 155 156  247 237 174  246 239 193  75 75 76  7 7 7
+60 60 60  227 227 227  243 235 220  240 219 129  245 218 76  245 213 29
+16 16 16  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+1 1 1  49 50 50  185 185 184  33 33 34  7 7 7  10 11 11
+56 56 56  16 16 16  7 7 7  10 10 10  237 237 238  26 27 27
+7 7 7  55 55 55  185 185 184  221 218 200  167 168 167  7 7 7
+20 20 20  39 39 39  10 11 11  7 7 7  181 181 181  58 58 58
+7 7 7  103 103 103  133 133 133  7 7 7  44 44 44  247 248 249
+24 24 24  7 7 7  156 155 156  129 130 130  7 7 7  9 9 9
+244 245 245  252 253 253  237 237 238  34 34 35  248 248 249  251 251 252
+161 161 162  7 7 7  24 24 24  187 187 188  212 211 212  67 70 70
+187 187 188  173 170 143  209 206 202  10 10 10  95 97 97  237 237 238
+129 130 130  8 8 8  89 90 91  246 239 193  247 237 174  177 177 174
+17 18 18  137 136 134  249 241 199  219 218 214  10 10 10  95 97 97
+243 243 243  150 151 151  31 31 31  221 218 200  240 219 129  53 54 54
+3 3 3  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+4 4 4  72 71 71  182 183 184  7 7 7  7 7 7  7 7 7
+7 7 7  7 7 7  12 12 12  161 161 162  209 210 210  7 7 7
+7 7 7  7 7 7  7 7 7  187 187 188  82 82 81  7 7 7
+146 146 147  247 248 249  17 18 18  7 7 7  212 211 212  47 47 47
+7 7 7  7 7 7  7 7 7  8 8 8  146 146 147  205 205 205
+7 7 7  7 7 7  214 214 215  156 155 156  7 7 7  7 7 7
+218 217 217  251 252 252  186 186 187  110 114 114  249 250 251  248 248 249
+75 75 76  34 34 35  205 205 205  129 130 130  16 16 16  7 7 7
+156 155 156  214 196 166  240 230 197  243 243 241  227 227 227  74 74 74
+7 7 7  29 29 30  226 226 219  249 241 199  175 173 165  14 14 14
+9 9 9  221 218 200  246 239 193  153 153 148  146 146 147  246 247 248
+110 114 114  7 7 7  7 7 7  42 42 43  193 193 194  95 97 97
+19 19 19  1 1 1  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+6 6 6  84 84 84  140 142 143  7 7 7  7 7 7  7 7 7
+7 7 7  20 20 20  177 177 174  249 241 199  149 149 150  7 7 7
+7 7 7  7 7 7  10 11 11  226 226 219  13 13 13  8 8 8
+219 218 214  219 218 214  7 7 7  8 8 8  238 238 236  200 200 197
+13 13 13  7 7 7  13 13 13  161 161 162  243 235 220  146 146 147
+7 7 7  29 29 30  232 232 233  176 177 177  7 7 7  7 7 7
+182 183 184  237 237 238  129 130 130  167 168 167  176 177 177  202 202 203
+10 11 11  95 97 97  44 44 45  7 7 7  7 7 7  7 7 7
+75 75 76  226 226 219  243 235 220  156 155 156  24 24 24  7 7 7
+7 7 7  176 177 177  247 247 246  200 200 197  17 18 18  7 7 7
+49 50 50  246 239 193  248 234 156  251 248 240  239 239 240  84 84 84
+7 7 7  7 7 7  7 7 7  7 7 7  60 60 60  187 187 188
+84 84 84  14 14 14  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+4 4 4  53 54 54  137 136 134  156 155 156  161 161 162  161 161 162
+167 168 167  239 223 156  240 219 129  246 226 108  239 223 156  239 223 156
+239 223 156  239 223 156  214 196 166  239 223 156  193 187 162  193 187 162
+248 234 156  239 223 156  193 187 162  193 187 162  248 234 156  248 234 156
+214 196 166  193 187 162  214 196 166  248 234 156  240 219 129  214 196 166
+193 187 162  193 187 162  171 168 154  146 146 147  137 136 134  137 136 134
+161 161 162  209 210 210  65 64 64  202 202 203  179 180 181  140 140 139
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+7 7 7  60 60 60  39 39 39  7 7 7  7 7 7  7 7 7
+66 66 66  249 250 251  202 202 203  16 16 16  7 7 7  7 7 7
+23 23 23  243 235 220  246 239 193  226 226 219  52 53 53  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  75 75 76
+176 177 177  66 66 66  9 9 9  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  10 10 10  28 28 29  34 34 35  36 36 36  36 36 36
+44 44 45  146 114 101  241 207 50  241 207 50  241 207 50  241 211 63
+241 211 63  241 211 63  241 211 63  241 211 63  241 211 63  245 216 51
+245 216 51  245 216 51  241 211 63  241 211 63  245 216 51  241 211 63
+245 218 76  245 218 76  245 216 51  245 215 41  245 214 38  241 207 50
+241 211 63  201 147 55  88 79 47  29 29 30  34 34 35  42 42 43
+103 103 103  191 190 190  75 75 76  196 196 197  200 200 197  65 64 64
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+90 87 86  146 146 147  19 19 19  7 7 7  7 7 7  7 7 7
+7 7 7  90 87 86  140 140 139  31 31 31  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+103 103 103  161 161 162  53 54 54  7 7 7  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  12 12 12  50 51 51  146 114 101  180 121 62  199 129 48
+201 147 55  213 157 40  213 157 40  230 165 41  226 179 40  226 179 40
+238 192 33  241 205 27  244 209 25  244 210 23  244 212 23  245 211 23
+245 211 23  245 211 23  245 211 23  244 209 25  238 204 29  226 179 40
+213 157 40  199 129 48  54 42 32  0 0 0  4 6 6  44 44 45
+150 151 151  129 130 130  137 136 134  205 205 205  202 202 203  8 8 8
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+7 7 7  129 130 130  146 146 147  47 47 47  4 4 4  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  2 2 2  12 12 12  28 28 29  49 50 50
+74 74 74  108 96 91  180 121 62  180 121 62  199 129 48  201 147 55
+213 157 40  230 165 41  226 179 40  238 192 33  241 205 27  241 205 27
+243 206 27  243 206 27  241 205 27  238 204 29  226 179 40  213 157 40
+199 129 48  199 129 48  21 19 17  65 64 64  103 103 103  167 168 167
+202 202 203  24 24 24  193 193 194  229 229 230  140 140 139  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+7 7 7  8 8 8  156 155 156  133 133 133  36 36 36  3 3 3
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  1 1 1
+4 4 4  10 11 11  21 21 22  39 39 39  60 60 60  108 96 91
+180 121 62  199 129 48  199 129 48  213 157 40  230 165 41  226 179 40
+226 179 40  226 179 40  226 179 40  226 179 40  213 157 40  199 129 48
+180 121 62  99 91 79  72 71 71  56 56 56  129 130 130  167 168 167
+21 21 22  17 18 18  231 231 231  229 229 230  52 53 53  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+7 7 7  7 7 7  13 13 13  176 177 177  120 121 122  33 33 34
+2 2 2  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  2 2 2  8 8 8
+21 21 22  47 47 47  99 91 79  180 121 62  199 129 48  199 129 48
+201 147 55  213 157 40  213 157 40  201 147 55  199 129 48  180 121 62
+99 91 79  26 26 27  9 9 9  60 60 60  186 186 187  31 31 31
+7 7 7  60 60 60  243 243 243  209 210 210  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  7 7 7  7 7 7  7 7 7
+7 7 7  7 7 7  7 7 7  26 27 27  193 193 194  108 110 110
+22 22 22  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  1 1 1  8 8 8  24 24 24  58 58 58  108 96 91
+180 121 62  180 121 62  180 121 62  180 121 62  180 121 62  72 71 71
+15 15 15  0 0 0  4 6 6  75 75 76  156 155 156  24 24 24
+24 24 24  108 107 107  232 232 233  137 136 134  24 24 24  24 24 24
+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
+24 24 24  24 24 24  24 24 24  24 24 24  58 58 58  176 177 177
+60 60 60  3 3 3
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  2 2 2  12 12 12
+26 27 27  44 44 44  55 55 55  50 51 51  29 29 30  8 8 8
+0 0 0  0 0 0  3 3 3  47 47 47  127 127 126  150 151 151
+150 151 151  140 142 143  129 130 130  140 142 143  150 151 151  150 151 151
+150 151 151  150 151 151  150 151 151  150 151 151  150 151 151  150 151 151
+150 151 151  150 151 151  153 154 155  161 161 162  165 165 165  167 168 167
+177 177 174  167 168 167  161 161 162  156 155 156  150 151 151  150 151 151
+150 151 151  150 151 151  150 151 151  150 151 151  150 151 151  150 151 151
+150 151 151  150 151 151  150 151 151  150 151 151  150 151 151  150 151 151
+150 151 151  150 151 151  150 151 151  150 151 151  149 149 150  127 127 126
+44 44 45  2 2 2
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  2 2 2  1 1 1  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  7 7 7  21 21 22  25 25 26
+25 25 26  24 24 24  20 20 20  23 23 24  25 25 26  26 26 27
+26 26 27  26 26 27  26 26 27  26 26 27  26 26 27  26 26 27
+26 26 27  26 26 27  26 26 27  26 26 27  26 26 27  26 27 27
+28 28 29  26 27 27  26 26 27  26 26 27  26 26 27  26 26 27
+26 26 27  26 26 27  26 26 27  26 26 27  26 26 27  26 26 27
+26 26 27  26 26 27  26 26 27  26 26 27  26 26 27  26 26 27
+26 26 27  26 26 27  26 26 27  26 26 27  25 25 26  21 21 22
+7 7 7  0 0 0
diff --git a/drivers/video/logo/logo_blackfin_vga16.ppm b/drivers/video/logo/logo_blackfin_vga16.ppm
new file mode 100644
index 000000000000..1352b02a9d93
--- /dev/null
+++ b/drivers/video/logo/logo_blackfin_vga16.ppm
@@ -0,0 +1,1127 @@
+P3
+# This was generated by the GIMP & Netpbm tools
+# gimp linux_bf.svg (create 80x80 save as linux_bf.ppm)
+# ppmquant -mapfile clut_vga16.ppm linux_bf.ppm | pnmnoraw > logo_blackfin_vga16.ppm
+#
+80 80
+255
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+85 85 85  85 85 85  85 85 85  85 85 85  85 85 85  85 85 85
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  85 85 85  85 85 85  85 85 85
+85 85 85  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+85 85 85  85 85 85  85 85 85  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  85 85 85  85 85 85  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  85 85 85  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  85 85 85  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  85 85 85
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+85 85 85  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  85 85 85  85 85 85  85 85 85  0 0 0  0 0 0
+85 85 85  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  85 85 85
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  170 170 170  170 170 170  85 85 85  0 0 0  0 0 0
+0 0 0  85 85 85  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  85 85 85
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  85 85 85  85 85 85  0 0 0  0 0 0  0 0 0
+0 0 0  85 85 85  85 85 85  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  85 85 85  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  85 85 85  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  85 85 85  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  85 85 85  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  85 85 85  85 85 85  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  85 85 85  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  85 85 85  85 85 85  85 85 85
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  170 170 170
+170 170 170  85 85 85  85 85 85  170 170 170  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  85 85 85  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+0 0 0  170 170 170  170 170 170  170 170 170  85 85 85  85 85 85
+0 0 0  0 0 0  0 0 0  85 85 85  170 170 170  255 255 255
+255 255 255  255 255 255  170 170 170  85 85 85  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  85 85 85  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+170 170 170  255 255 255  255 255 255  255 255 255  255 255 255  0 0 0
+0 0 0  0 0 0  0 0 0  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  170 170 170  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+255 255 255  170 170 170  85 85 85  170 170 170  255 255 255  255 255 255
+0 0 0  0 0 0  170 170 170  255 255 255  255 255 255  85 85 85
+85 85 85  170 170 170  255 255 255  255 255 255  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+255 255 255  85 85 85  170 170 170  170 170 170  255 255 255  255 255 255
+85 85 85  85 85 85  170 170 170  255 255 255  170 170 170  0 0 0
+170 170 170  170 170 170  255 255 255  255 255 255  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+255 255 255  0 0 0  85 85 85  170 170 170  170 170 170  255 255 255
+0 0 0  85 85 85  85 85 85  255 255 255  85 85 85  0 0 0
+0 0 0  85 85 85  170 170 170  255 255 255  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+255 255 255  85 85 85  0 0 0  0 0 0  255 85 85  255 255 85
+255 255 85  255 255 85  255 255 85  255 255 85  85 85 85  0 0 0
+0 0 0  0 0 0  170 170 170  255 255 255  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+170 170 170  255 255 255  0 0 0  255 85 85  170 85 0  170 85 0
+255 255 85  255 255 85  170 85 0  255 255 85  255 255 85  255 255 85
+0 0 0  85 85 85  255 255 255  255 255 255  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+0 0 0  255 255 255  255 85 85  255 255 85  255 255 85  255 255 85
+255 255 85  255 255 85  255 255 85  255 255 85  255 255 85  255 255 85
+255 255 85  255 255 85  255 255 85  170 170 170  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+0 0 0  255 85 85  255 255 85  255 255 85  255 255 85  255 255 85
+255 255 85  255 255 85  255 255 85  255 255 85  255 255 85  255 255 85
+255 255 85  255 255 85  255 255 85  255 255 85  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+170 85 0  255 255 85  255 255 85  255 255 85  255 255 85  255 255 85
+255 255 85  255 255 85  255 255 85  255 255 85  255 255 85  255 255 85
+255 255 85  170 85 0  85 85 85  255 255 85  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+255 85 85  255 255 85  255 255 85  255 255 85  255 255 85  255 255 85
+255 255 85  255 255 85  255 255 85  255 255 85  255 255 85  255 255 85
+170 85 0  85 85 85  255 255 85  255 255 85  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  85 85 85
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+170 85 0  170 85 0  255 255 85  255 255 85  255 255 85  255 255 85
+255 255 85  255 255 85  255 255 85  255 255 85  170 85 0  170 85 0
+170 85 0  255 255 85  255 255 85  255 85 85  0 0 0  0 0 0
+85 85 85  85 85 85  85 85 85  0 0 0  0 0 0  85 85 85
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+85 85 85  170 85 0  170 85 0  170 85 0  255 255 85  255 255 85
+255 255 85  255 85 85  170 85 0  170 85 0  170 85 0  255 255 85
+255 255 85  255 255 85  255 85 85  170 170 170  0 0 0  0 0 0
+85 85 85  85 85 85  85 85 85  85 85 85  0 0 0  85 85 85
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+85 85 85  170 170 170  170 85 0  170 85 0  170 85 0  170 85 0
+170 85 0  170 85 0  170 85 0  255 255 85  255 255 85  255 255 85
+255 85 85  170 170 170  255 255 255  255 255 255  85 85 85  0 0 0
+0 0 0  85 85 85  85 85 85  85 85 85  0 0 0  0 0 0
+85 85 85  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+170 170 170  170 170 170  170 170 170  170 85 0  255 255 85  255 255 85
+255 255 85  255 255 85  255 255 85  255 255 85  255 85 85  170 170 170
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  0 0 0
+0 0 0  0 0 0  85 85 85  85 85 85  0 0 0  0 0 0
+85 85 85  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+170 170 170  255 255 255  255 255 255  170 170 170  170 85 0  255 85 85
+255 85 85  255 85 85  255 85 85  255 85 85  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  85 85 85
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  85 85 85  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  85 85 85  0 0 0  0 0 0
+170 170 170  255 255 255  255 255 255  170 170 170  170 170 170  170 170 170
+170 170 170  170 170 170  170 170 170  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  85 85 85  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  85 85 85  85 85 85  0 0 0  0 0 0
+255 255 255  255 255 255  255 255 255  255 255 255  170 170 170  170 170 170
+170 170 170  170 170 170  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+170 170 170  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  85 85 85  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  85 85 85  0 0 0  0 0 0  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  85 85 85  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  85 85 85  0 0 0  0 0 0  170 170 170  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  85 85 85  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+85 85 85  0 0 0  0 0 0  0 0 0  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  170 170 170  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  85 85 85
+85 85 85  0 0 0  0 0 0  85 85 85  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  85 85 85
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  85 85 85
+0 0 0  0 0 0  0 0 0  170 170 170  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  85 85 85  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  85 85 85
+85 85 85  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  170 170 170  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  170 170 170  170 170 170  170 170 170  170 170 170
+170 170 170  255 255 255  255 255 255  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+85 85 85  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+0 0 0  0 0 0  85 85 85  170 170 170  170 170 170  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  170 170 170  170 170 170  170 170 170  170 170 170
+170 170 170  170 170 170  255 255 255  0 0 0  0 0 0  85 85 85
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  85 85 85  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  85 85 85  0 0 0  0 0 0
+0 0 0  0 0 0  170 170 170  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  170 170 170
+170 170 170  170 170 170  170 170 170  255 255 255  0 0 0  85 85 85
+85 85 85  85 85 85  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  85 85 85  85 85 85  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  85 85 85  0 0 0  0 0 0
+0 0 0  0 0 0  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  170 170 170  170 170 170  255 255 255  0 0 0  0 0 0
+0 0 0  85 85 85  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  85 85 85  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  85 85 85  0 0 0  0 0 0  85 85 85
+0 0 0  170 170 170  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  170 170 170  85 85 85  170 170 170  170 170 170  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  170 170 170  170 170 170  255 255 255  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  85 85 85  85 85 85  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  85 85 85  0 0 0  85 85 85  0 0 0
+0 0 0  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  0 0 0  0 0 0  0 0 0  0 0 0  85 85 85
+170 170 170  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  0 0 0
+0 0 0  85 85 85  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  85 85 85  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  85 85 85  0 0 0  0 0 0  85 85 85  0 0 0
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  85 85 85  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  85 85 85  170 170 170  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  170 170 170
+0 0 0  85 85 85  0 0 0  85 85 85  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  85 85 85  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  85 85 85  0 0 0  85 85 85  85 85 85  85 85 85
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  170 170 170  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  170 170 170  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  85 85 85  0 0 0  85 85 85  0 0 0  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  85 85 85  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  170 170 170  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+85 85 85  0 0 0  0 0 0  0 0 0  0 0 0  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  170 170 170
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  85 85 85
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+85 85 85  0 0 0  0 0 0  0 0 0  0 0 0  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  85 85 85  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+170 170 170  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  85 85 85
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  85 85 85
+0 0 0  0 0 0  0 0 0  0 0 0  170 170 170  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  170 170 170  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  170 170 170  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  170 170 170  255 255 255  255 255 255  255 255 255  255 255 255
+85 85 85  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  85 85 85
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  85 85 85
+0 0 0  0 0 0  85 85 85  0 0 0  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  170 170 170  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  170 170 170  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  170 170 170  255 255 255  255 255 255  255 255 255
+170 170 170  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  85 85 85
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+0 0 0  0 0 0  85 85 85  0 0 0  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  170 170 170  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  170 170 170  255 255 255  255 255 255
+170 170 170  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  85 85 85
+85 85 85  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+0 0 0  0 0 0  85 85 85  0 0 0  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  170 170 170  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  170 170 170  255 255 255
+170 170 170  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+85 85 85  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+0 0 0  0 0 0  85 85 85  0 0 0  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  170 170 170  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  170 170 170
+170 170 170  0 0 0  0 0 0  85 85 85  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+85 85 85  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  0 0 0
+0 0 0  0 0 0  85 85 85  85 85 85  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  170 170 170  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  85 85 85  170 170 170  170 170 170  255 255 255  255 255 255
+170 170 170  0 0 0  0 0 0  85 85 85  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  85 85 85
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  170 85 0
+255 255 85  255 255 85  0 0 0  85 85 85  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  170 170 170  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  85 85 85
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+170 170 170  170 170 170  170 170 170  85 85 85  0 0 0  85 85 85
+85 85 85  85 85 85  0 0 0  0 0 0  0 0 0  85 85 85
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  255 255 85  255 255 85
+255 255 85  255 255 85  255 255 85  85 85 85  170 170 170  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  170 170 170  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  170 170 170  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 85  170 170 170
+85 85 85  170 170 170  170 170 170  85 85 85  0 0 0  0 0 0
+0 0 0  85 85 85  170 170 170  0 0 0  0 0 0  85 85 85
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  85 85 85
+170 170 170  170 170 170  170 170 170  170 170 170  170 170 170  170 170 170
+85 85 85  0 0 0  0 0 0  170 85 0  255 255 85  255 255 85
+255 255 85  255 255 85  255 255 85  255 255 85  170 85 0  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  170 170 170  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  170 170 170  255 255 255  255 255 255
+255 255 255  255 255 255  170 170 170  170 170 170  170 170 170  170 170 170
+255 255 255  85 85 85  0 0 0  170 170 170  85 85 85  0 0 0
+0 0 0  0 0 0  85 85 85  0 0 0  255 255 85  85 85 85
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  170 170 170
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  85 85 85
+170 170 170  0 0 0  85 85 85  255 255 85  255 255 85  255 255 85
+255 255 85  255 255 85  255 255 85  255 255 85  255 255 85  0 0 0
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  85 85 85  0 0 0
+0 0 0  0 0 0  85 85 85  255 255 255  255 255 255  255 255 255
+170 170 170  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  170 170 170  85 85 85
+0 0 0  0 0 0  0 0 0  255 255 85  255 255 85  255 255 85
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  170 170 170
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+170 170 170  170 170 170  255 255 85  255 255 85  255 255 85  255 255 85
+255 255 85  255 255 85  255 255 85  255 255 85  255 255 85  255 255 85
+0 0 0  170 170 170  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  0 0 0  0 0 0
+0 0 0  0 0 0  255 255 255  255 255 255  255 255 255  170 170 170
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  170 170 170
+85 85 85  0 0 0  255 255 85  255 255 85  255 255 85  255 255 85
+85 85 85  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  170 170 170
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+170 170 170  170 170 170  170 170 170  170 170 170  255 255 85  255 255 85
+255 255 85  255 255 85  170 170 170  170 170 170  170 170 170  170 170 170
+255 255 85  85 85 85  170 170 170  170 170 170  170 170 170  170 170 170
+255 255 255  255 255 255  170 170 170  170 170 170  170 170 170  255 255 255
+255 255 255  170 170 170  170 170 170  255 255 255  0 0 0  0 0 0
+0 0 0  85 85 85  255 255 255  255 255 255  255 255 255  85 85 85
+85 85 85  170 170 170  170 170 170  85 85 85  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  85 85 85
+170 170 170  170 170 170  255 255 85  255 255 85  255 255 85  255 255 85
+85 85 85  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  170 170 170  85 85 85
+0 0 0  0 0 0  255 255 255  85 85 85  0 0 0  0 0 0
+255 255 255  85 85 85  0 0 0  0 0 0  255 255 255  255 255 85
+255 255 85  170 170 170  0 0 0  0 0 0  0 0 0  170 170 170
+255 255 255  170 170 170  85 85 85  0 0 0  0 0 0  0 0 0
+170 170 170  255 255 255  85 85 85  0 0 0  85 85 85  255 255 255
+85 85 85  0 0 0  85 85 85  255 255 255  0 0 0  0 0 0
+0 0 0  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  85 85 85  0 0 0  0 0 0  85 85 85
+85 85 85  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+85 85 85  255 255 255  255 255 85  255 255 85  255 255 85  255 255 85
+85 85 85  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  85 85 85  170 170 170  0 0 0
+0 0 0  85 85 85  255 255 255  0 0 0  0 0 0  85 85 85
+255 255 255  0 0 0  0 0 0  85 85 85  255 255 85  255 255 85
+255 255 85  85 85 85  0 0 0  0 0 0  0 0 0  170 170 170
+255 255 255  85 85 85  0 0 0  0 0 0  0 0 0  0 0 0
+85 85 85  255 255 255  0 0 0  0 0 0  170 170 170  170 170 170
+0 0 0  0 0 0  255 255 255  255 255 255  0 0 0  85 85 85
+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  85 85 85  0 0 0  85 85 85  255 255 255  255 255 255
+85 85 85  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  85 85 85  255 255 255  255 255 85  255 255 85  255 255 85
+255 255 85  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  85 85 85  170 170 170  0 0 0
+0 0 0  85 85 85  170 170 170  0 0 0  0 0 0  170 170 170
+170 170 170  0 0 0  0 0 0  170 170 170  255 255 85  255 255 85
+255 255 255  0 0 0  85 85 85  85 85 85  0 0 0  170 170 170
+255 255 255  0 0 0  0 0 0  170 170 170  85 85 85  0 0 0
+85 85 85  170 170 170  0 0 0  0 0 0  170 170 170  0 0 0
+0 0 0  170 170 170  255 255 255  255 255 255  255 255 255  255 255 255
+255 255 255  255 255 255  255 255 255  255 255 255  170 170 170  170 170 170
+85 85 85  0 0 0  85 85 85  255 255 255  255 255 255  170 170 170
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  85 85 85  255 255 255  255 255 85  255 255 85
+255 255 85  170 85 0  0 0 0  85 85 85  85 85 85  85 85 85
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  85 85 85  170 170 170  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  255 255 255
+170 170 170  0 0 0  0 0 0  170 170 170  255 255 85  255 255 85
+170 170 170  0 0 0  170 170 170  85 85 85  0 0 0  255 255 255
+170 170 170  0 0 0  0 0 0  255 255 255  0 0 0  0 0 0
+170 170 170  170 170 170  0 0 0  0 0 0  85 85 85  0 0 0
+85 85 85  255 255 255  255 255 255  255 255 255  255 255 255  170 170 170
+255 255 255  255 255 255  255 255 255  85 85 85  0 0 0  0 0 0
+0 0 0  0 0 0  170 170 170  255 255 255  170 170 170  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  85 85 85  255 255 255  255 255 85
+255 255 85  255 255 85  255 255 255  170 170 170  170 170 170  255 255 255
+85 85 85  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  170 170 170  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  255 255 255  255 255 255
+85 85 85  0 0 0  0 0 0  255 255 255  255 255 85  255 255 85
+85 85 85  0 0 0  255 255 255  85 85 85  0 0 0  255 255 255
+85 85 85  0 0 0  85 85 85  255 255 255  85 85 85  85 85 85
+255 255 255  85 85 85  0 0 0  0 0 0  0 0 0  0 0 0
+255 255 255  255 255 255  255 255 255  170 170 170  0 0 0  85 85 85
+255 255 255  255 255 255  255 255 255  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  255 255 255
+170 170 170  0 0 0  0 0 0  0 0 0  170 170 170  255 255 255
+255 255 85  255 255 85  170 170 170  170 170 170  170 170 170  170 170 170
+170 170 170  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  85 85 85  170 170 170  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  255 255 255
+0 0 0  0 0 0  85 85 85  255 255 85  255 255 85  255 255 255
+0 0 0  85 85 85  255 255 255  0 0 0  85 85 85  255 255 255
+85 85 85  0 0 0  170 170 170  255 255 255  170 170 170  170 170 170
+255 255 255  0 0 0  0 0 0  0 0 0  0 0 0  85 85 85
+255 255 255  255 255 255  255 255 255  170 170 170  0 0 0  170 170 170
+255 255 255  255 255 255  85 85 85  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  170 170 170  255 255 255  255 255 255
+170 170 170  0 0 0  85 85 85  85 85 85  0 0 0  170 170 170
+255 255 85  255 255 85  255 255 255  170 170 170  170 170 170  170 170 170
+85 85 85  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  85 85 85  170 170 170  0 0 0  0 0 0
+85 85 85  170 170 170  0 0 0  0 0 0  85 85 85  170 170 170
+0 0 0  0 0 0  170 170 170  255 255 85  255 255 85  170 170 170
+0 0 0  85 85 85  170 170 170  0 0 0  85 85 85  255 255 255
+0 0 0  0 0 0  170 170 170  170 170 170  170 170 170  255 255 255
+170 170 170  0 0 0  0 0 0  0 0 0  0 0 0  85 85 85
+255 255 255  255 255 255  255 255 255  85 85 85  0 0 0  255 255 255
+255 255 255  255 255 255  0 0 0  0 0 0  0 0 0  0 0 0
+85 85 85  255 255 255  255 255 255  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  170 170 170  255 255 255  255 255 85  255 255 255
+85 85 85  170 170 170  255 255 255  255 255 255  170 170 170  0 0 0
+170 170 170  255 255 85  255 255 85  255 255 255  170 170 170  255 255 255
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  85 85 85  170 170 170  0 0 0  0 0 0
+170 170 170  170 170 170  0 0 0  0 0 0  85 85 85  170 170 170
+0 0 0  0 0 0  170 170 170  255 255 85  255 255 255  85 85 85
+0 0 0  85 85 85  85 85 85  0 0 0  85 85 85  170 170 170
+0 0 0  0 0 0  255 255 255  85 85 85  0 0 0  170 170 170
+170 170 170  0 0 0  0 0 0  85 85 85  0 0 0  85 85 85
+255 255 255  255 255 255  255 255 255  85 85 85  85 85 85  255 255 255
+255 255 255  85 85 85  0 0 0  0 0 0  0 0 0  170 170 170
+170 170 170  170 170 170  255 255 255  0 0 0  0 0 0  0 0 0
+0 0 0  170 170 170  255 255 255  255 255 255  255 255 85  170 170 170
+255 255 255  255 255 255  255 255 85  255 255 85  170 170 170  0 0 0
+0 0 0  170 170 170  255 255 85  255 255 85  255 255 85  255 255 85
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  170 170 170  85 85 85  0 0 0  0 0 0
+255 255 255  85 85 85  0 0 0  0 0 0  170 170 170  85 85 85
+0 0 0  0 0 0  255 255 255  255 255 85  255 255 255  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  170 170 170  85 85 85
+0 0 0  85 85 85  255 255 255  0 0 0  0 0 0  255 255 255
+85 85 85  0 0 0  85 85 85  85 85 85  0 0 0  0 0 0
+255 255 255  255 255 255  255 255 255  85 85 85  170 170 170  255 255 255
+255 255 255  0 0 0  0 0 0  0 0 0  170 170 170  255 255 255
+170 170 170  85 85 85  170 170 170  0 0 0  0 0 0  85 85 85
+255 255 255  170 170 170  0 0 0  170 170 170  255 255 85  255 255 255
+255 255 255  170 170 170  255 255 255  255 255 255  85 85 85  0 0 0
+85 85 85  255 255 255  255 255 255  255 255 85  255 255 85  255 255 85
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  85 85 85  170 170 170  0 0 0  0 0 0  0 0 0
+85 85 85  0 0 0  0 0 0  0 0 0  255 255 255  0 0 0
+0 0 0  85 85 85  170 170 170  255 255 255  170 170 170  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  170 170 170  85 85 85
+0 0 0  85 85 85  170 170 170  0 0 0  85 85 85  255 255 255
+0 0 0  0 0 0  170 170 170  170 170 170  0 0 0  0 0 0
+255 255 255  255 255 255  255 255 255  0 0 0  255 255 255  255 255 255
+170 170 170  0 0 0  0 0 0  170 170 170  255 255 255  85 85 85
+170 170 170  170 170 170  170 170 170  0 0 0  85 85 85  255 255 255
+170 170 170  0 0 0  85 85 85  255 255 255  255 255 85  170 170 170
+0 0 0  170 170 170  255 255 255  255 255 255  0 0 0  85 85 85
+255 255 255  170 170 170  0 0 0  170 170 170  255 255 85  85 85 85
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  85 85 85  170 170 170  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  170 170 170  170 170 170  0 0 0
+0 0 0  0 0 0  0 0 0  170 170 170  85 85 85  0 0 0
+170 170 170  255 255 255  0 0 0  0 0 0  170 170 170  85 85 85
+0 0 0  0 0 0  0 0 0  0 0 0  170 170 170  170 170 170
+0 0 0  0 0 0  255 255 255  170 170 170  0 0 0  0 0 0
+255 255 255  255 255 255  170 170 170  85 85 85  255 255 255  255 255 255
+85 85 85  0 0 0  170 170 170  170 170 170  0 0 0  0 0 0
+170 170 170  170 170 170  255 255 255  255 255 255  255 255 255  85 85 85
+0 0 0  0 0 0  255 255 255  255 255 255  170 170 170  0 0 0
+0 0 0  170 170 170  255 255 255  170 170 170  170 170 170  255 255 255
+85 85 85  0 0 0  0 0 0  0 0 0  170 170 170  85 85 85
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  85 85 85  170 170 170  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  170 170 170  255 255 255  170 170 170  0 0 0
+0 0 0  0 0 0  0 0 0  255 255 255  0 0 0  0 0 0
+255 255 255  255 255 255  0 0 0  0 0 0  255 255 255  170 170 170
+0 0 0  0 0 0  0 0 0  170 170 170  255 255 255  170 170 170
+0 0 0  0 0 0  255 255 255  170 170 170  0 0 0  0 0 0
+170 170 170  255 255 255  170 170 170  170 170 170  170 170 170  170 170 170
+0 0 0  85 85 85  85 85 85  0 0 0  0 0 0  0 0 0
+85 85 85  255 255 255  255 255 255  170 170 170  0 0 0  0 0 0
+0 0 0  170 170 170  255 255 255  170 170 170  0 0 0  0 0 0
+85 85 85  255 255 255  255 255 85  255 255 255  255 255 255  85 85 85
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  170 170 170
+85 85 85  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  85 85 85  170 170 170  170 170 170  170 170 170  170 170 170
+170 170 170  170 170 170  255 255 85  255 255 85  255 255 85  170 170 170
+170 170 170  170 170 170  170 170 170  170 170 170  170 170 170  170 170 170
+255 255 85  170 170 170  170 170 170  170 170 170  255 255 85  255 255 85
+170 170 170  170 170 170  170 170 170  255 255 85  255 255 85  170 170 170
+170 170 170  170 170 170  170 170 170  170 170 170  170 170 170  170 170 170
+170 170 170  170 170 170  85 85 85  170 170 170  170 170 170  170 170 170
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  85 85 85  0 0 0  0 0 0  0 0 0  0 0 0
+85 85 85  255 255 255  170 170 170  0 0 0  0 0 0  0 0 0
+0 0 0  255 255 255  255 255 255  255 255 255  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  85 85 85
+170 170 170  85 85 85  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+85 85 85  85 85 85  255 255 85  255 255 85  255 255 85  255 255 85
+255 255 85  255 255 85  255 255 85  255 255 85  255 255 85  255 255 85
+255 255 85  255 255 85  255 255 85  255 255 85  255 255 85  255 255 85
+255 255 85  255 255 85  255 255 85  255 255 85  255 255 85  255 255 85
+255 255 85  255 85 85  85 85 85  0 0 0  0 0 0  0 0 0
+85 85 85  170 170 170  85 85 85  170 170 170  170 170 170  85 85 85
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+85 85 85  170 170 170  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  85 85 85  170 170 170  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+85 85 85  170 170 170  85 85 85  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  85 85 85  85 85 85  170 85 0  170 85 0
+170 85 0  255 85 85  255 85 85  255 85 85  255 255 85  255 255 85
+255 255 85  255 255 85  255 255 85  255 255 85  255 255 85  255 255 85
+255 255 85  255 255 85  255 255 85  255 255 85  255 255 85  255 255 85
+255 85 85  170 85 0  85 85 85  0 0 0  0 0 0  85 85 85
+170 170 170  170 170 170  170 170 170  170 170 170  170 170 170  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  170 170 170  170 170 170  85 85 85  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  85 85 85
+85 85 85  85 85 85  170 85 0  170 85 0  170 85 0  170 85 0
+255 85 85  255 85 85  255 255 85  255 255 85  255 255 85  255 255 85
+255 255 85  255 255 85  255 255 85  255 255 85  255 255 85  255 85 85
+170 85 0  170 85 0  0 0 0  85 85 85  85 85 85  170 170 170
+170 170 170  0 0 0  170 170 170  255 255 255  170 170 170  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  170 170 170  170 170 170  0 0 0  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  85 85 85
+170 85 0  170 85 0  170 85 0  255 85 85  255 85 85  255 255 85
+255 255 85  255 255 85  255 255 85  255 255 85  255 85 85  170 85 0
+170 85 0  85 85 85  85 85 85  85 85 85  170 170 170  170 170 170
+0 0 0  0 0 0  255 255 255  255 255 255  85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  170 170 170  85 85 85  0 0 0
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  85 85 85  85 85 85  170 85 0  170 85 0  170 85 0
+170 85 0  255 85 85  255 85 85  255 85 85  170 85 0  170 85 0
+85 85 85  0 0 0  0 0 0  85 85 85  170 170 170  0 0 0
+0 0 0  85 85 85  255 255 255  170 170 170  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  170 170 170  85 85 85
+0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  85 85 85
+170 85 0  170 85 0  170 85 0  170 85 0  170 85 0  85 85 85
+0 0 0  0 0 0  0 0 0  85 85 85  170 170 170  0 0 0
+0 0 0  85 85 85  255 255 255  170 170 170  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  85 85 85  170 170 170
+85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  85 85 85  85 85 85  85 85 85  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  85 85 85  85 85 85  170 170 170
+170 170 170  170 170 170  170 170 170  170 170 170  170 170 170  170 170 170
+170 170 170  170 170 170  170 170 170  170 170 170  170 170 170  170 170 170
+170 170 170  170 170 170  170 170 170  170 170 170  170 170 170  170 170 170
+170 170 170  170 170 170  170 170 170  170 170 170  170 170 170  170 170 170
+170 170 170  170 170 170  170 170 170  170 170 170  170 170 170  170 170 170
+170 170 170  170 170 170  170 170 170  170 170 170  170 170 170  170 170 170
+170 170 170  170 170 170  170 170 170  170 170 170  170 170 170  85 85 85
+85 85 85  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
+0 0 0  0 0 0
diff --git a/drivers/video/pnx4008/pnxrgbfb.c b/drivers/video/pnx4008/pnxrgbfb.c
index 685761a0732c..4db6b48a8715 100644
--- a/drivers/video/pnx4008/pnxrgbfb.c
+++ b/drivers/video/pnx4008/pnxrgbfb.c
@@ -100,7 +100,6 @@ static int rgbfb_remove(struct platform_device *pdev)
                 fb_dealloc_cmap(&info->cmap);
                 framebuffer_release(info);
                 platform_set_drvdata(pdev, NULL);
-                kfree(info);
         }
 
         pnx4008_free_dum_channel(channel_owned, pdev->id);
@@ -168,23 +167,21 @@ static int __devinit rgbfb_probe(struct platform_device *pdev)
 
         ret = fb_alloc_cmap(&info->cmap, 256, 0);
         if (ret < 0)
-                goto err2;
+                goto err1;
 
         ret = register_framebuffer(info);
         if (ret < 0)
-                goto err3;
+                goto err2;
         platform_set_drvdata(pdev, info);
 
         return 0;
 
-err3:
-        fb_dealloc_cmap(&info->cmap);
 err2:
-        framebuffer_release(info);
+        fb_dealloc_cmap(&info->cmap);
 err1:
         pnx4008_free_dum_channel(channel_owned, pdev->id);
 err0:
-        kfree(info);
+        framebuffer_release(info);
 err:
         return ret;
 }
diff --git a/drivers/video/tridentfb.c b/drivers/video/tridentfb.c
index bd54cd0de39a..beefab2992c0 100644
--- a/drivers/video/tridentfb.c
+++ b/drivers/video/tridentfb.c
@@ -27,7 +27,6 @@
 #define VERSION         "0.7.8-NEWAPI"
 
 struct tridentfb_par {
-        int vclk;               /* in MHz */
         void __iomem *io_virt;  /* iospace virtual memory address */
 };
 
@@ -669,27 +668,26 @@ static void set_screen_start(int base)
                  (read3X4(CRTHiOrd) & 0xF8) | ((base & 0xE0000) >> 17));
 }
 
-/* Use 20.12 fixed-point for NTSC value and frequency calculation */
-#define calc_freq(n, m, k)  ( ((unsigned long)0xE517 * (n + 8) / ((m + 2) * (1 << k))) >> 12 )
-
 /* Set dotclock frequency */
-static void set_vclk(int freq)
+static void set_vclk(unsigned long freq)
 {
         int m, n, k;
-        int f, fi, d, di;
+        unsigned long f, fi, d, di;
         unsigned char lo = 0, hi = 0;
 
-        d = 20;
+        d = 20000;
         for (k = 2; k >= 0; k--)
                 for (m = 0; m < 63; m++)
                         for (n = 0; n < 128; n++) {
-                                fi = calc_freq(n, m, k);
+                                fi = ((14318l * (n + 8)) / (m + 2)) >> k;
                                 if ((di = abs(fi - freq)) < d) {
                                         d = di;
                                         f = fi;
                                         lo = n;
                                         hi = (k << 6) | m;
                                 }
+                                if (fi > freq)
+                                        break;
                         }
         if (chip3D) {
                 write3C4(ClockHigh, hi);
@@ -888,6 +886,8 @@ static int tridentfb_set_par(struct fb_info *info)
         struct fb_var_screeninfo *var = &info->var;
         int bpp = var->bits_per_pixel;
         unsigned char tmp;
+        unsigned long vclk;
+
         debug("enter\n");
         hdispend = var->xres / 8 - 1;
         hsyncstart = (var->xres + var->right_margin) / 8;
@@ -905,7 +905,6 @@ static int tridentfb_set_par(struct fb_info *info)
         vblankstart = var->yres;
         vblankend = vtotal + 2;
 
-        enable_mmio();
         crtc_unlock();
         write3CE(CyberControl, 8);
 
@@ -1015,11 +1014,11 @@ static int tridentfb_set_par(struct fb_info *info)
         write3X4(Performance, 0x92);
         write3X4(PCIReg, 0x07);         /* MMIO & PCI read and write burst enable */
 
-        /* convert from picoseconds to MHz */
-        par->vclk = 1000000 / info->var.pixclock;
+        /* convert from picoseconds to kHz */
+        vclk = PICOS2KHZ(info->var.pixclock);
         if (bpp == 32)
-                par->vclk *= 2;
-        set_vclk(par->vclk);
+                vclk *= 2;
+        set_vclk(vclk);
 
         write3C4(0, 3);
         write3C4(1, 1);         /* set char clock 8 dots wide */