Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

234 files changed, 4405 insertions, 3386 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 0cce28c4025b..33e2ca847a26 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -247,7 +247,7 @@ config ACPI_CUSTOM_DSDT_FILE
           Enter the full path name to the file wich includes the AmlCode declaration.
 
 config ACPI_BLACKLIST_YEAR
-        int "Disable ACPI for systems before Jan 1st this year" if X86
+        int "Disable ACPI for systems before Jan 1st this year" if X86_32
         default 0
         help
           enter a 4-digit year, eg. 2001 to disable ACPI by default
@@ -285,9 +285,8 @@ config ACPI_SYSTEM
           dump your ACPI DSDT table using /proc/acpi/dsdt.
 
 config X86_PM_TIMER
-        bool "Power Management Timer Support"
+        bool "Power Management Timer Support" if EMBEDDED
         depends on X86
-        depends on !X86_64
         default y
         help
           The Power Management Timer is available on all ACPI-capable,
@@ -298,9 +297,8 @@ config X86_PM_TIMER
           voltage scaling, unlike the commonly used Time Stamp Counter
           (TSC) timing source.
 
-          So, if you see messages like 'Losing too many ticks!' in the
-          kernel logs, and/or you are using this on a notebook which
-          does not yet have an HPET, you should say "Y" here.
+          You should nearly always say Y here because many modern
+          systems require this timer. 
 
 config ACPI_CONTAINER
         tristate "ACPI0004,PNP0A05 and PNP0A06 Container Driver (EXPERIMENTAL)"
diff --git a/drivers/acpi/resources/rscalc.c b/drivers/acpi/resources/rscalc.c
index 7d6481d9fbec..4038dbfa63a0 100644
--- a/drivers/acpi/resources/rscalc.c
+++ b/drivers/acpi/resources/rscalc.c
@@ -391,8 +391,7 @@ acpi_rs_get_list_length(u8 * aml_buffer,
                          * Ensure a 32-bit boundary for the structure
                          */
                         extra_struct_bytes =
-                            ACPI_ROUND_UP_to_32_bITS(resource_length) -
-                            resource_length;
+                            ACPI_ROUND_UP_to_32_bITS(resource_length);
                         break;
 
                 case ACPI_RESOURCE_NAME_END_TAG:
@@ -408,8 +407,7 @@ acpi_rs_get_list_length(u8 * aml_buffer,
                          * Add vendor data and ensure a 32-bit boundary for the structure
                          */
                         extra_struct_bytes =
-                            ACPI_ROUND_UP_to_32_bITS(resource_length) -
-                            resource_length;
+                            ACPI_ROUND_UP_to_32_bITS(resource_length);
                         break;
 
                 case ACPI_RESOURCE_NAME_ADDRESS32:
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index 14f6a6201da3..05983a312d50 100644
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -555,7 +555,7 @@ fore200e_pca_reset(struct fore200e* fore200e)
 }
 
 
-static int __init
+static int __devinit
 fore200e_pca_map(struct fore200e* fore200e)
 {
     DPRINTK(2, "device %s being mapped in memory\n", fore200e->name);
@@ -589,7 +589,7 @@ fore200e_pca_unmap(struct fore200e* fore200e)
 }
 
 
-static int __init
+static int __devinit
 fore200e_pca_configure(struct fore200e* fore200e)
 {
     struct pci_dev* pci_dev = (struct pci_dev*)fore200e->bus_dev;
@@ -2125,7 +2125,7 @@ fore200e_change_qos(struct atm_vcc* vcc,struct atm_qos* qos, int flags)
 }
     
 
-static int __init
+static int __devinit
 fore200e_irq_request(struct fore200e* fore200e)
 {
     if (request_irq(fore200e->irq, fore200e_interrupt, SA_SHIRQ, fore200e->name, fore200e->atm_dev) < 0) {
@@ -2148,7 +2148,7 @@ fore200e_irq_request(struct fore200e* fore200e)
 }
 
 
-static int __init
+static int __devinit
 fore200e_get_esi(struct fore200e* fore200e)
 {
     struct prom_data* prom = fore200e_kmalloc(sizeof(struct prom_data), GFP_KERNEL | GFP_DMA);
@@ -2180,7 +2180,7 @@ fore200e_get_esi(struct fore200e* fore200e)
 }
 
 
-static int __init
+static int __devinit
 fore200e_alloc_rx_buf(struct fore200e* fore200e)
 {
     int scheme, magn, nbr, size, i;
@@ -2245,7 +2245,7 @@ fore200e_alloc_rx_buf(struct fore200e* fore200e)
 }
 
 
-static int __init
+static int __devinit
 fore200e_init_bs_queue(struct fore200e* fore200e)
 {
     int scheme, magn, i;
@@ -2308,7 +2308,7 @@ fore200e_init_bs_queue(struct fore200e* fore200e)
 }
 
 
-static int __init
+static int __devinit
 fore200e_init_rx_queue(struct fore200e* fore200e)
 {
     struct host_rxq*     rxq =  &fore200e->host_rxq;
@@ -2368,7 +2368,7 @@ fore200e_init_rx_queue(struct fore200e* fore200e)
 }
 
 
-static int __init
+static int __devinit
 fore200e_init_tx_queue(struct fore200e* fore200e)
 {
     struct host_txq*     txq =  &fore200e->host_txq;
@@ -2431,7 +2431,7 @@ fore200e_init_tx_queue(struct fore200e* fore200e)
 }
 
 
-static int __init
+static int __devinit
 fore200e_init_cmd_queue(struct fore200e* fore200e)
 {
     struct host_cmdq*     cmdq =  &fore200e->host_cmdq;
@@ -2487,7 +2487,7 @@ fore200e_param_bs_queue(struct fore200e* fore200e,
 }
 
 
-static int __init
+static int __devinit
 fore200e_initialize(struct fore200e* fore200e)
 {
     struct cp_queues __iomem * cpq;
@@ -2539,7 +2539,7 @@ fore200e_initialize(struct fore200e* fore200e)
 }
 
 
-static void __init
+static void __devinit
 fore200e_monitor_putc(struct fore200e* fore200e, char c)
 {
     struct cp_monitor __iomem * monitor = fore200e->cp_monitor;
@@ -2551,7 +2551,7 @@ fore200e_monitor_putc(struct fore200e* fore200e, char c)
 }
 
 
-static int __init
+static int __devinit
 fore200e_monitor_getc(struct fore200e* fore200e)
 {
     struct cp_monitor __iomem * monitor = fore200e->cp_monitor;
@@ -2576,7 +2576,7 @@ fore200e_monitor_getc(struct fore200e* fore200e)
 }
 
 
-static void __init
+static void __devinit
 fore200e_monitor_puts(struct fore200e* fore200e, char* str)
 {
     while (*str) {
@@ -2591,7 +2591,7 @@ fore200e_monitor_puts(struct fore200e* fore200e, char* str)
 }
 
 
-static int __init
+static int __devinit
 fore200e_start_fw(struct fore200e* fore200e)
 {
     int               ok;
@@ -2622,7 +2622,7 @@ fore200e_start_fw(struct fore200e* fore200e)
 }
 
 
-static int __init
+static int __devinit
 fore200e_load_fw(struct fore200e* fore200e)
 {
     u32* fw_data = (u32*) fore200e->bus->fw_data;
@@ -2648,7 +2648,7 @@ fore200e_load_fw(struct fore200e* fore200e)
 }
 
 
-static int __init
+static int __devinit
 fore200e_register(struct fore200e* fore200e)
 {
     struct atm_dev* atm_dev;
@@ -2675,7 +2675,7 @@ fore200e_register(struct fore200e* fore200e)
 }
 
 
-static int __init
+static int __devinit
 fore200e_init(struct fore200e* fore200e)
 {
     if (fore200e_register(fore200e) < 0)
@@ -2721,7 +2721,7 @@ fore200e_init(struct fore200e* fore200e)
         return -EBUSY;
 
     fore200e_supply(fore200e);
-    
+
     /* all done, board initialization is now complete */
     fore200e->state = FORE200E_STATE_COMPLETE;
     return 0;
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 6ede1f352c29..37b8cda3e8bc 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -41,6 +41,7 @@
 #include <linux/timer.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/random.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include "DAC960.h"
@@ -3463,7 +3464,7 @@ static inline boolean DAC960_ProcessCompletedRequest(DAC960_Command_T *Command,
                 Command->SegmentCount, Command->DmaDirection);
 
          if (!end_that_request_first(Request, UpToDate, Command->BlockCount)) {
-
+                add_disk_randomness(Request->rq_disk);
                 end_that_request_last(Request, UpToDate);
 
                 if (Command->Completion) {
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 93e44d0292ab..bc9b2bcd7dba 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -58,6 +58,7 @@
 #include <linux/suspend.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_ioctl.h>
+#include <scsi/scsi.h>
 
 #include <asm/uaccess.h>
 
@@ -380,6 +381,7 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command *
         memcpy(rq->cmd, cgc->cmd, CDROM_PACKET_SIZE);
         if (sizeof(rq->cmd) > CDROM_PACKET_SIZE)
                 memset(rq->cmd + CDROM_PACKET_SIZE, 0, sizeof(rq->cmd) - CDROM_PACKET_SIZE);
+        rq->cmd_len = COMMAND_SIZE(rq->cmd[0]);
 
         rq->ref_count++;
         rq->flags |= REQ_NOMERGE;
@@ -1495,40 +1497,42 @@ static int pkt_set_write_settings(struct pktcdvd_device *pd)
 }
 
 /*
- * 0 -- we can write to this track, 1 -- we can't
+ * 1 -- we can write to this track, 0 -- we can't
  */
-static int pkt_good_track(track_information *ti)
+static int pkt_writable_track(struct pktcdvd_device *pd, track_information *ti)
 {
-        /*
-         * only good for CD-RW at the moment, not DVD-RW
-         */
+        switch (pd->mmc3_profile) {
+                case 0x1a: /* DVD+RW */
+                case 0x12: /* DVD-RAM */
+                        /* The track is always writable on DVD+RW/DVD-RAM */
+                        return 1;
+                default:
+                        break;
+        }
 
-        /*
-         * FIXME: only for FP
-         */
-        if (ti->fp == 0)
+        if (!ti->packet || !ti->fp)
                 return 0;
 
         /*
          * "good" settings as per Mt Fuji.
          */
-        if (ti->rt == 0 && ti->blank == 0 && ti->packet == 1)
-                return 0;
+        if (ti->rt == 0 && ti->blank == 0)
+                return 1;
 
-        if (ti->rt == 0 && ti->blank == 1 && ti->packet == 1)
-                return 0;
+        if (ti->rt == 0 && ti->blank == 1)
+                return 1;
 
-        if (ti->rt == 1 && ti->blank == 0 && ti->packet == 1)
-                return 0;
+        if (ti->rt == 1 && ti->blank == 0)
+                return 1;
 
         printk("pktcdvd: bad state %d-%d-%d\n", ti->rt, ti->blank, ti->packet);
-        return 1;
+        return 0;
 }
 
 /*
- * 0 -- we can write to this disc, 1 -- we can't
+ * 1 -- we can write to this disc, 0 -- we can't
  */
-static int pkt_good_disc(struct pktcdvd_device *pd, disc_information *di)
+static int pkt_writable_disc(struct pktcdvd_device *pd, disc_information *di)
 {
         switch (pd->mmc3_profile) {
                 case 0x0a: /* CD-RW */
@@ -1537,10 +1541,10 @@ static int pkt_good_disc(struct pktcdvd_device *pd, disc_information *di)
                 case 0x1a: /* DVD+RW */
                 case 0x13: /* DVD-RW */
                 case 0x12: /* DVD-RAM */
-                        return 0;
+                        return 1;
                 default:
                         VPRINTK("pktcdvd: Wrong disc profile (%x)\n", pd->mmc3_profile);
-                        return 1;
+                        return 0;
         }
 
         /*
@@ -1549,25 +1553,25 @@ static int pkt_good_disc(struct pktcdvd_device *pd, disc_information *di)
          */
         if (di->disc_type == 0xff) {
                 printk("pktcdvd: Unknown disc. No track?\n");
-                return 1;
+                return 0;
         }
 
         if (di->disc_type != 0x20 && di->disc_type != 0) {
                 printk("pktcdvd: Wrong disc type (%x)\n", di->disc_type);
-                return 1;
+                return 0;
         }
 
         if (di->erasable == 0) {
                 printk("pktcdvd: Disc not erasable\n");
-                return 1;
+                return 0;
         }
 
         if (di->border_status == PACKET_SESSION_RESERVED) {
                 printk("pktcdvd: Can't write to last track (reserved)\n");
-                return 1;
+                return 0;
         }
 
-        return 0;
+        return 1;
 }
 
 static int pkt_probe_settings(struct pktcdvd_device *pd)
@@ -1592,23 +1596,9 @@ static int pkt_probe_settings(struct pktcdvd_device *pd)
                 return ret;
         }
 
-        if (pkt_good_disc(pd, &di))
-                return -ENXIO;
+        if (!pkt_writable_disc(pd, &di))
+                return -EROFS;
 
-        switch (pd->mmc3_profile) {
-                case 0x1a: /* DVD+RW */
-                        printk("pktcdvd: inserted media is DVD+RW\n");
-                        break;
-                case 0x13: /* DVD-RW */
-                        printk("pktcdvd: inserted media is DVD-RW\n");
-                        break;
-                case 0x12: /* DVD-RAM */
-                        printk("pktcdvd: inserted media is DVD-RAM\n");
-                        break;
-                default:
-                        printk("pktcdvd: inserted media is CD-R%s\n", di.erasable ? "W" : "");
-                        break;
-        }
         pd->type = di.erasable ? PACKET_CDRW : PACKET_CDR;
 
         track = 1; /* (di.last_track_msb << 8) | di.last_track_lsb; */
@@ -1617,9 +1607,9 @@ static int pkt_probe_settings(struct pktcdvd_device *pd)
                 return ret;
         }
 
-        if (pkt_good_track(&ti)) {
+        if (!pkt_writable_track(pd, &ti)) {
                 printk("pktcdvd: can't write to this track\n");
-                return -ENXIO;
+                return -EROFS;
         }
 
         /*
@@ -1633,7 +1623,7 @@ static int pkt_probe_settings(struct pktcdvd_device *pd)
         }
         if (pd->settings.size > PACKET_MAX_SECTORS) {
                 printk("pktcdvd: packet size is too big\n");
-                return -ENXIO;
+                return -EROFS;
         }
         pd->settings.fp = ti.fp;
         pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1);
@@ -1675,7 +1665,7 @@ static int pkt_probe_settings(struct pktcdvd_device *pd)
                         break;
                 default:
                         printk("pktcdvd: unknown data mode\n");
-                        return 1;
+                        return -EROFS;
         }
         return 0;
 }
@@ -1886,7 +1876,7 @@ static int pkt_open_write(struct pktcdvd_device *pd)
 
         if ((ret = pkt_probe_settings(pd))) {
                 VPRINTK("pktcdvd: %s failed probe\n", pd->name);
-                return -EROFS;
+                return ret;
         }
 
         if ((ret = pkt_set_write_settings(pd))) {
diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig
index 486ed8a11b59..a4d425d2dce2 100644
--- a/drivers/char/agp/Kconfig
+++ b/drivers/char/agp/Kconfig
@@ -15,22 +15,23 @@ config AGP
           due to kernel allocation issues), you could use PCI accesses
           and have up to a couple gigs of texture space.
 
-          Note that this is the only means to have XFree4/GLX use
+          Note that this is the only means to have X/GLX use
           write-combining with MTRR support on the AGP bus. Without it, OpenGL
           direct rendering will be a lot slower but still faster than PIO.
 
-          You should say Y here if you use XFree86 3.3.6 or 4.x and want to
-          use GLX or DRI.  If unsure, say N.
-
           To compile this driver as a module, choose M here: the
           module will be called agpgart.
 
+          You should say Y here if you want to use GLX or DRI.
+
+          If unsure, say N.
+
 config AGP_ALI
         tristate "ALI chipset support"
         depends on AGP && X86_32
         ---help---
           This option gives you AGP support for the GLX component of
-          XFree86 4.x on the following ALi chipsets.  The supported chipsets
+          X on the following ALi chipsets.  The supported chipsets
           include M1541, M1621, M1631, M1632, M1641,M1647,and M1651.
           For the ALi-chipset question, ALi suggests you refer to
           <http://www.ali.com.tw/eng/support/index.shtml>.
@@ -40,28 +41,19 @@ config AGP_ALI
           timing issues, this chipset cannot do AGP 2x with the G200.
           This is a hardware limitation. AGP 1x seems to be fine, though.
 
-          You should say Y here if you use XFree86 3.3.6 or 4.x and want to
-          use GLX or DRI.  If unsure, say N.
-
 config AGP_ATI
         tristate "ATI chipset support"
         depends on AGP && X86_32
         ---help---
-      This option gives you AGP support for the GLX component of
-      XFree86 4.x on the ATI RadeonIGP family of chipsets.
-
-      You should say Y here if you use XFree86 3.3.6 or 4.x and want to
-      use GLX or DRI.  If unsure, say N.
+          This option gives you AGP support for the GLX component of
+          X on the ATI RadeonIGP family of chipsets.
 
 config AGP_AMD
         tristate "AMD Irongate, 761, and 762 chipset support"
         depends on AGP && X86_32
         help
           This option gives you AGP support for the GLX component of
-          XFree86 4.x on AMD Irongate, 761, and 762 chipsets.
-
-          You should say Y here if you use XFree86 3.3.6 or 4.x and want to
-          use GLX or DRI.  If unsure, say N.
+          X on AMD Irongate, 761, and 762 chipsets.
 
 config AGP_AMD64
         tristate "AMD Opteron/Athlon64 on-CPU GART support" if !GART_IOMMU
@@ -69,45 +61,38 @@ config AGP_AMD64
         default y if GART_IOMMU
         help
           This option gives you AGP support for the GLX component of
-          XFree86 4.x using the on-CPU northbridge of the AMD Athlon64/Opteron CPUs.
+          X using the on-CPU northbridge of the AMD Athlon64/Opteron CPUs.
           You still need an external AGP bridge like the AMD 8151, VIA
           K8T400M, SiS755. It may also support other AGP bridges when loaded
           with agp_try_unsupported=1.
-          You should say Y here if you use XFree86 3.3.6 or 4.x and want to
-          use GLX or DRI.  If unsure, say Y
 
 config AGP_INTEL
         tristate "Intel 440LX/BX/GX, I8xx and E7x05 chipset support"
         depends on AGP && X86
         help
-          This option gives you AGP support for the GLX component of XFree86 4.x
+          This option gives you AGP support for the GLX component of X
           on Intel 440LX/BX/GX, 815, 820, 830, 840, 845, 850, 860, 875,
-          E7205 and E7505 chipsets and full support for the 810, 815, 830M, 845G,
-          852GM, 855GM, 865G and I915 integrated graphics chipsets.
+          E7205 and E7505 chipsets and full support for the 810, 815, 830M,
+          845G, 852GM, 855GM, 865G and I915 integrated graphics chipsets.
+
 
-          You should say Y here if you use XFree86 3.3.6 or 4.x and want to
-          use GLX or DRI, or if you have any Intel integrated graphics
-          chipsets.  If unsure, say Y.
 
 config AGP_NVIDIA
         tristate "NVIDIA nForce/nForce2 chipset support"
         depends on AGP && X86_32
         help
           This option gives you AGP support for the GLX component of
-          XFree86 4.x on the following NVIDIA chipsets.  The supported chipsets
-          include nForce and nForce2
+          X on NVIDIA chipsets including nForce and nForce2
 
 config AGP_SIS
         tristate "SiS chipset support"
         depends on AGP && X86_32
         help
           This option gives you AGP support for the GLX component of
-          XFree86 4.x on Silicon Integrated Systems [SiS] chipsets.
+          X on Silicon Integrated Systems [SiS] chipsets.
 
           Note that 5591/5592 AGP chipsets are NOT supported.
 
-          You should say Y here if you use XFree86 3.3.6 or 4.x and want to
-          use GLX or DRI.  If unsure, say N.
 
 config AGP_SWORKS
         tristate "Serverworks LE/HE chipset support"
@@ -121,10 +106,7 @@ config AGP_VIA
         depends on AGP && X86_32
         help
           This option gives you AGP support for the GLX component of
-          XFree86 4.x on VIA MVP3/Apollo Pro chipsets.
-
-          You should say Y here if you use XFree86 3.3.6 or 4.x and want to
-          use GLX or DRI.  If unsure, say N.
+          X on VIA MVP3/Apollo Pro chipsets.
 
 config AGP_I460
         tristate "Intel 460GX chipset support"
@@ -159,9 +141,6 @@ config AGP_EFFICEON
           This option gives you AGP support for the Transmeta Efficeon
           series processors with integrated northbridges.
 
-          You should say Y here if you use XFree86 3.3.6 or 4.x and want to
-          use GLX or DRI.  If unsure, say Y.
-
 config AGP_SGI_TIOCA
         tristate "SGI TIO chipset AGP support"
         depends on AGP && (IA64_SGI_SN2 || IA64_GENERIC)
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
index 9964c508c111..1251b2515bbe 100644
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
@@ -516,8 +516,10 @@ static int __devinit nforce3_agp_init(struct pci_dev *pdev)
         pci_read_config_dword (hammers[0], AMD64_GARTAPERTUREBASE, &apbase);
 
         /* if x86-64 aperture base is beyond 4G, exit here */
-        if ( (apbase & 0x7fff) >> (32 - 25) )
-                 return -ENODEV;
+        if ( (apbase & 0x7fff) >> (32 - 25) ) {
+                printk(KERN_INFO PFX "aperture base > 4G\n");
+                return -ENODEV;
+        }
 
         apbase = (apbase & 0x7fff) << 25;
 
diff --git a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c
index 268f78d926d3..efef9999f1cf 100644
--- a/drivers/char/agp/sworks-agp.c
+++ b/drivers/char/agp/sworks-agp.c
@@ -468,9 +468,7 @@ static int __devinit agp_serverworks_probe(struct pci_dev *pdev,
 
         switch (pdev->device) {
         case 0x0006:
-                /* ServerWorks CNB20HE
-                Fail silently.*/
-                printk (KERN_ERR PFX "Detected ServerWorks CNB20HE chipset: No AGP present.\n");
+                printk (KERN_ERR PFX "ServerWorks CNB20HE is unsupported due to lack of documentation.\n");
                 return -ENODEV;
 
         case PCI_DEVICE_ID_SERVERWORKS_HE:
diff --git a/drivers/char/drm/i915_irq.c b/drivers/char/drm/i915_irq.c
index a1381c61aa63..d3879ac9970f 100644
--- a/drivers/char/drm/i915_irq.c
+++ b/drivers/char/drm/i915_irq.c
@@ -202,10 +202,15 @@ void i915_driver_irq_postinstall(drm_device_t * dev)
 void i915_driver_irq_uninstall(drm_device_t * dev)
 {
         drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
+        u16 temp;
+
         if (!dev_priv)
                 return;
 
         I915_WRITE16(I915REG_HWSTAM, 0xffff);
         I915_WRITE16(I915REG_INT_MASK_R, 0xffff);
         I915_WRITE16(I915REG_INT_ENABLE_R, 0x0);
+
+        temp = I915_READ16(I915REG_INT_IDENTITY_R);
+        I915_WRITE16(I915REG_INT_IDENTITY_R, temp);
 }
diff --git a/drivers/char/drm/r300_cmdbuf.c b/drivers/char/drm/r300_cmdbuf.c
index 291dbf4c8186..c08fa5076f05 100644
--- a/drivers/char/drm/r300_cmdbuf.c
+++ b/drivers/char/drm/r300_cmdbuf.c
@@ -161,6 +161,7 @@ void r300_init_reg_flags(void)
         ADD_RANGE(R300_VAP_PVS_CNTL_1, 3);
         ADD_RANGE(R300_GB_ENABLE, 1);
         ADD_RANGE(R300_GB_MSPOS0, 5);
+        ADD_RANGE(R300_TX_CNTL, 1);
         ADD_RANGE(R300_TX_ENABLE, 1);
         ADD_RANGE(0x4200, 4);
         ADD_RANGE(0x4214, 1);
@@ -489,6 +490,50 @@ static __inline__ int r300_emit_3d_load_vbpntr(drm_radeon_private_t *dev_priv,
 
         return 0;
 }
+static __inline__ int r300_emit_bitblt_multi(drm_radeon_private_t *dev_priv,
+                                             drm_radeon_kcmd_buffer_t *cmdbuf)
+{
+        u32 *cmd = (u32 *) cmdbuf->buf;
+        int count, ret;
+        RING_LOCALS;
+
+        count=(cmd[0]>>16) & 0x3fff;
+
+        if (cmd[0] & 0x8000) {
+                u32 offset;
+
+                if (cmd[1] & (RADEON_GMC_SRC_PITCH_OFFSET_CNTL 
+                              | RADEON_GMC_DST_PITCH_OFFSET_CNTL)) {
+                        offset = cmd[2] << 10;
+                        ret = r300_check_offset(dev_priv, offset);
+                        if (ret) {
+                                DRM_ERROR("Invalid bitblt first offset is %08X\n", offset);
+                                return DRM_ERR(EINVAL);
+                        }
+                }
+
+                if ((cmd[1] & RADEON_GMC_SRC_PITCH_OFFSET_CNTL) &&
+                    (cmd[1] & RADEON_GMC_DST_PITCH_OFFSET_CNTL)) {
+                        offset = cmd[3] << 10;
+                        ret = r300_check_offset(dev_priv, offset);
+                        if (ret) {
+                                DRM_ERROR("Invalid bitblt second offset is %08X\n", offset);
+                                return DRM_ERR(EINVAL);
+                        }
+                        
+                }
+        }
+
+        BEGIN_RING(count+2);
+        OUT_RING(cmd[0]);
+        OUT_RING_TABLE((int *)(cmdbuf->buf + 4), count + 1);
+        ADVANCE_RING();
+
+        cmdbuf->buf += (count+2)*4;
+        cmdbuf->bufsz -= (count+2)*4;
+
+        return 0;
+}
 
 static __inline__ int r300_emit_raw_packet3(drm_radeon_private_t *dev_priv,
                                             drm_radeon_kcmd_buffer_t *cmdbuf)
@@ -527,6 +572,9 @@ static __inline__ int r300_emit_raw_packet3(drm_radeon_private_t *dev_priv,
         case RADEON_3D_LOAD_VBPNTR:     /* load vertex array pointers */
                 return r300_emit_3d_load_vbpntr(dev_priv, cmdbuf, header);
 
+        case RADEON_CNTL_BITBLT_MULTI:
+                return r300_emit_bitblt_multi(dev_priv, cmdbuf);
+
         case RADEON_CP_3D_DRAW_IMMD_2:  /* triggers drawing using in-packet vertex data */
         case RADEON_CP_3D_DRAW_VBUF_2:  /* triggers drawing of vertex buffers setup elsewhere */
         case RADEON_CP_3D_DRAW_INDX_2:  /* triggers drawing using indices to vertex buffer */
diff --git a/drivers/char/drm/r300_reg.h b/drivers/char/drm/r300_reg.h
index a0ed20e25221..d1e19954406b 100644
--- a/drivers/char/drm/r300_reg.h
+++ b/drivers/char/drm/r300_reg.h
@@ -451,6 +451,9 @@ I am fairly certain that they are correct unless stated otherwise in comments.
 /* END */
 
 /* gap */
+/* Zero to flush caches. */
+#define R300_TX_CNTL                        0x4100
+
 /* The upper enable bits are guessed, based on fglrx reported limits. */
 #define R300_TX_ENABLE                      0x4104
 #       define R300_TX_ENABLE_0                  (1 << 0)
diff --git a/drivers/char/drm/radeon_drv.h b/drivers/char/drm/radeon_drv.h
index 498b19b1d641..1f7d2ab8c4fc 100644
--- a/drivers/char/drm/radeon_drv.h
+++ b/drivers/char/drm/radeon_drv.h
@@ -90,9 +90,10 @@
  * 1.19- Add support for gart table in FB memory and PCIE r300
  * 1.20- Add support for r300 texrect
  * 1.21- Add support for card type getparam
+ * 1.22- Add support for texture cache flushes (R300_TX_CNTL)
  */
 #define DRIVER_MAJOR            1
-#define DRIVER_MINOR            21
+#define DRIVER_MINOR            22
 #define DRIVER_PATCHLEVEL       0
 
 /*
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
index 1994a92d4733..f65b2e14a485 100644
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
@@ -335,6 +335,8 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
         } /* else count == 0 */
 
         tty->driver_data = hp;
+        tty->low_latency = 1; /* Makes flushes to ldisc synchronous. */
+
         hp->tty = tty;
         /* Save for request_irq outside of spin_lock. */
         irq = hp->irq;
@@ -633,9 +635,6 @@ static int hvc_poll(struct hvc_struct *hp)
                         tty_insert_flip_char(tty, buf[i], 0);
                 }
 
-                if (count)
-                        tty_schedule_flip(tty);
-
                 /*
                  * Account for the total amount read in one loop, and if above
                  * 64 bytes, we do a quick schedule loop to let the tty grok
@@ -656,6 +655,9 @@ static int hvc_poll(struct hvc_struct *hp)
  bail:
         spin_unlock_irqrestore(&hp->lock, flags);
 
+        if (read_total)
+                tty_flip_buffer_push(tty);
+        
         return poll_mask;
 }
 
diff --git a/drivers/char/hw_random.c b/drivers/char/hw_random.c
index b3bc2e37e616..29dc87e59020 100644
--- a/drivers/char/hw_random.c
+++ b/drivers/char/hw_random.c
@@ -131,7 +131,9 @@ enum {
         rng_hw_none,
         rng_hw_intel,
         rng_hw_amd,
+#ifdef __i386__
         rng_hw_via,
+#endif
         rng_hw_geode,
 };
 
diff --git a/drivers/char/mmtimer.c b/drivers/char/mmtimer.c
index c92378121b4c..1b05fa688996 100644
--- a/drivers/char/mmtimer.c
+++ b/drivers/char/mmtimer.c
@@ -675,7 +675,7 @@ static int __init mmtimer_init(void)
         cnodeid_t node, maxn = -1;
 
         if (!ia64_platform_is("sn2"))
-                return -1;
+                return 0;
 
         /*
          * Sanity check the cycles/sec variable
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index 649677b5dc36..5fdf18515433 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -13,11 +13,12 @@
   *
   * (C) 2000,2001,2002,2003,2004 Omnikey AG
   *
-  * (C) 2005 Harald Welte <laforge@gnumonks.org>
+  * (C) 2005-2006 Harald Welte <laforge@gnumonks.org>
   *     - Adhere to Kernel CodingStyle
   *     - Port to 2.6.13 "new" style PCMCIA
   *     - Check for copy_{from,to}_user return values
   *     - Use nonseekable_open()
+  *     - add class interface for udev device creation
   *
   * All rights reserved. Licensed under dual BSD/GPL license.
   */
@@ -56,7 +57,7 @@ module_param(pc_debug, int, 0600);
 #else
 #define DEBUGP(n, rdr, x, args...)
 #endif
-static char *version = "cm4000_cs.c v2.4.0gm5 - All bugs added by Harald Welte";
+static char *version = "cm4000_cs.c v2.4.0gm6 - All bugs added by Harald Welte";
 
 #define T_1SEC          (HZ)
 #define T_10MSEC        msecs_to_jiffies(10)
@@ -156,6 +157,7 @@ struct cm4000_dev {
                 /*queue*/ 4*sizeof(wait_queue_head_t))
 
 static dev_link_t *dev_table[CM4000_MAX_DEV];
+static struct class *cmm_class;
 
 /* This table doesn't use spaces after the comma between fields and thus
  * violates CodingStyle.  However, I don't really think wrapping it around will
@@ -1937,6 +1939,9 @@ static int cm4000_attach(struct pcmcia_device *p_dev)
         link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
         cm4000_config(link, i);
 
+        class_device_create(cmm_class, NULL, MKDEV(major, i), NULL,
+                            "cmm%d", i);
+
         return 0;
 }
 
@@ -1962,6 +1967,8 @@ static void cm4000_detach(struct pcmcia_device *p_dev)
         dev_table[devno] = NULL;
         kfree(dev);
 
+        class_device_destroy(cmm_class, MKDEV(major, devno));
+
         return;
 }
 
@@ -1995,8 +2002,18 @@ static struct pcmcia_driver cm4000_driver = {
 
 static int __init cmm_init(void)
 {
+        int rc;
+
         printk(KERN_INFO "%s\n", version);
-        pcmcia_register_driver(&cm4000_driver);
+
+        cmm_class = class_create(THIS_MODULE, "cardman_4000");
+        if (!cmm_class)
+                return -1;
+
+        rc = pcmcia_register_driver(&cm4000_driver);
+        if (rc < 0)
+                return rc;
+
         major = register_chrdev(0, DEVICE_NAME, &cm4000_fops);
         if (major < 0) {
                 printk(KERN_WARNING MODULE_NAME
@@ -2012,6 +2029,7 @@ static void __exit cmm_exit(void)
         printk(KERN_INFO MODULE_NAME ": unloading\n");
         pcmcia_unregister_driver(&cm4000_driver);
         unregister_chrdev(major, DEVICE_NAME);
+        class_destroy(cmm_class);
 };
 
 module_init(cmm_init);
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c
index 46eb371bf17e..466e33bab029 100644
--- a/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@ -3,12 +3,13 @@
  *
  * (c) 2000-2004 Omnikey AG (http://www.omnikey.com/)
  *
- * (C) 2005 Harald Welte <laforge@gnumonks.org>
+ * (C) 2005-2006 Harald Welte <laforge@gnumonks.org>
  *      - add support for poll()
  *      - driver cleanup
  *      - add waitqueues
  *      - adhere to linux kernel coding style and policies
  *      - support 2.6.13 "new style" pcmcia interface
+ *      - add class interface for udev device creation
  *
  * The device basically is a USB CCID compliant device that has been
  * attached to an I/O-Mapped FIFO.
@@ -53,7 +54,7 @@ module_param(pc_debug, int, 0600);
 #endif
 
 static char *version =
-"OMNIKEY CardMan 4040 v1.1.0gm4 - All bugs added by Harald Welte";
+"OMNIKEY CardMan 4040 v1.1.0gm5 - All bugs added by Harald Welte";
 
 #define CCID_DRIVER_BULK_DEFAULT_TIMEOUT        (150*HZ)
 #define CCID_DRIVER_ASYNC_POWERUP_TIMEOUT       (35*HZ)
@@ -67,6 +68,7 @@ static char *version =
 static void reader_release(dev_link_t *link);
 
 static int major;
+static struct class *cmx_class;
 
 #define         BS_READABLE     0x01
 #define         BS_WRITABLE     0x02
@@ -696,6 +698,9 @@ static int reader_attach(struct pcmcia_device *p_dev)
         link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
         reader_config(link, i);
 
+        class_device_create(cmx_class, NULL, MKDEV(major, i), NULL,
+                            "cmx%d", i);
+
         return 0;
 }
 
@@ -721,6 +726,8 @@ static void reader_detach(struct pcmcia_device *p_dev)
         dev_table[devno] = NULL;
         kfree(dev);
 
+        class_device_destroy(cmx_class, MKDEV(major, devno));
+
         return;
 }
 
@@ -755,8 +762,17 @@ static struct pcmcia_driver reader_driver = {
 
 static int __init cm4040_init(void)
 {
+        int rc;
+
         printk(KERN_INFO "%s\n", version);
-        pcmcia_register_driver(&reader_driver);
+        cmx_class = class_create(THIS_MODULE, "cardman_4040");
+        if (!cmx_class)
+                return -1;
+
+        rc = pcmcia_register_driver(&reader_driver);
+        if (rc < 0)
+                return rc;
+
         major = register_chrdev(0, DEVICE_NAME, &reader_fops);
         if (major < 0) {
                 printk(KERN_WARNING MODULE_NAME
@@ -771,6 +787,7 @@ static void __exit cm4040_exit(void)
         printk(KERN_INFO MODULE_NAME ": unloading\n");
         pcmcia_unregister_driver(&reader_driver);
         unregister_chrdev(major, DEVICE_NAME);
+        class_destroy(cmx_class);
 }
 
 module_init(cm4040_init);
diff --git a/drivers/char/sx.c b/drivers/char/sx.c
index c2490e270f1f..a6b4f02bdceb 100644
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
@@ -1095,17 +1095,17 @@ static inline void sx_receive_chars (struct sx_port *port)
 
                 sx_dprintk (SX_DEBUG_RECEIVE, "rxop=%d, c = %d.\n", rx_op, c); 
 
+                /* Don't copy past the end of the hardware receive buffer */
+                if (rx_op + c > 0x100) c = 0x100 - rx_op;
+
+                sx_dprintk (SX_DEBUG_RECEIVE, "c = %d.\n", c);
+
                 /* Don't copy more bytes than there is room for in the buffer */
 
                 c = tty_prepare_flip_string(tty, &rp, c);
 
                 sx_dprintk (SX_DEBUG_RECEIVE, "c = %d.\n", c); 
 
-                /* Don't copy past the end of the hardware receive buffer */
-                if (rx_op + c > 0x100) c = 0x100 - rx_op;
-
-                sx_dprintk (SX_DEBUG_RECEIVE, "c = %d.\n", c);
-
                 /* If for one reason or another, we can't copy more data, we're done! */
                 if (c == 0) break;
 
@@ -2173,15 +2173,17 @@ static int probe_si (struct sx_board *board)
         if ( IS_SI1_BOARD(board)) {
                 /* This should be an SI1 board, which has this
                    location writable... */
-                if (read_sx_byte (board, SI2_ISA_ID_BASE) != 0x10)
+                if (read_sx_byte (board, SI2_ISA_ID_BASE) != 0x10) {
                         func_exit ();
                         return 0; 
+                }
         } else {
                 /* This should be an SI2 board, which has the bottom
                    3 bits non-writable... */
-                if (read_sx_byte (board, SI2_ISA_ID_BASE) == 0x10)
+                if (read_sx_byte (board, SI2_ISA_ID_BASE) == 0x10) {
                         func_exit ();
                         return 0; 
+                }
         }
 
         /* Now we're pretty much convinced that there is an SI board here, 
@@ -2192,15 +2194,17 @@ static int probe_si (struct sx_board *board)
         if ( IS_SI1_BOARD(board)) {
                 /* This should be an SI1 board, which has this
                    location writable... */
-                if (read_sx_byte (board, SI2_ISA_ID_BASE) != 0x10)
+                if (read_sx_byte (board, SI2_ISA_ID_BASE) != 0x10) {
                         func_exit();
                         return 0; 
+                }
         } else {
                 /* This should be an SI2 board, which has the bottom
                    3 bits non-writable... */
-                if (read_sx_byte (board, SI2_ISA_ID_BASE) == 0x10)
+                if (read_sx_byte (board, SI2_ISA_ID_BASE) == 0x10) {
                         func_exit ();
                         return 0; 
+                }
         }
 
         printheader ();
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c
index a85a60a93deb..b046390cd256 100644
--- a/drivers/char/synclink_gt.c
+++ b/drivers/char/synclink_gt.c
@@ -306,7 +306,7 @@ struct slgt_info {
         int tx_active;
 
         unsigned char signals;    /* serial signal states */
-        unsigned int init_error;  /* initialization error */
+        int init_error;  /* initialization error */
 
         unsigned char *tx_buf;
         int tx_count;
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
index 5765f672e853..d58f82318853 100644
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
@@ -243,7 +243,7 @@ static struct sysrq_key_op sysrq_term_op = {
 
 static void moom_callback(void *ignored)
 {
-        out_of_memory(GFP_KERNEL, 0);
+        out_of_memory(&NODE_DATA(0)->node_zonelists[ZONE_NORMAL], GFP_KERNEL, 0);
 }
 
 static DECLARE_WORK(moom_work, moom_callback, NULL);
diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c
index ec7590951af5..24095f6ee6da 100644
--- a/drivers/char/tpm/tpm_infineon.c
+++ b/drivers/char/tpm/tpm_infineon.c
@@ -33,6 +33,7 @@
 static int TPM_INF_DATA;
 static int TPM_INF_ADDR;
 static int TPM_INF_BASE;
+static int TPM_INF_ADDR_LEN;
 static int TPM_INF_PORT_LEN;
 
 /* TPM header definitions */
@@ -195,6 +196,7 @@ static int tpm_inf_recv(struct tpm_chip *chip, u8 * buf, size_t count)
         int i;
         int ret;
         u32 size = 0;
+        number_of_wtx = 0;
 
 recv_begin:
         /* start receiving header */
@@ -378,24 +380,35 @@ static int __devinit tpm_inf_pnp_probe(struct pnp_dev *dev,
         if (pnp_port_valid(dev, 0) && pnp_port_valid(dev, 1) &&
             !(pnp_port_flags(dev, 0) & IORESOURCE_DISABLED)) {
                 TPM_INF_ADDR = pnp_port_start(dev, 0);
+                TPM_INF_ADDR_LEN = pnp_port_len(dev, 0);
                 TPM_INF_DATA = (TPM_INF_ADDR + 1);
                 TPM_INF_BASE = pnp_port_start(dev, 1);
                 TPM_INF_PORT_LEN = pnp_port_len(dev, 1);
-                if (!TPM_INF_PORT_LEN)
-                        return -EINVAL;
+                if ((TPM_INF_PORT_LEN < 4) || (TPM_INF_ADDR_LEN < 2)) {
+                        rc = -EINVAL;
+                        goto err_last;
+                }
                 dev_info(&dev->dev, "Found %s with ID %s\n",
                          dev->name, dev_id->id);
-                if (!((TPM_INF_BASE >> 8) & 0xff))
-                        return -EINVAL;
+                if (!((TPM_INF_BASE >> 8) & 0xff)) {
+                        rc = -EINVAL;
+                        goto err_last;
+                }
                 /* publish my base address and request region */
                 tpm_inf.base = TPM_INF_BASE;
                 if (request_region
                     (tpm_inf.base, TPM_INF_PORT_LEN, "tpm_infineon0") == NULL) {
-                        release_region(tpm_inf.base, TPM_INF_PORT_LEN);
-                        return -EINVAL;
+                        rc = -EINVAL;
+                        goto err_last;
+                }
+                if (request_region(TPM_INF_ADDR, TPM_INF_ADDR_LEN,
+                                "tpm_infineon0") == NULL) {
+                        rc = -EINVAL;
+                        goto err_last;
                 }
         } else {
-                return -EINVAL;
+                rc = -EINVAL;
+                goto err_last;
         }
 
         /* query chip for its vendor, its version number a.s.o. */
@@ -443,8 +456,8 @@ static int __devinit tpm_inf_pnp_probe(struct pnp_dev *dev,
                         dev_err(&dev->dev,
                                 "Could not set IO-ports to 0x%lx\n",
                                 tpm_inf.base);
-                        release_region(tpm_inf.base, TPM_INF_PORT_LEN);
-                        return -EIO;
+                        rc = -EIO;
+                        goto err_release_region;
                 }
 
                 /* activate register */
@@ -471,14 +484,21 @@ static int __devinit tpm_inf_pnp_probe(struct pnp_dev *dev,
 
                 rc = tpm_register_hardware(&dev->dev, &tpm_inf);
                 if (rc < 0) {
-                        release_region(tpm_inf.base, TPM_INF_PORT_LEN);
-                        return -ENODEV;
+                        rc = -ENODEV;
+                        goto err_release_region;
                 }
                 return 0;
         } else {
-                dev_info(&dev->dev, "No Infineon TPM found!\n");
-                return -ENODEV;
+                rc = -ENODEV;
+                goto err_release_region;
         }
+
+err_release_region:
+        release_region(tpm_inf.base, TPM_INF_PORT_LEN);
+        release_region(TPM_INF_ADDR, TPM_INF_ADDR_LEN);
+
+err_last:
+        return rc;
 }
 
 static __devexit void tpm_inf_pnp_remove(struct pnp_dev *dev)
@@ -518,5 +538,5 @@ module_exit(cleanup_inf);
 
 MODULE_AUTHOR("Marcel Selhorst <selhorst@crypto.rub.de>");
 MODULE_DESCRIPTION("Driver for Infineon TPM SLD 9630 TT 1.1 / SLB 9635 TT 1.2");
-MODULE_VERSION("1.6");
+MODULE_VERSION("1.7");
 MODULE_LICENSE("GPL");
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index e9bba94fc898..53d3d066554e 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -303,7 +303,7 @@ static struct tty_buffer *tty_buffer_find(struct tty_struct *tty, size_t size)
                         t->commit = 0;
                         t->read = 0;
                         /* DEBUG ONLY */
-                        memset(t->data, '*', size);
+/*                      memset(t->data, '*', size); */
 /*                      printk("Flip recycle %p\n", t); */
                         return t;
                 }
diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c
index 64819aa7cac4..0c08c58252be 100644
--- a/drivers/crypto/padlock-aes.c
+++ b/drivers/crypto/padlock-aes.c
@@ -348,10 +348,10 @@ aes_set_key(void *ctx_arg, const uint8_t *in_key, unsigned int key_len, uint32_t
                 break;
 
         case 32:
-                E_KEY[4] = le32_to_cpu(in_key[4]);
-                E_KEY[5] = le32_to_cpu(in_key[5]);
-                E_KEY[6] = le32_to_cpu(in_key[6]);
-                t = E_KEY[7] = le32_to_cpu(in_key[7]);
+                E_KEY[4] = le32_to_cpu(key[4]);
+                E_KEY[5] = le32_to_cpu(key[5]);
+                E_KEY[6] = le32_to_cpu(key[6]);
+                t = E_KEY[7] = le32_to_cpu(key[7]);
                 for (i = 0; i < 7; ++i)
                         loop8 (i);
                 break;
diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
index 18a455651121..52f3eb45d2b9 100644
--- a/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@ -6,17 +6,29 @@
 # $Id: Kconfig,v 1.4.2.7 2005/07/08 22:05:38 dsp_llnl Exp $
 #
 
-menu 'EDAC - error detection and reporting (RAS)'
+menu 'EDAC - error detection and reporting (RAS) (EXPERIMENTAL)'
 
 config EDAC
-        tristate "EDAC core system error reporting"
-        depends on X86
+        tristate "EDAC core system error reporting (EXPERIMENTAL)"
+        depends on X86 && EXPERIMENTAL
         help
           EDAC is designed to report errors in the core system.
           These are low-level errors that are reported in the CPU or
           supporting chipset: memory errors, cache errors, PCI errors,
           thermal throttling, etc..  If unsure, select 'Y'.
 
+          If this code is reporting problems on your system, please
+          see the EDAC project web pages for more information at:
+
+          <http://bluesmoke.sourceforge.net/>
+
+          and:
+
+          <http://buttersideup.com/edacwiki>
+
+          There is also a mailing list for the EDAC project, which can
+          be found via the sourceforge page.
+
 
 comment "Reporting subsystems"
         depends on EDAC
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index b10ee4698b1d..262e44544dc8 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -132,11 +132,13 @@ static struct kobject edac_pci_kobj;
  * /sys/devices/system/edac/mc;
  *      data structures and methods
  */
+#if 0
 static ssize_t memctrl_string_show(void *ptr, char *buffer)
 {
         char *value = (char*) ptr;
         return sprintf(buffer, "%s\n", value);
 }
+#endif
 
 static ssize_t memctrl_int_show(void *ptr, char *buffer)
 {
@@ -207,7 +209,9 @@ struct memctrl_dev_attribute attr_##_name = {			\
 };
 
 /* cwrow<id> attribute f*/
+#if 0
 MEMCTRL_STRING_ATTR(mc_version,EDAC_MC_VERSION,S_IRUGO,memctrl_string_show,NULL);
+#endif
 
 /* csrow<id> control files */
 MEMCTRL_ATTR(panic_on_ue,S_IRUGO|S_IWUSR,memctrl_int_show,memctrl_int_store);
@@ -222,7 +226,6 @@ static struct memctrl_dev_attribute *memctrl_attr[] = {
         &attr_log_ue,
         &attr_log_ce,
         &attr_poll_msec,
-        &attr_mc_version,
         NULL,
 };
 
@@ -309,6 +312,8 @@ struct list_control {
         int *count;
 };
 
+
+#if 0
 /* Output the list as:  vendor_id:device:id<,vendor_id:device_id> */
 static ssize_t edac_pci_list_string_show(void *ptr, char *buffer)
 {
@@ -430,6 +435,7 @@ static ssize_t edac_pci_list_string_store(void *ptr, const char *buffer,
         return count;
 }
 
+#endif
 static ssize_t edac_pci_int_show(void *ptr, char *buffer)
 {
         int *value = ptr;
@@ -498,6 +504,7 @@ struct edac_pci_dev_attribute edac_pci_attr_##_name = {		\
         .store  = _store,                                       \
 };
 
+#if 0
 static struct list_control pci_whitelist_control = {
         .list = pci_whitelist,
         .count = &pci_whitelist_count
@@ -520,6 +527,7 @@ EDAC_PCI_STRING_ATTR(pci_parity_blacklist,
         S_IRUGO|S_IWUSR,
         edac_pci_list_string_show,
         edac_pci_list_string_store);
+#endif
 
 /* PCI Parity control files */
 EDAC_PCI_ATTR(check_pci_parity,S_IRUGO|S_IWUSR,edac_pci_int_show,edac_pci_int_store);
@@ -531,8 +539,6 @@ static struct edac_pci_dev_attribute *edac_pci_attr[] = {
         &edac_pci_attr_check_pci_parity,
         &edac_pci_attr_panic_on_pci_parity,
         &edac_pci_attr_pci_parity_count,
-        &edac_pci_attr_pci_parity_whitelist,
-        &edac_pci_attr_pci_parity_blacklist,
         NULL,
 };
 
diff --git a/drivers/fc4/fc.c b/drivers/fc4/fc.c
index 5c8943509cc1..66d03f242d3c 100644
--- a/drivers/fc4/fc.c
+++ b/drivers/fc4/fc.c
@@ -1053,7 +1053,7 @@ static int fc_do_els(fc_channel *fc, unsigned int alpa, void *data, int len)
         int i;
 
         fcmd = &_fcmd;
-        memset(fcmd, 0, sizeof(fcmd));
+        memset(fcmd, 0, sizeof(fcp_cmnd));
         FCD(("PLOGI SID %d DID %d\n", fc->sid, alpa))
         fch = &fcmd->fch;
         FILL_FCHDR_RCTL_DID(fch, R_CTL_ELS_REQ, alpa);
diff --git a/drivers/firmware/dcdbas.c b/drivers/firmware/dcdbas.c
index 8ed6ddbb9c5d..4652512f7d1a 100644
--- a/drivers/firmware/dcdbas.c
+++ b/drivers/firmware/dcdbas.c
@@ -39,7 +39,7 @@
 #include "dcdbas.h"
 
 #define DRIVER_NAME             "dcdbas"
-#define DRIVER_VERSION          "5.6.0-1"
+#define DRIVER_VERSION          "5.6.0-2"
 #define DRIVER_DESCRIPTION      "Dell Systems Management Base Driver"
 
 static struct platform_device *dcdbas_pdev;
@@ -581,9 +581,13 @@ static int __init dcdbas_init(void)
  */
 static void __exit dcdbas_exit(void)
 {
-        platform_device_unregister(dcdbas_pdev);
+        /*
+         * make sure functions that use dcdbas_pdev are called
+         * before platform_device_unregister
+         */
         unregister_reboot_notifier(&dcdbas_reboot_nb);
         smi_data_buf_free();
+        platform_device_unregister(dcdbas_pdev);
 }
 
 module_init(dcdbas_init);
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 9834dce4e20f..0606bd2f6020 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -34,6 +34,7 @@
 #include <linux/kernel.h>
 #include <linux/timer.h>
 #include <linux/mm.h>
+#include <linux/sched.h>
 #include <linux/interrupt.h>
 #include <linux/major.h>
 #include <linux/errno.h>
@@ -314,6 +315,8 @@ static void ide_pio_datablock(ide_drive_t *drive, struct request *rq,
         if (rq->bio)    /* fs request */
                 rq->errors = 0;
 
+        touch_softlockup_watchdog();
+
         switch (drive->hwif->data_phase) {
         case TASKFILE_MULTI_IN:
         case TASKFILE_MULTI_OUT:
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c
index 4c2af9020905..6213bd3caee5 100644
--- a/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/legacy/ide-cs.c
@@ -445,6 +445,7 @@ static struct pcmcia_device_id ide_ids[] = {
         PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728),
         PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1),
         PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003),
+        PCMCIA_DEVICE_PROD_ID1("TRANSCEND    512M   ", 0xd0909443),
         PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),
         PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
         PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index 2b286e865163..43b96e298363 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -13,11 +13,6 @@
  * License along with this program; if not, write the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
  *
- * Contact information:  Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
  * For further information regarding this notice, see:
  *
  * http://oss.sgi.com/projects/GenInfo/NoticeExplan
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index 18d7eda38851..eca92eb475a1 100644
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -137,15 +137,15 @@ MODULE_PARM_DESC(exclusive_login, "Exclusive login to sbp2 device (default = 1)"
 /*
  * SCSI inquiry hack for really badly behaved sbp2 devices. Turn this on
  * if your sbp2 device is not properly handling the SCSI inquiry command.
- * This hack makes the inquiry look more like a typical MS Windows
- * inquiry.
+ * This hack makes the inquiry look more like a typical MS Windows inquiry
+ * by enforcing 36 byte inquiry and avoiding access to mode_sense page 8.
  *
  * If force_inquiry_hack=1 is required for your device to work,
  * please submit the logged sbp2_firmware_revision value of this device to
  * the linux1394-devel mailing list.
  */
 static int force_inquiry_hack;
-module_param(force_inquiry_hack, int, 0444);
+module_param(force_inquiry_hack, int, 0644);
 MODULE_PARM_DESC(force_inquiry_hack, "Force SCSI inquiry hack (default = 0)");
 
 /*
@@ -264,18 +264,17 @@ static struct hpsb_protocol_driver sbp2_driver = {
         },
 };
 
-
-/* List of device firmware's that require a forced 36 byte inquiry.  */
+/*
+ * List of device firmwares that require the inquiry hack.
+ * Yields a few false positives but did not break other devices so far.
+ */
 static u32 sbp2_broken_inquiry_list[] = {
-        0x00002800,     /* Stefan Richter <richtest@bauwesen.tu-cottbus.de> */
+        0x00002800,     /* Stefan Richter <stefanr@s5r6.in-berlin.de> */
                         /* DViCO Momobay CX-1 */
         0x00000200      /* Andreas Plesch <plesch@fas.harvard.edu> */
                         /* QPS Fire DVDBurner */
 };
 
-#define NUM_BROKEN_INQUIRY_DEVS \
-        (sizeof(sbp2_broken_inquiry_list)/sizeof(*sbp2_broken_inquiry_list))
-
 /**************************************
  * General utility functions
  **************************************/
@@ -643,9 +642,15 @@ static int sbp2_remove(struct device *dev)
         if (!scsi_id)
                 return 0;
 
-        /* Trigger shutdown functions in scsi's highlevel. */
-        if (scsi_id->scsi_host)
+        if (scsi_id->scsi_host) {
+                /* Get rid of enqueued commands if there is no chance to
+                 * send them. */
+                if (!sbp2util_node_is_available(scsi_id))
+                        sbp2scsi_complete_all_commands(scsi_id, DID_NO_CONNECT);
+                /* scsi_remove_device() will trigger shutdown functions of SCSI
+                 * highlevel drivers which would deadlock if blocked. */
                 scsi_unblock_requests(scsi_id->scsi_host);
+        }
         sdev = scsi_id->sdev;
         if (sdev) {
                 scsi_id->sdev = NULL;
@@ -742,11 +747,6 @@ static struct scsi_id_instance_data *sbp2_alloc_device(struct unit_directory *ud
                 hi->host = ud->ne->host;
                 INIT_LIST_HEAD(&hi->scsi_ids);
 
-                /* Register our sbp2 status address space... */
-                hpsb_register_addrspace(&sbp2_highlevel, ud->ne->host, &sbp2_ops,
-                                        SBP2_STATUS_FIFO_ADDRESS,
-                                        SBP2_STATUS_FIFO_ADDRESS +
-                                        SBP2_STATUS_FIFO_ENTRY_TO_OFFSET(SBP2_MAX_UDS_PER_NODE+1));
 #ifdef CONFIG_IEEE1394_SBP2_PHYS_DMA
                 /* Handle data movement if physical dma is not
                  * enabled/supportedon host controller */
@@ -759,6 +759,18 @@ static struct scsi_id_instance_data *sbp2_alloc_device(struct unit_directory *ud
 
         list_add_tail(&scsi_id->scsi_list, &hi->scsi_ids);
 
+        /* Register the status FIFO address range. We could use the same FIFO
+         * for targets at different nodes. However we need different FIFOs per
+         * target in order to support multi-unit devices. */
+        scsi_id->status_fifo_addr = hpsb_allocate_and_register_addrspace(
+                        &sbp2_highlevel, ud->ne->host, &sbp2_ops,
+                        sizeof(struct sbp2_status_block), sizeof(quadlet_t),
+                        ~0ULL, ~0ULL);
+        if (!scsi_id->status_fifo_addr) {
+                SBP2_ERR("failed to allocate status FIFO address range");
+                goto failed_alloc;
+        }
+
         /* Register our host with the SCSI stack. */
         scsi_host = scsi_host_alloc(&scsi_driver_template,
                                     sizeof(unsigned long));
@@ -997,6 +1009,10 @@ static void sbp2_remove_device(struct scsi_id_instance_data *scsi_id)
                 SBP2_DMA_FREE("single query logins data");
         }
 
+        if (scsi_id->status_fifo_addr)
+                hpsb_unregister_addrspace(&sbp2_highlevel, hi->host,
+                        scsi_id->status_fifo_addr);
+
         scsi_id->ud->device.driver_data = NULL;
 
         SBP2_DEBUG("SBP-2 device removed, SCSI ID = %d", scsi_id->ud->id);
@@ -1075,11 +1091,10 @@ static int sbp2_query_logins(struct scsi_id_instance_data *scsi_id)
                 ORB_SET_QUERY_LOGINS_RESP_LENGTH(sizeof(struct sbp2_query_logins_response));
         SBP2_DEBUG("sbp2_query_logins: reserved_resp_length initialized");
 
-        scsi_id->query_logins_orb->status_FIFO_lo = SBP2_STATUS_FIFO_ADDRESS_LO +
-                                                    SBP2_STATUS_FIFO_ENTRY_TO_OFFSET(scsi_id->ud->id);
-        scsi_id->query_logins_orb->status_FIFO_hi = (ORB_SET_NODE_ID(hi->host->node_id) |
-                                                     SBP2_STATUS_FIFO_ADDRESS_HI);
-        SBP2_DEBUG("sbp2_query_logins: status FIFO initialized");
+        scsi_id->query_logins_orb->status_fifo_hi =
+                ORB_SET_STATUS_FIFO_HI(scsi_id->status_fifo_addr, hi->host->node_id);
+        scsi_id->query_logins_orb->status_fifo_lo =
+                ORB_SET_STATUS_FIFO_LO(scsi_id->status_fifo_addr);
 
         sbp2util_cpu_to_be32_buffer(scsi_id->query_logins_orb, sizeof(struct sbp2_query_logins_orb));
 
@@ -1184,11 +1199,10 @@ static int sbp2_login_device(struct scsi_id_instance_data *scsi_id)
                 ORB_SET_LOGIN_RESP_LENGTH(sizeof(struct sbp2_login_response));
         SBP2_DEBUG("sbp2_login_device: passwd_resp_lengths initialized");
 
-        scsi_id->login_orb->status_FIFO_lo = SBP2_STATUS_FIFO_ADDRESS_LO +
-                                             SBP2_STATUS_FIFO_ENTRY_TO_OFFSET(scsi_id->ud->id);
-        scsi_id->login_orb->status_FIFO_hi = (ORB_SET_NODE_ID(hi->host->node_id) |
-                                              SBP2_STATUS_FIFO_ADDRESS_HI);
-        SBP2_DEBUG("sbp2_login_device: status FIFO initialized");
+        scsi_id->login_orb->status_fifo_hi =
+                ORB_SET_STATUS_FIFO_HI(scsi_id->status_fifo_addr, hi->host->node_id);
+        scsi_id->login_orb->status_fifo_lo =
+                ORB_SET_STATUS_FIFO_LO(scsi_id->status_fifo_addr);
 
         /*
          * Byte swap ORB if necessary
@@ -1301,10 +1315,10 @@ static int sbp2_logout_device(struct scsi_id_instance_data *scsi_id)
         scsi_id->logout_orb->login_ID_misc |= ORB_SET_NOTIFY(1);
 
         scsi_id->logout_orb->reserved5 = 0x0;
-        scsi_id->logout_orb->status_FIFO_lo = SBP2_STATUS_FIFO_ADDRESS_LO +
-                                              SBP2_STATUS_FIFO_ENTRY_TO_OFFSET(scsi_id->ud->id);
-        scsi_id->logout_orb->status_FIFO_hi = (ORB_SET_NODE_ID(hi->host->node_id) |
-                                               SBP2_STATUS_FIFO_ADDRESS_HI);
+        scsi_id->logout_orb->status_fifo_hi =
+                ORB_SET_STATUS_FIFO_HI(scsi_id->status_fifo_addr, hi->host->node_id);
+        scsi_id->logout_orb->status_fifo_lo =
+                ORB_SET_STATUS_FIFO_LO(scsi_id->status_fifo_addr);
 
         /*
          * Byte swap ORB if necessary
@@ -1366,10 +1380,10 @@ static int sbp2_reconnect_device(struct scsi_id_instance_data *scsi_id)
         scsi_id->reconnect_orb->login_ID_misc |= ORB_SET_NOTIFY(1);
 
         scsi_id->reconnect_orb->reserved5 = 0x0;
-        scsi_id->reconnect_orb->status_FIFO_lo = SBP2_STATUS_FIFO_ADDRESS_LO +
-                                                 SBP2_STATUS_FIFO_ENTRY_TO_OFFSET(scsi_id->ud->id);
-        scsi_id->reconnect_orb->status_FIFO_hi =
-                (ORB_SET_NODE_ID(hi->host->node_id) | SBP2_STATUS_FIFO_ADDRESS_HI);
+        scsi_id->reconnect_orb->status_fifo_hi =
+                ORB_SET_STATUS_FIFO_HI(scsi_id->status_fifo_addr, hi->host->node_id);
+        scsi_id->reconnect_orb->status_fifo_lo =
+                ORB_SET_STATUS_FIFO_LO(scsi_id->status_fifo_addr);
 
         /*
          * Byte swap ORB if necessary
@@ -1560,7 +1574,7 @@ static void sbp2_parse_unit_directory(struct scsi_id_instance_data *scsi_id,
         /* Check for a blacklisted set of devices that require us to force
          * a 36 byte host inquiry. This can be overriden as a module param
          * (to force all hosts).  */
-        for (i = 0; i < NUM_BROKEN_INQUIRY_DEVS; i++) {
+        for (i = 0; i < ARRAY_SIZE(sbp2_broken_inquiry_list); i++) {
                 if ((firmware_revision & 0xffff00) ==
                                 sbp2_broken_inquiry_list[i]) {
                         SBP2_WARN("Node " NODE_BUS_FMT ": Using 36byte inquiry workaround",
@@ -2007,18 +2021,6 @@ static int sbp2_send_command(struct scsi_id_instance_data *scsi_id,
         }
 
         /*
-         * The scsi stack sends down a request_bufflen which does not match the
-         * length field in the scsi cdb. This causes some sbp2 devices to
-         * reject this inquiry command. Fix the request_bufflen.
-         */
-        if (*cmd == INQUIRY) {
-                if (force_inquiry_hack || scsi_id->workarounds & SBP2_BREAKAGE_INQUIRY_HACK)
-                        request_bufflen = cmd[4] = 0x24;
-                else
-                        request_bufflen = cmd[4];
-        }
-
-        /*
          * Now actually fill in the comamnd orb and sbp2 s/g list
          */
         sbp2_create_command_orb(scsi_id, command, cmd, SCpnt->use_sg,
@@ -2082,9 +2084,7 @@ static void sbp2_check_sbp2_response(struct scsi_id_instance_data *scsi_id,
 
         SBP2_DEBUG("sbp2_check_sbp2_response");
 
-        switch (SCpnt->cmnd[0]) {
-
-        case INQUIRY:
+        if (SCpnt->cmnd[0] == INQUIRY && (SCpnt->cmnd[1] & 3) == 0) {
                 /*
                  * Make sure data length is ok. Minimum length is 36 bytes
                  */
@@ -2097,13 +2097,7 @@ static void sbp2_check_sbp2_response(struct scsi_id_instance_data *scsi_id,
                  */
                 scsi_buf[2] |= 2;
                 scsi_buf[3] = (scsi_buf[3] & 0xf0) | 2;
-
-                break;
-
-        default:
-                break;
         }
-        return;
 }
 
 /*
@@ -2114,7 +2108,6 @@ static int sbp2_handle_status_write(struct hpsb_host *host, int nodeid, int dest
 {
         struct sbp2scsi_host_info *hi;
         struct scsi_id_instance_data *scsi_id = NULL, *scsi_id_tmp;
-        u32 id;
         struct scsi_cmnd *SCpnt = NULL;
         u32 scsi_status = SBP2_SCSI_STATUS_GOOD;
         struct sbp2_command_info *command;
@@ -2137,12 +2130,12 @@ static int sbp2_handle_status_write(struct hpsb_host *host, int nodeid, int dest
         }
 
         /*
-         * Find our scsi_id structure by looking at the status fifo address written to by
-         * the sbp2 device.
+         * Find our scsi_id structure by looking at the status fifo address
+         * written to by the sbp2 device.
          */
-        id = SBP2_STATUS_FIFO_OFFSET_TO_ENTRY((u32)(addr - SBP2_STATUS_FIFO_ADDRESS));
         list_for_each_entry(scsi_id_tmp, &hi->scsi_ids, scsi_list) {
-                if (scsi_id_tmp->ne->nodeid == nodeid && scsi_id_tmp->ud->id == id) {
+                if (scsi_id_tmp->ne->nodeid == nodeid &&
+                    scsi_id_tmp->status_fifo_addr == addr) {
                         scsi_id = scsi_id_tmp;
                         break;
                 }
@@ -2483,7 +2476,16 @@ static void sbp2scsi_complete_command(struct scsi_id_instance_data *scsi_id,
 
 static int sbp2scsi_slave_alloc(struct scsi_device *sdev)
 {
-        ((struct scsi_id_instance_data *)sdev->host->hostdata[0])->sdev = sdev;
+        struct scsi_id_instance_data *scsi_id =
+                (struct scsi_id_instance_data *)sdev->host->hostdata[0];
+
+        scsi_id->sdev = sdev;
+
+        if (force_inquiry_hack ||
+            scsi_id->workarounds & SBP2_BREAKAGE_INQUIRY_HACK) {
+                sdev->inquiry_len = 36;
+                sdev->skip_ms_page_8 = 1;
+        }
         return 0;
 }
 
diff --git a/drivers/ieee1394/sbp2.h b/drivers/ieee1394/sbp2.h
index 900ea1d25e71..e2d357a9ea3a 100644
--- a/drivers/ieee1394/sbp2.h
+++ b/drivers/ieee1394/sbp2.h
@@ -33,15 +33,17 @@
 #define ORB_DIRECTION_NO_DATA_TRANSFER  0x2
 
 #define ORB_SET_NULL_PTR(value)                 ((value & 0x1) << 31)
-#define ORB_SET_NOTIFY(value)                   ((value & 0x1) << 31)
-#define ORB_SET_RQ_FMT(value)                   ((value & 0x3) << 29)   /* unused ? */
+#define ORB_SET_NOTIFY(value)                   ((value & 0x1) << 31)
+#define ORB_SET_RQ_FMT(value)                   ((value & 0x3) << 29)   /* unused ? */
 #define ORB_SET_NODE_ID(value)                  ((value & 0xffff) << 16)
-#define ORB_SET_DATA_SIZE(value)                (value & 0xffff)
-#define ORB_SET_PAGE_SIZE(value)                ((value & 0x7) << 16)
-#define ORB_SET_PAGE_TABLE_PRESENT(value)       ((value & 0x1) << 19)
-#define ORB_SET_MAX_PAYLOAD(value)              ((value & 0xf) << 20)
-#define ORB_SET_SPEED(value)                    ((value & 0x7) << 24)
-#define ORB_SET_DIRECTION(value)                ((value & 0x1) << 27)
+#define ORB_SET_STATUS_FIFO_HI(value, id)       (value >> 32 | ORB_SET_NODE_ID(id))
+#define ORB_SET_STATUS_FIFO_LO(value)           (value & 0xffffffff)
+#define ORB_SET_DATA_SIZE(value)                (value & 0xffff)
+#define ORB_SET_PAGE_SIZE(value)                ((value & 0x7) << 16)
+#define ORB_SET_PAGE_TABLE_PRESENT(value)       ((value & 0x1) << 19)
+#define ORB_SET_MAX_PAYLOAD(value)              ((value & 0xf) << 20)
+#define ORB_SET_SPEED(value)                    ((value & 0x7) << 24)
+#define ORB_SET_DIRECTION(value)                ((value & 0x1) << 27)
 
 struct sbp2_command_orb {
         volatile u32 next_ORB_hi;
@@ -76,8 +78,8 @@ struct sbp2_login_orb {
         u32 login_response_lo;
         u32 lun_misc;
         u32 passwd_resp_lengths;
-        u32 status_FIFO_hi;
-        u32 status_FIFO_lo;
+        u32 status_fifo_hi;
+        u32 status_fifo_lo;
 };
 
 #define RESPONSE_GET_LOGIN_ID(value)            (value & 0xffff)
@@ -102,8 +104,8 @@ struct sbp2_query_logins_orb {
         u32 query_response_lo;
         u32 lun_misc;
         u32 reserved_resp_length;
-        u32 status_FIFO_hi;
-        u32 status_FIFO_lo;
+        u32 status_fifo_hi;
+        u32 status_fifo_lo;
 };
 
 #define RESPONSE_GET_MAX_LOGINS(value)          (value & 0xffff)
@@ -123,8 +125,8 @@ struct sbp2_reconnect_orb {
         u32 reserved4;
         u32 login_ID_misc;
         u32 reserved5;
-        u32 status_FIFO_hi;
-        u32 status_FIFO_lo;
+        u32 status_fifo_hi;
+        u32 status_fifo_lo;
 };
 
 struct sbp2_logout_orb {
@@ -134,8 +136,8 @@ struct sbp2_logout_orb {
         u32 reserved4;
         u32 login_ID_misc;
         u32 reserved5;
-        u32 status_FIFO_hi;
-        u32 status_FIFO_lo;
+        u32 status_fifo_hi;
+        u32 status_fifo_lo;
 };
 
 #define PAGE_TABLE_SET_SEGMENT_BASE_HI(value)   (value & 0xffff)
@@ -195,30 +197,6 @@ struct sbp2_status_block {
  * Miscellaneous SBP2 related config rom defines
  */
 
-/* The status fifo address definition below is used as a base for each
- * node, which a chunk seperately assigned to each unit directory in the
- * node.  For example, 0xfffe00000000ULL is used for the first sbp2 device
- * detected on node 0, 0xfffe00000020ULL for the next sbp2 device on node
- * 0, and so on.
- *
- * Note: We could use a single status fifo address for all sbp2 devices,
- * and figure out which sbp2 device the status belongs to by looking at
- * the source node id of the status write... but, using separate addresses
- * for each sbp2 unit directory allows for better code and the ability to
- * support multiple luns within a single 1394 node.
- *
- * Also note that we choose the address range below as it is a region
- * specified for write posting, where the ohci controller will
- * automatically send an ack_complete when the status is written by the
- * sbp2 device... saving a split transaction.   =)
- */
-#define SBP2_STATUS_FIFO_ADDRESS                                0xfffe00000000ULL
-#define SBP2_STATUS_FIFO_ADDRESS_HI                             0xfffe
-#define SBP2_STATUS_FIFO_ADDRESS_LO                             0x0
-
-#define SBP2_STATUS_FIFO_ENTRY_TO_OFFSET(entry)                 ((entry) << 5)
-#define SBP2_STATUS_FIFO_OFFSET_TO_ENTRY(offset)                ((offset) >> 5)
-
 #define SBP2_UNIT_DIRECTORY_OFFSET_KEY                          0xd1
 #define SBP2_CSR_OFFSET_KEY                                     0x54
 #define SBP2_UNIT_SPEC_ID_KEY                                   0x12
@@ -258,7 +236,6 @@ struct sbp2_status_block {
  */
 
 #define SBP2_MAX_SG_ELEMENT_LENGTH      0xf000
-#define SBP2_MAX_UDS_PER_NODE           16      /* Maximum scsi devices per node */
 #define SBP2_MAX_SECTORS                255     /* Max sectors supported */
 #define SBP2_MAX_CMDS                   8       /* This should be safe */
 
@@ -338,6 +315,11 @@ struct scsi_id_instance_data {
         u32 sbp2_firmware_revision;
 
         /*
+         * Address for the device to write status blocks to
+         */
+        u64 status_fifo_addr;
+
+        /*
          * Variable used for logins, reconnects, logouts, query logins
          */
         atomic_t sbp2_login_complete;
diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c
index 39fb88309e8e..216dbbf1dc8e 100644
--- a/drivers/ieee1394/video1394.c
+++ b/drivers/ieee1394/video1394.c
@@ -744,7 +744,7 @@ static int __video1394_ioctl(struct file *file,
                         if (i == ISO_CHANNELS) {
                             PRINT(KERN_ERR, ohci->host->id, 
                                   "No free channel found");
-                            return EAGAIN;
+                            return -EAGAIN;
                         }
                         if (!(ohci->ISO_channel_usage & mask)) {
                             v.channel = i;
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 2d2d4ac3525a..960dae5c87d1 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -1155,6 +1155,12 @@ static int srp_send_tsk_mgmt(struct scsi_cmnd *scmnd, u8 func)
 
         spin_lock_irq(target->scsi_host->host_lock);
 
+        if (target->state == SRP_TARGET_DEAD ||
+            target->state == SRP_TARGET_REMOVED) {
+                scmnd->result = DID_BAD_TARGET << 16;
+                goto out;
+        }
+
         if (scmnd->host_scribble == (void *) -1L)
                 goto out;
 
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index b1cdd708628d..32d70ed8f41d 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -60,7 +60,7 @@ static unsigned int psmouse_resetafter = 5;
 module_param_named(resetafter, psmouse_resetafter, uint, 0644);
 MODULE_PARM_DESC(resetafter, "Reset device after so many bad packets (0 = never).");
 
-static unsigned int psmouse_resync_time = 5;
+static unsigned int psmouse_resync_time;
 module_param_named(resync_time, psmouse_resync_time, uint, 0644);
 MODULE_PARM_DESC(resync_time, "How long can mouse stay idle before forcing resync (in seconds, 0 = never).");
 
diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c
index 8159bcecd0c2..df9d65201819 100644
--- a/drivers/isdn/hisax/config.c
+++ b/drivers/isdn/hisax/config.c
@@ -1929,6 +1929,8 @@ static struct pci_device_id hisax_pci_tbl[] __initdata = {
         {PCI_VENDOR_ID_CCD,      PCI_DEVICE_ID_CCD_B00B,         PCI_ANY_ID, PCI_ANY_ID},
         {PCI_VENDOR_ID_CCD,      PCI_DEVICE_ID_CCD_B00C,         PCI_ANY_ID, PCI_ANY_ID},
         {PCI_VENDOR_ID_CCD,      PCI_DEVICE_ID_CCD_B100,         PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VENDOR_ID_CCD,      PCI_DEVICE_ID_CCD_B700,         PCI_ANY_ID, PCI_ANY_ID},
+        {PCI_VENDOR_ID_CCD,      PCI_DEVICE_ID_CCD_B701,         PCI_ANY_ID, PCI_ANY_ID},
         {PCI_VENDOR_ID_ABOCOM,   PCI_DEVICE_ID_ABOCOM_2BD1,      PCI_ANY_ID, PCI_ANY_ID},
         {PCI_VENDOR_ID_ASUSTEK,  PCI_DEVICE_ID_ASUSTEK_0675,     PCI_ANY_ID, PCI_ANY_ID},
         {PCI_VENDOR_ID_BERKOM,   PCI_DEVICE_ID_BERKOM_T_CONCEPT, PCI_ANY_ID, PCI_ANY_ID},
diff --git a/drivers/isdn/hisax/hfc_pci.c b/drivers/isdn/hisax/hfc_pci.c
index 4866fc32d8d9..91d25acb5ede 100644
--- a/drivers/isdn/hisax/hfc_pci.c
+++ b/drivers/isdn/hisax/hfc_pci.c
@@ -51,6 +51,8 @@ static const PCI_ENTRY id_list[] =
         {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B00B, "Billion", "B00B"},
         {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B00C, "Billion", "B00C"},
         {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B100, "Seyeon", "B100"},
+        {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B700, "Primux II S0", "B700"},
+        {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B701, "Primux II S0 NT", "B701"},
         {PCI_VENDOR_ID_ABOCOM, PCI_DEVICE_ID_ABOCOM_2BD1, "Abocom/Magitek", "2BD1"},
         {PCI_VENDOR_ID_ASUSTEK, PCI_DEVICE_ID_ASUSTEK_0675, "Asuscom/Askey", "675"},
         {PCI_VENDOR_ID_BERKOM, PCI_DEVICE_ID_BERKOM_T_CONCEPT, "German telekom", "T-Concept"},
diff --git a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c
index ca5b4a3b683e..262c44127419 100644
--- a/drivers/isdn/hisax/hfc_usb.c
+++ b/drivers/isdn/hisax/hfc_usb.c
@@ -1,7 +1,7 @@
 /*
  * hfc_usb.c
  *
- * $Id: hfc_usb.c,v 4.36 2005/04/08 09:55:13 martinb1 Exp $
+ * $Id: hfc_usb.c,v 2.3.2.13 2006/02/17 17:17:22 mbachem Exp $
  *
  * modular HiSax ISDN driver for Colognechip HFC-S USB chip
  *
@@ -45,7 +45,7 @@
 #include "hfc_usb.h"
 
 static const char *hfcusb_revision =
-    "$Revision: 4.36 $ $Date: 2005/04/08 09:55:13 $ ";
+    "$Revision: 2.3.2.13 $ $Date: 2006/02/17 17:17:22 $ ";
 
 /* Hisax debug support
 * use "modprobe debug=x" where x is bitfield of USB_DBG & ISDN_DBG
@@ -219,7 +219,7 @@ symbolic(struct hfcusb_symbolic_list list[], const int num)
         for (i = 0; list[i].name != NULL; i++)
                 if (list[i].num == num)
                         return (list[i].name);
-        return "<unkown ERROR>";
+        return "<unknown ERROR>";
 }
 
 
@@ -235,9 +235,9 @@ ctrl_start_transfer(hfcusb_data * hfc)
                 hfc->ctrl_urb->transfer_buffer = NULL;
                 hfc->ctrl_urb->transfer_buffer_length = 0;
                 hfc->ctrl_write.wIndex =
-                    hfc->ctrl_buff[hfc->ctrl_out_idx].hfc_reg;
+                    cpu_to_le16(hfc->ctrl_buff[hfc->ctrl_out_idx].hfc_reg);
                 hfc->ctrl_write.wValue =
-                    hfc->ctrl_buff[hfc->ctrl_out_idx].reg_val;
+                    cpu_to_le16(hfc->ctrl_buff[hfc->ctrl_out_idx].reg_val);
 
                 usb_submit_urb(hfc->ctrl_urb, GFP_ATOMIC);      /* start transfer */
         }
@@ -1282,7 +1282,7 @@ usb_init(hfcusb_data * hfc)
         /* init the background machinery for control requests */
         hfc->ctrl_read.bRequestType = 0xc0;
         hfc->ctrl_read.bRequest = 1;
-        hfc->ctrl_read.wLength = 1;
+        hfc->ctrl_read.wLength = cpu_to_le16(1);
         hfc->ctrl_write.bRequestType = 0x40;
         hfc->ctrl_write.bRequest = 0;
         hfc->ctrl_write.wLength = 0;
@@ -1373,9 +1373,8 @@ hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
 
         vend_idx = 0xffff;
         for (i = 0; hfcusb_idtab[i].idVendor; i++) {
-                if (dev->descriptor.idVendor == hfcusb_idtab[i].idVendor
-                    && dev->descriptor.idProduct ==
-                    hfcusb_idtab[i].idProduct) {
+                if ((le16_to_cpu(dev->descriptor.idVendor) == hfcusb_idtab[i].idVendor)
+                    && (le16_to_cpu(dev->descriptor.idProduct) == hfcusb_idtab[i].idProduct)) {
                         vend_idx = i;
                         continue;
                 }
@@ -1516,8 +1515,7 @@ hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
                                                             usb_transfer_mode
                                                             = USB_INT;
                                                         packet_size =
-                                                            ep->desc.
-                                                            wMaxPacketSize;
+                                                            le16_to_cpu(ep->desc.wMaxPacketSize);
                                                         break;
                                                 case USB_ENDPOINT_XFER_BULK:
                                                         if (ep_addr & 0x80)
@@ -1545,8 +1543,7 @@ hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
                                                             usb_transfer_mode
                                                             = USB_BULK;
                                                         packet_size =
-                                                            ep->desc.
-                                                            wMaxPacketSize;
+                                                            le16_to_cpu(ep->desc.wMaxPacketSize);
                                                         break;
                                                 case USB_ENDPOINT_XFER_ISOC:
                                                         if (ep_addr & 0x80)
@@ -1574,8 +1571,7 @@ hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
                                                             usb_transfer_mode
                                                             = USB_ISOC;
                                                         iso_packet_size =
-                                                            ep->desc.
-                                                            wMaxPacketSize;
+                                                            le16_to_cpu(ep->desc.wMaxPacketSize);
                                                         break;
                                                 default:
                                                         context->
@@ -1588,10 +1584,8 @@ hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
                                                     fifonum = cidx;
                                                 context->fifos[cidx].hfc =
                                                     context;
-                                                context->fifos[cidx].
-                                                    usb_packet_maxlen =
-                                                    ep->desc.
-                                                    wMaxPacketSize;
+                                                context->fifos[cidx].usb_packet_maxlen =
+                                                    le16_to_cpu(ep->desc.wMaxPacketSize);
                                                 context->fifos[cidx].
                                                     intervall =
                                                     ep->desc.bInterval;
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index 393633681f49..aeaa1db74bd8 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -1682,6 +1682,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
 #ifdef ISDN_DEBUG_MODEM_OPEN
                 printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n");
 #endif
+                module_put(info->owner);
                 return;
         }
         info->flags |= ISDN_ASYNC_CLOSING;
diff --git a/drivers/macintosh/windfarm_core.c b/drivers/macintosh/windfarm_core.c
index bb8d5efe19bf..6c0ba04bc57a 100644
--- a/drivers/macintosh/windfarm_core.c
+++ b/drivers/macintosh/windfarm_core.c
@@ -35,6 +35,8 @@
 #include <linux/platform_device.h>
 #include <linux/mutex.h>
 
+#include <asm/prom.h>
+
 #include "windfarm.h"
 
 #define VERSION "0.2"
@@ -465,6 +467,11 @@ static int __init windfarm_core_init(void)
 {
         DBG("wf: core loaded\n");
 
+        /* Don't register on old machines that use therm_pm72 for now */
+        if (machine_is_compatible("PowerMac7,2") ||
+            machine_is_compatible("PowerMac7,3") ||
+            machine_is_compatible("RackMac3,1"))
+                return -ENODEV;
         platform_device_register(&wf_platform_device);
         return 0;
 }
diff --git a/drivers/macintosh/windfarm_cpufreq_clamp.c b/drivers/macintosh/windfarm_cpufreq_clamp.c
index 607dbaca69c9..81337cd16e80 100644
--- a/drivers/macintosh/windfarm_cpufreq_clamp.c
+++ b/drivers/macintosh/windfarm_cpufreq_clamp.c
@@ -8,6 +8,8 @@
 #include <linux/wait.h>
 #include <linux/cpufreq.h>
 
+#include <asm/prom.h>
+
 #include "windfarm.h"
 
 #define VERSION "0.3"
@@ -74,6 +76,12 @@ static int __init wf_cpufreq_clamp_init(void)
 {
         struct wf_control *clamp;
 
+        /* Don't register on old machines that use therm_pm72 for now */
+        if (machine_is_compatible("PowerMac7,2") ||
+            machine_is_compatible("PowerMac7,3") ||
+            machine_is_compatible("RackMac3,1"))
+                return -ENODEV;
+
         clamp = kmalloc(sizeof(struct wf_control), GFP_KERNEL);
         if (clamp == NULL)
                 return -ENOMEM;
diff --git a/drivers/macintosh/windfarm_lm75_sensor.c b/drivers/macintosh/windfarm_lm75_sensor.c
index 906d3ecae6e6..423bfa2432c0 100644
--- a/drivers/macintosh/windfarm_lm75_sensor.c
+++ b/drivers/macintosh/windfarm_lm75_sensor.c
@@ -25,7 +25,7 @@
 
 #include "windfarm.h"
 
-#define VERSION "0.1"
+#define VERSION "0.2"
 
 #undef DEBUG
 
@@ -113,6 +113,7 @@ static struct wf_lm75_sensor *wf_lm75_create(struct i2c_adapter *adapter,
                                              const char *loc)
 {
         struct wf_lm75_sensor *lm;
+        int rc;
 
         DBG("wf_lm75: creating  %s device at address 0x%02x\n",
             ds1775 ? "ds1775" : "lm75", addr);
@@ -139,9 +140,11 @@ static struct wf_lm75_sensor *wf_lm75_create(struct i2c_adapter *adapter,
         lm->i2c.driver = &wf_lm75_driver;
         strncpy(lm->i2c.name, lm->sens.name, I2C_NAME_SIZE-1);
 
-        if (i2c_attach_client(&lm->i2c)) {
-                printk(KERN_ERR "windfarm: failed to attach %s %s to i2c\n",
-                       ds1775 ? "ds1775" : "lm75", lm->i2c.name);
+        rc = i2c_attach_client(&lm->i2c);
+        if (rc) {
+                printk(KERN_ERR "windfarm: failed to attach %s %s to i2c,"
+                       " err %d\n", ds1775 ? "ds1775" : "lm75",
+                       lm->i2c.name, rc);
                 goto fail;
         }
 
@@ -175,16 +178,22 @@ static int wf_lm75_attach(struct i2c_adapter *adapter)
              (dev = of_get_next_child(busnode, dev)) != NULL;) {
                 const char *loc =
                         get_property(dev, "hwsensor-location", NULL);
-                u32 *reg = (u32 *)get_property(dev, "reg", NULL);
-                DBG(" dev: %s... (loc: %p, reg: %p)\n", dev->name, loc, reg);
-                if (loc == NULL || reg == NULL)
+                u8 addr;
+
+                /* We must re-match the adapter in order to properly check
+                 * the channel on multibus setups
+                 */
+                if (!pmac_i2c_match_adapter(dev, adapter))
+                        continue;
+                addr = pmac_i2c_get_dev_addr(dev);
+                if (loc == NULL || addr == 0)
                         continue;
                 /* real lm75 */
                 if (device_is_compatible(dev, "lm75"))
-                        wf_lm75_create(adapter, *reg, 0, loc);
+                        wf_lm75_create(adapter, addr, 0, loc);
                 /* ds1775 (compatible, better resolution */
                 else if (device_is_compatible(dev, "ds1775"))
-                        wf_lm75_create(adapter, *reg, 1, loc);
+                        wf_lm75_create(adapter, addr, 1, loc);
         }
         return 0;
 }
@@ -206,6 +215,11 @@ static int wf_lm75_detach(struct i2c_client *client)
 
 static int __init wf_lm75_sensor_init(void)
 {
+        /* Don't register on old machines that use therm_pm72 for now */
+        if (machine_is_compatible("PowerMac7,2") ||
+            machine_is_compatible("PowerMac7,3") ||
+            machine_is_compatible("RackMac3,1"))
+                return -ENODEV;
         return i2c_add_driver(&wf_lm75_driver);
 }
 
diff --git a/drivers/macintosh/windfarm_max6690_sensor.c b/drivers/macintosh/windfarm_max6690_sensor.c
index 5b9ad6ca7cba..8e99d408fddd 100644
--- a/drivers/macintosh/windfarm_max6690_sensor.c
+++ b/drivers/macintosh/windfarm_max6690_sensor.c
@@ -17,7 +17,7 @@
 
 #include "windfarm.h"
 
-#define VERSION "0.1"
+#define VERSION "0.2"
 
 /* This currently only exports the external temperature sensor,
    since that's all the control loops need. */
@@ -81,7 +81,7 @@ static struct wf_sensor_ops wf_max6690_ops = {
 static void wf_max6690_create(struct i2c_adapter *adapter, u8 addr)
 {
         struct wf_6690_sensor *max;
-        char *name = "u4-temp";
+        char *name = "backside-temp";
 
         max = kzalloc(sizeof(struct wf_6690_sensor), GFP_KERNEL);
         if (max == NULL) {
@@ -118,7 +118,6 @@ static int wf_max6690_attach(struct i2c_adapter *adapter)
         struct device_node *busnode, *dev = NULL;
         struct pmac_i2c_bus *bus;
         const char *loc;
-        u32 *reg;
 
         bus = pmac_i2c_adapter_to_bus(adapter);
         if (bus == NULL)
@@ -126,16 +125,23 @@ static int wf_max6690_attach(struct i2c_adapter *adapter)
         busnode = pmac_i2c_get_bus_node(bus);
 
         while ((dev = of_get_next_child(busnode, dev)) != NULL) {
+                u8 addr;
+
+                /* We must re-match the adapter in order to properly check
+                 * the channel on multibus setups
+                 */
+                if (!pmac_i2c_match_adapter(dev, adapter))
+                        continue;
                 if (!device_is_compatible(dev, "max6690"))
                         continue;
+                addr = pmac_i2c_get_dev_addr(dev);
                 loc = get_property(dev, "hwsensor-location", NULL);
-                reg = (u32 *) get_property(dev, "reg", NULL);
-                if (!loc || !reg)
+                if (loc == NULL || addr == 0)
                         continue;
-                printk("found max6690, loc=%s reg=%x\n", loc, *reg);
+                printk("found max6690, loc=%s addr=0x%02x\n", loc, addr);
                 if (strcmp(loc, "BACKSIDE"))
                         continue;
-                wf_max6690_create(adapter, *reg);
+                wf_max6690_create(adapter, addr);
         }
 
         return 0;
@@ -153,6 +159,11 @@ static int wf_max6690_detach(struct i2c_client *client)
 
 static int __init wf_max6690_sensor_init(void)
 {
+        /* Don't register on old machines that use therm_pm72 for now */
+        if (machine_is_compatible("PowerMac7,2") ||
+            machine_is_compatible("PowerMac7,3") ||
+            machine_is_compatible("RackMac3,1"))
+                return -ENODEV;
         return i2c_add_driver(&wf_max6690_driver);
 }
 
diff --git a/drivers/macintosh/windfarm_pid.c b/drivers/macintosh/windfarm_pid.c
index 0842432e27ad..f10efb28cae4 100644
--- a/drivers/macintosh/windfarm_pid.c
+++ b/drivers/macintosh/windfarm_pid.c
@@ -143,3 +143,7 @@ s32 wf_cpu_pid_run(struct wf_cpu_pid_state *st, s32 new_power, s32 new_temp)
         return st->target;
 }
 EXPORT_SYMBOL_GPL(wf_cpu_pid_run);
+
+MODULE_AUTHOR("Benjamin Herrenschmidt <benh@kernel.crashing.org>");
+MODULE_DESCRIPTION("PID algorithm for PowerMacs thermal control");
+MODULE_LICENSE("GPL");
diff --git a/drivers/macintosh/windfarm_pm112.c b/drivers/macintosh/windfarm_pm112.c
index c2a4e689c784..ef66bf2778ec 100644
--- a/drivers/macintosh/windfarm_pm112.c
+++ b/drivers/macintosh/windfarm_pm112.c
@@ -358,6 +358,7 @@ static void backside_fan_tick(void)
                 return;
         if (!backside_tick) {
                 /* first time; initialize things */
+                printk(KERN_INFO "windfarm: Backside control loop started.\n");
                 backside_param.min = backside_fan->ops->get_min(backside_fan);
                 backside_param.max = backside_fan->ops->get_max(backside_fan);
                 wf_pid_init(&backside_pid, &backside_param);
@@ -407,6 +408,7 @@ static void drive_bay_fan_tick(void)
                 return;
         if (!drive_bay_tick) {
                 /* first time; initialize things */
+                printk(KERN_INFO "windfarm: Drive bay control loop started.\n");
                 drive_bay_prm.min = drive_bay_fan->ops->get_min(drive_bay_fan);
                 drive_bay_prm.max = drive_bay_fan->ops->get_max(drive_bay_fan);
                 wf_pid_init(&drive_bay_pid, &drive_bay_prm);
@@ -458,6 +460,7 @@ static void slots_fan_tick(void)
                 return;
         if (!slots_started) {
                 /* first time; initialize things */
+                printk(KERN_INFO "windfarm: Slots control loop started.\n");
                 wf_pid_init(&slots_pid, &slots_param);
                 slots_started = 1;
         }
@@ -504,6 +507,7 @@ static void pm112_tick(void)
 
         if (!started) {
                 started = 1;
+                printk(KERN_INFO "windfarm: CPUs control loops started.\n");
                 for (i = 0; i < nr_cores; ++i) {
                         if (create_cpu_loop(i) < 0) {
                                 failure_state = FAILURE_PERM;
@@ -594,8 +598,6 @@ static void pm112_new_sensor(struct wf_sensor *sr)
 {
         unsigned int i;
 
-        if (have_all_sensors)
-                return;
         if (!strncmp(sr->name, "cpu-temp-", 9)) {
                 i = sr->name[9] - '0';
                 if (sr->name[10] == 0 && i < NR_CORES &&
@@ -613,7 +615,7 @@ static void pm112_new_sensor(struct wf_sensor *sr)
         } else if (!strcmp(sr->name, "slots-power")) {
                 if (slots_power == NULL && wf_get_sensor(sr) == 0)
                         slots_power = sr;
-        } else if (!strcmp(sr->name, "u4-temp")) {
+        } else if (!strcmp(sr->name, "backside-temp")) {
                 if (u4_temp == NULL && wf_get_sensor(sr) == 0)
                         u4_temp = sr;
         } else
diff --git a/drivers/macintosh/windfarm_smu_sat.c b/drivers/macintosh/windfarm_smu_sat.c
index 3a32c59494f2..24e51d5e97fc 100644
--- a/drivers/macintosh/windfarm_smu_sat.c
+++ b/drivers/macintosh/windfarm_smu_sat.c
@@ -151,6 +151,7 @@ struct smu_sdbp_header *smu_sat_get_sdb_partition(unsigned int sat_id, int id,
         kfree(buf);
         return NULL;
 }
+EXPORT_SYMBOL_GPL(smu_sat_get_sdb_partition);
 
 /* refresh the cache */
 static int wf_sat_read_cache(struct wf_sat *sat)
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index e9adeb9d172f..745ca1f67b14 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -849,10 +849,16 @@ static struct mapped_device *alloc_dev(unsigned int minor, int persistent)
 
 static void free_dev(struct mapped_device *md)
 {
-        free_minor(md->disk->first_minor);
+        unsigned int minor = md->disk->first_minor;
+
+        if (md->suspended_bdev) {
+                thaw_bdev(md->suspended_bdev, NULL);
+                bdput(md->suspended_bdev);
+        }
         mempool_destroy(md->tio_pool);
         mempool_destroy(md->io_pool);
         del_gendisk(md->disk);
+        free_minor(minor);
         put_disk(md->disk);
         blk_put_queue(md->queue);
         kfree(md);
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index d39f584cd8b3..5d88329e3c7a 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -306,6 +306,7 @@ static int raid1_end_write_request(struct bio *bio, unsigned int bytes_done, int
         r1bio_t * r1_bio = (r1bio_t *)(bio->bi_private);
         int mirror, behind = test_bit(R1BIO_BehindIO, &r1_bio->state);
         conf_t *conf = mddev_to_conf(r1_bio->mddev);
+        struct bio *to_put = NULL;
 
         if (bio->bi_size)
                 return 1;
@@ -323,6 +324,7 @@ static int raid1_end_write_request(struct bio *bio, unsigned int bytes_done, int
                  * this branch is our 'one mirror IO has finished' event handler:
                  */
                 r1_bio->bios[mirror] = NULL;
+                to_put = bio;
                 if (!uptodate) {
                         md_error(r1_bio->mddev, conf->mirrors[mirror].rdev);
                         /* an I/O failed, we can't clear the bitmap */
@@ -375,7 +377,7 @@ static int raid1_end_write_request(struct bio *bio, unsigned int bytes_done, int
                         /* Don't dec_pending yet, we want to hold
                          * the reference over the retry
                          */
-                        return 0;
+                        goto out;
                 }
                 if (test_bit(R1BIO_BehindIO, &r1_bio->state)) {
                         /* free extra copy of the data pages */
@@ -392,10 +394,11 @@ static int raid1_end_write_request(struct bio *bio, unsigned int bytes_done, int
                 raid_end_bio_io(r1_bio);
         }
 
-        if (r1_bio->bios[mirror]==NULL)
-                bio_put(bio);
-
         rdev_dec_pending(conf->mirrors[mirror].rdev, conf->mddev);
+ out:
+        if (to_put)
+                bio_put(to_put);
+
         return 0;
 }
 
@@ -857,7 +860,7 @@ static int make_request(request_queue_t *q, struct bio * bio)
         atomic_set(&r1_bio->remaining, 0);
         atomic_set(&r1_bio->behind_remaining, 0);
 
-        do_barriers = bio->bi_rw & BIO_RW_BARRIER;
+        do_barriers = bio_barrier(bio);
         if (do_barriers)
                 set_bit(R1BIO_Barrier, &r1_bio->state);
 
diff --git a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
index 390cc3a99ce6..9c7f122826e0 100644
--- a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
+++ b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
@@ -526,7 +526,7 @@ int flexcop_frontend_init(struct flexcop_device *fc)
                 info("found the stv0297 at i2c address: 0x%02x",alps_tdee4_stv0297_config.demod_address);
         } else
         /* try the sky v2.3 (vp310/Samsung tbdu18132(tsa5059)) */
-        if ((fc->fe = vp310_attach(&skystar23_samsung_tbdu18132_config, &fc->i2c_adap)) != NULL) {
+        if ((fc->fe = vp310_mt312_attach(&skystar23_samsung_tbdu18132_config, &fc->i2c_adap)) != NULL) {
                 ops = fc->fe->ops;
 
                 ops->diseqc_send_master_cmd = flexcop_diseqc_send_master_cmd;
diff --git a/drivers/media/dvb/bt8xx/bt878.c b/drivers/media/dvb/bt8xx/bt878.c
index 34c3189a1a33..356f447ee2ab 100644
--- a/drivers/media/dvb/bt8xx/bt878.c
+++ b/drivers/media/dvb/bt8xx/bt878.c
@@ -382,7 +382,7 @@ bt878_device_control(struct bt878 *bt, unsigned int cmd, union dst_gpio_packet *
 EXPORT_SYMBOL(bt878_device_control);
 
 
-struct cards card_list[] __devinitdata = {
+static struct cards card_list[] __devinitdata = {
 
         { 0x01010071, BTTV_BOARD_NEBULA_DIGITV,                 "Nebula Electronics DigiTV" },
         { 0x07611461, BTTV_BOARD_AVDVBT_761,                    "AverMedia AverTV DVB-T 761" },
diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
index 3a2ff1cc24b7..0310e3dd07e6 100644
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
@@ -602,7 +602,7 @@ static int dst_type_print(u8 type)
 
 */
 
-struct dst_types dst_tlist[] = {
+static struct dst_types dst_tlist[] = {
         {
                 .device_id = "200103A",
                 .offset = 0,
diff --git a/drivers/media/dvb/dvb-core/demux.h b/drivers/media/dvb/dvb-core/demux.h
index 9f025825b2d2..0c1d87c5227a 100644
--- a/drivers/media/dvb/dvb-core/demux.h
+++ b/drivers/media/dvb/dvb-core/demux.h
@@ -216,7 +216,7 @@ struct dmx_frontend {
 /*--------------------------------------------------------------------------*/
 
 /*
- * Flags OR'ed in the capabilites field of struct dmx_demux.
+ * Flags OR'ed in the capabilities field of struct dmx_demux.
  */
 
 #define DMX_TS_FILTERING                        1
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index f327fac1688e..162f9795cd89 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -282,7 +282,7 @@ static struct cx22702_config cxusb_cx22702_config = {
         .pll_set  = dvb_usb_pll_set_i2c,
 };
 
-static struct lgdt330x_config cxusb_lgdt330x_config = {
+static struct lgdt330x_config cxusb_lgdt3303_config = {
         .demod_address = 0x0e,
         .demod_chip    = LGDT3303,
         .pll_set       = dvb_usb_pll_set_i2c,
@@ -357,14 +357,14 @@ static int cxusb_cx22702_frontend_attach(struct dvb_usb_device *d)
         return -EIO;
 }
 
-static int cxusb_lgdt330x_frontend_attach(struct dvb_usb_device *d)
+static int cxusb_lgdt3303_frontend_attach(struct dvb_usb_device *d)
 {
         if (usb_set_interface(d->udev,0,7) < 0)
                 err("set interface failed");
 
         cxusb_ctrl_msg(d,CMD_DIGITAL, NULL, 0, NULL, 0);
 
-        if ((d->fe = lgdt330x_attach(&cxusb_lgdt330x_config, &d->i2c_adap)) != NULL)
+        if ((d->fe = lgdt330x_attach(&cxusb_lgdt3303_config, &d->i2c_adap)) != NULL)
                 return 0;
 
         return -EIO;
@@ -506,7 +506,7 @@ static struct dvb_usb_properties cxusb_bluebird_lgh064f_properties = {
 
         .streaming_ctrl   = cxusb_streaming_ctrl,
         .power_ctrl       = cxusb_power_ctrl,
-        .frontend_attach  = cxusb_lgdt330x_frontend_attach,
+        .frontend_attach  = cxusb_lgdt3303_frontend_attach,
         .tuner_attach     = cxusb_lgh064f_tuner_attach,
 
         .i2c_algo         = &cxusb_i2c_algo,
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-init.c b/drivers/media/dvb/dvb-usb/dvb-usb-init.c
index 716f8bf528cd..ce34a55e5c24 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-init.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-init.c
@@ -47,7 +47,7 @@ static int dvb_usb_init(struct dvb_usb_device *d)
 
         d->state = DVB_USB_STATE_INIT;
 
-/* check the capabilites and set appropriate variables */
+/* check the capabilities and set appropriate variables */
 
 /* speed - when running at FULL speed we need a HW PID filter */
         if (d->udev->speed == USB_SPEED_FULL && !(d->props.caps & DVB_USB_HAS_PID_FILTER)) {
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb.h b/drivers/media/dvb/dvb-usb/dvb-usb.h
index 5e5d21ad93c9..d4909e5c67e0 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb.h
@@ -87,7 +87,7 @@ struct dvb_usb_device;
 
 /**
  * struct dvb_usb_properties - properties of a dvb-usb-device
- * @caps: capabilites of the DVB USB device.
+ * @caps: capabilities of the DVB USB device.
  * @pid_filter_count: number of PID filter position in the optional hardware
  *  PID-filter.
  *
diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index 76b6a2aef32f..c676b1e23ab0 100644
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -29,7 +29,7 @@ config DVB_TDA8083
           A DVB-S tuner module. Say Y when you want to support this frontend.
 
 config DVB_MT312
-        tristate "Zarlink MT312 based"
+        tristate "Zarlink VP310/MT312 based"
         depends on DVB_CORE
         help
           A DVB-S tuner module. Say Y when you want to support this frontend.
diff --git a/drivers/media/dvb/frontends/mt312.c b/drivers/media/dvb/frontends/mt312.c
index ec4e641acc64..d3aea83cf218 100644
--- a/drivers/media/dvb/frontends/mt312.c
+++ b/drivers/media/dvb/frontends/mt312.c
@@ -612,76 +612,6 @@ static void mt312_release(struct dvb_frontend* fe)
         kfree(state);
 }
 
-static struct dvb_frontend_ops vp310_mt312_ops;
-
-struct dvb_frontend* vp310_attach(const struct mt312_config* config,
-                                  struct i2c_adapter* i2c)
-{
-        struct mt312_state* state = NULL;
-
-        /* allocate memory for the internal state */
-        state = kmalloc(sizeof(struct mt312_state), GFP_KERNEL);
-        if (state == NULL)
-                goto error;
-
-        /* setup the state */
-        state->config = config;
-        state->i2c = i2c;
-        memcpy(&state->ops, &vp310_mt312_ops, sizeof(struct dvb_frontend_ops));
-        strcpy(state->ops.info.name, "Zarlink VP310 DVB-S");
-
-        /* check if the demod is there */
-        if (mt312_readreg(state, ID, &state->id) < 0)
-                goto error;
-        if (state->id != ID_VP310) {
-                goto error;
-        }
-
-        /* create dvb_frontend */
-        state->frequency = 90;
-        state->frontend.ops = &state->ops;
-        state->frontend.demodulator_priv = state;
-        return &state->frontend;
-
-error:
-        kfree(state);
-        return NULL;
-}
-
-struct dvb_frontend* mt312_attach(const struct mt312_config* config,
-                                  struct i2c_adapter* i2c)
-{
-        struct mt312_state* state = NULL;
-
-        /* allocate memory for the internal state */
-        state = kmalloc(sizeof(struct mt312_state), GFP_KERNEL);
-        if (state == NULL)
-                goto error;
-
-        /* setup the state */
-        state->config = config;
-        state->i2c = i2c;
-        memcpy(&state->ops, &vp310_mt312_ops, sizeof(struct dvb_frontend_ops));
-        strcpy(state->ops.info.name, "Zarlink MT312 DVB-S");
-
-        /* check if the demod is there */
-        if (mt312_readreg(state, ID, &state->id) < 0)
-                goto error;
-        if (state->id != ID_MT312) {
-                goto error;
-        }
-
-        /* create dvb_frontend */
-        state->frequency = 60;
-        state->frontend.ops = &state->ops;
-        state->frontend.demodulator_priv = state;
-        return &state->frontend;
-
-error:
-        kfree(state);
-        return NULL;
-}
-
 static struct dvb_frontend_ops vp310_mt312_ops = {
 
         .info = {
@@ -720,6 +650,49 @@ 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 i2c_adapter* i2c)
+{
+        struct mt312_state* state = NULL;
+
+        /* allocate memory for the internal state */
+        state = kmalloc(sizeof(struct mt312_state), GFP_KERNEL);
+        if (state == NULL)
+                goto error;
+
+        /* setup the state */
+        state->config = config;
+        state->i2c = i2c;
+        memcpy(&state->ops, &vp310_mt312_ops, sizeof(struct dvb_frontend_ops));
+
+        /* check if the demod is there */
+        if (mt312_readreg(state, ID, &state->id) < 0)
+                goto error;
+
+        switch (state->id) {
+        case ID_VP310:
+                strcpy(state->ops.info.name, "Zarlink VP310 DVB-S");
+                state->frequency = 90;
+                break;
+        case ID_MT312:
+                strcpy(state->ops.info.name, "Zarlink MT312 DVB-S");
+                state->frequency = 60;
+                break;
+        default:
+                printk (KERN_WARNING "Only Zarlink VP310/MT312 are supported chips.\n");
+                goto error;
+        }
+
+        /* create dvb_frontend */
+        state->frontend.ops = &state->ops;
+        state->frontend.demodulator_priv = state;
+        return &state->frontend;
+
+error:
+        kfree(state);
+        return NULL;
+}
+
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
 
@@ -727,5 +700,4 @@ MODULE_DESCRIPTION("Zarlink VP310/MT312 DVB-S Demodulator driver");
 MODULE_AUTHOR("Andreas Oberritter <obi@linuxtv.org>");
 MODULE_LICENSE("GPL");
 
-EXPORT_SYMBOL(mt312_attach);
-EXPORT_SYMBOL(vp310_attach);
+EXPORT_SYMBOL(vp310_mt312_attach);
diff --git a/drivers/media/dvb/frontends/mt312.h b/drivers/media/dvb/frontends/mt312.h
index b3a53a73a117..074d844f0139 100644
--- a/drivers/media/dvb/frontends/mt312.h
+++ b/drivers/media/dvb/frontends/mt312.h
@@ -38,10 +38,8 @@ struct mt312_config
         int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);
 };
 
-extern struct dvb_frontend* mt312_attach(const struct mt312_config* config,
-                                         struct i2c_adapter* i2c);
+struct dvb_frontend* vp310_mt312_attach(const struct mt312_config* config,
+                                        struct i2c_adapter* i2c);
 
-extern struct dvb_frontend* vp310_attach(const struct mt312_config* config,
-                                         struct i2c_adapter* i2c);
 
 #endif // MT312_H
diff --git a/drivers/media/dvb/frontends/stv0297.c b/drivers/media/dvb/frontends/stv0297.c
index 6122ba754bc5..eb15676d374f 100644
--- a/drivers/media/dvb/frontends/stv0297.c
+++ b/drivers/media/dvb/frontends/stv0297.c
@@ -393,10 +393,6 @@ static int stv0297_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par
                 break;
 
         case QAM_128:
-                delay = 150;
-                sweeprate = 1000;
-                break;
-
         case QAM_256:
                 delay = 200;
                 sweeprate = 500;
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index d36369e9e88f..7c6ccb96b157 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -1439,7 +1439,7 @@ static int check_firmware(struct av7110* av7110)
         len = ntohl(*(u32*) ptr);
         ptr += 4;
         if (len >= 512) {
-                printk("dvb-ttpci: dpram file is way to big.\n");
+                printk("dvb-ttpci: dpram file is way too big.\n");
                 return -EINVAL;
         }
         if (crc != crc32_le(0, ptr, len)) {
@@ -2477,7 +2477,8 @@ static int frontend_init(struct av7110 *av7110)
  * The same behaviour of missing VSYNC can be duplicated on budget
  * cards, by seting DD1_INIT trigger mode 7 in 3rd nibble.
  */
-static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_data *pci_ext)
+static int __devinit av7110_attach(struct saa7146_dev* dev,
+                                   struct saa7146_pci_extension_data *pci_ext)
 {
         const int length = TS_WIDTH * TS_HEIGHT;
         struct pci_dev *pdev = dev->pci;
@@ -2827,7 +2828,7 @@ err_kfree_0:
         goto out;
 }
 
-static int av7110_detach(struct saa7146_dev* saa)
+static int __devexit av7110_detach(struct saa7146_dev* saa)
 {
         struct av7110 *av7110 = saa->ext_priv;
         dprintk(4, "%p\n", av7110);
@@ -2974,7 +2975,7 @@ static struct saa7146_extension av7110_extension = {
         .module         = THIS_MODULE,
         .pci_tbl        = &pci_tbl[0],
         .attach         = av7110_attach,
-        .detach         = av7110_detach,
+        .detach         = __devexit_p(av7110_detach),
 
         .irq_mask       = MASK_19 | MASK_03 | MASK_10,
         .irq_func       = av7110_irq,
diff --git a/drivers/media/dvb/ttpci/av7110_hw.c b/drivers/media/dvb/ttpci/av7110_hw.c
index b2e63e9fc053..0bb6e74ae7f0 100644
--- a/drivers/media/dvb/ttpci/av7110_hw.c
+++ b/drivers/media/dvb/ttpci/av7110_hw.c
@@ -245,6 +245,9 @@ int av7110_bootarm(struct av7110 *av7110)
 
         /* test DEBI */
         iwdebi(av7110, DEBISWAP, DPRAM_BASE, 0x76543210, 4);
+        /* FIXME: Why does Nexus CA require 2x iwdebi for first init? */
+        iwdebi(av7110, DEBISWAP, DPRAM_BASE, 0x76543210, 4);
+
         if ((ret=irdebi(av7110, DEBINOSWAP, DPRAM_BASE, 0, 4)) != 0x10325476) {
                 printk(KERN_ERR "dvb-ttpci: debi test in av7110_bootarm() failed: "
                        "%08x != %08x (check your BIOS 'Plug&Play OS' settings)\n",
diff --git a/drivers/media/dvb/ttpci/av7110_ir.c b/drivers/media/dvb/ttpci/av7110_ir.c
index 617e4f6c0ed7..d54bbcdde2cc 100644
--- a/drivers/media/dvb/ttpci/av7110_ir.c
+++ b/drivers/media/dvb/ttpci/av7110_ir.c
@@ -208,7 +208,7 @@ static void ir_handler(struct av7110 *av7110, u32 ircom)
 }
 
 
-int __init av7110_ir_init(struct av7110 *av7110)
+int __devinit av7110_ir_init(struct av7110 *av7110)
 {
         static struct proc_dir_entry *e;
 
@@ -248,7 +248,7 @@ int __init av7110_ir_init(struct av7110 *av7110)
 }
 
 
-void __exit av7110_ir_exit(struct av7110 *av7110)
+void __devexit av7110_ir_exit(struct av7110 *av7110)
 {
         int i;
 
diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c
index 9f59541155d9..85d964b5b33c 100644
--- a/drivers/media/video/cpia.c
+++ b/drivers/media/video/cpia.c
@@ -3369,7 +3369,7 @@ static int cpia_do_ioctl(struct inode *inode, struct file *file,
         //DBG("cpia_ioctl: %u\n", ioctlnr);
 
         switch (ioctlnr) {
-        /* query capabilites */
+        /* query capabilities */
         case VIDIOCGCAP:
         {
                 struct video_capability *b = arg;
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index 08ffd1f325fc..5588b9a5c430 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -567,7 +567,7 @@ static struct v4l2_queryctrl cx25840_qctrl[] = {
                 .type          = V4L2_CTRL_TYPE_INTEGER,
                 .name          = "Contrast",
                 .minimum       = 0,
-                .maximum       = 255,
+                .maximum       = 127,
                 .step          = 1,
                 .default_value = 64,
                 .flags         = 0,
@@ -576,7 +576,7 @@ static struct v4l2_queryctrl cx25840_qctrl[] = {
                 .type          = V4L2_CTRL_TYPE_INTEGER,
                 .name          = "Saturation",
                 .minimum       = 0,
-                .maximum       = 255,
+                .maximum       = 127,
                 .step          = 1,
                 .default_value = 64,
                 .flags         = 0,
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index 048d000941c7..ffd87ce55556 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -1027,7 +1027,7 @@ static struct v4l2_queryctrl saa7115_qctrl[] = {
                 .type          = V4L2_CTRL_TYPE_INTEGER,
                 .name          = "Contrast",
                 .minimum       = 0,
-                .maximum       = 255,
+                .maximum       = 127,
                 .step          = 1,
                 .default_value = 64,
                 .flags         = 0,
@@ -1036,7 +1036,7 @@ static struct v4l2_queryctrl saa7115_qctrl[] = {
                 .type          = V4L2_CTRL_TYPE_INTEGER,
                 .name          = "Saturation",
                 .minimum       = 0,
-                .maximum       = 255,
+                .maximum       = 127,
                 .step          = 1,
                 .default_value = 64,
                 .flags         = 0,
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index a7a6ab9298a9..7df5e0826e12 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -54,10 +54,12 @@ MODULE_PARM_DESC(debug,"enable debug messages [alsa]");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
-static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};
+static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 1};
 
 module_param_array(index, int, NULL, 0444);
+module_param_array(enable, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for SAA7134 capture interface(s).");
+MODULE_PARM_DESC(enable, "Enable (or not) the SAA7134 capture interface(s).");
 
 #define dprintk(fmt, arg...)    if (debug) \
         printk(KERN_DEBUG "%s/alsa: " fmt, dev->name , ##arg)
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 5a35d3b6550d..6bc63a4086c1 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -977,7 +977,7 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
-                .tda9887_conf   = TDA9887_PRESENT | TDA9887_INTERCARRIER | TDA9887_PORT2_ACTIVE,
+                .tda9887_conf   = TDA9887_PRESENT | TDA9887_INTERCARRIER | TDA9887_PORT2_INACTIVE,
                 .inputs         = {{
                         .name = name_tv,
                         .vmux = 3,
@@ -1666,7 +1666,7 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
-                .tda9887_conf   = TDA9887_PRESENT | TDA9887_INTERCARRIER | TDA9887_PORT2_ACTIVE,
+                .tda9887_conf   = TDA9887_PRESENT | TDA9887_INTERCARRIER | TDA9887_PORT2_INACTIVE,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs         = {{
                         .name = name_tv,
@@ -2187,7 +2187,7 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_type     = UNSET,
                 .tuner_addr     = 0x61,
                 .radio_addr     = ADDR_UNSET,
-                .tda9887_conf   = TDA9887_PRESENT,
+                .tda9887_conf   = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs = {{
                         .name   = name_tv,
@@ -2211,7 +2211,7 @@ struct saa7134_board saa7134_boards[] = {
                 .radio_type     = UNSET,
                 .tuner_addr     = 0x61,
                 .radio_addr     = ADDR_UNSET,
-                .tda9887_conf   = TDA9887_PRESENT,
+                .tda9887_conf   = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE,
                 .mpeg           = SAA7134_MPEG_DVB,
                 .inputs = {{
                         .name   = name_tv,
@@ -2392,7 +2392,7 @@ struct saa7134_board saa7134_boards[] = {
                 }},
         },
         [SAA7134_BOARD_PINNACLE_PCTV_110i] = {
-                .name           = "Pinnacle PCTV 110i (saa7133)",
+               .name           = "Pinnacle PCTV 40i/50i/110i (saa7133)",
                 .audio_clock    = 0x00187de7,
                 .tuner_type     = TUNER_PHILIPS_TDA8290,
                 .radio_type     = UNSET,
@@ -2407,6 +2407,10 @@ struct saa7134_board saa7134_boards[] = {
                 },{
                           .name = name_comp1,
                           .vmux = 1,
+                         .amux = LINE2,
+               },{
+                         .name = name_comp2,
+                         .vmux = 0,
                           .amux = LINE2,
                 },{
                           .name = name_svideo,
@@ -2745,7 +2749,7 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7130,
                 .subvendor    = 0x1048,
-                .subdevice    = 0x226b,
+                .subdevice    = 0x226a,
                 .driver_data  = SAA7134_BOARD_ELSA_500TV,
         },{
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
@@ -3201,6 +3205,11 @@ int saa7134_board_init1(struct saa7134_dev *dev)
                 /* power-up tuner chip */
                 saa_andorl(SAA7134_GPIO_GPMODE0 >> 2,   0x00040000, 0x00040000);
                 saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x00040000, 0x00000000);
+        case SAA7134_BOARD_PINNACLE_300I_DVBT_PAL:
+                /* this turns the remote control chip off to work around a bug in it */
+                saa_writeb(SAA7134_GPIO_GPMODE1, 0x80);
+                saa_writeb(SAA7134_GPIO_GPSTATUS1, 0x80);
+                break;
         case SAA7134_BOARD_MONSTERTV_MOBILE:
                 /* power-up tuner chip */
                 saa_andorl(SAA7134_GPIO_GPMODE0 >> 2,   0x00040000, 0x00040000);
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index 1a536e865277..9db8e13f21c3 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -110,6 +110,7 @@ static int mt352_pinnacle_init(struct dvb_frontend* fe)
         mt352_write(fe, fsm_ctl_cfg,    sizeof(fsm_ctl_cfg));
         mt352_write(fe, scan_ctl_cfg,   sizeof(scan_ctl_cfg));
         mt352_write(fe, irq_cfg,        sizeof(irq_cfg));
+
         return 0;
 }
 
@@ -117,8 +118,10 @@ static int mt352_pinnacle_pll_set(struct dvb_frontend* fe,
                                   struct dvb_frontend_parameters* params,
                                   u8* pllbuf)
 {
-        static int on  = TDA9887_PRESENT | TDA9887_PORT2_INACTIVE;
-        static int off = TDA9887_PRESENT | TDA9887_PORT2_ACTIVE;
+        u8 off[] = { 0x00, 0xf1};
+        u8 on[]  = { 0x00, 0x71};
+        struct i2c_msg msg = {.addr=0x43, .flags=0, .buf=off, .len = sizeof(off)};
+
         struct saa7134_dev *dev = fe->dvb->priv;
         struct v4l2_frequency f;
 
@@ -126,9 +129,10 @@ static int mt352_pinnacle_pll_set(struct dvb_frontend* fe,
         f.tuner     = 0;
         f.type      = V4L2_TUNER_DIGITAL_TV;
         f.frequency = params->frequency / 1000 * 16 / 1000;
-        saa7134_i2c_call_clients(dev,TDA9887_SET_CONFIG,&on);
+        i2c_transfer(&dev->i2c_adap, &msg, 1);
         saa7134_i2c_call_clients(dev,VIDIOC_S_FREQUENCY,&f);
-        saa7134_i2c_call_clients(dev,TDA9887_SET_CONFIG,&off);
+        msg.buf = on;
+        i2c_transfer(&dev->i2c_adap, &msg, 1);
 
         pinnacle_antenna_pwr(dev, antenna_pwr);
 
diff --git a/drivers/media/video/tda8290.c b/drivers/media/video/tda8290.c
index 7b4fb282ac82..a796a4e1917c 100644
--- a/drivers/media/video/tda8290.c
+++ b/drivers/media/video/tda8290.c
@@ -580,9 +580,10 @@ int tda8290_init(struct i2c_client *c)
 
 int tda8290_probe(struct i2c_client *c)
 {
-        unsigned char soft_reset[]  = { 0x00, 0x00 };
-        unsigned char easy_mode_b[] = { 0x01, 0x02 };
-        unsigned char easy_mode_g[] = { 0x01, 0x04 };
+        unsigned char soft_reset[]   = { 0x00, 0x00 };
+        unsigned char easy_mode_b[]  = { 0x01, 0x02 };
+        unsigned char easy_mode_g[]  = { 0x01, 0x04 };
+        unsigned char restore_9886[] = { 0x00, 0xd6, 0x30 };
         unsigned char addr_dto_lsb = 0x07;
         unsigned char data;
 
@@ -599,6 +600,7 @@ int tda8290_probe(struct i2c_client *c)
                         return 0;
                 }
         }
+        i2c_master_send(c, restore_9886, 3);
         return -1;
 }
 
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index e7ee619d62c5..b6101bf446d4 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -713,8 +713,9 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
                         struct v4l2_frequency *f = arg;
 
                         switch_v4l2();
-                        if (V4L2_TUNER_RADIO == f->type &&
-                            V4L2_TUNER_RADIO != t->mode) {
+                        if ((V4L2_TUNER_RADIO == f->type && V4L2_TUNER_RADIO != t->mode)
+                                || (V4L2_TUNER_DIGITAL_TV == f->type
+                                        && V4L2_TUNER_DIGITAL_TV != t->mode)) {
                                 if (set_mode (client, t, f->type, "VIDIOC_S_FREQUENCY")
                                             == EINVAL)
                                         return 0;
diff --git a/drivers/media/video/videocodec.h b/drivers/media/video/videocodec.h
index 156ae57096fe..b1239ac7f371 100644
--- a/drivers/media/video/videocodec.h
+++ b/drivers/media/video/videocodec.h
@@ -56,7 +56,7 @@
    the slave is bound to it). Otherwise it doesn't need this functions and
    therfor they may not be initialized.
 
-   The other fuctions are just for convenience, as they are for shure used by
+   The other fuctions are just for convenience, as they are for sure used by
    most/all of the codecs. The last ones may be ommited, too. 
 
    See the structure declaration below for more information and which data has
diff --git a/drivers/media/video/zr36050.c b/drivers/media/video/zr36050.c
index bd0cd28543ca..6699725be605 100644
--- a/drivers/media/video/zr36050.c
+++ b/drivers/media/video/zr36050.c
@@ -159,7 +159,7 @@ zr36050_wait_end (struct zr36050 *ptr)
 
         while (!(zr36050_read_status1(ptr) & 0x4)) {
                 udelay(1);
-                if (i++ > 200000) {     // 200ms, there is for shure something wrong!!!
+                if (i++ > 200000) {     // 200ms, there is for sure something wrong!!!
                         dprintk(1,
                                 "%s: timout at wait_end (last status: 0x%02x)\n",
                                 ptr->name, ptr->status1);
diff --git a/drivers/media/video/zr36060.c b/drivers/media/video/zr36060.c
index 28fa31a5f150..d8dd003a7aad 100644
--- a/drivers/media/video/zr36060.c
+++ b/drivers/media/video/zr36060.c
@@ -161,7 +161,7 @@ zr36060_wait_end (struct zr36060 *ptr)
 
         while (zr36060_read_status(ptr) & ZR060_CFSR_Busy) {
                 udelay(1);
-                if (i++ > 200000) {     // 200ms, there is for shure something wrong!!!
+                if (i++ > 200000) {     // 200ms, there is for sure something wrong!!!
                         dprintk(1,
                                 "%s: timout at wait_end (last status: 0x%02x)\n",
                                 ptr->name, ptr->status);
diff --git a/drivers/media/video/zr36120_i2c.c b/drivers/media/video/zr36120_i2c.c
index 6bfe84d657f1..21fde43a6aed 100644
--- a/drivers/media/video/zr36120_i2c.c
+++ b/drivers/media/video/zr36120_i2c.c
@@ -65,7 +65,7 @@ void attach_inform(struct i2c_bus *bus, int id)
          case I2C_DRIVERID_VIDEODECODER:
                 DEBUG(printk(CARD_INFO "decoder attached\n",CARD));
 
-                /* fetch the capabilites of the decoder */
+                /* fetch the capabilities of the decoder */
                 rv = i2c_control_device(&ztv->i2c, I2C_DRIVERID_VIDEODECODER, DECODER_GET_CAPABILITIES, &dc);
                 if (rv) {
                         DEBUG(printk(CARD_DEBUG "decoder is not V4L aware!\n",CARD));
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 9a2c7605d49c..642a61b6d0a4 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -452,8 +452,7 @@ mpt_base_reply(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *reply)
         } else if (func == MPI_FUNCTION_EVENT_ACK) {
                 dprintk((MYIOC_s_INFO_FMT "mpt_base_reply, EventAck reply received\n",
                                 ioc->name));
-        } else if (func == MPI_FUNCTION_CONFIG ||
-                   func == MPI_FUNCTION_TOOLBOX) {
+        } else if (func == MPI_FUNCTION_CONFIG) {
                 CONFIGPARMS *pCfg;
                 unsigned long flags;
 
@@ -5327,115 +5326,6 @@ mpt_config(MPT_ADAPTER *ioc, CONFIGPARMS *pCfg)
 }
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
-/**
- *      mpt_toolbox - Generic function to issue toolbox message
- *      @ioc - Pointer to an adapter structure
- *      @cfg - Pointer to a toolbox structure. Struct contains
- *              action, page address, direction, physical address
- *              and pointer to a configuration page header
- *              Page header is updated.
- *
- *      Returns 0 for success
- *      -EPERM if not allowed due to ISR context
- *      -EAGAIN if no msg frames currently available
- *      -EFAULT for non-successful reply or no reply (timeout)
- */
-int
-mpt_toolbox(MPT_ADAPTER *ioc, CONFIGPARMS *pCfg)
-{
-        ToolboxIstwiReadWriteRequest_t  *pReq;
-        MPT_FRAME_HDR   *mf;
-        struct pci_dev  *pdev;
-        unsigned long    flags;
-        int              rc;
-        u32              flagsLength;
-        int              in_isr;
-
-        /*      Prevent calling wait_event() (below), if caller happens
-         *      to be in ISR context, because that is fatal!
-         */
-        in_isr = in_interrupt();
-        if (in_isr) {
-                dcprintk((MYIOC_s_WARN_FMT "toobox request not allowed in ISR context!\n",
-                                ioc->name));
-                return -EPERM;
-        }
-
-        /* Get and Populate a free Frame
-         */
-        if ((mf = mpt_get_msg_frame(mpt_base_index, ioc)) == NULL) {
-                dcprintk((MYIOC_s_WARN_FMT "mpt_toolbox: no msg frames!\n",
-                                ioc->name));
-                return -EAGAIN;
-        }
-        pReq = (ToolboxIstwiReadWriteRequest_t  *)mf;
-        pReq->Tool = pCfg->action;
-        pReq->Reserved = 0;
-        pReq->ChainOffset = 0;
-        pReq->Function = MPI_FUNCTION_TOOLBOX;
-        pReq->Reserved1 = 0;
-        pReq->Reserved2 = 0;
-        pReq->MsgFlags = 0;
-        pReq->Flags = pCfg->dir;
-        pReq->BusNum = 0;
-        pReq->Reserved3 = 0;
-        pReq->NumAddressBytes = 0x01;
-        pReq->Reserved4 = 0;
-        pReq->DataLength = cpu_to_le16(0x04);
-        pdev = ioc->pcidev;
-        if (pdev->devfn & 1)
-                pReq->DeviceAddr = 0xB2;
-        else
-                pReq->DeviceAddr = 0xB0;
-        pReq->Addr1 = 0;
-        pReq->Addr2 = 0;
-        pReq->Addr3 = 0;
-        pReq->Reserved5 = 0;
-
-        /* Add a SGE to the config request.
-         */
-
-        flagsLength = MPT_SGE_FLAGS_SSIMPLE_READ | 4;
-
-        mpt_add_sge((char *)&pReq->SGL, flagsLength, pCfg->physAddr);
-
-        dcprintk((MYIOC_s_INFO_FMT "Sending Toolbox request, Tool=%x\n",
-                ioc->name, pReq->Tool));
-
-        /* Append pCfg pointer to end of mf
-         */
-        *((void **) (((u8 *) mf) + (ioc->req_sz - sizeof(void *)))) =  (void *) pCfg;
-
-        /* Initalize the timer
-         */
-        init_timer(&pCfg->timer);
-        pCfg->timer.data = (unsigned long) ioc;
-        pCfg->timer.function = mpt_timer_expired;
-        pCfg->wait_done = 0;
-
-        /* Set the timer; ensure 10 second minimum */
-        if (pCfg->timeout < 10)
-                pCfg->timer.expires = jiffies + HZ*10;
-        else
-                pCfg->timer.expires = jiffies + HZ*pCfg->timeout;
-
-        /* Add to end of Q, set timer and then issue this command */
-        spin_lock_irqsave(&ioc->FreeQlock, flags);
-        list_add_tail(&pCfg->linkage, &ioc->configQ);
-        spin_unlock_irqrestore(&ioc->FreeQlock, flags);
-
-        add_timer(&pCfg->timer);
-        mpt_put_msg_frame(mpt_base_index, ioc, mf);
-        wait_event(mpt_waitq, pCfg->wait_done);
-
-        /* mf has been freed - do not access */
-
-        rc = pCfg->status;
-
-        return rc;
-}
-
-/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*
  *      mpt_timer_expired - Call back for timer process.
  *      Used only internal config functionality.
@@ -6142,7 +6032,7 @@ ProcessEventNotification(MPT_ADAPTER *ioc, EventNotificationReply_t *pEventReply
         if (ioc->events && (ioc->eventTypes & ( 1 << event))) {
                 int idx;
 
-                idx = ioc->eventContext % ioc->eventLogSize;
+                idx = ioc->eventContext % MPTCTL_EVENT_LOG_SIZE;
 
                 ioc->events[idx].event = event;
                 ioc->events[idx].eventContext = ioc->eventContext;
@@ -6540,7 +6430,6 @@ EXPORT_SYMBOL(mpt_lan_index);
 EXPORT_SYMBOL(mpt_stm_index);
 EXPORT_SYMBOL(mpt_HardResetHandler);
 EXPORT_SYMBOL(mpt_config);
-EXPORT_SYMBOL(mpt_toolbox);
 EXPORT_SYMBOL(mpt_findImVolumes);
 EXPORT_SYMBOL(mpt_read_ioc_pg_3);
 EXPORT_SYMBOL(mpt_alloc_fw_memory);
diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h
index ea2649ecad1f..723d54300953 100644
--- a/drivers/message/fusion/mptbase.h
+++ b/drivers/message/fusion/mptbase.h
@@ -616,6 +616,7 @@ typedef struct _MPT_ADAPTER
          * increments by 32 bytes
          */
         int                      errata_flag_1064;
+        int                      aen_event_read_flag; /* flag to indicate event log was read*/
         u8                       FirstWhoInit;
         u8                       upload_fw;     /* If set, do a fw upload */
         u8                       reload_fw;     /* Force a FW Reload on next reset */
@@ -1026,7 +1027,6 @@ extern u32	 mpt_GetIocState(MPT_ADAPTER *ioc, int cooked);
 extern void      mpt_print_ioc_summary(MPT_ADAPTER *ioc, char *buf, int *size, int len, int showlan);
 extern int       mpt_HardResetHandler(MPT_ADAPTER *ioc, int sleepFlag);
 extern int       mpt_config(MPT_ADAPTER *ioc, CONFIGPARMS *cfg);
-extern int       mpt_toolbox(MPT_ADAPTER *ioc, CONFIGPARMS *cfg);
 extern void      mpt_alloc_fw_memory(MPT_ADAPTER *ioc, int size);
 extern void      mpt_free_fw_memory(MPT_ADAPTER *ioc);
 extern int       mpt_findImVolumes(MPT_ADAPTER *ioc);
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index bdf709987982..9b64e07400da 100644
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -136,6 +136,12 @@ static void mptctl_free_tm_flags(MPT_ADAPTER *ioc);
  */
 static int  mptctl_ioc_reset(MPT_ADAPTER *ioc, int reset_phase);
 
+/*
+ * Event Handler function
+ */
+static int mptctl_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply);
+struct fasync_struct *async_queue=NULL;
+
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*
  * Scatter gather list (SGL) sizes and limits...
@@ -385,18 +391,18 @@ static int mptctl_bus_reset(MPT_IOCTL *ioctl)
         }
 
         /* Now wait for the command to complete */
-        ii = wait_event_interruptible_timeout(mptctl_wait,
+        ii = wait_event_timeout(mptctl_wait,
              ioctl->wait_done == 1,
              HZ*5 /* 5 second timeout */);
 
         if(ii <=0 && (ioctl->wait_done != 1 ))  {
+                mpt_free_msg_frame(hd->ioc, mf);
                 ioctl->wait_done = 0;
                 retval = -1; /* return failure */
         }
 
 mptctl_bus_reset_done:
 
-        mpt_free_msg_frame(hd->ioc, mf);
         mptctl_free_tm_flags(ioctl->ioc);
         return retval;
 }
@@ -472,6 +478,69 @@ mptctl_ioc_reset(MPT_ADAPTER *ioc, int reset_phase)
 }
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
+/* ASYNC Event Notification Support */
+static int
+mptctl_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply)
+{
+        u8 event;
+
+        event = le32_to_cpu(pEvReply->Event) & 0xFF;
+
+        dctlprintk(("%s() called\n", __FUNCTION__));
+        if(async_queue == NULL)
+                return 1;
+
+        /* Raise SIGIO for persistent events.
+         * TODO - this define is not in MPI spec yet,
+         * but they plan to set it to 0x21
+         */
+         if (event == 0x21 ) {
+                ioc->aen_event_read_flag=1;
+                dctlprintk(("Raised SIGIO to application\n"));
+                devtprintk(("Raised SIGIO to application\n"));
+                kill_fasync(&async_queue, SIGIO, POLL_IN);
+                return 1;
+         }
+
+        /* This flag is set after SIGIO was raised, and
+         * remains set until the application has read
+         * the event log via ioctl=MPTEVENTREPORT
+         */
+        if(ioc->aen_event_read_flag)
+                return 1;
+
+        /* Signal only for the events that are
+         * requested for by the application
+         */
+        if (ioc->events && (ioc->eventTypes & ( 1 << event))) {
+                ioc->aen_event_read_flag=1;
+                dctlprintk(("Raised SIGIO to application\n"));
+                devtprintk(("Raised SIGIO to application\n"));
+                kill_fasync(&async_queue, SIGIO, POLL_IN);
+        }
+        return 1;
+}
+
+static int
+mptctl_fasync(int fd, struct file *filep, int mode)
+{
+        MPT_ADAPTER     *ioc;
+
+        list_for_each_entry(ioc, &ioc_list, list)
+                ioc->aen_event_read_flag=0;
+
+        dctlprintk(("%s() called\n", __FUNCTION__));
+        return fasync_helper(fd, filep, mode, &async_queue);
+}
+
+static int
+mptctl_release(struct inode *inode, struct file *filep)
+{
+        dctlprintk(("%s() called\n", __FUNCTION__));
+        return fasync_helper(-1, filep, 0, &async_queue);
+}
+
+/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*
  *  MPT ioctl handler
  *  cmd - specify the particular IOCTL command to be issued
@@ -674,22 +743,23 @@ mptctl_do_fw_download(int ioc, char __user *ufwbuf, size_t fwlen)
         u16                      iocstat;
         pFWDownloadReply_t       ReplyMsg = NULL;
 
-        dctlprintk((KERN_INFO "mptctl_do_fwdl called. mptctl_id = %xh.\n", mptctl_id));
+        dctlprintk(("mptctl_do_fwdl called. mptctl_id = %xh.\n", mptctl_id));
 
-        dctlprintk((KERN_INFO "DbG: kfwdl.bufp  = %p\n", ufwbuf));
-        dctlprintk((KERN_INFO "DbG: kfwdl.fwlen = %d\n", (int)fwlen));
-        dctlprintk((KERN_INFO "DbG: kfwdl.ioc   = %04xh\n", ioc));
+        dctlprintk(("DbG: kfwdl.bufp  = %p\n", ufwbuf));
+        dctlprintk(("DbG: kfwdl.fwlen = %d\n", (int)fwlen));
+        dctlprintk(("DbG: kfwdl.ioc   = %04xh\n", ioc));
 
-        if ((ioc = mpt_verify_adapter(ioc, &iocp)) < 0) {
-                dctlprintk(("%s@%d::_ioctl_fwdl - ioc%d not found!\n",
-                                __FILE__, __LINE__, ioc));
+        if (mpt_verify_adapter(ioc, &iocp) < 0) {
+                dctlprintk(("ioctl_fwdl - ioc%d not found!\n",
+                                 ioc));
                 return -ENODEV; /* (-6) No such device or address */
-        }
+        } else {
 
-        /*  Valid device. Get a message frame and construct the FW download message.
-         */
-        if ((mf = mpt_get_msg_frame(mptctl_id, iocp)) == NULL)
-                return -EAGAIN;
+                /*  Valid device. Get a message frame and construct the FW download message.
+                */
+                if ((mf = mpt_get_msg_frame(mptctl_id, iocp)) == NULL)
+                        return -EAGAIN;
+        }
         dlmsg = (FWDownload_t*) mf;
         ptsge = (FWDownloadTCSGE_t *) &dlmsg->SGL;
         sgOut = (char *) (ptsge + 1);
@@ -702,7 +772,11 @@ mptctl_do_fw_download(int ioc, char __user *ufwbuf, size_t fwlen)
         dlmsg->ChainOffset = 0;
         dlmsg->Function = MPI_FUNCTION_FW_DOWNLOAD;
         dlmsg->Reserved1[0] = dlmsg->Reserved1[1] = dlmsg->Reserved1[2] = 0;
-        dlmsg->MsgFlags = 0;
+        if (iocp->facts.MsgVersion >= MPI_VERSION_01_05)
+                dlmsg->MsgFlags = MPI_FW_DOWNLOAD_MSGFLGS_LAST_SEGMENT;
+        else
+                dlmsg->MsgFlags = 0;
+
 
         /* Set up the Transaction SGE.
          */
@@ -754,7 +828,7 @@ mptctl_do_fw_download(int ioc, char __user *ufwbuf, size_t fwlen)
                 goto fwdl_out;
         }
 
-        dctlprintk((KERN_INFO "DbG: sgl buffer  = %p, sgfrags = %d\n", sgl, numfrags));
+        dctlprintk(("DbG: sgl buffer  = %p, sgfrags = %d\n", sgl, numfrags));
 
         /*
          * Parse SG list, copying sgl itself,
@@ -803,11 +877,11 @@ mptctl_do_fw_download(int ioc, char __user *ufwbuf, size_t fwlen)
         /*
          * Finally, perform firmware download.
          */
-        iocp->ioctl->wait_done = 0;
+        ReplyMsg = NULL;
         mpt_put_msg_frame(mptctl_id, iocp, mf);
 
         /* Now wait for the command to complete */
-        ret = wait_event_interruptible_timeout(mptctl_wait,
+        ret = wait_event_timeout(mptctl_wait,
              iocp->ioctl->wait_done == 1,
              HZ*60);
 
@@ -1145,7 +1219,9 @@ mptctl_getiocinfo (unsigned long arg, unsigned int data_size)
         /* Fill in the data and return the structure to the calling
          * program
          */
-        if (ioc->bus_type == FC)
+        if (ioc->bus_type == SAS)
+                karg->adapterType = MPT_IOCTL_INTERFACE_SAS;
+        else if (ioc->bus_type == FC)
                 karg->adapterType = MPT_IOCTL_INTERFACE_FC;
         else
                 karg->adapterType = MPT_IOCTL_INTERFACE_SCSI;
@@ -1170,12 +1246,11 @@ mptctl_getiocinfo (unsigned long arg, unsigned int data_size)
                 karg->pciInfo.u.bits.deviceNumber = PCI_SLOT( pdev->devfn );
                 karg->pciInfo.u.bits.functionNumber = PCI_FUNC( pdev->devfn );
         } else if (cim_rev == 2) {
-                /* Get the PCI bus, device, function and segment ID numbers 
+                /* Get the PCI bus, device, function and segment ID numbers
                    for the IOC */
                 karg->pciInfo.u.bits.busNumber = pdev->bus->number;
                 karg->pciInfo.u.bits.deviceNumber = PCI_SLOT( pdev->devfn );
                 karg->pciInfo.u.bits.functionNumber = PCI_FUNC( pdev->devfn );
-                karg->pciInfo.u.bits.functionNumber = PCI_FUNC( pdev->devfn );
                 karg->pciInfo.segmentID = pci_domain_nr(pdev->bus);
         }
 
@@ -1500,7 +1575,7 @@ mptctl_eventquery (unsigned long arg)
                 return -ENODEV;
         }
 
-        karg.eventEntries = ioc->eventLogSize;
+        karg.eventEntries = MPTCTL_EVENT_LOG_SIZE;
         karg.eventTypes = ioc->eventTypes;
 
         /* Copy the data from kernel memory to user memory
@@ -1550,7 +1625,6 @@ mptctl_eventenable (unsigned long arg)
                 memset(ioc->events, 0, sz);
                 ioc->alloc_total += sz;
 
-                ioc->eventLogSize = MPTCTL_EVENT_LOG_SIZE;
                 ioc->eventContext = 0;
         }
 
@@ -1590,7 +1664,7 @@ mptctl_eventreport (unsigned long arg)
         maxEvents = numBytes/sizeof(MPT_IOCTL_EVENTS);
 
 
-        max = ioc->eventLogSize < maxEvents ? ioc->eventLogSize : maxEvents;
+        max = MPTCTL_EVENT_LOG_SIZE < maxEvents ? MPTCTL_EVENT_LOG_SIZE : maxEvents;
 
         /* If fewer than 1 event is requested, there must have
          * been some type of error.
@@ -1598,6 +1672,9 @@ mptctl_eventreport (unsigned long arg)
         if ((max < 1) || !ioc->events)
                 return -ENODATA;
 
+        /* reset this flag so SIGIO can restart */
+        ioc->aen_event_read_flag=0;
+
         /* Copy the data from kernel memory to user memory
          */
         numBytes = max * sizeof(MPT_IOCTL_EVENTS);
@@ -1817,6 +1894,8 @@ mptctl_do_mpt_command (struct mpt_ioctl_command karg, void __user *mfPtr)
         case MPI_FUNCTION_SCSI_ENCLOSURE_PROCESSOR:
         case MPI_FUNCTION_FW_DOWNLOAD:
         case MPI_FUNCTION_FC_PRIMITIVE_SEND:
+        case MPI_FUNCTION_TOOLBOX:
+        case MPI_FUNCTION_SAS_IO_UNIT_CONTROL:
                 break;
 
         case MPI_FUNCTION_SCSI_IO_REQUEST:
@@ -1837,7 +1916,9 @@ mptctl_do_mpt_command (struct mpt_ioctl_command karg, void __user *mfPtr)
                                 goto done_free_mem;
                         }
 
-                        pScsiReq->MsgFlags = mpt_msg_flags();
+                        pScsiReq->MsgFlags &= ~MPI_SCSIIO_MSGFLGS_SENSE_WIDTH;
+                        pScsiReq->MsgFlags |= mpt_msg_flags();
+
 
                         /* verify that app has not requested
                          *      more sense data than driver
@@ -1888,6 +1969,25 @@ mptctl_do_mpt_command (struct mpt_ioctl_command karg, void __user *mfPtr)
                 }
                 break;
 
+        case MPI_FUNCTION_SMP_PASSTHROUGH:
+                /* Check mf->PassthruFlags to determine if
+                 * transfer is ImmediateMode or not.
+                 * Immediate mode returns data in the ReplyFrame.
+                 * Else, we are sending request and response data
+                 * in two SGLs at the end of the mf.
+                 */
+                break;
+
+        case MPI_FUNCTION_SATA_PASSTHROUGH:
+                if (!ioc->sh) {
+                        printk(KERN_ERR "%s@%d::mptctl_do_mpt_command - "
+                                "SCSI driver is not loaded. \n",
+                                        __FILE__, __LINE__);
+                        rc = -EFAULT;
+                        goto done_free_mem;
+                }
+                break;
+
         case MPI_FUNCTION_RAID_ACTION:
                 /* Just add a SGE
                  */
@@ -1900,7 +2000,9 @@ mptctl_do_mpt_command (struct mpt_ioctl_command karg, void __user *mfPtr)
                         int scsidir = MPI_SCSIIO_CONTROL_READ;
                         int dataSize;
 
-                        pScsiReq->MsgFlags = mpt_msg_flags();
+                        pScsiReq->MsgFlags &= ~MPI_SCSIIO_MSGFLGS_SENSE_WIDTH;
+                        pScsiReq->MsgFlags |= mpt_msg_flags();
+
 
                         /* verify that app has not requested
                          *      more sense data than driver
@@ -2130,7 +2232,7 @@ mptctl_do_mpt_command (struct mpt_ioctl_command karg, void __user *mfPtr)
 
         /* Now wait for the command to complete */
         timeout = (karg.timeout > 0) ? karg.timeout : MPT_IOCTL_DEFAULT_TIMEOUT;
-        timeout = wait_event_interruptible_timeout(mptctl_wait,
+        timeout = wait_event_timeout(mptctl_wait,
              ioc->ioctl->wait_done == 1,
              HZ*timeout);
 
@@ -2246,13 +2348,16 @@ mptctl_hp_hostinfo(unsigned long arg, unsigned int data_size)
         hp_host_info_t  __user *uarg = (void __user *) arg;
         MPT_ADAPTER             *ioc;
         struct pci_dev          *pdev;
-        char                    *pbuf;
+        char                    *pbuf=NULL;
         dma_addr_t              buf_dma;
         hp_host_info_t          karg;
         CONFIGPARMS             cfg;
         ConfigPageHeader_t      hdr;
         int                     iocnum;
         int                     rc, cim_rev;
+        ToolboxIstwiReadWriteRequest_t  *IstwiRWRequest;
+        MPT_FRAME_HDR           *mf = NULL;
+        MPIHeader_t             *mpi_hdr;
 
         dctlprintk((": mptctl_hp_hostinfo called.\n"));
         /* Reset long to int. Should affect IA64 and SPARC only
@@ -2370,7 +2475,7 @@ mptctl_hp_hostinfo(unsigned long arg, unsigned int data_size)
 
         karg.base_io_addr = pci_resource_start(pdev, 0);
 
-        if (ioc->bus_type == FC)
+        if ((ioc->bus_type == SAS) || (ioc->bus_type == FC))
                 karg.bus_phys_width = HP_BUS_WIDTH_UNK;
         else
                 karg.bus_phys_width = HP_BUS_WIDTH_16;
@@ -2388,20 +2493,67 @@ mptctl_hp_hostinfo(unsigned long arg, unsigned int data_size)
                 }
         }
 
-        cfg.pageAddr = 0;
-        cfg.action = MPI_TOOLBOX_ISTWI_READ_WRITE_TOOL;
-        cfg.dir = MPI_TB_ISTWI_FLAGS_READ;
-        cfg.timeout = 10;
+        /* 
+         * Gather ISTWI(Industry Standard Two Wire Interface) Data
+         */
+        if ((mf = mpt_get_msg_frame(mptctl_id, ioc)) == NULL) {
+                dfailprintk((MYIOC_s_WARN_FMT "%s, no msg frames!!\n",
+                    ioc->name,__FUNCTION__));
+                goto out;
+        }
+
+        IstwiRWRequest = (ToolboxIstwiReadWriteRequest_t *)mf;
+        mpi_hdr = (MPIHeader_t *) mf;
+        memset(IstwiRWRequest,0,sizeof(ToolboxIstwiReadWriteRequest_t));
+        IstwiRWRequest->Function = MPI_FUNCTION_TOOLBOX;
+        IstwiRWRequest->Tool = MPI_TOOLBOX_ISTWI_READ_WRITE_TOOL;
+        IstwiRWRequest->MsgContext = mpi_hdr->MsgContext;
+        IstwiRWRequest->Flags = MPI_TB_ISTWI_FLAGS_READ;
+        IstwiRWRequest->NumAddressBytes = 0x01;
+        IstwiRWRequest->DataLength = cpu_to_le16(0x04);
+        if (pdev->devfn & 1)
+                IstwiRWRequest->DeviceAddr = 0xB2;
+        else
+                IstwiRWRequest->DeviceAddr = 0xB0;
+
         pbuf = pci_alloc_consistent(ioc->pcidev, 4, &buf_dma);
-        if (pbuf) {
-                cfg.physAddr = buf_dma;
-                if ((mpt_toolbox(ioc, &cfg)) == 0) {
-                        karg.rsvd = *(u32 *)pbuf;
-                }
-                pci_free_consistent(ioc->pcidev, 4, pbuf, buf_dma);
-                pbuf = NULL;
+        if (!pbuf)
+                goto out;
+        mpt_add_sge((char *)&IstwiRWRequest->SGL,
+            (MPT_SGE_FLAGS_SSIMPLE_READ|4), buf_dma);
+
+        ioc->ioctl->wait_done = 0;
+        mpt_put_msg_frame(mptctl_id, ioc, mf);
+
+        rc = wait_event_timeout(mptctl_wait,
+             ioc->ioctl->wait_done == 1,
+             HZ*MPT_IOCTL_DEFAULT_TIMEOUT /* 10 sec */);
+
+        if(rc <=0 && (ioc->ioctl->wait_done != 1 )) {
+                /* 
+                 * Now we need to reset the board
+                 */
+                mpt_free_msg_frame(ioc, mf);
+                mptctl_timeout_expired(ioc->ioctl);
+                goto out;
         }
 
+        /* 
+         *ISTWI Data Definition
+         * pbuf[0] = FW_VERSION = 0x4
+         * pbuf[1] = Bay Count = 6 or 4 or 2, depending on
+         *  the config, you should be seeing one out of these three values
+         * pbuf[2] = Drive Installed Map = bit pattern depend on which
+         *   bays have drives in them
+         * pbuf[3] = Checksum (0x100 = (byte0 + byte2 + byte3)
+         */
+        if (ioc->ioctl->status & MPT_IOCTL_STATUS_RF_VALID)
+                karg.rsvd = *(u32 *)pbuf;
+
+ out:
+        if (pbuf)
+                pci_free_consistent(ioc->pcidev, 4, pbuf, buf_dma);
+
         /* Copy the data from kernel memory to user memory
          */
         if (copy_to_user((char __user *)arg, &karg, sizeof(hp_host_info_t))) {
@@ -2459,7 +2611,7 @@ mptctl_hp_targetinfo(unsigned long arg)
 
         /*  There is nothing to do for FCP parts.
          */
-        if (ioc->bus_type == FC)
+        if ((ioc->bus_type == SAS) || (ioc->bus_type == FC))
                 return 0;
 
         if ((ioc->spi_data.sdp0length == 0) || (ioc->sh == NULL))
@@ -2569,6 +2721,8 @@ mptctl_hp_targetinfo(unsigned long arg)
 static struct file_operations mptctl_fops = {
         .owner =        THIS_MODULE,
         .llseek =       no_llseek,
+        .release =      mptctl_release,
+        .fasync =       mptctl_fasync,
         .unlocked_ioctl = mptctl_ioctl,
 #ifdef CONFIG_COMPAT
         .compat_ioctl = compat_mpctl_ioctl,
@@ -2813,6 +2967,11 @@ static int __init mptctl_init(void)
                 /* FIXME! */
         }
 
+        if (mpt_event_register(mptctl_id, mptctl_event_process) == 0) {
+                devtprintk((KERN_INFO MYNAM
+                  ": Registered for IOC event notifications\n"));
+        }
+
         return 0;
 
 out_fail:
diff --git a/drivers/message/fusion/mptctl.h b/drivers/message/fusion/mptctl.h
index 518996e03481..a2f8a97992e6 100644
--- a/drivers/message/fusion/mptctl.h
+++ b/drivers/message/fusion/mptctl.h
@@ -169,8 +169,10 @@ struct mpt_ioctl_pci_info2 {
  *  Read only.
  *  Data starts at offset 0xC
  */
-#define MPT_IOCTL_INTERFACE_FC          (0x01)
 #define MPT_IOCTL_INTERFACE_SCSI        (0x00)
+#define MPT_IOCTL_INTERFACE_FC          (0x01)
+#define MPT_IOCTL_INTERFACE_FC_IP       (0x02)
+#define MPT_IOCTL_INTERFACE_SAS         (0x03)
 #define MPT_IOCTL_VERSION_LENGTH        (32)
 
 struct mpt_ioctl_iocinfo {
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index 05789e505464..4fee6befc93d 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -2489,7 +2489,7 @@ mptscsih_copy_sense_data(struct scsi_cmnd *sc, MPT_SCSI_HOST *hd, MPT_FRAME_HDR
                                 int idx;
                                 MPT_ADAPTER *ioc = hd->ioc;
 
-                                idx = ioc->eventContext % ioc->eventLogSize;
+                                idx = ioc->eventContext % MPTCTL_EVENT_LOG_SIZE;
                                 ioc->events[idx].event = MPI_EVENT_SCSI_DEVICE_STATUS_CHANGE;
                                 ioc->events[idx].eventContext = ioc->eventContext;
 
diff --git a/drivers/misc/ibmasm/ibmasm.h b/drivers/misc/ibmasm/ibmasm.h
index 1cef2387fa65..6aba41954448 100644
--- a/drivers/misc/ibmasm/ibmasm.h
+++ b/drivers/misc/ibmasm/ibmasm.h
@@ -101,15 +101,16 @@ struct command {
 static inline void command_put(struct command *cmd)
 {
         unsigned long flags;
+        spinlock_t *lock = cmd->lock;
 
-        spin_lock_irqsave(cmd->lock, flags);
-        kobject_put(&cmd->kobj);
-        spin_unlock_irqrestore(cmd->lock, flags);
+        spin_lock_irqsave(lock, flags);
+        kobject_put(&cmd->kobj);
+        spin_unlock_irqrestore(lock, flags);
 }
 
 static inline void command_get(struct command *cmd)
 {
-        kobject_get(&cmd->kobj);
+        kobject_get(&cmd->kobj);
 }
 
 
diff --git a/drivers/mmc/au1xmmc.c b/drivers/mmc/au1xmmc.c
index 227c39a7c1b4..8d84b045bc83 100644
--- a/drivers/mmc/au1xmmc.c
+++ b/drivers/mmc/au1xmmc.c
@@ -37,7 +37,7 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 #include <linux/mm.h>
 #include <linux/interrupt.h>
 #include <linux/dma-mapping.h>
@@ -194,7 +194,7 @@ static int au1xmmc_send_command(struct au1xmmc_host *host, int wait,
 
         u32 mmccmd = (cmd->opcode << SD_CMD_CI_SHIFT);
 
-        switch (mmc_rsp_type(cmd->flags)) {
+        switch (mmc_resp_type(cmd)) {
         case MMC_RSP_R1:
                 mmccmd |= SD_CMD_RT_1;
                 break;
@@ -740,7 +740,6 @@ static void au1xmmc_set_ios(struct mmc_host* mmc, struct mmc_ios* ios)
 static void au1xmmc_dma_callback(int irq, void *dev_id, struct pt_regs *regs)
 {
         struct au1xmmc_host *host = (struct au1xmmc_host *) dev_id;
-        u32 status;
 
         /* Avoid spurious interrupts */
 
@@ -887,7 +886,7 @@ struct mmc_host_ops au1xmmc_ops = {
         .set_ios        = au1xmmc_set_ios,
 };
 
-static int au1xmmc_probe(struct device *dev)
+static int __devinit au1xmmc_probe(struct platform_device *pdev)
 {
 
         int i, ret = 0;
@@ -904,7 +903,7 @@ static int au1xmmc_probe(struct device *dev)
         disable_irq(AU1100_SD_IRQ);
 
         for(i = 0; i < AU1XMMC_CONTROLLER_COUNT; i++) {
-                struct mmc_host *mmc = mmc_alloc_host(sizeof(struct au1xmmc_host), dev);
+                struct mmc_host *mmc = mmc_alloc_host(sizeof(struct au1xmmc_host), &pdev->dev);
                 struct au1xmmc_host *host = 0;
 
                 if (!mmc) {
@@ -967,7 +966,7 @@ static int au1xmmc_probe(struct device *dev)
         return 0;
 }
 
-static int au1xmmc_remove(struct device *dev)
+static int __devexit au1xmmc_remove(struct platform_device *pdev)
 {
 
         int i;
@@ -997,23 +996,24 @@ static int au1xmmc_remove(struct device *dev)
         return 0;
 }
 
-static struct device_driver au1xmmc_driver = {
-        .name          = DRIVER_NAME,
-        .bus           = &platform_bus_type,
+static struct platform_driver au1xmmc_driver = {
         .probe         = au1xmmc_probe,
         .remove        = au1xmmc_remove,
         .suspend       = NULL,
-        .resume        = NULL
+        .resume        = NULL,
+        .driver        = {
+                .name  = DRIVER_NAME,
+        },
 };
 
 static int __init au1xmmc_init(void)
 {
-        return driver_register(&au1xmmc_driver);
+        return platform_driver_register(&au1xmmc_driver);
 }
 
 static void __exit au1xmmc_exit(void)
 {
-        driver_unregister(&au1xmmc_driver);
+        platform_driver_unregister(&au1xmmc_driver);
 }
 
 module_init(au1xmmc_init);
diff --git a/drivers/mmc/mmci.c b/drivers/mmc/mmci.c
index 37ee7f8dc82f..9fef29d978b5 100644
--- a/drivers/mmc/mmci.c
+++ b/drivers/mmc/mmci.c
@@ -97,6 +97,13 @@ static void mmci_start_data(struct mmci_host *host, struct mmc_data *data)
         if (data->flags & MMC_DATA_READ) {
                 datactrl |= MCI_DPSM_DIRECTION;
                 irqmask = MCI_RXFIFOHALFFULLMASK;
+
+                /*
+                 * If we have less than a FIFOSIZE of bytes to transfer,
+                 * trigger a PIO interrupt as soon as any data is available.
+                 */
+                if (host->size < MCI_FIFOSIZE)
+                        irqmask |= MCI_RXDATAAVLBLMASK;
         } else {
                 /*
                  * We don't actually need to include "FIFO empty" here
diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
index 69c04945591f..1c074d63ff3a 100644
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -408,6 +408,7 @@ struct mtd_info *cfi_cmdset_0001(struct map_info *map, int primary)
                 cfi->chips[i].buffer_write_time = 1<<cfi->cfiq->BufWriteTimeoutTyp;
                 cfi->chips[i].erase_time = 1<<cfi->cfiq->BlockEraseTimeoutTyp;
                 cfi->chips[i].ref_point_counter = 0;
+                init_waitqueue_head(&(cfi->chips[i].wq));
         }
 
         map->fldrv = &cfi_intelext_chipdrv;
@@ -1019,8 +1020,8 @@ static void __xipram xip_udelay(struct map_info *map, struct flchip *chip,
 #define XIP_INVAL_CACHED_RANGE(map, from, size)  \
         INVALIDATE_CACHED_RANGE(map, from, size)
 
-#define INVALIDATE_CACHE_UDELAY(map, chip, adr, len, usec)  \
-        UDELAY(map, chip, adr, usec)
+#define INVALIDATE_CACHE_UDELAY(map, chip, cmd_adr, adr, len, usec)  \
+        UDELAY(map, chip, cmd_adr, usec)
 
 /*
  * Extra notes:
@@ -1052,7 +1053,7 @@ do {  \
         spin_lock(chip->mutex);  \
 } while (0)
 
-#define INVALIDATE_CACHE_UDELAY(map, chip, adr, len, usec)  \
+#define INVALIDATE_CACHE_UDELAY(map, chip, cmd_adr, adr, len, usec)  \
 do {  \
         spin_unlock(chip->mutex);  \
         INVALIDATE_CACHED_RANGE(map, adr, len);  \
@@ -1284,7 +1285,7 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,
         map_write(map, datum, adr);
         chip->state = mode;
 
-        INVALIDATE_CACHE_UDELAY(map, chip,
+        INVALIDATE_CACHE_UDELAY(map, chip, adr,
                                 adr, map_bankwidth(map),
                                 chip->word_write_time);
 
@@ -1572,8 +1573,8 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
         map_write(map, CMD(0xd0), cmd_adr);
         chip->state = FL_WRITING;
 
-        INVALIDATE_CACHE_UDELAY(map, chip,
-                                cmd_adr, len,
+        INVALIDATE_CACHE_UDELAY(map, chip, cmd_adr,
+                                adr, len,
                                 chip->buffer_write_time);
 
         timeo = jiffies + (HZ/2);
@@ -1744,7 +1745,7 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,
         chip->state = FL_ERASING;
         chip->erase_suspended = 0;
 
-        INVALIDATE_CACHE_UDELAY(map, chip,
+        INVALIDATE_CACHE_UDELAY(map, chip, adr,
                                 adr, len,
                                 chip->erase_time*1000/2);
 
diff --git a/drivers/mtd/redboot.c b/drivers/mtd/redboot.c
index 7b7ca5ab5ae4..8815c8dbef2d 100644
--- a/drivers/mtd/redboot.c
+++ b/drivers/mtd/redboot.c
@@ -1,5 +1,5 @@
 /*
- * $Id: redboot.c,v 1.18 2005/11/07 11:14:21 gleixner Exp $
+ * $Id: redboot.c,v 1.19 2005/12/01 10:03:51 dwmw2 Exp $
  *
  * Parse RedBoot-style Flash Image System (FIS) tables and
  * produce a Linux partition array to match.
@@ -89,8 +89,32 @@ static int parse_redboot_partitions(struct mtd_info *master,
                         i = numslots;
                         break;
                 }
-                if (!memcmp(buf[i].name, "FIS directory", 14))
+                if (!memcmp(buf[i].name, "FIS directory", 14)) {
+                        /* This is apparently the FIS directory entry for the
+                         * FIS directory itself.  The FIS directory size is
+                         * one erase block; if the buf[i].size field is
+                         * swab32(erasesize) then we know we are looking at
+                         * a byte swapped FIS directory - swap all the entries!
+                         * (NOTE: this is 'size' not 'data_length'; size is
+                         * the full size of the entry.)
+                         */
+                        if (swab32(buf[i].size) == master->erasesize) {
+                                int j;
+                                for (j = 0; j < numslots && buf[j].name[0] != 0xff; ++j) {
+                                        /* The unsigned long fields were written with the
+                                         * wrong byte sex, name and pad have no byte sex.
+                                         */
+                                        swab32s(&buf[j].flash_base);
+                                        swab32s(&buf[j].mem_base);
+                                        swab32s(&buf[j].size);
+                                        swab32s(&buf[j].entry_point);
+                                        swab32s(&buf[j].data_length);
+                                        swab32s(&buf[j].desc_cksum);
+                                        swab32s(&buf[j].file_cksum);
+                                }
+                        }
                         break;
+                }
         }
         if (i == numslots) {
                 /* Didn't find it */
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c
index 824e430486c2..830528dce0ca 100644
--- a/drivers/net/3c509.c
+++ b/drivers/net/3c509.c
@@ -1574,6 +1574,7 @@ MODULE_LICENSE("GPL");
 
 static int __init el3_init_module(void)
 {
+        int ret = 0;
         el3_cards = 0;
 
         if (debug >= 0)
@@ -1589,14 +1590,16 @@ static int __init el3_init_module(void)
         }
 
 #ifdef CONFIG_EISA
-        if (eisa_driver_register (&el3_eisa_driver) < 0) {
-                eisa_driver_unregister (&el3_eisa_driver);
-        }
+        ret = eisa_driver_register(&el3_eisa_driver);
 #endif
 #ifdef CONFIG_MCA
-        mca_register_driver(&el3_mca_driver);
+        {
+                int err = mca_register_driver(&el3_mca_driver);
+                if (ret == 0)
+                        ret = err;
+        }
 #endif
-        return 0;
+        return ret;
 }
 
 static void __exit el3_cleanup_module(void)
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index f822cd3025ff..dd410496aadb 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -1118,13 +1118,18 @@ err_out:
         return -ENOMEM;
 }
 
+static void cp_init_rings_index (struct cp_private *cp)
+{
+        cp->rx_tail = 0;
+        cp->tx_head = cp->tx_tail = 0;
+}
+
 static int cp_init_rings (struct cp_private *cp)
 {
         memset(cp->tx_ring, 0, sizeof(struct cp_desc) * CP_TX_RING_SIZE);
         cp->tx_ring[CP_TX_RING_SIZE - 1].opts1 = cpu_to_le32(RingEnd);
 
-        cp->rx_tail = 0;
-        cp->tx_head = cp->tx_tail = 0;
+        cp_init_rings_index(cp);
 
         return cp_refill_rx (cp);
 }
@@ -1886,30 +1891,30 @@ static int cp_suspend (struct pci_dev *pdev, pm_message_t state)
 
         spin_unlock_irqrestore (&cp->lock, flags);
 
-        if (cp->pdev && cp->wol_enabled) {
-                pci_save_state (cp->pdev);
-                cp_set_d3_state (cp);
-        }
+        pci_save_state(pdev);
+        pci_enable_wake(pdev, pci_choose_state(pdev, state), cp->wol_enabled);
+        pci_set_power_state(pdev, pci_choose_state(pdev, state));
 
         return 0;
 }
 
 static int cp_resume (struct pci_dev *pdev)
 {
-        struct net_device *dev;
-        struct cp_private *cp;
+        struct net_device *dev = pci_get_drvdata (pdev);
+        struct cp_private *cp = netdev_priv(dev);
         unsigned long flags;
 
-        dev = pci_get_drvdata (pdev);
-        cp  = netdev_priv(dev);
+        if (!netif_running(dev))
+                return 0;
 
         netif_device_attach (dev);
-        
-        if (cp->pdev && cp->wol_enabled) {
-                pci_set_power_state (cp->pdev, PCI_D0);
-                pci_restore_state (cp->pdev);
-        }
-        
+
+        pci_set_power_state(pdev, PCI_D0);
+        pci_restore_state(pdev);
+        pci_enable_wake(pdev, PCI_D0, 0);
+
+        /* FIXME: sh*t may happen if the Rx ring buffer is depleted */
+        cp_init_rings_index (cp);
         cp_init_hw (cp);
         netif_start_queue (dev);
 
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 47c72a63dfe1..aa633fa95e64 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1087,7 +1087,8 @@ config NE2000
           without a specific driver are compatible with NE2000.
 
           If you have a PCI NE2000 card however, say N here and Y to "PCI
-          NE2000 support", above. If you have a NE2000 card and are running on
+          NE2000 and clone support" under "EISA, VLB, PCI and on board
+          controllers" below. If you have a NE2000 card and are running on
           an MCA system (a bus system used on some IBM PS/2 computers and
           laptops), say N here and Y to "NE/2 (ne2000 MCA version) support",
           below.
@@ -2020,8 +2021,8 @@ config SIS190
           will be called sis190.  This is recommended.
 
 config SKGE
-        tristate "New SysKonnect GigaEthernet support (EXPERIMENTAL)"
-        depends on PCI && EXPERIMENTAL
+        tristate "New SysKonnect GigaEthernet support"
+        depends on PCI
         select CRC32
         ---help---
           This driver support the Marvell Yukon or SysKonnect SK-98xx/SK-95xx
@@ -2082,7 +2083,6 @@ config SK98LIN
             - Allied Telesyn AT-2971SX Gigabit Ethernet Adapter
             - Allied Telesyn AT-2971T Gigabit Ethernet Adapter
             - Belkin Gigabit Desktop Card 10/100/1000Base-T Adapter, Copper RJ-45
-            - DGE-530T Gigabit Ethernet Adapter
             - EG1032 v2 Instant Gigabit Network Adapter
             - EG1064 v2 Instant Gigabit Network Adapter
             - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Abit)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index e0f51afec778..bcf9f17daf0d 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1581,6 +1581,7 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
                 printk(KERN_INFO DRV_NAME
                        ": %s: %s not enslaved\n",
                        bond_dev->name, slave_dev->name);
+                write_unlock_bh(&bond->lock);
                 return -EINVAL;
         }
 
diff --git a/drivers/net/chelsio/espi.c b/drivers/net/chelsio/espi.c
index 230642571c92..e824acaf188a 100644
--- a/drivers/net/chelsio/espi.c
+++ b/drivers/net/chelsio/espi.c
@@ -296,9 +296,7 @@ void t1_espi_destroy(struct peespi *espi)
 
 struct peespi *t1_espi_create(adapter_t *adapter)
 {
-        struct peespi *espi = kmalloc(sizeof(*espi), GFP_KERNEL);
-
-        memset(espi, 0, sizeof(*espi));
+        struct peespi *espi = kzalloc(sizeof(*espi), GFP_KERNEL);
 
         if (espi)
                 espi->adapter = adapter;
diff --git a/drivers/net/de620.c b/drivers/net/de620.c
index 0069f5fa973a..22fc5b869a60 100644
--- a/drivers/net/de620.c
+++ b/drivers/net/de620.c
@@ -1012,7 +1012,7 @@ static int __init read_eeprom(struct net_device *dev)
 #ifdef MODULE
 static struct net_device *de620_dev;
 
-int init_module(void)
+int __init init_module(void)
 {
         de620_dev = de620_probe(-1);
         if (IS_ERR(de620_dev))
diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c
index 430c628279b3..fb9dae302dcc 100644
--- a/drivers/net/dl2k.c
+++ b/drivers/net/dl2k.c
@@ -50,8 +50,8 @@
 
 */
 #define DRV_NAME        "D-Link DL2000-based linux driver"
-#define DRV_VERSION     "v1.17a"
-#define DRV_RELDATE     "2002/10/04"
+#define DRV_VERSION     "v1.17b"
+#define DRV_RELDATE     "2006/03/10"
 #include "dl2k.h"
 
 static char version[] __devinitdata =
@@ -765,7 +765,7 @@ rio_free_tx (struct net_device *dev, int irq)
                         break;
                 skb = np->tx_skbuff[entry];
                 pci_unmap_single (np->pdev,
-                                  np->tx_ring[entry].fraginfo,
+                                  np->tx_ring[entry].fraginfo & 0xffffffffffff,
                                   skb->len, PCI_DMA_TODEVICE);
                 if (irq)
                         dev_kfree_skb_irq (skb);
@@ -892,14 +892,16 @@ receive_packet (struct net_device *dev)
 
                         /* Small skbuffs for short packets */
                         if (pkt_len > copy_thresh) {
-                                pci_unmap_single (np->pdev, desc->fraginfo,
+                                pci_unmap_single (np->pdev,
+                                                  desc->fraginfo & 0xffffffffffff,
                                                   np->rx_buf_sz,
                                                   PCI_DMA_FROMDEVICE);
                                 skb_put (skb = np->rx_skbuff[entry], pkt_len);
                                 np->rx_skbuff[entry] = NULL;
                         } else if ((skb = dev_alloc_skb (pkt_len + 2)) != NULL) {
                                 pci_dma_sync_single_for_cpu(np->pdev,
-                                                            desc->fraginfo,
+                                                            desc->fraginfo & 
+                                                                0xffffffffffff,
                                                             np->rx_buf_sz,
                                                             PCI_DMA_FROMDEVICE);
                                 skb->dev = dev;
@@ -910,7 +912,8 @@ receive_packet (struct net_device *dev)
                                                   pkt_len, 0);
                                 skb_put (skb, pkt_len);
                                 pci_dma_sync_single_for_device(np->pdev,
-                                                               desc->fraginfo,
+                                                               desc->fraginfo &
+                                                                 0xffffffffffff,
                                                                np->rx_buf_sz,
                                                                PCI_DMA_FROMDEVICE);
                         }
@@ -1796,8 +1799,9 @@ rio_close (struct net_device *dev)
                 np->rx_ring[i].fraginfo = 0;
                 skb = np->rx_skbuff[i];
                 if (skb) {
-                        pci_unmap_single (np->pdev, np->rx_ring[i].fraginfo,
-                                          skb->len, PCI_DMA_FROMDEVICE);
+                        pci_unmap_single(np->pdev, 
+                                         np->rx_ring[i].fraginfo & 0xffffffffffff,
+                                         skb->len, PCI_DMA_FROMDEVICE);
                         dev_kfree_skb (skb);
                         np->rx_skbuff[i] = NULL;
                 }
@@ -1805,8 +1809,9 @@ rio_close (struct net_device *dev)
         for (i = 0; i < TX_RING_SIZE; i++) {
                 skb = np->tx_skbuff[i];
                 if (skb) {
-                        pci_unmap_single (np->pdev, np->tx_ring[i].fraginfo,
-                                          skb->len, PCI_DMA_TODEVICE);
+                        pci_unmap_single(np->pdev, 
+                                         np->tx_ring[i].fraginfo & 0xffffffffffff,
+                                         skb->len, PCI_DMA_TODEVICE);
                         dev_kfree_skb (skb);
                         np->tx_skbuff[i] = NULL;
                 }
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
index 27c77306193b..99baf0e099fc 100644
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -225,9 +225,6 @@ struct e1000_rx_ring {
         struct e1000_ps_page *ps_page;
         struct e1000_ps_page_dma *ps_page_dma;
 
-        struct sk_buff *rx_skb_top;
-        struct sk_buff *rx_skb_prev;
-
         /* cpu for rx queue */
         int cpu;
 
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 31e332935e5a..4c4db96d0b7b 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -103,7 +103,7 @@ static char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver";
 #else
 #define DRIVERNAPI "-NAPI"
 #endif
-#define DRV_VERSION "6.3.9-k2"DRIVERNAPI
+#define DRV_VERSION "6.3.9-k4"DRIVERNAPI
 char e1000_driver_version[] = DRV_VERSION;
 static char e1000_copyright[] = "Copyright (c) 1999-2005 Intel Corporation.";
 
@@ -1635,8 +1635,6 @@ setup_rx_desc_die:
 
         rxdr->next_to_clean = 0;
         rxdr->next_to_use = 0;
-        rxdr->rx_skb_top = NULL;
-        rxdr->rx_skb_prev = NULL;
 
         return 0;
 }
@@ -1713,8 +1711,23 @@ e1000_setup_rctl(struct e1000_adapter *adapter)
                 rctl |= adapter->rx_buffer_len << 0x11;
         } else {
                 rctl &= ~E1000_RCTL_SZ_4096;
-                rctl &= ~E1000_RCTL_BSEX;
-                rctl |= E1000_RCTL_SZ_2048;
+                rctl |= E1000_RCTL_BSEX; 
+                switch (adapter->rx_buffer_len) {
+                case E1000_RXBUFFER_2048:
+                default:
+                        rctl |= E1000_RCTL_SZ_2048;
+                        rctl &= ~E1000_RCTL_BSEX;
+                        break;
+                case E1000_RXBUFFER_4096:
+                        rctl |= E1000_RCTL_SZ_4096;
+                        break;
+                case E1000_RXBUFFER_8192:
+                        rctl |= E1000_RCTL_SZ_8192;
+                        break;
+                case E1000_RXBUFFER_16384:
+                        rctl |= E1000_RCTL_SZ_16384;
+                        break;
+                }
         }
 
 #ifndef CONFIG_E1000_DISABLE_PACKET_SPLIT
@@ -2107,16 +2120,6 @@ e1000_clean_rx_ring(struct e1000_adapter *adapter,
                 }
         }
 
-        /* there also may be some cached data in our adapter */
-        if (rx_ring->rx_skb_top) {
-                dev_kfree_skb(rx_ring->rx_skb_top);
-
-                /* rx_skb_prev will be wiped out by rx_skb_top */
-                rx_ring->rx_skb_top = NULL;
-                rx_ring->rx_skb_prev = NULL;
-        }
-
-
         size = sizeof(struct e1000_buffer) * rx_ring->count;
         memset(rx_ring->buffer_info, 0, size);
         size = sizeof(struct e1000_ps_page) * rx_ring->count;
@@ -2914,7 +2917,7 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                         if (!__pskb_pull_tail(skb, pull_size)) {
                                 printk(KERN_ERR "__pskb_pull_tail failed.\n");
                                 dev_kfree_skb_any(skb);
-                                return -EFAULT;
+                                return NETDEV_TX_OK;
                         }
                         len = skb->len - skb->data_len;
                 }
@@ -3106,24 +3109,27 @@ e1000_change_mtu(struct net_device *netdev, int new_mtu)
                 break;
         }
 
-        /* since the driver code now supports splitting a packet across
-         * multiple descriptors, most of the fifo related limitations on
-         * jumbo frame traffic have gone away.
-         * simply use 2k descriptors for everything.
-         *
-         * NOTE: dev_alloc_skb reserves 16 bytes, and typically NET_IP_ALIGN
-         * means we reserve 2 more, this pushes us to allocate from the next
-         * larger slab size
-         * i.e. RXBUFFER_2048 --> size-4096 slab */
-
-        /* recent hardware supports 1KB granularity */
+
         if (adapter->hw.mac_type > e1000_82547_rev_2) {
-                adapter->rx_buffer_len =
-                    ((max_frame < E1000_RXBUFFER_2048) ?
-                        max_frame : E1000_RXBUFFER_2048);
+                adapter->rx_buffer_len = max_frame;
                 E1000_ROUNDUP(adapter->rx_buffer_len, 1024);
-        } else
-                adapter->rx_buffer_len = E1000_RXBUFFER_2048;
+        } else {
+                if(unlikely((adapter->hw.mac_type < e1000_82543) &&
+                   (max_frame > MAXIMUM_ETHERNET_FRAME_SIZE))) {
+                        DPRINTK(PROBE, ERR, "Jumbo Frames not supported "
+                                            "on 82542\n");
+                        return -EINVAL;
+                } else {
+                        if(max_frame <= E1000_RXBUFFER_2048)
+                                adapter->rx_buffer_len = E1000_RXBUFFER_2048;
+                        else if(max_frame <= E1000_RXBUFFER_4096)
+                                adapter->rx_buffer_len = E1000_RXBUFFER_4096;
+                        else if(max_frame <= E1000_RXBUFFER_8192)
+                                adapter->rx_buffer_len = E1000_RXBUFFER_8192;
+                        else if(max_frame <= E1000_RXBUFFER_16384)
+                                adapter->rx_buffer_len = E1000_RXBUFFER_16384;
+                }
+        }
 
         netdev->mtu = new_mtu;
 
@@ -3620,7 +3626,7 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter,
         uint8_t last_byte;
         unsigned int i;
         int cleaned_count = 0;
-        boolean_t cleaned = FALSE, multi_descriptor = FALSE;
+        boolean_t cleaned = FALSE;
 
         i = rx_ring->next_to_clean;
         rx_desc = E1000_RX_DESC(*rx_ring, i);
@@ -3652,43 +3658,12 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter,
 
                 length = le16_to_cpu(rx_desc->length);
 
-                skb_put(skb, length);
-
-                if (!(status & E1000_RXD_STAT_EOP)) {
-                        if (!rx_ring->rx_skb_top) {
-                                rx_ring->rx_skb_top = skb;
-                                rx_ring->rx_skb_top->len = length;
-                                rx_ring->rx_skb_prev = skb;
-                        } else {
-                                if (skb_shinfo(rx_ring->rx_skb_top)->frag_list) {
-                                        rx_ring->rx_skb_prev->next = skb;
-                                        skb->prev = rx_ring->rx_skb_prev;
-                                } else {
-                                        skb_shinfo(rx_ring->rx_skb_top)->frag_list = skb;
-                                }
-                                rx_ring->rx_skb_prev = skb;
-                                rx_ring->rx_skb_top->data_len += length;
-                        }
+                if (unlikely(!(status & E1000_RXD_STAT_EOP))) {
+                        /* All receives must fit into a single buffer */
+                        E1000_DBG("%s: Receive packet consumed multiple"
+                                  " buffers\n", netdev->name);
+                        dev_kfree_skb_irq(skb);
                         goto next_desc;
-                } else {
-                        if (rx_ring->rx_skb_top) {
-                                if (skb_shinfo(rx_ring->rx_skb_top)
-                                                        ->frag_list) {
-                                        rx_ring->rx_skb_prev->next = skb;
-                                        skb->prev = rx_ring->rx_skb_prev;
-                                } else
-                                        skb_shinfo(rx_ring->rx_skb_top)
-                                                        ->frag_list = skb;
-
-                                rx_ring->rx_skb_top->data_len += length;
-                                rx_ring->rx_skb_top->len +=
-                                        rx_ring->rx_skb_top->data_len;
-
-                                skb = rx_ring->rx_skb_top;
-                                multi_descriptor = TRUE;
-                                rx_ring->rx_skb_top = NULL;
-                                rx_ring->rx_skb_prev = NULL;
-                        }
                 }
 
                 if (unlikely(rx_desc->errors & E1000_RXD_ERR_FRAME_ERR_MASK)) {
@@ -3712,10 +3687,7 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter,
                  * performance for small packets with large amounts
                  * of reassembly being done in the stack */
 #define E1000_CB_LENGTH 256
-                if ((length < E1000_CB_LENGTH) &&
-                   !rx_ring->rx_skb_top &&
-                   /* or maybe (status & E1000_RXD_STAT_EOP) && */
-                   !multi_descriptor) {
+                if (length < E1000_CB_LENGTH) {
                         struct sk_buff *new_skb =
                             dev_alloc_skb(length + NET_IP_ALIGN);
                         if (new_skb) {
@@ -3729,7 +3701,8 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter,
                                 skb = new_skb;
                                 skb_put(skb, length);
                         }
-                }
+                } else
+                        skb_put(skb, length);
 
                 /* end copybreak code */
 
diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
index 1b699259b4ec..31fb2d75dc44 100644
--- a/drivers/net/ifb.c
+++ b/drivers/net/ifb.c
@@ -57,7 +57,7 @@ struct ifb_private {
         struct sk_buff_head     tq;
 };
 
-static int numifbs = 1;
+static int numifbs = 2;
 
 static void ri_tasklet(unsigned long dev);
 static int ifb_xmit(struct sk_buff *skb, struct net_device *dev);
diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index fa176ffb4ad5..8936058a3cce 100644
--- a/drivers/net/irda/irda-usb.c
+++ b/drivers/net/irda/irda-usb.c
@@ -108,6 +108,7 @@ static void irda_usb_close(struct irda_usb_cb *self);
 static void speed_bulk_callback(struct urb *urb, struct pt_regs *regs);
 static void write_bulk_callback(struct urb *urb, struct pt_regs *regs);
 static void irda_usb_receive(struct urb *urb, struct pt_regs *regs);
+static void irda_usb_rx_defer_expired(unsigned long data);
 static int irda_usb_net_open(struct net_device *dev);
 static int irda_usb_net_close(struct net_device *dev);
 static int irda_usb_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
@@ -677,6 +678,12 @@ static void irda_usb_net_timeout(struct net_device *netdev)
  * on the interrupt pipe and hang the Rx URB only when an interrupt is
  * received.
  * Jean II
+ *
+ * Note : don't read the above as what we are currently doing, but as
+ * something we could do with KC dongle. Also don't forget that the
+ * interrupt pipe is not part of the original standard, so this would
+ * need to be optional...
+ * Jean II
  */
 
 /*------------------------------------------------------------------*/
@@ -704,10 +711,8 @@ static void irda_usb_submit(struct irda_usb_cb *self, struct sk_buff *skb, struc
         /* Reinitialize URB */
         usb_fill_bulk_urb(urb, self->usbdev, 
                       usb_rcvbulkpipe(self->usbdev, self->bulk_in_ep), 
-                      skb->data, skb->truesize,
+                      skb->data, IRDA_SKB_MAX_MTU,
                       irda_usb_receive, skb);
-        /* Note : unlink *must* be synchronous because of the code in 
-         * irda_usb_net_close() -> free the skb - Jean II */
         urb->status = 0;
 
         /* Can be called from irda_usb_receive (irq handler) -> GFP_ATOMIC */
@@ -734,6 +739,7 @@ static void irda_usb_receive(struct urb *urb, struct pt_regs *regs)
         struct irda_skb_cb *cb;
         struct sk_buff *newskb;
         struct sk_buff *dataskb;
+        struct urb *next_urb;
         int             docopy;
 
         IRDA_DEBUG(2, "%s(), len=%d\n", __FUNCTION__, urb->actual_length);
@@ -755,20 +761,37 @@ static void irda_usb_receive(struct urb *urb, struct pt_regs *regs)
         if (urb->status != 0) {
                 switch (urb->status) {
                 case -EILSEQ:
-                        self->stats.rx_errors++;
                         self->stats.rx_crc_errors++;    
-                        break;
+                        /* Also precursor to a hot-unplug on UHCI. */
+                        /* Fallthrough... */
                 case -ECONNRESET:               /* -104 */
-                        IRDA_DEBUG(0, "%s(), Connection Reset (-104), transfer_flags 0x%04X \n", __FUNCTION__, urb->transfer_flags);
+                        /* Random error, if I remember correctly */
                         /* uhci_cleanup_unlink() is going to kill the Rx
                          * URB just after we return. No problem, at this
                          * point the URB will be idle ;-) - Jean II */
-                        break;
+                case -ESHUTDOWN:                /* -108 */
+                        /* That's usually a hot-unplug. Submit will fail... */
+                case -ETIMEDOUT:                /* -110 */
+                        /* Usually precursor to a hot-unplug on OHCI. */
                 default:
-                        IRDA_DEBUG(0, "%s(), RX status %d,transfer_flags 0x%04X \n", __FUNCTION__, urb->status, urb->transfer_flags);
+                        self->stats.rx_errors++;
+                        IRDA_DEBUG(0, "%s(), RX status %d, transfer_flags 0x%04X \n", __FUNCTION__, urb->status, urb->transfer_flags);
                         break;
                 }
-                goto done;
+                /* If we received an error, we don't want to resubmit the
+                 * Rx URB straight away but to give the USB layer a little
+                 * bit of breathing room.
+                 * We are in the USB thread context, therefore there is a
+                 * danger of recursion (new URB we submit fails, we come
+                 * back here).
+                 * With recent USB stack (2.6.15+), I'm seeing that on
+                 * hot unplug of the dongle...
+                 * Lowest effective timer is 10ms...
+                 * Jean II */
+                self->rx_defer_timer.function = &irda_usb_rx_defer_expired;
+                self->rx_defer_timer.data = (unsigned long) urb;
+                mod_timer(&self->rx_defer_timer, jiffies + (10 * HZ / 1000));
+                return;
         }
         
         /* Check for empty frames */
@@ -845,13 +868,45 @@ done:
          * idle slot....
          * Jean II */
         /* Note : with this scheme, we could submit the idle URB before
-         * processing the Rx URB. Another time... Jean II */
+         * processing the Rx URB. I don't think it would buy us anything as
+         * we are running in the USB thread context. Jean II */
+        next_urb = self->idle_rx_urb;
 
-        /* Submit the idle URB to replace the URB we've just received */
-        irda_usb_submit(self, skb, self->idle_rx_urb);
         /* Recycle Rx URB : Now, the idle URB is the present one */
         urb->context = NULL;
         self->idle_rx_urb = urb;
+
+        /* Submit the idle URB to replace the URB we've just received.
+         * Do it last to avoid race conditions... Jean II */
+        irda_usb_submit(self, skb, next_urb);
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * In case of errors, we want the USB layer to have time to recover.
+ * Now, it is time to resubmit ouur Rx URB...
+ */
+static void irda_usb_rx_defer_expired(unsigned long data)
+{
+        struct urb *urb = (struct urb *) data;
+        struct sk_buff *skb = (struct sk_buff *) urb->context;
+        struct irda_usb_cb *self; 
+        struct irda_skb_cb *cb;
+        struct urb *next_urb;
+
+        IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
+
+        /* Find ourselves */
+        cb = (struct irda_skb_cb *) skb->cb;
+        IRDA_ASSERT(cb != NULL, return;);
+        self = (struct irda_usb_cb *) cb->context;
+        IRDA_ASSERT(self != NULL, return;);
+
+        /* Same stuff as when Rx is done, see above... */
+        next_urb = self->idle_rx_urb;
+        urb->context = NULL;
+        self->idle_rx_urb = urb;
+        irda_usb_submit(self, skb, next_urb);
 }
 
 /*------------------------------------------------------------------*/
@@ -990,6 +1045,9 @@ static int irda_usb_net_close(struct net_device *netdev)
         /* Stop network Tx queue */
         netif_stop_queue(netdev);
 
+        /* Kill defered Rx URB */
+        del_timer(&self->rx_defer_timer);
+
         /* Deallocate all the Rx path buffers (URBs and skb) */
         for (i = 0; i < IU_MAX_RX_URBS; i++) {
                 struct urb *urb = self->rx_urb[i];
@@ -1365,6 +1423,7 @@ static int irda_usb_probe(struct usb_interface *intf,
         self = net->priv;
         self->netdev = net;
         spin_lock_init(&self->lock);
+        init_timer(&self->rx_defer_timer);
 
         /* Create all of the needed urbs */
         for (i = 0; i < IU_MAX_RX_URBS; i++) {
@@ -1498,6 +1557,9 @@ static void irda_usb_disconnect(struct usb_interface *intf)
          * This will stop/desactivate the Tx path. - Jean II */
         self->present = 0;
 
+        /* Kill defered Rx URB */
+        del_timer(&self->rx_defer_timer);
+
         /* We need to have irq enabled to unlink the URBs. That's OK,
          * at this point the Tx path is gone - Jean II */
         spin_unlock_irqrestore(&self->lock, flags);
@@ -1507,11 +1569,11 @@ static void irda_usb_disconnect(struct usb_interface *intf)
                 /* Accept no more transmissions */
                 /*netif_device_detach(self->netdev);*/
                 netif_stop_queue(self->netdev);
-                /* Stop all the receive URBs */
+                /* Stop all the receive URBs. Must be synchronous. */
                 for (i = 0; i < IU_MAX_RX_URBS; i++)
                         usb_kill_urb(self->rx_urb[i]);
                 /* Cancel Tx and speed URB.
-                 * Toggle flags to make sure it's synchronous. */
+                 * Make sure it's synchronous to avoid races. */
                 usb_kill_urb(self->tx_urb);
                 usb_kill_urb(self->speed_urb);
         }
diff --git a/drivers/net/irda/irda-usb.h b/drivers/net/irda/irda-usb.h
index bd8f66542322..4026af42dd47 100644
--- a/drivers/net/irda/irda-usb.h
+++ b/drivers/net/irda/irda-usb.h
@@ -136,8 +136,6 @@ struct irda_usb_cb {
         __u16 bulk_out_mtu;             /* Max Tx packet size in bytes */
         __u8  bulk_int_ep;              /* Interrupt Endpoint assignments */
 
-        wait_queue_head_t wait_q;       /* for timeouts */
-
         struct urb *rx_urb[IU_MAX_RX_URBS];     /* URBs used to receive data frames */
         struct urb *idle_rx_urb;        /* Pointer to idle URB in Rx path */
         struct urb *tx_urb;             /* URB used to send data frames */
@@ -147,17 +145,18 @@ struct irda_usb_cb {
         struct net_device_stats stats;
         struct irlap_cb   *irlap;       /* The link layer we are binded to */
         struct qos_info qos;
-        hashbin_t *tx_list;             /* Queued transmit skb's */
         char *speed_buff;               /* Buffer for speed changes */
 
         struct timeval stamp;
         struct timeval now;
 
-        spinlock_t lock;                /* For serializing operations */
+        spinlock_t lock;                /* For serializing Tx operations */
 
         __u16 xbofs;                    /* Current xbofs setting */
         __s16 new_xbofs;                /* xbofs we need to set */
         __u32 speed;                    /* Current speed */
         __s32 new_speed;                /* speed we need to set */
+
+        struct timer_list rx_defer_timer;       /* Wait for Rx error to clear */
 };
 
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 01ddfc8cce3f..aa5581369399 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -806,6 +806,7 @@ static struct pcmcia_device_id axnet_ids[] = {
         PCMCIA_DEVICE_MANF_CARD(0x026f, 0x0309),
         PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1106),
         PCMCIA_DEVICE_MANF_CARD(0x8a01, 0xc1ab),
+        PCMCIA_DEVICE_PROD_ID12("AmbiCom,Inc.", "Fast Ethernet PC Card(AMB8110)", 0x49b020a7, 0x119cc9fc),
         PCMCIA_DEVICE_PROD_ID124("Fast Ethernet", "16-bit PC Card", "AX88190", 0xb4be14e3, 0x9a12eb6a, 0xab9be5ef),
         PCMCIA_DEVICE_PROD_ID12("ASIX", "AX88190", 0x0959823b, 0xab9be5ef),
         PCMCIA_DEVICE_PROD_ID12("Billionton", "LNA-100B", 0x552ab682, 0xbc3b87e1),
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 6e1018448eea..8cc0d0bbdf50 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -287,6 +287,20 @@ enum RTL8169_register_content {
         TxInterFrameGapShift = 24,
         TxDMAShift = 8, /* DMA burst value (0-7) is shift this many bits */
 
+        /* Config1 register p.24 */
+        PMEnable        = (1 << 0),     /* Power Management Enable */
+
+        /* Config3 register p.25 */
+        MagicPacket     = (1 << 5),     /* Wake up when receives a Magic Packet */
+        LinkUp          = (1 << 4),     /* Wake up when the cable connection is re-established */
+
+        /* Config5 register p.27 */
+        BWF             = (1 << 6),     /* Accept Broadcast wakeup frame */
+        MWF             = (1 << 5),     /* Accept Multicast wakeup frame */
+        UWF             = (1 << 4),     /* Accept Unicast wakeup frame */
+        LanWake         = (1 << 1),     /* LanWake enable/disable */
+        PMEStatus       = (1 << 0),     /* PME status can be reset by PCI RST# */
+
         /* TBICSR p.28 */
         TBIReset        = 0x80000000,
         TBILoopback     = 0x40000000,
@@ -433,6 +447,7 @@ struct rtl8169_private {
         unsigned int (*phy_reset_pending)(void __iomem *);
         unsigned int (*link_ok)(void __iomem *);
         struct work_struct task;
+        unsigned wol_enabled : 1;
 };
 
 MODULE_AUTHOR("Realtek and the Linux r8169 crew <netdev@vger.kernel.org>");
@@ -607,6 +622,80 @@ static void rtl8169_link_option(int idx, u8 *autoneg, u16 *speed, u8 *duplex)
         *duplex = p->duplex;
 }
 
+static void rtl8169_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
+{
+        struct rtl8169_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
+        u8 options;
+
+        wol->wolopts = 0;
+
+#define WAKE_ANY (WAKE_PHY | WAKE_MAGIC | WAKE_UCAST | WAKE_BCAST | WAKE_MCAST)
+        wol->supported = WAKE_ANY;
+
+        spin_lock_irq(&tp->lock);
+
+        options = RTL_R8(Config1);
+        if (!(options & PMEnable))
+                goto out_unlock;
+
+        options = RTL_R8(Config3);
+        if (options & LinkUp)
+                wol->wolopts |= WAKE_PHY;
+        if (options & MagicPacket)
+                wol->wolopts |= WAKE_MAGIC;
+
+        options = RTL_R8(Config5);
+        if (options & UWF)
+                wol->wolopts |= WAKE_UCAST;
+        if (options & BWF)
+                wol->wolopts |= WAKE_BCAST;
+        if (options & MWF)
+                wol->wolopts |= WAKE_MCAST;
+
+out_unlock:
+        spin_unlock_irq(&tp->lock);
+}
+
+static int rtl8169_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
+{
+        struct rtl8169_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
+        int i;
+        static struct {
+                u32 opt;
+                u16 reg;
+                u8  mask;
+        } cfg[] = {
+                { WAKE_ANY,   Config1, PMEnable },
+                { WAKE_PHY,   Config3, LinkUp },
+                { WAKE_MAGIC, Config3, MagicPacket },
+                { WAKE_UCAST, Config5, UWF },
+                { WAKE_BCAST, Config5, BWF },
+                { WAKE_MCAST, Config5, MWF },
+                { WAKE_ANY,   Config5, LanWake }
+        };
+
+        spin_lock_irq(&tp->lock);
+
+        RTL_W8(Cfg9346, Cfg9346_Unlock);
+
+        for (i = 0; i < ARRAY_SIZE(cfg); i++) {
+                u8 options = RTL_R8(cfg[i].reg) & ~cfg[i].mask;
+                if (wol->wolopts & cfg[i].opt)
+                        options |= cfg[i].mask;
+                RTL_W8(cfg[i].reg, options);
+        }
+
+        RTL_W8(Cfg9346, Cfg9346_Lock);
+
+        tp->wol_enabled = (wol->wolopts) ? 1 : 0;
+
+        spin_unlock_irq(&tp->lock);
+
+        return 0;
+}
+
 static void rtl8169_get_drvinfo(struct net_device *dev,
                                 struct ethtool_drvinfo *info)
 {
@@ -1025,6 +1114,8 @@ static struct ethtool_ops rtl8169_ethtool_ops = {
         .get_tso                = ethtool_op_get_tso,
         .set_tso                = ethtool_op_set_tso,
         .get_regs               = rtl8169_get_regs,
+        .get_wol                = rtl8169_get_wol,
+        .set_wol                = rtl8169_set_wol,
         .get_strings            = rtl8169_get_strings,
         .get_stats_count        = rtl8169_get_stats_count,
         .get_ethtool_stats      = rtl8169_get_ethtool_stats,
@@ -1442,6 +1533,11 @@ rtl8169_init_board(struct pci_dev *pdev, struct net_device **dev_out,
         }
         tp->chipset = i;
 
+        RTL_W8(Cfg9346, Cfg9346_Unlock);
+        RTL_W8(Config1, RTL_R8(Config1) | PMEnable);
+        RTL_W8(Config5, RTL_R8(Config5) & PMEStatus);
+        RTL_W8(Cfg9346, Cfg9346_Lock);
+
         *ioaddr_out = ioaddr;
         *dev_out = dev;
 out:
@@ -1612,49 +1708,6 @@ rtl8169_remove_one(struct pci_dev *pdev)
         pci_set_drvdata(pdev, NULL);
 }
 
-#ifdef CONFIG_PM
-
-static int rtl8169_suspend(struct pci_dev *pdev, pm_message_t state)
-{
-        struct net_device *dev = pci_get_drvdata(pdev);
-        struct rtl8169_private *tp = netdev_priv(dev);
-        void __iomem *ioaddr = tp->mmio_addr;
-        unsigned long flags;
-
-        if (!netif_running(dev))
-                return 0;
-        
-        netif_device_detach(dev);
-        netif_stop_queue(dev);
-        spin_lock_irqsave(&tp->lock, flags);
-
-        /* Disable interrupts, stop Rx and Tx */
-        RTL_W16(IntrMask, 0);
-        RTL_W8(ChipCmd, 0);
-                
-        /* Update the error counts. */
-        tp->stats.rx_missed_errors += RTL_R32(RxMissed);
-        RTL_W32(RxMissed, 0);
-        spin_unlock_irqrestore(&tp->lock, flags);
-        
-        return 0;
-}
-
-static int rtl8169_resume(struct pci_dev *pdev)
-{
-        struct net_device *dev = pci_get_drvdata(pdev);
-
-        if (!netif_running(dev))
-            return 0;
-
-        netif_device_attach(dev);
-        rtl8169_hw_start(dev);
-
-        return 0;
-}
-                                                                                
-#endif /* CONFIG_PM */
-
 static void rtl8169_set_rxbufsize(struct rtl8169_private *tp,
                                   struct net_device *dev)
 {
@@ -2700,6 +2753,56 @@ static struct net_device_stats *rtl8169_get_stats(struct net_device *dev)
         return &tp->stats;
 }
 
+#ifdef CONFIG_PM
+
+static int rtl8169_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+        struct net_device *dev = pci_get_drvdata(pdev);
+        struct rtl8169_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        if (!netif_running(dev))
+                goto out;
+
+        netif_device_detach(dev);
+        netif_stop_queue(dev);
+
+        spin_lock_irq(&tp->lock);
+
+        rtl8169_asic_down(ioaddr);
+
+        tp->stats.rx_missed_errors += RTL_R32(RxMissed);
+        RTL_W32(RxMissed, 0);
+
+        spin_unlock_irq(&tp->lock);
+
+        pci_save_state(pdev);
+        pci_enable_wake(pdev, pci_choose_state(pdev, state), tp->wol_enabled);
+        pci_set_power_state(pdev, pci_choose_state(pdev, state));
+out:
+        return 0;
+}
+
+static int rtl8169_resume(struct pci_dev *pdev)
+{
+        struct net_device *dev = pci_get_drvdata(pdev);
+
+        if (!netif_running(dev))
+                goto out;
+
+        netif_device_attach(dev);
+
+        pci_set_power_state(pdev, PCI_D0);
+        pci_restore_state(pdev);
+        pci_enable_wake(pdev, PCI_D0, 0);
+
+        rtl8169_schedule_work(dev, rtl8169_reset_task);
+out:
+        return 0;
+}
+
+#endif /* CONFIG_PM */
+
 static struct pci_driver rtl8169_pci_driver = {
         .name           = MODULENAME,
         .id_table       = rtl8169_pci_tbl,
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 49b597cbc19a..b7f00d6eb6a6 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -4092,6 +4092,7 @@ static void s2io_set_multicast(struct net_device *dev)
                      i++, mclist = mclist->next) {
                         memcpy(sp->usr_addrs[i].addr, mclist->dmi_addr,
                                ETH_ALEN);
+                        mac_addr = 0;
                         for (j = 0; j < ETH_ALEN; j++) {
                                 mac_addr |= mclist->dmi_addr[j];
                                 mac_addr <<= 8;
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index b420182eec4b..ed4bc91638d2 100644
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -1791,6 +1791,8 @@ static int __devinit sis190_init_one(struct pci_dev *pdev,
                 goto out;
         }
 
+        pci_set_drvdata(pdev, dev);
+
         tp = netdev_priv(dev);
         ioaddr = tp->mmio_addr;
 
@@ -1827,8 +1829,6 @@ static int __devinit sis190_init_one(struct pci_dev *pdev,
         if (rc < 0)
                 goto err_remove_mii;
 
-        pci_set_drvdata(pdev, dev);
-
         net_probe(tp, KERN_INFO "%s: %s at %p (IRQ: %d), "
                "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n",
                pci_name(pdev), sis_chip_info[ent->driver_data].name,
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index 3d95fa20cd88..7a952fe60be2 100644
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -540,7 +540,7 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
         printk("%2.2x.\n", net_dev->dev_addr[i]);
 
         /* Detect Wake on Lan support */
-        ret = inl(CFGPMC & PMESP);
+        ret = (inl(net_dev->base_addr + CFGPMC) & PMESP) >> 27;
         if (netif_msg_probe(sis_priv) && (ret & PME_D3C) == 0)
                 printk(KERN_INFO "%s: Wake on LAN only available from suspend to RAM.", net_dev->name);
 
@@ -2040,7 +2040,7 @@ static int sis900_set_wol(struct net_device *net_dev, struct ethtool_wolinfo *wo
 
         if (wol->wolopts == 0) {
                 pci_read_config_dword(sis_priv->pci_dev, CFGPMCSR, &cfgpmcsr);
-                cfgpmcsr |= ~PME_EN;
+                cfgpmcsr &= ~PME_EN;
                 pci_write_config_dword(sis_priv->pci_dev, CFGPMCSR, cfgpmcsr);
                 outl(pmctrl_bits, pmctrl_addr);
                 if (netif_msg_wol(sis_priv))
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index bf55a4cfb3d2..25e028b7ce48 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -879,13 +879,12 @@ static int __xm_phy_read(struct skge_hw *hw, int port, u16 reg, u16 *val)
         int i;
 
         xm_write16(hw, port, XM_PHY_ADDR, reg | hw->phy_addr);
-        xm_read16(hw, port, XM_PHY_DATA);
+        *val = xm_read16(hw, port, XM_PHY_DATA);
 
-        /* Need to wait for external PHY */
         for (i = 0; i < PHY_RETRIES; i++) {
-                udelay(1);
                 if (xm_read16(hw, port, XM_MMU_CMD) & XM_MMU_PHY_RDY)
                         goto ready;
+                udelay(1);
         }
 
         return -ETIMEDOUT;
@@ -918,7 +917,12 @@ static int xm_phy_write(struct skge_hw *hw, int port, u16 reg, u16 val)
 
  ready:
         xm_write16(hw, port, XM_PHY_DATA, val);
-        return 0;
+        for (i = 0; i < PHY_RETRIES; i++) {
+                if (!(xm_read16(hw, port, XM_MMU_CMD) & XM_MMU_PHY_BUSY))
+                        return 0;
+                udelay(1);
+        }
+        return -ETIMEDOUT;
 }
 
 static void genesis_init(struct skge_hw *hw)
@@ -1168,13 +1172,17 @@ static void genesis_mac_init(struct skge_hw *hw, int port)
         u32 r;
         const u8 zero[6]  = { 0 };
 
-        /* Clear MIB counters */
-        xm_write16(hw, port, XM_STAT_CMD,
-                        XM_SC_CLR_RXC | XM_SC_CLR_TXC);
-        /* Clear two times according to Errata #3 */
-        xm_write16(hw, port, XM_STAT_CMD,
-                        XM_SC_CLR_RXC | XM_SC_CLR_TXC);
+        for (i = 0; i < 10; i++) {
+                skge_write16(hw, SK_REG(port, TX_MFF_CTRL1),
+                             MFF_SET_MAC_RST);
+                if (skge_read16(hw, SK_REG(port, TX_MFF_CTRL1)) & MFF_SET_MAC_RST)
+                        goto reset_ok;
+                udelay(1);
+        }
 
+        printk(KERN_WARNING PFX "%s: genesis reset failed\n", dev->name);
+
+ reset_ok:
         /* Unreset the XMAC. */
         skge_write16(hw, SK_REG(port, TX_MFF_CTRL1), MFF_CLR_MAC_RST);
 
@@ -1191,7 +1199,7 @@ static void genesis_mac_init(struct skge_hw *hw, int port)
                 r |= GP_DIR_2|GP_IO_2;
 
         skge_write32(hw, B2_GP_IO, r);
-        skge_read32(hw, B2_GP_IO);
+
 
         /* Enable GMII interface */
         xm_write16(hw, port, XM_HW_CFG, XM_HW_GMII_MD);
@@ -1205,6 +1213,13 @@ static void genesis_mac_init(struct skge_hw *hw, int port)
         for (i = 1; i < 16; i++)
                 xm_outaddr(hw, port, XM_EXM(i), zero);
 
+        /* Clear MIB counters */
+        xm_write16(hw, port, XM_STAT_CMD,
+                        XM_SC_CLR_RXC | XM_SC_CLR_TXC);
+        /* Clear two times according to Errata #3 */
+        xm_write16(hw, port, XM_STAT_CMD,
+                        XM_SC_CLR_RXC | XM_SC_CLR_TXC);
+
         /* configure Rx High Water Mark (XM_RX_HI_WM) */
         xm_write16(hw, port, XM_RX_HI_WM, 1450);
 
@@ -1697,6 +1712,7 @@ static void yukon_mac_init(struct skge_hw *hw, int port)
         skge_write32(hw, SK_REG(port, GPHY_CTRL), reg | GPC_RST_SET);
         skge_write32(hw, SK_REG(port, GPHY_CTRL), reg | GPC_RST_CLR);
         skge_write32(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_ON | GMC_RST_CLR);
+
         if (skge->autoneg == AUTONEG_DISABLE) {
                 reg = GM_GPCR_AU_ALL_DIS;
                 gma_write16(hw, port, GM_GP_CTRL,
@@ -1704,16 +1720,23 @@ static void yukon_mac_init(struct skge_hw *hw, int port)
 
                 switch (skge->speed) {
                 case SPEED_1000:
+                        reg &= ~GM_GPCR_SPEED_100;
                         reg |= GM_GPCR_SPEED_1000;
-                        /* fallthru */
+                        break;
                 case SPEED_100:
+                        reg &= ~GM_GPCR_SPEED_1000;
                         reg |= GM_GPCR_SPEED_100;
+                        break;
+                case SPEED_10:
+                        reg &= ~(GM_GPCR_SPEED_1000 | GM_GPCR_SPEED_100);
+                        break;
                 }
 
                 if (skge->duplex == DUPLEX_FULL)
                         reg |= GM_GPCR_DUP_FULL;
         } else
                 reg = GM_GPCR_SPEED_1000 | GM_GPCR_SPEED_100 | GM_GPCR_DUP_FULL;
+
         switch (skge->flow_control) {
         case FLOW_MODE_NONE:
                 skge_write32(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_OFF);
@@ -2162,8 +2185,10 @@ static int skge_up(struct net_device *dev)
         skge->tx_avail = skge->tx_ring.count - 1;
 
         /* Enable IRQ from port */
+        spin_lock_irq(&hw->hw_lock);
         hw->intr_mask |= portirqmask[port];
         skge_write32(hw, B0_IMSK, hw->intr_mask);
+        spin_unlock_irq(&hw->hw_lock);
 
         /* Initialize MAC */
         spin_lock_bh(&hw->phy_lock);
@@ -2221,8 +2246,10 @@ static int skge_down(struct net_device *dev)
         else
                 yukon_stop(skge);
 
+        spin_lock_irq(&hw->hw_lock);
         hw->intr_mask &= ~portirqmask[skge->port];
         skge_write32(hw, B0_IMSK, hw->intr_mask);
+        spin_unlock_irq(&hw->hw_lock);
 
         /* Stop transmitter */
         skge_write8(hw, Q_ADDR(txqaddr[port], Q_CSR), CSR_STOP);
@@ -2670,8 +2697,7 @@ static int skge_poll(struct net_device *dev, int *budget)
 
         /* restart receiver */
         wmb();
-        skge_write8(hw, Q_ADDR(rxqaddr[skge->port], Q_CSR),
-                    CSR_START | CSR_IRQ_CL_F);
+        skge_write8(hw, Q_ADDR(rxqaddr[skge->port], Q_CSR), CSR_START);
 
         *budget -= work_done;
         dev->quota -= work_done;
@@ -2679,10 +2705,11 @@ static int skge_poll(struct net_device *dev, int *budget)
         if (work_done >=  to_do)
                 return 1; /* not done */
 
-        netif_rx_complete(dev);
-        hw->intr_mask |= portirqmask[skge->port];
-        skge_write32(hw, B0_IMSK, hw->intr_mask);
-        skge_read32(hw, B0_IMSK);
+        spin_lock_irq(&hw->hw_lock);
+        __netif_rx_complete(dev);
+        hw->intr_mask |= portirqmask[skge->port];
+        skge_write32(hw, B0_IMSK, hw->intr_mask);
+        spin_unlock_irq(&hw->hw_lock);
 
         return 0;
 }
@@ -2842,18 +2869,10 @@ static void skge_extirq(unsigned long data)
         }
         spin_unlock(&hw->phy_lock);
 
-        local_irq_disable();
+        spin_lock_irq(&hw->hw_lock);
         hw->intr_mask |= IS_EXT_REG;
         skge_write32(hw, B0_IMSK, hw->intr_mask);
-        local_irq_enable();
-}
-
-static inline void skge_wakeup(struct net_device *dev)
-{
-        struct skge_port *skge = netdev_priv(dev);
-
-        prefetch(skge->rx_ring.to_clean);
-        netif_rx_schedule(dev);
+        spin_unlock_irq(&hw->hw_lock);
 }
 
 static irqreturn_t skge_intr(int irq, void *dev_id, struct pt_regs *regs)
@@ -2864,15 +2883,17 @@ static irqreturn_t skge_intr(int irq, void *dev_id, struct pt_regs *regs)
         if (status == 0 || status == ~0) /* hotplug or shared irq */
                 return IRQ_NONE;
 
-        status &= hw->intr_mask;
+        spin_lock(&hw->hw_lock);
         if (status & IS_R1_F) {
+                skge_write8(hw, Q_ADDR(Q_R1, Q_CSR), CSR_IRQ_CL_F);
                 hw->intr_mask &= ~IS_R1_F;
-                skge_wakeup(hw->dev[0]);
+                netif_rx_schedule(hw->dev[0]);
         }
 
         if (status & IS_R2_F) {
+                skge_write8(hw, Q_ADDR(Q_R2, Q_CSR), CSR_IRQ_CL_F);
                 hw->intr_mask &= ~IS_R2_F;
-                skge_wakeup(hw->dev[1]);
+                netif_rx_schedule(hw->dev[1]);
         }
 
         if (status & IS_XA1_F)
@@ -2914,6 +2935,7 @@ static irqreturn_t skge_intr(int irq, void *dev_id, struct pt_regs *regs)
         }
 
         skge_write32(hw, B0_IMSK, hw->intr_mask);
+        spin_unlock(&hw->hw_lock);
 
         return IRQ_HANDLED;
 }
@@ -3282,6 +3304,7 @@ static int __devinit skge_probe(struct pci_dev *pdev,
 
         hw->pdev = pdev;
         spin_lock_init(&hw->phy_lock);
+        spin_lock_init(&hw->hw_lock);
         tasklet_init(&hw->ext_tasklet, skge_extirq, (unsigned long) hw);
 
         hw->regs = ioremap_nocache(pci_resource_start(pdev, 0), 0x4000);
diff --git a/drivers/net/skge.h b/drivers/net/skge.h
index 2efdacc290e5..941f12a333b6 100644
--- a/drivers/net/skge.h
+++ b/drivers/net/skge.h
@@ -2402,6 +2402,7 @@ struct skge_hw {
 
         struct tasklet_struct ext_tasklet;
         spinlock_t           phy_lock;
+        spinlock_t           hw_lock;
 };
 
 enum {
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index cae2edf23004..73260364cba3 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -74,7 +74,7 @@
 #define TX_RING_SIZE            512
 #define TX_DEF_PENDING          (TX_RING_SIZE - 1)
 #define TX_MIN_PENDING          64
-#define MAX_SKB_TX_LE           (4 + 2*MAX_SKB_FRAGS)
+#define MAX_SKB_TX_LE           (4 + (sizeof(dma_addr_t)/sizeof(u32))*MAX_SKB_FRAGS)
 
 #define STATUS_RING_SIZE        2048    /* 2 ports * (TX + 2*RX) */
 #define STATUS_LE_BYTES         (STATUS_RING_SIZE*sizeof(struct sky2_status_le))
@@ -96,10 +96,6 @@ static int copybreak __read_mostly = 256;
 module_param(copybreak, int, 0);
 MODULE_PARM_DESC(copybreak, "Receive copy threshold");
 
-static int disable_msi = 0;
-module_param(disable_msi, int, 0);
-MODULE_PARM_DESC(disable_msi, "Disable Message Signaled Interrupt (MSI)");
-
 static const struct pci_device_id sky2_id_table[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9000) },
         { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9E00) },
@@ -195,11 +191,11 @@ static int sky2_set_power_state(struct sky2_hw *hw, pci_power_t state)
         pr_debug("sky2_set_power_state %d\n", state);
         sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
 
-        pci_read_config_word(hw->pdev, hw->pm_cap + PCI_PM_PMC, &power_control);
+        power_control = sky2_pci_read16(hw, hw->pm_cap + PCI_PM_PMC);
         vaux = (sky2_read16(hw, B0_CTST) & Y2_VAUX_AVAIL) &&
                 (power_control & PCI_PM_CAP_PME_D3cold);
 
-        pci_read_config_word(hw->pdev, hw->pm_cap + PCI_PM_CTRL, &power_control);
+        power_control = sky2_pci_read16(hw, hw->pm_cap + PCI_PM_CTRL);
 
         power_control |= PCI_PM_CTRL_PME_STATUS;
         power_control &= ~(PCI_PM_CTRL_STATE_MASK);
@@ -223,7 +219,7 @@ static int sky2_set_power_state(struct sky2_hw *hw, pci_power_t state)
                         sky2_write8(hw, B2_Y2_CLK_GATE, 0);
 
                 /* Turn off phy power saving */
-                pci_read_config_dword(hw->pdev, PCI_DEV_REG1, &reg1);
+                reg1 = sky2_pci_read32(hw, PCI_DEV_REG1);
                 reg1 &= ~(PCI_Y2_PHY1_POWD | PCI_Y2_PHY2_POWD);
 
                 /* looks like this XL is back asswards .. */
@@ -232,18 +228,28 @@ static int sky2_set_power_state(struct sky2_hw *hw, pci_power_t state)
                         if (hw->ports > 1)
                                 reg1 |= PCI_Y2_PHY2_COMA;
                 }
-                pci_write_config_dword(hw->pdev, PCI_DEV_REG1, reg1);
+
+                if (hw->chip_id == CHIP_ID_YUKON_EC_U) {
+                        sky2_pci_write32(hw, PCI_DEV_REG3, 0);
+                        reg1 = sky2_pci_read32(hw, PCI_DEV_REG4);
+                        reg1 &= P_ASPM_CONTROL_MSK;
+                        sky2_pci_write32(hw, PCI_DEV_REG4, reg1);
+                        sky2_pci_write32(hw, PCI_DEV_REG5, 0);
+                }
+
+                sky2_pci_write32(hw, PCI_DEV_REG1, reg1);
+
                 break;
 
         case PCI_D3hot:
         case PCI_D3cold:
                 /* Turn on phy power saving */
-                pci_read_config_dword(hw->pdev, PCI_DEV_REG1, &reg1);
+                reg1 = sky2_pci_read32(hw, PCI_DEV_REG1);
                 if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev > 1)
                         reg1 &= ~(PCI_Y2_PHY1_POWD | PCI_Y2_PHY2_POWD);
                 else
                         reg1 |= (PCI_Y2_PHY1_POWD | PCI_Y2_PHY2_POWD);
-                pci_write_config_dword(hw->pdev, PCI_DEV_REG1, reg1);
+                sky2_pci_write32(hw, PCI_DEV_REG1, reg1);
 
                 if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev > 1)
                         sky2_write8(hw, B2_Y2_CLK_GATE, 0);
@@ -265,7 +271,7 @@ static int sky2_set_power_state(struct sky2_hw *hw, pci_power_t state)
                 ret = -1;
         }
 
-        pci_write_config_byte(hw->pdev, hw->pm_cap + PCI_PM_CTRL, power_control);
+        sky2_pci_write16(hw, hw->pm_cap + PCI_PM_CTRL, power_control);
         sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
         return ret;
 }
@@ -463,16 +469,31 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
                 ledover |= PHY_M_LED_MO_RX(MO_LED_OFF);
         }
 
-        gm_phy_write(hw, port, PHY_MARV_LED_CTRL, ledctrl);
+        if (hw->chip_id == CHIP_ID_YUKON_EC_U && hw->chip_rev >= 2) {
+                /* apply fixes in PHY AFE */
+                gm_phy_write(hw, port, 22, 255);
+                /* increase differential signal amplitude in 10BASE-T */
+                gm_phy_write(hw, port, 24, 0xaa99);
+                gm_phy_write(hw, port, 23, 0x2011);
 
-        if (sky2->autoneg == AUTONEG_DISABLE || sky2->speed == SPEED_100) {
-                /* turn on 100 Mbps LED (LED_LINK100) */
-                ledover |= PHY_M_LED_MO_100(MO_LED_ON);
-        }
+                /* fix for IEEE A/B Symmetry failure in 1000BASE-T */
+                gm_phy_write(hw, port, 24, 0xa204);
+                gm_phy_write(hw, port, 23, 0x2002);
 
-        if (ledover)
-                gm_phy_write(hw, port, PHY_MARV_LED_OVER, ledover);
+                /* set page register to 0 */
+                gm_phy_write(hw, port, 22, 0);
+        } else {
+                gm_phy_write(hw, port, PHY_MARV_LED_CTRL, ledctrl);
+
+                if (sky2->autoneg == AUTONEG_DISABLE || sky2->speed == SPEED_100) {
+                        /* turn on 100 Mbps LED (LED_LINK100) */
+                        ledover |= PHY_M_LED_MO_100(MO_LED_ON);
+                }
+
+                if (ledover)
+                        gm_phy_write(hw, port, PHY_MARV_LED_OVER, ledover);
 
+        }
         /* Enable phy interrupt on auto-negotiation complete (or link up) */
         if (sky2->autoneg == AUTONEG_ENABLE)
                 gm_phy_write(hw, port, PHY_MARV_INT_MASK, PHY_M_IS_AN_COMPL);
@@ -520,10 +541,16 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port)
 
                 switch (sky2->speed) {
                 case SPEED_1000:
+                        reg &= ~GM_GPCR_SPEED_100;
                         reg |= GM_GPCR_SPEED_1000;
-                        /* fallthru */
+                        break;
                 case SPEED_100:
+                        reg &= ~GM_GPCR_SPEED_1000;
                         reg |= GM_GPCR_SPEED_100;
+                        break;
+                case SPEED_10:
+                        reg &= ~(GM_GPCR_SPEED_1000 | GM_GPCR_SPEED_100);
+                        break;
                 }
 
                 if (sky2->duplex == DUPLEX_FULL)
@@ -595,8 +622,8 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port)
 
         /* Configure Rx MAC FIFO */
         sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_CLR);
-        sky2_write16(hw, SK_REG(port, RX_GMF_CTRL_T),
-                     GMF_RX_CTRL_DEF);
+        sky2_write32(hw, SK_REG(port, RX_GMF_CTRL_T),
+                     GMF_OPER_ON | GMF_RX_F_FL_ON);
 
         /* Flush Rx MAC FIFO on any flow control or error */
         sky2_write16(hw, SK_REG(port, RX_GMF_FL_MSK), GMR_FS_ANY_ERR);
@@ -947,6 +974,12 @@ static int sky2_rx_start(struct sky2_port *sky2)
 
         sky2->rx_put = sky2->rx_next = 0;
         sky2_qset(hw, rxq);
+
+        if (hw->chip_id == CHIP_ID_YUKON_EC_U && hw->chip_rev >= 2) {
+                /* MAC Rx RAM Read is controlled by hardware */
+                sky2_write32(hw, Q_ADDR(rxq, Q_F), F_M_RX_RAM_DIS);
+        }
+
         sky2_prefetch_init(hw, rxq, sky2->rx_le_map, RX_LE_SIZE - 1);
 
         rx_set_checksum(sky2);
@@ -962,6 +995,10 @@ static int sky2_rx_start(struct sky2_port *sky2)
                 sky2_rx_add(sky2, re->mapaddr);
         }
 
+        /* Truncate oversize frames */
+        sky2_write16(hw, SK_REG(sky2->port, RX_GMF_TR_THR), sky2->rx_bufsize - 8);
+        sky2_write32(hw, SK_REG(sky2->port, RX_GMF_CTRL_T), RX_TRUNC_ON);
+
         /* Tell chip about available buffers */
         sky2_write16(hw, Y2_QADDR(rxq, PREF_UNIT_PUT_IDX), sky2->rx_put);
         sky2->rx_last_put = sky2_read16(hw, Y2_QADDR(rxq, PREF_UNIT_PUT_IDX));
@@ -1029,9 +1066,10 @@ static int sky2_up(struct net_device *dev)
                     RB_RST_SET);
 
         sky2_qset(hw, txqaddr[port]);
-        if (hw->chip_id == CHIP_ID_YUKON_EC_U)
-                sky2_write16(hw, Q_ADDR(txqaddr[port], Q_AL), 0x1a0);
 
+        /* Set almost empty threshold */
+        if (hw->chip_id == CHIP_ID_YUKON_EC_U && hw->chip_rev == 1)
+                sky2_write16(hw, Q_ADDR(txqaddr[port], Q_AL), 0x1a0);
 
         sky2_prefetch_init(hw, txqaddr[port], sky2->tx_le_map,
                            TX_RING_SIZE - 1);
@@ -1041,8 +1079,10 @@ static int sky2_up(struct net_device *dev)
                 goto err_out;
 
         /* Enable interrupts from phy/mac for port */
+        spin_lock_irq(&hw->hw_lock);
         hw->intr_mask |= (port == 0) ? Y2_IS_PORT_1 : Y2_IS_PORT_2;
         sky2_write32(hw, B0_IMSK, hw->intr_mask);
+        spin_unlock_irq(&hw->hw_lock);
         return 0;
 
 err_out:
@@ -1109,6 +1149,7 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
         struct sky2_tx_le *le = NULL;
         struct tx_ring_info *re;
         unsigned i, len;
+        int avail;
         dma_addr_t mapping;
         u32 addr64;
         u16 mss;
@@ -1251,12 +1292,16 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
         re->idx = sky2->tx_prod;
         le->ctrl |= EOP;
 
+        avail = tx_avail(sky2);
+        if (mss != 0 || avail < TX_MIN_PENDING) {
+                le->ctrl |= FRC_STAT;
+                if (avail <= MAX_SKB_TX_LE)
+                        netif_stop_queue(dev);
+        }
+
         sky2_put_idx(hw, txqaddr[sky2->port], sky2->tx_prod,
                      &sky2->tx_last_put, TX_RING_SIZE);
 
-        if (tx_avail(sky2) <= MAX_SKB_TX_LE)
-                netif_stop_queue(dev);
-
 out_unlock:
         spin_unlock(&sky2->tx_lock);
 
@@ -1342,10 +1387,10 @@ static int sky2_down(struct net_device *dev)
         netif_stop_queue(dev);
 
         /* Disable port IRQ */
-        local_irq_disable();
+        spin_lock_irq(&hw->hw_lock);
         hw->intr_mask &= ~((sky2->port == 0) ? Y2_IS_IRQ_PHY1 : Y2_IS_IRQ_PHY2);
         sky2_write32(hw, B0_IMSK, hw->intr_mask);
-        local_irq_enable();
+        spin_unlock_irq(&hw->hw_lock);
 
         flush_scheduled_work();
 
@@ -1446,6 +1491,29 @@ static void sky2_link_up(struct sky2_port *sky2)
         sky2_write8(hw, SK_REG(port, GMAC_IRQ_MSK), GMAC_DEF_MSK);
 
         reg = gma_read16(hw, port, GM_GP_CTRL);
+        if (sky2->autoneg == AUTONEG_DISABLE) {
+                reg |= GM_GPCR_AU_ALL_DIS;
+
+                /* Is write/read necessary?  Copied from sky2_mac_init */
+                gma_write16(hw, port, GM_GP_CTRL, reg);
+                gma_read16(hw, port, GM_GP_CTRL);
+
+                switch (sky2->speed) {
+                case SPEED_1000:
+                        reg &= ~GM_GPCR_SPEED_100;
+                        reg |= GM_GPCR_SPEED_1000;
+                        break;
+                case SPEED_100:
+                        reg &= ~GM_GPCR_SPEED_1000;
+                        reg |= GM_GPCR_SPEED_100;
+                        break;
+                case SPEED_10:
+                        reg &= ~(GM_GPCR_SPEED_1000 | GM_GPCR_SPEED_100);
+                        break;
+                }
+        } else
+                reg &= ~GM_GPCR_AU_ALL_DIS;
+
         if (sky2->duplex == DUPLEX_FULL || sky2->autoneg == AUTONEG_ENABLE)
                 reg |= GM_GPCR_DUP_FULL;
 
@@ -1604,10 +1672,10 @@ static void sky2_phy_task(void *arg)
 out:
         up(&sky2->phy_sema);
 
-        local_irq_disable();
+        spin_lock_irq(&hw->hw_lock);
         hw->intr_mask |= (sky2->port == 0) ? Y2_IS_IRQ_PHY1 : Y2_IS_IRQ_PHY2;
         sky2_write32(hw, B0_IMSK, hw->intr_mask);
-        local_irq_enable();
+        spin_unlock_irq(&hw->hw_lock);
 }
 
 
@@ -1648,10 +1716,12 @@ static void sky2_tx_timeout(struct net_device *dev)
 
 
 #define roundup(x, y)   ((((x)+((y)-1))/(y))*(y))
-/* Want receive buffer size to be multiple of 64 bits, and incl room for vlan */
+/* Want receive buffer size to be multiple of 64 bits
+ * and incl room for vlan and truncation
+ */
 static inline unsigned sky2_buf_size(int mtu)
 {
-        return roundup(mtu + ETH_HLEN + 4, 8);
+        return roundup(mtu + ETH_HLEN + VLAN_HLEN, 8) + 8;
 }
 
 static int sky2_change_mtu(struct net_device *dev, int new_mtu)
@@ -1734,7 +1804,7 @@ static struct sk_buff *sky2_receive(struct sky2_port *sky2,
         if (!(status & GMR_FS_RX_OK))
                 goto resubmit;
 
-        if ((status >> 16) != length || length > sky2->rx_bufsize)
+        if (length > sky2->netdev->mtu + ETH_HLEN)
                 goto oversize;
 
         if (length < copybreak) {
@@ -1834,6 +1904,17 @@ static int sky2_poll(struct net_device *dev0, int *budget)
 
         sky2_write32(hw, STAT_CTRL, SC_STAT_CLR_IRQ);
 
+        /*
+         * Kick the STAT_LEV_TIMER_CTRL timer.
+         * This fixes my hangs on Yukon-EC (0xb6) rev 1.
+         * The if clause is there to start the timer only if it has been
+         * configured correctly and not been disabled via ethtool.
+         */
+        if (sky2_read8(hw, STAT_LEV_TIMER_CTRL) == TIM_START) {
+                sky2_write8(hw, STAT_LEV_TIMER_CTRL, TIM_STOP);
+                sky2_write8(hw, STAT_LEV_TIMER_CTRL, TIM_START);
+        }
+
         hwidx = sky2_read16(hw, STAT_PUT_IDX);
         BUG_ON(hwidx >= STATUS_RING_SIZE);
         rmb();
@@ -1916,16 +1997,19 @@ exit_loop:
         sky2_tx_check(hw, 0, tx_done[0]);
         sky2_tx_check(hw, 1, tx_done[1]);
 
+        if (sky2_read8(hw, STAT_TX_TIMER_CTRL) == TIM_START) {
+                sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_STOP);
+                sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_START);
+        }
+
         if (likely(work_done < to_do)) {
-                /* need to restart TX timer */
-                if (is_ec_a1(hw)) {
-                        sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_STOP);
-                        sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_START);
-                }
+                spin_lock_irq(&hw->hw_lock);
+                __netif_rx_complete(dev0);
 
-                netif_rx_complete(dev0);
                 hw->intr_mask |= Y2_IS_STAT_BMU;
                 sky2_write32(hw, B0_IMSK, hw->intr_mask);
+                spin_unlock_irq(&hw->hw_lock);
+
                 return 0;
         } else {
                 *budget -= work_done;
@@ -1988,13 +2072,13 @@ static void sky2_hw_intr(struct sky2_hw *hw)
         if (status & (Y2_IS_MST_ERR | Y2_IS_IRQ_STAT)) {
                 u16 pci_err;
 
-                pci_read_config_word(hw->pdev, PCI_STATUS, &pci_err);
+                pci_err = sky2_pci_read16(hw, PCI_STATUS);
                 if (net_ratelimit())
                         printk(KERN_ERR PFX "%s: pci hw error (0x%x)\n",
                                pci_name(hw->pdev), pci_err);
 
                 sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
-                pci_write_config_word(hw->pdev, PCI_STATUS,
+                sky2_pci_write16(hw, PCI_STATUS,
                                       pci_err | PCI_STATUS_ERROR_BITS);
                 sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
         }
@@ -2003,7 +2087,7 @@ static void sky2_hw_intr(struct sky2_hw *hw)
                 /* PCI-Express uncorrectable Error occurred */
                 u32 pex_err;
 
-                pci_read_config_dword(hw->pdev, PEX_UNC_ERR_STAT, &pex_err);
+                pex_err = sky2_pci_read32(hw, PEX_UNC_ERR_STAT);
 
                 if (net_ratelimit())
                         printk(KERN_ERR PFX "%s: pci express error (0x%x)\n",
@@ -2011,7 +2095,7 @@ static void sky2_hw_intr(struct sky2_hw *hw)
 
                 /* clear the interrupt */
                 sky2_write32(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
-                pci_write_config_dword(hw->pdev, PEX_UNC_ERR_STAT,
+                sky2_pci_write32(hw, PEX_UNC_ERR_STAT,
                                        0xffffffffUL);
                 sky2_write32(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
 
@@ -2057,6 +2141,7 @@ static void sky2_phy_intr(struct sky2_hw *hw, unsigned port)
 
         hw->intr_mask &= ~(port == 0 ? Y2_IS_IRQ_PHY1 : Y2_IS_IRQ_PHY2);
         sky2_write32(hw, B0_IMSK, hw->intr_mask);
+
         schedule_work(&sky2->phy_task);
 }
 
@@ -2070,6 +2155,7 @@ static irqreturn_t sky2_intr(int irq, void *dev_id, struct pt_regs *regs)
         if (status == 0 || status == ~0)
                 return IRQ_NONE;
 
+        spin_lock(&hw->hw_lock);
         if (status & Y2_IS_HW_ERR)
                 sky2_hw_intr(hw);
 
@@ -2098,7 +2184,7 @@ static irqreturn_t sky2_intr(int irq, void *dev_id, struct pt_regs *regs)
 
         sky2_write32(hw, B0_Y2_SP_ICR, 2);
 
-        sky2_read32(hw, B0_IMSK);
+        spin_unlock(&hw->hw_lock);
 
         return IRQ_HANDLED;
 }
@@ -2141,7 +2227,7 @@ static int sky2_reset(struct sky2_hw *hw)
 {
         u16 status;
         u8 t8, pmd_type;
-        int i, err;
+        int i;
 
         sky2_write8(hw, B0_CTST, CS_RST_CLR);
 
@@ -2163,25 +2249,18 @@ static int sky2_reset(struct sky2_hw *hw)
         sky2_write8(hw, B0_CTST, CS_RST_CLR);
 
         /* clear PCI errors, if any */
-        err = pci_read_config_word(hw->pdev, PCI_STATUS, &status);
-        if (err)
-                goto pci_err;
+        status = sky2_pci_read16(hw, PCI_STATUS);
 
         sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
-        err = pci_write_config_word(hw->pdev, PCI_STATUS,
-                                    status | PCI_STATUS_ERROR_BITS);
-        if (err)
-                goto pci_err;
+        sky2_pci_write16(hw, PCI_STATUS, status | PCI_STATUS_ERROR_BITS);
+
 
         sky2_write8(hw, B0_CTST, CS_MRST_CLR);
 
         /* clear any PEX errors */
-        if (pci_find_capability(hw->pdev, PCI_CAP_ID_EXP)) {
-                err = pci_write_config_dword(hw->pdev, PEX_UNC_ERR_STAT,
-                                                 0xffffffffUL);
-                if (err)
-                        goto pci_err;
-        }
+        if (pci_find_capability(hw->pdev, PCI_CAP_ID_EXP)) 
+                sky2_pci_write32(hw, PEX_UNC_ERR_STAT, 0xffffffffUL);
+
 
         pmd_type = sky2_read8(hw, B2_PMD_TYP);
         hw->copper = !(pmd_type == 'L' || pmd_type == 'S');
@@ -2280,8 +2359,7 @@ static int sky2_reset(struct sky2_hw *hw)
                         sky2_write8(hw, STAT_FIFO_ISR_WM, 16);
 
                 sky2_write32(hw, STAT_TX_TIMER_INI, sky2_us2clk(hw, 1000));
-                sky2_write32(hw, STAT_LEV_TIMER_INI, sky2_us2clk(hw, 100));
-                sky2_write32(hw, STAT_ISR_TIMER_INI, sky2_us2clk(hw, 20));
+                sky2_write32(hw, STAT_ISR_TIMER_INI, sky2_us2clk(hw, 7));
         }
 
         /* enable status unit */
@@ -2292,14 +2370,6 @@ static int sky2_reset(struct sky2_hw *hw)
         sky2_write8(hw, STAT_ISR_TIMER_CTRL, TIM_START);
 
         return 0;
-
-pci_err:
-        /* This is to catch a BIOS bug workaround where
-         * mmconfig table doesn't have other buses.
-         */
-        printk(KERN_ERR PFX "%s: can't access PCI config space\n",
-               pci_name(hw->pdev));
-        return err;
 }
 
 static u32 sky2_supported_modes(const struct sky2_hw *hw)
@@ -2823,11 +2893,11 @@ static int sky2_set_coalesce(struct net_device *dev,
             (ecmd->rx_coalesce_usecs_irq < tmin || ecmd->rx_coalesce_usecs_irq > tmax))
                 return -EINVAL;
 
-        if (ecmd->tx_max_coalesced_frames > 0xffff)
+        if (ecmd->tx_max_coalesced_frames >= TX_RING_SIZE-1)
                 return -EINVAL;
-        if (ecmd->rx_max_coalesced_frames > 0xff)
+        if (ecmd->rx_max_coalesced_frames > RX_MAX_PENDING)
                 return -EINVAL;
-        if (ecmd->rx_max_coalesced_frames_irq > 0xff)
+        if (ecmd->rx_max_coalesced_frames_irq >RX_MAX_PENDING)
                 return -EINVAL;
 
         if (ecmd->tx_coalesce_usecs == 0)
@@ -3063,61 +3133,6 @@ static void __devinit sky2_show_addr(struct net_device *dev)
                        dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
 }
 
-/* Handle software interrupt used during MSI test */
-static irqreturn_t __devinit sky2_test_intr(int irq, void *dev_id,
-                                            struct pt_regs *regs)
-{
-        struct sky2_hw *hw = dev_id;
-        u32 status = sky2_read32(hw, B0_Y2_SP_ISRC2);
-
-        if (status == 0)
-                return IRQ_NONE;
-
-        if (status & Y2_IS_IRQ_SW) {
-                sky2_write8(hw, B0_CTST, CS_CL_SW_IRQ);
-                hw->msi = 1;
-        }
-        sky2_write32(hw, B0_Y2_SP_ICR, 2);
-
-        sky2_read32(hw, B0_IMSK);
-        return IRQ_HANDLED;
-}
-
-/* Test interrupt path by forcing a a software IRQ */
-static int __devinit sky2_test_msi(struct sky2_hw *hw)
-{
-        struct pci_dev *pdev = hw->pdev;
-        int i, err;
-
-        sky2_write32(hw, B0_IMSK, Y2_IS_IRQ_SW);
-
-        err = request_irq(pdev->irq, sky2_test_intr, SA_SHIRQ, DRV_NAME, hw);
-        if (err) {
-                printk(KERN_ERR PFX "%s: cannot assign irq %d\n",
-                       pci_name(pdev), pdev->irq);
-                return err;
-        }
-
-        sky2_write8(hw, B0_CTST, CS_ST_SW_IRQ);
-        wmb();
-
-        for (i = 0; i < 10; i++) {
-                barrier();
-                if (hw->msi)
-                        goto found;
-                mdelay(1);
-        }
-
-        err = -EOPNOTSUPP;
-        sky2_write8(hw, B0_CTST, CS_CL_SW_IRQ);
- found:
-        sky2_write32(hw, B0_IMSK, 0);
-
-        free_irq(pdev->irq, hw);
-
-        return err;
-}
-
 static int __devinit sky2_probe(struct pci_dev *pdev,
                                 const struct pci_device_id *ent)
 {
@@ -3169,17 +3184,6 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
                 }
         }
 
-#ifdef __BIG_ENDIAN
-        /* byte swap descriptors in hardware */
-        {
-                u32 reg;
-
-                pci_read_config_dword(pdev, PCI_DEV_REG2, &reg);
-                reg |= PCI_REV_DESC;
-                pci_write_config_dword(pdev, PCI_DEV_REG2, reg);
-        }
-#endif
-
         err = -ENOMEM;
         hw = kzalloc(sizeof(*hw), GFP_KERNEL);
         if (!hw) {
@@ -3197,6 +3201,18 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
                 goto err_out_free_hw;
         }
         hw->pm_cap = pm_cap;
+        spin_lock_init(&hw->hw_lock);
+
+#ifdef __BIG_ENDIAN
+        /* byte swap descriptors in hardware */
+        {
+                u32 reg;
+
+                reg = sky2_pci_read32(hw, PCI_DEV_REG2);
+                reg |= PCI_REV_DESC;
+                sky2_pci_write32(hw, PCI_DEV_REG2, reg);
+        }
+#endif
 
         /* ring for status responses */
         hw->st_le = pci_alloc_consistent(hw->pdev, STATUS_LE_BYTES,
@@ -3238,22 +3254,7 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
                 }
         }
 
-        if (!disable_msi && pci_enable_msi(pdev) == 0) {
-                err = sky2_test_msi(hw);
-                if (err == -EOPNOTSUPP) {
-                        /* MSI test failed, go back to INTx mode */
-                        printk(KERN_WARNING PFX "%s: No interrupt was generated using MSI, "
-                               "switching to INTx mode. Please report this failure to "
-                               "the PCI maintainer and include system chipset information.\n",
-                               pci_name(pdev));
-                        pci_disable_msi(pdev);
-                }
-                else if (err)
-                        goto err_out_unregister;
-        }
-
-        err = request_irq(pdev->irq, sky2_intr, SA_SHIRQ | SA_SAMPLE_RANDOM,
-                          DRV_NAME, hw);
+        err = request_irq(pdev->irq, sky2_intr, SA_SHIRQ, DRV_NAME, hw);
         if (err) {
                 printk(KERN_ERR PFX "%s: cannot assign irq %d\n",
                        pci_name(pdev), pdev->irq);
@@ -3268,8 +3269,6 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
         return 0;
 
 err_out_unregister:
-        if (hw->msi)
-                pci_disable_msi(pdev);
         if (dev1) {
                 unregister_netdev(dev1);
                 free_netdev(dev1);
@@ -3312,8 +3311,6 @@ static void __devexit sky2_remove(struct pci_dev *pdev)
         sky2_read8(hw, B0_CTST);
 
         free_irq(pdev->irq, hw);
-        if (hw->msi)
-                pci_disable_msi(pdev);
         pci_free_consistent(pdev, STATUS_LE_BYTES, hw->st_le, hw->st_dma);
         pci_release_regions(pdev);
         pci_disable_device(pdev);
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
index fd12c289a238..dce955c76f3c 100644
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
@@ -5,14 +5,22 @@
 #define _SKY2_H
 
 /* PCI config registers */
-#define PCI_DEV_REG1    0x40
-#define PCI_DEV_REG2    0x44
-#define PCI_DEV_STATUS  0x7c
-#define PCI_OS_PCI_X    (1<<26)
+enum {
+        PCI_DEV_REG1    = 0x40,
+        PCI_DEV_REG2    = 0x44,
+        PCI_DEV_STATUS  = 0x7c,
+        PCI_DEV_REG3    = 0x80,
+        PCI_DEV_REG4    = 0x84,
+        PCI_DEV_REG5    = 0x88,
+};
 
-#define PEX_LNK_STAT    0xf2
-#define PEX_UNC_ERR_STAT 0x104
-#define PEX_DEV_CTRL    0xe8
+enum {
+        PEX_DEV_CAP     = 0xe4,
+        PEX_DEV_CTRL    = 0xe8,
+        PEX_DEV_STA     = 0xea,
+        PEX_LNK_STAT    = 0xf2,
+        PEX_UNC_ERR_STAT= 0x104,
+};
 
 /* Yukon-2 */
 enum pci_dev_reg_1 {
@@ -37,6 +45,25 @@ enum pci_dev_reg_2 {
         PCI_USEDATA64   = 1<<0,         /* Use 64Bit Data bus ext */
 };
 
+/*      PCI_OUR_REG_4           32 bit  Our Register 4 (Yukon-ECU only) */
+enum pci_dev_reg_4 {
+                                        /* (Link Training & Status State Machine) */
+        P_TIMER_VALUE_MSK       = 0xffL<<16,    /* Bit 23..16:  Timer Value Mask */
+                                        /* (Active State Power Management) */
+        P_FORCE_ASPM_REQUEST    = 1<<15, /* Force ASPM Request (A1 only) */
+        P_ASPM_GPHY_LINK_DOWN   = 1<<14, /* GPHY Link Down (A1 only) */
+        P_ASPM_INT_FIFO_EMPTY   = 1<<13, /* Internal FIFO Empty (A1 only) */
+        P_ASPM_CLKRUN_REQUEST   = 1<<12, /* CLKRUN Request (A1 only) */
+
+        P_ASPM_FORCE_CLKREQ_ENA = 1<<4, /* Force CLKREQ Enable (A1b only) */
+        P_ASPM_CLKREQ_PAD_CTL   = 1<<3, /* CLKREQ PAD Control (A1 only) */
+        P_ASPM_A1_MODE_SELECT   = 1<<2, /* A1 Mode Select (A1 only) */
+        P_CLK_GATE_PEX_UNIT_ENA = 1<<1, /* Enable Gate PEX Unit Clock */
+        P_CLK_GATE_ROOT_COR_ENA = 1<<0, /* Enable Gate Root Core Clock */
+        P_ASPM_CONTROL_MSK      = P_FORCE_ASPM_REQUEST | P_ASPM_GPHY_LINK_DOWN
+                                  | P_ASPM_CLKRUN_REQUEST | P_ASPM_INT_FIFO_EMPTY,
+};
+
 
 #define PCI_STATUS_ERROR_BITS (PCI_STATUS_DETECTED_PARITY | \
                                PCI_STATUS_SIG_SYSTEM_ERROR | \
@@ -507,6 +534,16 @@ enum {
 };
 #define Q_ADDR(reg, offs) (B8_Q_REGS + (reg) + (offs))
 
+/*      Q_F                             32 bit  Flag Register */
+enum {
+        F_ALM_FULL      = 1<<27, /* Rx FIFO: almost full */
+        F_EMPTY         = 1<<27, /* Tx FIFO: empty flag */
+        F_FIFO_EOF      = 1<<26, /* Tag (EOF Flag) bit in FIFO */
+        F_WM_REACHED    = 1<<25, /* Watermark reached */
+        F_M_RX_RAM_DIS  = 1<<24, /* MAC Rx RAM Read Port disable */
+        F_FIFO_LEVEL    = 0x1fL<<16, /* Bit 23..16:     # of Qwords in FIFO */
+        F_WATER_MARK    = 0x0007ffL, /* Bit 10.. 0:     Watermark */
+};
 
 /* Queue Prefetch Unit Offsets, use Y2_QADDR() to address (Yukon-2 only)*/
 enum {
@@ -909,10 +946,12 @@ enum {
         PHY_BCOM_ID1_C0 = 0x6044,
         PHY_BCOM_ID1_C5 = 0x6047,
 
-        PHY_MARV_ID1_B0 = 0x0C23, /* Yukon (PHY 88E1011) */
+        PHY_MARV_ID1_B0 = 0x0C23, /* Yukon      (PHY 88E1011) */
         PHY_MARV_ID1_B2 = 0x0C25, /* Yukon-Plus (PHY 88E1011) */
-        PHY_MARV_ID1_C2 = 0x0CC2, /* Yukon-EC (PHY 88E1111) */
-        PHY_MARV_ID1_Y2 = 0x0C91, /* Yukon-2 (PHY 88E1112) */
+        PHY_MARV_ID1_C2 = 0x0CC2, /* Yukon-EC   (PHY 88E1111) */
+        PHY_MARV_ID1_Y2 = 0x0C91, /* Yukon-2    (PHY 88E1112) */
+        PHY_MARV_ID1_FE = 0x0C83, /* Yukon-FE   (PHY 88E3082 Rev.A1) */
+        PHY_MARV_ID1_ECU= 0x0CB0, /* Yukon-ECU  (PHY 88E1149 Rev.B2?) */
 };
 
 /* Advertisement register bits */
@@ -1837,11 +1876,11 @@ struct sky2_port {
 struct sky2_hw {
         void __iomem         *regs;
         struct pci_dev       *pdev;
-        u32                  intr_mask;
         struct net_device    *dev[2];
+        spinlock_t           hw_lock;
+        u32                  intr_mask;
 
         int                  pm_cap;
-        int                  msi;
         u8                   chip_id;
         u8                   chip_rev;
         u8                   copper;
@@ -1912,4 +1951,25 @@ static inline void gma_set_addr(struct sky2_hw *hw, unsigned port, unsigned reg,
         gma_write16(hw, port, reg+4,(u16) addr[2] | ((u16) addr[3] << 8));
         gma_write16(hw, port, reg+8,(u16) addr[4] | ((u16) addr[5] << 8));
 }
+
+/* PCI config space access */
+static inline u32 sky2_pci_read32(const struct sky2_hw *hw, unsigned reg)
+{
+        return sky2_read32(hw, Y2_CFG_SPC + reg);
+}
+
+static inline u16 sky2_pci_read16(const struct sky2_hw *hw, unsigned reg)
+{
+        return sky2_read16(hw, Y2_CFG_SPC + reg);
+}
+
+static inline void sky2_pci_write32(struct sky2_hw *hw, unsigned reg, u32 val)
+{
+        sky2_write32(hw, Y2_CFG_SPC + reg, val);
+}
+
+static inline void sky2_pci_write16(struct sky2_hw *hw, unsigned reg, u16 val)
+{
+        sky2_write16(hw, Y2_CFG_SPC + reg, val);
+}
 #endif
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index e7dc653d5bd6..b8f1524da557 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -3532,9 +3532,23 @@ static inline int tg3_4g_overflow_test(dma_addr_t mapping, int len)
                 (base + len + 8 < base));
 }
 
+/* Test for DMA addresses > 40-bit */
+static inline int tg3_40bit_overflow_test(struct tg3 *tp, dma_addr_t mapping,
+                                          int len)
+{
+#if defined(CONFIG_HIGHMEM) && (BITS_PER_LONG == 64)
+        if (tp->tg3_flags2 & TG3_FLG2_5780_CLASS)
+                return (((u64) mapping + len) > DMA_40BIT_MASK);
+        return 0;
+#else
+        return 0;
+#endif
+}
+
 static void tg3_set_txd(struct tg3 *, int, dma_addr_t, int, u32, u32);
 
-static int tigon3_4gb_hwbug_workaround(struct tg3 *tp, struct sk_buff *skb,
+/* Workaround 4GB and 40-bit hardware DMA bugs. */
+static int tigon3_dma_hwbug_workaround(struct tg3 *tp, struct sk_buff *skb,
                                        u32 last_plus_one, u32 *start,
                                        u32 base_flags, u32 mss)
 {
@@ -3742,6 +3756,9 @@ static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
                         if (tg3_4g_overflow_test(mapping, len))
                                 would_hit_hwbug = 1;
 
+                        if (tg3_40bit_overflow_test(tp, mapping, len))
+                                would_hit_hwbug = 1;
+
                         if (tp->tg3_flags2 & TG3_FLG2_HW_TSO)
                                 tg3_set_txd(tp, entry, mapping, len,
                                             base_flags, (i == last)|(mss << 1));
@@ -3763,7 +3780,7 @@ static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 /* If the workaround fails due to memory/mapping
                  * failure, silently drop this packet.
                  */
-                if (tigon3_4gb_hwbug_workaround(tp, skb, last_plus_one,
+                if (tigon3_dma_hwbug_workaround(tp, skb, last_plus_one,
                                                 &start, base_flags, mss))
                         goto out_unlock;
 
@@ -9408,6 +9425,15 @@ static int __devinit tg3_is_sun_570X(struct tg3 *tp)
                         return 0;
                 if (venid == PCI_VENDOR_ID_SUN)
                         return 1;
+
+                /* TG3 chips onboard the SunBlade-2500 don't have the
+                 * subsystem-vendor-id set to PCI_VENDOR_ID_SUN but they
+                 * are distinguishable from non-Sun variants by being
+                 * named "network" by the firmware.  Non-Sun cards will
+                 * show up as being named "ethernet".
+                 */
+                if (!strcmp(pcp->prom_name, "network"))
+                        return 1;
         }
         return 0;
 }
@@ -10517,8 +10543,6 @@ static char * __devinit tg3_bus_string(struct tg3 *tp, char *str)
                         strcat(str, "66MHz");
                 else if (clock_ctrl == 6)
                         strcat(str, "100MHz");
-                else if (clock_ctrl == 7)
-                        strcat(str, "133MHz");
         } else {
                 strcpy(str, "PCI:");
                 if (tp->tg3_flags & TG3_FLAG_PCI_HIGH_SPEED)
@@ -10599,8 +10623,9 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
         unsigned long tg3reg_base, tg3reg_len;
         struct net_device *dev;
         struct tg3 *tp;
-        int i, err, pci_using_dac, pm_cap;
+        int i, err, pm_cap;
         char str[40];
+        u64 dma_mask, persist_dma_mask;
 
         if (tg3_version_printed++ == 0)
                 printk(KERN_INFO "%s", version);
@@ -10637,26 +10662,6 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
                 goto err_out_free_res;
         }
 
-        /* Configure DMA attributes. */
-        err = pci_set_dma_mask(pdev, DMA_64BIT_MASK);
-        if (!err) {
-                pci_using_dac = 1;
-                err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
-                if (err < 0) {
-                        printk(KERN_ERR PFX "Unable to obtain 64 bit DMA "
-                               "for consistent allocations\n");
-                        goto err_out_free_res;
-                }
-        } else {
-                err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
-                if (err) {
-                        printk(KERN_ERR PFX "No usable DMA configuration, "
-                               "aborting.\n");
-                        goto err_out_free_res;
-                }
-                pci_using_dac = 0;
-        }
-
         tg3reg_base = pci_resource_start(pdev, 0);
         tg3reg_len = pci_resource_len(pdev, 0);
 
@@ -10670,8 +10675,6 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
         SET_MODULE_OWNER(dev);
         SET_NETDEV_DEV(dev, &pdev->dev);
 
-        if (pci_using_dac)
-                dev->features |= NETIF_F_HIGHDMA;
         dev->features |= NETIF_F_LLTX;
 #if TG3_VLAN_TAG_USED
         dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
@@ -10756,6 +10759,44 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
                 goto err_out_iounmap;
         }
 
+        /* 5714, 5715 and 5780 cannot support DMA addresses > 40-bit.
+         * On 64-bit systems with IOMMU, use 40-bit dma_mask.
+         * On 64-bit systems without IOMMU, use 64-bit dma_mask and
+         * do DMA address check in tg3_start_xmit().
+         */
+        if (tp->tg3_flags2 & TG3_FLG2_5780_CLASS) {
+                persist_dma_mask = dma_mask = DMA_40BIT_MASK;
+#ifdef CONFIG_HIGHMEM
+                dma_mask = DMA_64BIT_MASK;
+#endif
+        } else if (tp->tg3_flags2 & TG3_FLG2_IS_5788)
+                persist_dma_mask = dma_mask = DMA_32BIT_MASK;
+        else
+                persist_dma_mask = dma_mask = DMA_64BIT_MASK;
+
+        /* Configure DMA attributes. */
+        if (dma_mask > DMA_32BIT_MASK) {
+                err = pci_set_dma_mask(pdev, dma_mask);
+                if (!err) {
+                        dev->features |= NETIF_F_HIGHDMA;
+                        err = pci_set_consistent_dma_mask(pdev,
+                                                          persist_dma_mask);
+                        if (err < 0) {
+                                printk(KERN_ERR PFX "Unable to obtain 64 bit "
+                                       "DMA for consistent allocations\n");
+                                goto err_out_iounmap;
+                        }
+                }
+        }
+        if (err || dma_mask == DMA_32BIT_MASK) {
+                err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+                if (err) {
+                        printk(KERN_ERR PFX "No usable DMA configuration, "
+                               "aborting.\n");
+                        goto err_out_iounmap;
+                }
+        }
+
         tg3_init_bufmgr_config(tp);
 
 #if TG3_TSO_SUPPORT != 0
@@ -10824,9 +10865,6 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
         } else
                 tp->tg3_flags &= ~TG3_FLAG_RX_CHECKSUMS;
 
-        if (tp->tg3_flags2 & TG3_FLG2_IS_5788)
-                dev->features &= ~NETIF_F_HIGHDMA;
-
         /* flow control autonegotiation is default behavior */
         tp->tg3_flags |= TG3_FLAG_PAUSE_AUTONEG;
 
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c
index c2506b56a186..12076f8f942c 100644
--- a/drivers/net/tlan.c
+++ b/drivers/net/tlan.c
@@ -536,6 +536,7 @@ static int __devinit TLan_probe1(struct pci_dev *pdev,
         u16                device_id;
         int                reg, rc = -ENODEV;
 
+#ifdef CONFIG_PCI
         if (pdev) {
                 rc = pci_enable_device(pdev);
                 if (rc)
@@ -547,6 +548,7 @@ static int __devinit TLan_probe1(struct pci_dev *pdev,
                         goto err_out;
                 }
         }
+#endif  /*  CONFIG_PCI  */
 
         dev = alloc_etherdev(sizeof(TLanPrivateInfo));
         if (dev == NULL) {
diff --git a/drivers/net/tokenring/smctr.h b/drivers/net/tokenring/smctr.h
index b306c7e4c793..88dfa2e01d6e 100644
--- a/drivers/net/tokenring/smctr.h
+++ b/drivers/net/tokenring/smctr.h
@@ -1042,7 +1042,7 @@ typedef struct net_local {
         __u16            functional_address[2];
         __u16            bitwise_group_address[2];
 
-        __u8            *ptr_ucode;
+        const __u8       *ptr_ucode;
 
         __u8            cleanup;
 
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index d7fb3ffe06ac..2d0cfbceee22 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -1362,7 +1362,6 @@ static int de_open (struct net_device *dev)
 {
         struct de_private *de = dev->priv;
         int rc;
-        unsigned long flags;
 
         if (netif_msg_ifup(de))
                 printk(KERN_DEBUG "%s: enabling interface\n", dev->name);
@@ -1376,18 +1375,20 @@ static int de_open (struct net_device *dev)
                 return rc;
         }
 
-        rc = de_init_hw(de);
-        if (rc) {
-                printk(KERN_ERR "%s: h/w init failure, err=%d\n",
-                       dev->name, rc);
-                goto err_out_free;
-        }
+        dw32(IntrMask, 0);
 
         rc = request_irq(dev->irq, de_interrupt, SA_SHIRQ, dev->name, dev);
         if (rc) {
                 printk(KERN_ERR "%s: IRQ %d request failure, err=%d\n",
                        dev->name, dev->irq, rc);
-                goto err_out_hw;
+                goto err_out_free;
+        }
+
+        rc = de_init_hw(de);
+        if (rc) {
+                printk(KERN_ERR "%s: h/w init failure, err=%d\n",
+                       dev->name, rc);
+                goto err_out_free_irq;
         }
 
         netif_start_queue(dev);
@@ -1395,11 +1396,8 @@ static int de_open (struct net_device *dev)
 
         return 0;
 
-err_out_hw:
-        spin_lock_irqsave(&de->lock, flags);
-        de_stop_hw(de);
-        spin_unlock_irqrestore(&de->lock, flags);
-
+err_out_free_irq:
+        free_irq(dev->irq, dev);
 err_out_free:
         de_free_rings(de);
         return rc;
@@ -1455,6 +1453,8 @@ static void de_tx_timeout (struct net_device *dev)
         synchronize_irq(dev->irq);
         de_clean_rings(de);
 
+        de_init_rings(de);
+
         de_init_hw(de);
         
         netif_wake_queue(dev);
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 50b8c6754b1e..a1ed2d983740 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -249,8 +249,11 @@ static __inline__ ssize_t tun_get_user(struct tun_struct *tun, struct iovec *iv,
 
         if (align)
                 skb_reserve(skb, align);
-        if (memcpy_fromiovec(skb_put(skb, len), iv, len))
+        if (memcpy_fromiovec(skb_put(skb, len), iv, len)) {
+                tun->stats.rx_dropped++;
+                kfree_skb(skb);
                 return -EFAULT;
+        }
 
         skb->dev = tun->dev;
         switch (tun->flags & TUN_TYPE_MASK) {
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index c2d5907dc8e0..ed1f837c8fda 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -1106,6 +1106,9 @@ static void velocity_free_rd_ring(struct velocity_info *vptr)
 
         for (i = 0; i < vptr->options.numrx; i++) {
                 struct velocity_rd_info *rd_info = &(vptr->rd_info[i]);
+                struct rx_desc *rd = vptr->rd_ring + i;
+
+                memset(rd, 0, sizeof(*rd));
 
                 if (!rd_info->skb)
                         continue;
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 98a76f10a0f7..dfc24016ba81 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -1872,7 +1872,7 @@ static int atmel_set_encodeext(struct net_device *dev,
         struct atmel_private *priv = netdev_priv(dev);
         struct iw_point *encoding = &wrqu->encoding;
         struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
-        int idx, key_len;
+        int idx, key_len, alg = ext->alg, set_key = 1;
 
         /* Determine and validate the key index */
         idx = encoding->flags & IW_ENCODE_INDEX;
@@ -1883,39 +1883,42 @@ static int atmel_set_encodeext(struct net_device *dev,
         } else
                 idx = priv->default_key;
 
-        if ((encoding->flags & IW_ENCODE_DISABLED) ||
-            ext->alg == IW_ENCODE_ALG_NONE) {
-                priv->wep_is_on = 0;
-                priv->encryption_level = 0;
-                priv->pairwise_cipher_suite = CIPHER_SUITE_NONE;
-        }
+        if (encoding->flags & IW_ENCODE_DISABLED)
+            alg = IW_ENCODE_ALG_NONE;
 
-        if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY)
+        if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) {
                 priv->default_key = idx;
+                set_key = ext->key_len > 0 ? 1 : 0;
+        }
 
-        /* Set the requested key */
-        switch (ext->alg) {
-        case IW_ENCODE_ALG_NONE:
-                break;
-        case IW_ENCODE_ALG_WEP:
-                if (ext->key_len > 5) {
-                        priv->wep_key_len[idx] = 13;
-                        priv->pairwise_cipher_suite = CIPHER_SUITE_WEP_128;
-                        priv->encryption_level = 2;
-                } else if (ext->key_len > 0) {
-                        priv->wep_key_len[idx] = 5;
-                        priv->pairwise_cipher_suite = CIPHER_SUITE_WEP_64;
-                        priv->encryption_level = 1;
-                } else {
+        if (set_key) {
+                /* Set the requested key first */
+                switch (alg) {
+                case IW_ENCODE_ALG_NONE:
+                        priv->wep_is_on = 0;
+                        priv->encryption_level = 0;
+                        priv->pairwise_cipher_suite = CIPHER_SUITE_NONE;
+                        break;
+                case IW_ENCODE_ALG_WEP:
+                        if (ext->key_len > 5) {
+                                priv->wep_key_len[idx] = 13;
+                                priv->pairwise_cipher_suite = CIPHER_SUITE_WEP_128;
+                                priv->encryption_level = 2;
+                        } else if (ext->key_len > 0) {
+                                priv->wep_key_len[idx] = 5;
+                                priv->pairwise_cipher_suite = CIPHER_SUITE_WEP_64;
+                                priv->encryption_level = 1;
+                        } else {
+                                return -EINVAL;
+                        }
+                        priv->wep_is_on = 1;
+                        memset(priv->wep_keys[idx], 0, 13);
+                        key_len = min ((int)ext->key_len, priv->wep_key_len[idx]);
+                        memcpy(priv->wep_keys[idx], ext->key, key_len);
+                        break;
+                default:
                         return -EINVAL;
                 }
-                priv->wep_is_on = 1;
-                memset(priv->wep_keys[idx], 0, 13);
-                key_len = min ((int)ext->key_len, priv->wep_key_len[idx]);
-                memcpy(priv->wep_keys[idx], ext->key, key_len);
-                break;
-        default:
-                return -EINVAL;
         }
 
         return -EINPROGRESS;
@@ -3061,17 +3064,26 @@ static void authenticate(struct atmel_private *priv, u16 frame_len)
         }
 
         if (status == C80211_MGMT_SC_Success && priv->wep_is_on) {
+                int should_associate = 0;
                 /* WEP */
                 if (trans_seq_no != priv->ExpectedAuthentTransactionSeqNum)
                         return;
 
-                if (trans_seq_no == 0x0002 &&
-                    auth->el_id == C80211_MGMT_ElementID_ChallengeText) {
-                        send_authentication_request(priv, system, auth->chall_text, auth->chall_text_len);
-                        return;
+                if (system == C80211_MGMT_AAN_OPENSYSTEM) {
+                        if (trans_seq_no == 0x0002) {
+                                should_associate = 1;
+                        }
+                } else if (system == C80211_MGMT_AAN_SHAREDKEY) {
+                        if (trans_seq_no == 0x0002 &&
+                            auth->el_id == C80211_MGMT_ElementID_ChallengeText) {
+                                send_authentication_request(priv, system, auth->chall_text, auth->chall_text_len);
+                                return;
+                        } else if (trans_seq_no == 0x0004) {
+                                should_associate = 1;
+                        }
                 }
 
-                if (trans_seq_no == 0x0004) {
+                if (should_associate) {
                         if(priv->station_was_associated) {
                                 atmel_enter_state(priv, STATION_STATE_REASSOCIATING);
                                 send_association_request(priv, 1);
@@ -3084,11 +3096,13 @@ static void authenticate(struct atmel_private *priv, u16 frame_len)
                 }
         }
 
-        if (status == C80211_MGMT_SC_AuthAlgNotSupported) {
+        if (status == WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG) {
                 /* Do opensystem first, then try sharedkey */
-                if (system ==  C80211_MGMT_AAN_OPENSYSTEM) {
+                if (system == WLAN_AUTH_OPEN) {
                         priv->CurrentAuthentTransactionSeqNum = 0x001;
-                        send_authentication_request(priv, C80211_MGMT_AAN_SHAREDKEY, NULL, 0);
+                        priv->exclude_unencrypted = 1;
+                        send_authentication_request(priv, WLAN_AUTH_SHARED_KEY, NULL, 0);
+                        return;
                 } else if (priv->connect_to_any_BSS) {
                         int bss_index;
 
@@ -3439,10 +3453,13 @@ static void atmel_management_timer(u_long a)
                         priv->AuthenticationRequestRetryCnt = 0;
                         restart_search(priv);
                 } else {
+                        int auth = C80211_MGMT_AAN_OPENSYSTEM;
                         priv->AuthenticationRequestRetryCnt++;
                         priv->CurrentAuthentTransactionSeqNum = 0x0001;
                         mod_timer(&priv->management_timer, jiffies + MGMT_JIFFIES);
-                        send_authentication_request(priv, C80211_MGMT_AAN_OPENSYSTEM, NULL, 0);
+                        if (priv->wep_is_on && priv->exclude_unencrypted)
+                                auth = C80211_MGMT_AAN_SHAREDKEY;
+                        send_authentication_request(priv, auth, NULL, 0);
           }
           break;
 
@@ -3541,12 +3558,15 @@ static void atmel_command_irq(struct atmel_private *priv)
                                 priv->station_was_associated = priv->station_is_associated;
                                 atmel_enter_state(priv, STATION_STATE_READY);
                         } else {
+                                int auth = C80211_MGMT_AAN_OPENSYSTEM;
                                 priv->AuthenticationRequestRetryCnt = 0;
                                 atmel_enter_state(priv, STATION_STATE_AUTHENTICATING);
 
                                 mod_timer(&priv->management_timer, jiffies + MGMT_JIFFIES);
                                 priv->CurrentAuthentTransactionSeqNum = 0x0001;
-                                send_authentication_request(priv, C80211_MGMT_AAN_SHAREDKEY, NULL, 0);
+                                if (priv->wep_is_on && priv->exclude_unencrypted)
+                                        auth = C80211_MGMT_AAN_SHAREDKEY;
+                                send_authentication_request(priv, auth, NULL, 0);
                         }
                         return;
                 }
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index 8bc0b528548f..f8f4503475f9 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -877,7 +877,6 @@ static struct pcmcia_device_id hostap_cs_ids[] = {
         PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777),
         PCMCIA_DEVICE_MANF_CARD(0x0126, 0x8000),
         PCMCIA_DEVICE_MANF_CARD(0x0138, 0x0002),
-        PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002),
         PCMCIA_DEVICE_MANF_CARD(0x0250, 0x0002),
         PCMCIA_DEVICE_MANF_CARD(0x026f, 0x030b),
         PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1612),
@@ -891,6 +890,10 @@ static struct pcmcia_device_id hostap_cs_ids[] = {
         PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002),
         PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005),
         PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010),
+        PCMCIA_DEVICE_MANF_CARD_PROD_ID1(0x0156, 0x0002, "INTERSIL",
+                                         0x74c5e40d),
+        PCMCIA_DEVICE_MANF_CARD_PROD_ID1(0x0156, 0x0002, "Intersil",
+                                         0x4b801a17),
         PCMCIA_MFC_DEVICE_PROD_ID12(0, "SanDisk", "ConnectPlus",
                                     0x7a954bd9, 0x74be00c6),
         PCMCIA_DEVICE_PROD_ID1234(
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 14beab4bc91c..287676ad80df 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -4616,9 +4616,9 @@ static void ipw_rx_notification(struct ipw_priv *priv,
                 }
 
         default:
-                IPW_ERROR("Unknown notification: "
-                          "subtype=%d,flags=0x%2x,size=%d\n",
-                          notif->subtype, notif->flags, notif->size);
+                IPW_DEBUG_NOTIF("Unknown notification: "
+                                "subtype=%d,flags=0x%2x,size=%d\n",
+                                notif->subtype, notif->flags, notif->size);
         }
 }
 
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c
index cf373625fc70..98122f3a4bc2 100644
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
@@ -950,16 +950,8 @@ wv_82593_cmd(struct net_device *	dev,
 static inline int
 wv_diag(struct net_device *     dev)
 {
-  int           ret = FALSE;
-
-  if(wv_82593_cmd(dev, "wv_diag(): diagnose",
-                  OP0_DIAGNOSE, SR0_DIAGNOSE_PASSED))
-    ret = TRUE;
-
-#ifdef DEBUG_CONFIG_ERRORS
-  printk(KERN_INFO "wavelan_cs: i82593 Self Test failed!\n");
-#endif
-  return(ret);
+  return(wv_82593_cmd(dev, "wv_diag(): diagnose",
+                      OP0_DIAGNOSE, SR0_DIAGNOSE_PASSED));
 } /* wv_diag */
 
 /*------------------------------------------------------------------*/
@@ -3604,8 +3596,8 @@ wv_82593_config(struct net_device *	dev)
   cfblk.lin_prio = 0;           /* conform to 802.3 backoff algoritm */
   cfblk.exp_prio = 5;           /* conform to 802.3 backoff algoritm */
   cfblk.bof_met = 1;            /* conform to 802.3 backoff algoritm */
-  cfblk.ifrm_spc = 0x20;        /* 32 bit times interframe spacing */
-  cfblk.slottim_low = 0x20;     /* 32 bit times slot time */
+  cfblk.ifrm_spc = 0x20 >> 4;   /* 32 bit times interframe spacing */
+  cfblk.slottim_low = 0x20 >> 5;        /* 32 bit times slot time */
   cfblk.slottim_hi = 0x0;
   cfblk.max_retr = 15;
   cfblk.prmisc = ((lp->promiscuous) ? TRUE: FALSE);     /* Promiscuous mode */
diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c
index 166de3507780..10845253c9e0 100644
--- a/drivers/parport/parport_serial.c
+++ b/drivers/parport/parport_serial.c
@@ -312,8 +312,7 @@ static int __devinit parport_register (struct pci_dev *dev,
 {
         struct parport_pc_pci *card;
         struct parport_serial_private *priv = pci_get_drvdata (dev);
-        int i = id->driver_data, n;
-        int success = 0;
+        int n, success = 0;
 
         priv->par = cards[id->driver_data];
         card = &priv->par;
@@ -344,10 +343,8 @@ static int __devinit parport_register (struct pci_dev *dev,
                                         "hi" as an offset (see SYBA
                                         def.) */
                 /* TODO: test if sharing interrupts works */
-                printk (KERN_DEBUG "PCI parallel port detected: %04x:%04x, "
-                        "I/O at %#lx(%#lx)\n",
-                        parport_serial_pci_tbl[i].vendor,
-                        parport_serial_pci_tbl[i].device, io_lo, io_hi);
+                dev_dbg(&dev->dev, "PCI parallel port detected: I/O at "
+                        "%#lx(%#lx)\n", io_lo, io_hi);
                 port = parport_pc_probe_port (io_lo, io_hi, PARPORT_IRQ_NONE,
                                               PARPORT_DMA_NONE, dev);
                 if (port) {
@@ -359,7 +356,7 @@ static int __devinit parport_register (struct pci_dev *dev,
         if (card->postinit_hook)
                 card->postinit_hook (dev, card, !success);
 
-        return success ? 0 : 1;
+        return 0;
 }
 
 static int __devinit parport_serial_pci_probe (struct pci_dev *dev,
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 0a424a4e8187..bb96ce1db08c 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -352,11 +352,20 @@ static void pcmcia_release_dev(struct device *dev)
         kfree(p_dev);
 }
 
+static void pcmcia_add_pseudo_device(struct pcmcia_socket *s)
+{
+        if (!s->pcmcia_state.device_add_pending) {
+                s->pcmcia_state.device_add_pending = 1;
+                schedule_work(&s->device_add);
+        }
+        return;
+}
 
 static int pcmcia_device_probe(struct device * dev)
 {
         struct pcmcia_device *p_dev;
         struct pcmcia_driver *p_drv;
+        struct pcmcia_device_id *did;
         struct pcmcia_socket *s;
         int ret = 0;
 
@@ -392,6 +401,19 @@ static int pcmcia_device_probe(struct device * dev)
         }
 
         ret = p_drv->probe(p_dev);
+        if (ret)
+                goto put_module;
+
+        /* handle pseudo multifunction devices:
+         * there are at most two pseudo multifunction devices.
+         * if we're matching against the first, schedule a
+         * call which will then check whether there are two
+         * pseudo devices, and if not, add the second one.
+         */
+        did = (struct pcmcia_device_id *) p_dev->dev.driver_data;
+        if (did && (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) &&
+            (p_dev->socket->device_count == 1) && (p_dev->device_no == 0))
+                pcmcia_add_pseudo_device(p_dev->socket);
 
  put_module:
         if (ret)
@@ -660,15 +682,6 @@ static void pcmcia_delayed_add_pseudo_device(void *data)
         s->pcmcia_state.device_add_pending = 0;
 }
 
-static inline void pcmcia_add_pseudo_device(struct pcmcia_socket *s)
-{
-        if (!s->pcmcia_state.device_add_pending) {
-                s->pcmcia_state.device_add_pending = 1;
-                schedule_work(&s->device_add);
-        }
-        return;
-}
-
 static int pcmcia_requery(struct device *dev, void * _data)
 {
         struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
@@ -755,15 +768,6 @@ static inline int pcmcia_devmatch(struct pcmcia_device *dev,
         }
 
         if (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) {
-                /* handle pseudo multifunction devices:
-                 * there are at most two pseudo multifunction devices.
-                 * if we're matching against the first, schedule a
-                 * call which will then check whether there are two
-                 * pseudo devices, and if not, add the second one.
-                 */
-                if (dev->device_no == 0)
-                        pcmcia_add_pseudo_device(dev->socket);
-
                 if (dev->device_no != did->device_no)
                         return 0;
         }
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c
index aaa568a3806e..b68eef251614 100644
--- a/drivers/pnp/card.c
+++ b/drivers/pnp/card.c
@@ -303,13 +303,11 @@ found:
         down_write(&dev->dev.bus->subsys.rwsem);
         dev->card_link = clink;
         dev->dev.driver = &drv->link.driver;
-        if (drv->link.driver.probe) {
-                if (drv->link.driver.probe(&dev->dev)) {
-                        dev->dev.driver = NULL;
-                        dev->card_link = NULL;
-                        up_write(&dev->dev.bus->subsys.rwsem);
-                        return NULL;
-                }
+        if (pnp_bus_type.probe(&dev->dev)) {
+                dev->dev.driver = NULL;
+                dev->card_link = NULL;
+                up_write(&dev->dev.bus->subsys.rwsem);
+                return NULL;
         }
         device_bind_driver(&dev->dev);
         up_write(&dev->dev.bus->subsys.rwsem);
diff --git a/drivers/s390/block/Kconfig b/drivers/s390/block/Kconfig
index 6912399d0937..6f50cc9323d9 100644
--- a/drivers/s390/block/Kconfig
+++ b/drivers/s390/block/Kconfig
@@ -55,21 +55,13 @@ config DASD_DIAG
           Disks under VM.  If you are not running under VM or unsure what it is,
           say "N".
 
-config DASD_EER
-        tristate "Extended error reporting (EER)"
-        depends on DASD
-        help
-          This driver provides a character device interface to the
-          DASD extended error reporting. This is only needed if you want to
-          use applications written for the EER facility.
-
 config DASD_CMB
         tristate "Compatibility interface for DASD channel measurement blocks"
         depends on DASD
         help
-          This driver provides an additional interface to the channel
-          measurement facility, which is normally accessed though sysfs, with
-          a set of ioctl functions specific to the dasd driver.
+          This driver provides an additional interface to the channel measurement
+          facility, which is normally accessed though sysfs, with a set of
+          ioctl functions specific to the dasd driver.
           This is only needed if you want to use applications written for
           linux-2.4 dasd channel measurement facility interface.
 
diff --git a/drivers/s390/block/Makefile b/drivers/s390/block/Makefile
index 0c0d871e8f51..58c6780134f7 100644
--- a/drivers/s390/block/Makefile
+++ b/drivers/s390/block/Makefile
@@ -5,7 +5,6 @@
 dasd_eckd_mod-objs := dasd_eckd.o dasd_3990_erp.o dasd_9343_erp.o
 dasd_fba_mod-objs  := dasd_fba.o dasd_3370_erp.o dasd_9336_erp.o
 dasd_diag_mod-objs := dasd_diag.o
-dasd_eer_mod-objs := dasd_eer.o
 dasd_mod-objs      := dasd.o dasd_ioctl.o dasd_proc.o dasd_devmap.o \
                         dasd_genhd.o dasd_erp.o
 
@@ -14,6 +13,5 @@ obj-$(CONFIG_DASD_DIAG) += dasd_diag_mod.o
 obj-$(CONFIG_DASD_ECKD) += dasd_eckd_mod.o
 obj-$(CONFIG_DASD_FBA)  += dasd_fba_mod.o
 obj-$(CONFIG_DASD_CMB)  += dasd_cmb.o
-obj-$(CONFIG_DASD_EER)  += dasd_eer.o
 obj-$(CONFIG_BLK_DEV_XPRAM) += xpram.o
 obj-$(CONFIG_DCSSBLK) += dcssblk.o
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 08c88fcd8963..33157c84d1d3 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -18,7 +18,6 @@
 #include <linux/slab.h>
 #include <linux/buffer_head.h>
 #include <linux/hdreg.h>
-#include <linux/notifier.h>
 
 #include <asm/ccwdev.h>
 #include <asm/ebcdic.h>
@@ -58,7 +57,6 @@ static void dasd_int_handler(struct ccw_device *, unsigned long, struct irb *);
 static void dasd_flush_ccw_queue(struct dasd_device *, int);
 static void dasd_tasklet(struct dasd_device *);
 static void do_kick_device(void *data);
-static void dasd_disable_eer(struct dasd_device *device);
 
 /*
  * SECTION: Operations on the device structure.
@@ -153,10 +151,13 @@ dasd_state_new_to_known(struct dasd_device *device)
 static inline void
 dasd_state_known_to_new(struct dasd_device * device)
 {
-        /* disable extended error reporting for this device */
-        dasd_disable_eer(device);
         /* Forget the discipline information. */
+        if (device->discipline)
+                module_put(device->discipline->owner);
         device->discipline = NULL;
+        if (device->base_discipline)
+                module_put(device->base_discipline->owner);
+        device->base_discipline = NULL;
         device->state = DASD_STATE_NEW;
 
         dasd_free_queue(device);
@@ -214,9 +215,10 @@ dasd_state_basic_to_known(struct dasd_device * device)
  * interrupt for this detection ccw uses the kernel event daemon to
  * trigger the call to dasd_change_state. All this is done in the
  * discipline code, see dasd_eckd.c.
- * After the analysis ccw is done (do_analysis returned 0 or error)
- * the block device is setup. Either a fake disk is added to allow
- * formatting or a proper device request queue is created.
+ * After the analysis ccw is done (do_analysis returned 0) the block
+ * device is setup.
+ * In case the analysis returns an error, the device setup is stopped
+ * (a fake disk was already added to allow formatting).
  */
 static inline int
 dasd_state_basic_to_ready(struct dasd_device * device)
@@ -226,13 +228,19 @@ dasd_state_basic_to_ready(struct dasd_device * device)
         rc = 0;
         if (device->discipline->do_analysis != NULL)
                 rc = device->discipline->do_analysis(device);
-        if (rc)
+        if (rc) {
+                if (rc != -EAGAIN)
+                        device->state = DASD_STATE_UNFMT;
                 return rc;
+        }
+        /* make disk known with correct capacity */
         dasd_setup_queue(device);
+        set_capacity(device->gdp, device->blocks << device->s2b_shift);
         device->state = DASD_STATE_READY;
-        if (dasd_scan_partitions(device) != 0)
+        rc = dasd_scan_partitions(device);
+        if (rc)
                 device->state = DASD_STATE_BASIC;
-        return 0;
+        return rc;
 }
 
 /*
@@ -253,6 +261,15 @@ dasd_state_ready_to_basic(struct dasd_device * device)
 }
 
 /*
+ * Back to basic.
+ */
+static inline void
+dasd_state_unfmt_to_basic(struct dasd_device * device)
+{
+        device->state = DASD_STATE_BASIC;
+}
+
+/*
  * Make the device online and schedule the bottom half to start
  * the requeueing of requests from the linux request queue to the
  * ccw queue.
@@ -318,8 +335,12 @@ dasd_decrease_state(struct dasd_device *device)
         if (device->state == DASD_STATE_READY &&
             device->target <= DASD_STATE_BASIC)
                 dasd_state_ready_to_basic(device);
-        
-        if (device->state == DASD_STATE_BASIC && 
+
+        if (device->state == DASD_STATE_UNFMT &&
+            device->target <= DASD_STATE_BASIC)
+                dasd_state_unfmt_to_basic(device);
+
+        if (device->state == DASD_STATE_BASIC &&
             device->target <= DASD_STATE_KNOWN)
                 dasd_state_basic_to_known(device);
         
@@ -871,9 +892,6 @@ dasd_handle_state_change_pending(struct dasd_device *device)
         struct dasd_ccw_req *cqr;
         struct list_head *l, *n;
 
-        /* first of all call extended error reporting */
-        dasd_write_eer_trigger(DASD_EER_STATECHANGE, device, NULL);
-
         device->stopped &= ~DASD_STOPPED_PENDING;
 
         /* restart all 'running' IO on queue */
@@ -1093,19 +1111,6 @@ restart:
                         }
                         goto restart;
                 }
-
-                /* first of all call extended error reporting */
-                if (device->eer && cqr->status == DASD_CQR_FAILED) {
-                        dasd_write_eer_trigger(DASD_EER_FATALERROR,
-                                               device, cqr);
-
-                        /* restart request  */
-                        cqr->status = DASD_CQR_QUEUED;
-                        cqr->retries = 255;
-                        device->stopped |= DASD_STOPPED_QUIESCE;
-                        goto restart;
-                }
-
                 /* Process finished ERP request. */
                 if (cqr->refers) {
                         __dasd_process_erp(device, cqr);
@@ -1243,8 +1248,7 @@ __dasd_start_head(struct dasd_device * device)
         cqr = list_entry(device->ccw_queue.next, struct dasd_ccw_req, list);
         /* check FAILFAST */
         if (device->stopped & ~DASD_STOPPED_PENDING &&
-            test_bit(DASD_CQR_FLAGS_FAILFAST, &cqr->flags) &&
-            (!device->eer)) {
+            test_bit(DASD_CQR_FLAGS_FAILFAST, &cqr->flags)) {
                 cqr->status = DASD_CQR_FAILED;
                 dasd_schedule_bh(device);
         }
@@ -1738,7 +1742,7 @@ dasd_open(struct inode *inp, struct file *filp)
                 goto out;
         }
 
-        if (device->state < DASD_STATE_BASIC) {
+        if (device->state <= DASD_STATE_BASIC) {
                 DBF_DEV_EVENT(DBF_ERR, device, " %s",
                               " Cannot open unrecognized device");
                 rc = -ENODEV;
@@ -1880,9 +1884,10 @@ dasd_generic_remove (struct ccw_device *cdev)
  */
 int
 dasd_generic_set_online (struct ccw_device *cdev,
-                         struct dasd_discipline *discipline)
+                         struct dasd_discipline *base_discipline)
 
 {
+        struct dasd_discipline *discipline;
         struct dasd_device *device;
         int rc;
 
@@ -1890,6 +1895,7 @@ dasd_generic_set_online (struct ccw_device *cdev,
         if (IS_ERR(device))
                 return PTR_ERR(device);
 
+        discipline = base_discipline;
         if (device->features & DASD_FEATURE_USEDIAG) {
                 if (!dasd_diag_discipline_pointer) {
                         printk (KERN_WARNING
@@ -1901,6 +1907,16 @@ dasd_generic_set_online (struct ccw_device *cdev,
                 }
                 discipline = dasd_diag_discipline_pointer;
         }
+        if (!try_module_get(base_discipline->owner)) {
+                dasd_delete_device(device);
+                return -EINVAL;
+        }
+        if (!try_module_get(discipline->owner)) {
+                module_put(base_discipline->owner);
+                dasd_delete_device(device);
+                return -EINVAL;
+        }
+        device->base_discipline = base_discipline;
         device->discipline = discipline;
 
         rc = discipline->check_device(device);
@@ -1909,6 +1925,8 @@ dasd_generic_set_online (struct ccw_device *cdev,
                         "dasd_generic couldn't online device %s "
                         "with discipline %s rc=%i\n",
                         cdev->dev.bus_id, discipline->name, rc);
+                module_put(discipline->owner);
+                module_put(base_discipline->owner);
                 dasd_delete_device(device);
                 return rc;
         }
@@ -1986,9 +2004,6 @@ dasd_generic_notify(struct ccw_device *cdev, int event)
         switch (event) {
         case CIO_GONE:
         case CIO_NO_PATH:
-                /* first of all call extended error reporting */
-                dasd_write_eer_trigger(DASD_EER_NOPATH, device, NULL);
-
                 if (device->state < DASD_STATE_BASIC)
                         break;
                 /* Device is active. We want to keep it. */
@@ -2046,51 +2061,6 @@ dasd_generic_auto_online (struct ccw_driver *dasd_discipline_driver)
         put_driver(drv);
 }
 
-/*
- * notifications for extended error reports
- */
-static struct notifier_block *dasd_eer_chain;
-
-int
-dasd_register_eer_notifier(struct notifier_block *nb)
-{
-        return notifier_chain_register(&dasd_eer_chain, nb);
-}
-
-int
-dasd_unregister_eer_notifier(struct notifier_block *nb)
-{
-        return notifier_chain_unregister(&dasd_eer_chain, nb);
-}
-
-/*
- * Notify the registered error reporting module of a problem
- */
-void
-dasd_write_eer_trigger(unsigned int id, struct dasd_device *device,
-                       struct dasd_ccw_req *cqr)
-{
-        if (device->eer) {
-                struct dasd_eer_trigger temp;
-                temp.id = id;
-                temp.device = device;
-                temp.cqr = cqr;
-                notifier_call_chain(&dasd_eer_chain, DASD_EER_TRIGGER,
-                                    (void *)&temp);
-        }
-}
-
-/*
- * Tell the registered error reporting module to disable error reporting for
- * a given device and to cleanup any private data structures on that device.
- */
-static void
-dasd_disable_eer(struct dasd_device *device)
-{
-        notifier_call_chain(&dasd_eer_chain, DASD_EER_DISABLE, (void *)device);
-}
-
-
 static int __init
 dasd_init(void)
 {
@@ -2172,11 +2142,6 @@ EXPORT_SYMBOL_GPL(dasd_generic_set_online);
 EXPORT_SYMBOL_GPL(dasd_generic_set_offline);
 EXPORT_SYMBOL_GPL(dasd_generic_auto_online);
 
-EXPORT_SYMBOL(dasd_register_eer_notifier);
-EXPORT_SYMBOL(dasd_unregister_eer_notifier);
-EXPORT_SYMBOL(dasd_write_eer_trigger);
-
-
 /*
  * Overrides for Emacs so that we follow Linus's tabbing style.
  * Emacs will notice this stuff at the end of the file and automatically
diff --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c
index c811380b9079..4ee0f934e325 100644
--- a/drivers/s390/block/dasd_3990_erp.c
+++ b/drivers/s390/block/dasd_3990_erp.c
@@ -1108,9 +1108,6 @@ dasd_3990_handle_env_data(struct dasd_ccw_req * erp, char *sense)
                 case 0x0B:
                         DEV_MESSAGE(KERN_WARNING, device, "%s",
                                     "FORMAT F - Volume is suspended duplex");
-                        /* call extended error reporting (EER) */
-                        dasd_write_eer_trigger(DASD_EER_PPRCSUSPEND, device,
-                                               erp->refers);
                         break;
                 case 0x0C:
                         DEV_MESSAGE(KERN_WARNING, device, "%s",
diff --git a/drivers/s390/block/dasd_eckd.h b/drivers/s390/block/dasd_eckd.h
index e15dd7978050..bc3823d35223 100644
--- a/drivers/s390/block/dasd_eckd.h
+++ b/drivers/s390/block/dasd_eckd.h
@@ -29,7 +29,6 @@
 #define DASD_ECKD_CCW_PSF                0x27
 #define DASD_ECKD_CCW_RSSD               0x3e
 #define DASD_ECKD_CCW_LOCATE_RECORD      0x47
-#define DASD_ECKD_CCW_SNSS               0x54
 #define DASD_ECKD_CCW_DEFINE_EXTENT      0x63
 #define DASD_ECKD_CCW_WRITE_MT           0x85
 #define DASD_ECKD_CCW_READ_MT            0x86
diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c
deleted file mode 100644
index f70cd7716b24..000000000000
--- a/drivers/s390/block/dasd_eer.c
+++ /dev/null
@@ -1,1090 +0,0 @@
-/*
- *      character device driver for extended error reporting
- *
- *
- *      Copyright (C) 2005 IBM Corporation
- *      extended error reporting for DASD ECKD devices
- *      Author(s): Stefan Weinhuber <wein@de.ibm.com>
- *
- */
-
-#include <linux/init.h>
-#include <linux/fs.h>
-#include <linux/kernel.h>
-#include <linux/miscdevice.h>
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/device.h>
-#include <linux/workqueue.h>
-#include <linux/poll.h>
-#include <linux/notifier.h>
-
-#include <asm/uaccess.h>
-#include <asm/semaphore.h>
-#include <asm/atomic.h>
-#include <asm/ebcdic.h>
-
-#include "dasd_int.h"
-#include "dasd_eckd.h"
-
-
-MODULE_LICENSE("GPL");
-
-MODULE_AUTHOR("Stefan Weinhuber <wein@de.ibm.com>");
-MODULE_DESCRIPTION("DASD extended error reporting module");
-
-
-#ifdef PRINTK_HEADER
-#undef PRINTK_HEADER
-#endif                          /* PRINTK_HEADER */
-#define PRINTK_HEADER "dasd(eer):"
-
-
-
-
-
-/*****************************************************************************/
-/*      the internal buffer                                                  */
-/*****************************************************************************/
-
-/*
- * The internal buffer is meant to store obaque blobs of data, so it doesn't
- * know of higher level concepts like triggers.
- * It consists of a number of pages that are used as a ringbuffer. Each data
- * blob is stored in a simple record that consists of an integer, which
- * contains the size of the following data, and the data bytes themselfes.
- *
- * To allow for multiple independent readers we create one internal buffer
- * each time the device is opened and destroy the buffer when the file is
- * closed again.
- *
- * One record can be written to a buffer by using the functions
- * - dasd_eer_start_record (one time per record to write the size to the buffer
- *                          and reserve the space for the data)
- * - dasd_eer_write_buffer (one or more times per record to write the data)
- * The data can be written in several steps but you will have to compute
- * the total size up front for the invocation of dasd_eer_start_record.
- * If the ringbuffer is full, dasd_eer_start_record will remove the required
- * number of old records.
- *
- * A record is typically read in two steps, first read the integer that
- * specifies the size of the following data, then read the data.
- * Both can be done by
- * - dasd_eer_read_buffer
- *
- * For all mentioned functions you need to get the bufferlock first and keep it
- * until a complete record is written or read.
- */
-
-
-/*
- * Alle information necessary to keep track of an internal buffer is kept in
- * a struct eerbuffer. The buffer specific to a file pointer is strored in
- * the private_data field of that file. To be able to write data to all
- * existing buffers, each buffer is also added to the bufferlist.
- * If the user doesn't want to read a complete record in one go, we have to
- * keep track of the rest of the record. residual stores the number of bytes
- * that are still to deliver. If the rest of the record is invalidated between
- * two reads then residual will be set to -1 so that the next read will fail.
- * All entries in the eerbuffer structure are protected with the bufferlock.
- * To avoid races between writing to a buffer on the one side and creating
- * and destroying buffers on the other side, the bufferlock must also be used
- * to protect the bufferlist.
- */
-
-struct eerbuffer {
-        struct list_head list;
-        char **buffer;
-        int buffersize;
-        int buffer_page_count;
-        int head;
-        int tail;
-        int residual;
-};
-
-LIST_HEAD(bufferlist);
-
-static spinlock_t bufferlock = SPIN_LOCK_UNLOCKED;
-
-DECLARE_WAIT_QUEUE_HEAD(dasd_eer_read_wait_queue);
-
-/*
- * How many free bytes are available on the buffer.
- * needs to be called with bufferlock held
- */
-static int
-dasd_eer_get_free_bytes(struct eerbuffer *eerb)
-{
-        if (eerb->head < eerb->tail) {
-                return eerb->tail - eerb->head - 1;
-        } else
-                return eerb->buffersize - eerb->head + eerb->tail -1;
-}
-
-/*
- * How many bytes of buffer space are used.
- * needs to be called with bufferlock held
- */
-static int
-dasd_eer_get_filled_bytes(struct eerbuffer *eerb)
-{
-
-        if (eerb->head >= eerb->tail) {
-                return eerb->head - eerb->tail;
-        } else
-                return eerb->buffersize - eerb->tail + eerb->head;
-}
-
-/*
- * The dasd_eer_write_buffer function just copies count bytes of data
- * to the buffer. Make sure to call dasd_eer_start_record first, to
- * make sure that enough free space is available.
- * needs to be called with bufferlock held
- */
-static void
-dasd_eer_write_buffer(struct eerbuffer *eerb, int count, char *data)
-{
-
-        unsigned long headindex,localhead;
-        unsigned long rest, len;
-        char *nextdata;
-
-        nextdata = data;
-        rest = count;
-        while (rest > 0) {
-                headindex = eerb->head / PAGE_SIZE;
-                localhead = eerb->head % PAGE_SIZE;
-                len = min(rest, (PAGE_SIZE - localhead));
-                memcpy(eerb->buffer[headindex]+localhead, nextdata, len);
-                nextdata += len;
-                rest -= len;
-                eerb->head += len;
-                if ( eerb->head == eerb->buffersize )
-                        eerb->head = 0; /* wrap around */
-                if (eerb->head > eerb->buffersize) {
-                        MESSAGE(KERN_ERR, "%s", "runaway buffer head.");
-                        BUG();
-                }
-        }
-}
-
-/*
- * needs to be called with bufferlock held
- */
-static int
-dasd_eer_read_buffer(struct eerbuffer *eerb, int count, char *data)
-{
-
-        unsigned long tailindex,localtail;
-        unsigned long rest, len, finalcount;
-        char *nextdata;
-
-        finalcount = min(count, dasd_eer_get_filled_bytes(eerb));
-        nextdata = data;
-        rest = finalcount;
-        while (rest > 0) {
-                tailindex = eerb->tail / PAGE_SIZE;
-                localtail = eerb->tail % PAGE_SIZE;
-                len = min(rest, (PAGE_SIZE - localtail));
-                memcpy(nextdata, eerb->buffer[tailindex]+localtail, len);
-                nextdata += len;
-                rest -= len;
-                eerb->tail += len;
-                if ( eerb->tail == eerb->buffersize )
-                        eerb->tail = 0; /* wrap around */
-                if (eerb->tail > eerb->buffersize) {
-                        MESSAGE(KERN_ERR, "%s", "runaway buffer tail.");
-                        BUG();
-                }
-        }
-        return finalcount;
-}
-
-/*
- * Whenever you want to write a blob of data to the internal buffer you
- * have to start by using this function first. It will write the number
- * of bytes that will be written to the buffer. If necessary it will remove
- * old records to make room for the new one.
- * needs to be called with bufferlock held
- */
-static int
-dasd_eer_start_record(struct eerbuffer *eerb, int count)
-{
-        int tailcount;
-        if (count + sizeof(count) > eerb->buffersize)
-                return -ENOMEM;
-        while (dasd_eer_get_free_bytes(eerb) < count + sizeof(count)) {
-                if (eerb->residual > 0) {
-                        eerb->tail += eerb->residual;
-                        if (eerb->tail >= eerb->buffersize)
-                                eerb->tail -= eerb->buffersize;
-                        eerb->residual = -1;
-                }
-                dasd_eer_read_buffer(eerb, sizeof(tailcount),
-                                     (char*)(&tailcount));
-                eerb->tail += tailcount;
-                if (eerb->tail >= eerb->buffersize)
-                        eerb->tail -= eerb->buffersize;
-        }
-        dasd_eer_write_buffer(eerb, sizeof(count), (char*)(&count));
-
-        return 0;
-};
-
-/*
- * release pages that are not used anymore
- */
-static void
-dasd_eer_free_buffer_pages(char **buf, int no_pages)
-{
-        int i;
-
-        for (i = 0; i < no_pages; ++i) {
-                free_page((unsigned long)buf[i]);
-        }
-}
-
-/*
- * allocate a new set of memory pages
- */
-static int
-dasd_eer_allocate_buffer_pages(char **buf, int no_pages)
-{
-        int i;
-
-        for (i = 0; i < no_pages; ++i) {
-                buf[i] = (char *) get_zeroed_page(GFP_KERNEL);
-                if (!buf[i]) {
-                        dasd_eer_free_buffer_pages(buf, i);
-                        return -ENOMEM;
-                }
-        }
-        return 0;
-}
-
-/*
- * empty the buffer by resetting head and tail
- * In case there is a half read data blob in the buffer, we set residual
- * to -1 to indicate that the remainder of the blob is lost.
- */
-static void
-dasd_eer_purge_buffer(struct eerbuffer *eerb)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&bufferlock, flags);
-        if (eerb->residual > 0)
-                eerb->residual = -1;
-        eerb->tail=0;
-        eerb->head=0;
-        spin_unlock_irqrestore(&bufferlock, flags);
-}
-
-/*
- * set the size of the buffer, newsize is the new number of pages to be used
- * we don't try to copy any data back an forth, so any resize will also purge
- * the buffer
- */
-static int
-dasd_eer_resize_buffer(struct eerbuffer *eerb, int newsize)
-{
-        int i, oldcount, reuse;
-        char **new;
-        char **old;
-        unsigned long flags;
-
-        if (newsize < 1)
-                return -EINVAL;
-        if (eerb->buffer_page_count == newsize) {
-                /* documented behaviour is that any successfull invocation
-                 * will purge all records */
-                dasd_eer_purge_buffer(eerb);
-                return 0;
-        }
-        new = kmalloc(newsize*sizeof(char*), GFP_KERNEL);
-        if (!new)
-                return -ENOMEM;
-
-        reuse=min(eerb->buffer_page_count, newsize);
-        for (i = 0; i < reuse; ++i) {
-                new[i] = eerb->buffer[i];
-        }
-        if (eerb->buffer_page_count < newsize) {
-                if (dasd_eer_allocate_buffer_pages(
-                            &new[eerb->buffer_page_count],
-                            newsize - eerb->buffer_page_count)) {
-                        kfree(new);
-                        return -ENOMEM;
-                }
-        }
-
-        spin_lock_irqsave(&bufferlock, flags);
-        old = eerb->buffer;
-        eerb->buffer = new;
-        if (eerb->residual > 0)
-                eerb->residual = -1;
-        eerb->tail = 0;
-        eerb->head = 0;
-        oldcount = eerb->buffer_page_count;
-        eerb->buffer_page_count = newsize;
-        spin_unlock_irqrestore(&bufferlock, flags);
-
-        if (oldcount > newsize) {
-                for (i = newsize; i < oldcount; ++i) {
-                        free_page((unsigned long)old[i]);
-                }
-        }
-        kfree(old);
-
-        return 0;
-}
-
-
-/*****************************************************************************/
-/*      The extended error reporting functionality                           */
-/*****************************************************************************/
-
-/*
- * When a DASD device driver wants to report an error, it calls the
- * function dasd_eer_write_trigger (via a notifier mechanism) and gives the
- * respective trigger ID as parameter.
- * Currently there are four kinds of triggers:
- *
- * DASD_EER_FATALERROR:  all kinds of unrecoverable I/O problems
- * DASD_EER_PPRCSUSPEND: PPRC was suspended
- * DASD_EER_NOPATH:      There is no path to the device left.
- * DASD_EER_STATECHANGE: The state of the device has changed.
- *
- * For the first three triggers all required information can be supplied by
- * the caller. For these triggers a record is written by the function
- * dasd_eer_write_standard_trigger.
- *
- * When dasd_eer_write_trigger is called to write a DASD_EER_STATECHANGE
- * trigger, we have to gather the necessary sense data first. We cannot queue
- * the necessary SNSS (sense subsystem status) request immediatly, since we
- * are likely to run in a deadlock situation. Instead, we schedule a
- * work_struct that calls the function dasd_eer_sense_subsystem_status to
- * create and start an SNSS  request asynchronously.
- *
- * To avoid memory allocations at runtime, the necessary memory is allocated
- * when the extended error reporting is enabled for a device (by
- * dasd_eer_probe). There is one private eer data structure for each eer
- * enabled DASD device. It contains memory for the work_struct, one SNSS cqr
- * and a flags field that is used to coordinate the use of the cqr. The call
- * to write a state change trigger can come in at any time, so we have one flag
- * CQR_IN_USE that protects the cqr itself. When this flag indicates that the
- * cqr is currently in use, dasd_eer_sense_subsystem_status cannot start a
- * second request but sets the SNSS_REQUESTED flag instead.
- *
- * When the request is finished, the callback function dasd_eer_SNSS_cb
- * is called. This function will invoke the function
- * dasd_eer_write_SNSS_trigger to finally write the trigger. It will also
- * check the SNSS_REQUESTED flag and if it is set it will call
- * dasd_eer_sense_subsystem_status again.
- *
- * To avoid race conditions during the handling of the lock, the flags must
- * be protected by the snsslock.
- */
-
-struct dasd_eer_private {
-        struct dasd_ccw_req *cqr;
-        unsigned long flags;
-        struct work_struct worker;
-};
-
-static void dasd_eer_destroy(struct dasd_device *device,
-                             struct dasd_eer_private *eer);
-static int
-dasd_eer_write_trigger(struct dasd_eer_trigger *trigger);
-static void dasd_eer_sense_subsystem_status(void *data);
-static int dasd_eer_notify(struct notifier_block *self,
-                           unsigned long action, void *data);
-
-struct workqueue_struct *dasd_eer_workqueue;
-
-#define SNSS_DATA_SIZE 44
-static spinlock_t snsslock = SPIN_LOCK_UNLOCKED;
-
-#define DASD_EER_BUSID_SIZE 10
-struct dasd_eer_header {
-        __u32 total_size;
-        __u32 trigger;
-        __u64 tv_sec;
-        __u64 tv_usec;
-        char busid[DASD_EER_BUSID_SIZE];
-} __attribute__ ((packed));
-
-static struct notifier_block dasd_eer_nb = {
-        .notifier_call = dasd_eer_notify,
-};
-
-/*
- * flags for use with dasd_eer_private
- */
-#define CQR_IN_USE     0
-#define SNSS_REQUESTED 1
-
-/*
- * This function checks if extended error reporting is available for a given
- * dasd_device. If yes, then it creates and returns a struct dasd_eer,
- * otherwise it returns an -EPERM error pointer.
- */
-struct dasd_eer_private *
-dasd_eer_probe(struct dasd_device *device)
-{
-        struct dasd_eer_private *private;
-
-        if (!(device && device->discipline
-              && !strcmp(device->discipline->name, "ECKD"))) {
-                return ERR_PTR(-EPERM);
-        }
-        /* allocate the private data structure */
-        private = (struct dasd_eer_private *)kmalloc(
-                sizeof(struct dasd_eer_private), GFP_KERNEL);
-        if (!private) {
-                return ERR_PTR(-ENOMEM);
-        }
-        INIT_WORK(&private->worker, dasd_eer_sense_subsystem_status,
-                  (void *)device);
-        private->cqr = dasd_kmalloc_request("ECKD",
-                                            1 /* SNSS */ ,
-                                            SNSS_DATA_SIZE ,
-                                            device);
-        if (!private->cqr) {
-                kfree(private);
-                return ERR_PTR(-ENOMEM);
-        }
-        private->flags = 0;
-        return private;
-};
-
-/*
- * If our private SNSS request is queued, remove it from the
- * dasd ccw queue so we can free the requests memory.
- */
-static void
-dasd_eer_dequeue_SNSS_request(struct dasd_device *device,
-                              struct dasd_eer_private *eer)
-{
-        struct list_head *lst, *nxt;
-        struct dasd_ccw_req *cqr, *erpcqr;
-        dasd_erp_fn_t erp_fn;
-
-        spin_lock_irq(get_ccwdev_lock(device->cdev));
-        list_for_each_safe(lst, nxt, &device->ccw_queue) {
-                cqr = list_entry(lst, struct dasd_ccw_req, list);
-                /* we are looking for two kinds or requests */
-                /* first kind: our SNSS request: */
-                if (cqr == eer->cqr) {
-                        if (cqr->status == DASD_CQR_IN_IO)
-                                device->discipline->term_IO(cqr);
-                        list_del(&cqr->list);
-                        break;
-                }
-                /* second kind: ERP requests for our SNSS request */
-                if (cqr->refers) {
-                        /* If this erp request chain ends in our cqr, then */
-                        /* cal the erp_postaction to clean it up  */
-                        erpcqr = cqr;
-                        while (erpcqr->refers) {
-                                erpcqr = erpcqr->refers;
-                        }
-                        if (erpcqr == eer->cqr) {
-                                erp_fn = device->discipline->erp_postaction(
-                                         cqr);
-                                erp_fn(cqr);
-                        }
-                        continue;
-                }
-        }
-        spin_unlock_irq(get_ccwdev_lock(device->cdev));
-}
-
-/*
- * This function dismantles a struct dasd_eer that was created by
- * dasd_eer_probe. Since we want to free our private data structure,
- * we must make sure that the memory is not in use anymore.
- * We have to flush the work queue and remove a possible SNSS request
- * from the dasd queue.
- */
-static void
-dasd_eer_destroy(struct dasd_device *device, struct dasd_eer_private *eer)
-{
-        flush_workqueue(dasd_eer_workqueue);
-        dasd_eer_dequeue_SNSS_request(device, eer);
-        dasd_kfree_request(eer->cqr, device);
-        kfree(eer);
-};
-
-/*
- * enable the extended error reporting for a particular device
- */
-static int
-dasd_eer_enable_on_device(struct dasd_device *device)
-{
-        void *eer;
-        if (!device)
-                return -ENODEV;
-        if (device->eer)
-                return 0;
-        if (!try_module_get(THIS_MODULE)) {
-                return -EINVAL;
-        }
-        eer = (void *)dasd_eer_probe(device);
-        if (IS_ERR(eer)) {
-                module_put(THIS_MODULE);
-                return PTR_ERR(eer);
-        }
-        device->eer = eer;
-        return 0;
-}
-
-/*
- * enable the extended error reporting for a particular device
- */
-static int
-dasd_eer_disable_on_device(struct dasd_device *device)
-{
-        struct dasd_eer_private *eer = device->eer;
-
-        if (!device)
-                return -ENODEV;
-        if (!device->eer)
-                return 0;
-        device->eer = NULL;
-        dasd_eer_destroy(device,eer);
-        module_put(THIS_MODULE);
-
-        return 0;
-}
-
-/*
- * Set extended error reporting (eer)
- * Note: This will be registered as a DASD ioctl, to be called on DASD devices.
- */
-static int
-dasd_ioctl_set_eer(struct block_device *bdev, int no, long args)
-{
-        struct dasd_device *device;
-        int intval;
-
-        if (!capable(CAP_SYS_ADMIN))
-                return -EACCES;
-        if (bdev != bdev->bd_contains)
-                /* Error-reporting is not allowed for partitions */
-                return -EINVAL;
-        if (get_user(intval, (int __user *) args))
-                return -EFAULT;
-        device =  bdev->bd_disk->private_data;
-        if (device == NULL)
-                return -ENODEV;
-
-        intval = (intval != 0);
-        DEV_MESSAGE (KERN_DEBUG, device,
-                     "set eer on device to %d", intval);
-        if (intval)
-                return dasd_eer_enable_on_device(device);
-        else
-                return dasd_eer_disable_on_device(device);
-}
-
-/*
- * Get value of extended error reporting.
- * Note: This will be registered as a DASD ioctl, to be called on DASD devices.
- */
-static int
-dasd_ioctl_get_eer(struct block_device *bdev, int no, long args)
-{
-        struct dasd_device *device;
-
-        device =  bdev->bd_disk->private_data;
-        if (device == NULL)
-                return -ENODEV;
-        return put_user((device->eer != NULL), (int __user *) args);
-}
-
-/*
- * The following function can be used for those triggers that have
- * all necessary data available when the function is called.
- * If the parameter cqr is not NULL, the chain of requests will be searched
- * for valid sense data, and all valid sense data sets will be added to
- * the triggers data.
- */
-static int
-dasd_eer_write_standard_trigger(int trigger, struct dasd_device *device,
-                                struct dasd_ccw_req *cqr)
-{
-        struct dasd_ccw_req *temp_cqr;
-        int data_size;
-        struct timeval tv;
-        struct dasd_eer_header header;
-        unsigned long flags;
-        struct eerbuffer *eerb;
-
-        /* go through cqr chain and count the valid sense data sets */
-        temp_cqr = cqr;
-        data_size = 0;
-        while (temp_cqr) {
-                if (temp_cqr->irb.esw.esw0.erw.cons)
-                        data_size += 32;
-                temp_cqr = temp_cqr->refers;
-        }
-
-        header.total_size = sizeof(header) + data_size + 4; /* "EOR" */
-        header.trigger = trigger;
-        do_gettimeofday(&tv);
-        header.tv_sec = tv.tv_sec;
-        header.tv_usec = tv.tv_usec;
-        strncpy(header.busid, device->cdev->dev.bus_id, DASD_EER_BUSID_SIZE);
-
-        spin_lock_irqsave(&bufferlock, flags);
-        list_for_each_entry(eerb, &bufferlist, list) {
-                dasd_eer_start_record(eerb, header.total_size);
-                dasd_eer_write_buffer(eerb, sizeof(header), (char*)(&header));
-                temp_cqr = cqr;
-                while (temp_cqr) {
-                        if (temp_cqr->irb.esw.esw0.erw.cons)
-                                dasd_eer_write_buffer(eerb, 32, cqr->irb.ecw);
-                        temp_cqr = temp_cqr->refers;
-                }
-                dasd_eer_write_buffer(eerb, 4,"EOR");
-        }
-        spin_unlock_irqrestore(&bufferlock, flags);
-
-        wake_up_interruptible(&dasd_eer_read_wait_queue);
-
-        return 0;
-}
-
-/*
- * This function writes a DASD_EER_STATECHANGE trigger.
- */
-static void
-dasd_eer_write_SNSS_trigger(struct dasd_device *device,
-                            struct dasd_ccw_req *cqr)
-{
-        int data_size;
-        int snss_rc;
-        struct timeval tv;
-        struct dasd_eer_header header;
-        unsigned long flags;
-        struct eerbuffer *eerb;
-
-        snss_rc = (cqr->status == DASD_CQR_FAILED) ? -EIO : 0;
-        if (snss_rc)
-                data_size = 0;
-        else
-                data_size = SNSS_DATA_SIZE;
-
-        header.total_size = sizeof(header) + data_size + 4; /* "EOR" */
-        header.trigger = DASD_EER_STATECHANGE;
-        do_gettimeofday(&tv);
-        header.tv_sec = tv.tv_sec;
-        header.tv_usec = tv.tv_usec;
-        strncpy(header.busid, device->cdev->dev.bus_id, DASD_EER_BUSID_SIZE);
-
-        spin_lock_irqsave(&bufferlock, flags);
-        list_for_each_entry(eerb, &bufferlist, list) {
-                dasd_eer_start_record(eerb, header.total_size);
-                dasd_eer_write_buffer(eerb, sizeof(header),(char*)(&header));
-                if (!snss_rc)
-                        dasd_eer_write_buffer(eerb, SNSS_DATA_SIZE, cqr->data);
-                dasd_eer_write_buffer(eerb, 4,"EOR");
-        }
-        spin_unlock_irqrestore(&bufferlock, flags);
-
-        wake_up_interruptible(&dasd_eer_read_wait_queue);
-}
-
-/*
- * callback function for use with SNSS request
- */
-static void
-dasd_eer_SNSS_cb(struct dasd_ccw_req *cqr, void *data)
-{
-        struct dasd_device *device;
-        struct dasd_eer_private *private;
-        unsigned long irqflags;
-
-        device = (struct dasd_device *)data;
-        private = (struct dasd_eer_private *)device->eer;
-        dasd_eer_write_SNSS_trigger(device, cqr);
-        spin_lock_irqsave(&snsslock, irqflags);
-        if(!test_and_clear_bit(SNSS_REQUESTED, &private->flags)) {
-                clear_bit(CQR_IN_USE, &private->flags);
-                spin_unlock_irqrestore(&snsslock, irqflags);
-                return;
-        };
-        clear_bit(CQR_IN_USE, &private->flags);
-        spin_unlock_irqrestore(&snsslock, irqflags);
-        dasd_eer_sense_subsystem_status(device);
-        return;
-}
-
-/*
- * clean a used cqr before using it again
- */
-static void
-dasd_eer_clean_SNSS_request(struct dasd_ccw_req *cqr)
-{
-        struct ccw1 *cpaddr = cqr->cpaddr;
-        void *data = cqr->data;
-
-        memset(cqr, 0, sizeof(struct dasd_ccw_req));
-        memset(cpaddr, 0, sizeof(struct ccw1));
-        memset(data, 0, SNSS_DATA_SIZE);
-        cqr->cpaddr = cpaddr;
-        cqr->data = data;
-        strncpy((char *) &cqr->magic, "ECKD", 4);
-        ASCEBC((char *) &cqr->magic, 4);
-        set_bit(DASD_CQR_FLAGS_USE_ERP, &cqr->flags);
-}
-
-/*
- * build and start an SNSS request
- * This function is called from a work queue so we have to
- * pass the dasd_device pointer as a void pointer.
- */
-static void
-dasd_eer_sense_subsystem_status(void *data)
-{
-        struct dasd_device *device;
-        struct dasd_eer_private *private;
-        struct dasd_ccw_req *cqr;
-        struct ccw1 *ccw;
-        unsigned long irqflags;
-
-        device = (struct dasd_device *)data;
-        private = (struct dasd_eer_private *)device->eer;
-        if (!private) /* device not eer enabled any more */
-                return;
-        cqr = private->cqr;
-        spin_lock_irqsave(&snsslock, irqflags);
-        if(test_and_set_bit(CQR_IN_USE, &private->flags)) {
-                set_bit(SNSS_REQUESTED, &private->flags);
-                spin_unlock_irqrestore(&snsslock, irqflags);
-                return;
-        };
-        spin_unlock_irqrestore(&snsslock, irqflags);
-        dasd_eer_clean_SNSS_request(cqr);
-        cqr->device = device;
-        cqr->retries = 255;
-        cqr->expires = 10 * HZ;
-
-        ccw = cqr->cpaddr;
-        ccw->cmd_code = DASD_ECKD_CCW_SNSS;
-        ccw->count = SNSS_DATA_SIZE;
-        ccw->flags = 0;
-        ccw->cda = (__u32)(addr_t)cqr->data;
-
-        cqr->buildclk = get_clock();
-        cqr->status = DASD_CQR_FILLED;
-        cqr->callback = dasd_eer_SNSS_cb;
-        cqr->callback_data = (void *)device;
-        dasd_add_request_head(cqr);
-
-        return;
-}
-
-/*
- * This function is called for all triggers. It calls the appropriate
- * function that writes the actual trigger records.
- */
-static int
-dasd_eer_write_trigger(struct dasd_eer_trigger *trigger)
-{
-        int rc;
-        struct dasd_eer_private *private = trigger->device->eer;
-
-        switch (trigger->id) {
-        case DASD_EER_FATALERROR:
-        case DASD_EER_PPRCSUSPEND:
-                rc = dasd_eer_write_standard_trigger(
-                        trigger->id, trigger->device, trigger->cqr);
-                break;
-        case DASD_EER_NOPATH:
-                rc = dasd_eer_write_standard_trigger(
-                        trigger->id, trigger->device, NULL);
-                break;
-        case DASD_EER_STATECHANGE:
-                if (queue_work(dasd_eer_workqueue, &private->worker)) {
-                        rc=0;
-                } else {
-                        /* If the work_struct was already queued, it can't
-                         * be queued again. But this is OK since we don't
-                         * need to have it queued twice.
-                         */
-                        rc = -EBUSY;
-                }
-                break;
-        default: /* unknown trigger, so we write it without any sense data */
-                rc = dasd_eer_write_standard_trigger(
-                        trigger->id, trigger->device, NULL);
-                break;
-        }
-        return rc;
-}
-
-/*
- * This function is registered with the dasd device driver and gets called
- * for all dasd eer notifications.
- */
-static int dasd_eer_notify(struct notifier_block *self,
-                            unsigned long action, void *data)
-{
-        switch (action) {
-        case DASD_EER_DISABLE:
-                dasd_eer_disable_on_device((struct dasd_device *)data);
-                break;
-        case DASD_EER_TRIGGER:
-                dasd_eer_write_trigger((struct dasd_eer_trigger *)data);
-                break;
-        }
-        return NOTIFY_OK;
-}
-
-
-/*****************************************************************************/
-/*      the device operations                                                */
-/*****************************************************************************/
-
-/*
- * On the one side we need a lock to access our internal buffer, on the
- * other side a copy_to_user can sleep. So we need to copy the data we have
- * to transfer in a readbuffer, which is protected by the readbuffer_mutex.
- */
-static char readbuffer[PAGE_SIZE];
-DECLARE_MUTEX(readbuffer_mutex);
-
-
-static int
-dasd_eer_open(struct inode *inp, struct file *filp)
-{
-        struct eerbuffer *eerb;
-        unsigned long flags;
-
-        eerb = kmalloc(sizeof(struct eerbuffer), GFP_KERNEL);
-        eerb->head = 0;
-        eerb->tail = 0;
-        eerb->residual = 0;
-        eerb->buffer_page_count = 1;
-        eerb->buffersize = eerb->buffer_page_count * PAGE_SIZE;
-        eerb->buffer = kmalloc(eerb->buffer_page_count*sizeof(char*),
-                               GFP_KERNEL);
-        if (!eerb->buffer)
-                return -ENOMEM;
-        if (dasd_eer_allocate_buffer_pages(eerb->buffer,
-                                           eerb->buffer_page_count)) {
-                kfree(eerb->buffer);
-                return -ENOMEM;
-        }
-        filp->private_data = eerb;
-        spin_lock_irqsave(&bufferlock, flags);
-        list_add(&eerb->list, &bufferlist);
-        spin_unlock_irqrestore(&bufferlock, flags);
-
-        return nonseekable_open(inp,filp);
-}
-
-static int
-dasd_eer_close(struct inode *inp, struct file *filp)
-{
-        struct eerbuffer *eerb;
-        unsigned long flags;
-
-        eerb = (struct eerbuffer *)filp->private_data;
-        spin_lock_irqsave(&bufferlock, flags);
-        list_del(&eerb->list);
-        spin_unlock_irqrestore(&bufferlock, flags);
-        dasd_eer_free_buffer_pages(eerb->buffer, eerb->buffer_page_count);
-        kfree(eerb->buffer);
-        kfree(eerb);
-
-        return 0;
-}
-
-static long
-dasd_eer_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
-{
-        int intval;
-        struct eerbuffer *eerb;
-
-        eerb = (struct eerbuffer *)filp->private_data;
-        switch (cmd) {
-        case DASD_EER_PURGE:
-                dasd_eer_purge_buffer(eerb);
-                return 0;
-        case DASD_EER_SETBUFSIZE:
-                if (get_user(intval, (int __user *)arg))
-                        return -EFAULT;
-                return dasd_eer_resize_buffer(eerb, intval);
-        default:
-                return -ENOIOCTLCMD;
-        }
-}
-
-static ssize_t
-dasd_eer_read(struct file *filp, char __user *buf, size_t count, loff_t *ppos)
-{
-        int tc,rc;
-        int tailcount,effective_count;
-        unsigned long flags;
-        struct eerbuffer *eerb;
-
-        eerb = (struct eerbuffer *)filp->private_data;
-        if(down_interruptible(&readbuffer_mutex))
-                return -ERESTARTSYS;
-
-        spin_lock_irqsave(&bufferlock, flags);
-
-        if (eerb->residual < 0) { /* the remainder of this record */
-                                  /* has been deleted             */
-                eerb->residual = 0;
-                spin_unlock_irqrestore(&bufferlock, flags);
-                up(&readbuffer_mutex);
-                return -EIO;
-        } else if (eerb->residual > 0) {
-                /* OK we still have a second half of a record to deliver */
-                effective_count = min(eerb->residual, (int)count);
-                eerb->residual -= effective_count;
-        } else {
-                tc = 0;
-                while (!tc) {
-                        tc = dasd_eer_read_buffer(eerb,
-                                sizeof(tailcount), (char*)(&tailcount));
-                        if (!tc) {
-                                /* no data available */
-                                spin_unlock_irqrestore(&bufferlock, flags);
-                                up(&readbuffer_mutex);
-                                if (filp->f_flags & O_NONBLOCK)
-                                        return -EAGAIN;
-                                rc = wait_event_interruptible(
-                                        dasd_eer_read_wait_queue,
-                                        eerb->head != eerb->tail);
-                                if (rc) {
-                                        return rc;
-                                }
-                                if(down_interruptible(&readbuffer_mutex))
-                                        return -ERESTARTSYS;
-                                spin_lock_irqsave(&bufferlock, flags);
-                        }
-                }
-                WARN_ON(tc != sizeof(tailcount));
-                effective_count = min(tailcount,(int)count);
-                eerb->residual = tailcount - effective_count;
-        }
-
-        tc = dasd_eer_read_buffer(eerb, effective_count, readbuffer);
-        WARN_ON(tc != effective_count);
-
-        spin_unlock_irqrestore(&bufferlock, flags);
-
-        if (copy_to_user(buf, readbuffer, effective_count)) {
-                up(&readbuffer_mutex);
-                return -EFAULT;
-        }
-
-        up(&readbuffer_mutex);
-        return effective_count;
-}
-
-static unsigned int
-dasd_eer_poll (struct file *filp, poll_table *ptable)
-{
-        unsigned int mask;
-        unsigned long flags;
-        struct eerbuffer *eerb;
-
-        eerb = (struct eerbuffer *)filp->private_data;
-        poll_wait(filp, &dasd_eer_read_wait_queue, ptable);
-        spin_lock_irqsave(&bufferlock, flags);
-        if (eerb->head != eerb->tail)
-                mask = POLLIN | POLLRDNORM ;
-        else
-                mask = 0;
-        spin_unlock_irqrestore(&bufferlock, flags);
-        return mask;
-}
-
-static struct file_operations dasd_eer_fops = {
-        .open           = &dasd_eer_open,
-        .release        = &dasd_eer_close,
-        .unlocked_ioctl = &dasd_eer_ioctl,
-        .compat_ioctl   = &dasd_eer_ioctl,
-        .read           = &dasd_eer_read,
-        .poll           = &dasd_eer_poll,
-        .owner          = THIS_MODULE,
-};
-
-static struct miscdevice dasd_eer_dev = {
-        .minor      = MISC_DYNAMIC_MINOR,
-        .name       = "dasd_eer",
-        .fops       = &dasd_eer_fops,
-};
-
-
-/*****************************************************************************/
-/*      Init and exit                                                        */
-/*****************************************************************************/
-
-static int
-__init dasd_eer_init(void)
-{
-        int rc;
-
-        dasd_eer_workqueue = create_singlethread_workqueue("dasd_eer");
-        if (!dasd_eer_workqueue) {
-                MESSAGE(KERN_ERR , "%s", "dasd_eer_init could not "
-                       "create workqueue \n");
-                rc = -ENOMEM;
-                goto out;
-        }
-
-        rc = dasd_register_eer_notifier(&dasd_eer_nb);
-        if (rc) {
-                MESSAGE(KERN_ERR, "%s", "dasd_eer_init could not "
-                       "register error reporting");
-                goto queue;
-        }
-
-        dasd_ioctl_no_register(THIS_MODULE, BIODASDEERSET, dasd_ioctl_set_eer);
-        dasd_ioctl_no_register(THIS_MODULE, BIODASDEERGET, dasd_ioctl_get_eer);
-
-        /* we don't need our own character device,
-         * so we just register as misc device */
-        rc = misc_register(&dasd_eer_dev);
-        if (rc) {
-                MESSAGE(KERN_ERR, "%s", "dasd_eer_init could not "
-                       "register misc device");
-                goto unregister;
-        }
-
-        return 0;
-
-unregister:
-        dasd_unregister_eer_notifier(&dasd_eer_nb);
-        dasd_ioctl_no_unregister(THIS_MODULE, BIODASDEERSET,
-                                 dasd_ioctl_set_eer);
-        dasd_ioctl_no_unregister(THIS_MODULE, BIODASDEERGET,
-                                 dasd_ioctl_get_eer);
-queue:
-        destroy_workqueue(dasd_eer_workqueue);
-out:
-        return rc;
-
-}
-module_init(dasd_eer_init);
-
-static void
-__exit dasd_eer_exit(void)
-{
-        dasd_unregister_eer_notifier(&dasd_eer_nb);
-        dasd_ioctl_no_unregister(THIS_MODULE, BIODASDEERSET,
-                                 dasd_ioctl_set_eer);
-        dasd_ioctl_no_unregister(THIS_MODULE, BIODASDEERGET,
-                                 dasd_ioctl_get_eer);
-        destroy_workqueue(dasd_eer_workqueue);
-
-        WARN_ON(misc_deregister(&dasd_eer_dev) != 0);
-}
-module_exit(dasd_eer_exit);
diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c
index 65dc844b975c..fce2835e7d19 100644
--- a/drivers/s390/block/dasd_genhd.c
+++ b/drivers/s390/block/dasd_genhd.c
@@ -100,8 +100,6 @@ dasd_scan_partitions(struct dasd_device * device)
 {
         struct block_device *bdev;
 
-        /* Make the disk known. */
-        set_capacity(device->gdp, device->blocks << device->s2b_shift);
         bdev = bdget_disk(device->gdp, 0);
         if (!bdev || blkdev_get(bdev, FMODE_READ, 1) < 0)
                 return -ENODEV;
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h
index d1b08fa13fd2..7cb0b9e78a6a 100644
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
@@ -26,7 +26,7 @@
  *   new: the dasd_device structure is allocated.
  *   known: the discipline for the device is identified.
  *   basic: the device can do basic i/o.
- *   accept: the device is analysed (format is known).
+ *   unfmt: the device could not be analyzed (format is unknown).
  *   ready: partition detection is done and the device is can do block io.
  *   online: the device accepts requests from the block device queue.
  *
@@ -47,8 +47,9 @@
 #define DASD_STATE_NEW    0
 #define DASD_STATE_KNOWN  1
 #define DASD_STATE_BASIC  2
-#define DASD_STATE_READY  3
-#define DASD_STATE_ONLINE 4
+#define DASD_STATE_UNFMT  3
+#define DASD_STATE_READY  4
+#define DASD_STATE_ONLINE 5
 
 #include <linux/module.h>
 #include <linux/wait.h>
@@ -275,34 +276,6 @@ struct dasd_discipline {
 
 extern struct dasd_discipline *dasd_diag_discipline_pointer;
 
-
-/*
- * Notification numbers for extended error reporting notifications:
- * The DASD_EER_DISABLE notification is sent before a dasd_device (and it's
- * eer pointer) is freed. The error reporting module needs to do all necessary
- * cleanup steps.
- * The DASD_EER_TRIGGER notification sends the actual error reports (triggers).
- */
-#define DASD_EER_DISABLE 0
-#define DASD_EER_TRIGGER 1
-
-/* Trigger IDs for extended error reporting DASD_EER_TRIGGER notification */
-#define DASD_EER_FATALERROR  1
-#define DASD_EER_NOPATH      2
-#define DASD_EER_STATECHANGE 3
-#define DASD_EER_PPRCSUSPEND 4
-
-/*
- * The dasd_eer_trigger structure contains all data that we need to send
- * along with an DASD_EER_TRIGGER notification.
- */
-struct dasd_eer_trigger {
-        unsigned int id;
-        struct dasd_device *device;
-        struct dasd_ccw_req *cqr;
-};
-
-
 struct dasd_device {
         /* Block device stuff. */
         struct gendisk *gdp;
@@ -316,11 +289,9 @@ struct dasd_device {
         unsigned long flags;            /* per device flags */
         unsigned short features;        /* copy of devmap-features (read-only!) */
 
-        /* extended error reporting stuff (eer) */
-        void *eer;
-
         /* Device discipline stuff. */
         struct dasd_discipline *discipline;
+        struct dasd_discipline *base_discipline;
         char *private;
 
         /* Device state and target state. */
@@ -519,12 +490,6 @@ int dasd_generic_set_online(struct ccw_device *, struct dasd_discipline *);
 int dasd_generic_set_offline (struct ccw_device *cdev);
 int dasd_generic_notify(struct ccw_device *, int);
 void dasd_generic_auto_online (struct ccw_driver *);
-int dasd_register_eer_notifier(struct notifier_block *);
-int dasd_unregister_eer_notifier(struct notifier_block *);
-void dasd_write_eer_trigger(unsigned int , struct dasd_device *,
-                        struct dasd_ccw_req *);
-
-
 
 /* externals in dasd_devmap.c */
 extern int dasd_max_devindex;
diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c
index 2d5da3c75ca7..1aa3c261718a 100644
--- a/drivers/s390/block/dasd_proc.c
+++ b/drivers/s390/block/dasd_proc.c
@@ -93,6 +93,9 @@ dasd_devices_show(struct seq_file *m, void *v)
         case DASD_STATE_BASIC:
                 seq_printf(m, "basic");
                 break;
+        case DASD_STATE_UNFMT:
+                seq_printf(m, "unformatted");
+                break;
         case DASD_STATE_READY:
         case DASD_STATE_ONLINE:
                 seq_printf(m, "active ");
diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c
index 8cf9905d484b..f4183d660258 100644
--- a/drivers/s390/cio/chsc.c
+++ b/drivers/s390/cio/chsc.c
@@ -1115,6 +1115,9 @@ chsc_enable_facility(int operation_code)
                 goto out;
         }
         switch (sda_area->response.code) {
+        case 0x0001: /* everything ok */
+                ret = 0;
+                break;
         case 0x0003: /* invalid request block */
         case 0x0007:
                 ret = -EINVAL;
@@ -1123,6 +1126,8 @@ chsc_enable_facility(int operation_code)
         case 0x0101: /* facility not provided */
                 ret = -EOPNOTSUPP;
                 break;
+        default: /* something went wrong */
+                ret = -EIO;
         }
  out:
         free_page((unsigned long)sda_area);
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 062fb100d94c..afc4e88551ad 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -359,7 +359,7 @@ ccw_device_set_online(struct ccw_device *cdev)
         else 
                 pr_debug("ccw_device_offline returned %d, device %s\n",
                          ret, cdev->dev.bus_id);
-        return (ret = 0) ? -ENODEV : ret;
+        return (ret == 0) ? -ENODEV : ret;
 }
 
 static ssize_t
diff --git a/drivers/s390/cio/device_pgid.c b/drivers/s390/cio/device_pgid.c
index d2a5b04d7cba..85b1020a1fcc 100644
--- a/drivers/s390/cio/device_pgid.c
+++ b/drivers/s390/cio/device_pgid.c
@@ -405,7 +405,7 @@ __ccw_device_disband_start(struct ccw_device *cdev)
                 cdev->private->iretry = 5;
                 cdev->private->imask >>= 1;
         }
-        ccw_device_verify_done(cdev, (sch->lpm != 0) ? 0 : -ENODEV);
+        ccw_device_disband_done(cdev, (sch->lpm != 0) ? 0 : -ENODEV);
 }
 
 /*
diff --git a/drivers/s390/cio/device_status.c b/drivers/s390/cio/device_status.c
index dad4dd9887c9..6c762b43f921 100644
--- a/drivers/s390/cio/device_status.c
+++ b/drivers/s390/cio/device_status.c
@@ -317,7 +317,6 @@ ccw_device_do_sense(struct ccw_device *cdev, struct irb *irb)
         /*
          * We have ending status but no sense information. Do a basic sense.
          */
-        sch = to_subchannel(cdev->dev.parent);
         sch->sense_ccw.cmd_code = CCW_CMD_BASIC_SENSE;
         sch->sense_ccw.cda = (__u32) __pa(cdev->private->irb.ecw);
         sch->sense_ccw.count = SENSE_MAX_COUNT;
diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c
index 45ce032772f4..9ed37dc9a1b0 100644
--- a/drivers/s390/cio/qdio.c
+++ b/drivers/s390/cio/qdio.c
@@ -165,8 +165,13 @@ qdio_do_eqbs(struct qdio_q *q, unsigned char *state,
         q_no = q->q_no;
         if(!q->is_input_q)
                 q_no += irq->no_input_qs;
+again:
         ccq = do_eqbs(irq->sch_token, state, q_no, start, cnt);
         rc = qdio_check_ccq(q, ccq);
+        if (rc == 1) {
+                QDIO_DBF_TEXT5(1,trace,"eqAGAIN");
+                goto again;
+        }
         if (rc < 0) {
                 QDIO_DBF_TEXT2(1,trace,"eqberr");
                 sprintf(dbf_text,"%2x,%2x,%d,%d",tmp_cnt, *cnt, ccq, q_no);
@@ -195,8 +200,13 @@ qdio_do_sqbs(struct qdio_q *q, unsigned char state,
         q_no = q->q_no;
         if(!q->is_input_q)
                 q_no += irq->no_input_qs;
+again:
         ccq = do_sqbs(irq->sch_token, state, q_no, start, cnt);
         rc = qdio_check_ccq(q, ccq);
+        if (rc == 1) {
+                QDIO_DBF_TEXT5(1,trace,"sqAGAIN");
+                goto again;
+        }
         if (rc < 0) {
                 QDIO_DBF_TEXT3(1,trace,"sqberr");
                 sprintf(dbf_text,"%2x,%2x,%d,%d",tmp_cnt,*cnt,ccq,q_no);
@@ -1187,8 +1197,7 @@ tiqdio_is_inbound_q_done(struct qdio_q *q)
 
         if (!no_used)
                 return 1;
-
-        if (!q->siga_sync)
+        if (!q->siga_sync && !irq->is_qebsm)
                 /* we'll check for more primed buffers in qeth_stop_polling */
                 return 0;
         if (irq->is_qebsm) {
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index 6229ba4995ad..9cf88d7201d3 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -98,9 +98,9 @@ lcs_register_debug_facility(void)
                 return -ENOMEM;
         }
         debug_register_view(lcs_dbf_setup, &debug_hex_ascii_view);
-        debug_set_level(lcs_dbf_setup, 4);
+        debug_set_level(lcs_dbf_setup, 2);
         debug_register_view(lcs_dbf_trace, &debug_hex_ascii_view);
-        debug_set_level(lcs_dbf_trace, 4);
+        debug_set_level(lcs_dbf_trace, 2);
         return 0;
 }
 
@@ -1292,9 +1292,8 @@ lcs_set_multicast_list(struct net_device *dev)
         LCS_DBF_TEXT(4, trace, "setmulti");
         card = (struct lcs_card *) dev->priv;
 
-        if (!lcs_set_thread_start_bit(card, LCS_SET_MC_THREAD)) {
+        if (!lcs_set_thread_start_bit(card, LCS_SET_MC_THREAD)) 
                 schedule_work(&card->kernel_thread_starter);
-        }
 }
 
 #endif /* CONFIG_IP_MULTICAST */
@@ -1459,6 +1458,8 @@ lcs_txbuffer_cb(struct lcs_channel *channel, struct lcs_buffer *buffer)
         lcs_release_buffer(channel, buffer);
         card = (struct lcs_card *)
                 ((char *) channel - offsetof(struct lcs_card, write));
+        if (netif_queue_stopped(card->dev))
+                netif_wake_queue(card->dev);
         spin_lock(&card->lock);
         card->tx_emitted--;
         if (card->tx_emitted <= 0 && card->tx_buffer != NULL)
@@ -1478,6 +1479,7 @@ __lcs_start_xmit(struct lcs_card *card, struct sk_buff *skb,
                  struct net_device *dev)
 {
         struct lcs_header *header;
+        int rc = 0;
 
         LCS_DBF_TEXT(5, trace, "hardxmit");
         if (skb == NULL) {
@@ -1492,10 +1494,8 @@ __lcs_start_xmit(struct lcs_card *card, struct sk_buff *skb,
                 card->stats.tx_carrier_errors++;
                 return 0;
         }
-        if (netif_queue_stopped(dev) ) {
-                card->stats.tx_dropped++;
-                return -EBUSY;
-        }
+        netif_stop_queue(card->dev);
+        spin_lock(&card->lock);
         if (card->tx_buffer != NULL &&
             card->tx_buffer->count + sizeof(struct lcs_header) +
             skb->len + sizeof(u16) > LCS_IOBUFFERSIZE)
@@ -1506,7 +1506,8 @@ __lcs_start_xmit(struct lcs_card *card, struct sk_buff *skb,
                 card->tx_buffer = lcs_get_buffer(&card->write);
                 if (card->tx_buffer == NULL) {
                         card->stats.tx_dropped++;
-                        return -EBUSY;
+                        rc = -EBUSY;
+                        goto out;
                 }
                 card->tx_buffer->callback = lcs_txbuffer_cb;
                 card->tx_buffer->count = 0;
@@ -1518,13 +1519,18 @@ __lcs_start_xmit(struct lcs_card *card, struct sk_buff *skb,
         header->type = card->lan_type;
         header->slot = card->portno;
         memcpy(header + 1, skb->data, skb->len);
+        spin_unlock(&card->lock);
         card->stats.tx_bytes += skb->len;
         card->stats.tx_packets++;
         dev_kfree_skb(skb);
-        if (card->tx_emitted <= 0)
+        netif_wake_queue(card->dev);
+        spin_lock(&card->lock);
+        if (card->tx_emitted <= 0 && card->tx_buffer != NULL)
                 /* If this is the first tx buffer emit it immediately. */
                 __lcs_emit_txbuffer(card);
-        return 0;
+out:
+        spin_unlock(&card->lock);
+        return rc;
 }
 
 static int
@@ -1535,9 +1541,7 @@ lcs_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         LCS_DBF_TEXT(5, trace, "pktxmit");
         card = (struct lcs_card *) dev->priv;
-        spin_lock(&card->lock);
         rc = __lcs_start_xmit(card, skb, dev);
-        spin_unlock(&card->lock);
         return rc;
 }
 
@@ -2319,7 +2323,6 @@ __init lcs_init_module(void)
                 PRINT_ERR("Initialization failed\n");
                 return rc;
         }
-
         return 0;
 }
 
diff --git a/drivers/s390/net/lcs.h b/drivers/s390/net/lcs.h
index 08e60ad43916..2fad5e40c2e4 100644
--- a/drivers/s390/net/lcs.h
+++ b/drivers/s390/net/lcs.h
@@ -95,7 +95,7 @@ do {                                       \
  */
 #define LCS_ILLEGAL_OFFSET              0xffff
 #define LCS_IOBUFFERSIZE                0x5000
-#define LCS_NUM_BUFFS                   8       /* needs to be power of 2 */
+#define LCS_NUM_BUFFS                   32      /* needs to be power of 2 */
 #define LCS_MAC_LENGTH                  6
 #define LCS_INVALID_PORT_NO             -1
 #define LCS_LANCMD_TIMEOUT_DEFAULT      5
diff --git a/drivers/s390/net/qeth.h b/drivers/s390/net/qeth.h
index 9a064d4727ad..4df0fcd7b10b 100644
--- a/drivers/s390/net/qeth.h
+++ b/drivers/s390/net/qeth.h
@@ -1076,16 +1076,6 @@ qeth_get_qdio_q_format(struct qeth_card *card)
 }
 
 static inline int
-qeth_isdigit(char * buf)
-{
-        while (*buf) {
-                if (!isdigit(*buf++))
-                        return 0;
-        }
-        return 1;
-}
-
-static inline int
 qeth_isxdigit(char * buf)
 {
         while (*buf) {
@@ -1104,33 +1094,17 @@ qeth_ipaddr4_to_string(const __u8 *addr, char *buf)
 static inline int
 qeth_string_to_ipaddr4(const char *buf, __u8 *addr)
 {
-        const char *start, *end;
-        char abuf[4];
-        char *tmp;
-        int len;
-        int i;
-
-        start = buf;
-        for (i = 0; i < 4; i++) {
-                if (i == 3) {
-                        end = strchr(start,0xa);
-                        if (end)
-                                len = end - start;
-                        else            
-                                len = strlen(start);
-                }
-                else {
-                        end = strchr(start, '.');
-                        len = end - start;
-                }
-                if ((len <= 0) || (len > 3))
-                        return -EINVAL;
-                memset(abuf, 0, 4);
-                strncpy(abuf, start, len);
-                if (!qeth_isdigit(abuf))
+        int count = 0, rc = 0;
+        int in[4];
+
+        rc = sscanf(buf, "%d.%d.%d.%d%n", 
+                    &in[0], &in[1], &in[2], &in[3], &count);
+        if (rc != 4  || count) 
+                return -EINVAL;
+        for (count = 0; count < 4; count++) {
+                if (in[count] > 255)
                         return -EINVAL;
-                addr[i] = simple_strtoul(abuf, &tmp, 10);
-                start = end + 1;
+                addr[count] = in[count];
         }
         return 0;
 }
@@ -1149,36 +1123,44 @@ qeth_ipaddr6_to_string(const __u8 *addr, char *buf)
 static inline int
 qeth_string_to_ipaddr6(const char *buf, __u8 *addr)
 {
-        const char *start, *end;
-        u16 *tmp_addr;
-        char abuf[5];
-        char *tmp;
-        int len;
-        int i;
-
-        tmp_addr = (u16 *)addr;
-        start = buf;
-        for (i = 0; i < 8; i++) {
-                if (i == 7) {
-                        end = strchr(start,0xa);
-                        if (end)
-                                len = end - start;
-                        else
-                                len = strlen(start);
-                }
-                else {
-                        end = strchr(start, ':');
-                        len = end - start;
+        char *end, *start;
+        __u16 *in;
+        char num[5];
+        int num2, cnt, out, found, save_cnt;
+        unsigned short in_tmp[8] = {0, };
+
+        cnt = out = found = save_cnt = num2 = 0;
+        end = start = (char *) buf;
+        in = (__u16 *) addr;    
+        memset(in, 0, 16);
+        while (end) {
+                end = strchr(end,':');
+                if (end == NULL) {
+                        end = (char *)buf + (strlen(buf));
+                        out = 1;
+                }
+                if ((end - start)) { 
+                        memset(num, 0, 5);
+                        memcpy(num, start, end - start);
+                        if (!qeth_isxdigit(num))
+                                return -EINVAL;
+                        sscanf(start, "%x", &num2);
+                        if (found)
+                                in_tmp[save_cnt++] = num2;
+                        else
+                                in[cnt++] = num2;
+                        if (out)
+                                break;
+                } else {
+                        if (found)
+                                return -EINVAL;
+                        found = 1;
                 }
-                if ((len <= 0) || (len > 4))
-                        return -EINVAL;
-                memset(abuf, 0, 5);
-                strncpy(abuf, start, len);
-                if (!qeth_isxdigit(abuf))
-                        return -EINVAL;
-                tmp_addr[i] = simple_strtoul(abuf, &tmp, 16);
-                start = end + 1;
-        }
+                start = ++end;
+        }
+        cnt = 7;
+        while (save_cnt)
+                in[cnt--] = in_tmp[--save_cnt];
         return 0;
 }
 
diff --git a/drivers/s390/net/qeth_eddp.c b/drivers/s390/net/qeth_eddp.c
index b02313127780..82cb4af2f0e7 100644
--- a/drivers/s390/net/qeth_eddp.c
+++ b/drivers/s390/net/qeth_eddp.c
@@ -59,8 +59,7 @@ qeth_eddp_free_context(struct qeth_eddp_context *ctx)
         for (i = 0; i < ctx->num_pages; ++i)
                 free_page((unsigned long)ctx->pages[i]);
         kfree(ctx->pages);
-        if (ctx->elements != NULL)
-                kfree(ctx->elements);
+        kfree(ctx->elements);
         kfree(ctx);
 }
 
@@ -413,6 +412,13 @@ __qeth_eddp_fill_context_tcp(struct qeth_eddp_context *ctx,
         
         QETH_DBF_TEXT(trace, 5, "eddpftcp");
         eddp->skb_offset = sizeof(struct qeth_hdr) + eddp->nhl + eddp->thl;
+       if (eddp->qh.hdr.l2.id == QETH_HEADER_TYPE_LAYER2) {
+               eddp->skb_offset += sizeof(struct ethhdr);
+#ifdef CONFIG_QETH_VLAN
+               if (eddp->mac.h_proto == __constant_htons(ETH_P_8021Q))
+                       eddp->skb_offset += VLAN_HLEN;
+#endif /* CONFIG_QETH_VLAN */
+       }
         tcph = eddp->skb->h.th;
         while (eddp->skb_offset < eddp->skb->len) {
                 data_len = min((int)skb_shinfo(eddp->skb)->tso_size,
@@ -483,6 +489,7 @@ qeth_eddp_fill_context_tcp(struct qeth_eddp_context *ctx,
                 return -ENOMEM;
         }
         if (qhdr->hdr.l2.id == QETH_HEADER_TYPE_LAYER2) {
+                skb->mac.raw = (skb->data) + sizeof(struct qeth_hdr);
                 memcpy(&eddp->mac, eth_hdr(skb), ETH_HLEN);
 #ifdef CONFIG_QETH_VLAN
                 if (eddp->mac.h_proto == __constant_htons(ETH_P_8021Q)) {
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index 410abeada6c4..dba7f7f02e79 100644
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
@@ -516,7 +516,8 @@ __qeth_set_offline(struct ccwgroup_device *cgdev, int recovery_mode)
         QETH_DBF_TEXT(setup, 3, "setoffl");
         QETH_DBF_HEX(setup, 3, &card, sizeof(void *));
         
-        netif_carrier_off(card->dev);
+        if (card->dev && netif_carrier_ok(card->dev))
+                netif_carrier_off(card->dev);
         recover_flag = card->state;
         if (qeth_stop_card(card, recovery_mode) == -ERESTARTSYS){
                 PRINT_WARN("Stopping card %s interrupted by user!\n",
@@ -1679,6 +1680,7 @@ qeth_cmd_timeout(unsigned long data)
         spin_unlock_irqrestore(&reply->card->lock, flags);
 }
 
+
 static struct qeth_ipa_cmd *
 qeth_check_ipa_data(struct qeth_card *card, struct qeth_cmd_buffer *iob)
 {
@@ -1699,7 +1701,8 @@ qeth_check_ipa_data(struct qeth_card *card, struct qeth_cmd_buffer *iob)
                                            QETH_CARD_IFNAME(card),
                                            card->info.chpid);
                                 card->lan_online = 0;
-                                netif_carrier_off(card->dev);
+                                if (card->dev && netif_carrier_ok(card->dev))
+                                        netif_carrier_off(card->dev);
                                 return NULL;
                         case IPA_CMD_STARTLAN:
                                 PRINT_INFO("Link reestablished on %s "
@@ -5562,7 +5565,7 @@ qeth_set_multicast_list(struct net_device *dev)
         if (card->info.type == QETH_CARD_TYPE_OSN)
                 return ;
          
-        QETH_DBF_TEXT(trace,3,"setmulti");
+        QETH_DBF_TEXT(trace, 3, "setmulti");
         qeth_delete_mc_addresses(card);
         if (card->options.layer2) {
                 qeth_layer2_add_multicast(card);
@@ -5579,7 +5582,6 @@ out:
                 return;
         if (qeth_set_thread_start_bit(card, QETH_SET_PROMISC_MODE_THREAD)==0)
                 schedule_work(&card->kernel_thread_starter);
-
 }
 
 static int
@@ -7452,6 +7454,7 @@ qeth_softsetup_card(struct qeth_card *card)
                 card->lan_online = 1;
         if (card->info.type==QETH_CARD_TYPE_OSN)
                 goto out;
+        qeth_set_large_send(card, card->options.large_send);
         if (card->options.layer2) {
                 card->dev->features |=
                         NETIF_F_HW_VLAN_FILTER |
@@ -7468,12 +7471,6 @@ qeth_softsetup_card(struct qeth_card *card)
 #endif
                 goto out;
         }
-        if ((card->options.large_send == QETH_LARGE_SEND_EDDP) ||
-            (card->options.large_send == QETH_LARGE_SEND_TSO))
-                card->dev->features |= NETIF_F_TSO | NETIF_F_SG;
-        else
-                card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG);
-
         if ((rc = qeth_setadapter_parms(card)))
                 QETH_DBF_TEXT_(setup, 2, "2err%d", rc);
         if ((rc = qeth_start_ipassists(card)))
diff --git a/drivers/s390/net/smsgiucv.c b/drivers/s390/net/smsgiucv.c
index d6469baa7e16..72118ee68954 100644
--- a/drivers/s390/net/smsgiucv.c
+++ b/drivers/s390/net/smsgiucv.c
@@ -168,7 +168,7 @@ smsg_init(void)
                 driver_unregister(&smsg_driver);
                 return -EIO;    /* better errno ? */
         }
-        rc = iucv_connect (&smsg_pathid, 1, 0, "*MSG    ", 0, 0, 0, 0,
+        rc = iucv_connect (&smsg_pathid, 255, 0, "*MSG    ", 0, 0, 0, 0,
                            smsg_handle, 0);
         if (rc) {
                 printk(KERN_ERR "SMSGIUCV: failed to connect to *MSG");
diff --git a/drivers/s390/scsi/zfcp_dbf.c b/drivers/s390/scsi/zfcp_dbf.c
index 4d7d47cf2394..a5f2ba9a8fdb 100644
--- a/drivers/s390/scsi/zfcp_dbf.c
+++ b/drivers/s390/scsi/zfcp_dbf.c
@@ -710,10 +710,9 @@ static inline void
 _zfcp_scsi_dbf_event_common(const char *tag, const char *tag2, int level,
                             struct zfcp_adapter *adapter,
                             struct scsi_cmnd *scsi_cmnd,
-                            struct zfcp_fsf_req *new_fsf_req)
+                            struct zfcp_fsf_req *fsf_req,
+                            struct zfcp_fsf_req *old_fsf_req)
 {
-        struct zfcp_fsf_req *fsf_req =
-            (struct zfcp_fsf_req *)scsi_cmnd->host_scribble;
         struct zfcp_scsi_dbf_record *rec = &adapter->scsi_dbf_buf;
         struct zfcp_dbf_dump *dump = (struct zfcp_dbf_dump *)rec;
         unsigned long flags;
@@ -727,19 +726,20 @@ _zfcp_scsi_dbf_event_common(const char *tag, const char *tag2, int level,
                 if (offset == 0) {
                         strncpy(rec->tag, tag, ZFCP_DBF_TAG_SIZE);
                         strncpy(rec->tag2, tag2, ZFCP_DBF_TAG_SIZE);
-                        if (scsi_cmnd->device) {
-                                rec->scsi_id = scsi_cmnd->device->id;
-                                rec->scsi_lun = scsi_cmnd->device->lun;
+                        if (scsi_cmnd != NULL) {
+                                if (scsi_cmnd->device) {
+                                        rec->scsi_id = scsi_cmnd->device->id;
+                                        rec->scsi_lun = scsi_cmnd->device->lun;
+                                }
+                                rec->scsi_result = scsi_cmnd->result;
+                                rec->scsi_cmnd = (unsigned long)scsi_cmnd;
+                                rec->scsi_serial = scsi_cmnd->serial_number;
+                                memcpy(rec->scsi_opcode, &scsi_cmnd->cmnd,
+                                        min((int)scsi_cmnd->cmd_len,
+                                                ZFCP_DBF_SCSI_OPCODE));
+                                rec->scsi_retries = scsi_cmnd->retries;
+                                rec->scsi_allowed = scsi_cmnd->allowed;
                         }
-                        rec->scsi_result = scsi_cmnd->result;
-                        rec->scsi_cmnd = (unsigned long)scsi_cmnd;
-                        rec->scsi_serial = scsi_cmnd->serial_number;
-                        memcpy(rec->scsi_opcode,
-                               &scsi_cmnd->cmnd,
-                               min((int)scsi_cmnd->cmd_len,
-                                   ZFCP_DBF_SCSI_OPCODE));
-                        rec->scsi_retries = scsi_cmnd->retries;
-                        rec->scsi_allowed = scsi_cmnd->allowed;
                         if (fsf_req != NULL) {
                                 fcp_rsp = (struct fcp_rsp_iu *)
                                     &(fsf_req->qtcb->bottom.io.fcp_rsp);
@@ -772,15 +772,8 @@ _zfcp_scsi_dbf_event_common(const char *tag, const char *tag2, int level,
                                 rec->fsf_seqno = fsf_req->seq_no;
                                 rec->fsf_issued = fsf_req->issued;
                         }
-                        if (new_fsf_req != NULL) {
-                                rec->type.new_fsf_req.fsf_reqid =
-                                    (unsigned long)
-                                    new_fsf_req;
-                                rec->type.new_fsf_req.fsf_seqno =
-                                    new_fsf_req->seq_no;
-                                rec->type.new_fsf_req.fsf_issued =
-                                    new_fsf_req->issued;
-                        }
+                        rec->type.old_fsf_reqid =
+                                    (unsigned long) old_fsf_req;
                 } else {
                         strncpy(dump->tag, "dump", ZFCP_DBF_TAG_SIZE);
                         dump->total_size = buflen;
@@ -801,19 +794,21 @@ _zfcp_scsi_dbf_event_common(const char *tag, const char *tag2, int level,
 inline void
 zfcp_scsi_dbf_event_result(const char *tag, int level,
                            struct zfcp_adapter *adapter,
-                           struct scsi_cmnd *scsi_cmnd)
+                           struct scsi_cmnd *scsi_cmnd,
+                           struct zfcp_fsf_req *fsf_req)
 {
-        _zfcp_scsi_dbf_event_common("rslt",
-                                    tag, level, adapter, scsi_cmnd, NULL);
+        _zfcp_scsi_dbf_event_common("rslt", tag, level,
+                        adapter, scsi_cmnd, fsf_req, NULL);
 }
 
 inline void
 zfcp_scsi_dbf_event_abort(const char *tag, struct zfcp_adapter *adapter,
                           struct scsi_cmnd *scsi_cmnd,
-                          struct zfcp_fsf_req *new_fsf_req)
+                          struct zfcp_fsf_req *new_fsf_req,
+                          struct zfcp_fsf_req *old_fsf_req)
 {
-        _zfcp_scsi_dbf_event_common("abrt",
-                                    tag, 1, adapter, scsi_cmnd, new_fsf_req);
+        _zfcp_scsi_dbf_event_common("abrt", tag, 1,
+                        adapter, scsi_cmnd, new_fsf_req, old_fsf_req);
 }
 
 inline void
@@ -823,7 +818,7 @@ zfcp_scsi_dbf_event_devreset(const char *tag, u8 flag, struct zfcp_unit *unit,
         struct zfcp_adapter *adapter = unit->port->adapter;
 
         _zfcp_scsi_dbf_event_common(flag == FCP_TARGET_RESET ? "trst" : "lrst",
-                                    tag, 1, adapter, scsi_cmnd, NULL);
+                        tag, 1, adapter, scsi_cmnd, NULL, NULL);
 }
 
 static int
@@ -856,6 +851,10 @@ zfcp_scsi_dbf_view_format(debug_info_t * id, struct debug_view *view,
                              rec->scsi_retries);
         len += zfcp_dbf_view(out_buf + len, "scsi_allowed", "0x%02x",
                              rec->scsi_allowed);
+        if (strncmp(rec->tag, "abrt", ZFCP_DBF_TAG_SIZE) == 0) {
+                len += zfcp_dbf_view(out_buf + len, "old_fsf_reqid", "0x%0Lx",
+                                     rec->type.old_fsf_reqid);
+        }
         len += zfcp_dbf_view(out_buf + len, "fsf_reqid", "0x%0Lx",
                              rec->fsf_reqid);
         len += zfcp_dbf_view(out_buf + len, "fsf_seqno", "0x%08x",
@@ -883,21 +882,6 @@ zfcp_scsi_dbf_view_format(debug_info_t * id, struct debug_view *view,
                                        min((int)rec->type.fcp.sns_info_len,
                                            ZFCP_DBF_SCSI_FCP_SNS_INFO), 0,
                                        rec->type.fcp.sns_info_len);
-        } else if (strncmp(rec->tag, "abrt", ZFCP_DBF_TAG_SIZE) == 0) {
-                len += zfcp_dbf_view(out_buf + len, "fsf_reqid_abort", "0x%0Lx",
-                                     rec->type.new_fsf_req.fsf_reqid);
-                len += zfcp_dbf_view(out_buf + len, "fsf_seqno_abort", "0x%08x",
-                                     rec->type.new_fsf_req.fsf_seqno);
-                len += zfcp_dbf_stck(out_buf + len, "fsf_issued",
-                                     rec->type.new_fsf_req.fsf_issued);
-        } else if ((strncmp(rec->tag, "trst", ZFCP_DBF_TAG_SIZE) == 0) ||
-                   (strncmp(rec->tag, "lrst", ZFCP_DBF_TAG_SIZE) == 0)) {
-                len += zfcp_dbf_view(out_buf + len, "fsf_reqid_reset", "0x%0Lx",
-                                     rec->type.new_fsf_req.fsf_reqid);
-                len += zfcp_dbf_view(out_buf + len, "fsf_seqno_reset", "0x%08x",
-                                     rec->type.new_fsf_req.fsf_seqno);
-                len += zfcp_dbf_stck(out_buf + len, "fsf_issued",
-                                     rec->type.new_fsf_req.fsf_issued);
         }
 
         len += sprintf(out_buf + len, "\n");
diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h
index e260d19fa717..7f551d66f47f 100644
--- a/drivers/s390/scsi/zfcp_def.h
+++ b/drivers/s390/scsi/zfcp_def.h
@@ -152,11 +152,6 @@ typedef u32 scsi_lun_t;
 #define ZFCP_EXCHANGE_CONFIG_DATA_FIRST_SLEEP   100
 #define ZFCP_EXCHANGE_CONFIG_DATA_RETRIES       7
 
-/* Retry 5 times every 2 second, then every minute */
-#define ZFCP_EXCHANGE_PORT_DATA_SHORT_RETRIES   5
-#define ZFCP_EXCHANGE_PORT_DATA_SHORT_SLEEP     200
-#define ZFCP_EXCHANGE_PORT_DATA_LONG_SLEEP      6000
-
 /* timeout value for "default timer" for fsf requests */
 #define ZFCP_FSF_REQUEST_TIMEOUT (60*HZ);
 
@@ -429,11 +424,7 @@ struct zfcp_scsi_dbf_record {
         u32 fsf_seqno;
         u64 fsf_issued;
         union {
-                struct {
-                        u64 fsf_reqid;
-                        u32 fsf_seqno;
-                        u64 fsf_issued;
-                } new_fsf_req;
+                u64 old_fsf_reqid;
                 struct {
                         u8 rsp_validity;
                         u8 rsp_scsi_status;
@@ -915,8 +906,6 @@ struct zfcp_adapter {
         wwn_t                   peer_wwnn;         /* P2P peer WWNN */
         wwn_t                   peer_wwpn;         /* P2P peer WWPN */
         u32                     peer_d_id;         /* P2P peer D_ID */
-        wwn_t                   physical_wwpn;     /* WWPN of physical port */
-        u32                     physical_s_id;     /* local FC port ID */
         struct ccw_device       *ccw_device;       /* S/390 ccw device */
         u8                      fc_service_class;
         u32                     hydra_version;     /* Hydra version */
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index da947e662031..e3c4bdd29a60 100644
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -2246,15 +2246,6 @@ zfcp_erp_adapter_strategy_open_fsf(struct zfcp_erp_action *erp_action)
 {
         int retval;
 
-        if ((atomic_test_mask(ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED,
-                              &erp_action->adapter->status)) &&
-            (erp_action->adapter->adapter_features &
-             FSF_FEATURE_HBAAPI_MANAGEMENT)) {
-                zfcp_erp_adapter_strategy_open_fsf_xport(erp_action);
-                atomic_set(&erp_action->adapter->erp_counter, 0);
-                return ZFCP_ERP_FAILED;
-        }
-
         retval = zfcp_erp_adapter_strategy_open_fsf_xconfig(erp_action);
         if (retval == ZFCP_ERP_FAILED)
                 return ZFCP_ERP_FAILED;
@@ -2266,13 +2257,6 @@ zfcp_erp_adapter_strategy_open_fsf(struct zfcp_erp_action *erp_action)
         return zfcp_erp_adapter_strategy_open_fsf_statusread(erp_action);
 }
 
-/*
- * function:    
- *
- * purpose:     
- *
- * returns:
- */
 static int
 zfcp_erp_adapter_strategy_open_fsf_xconfig(struct zfcp_erp_action *erp_action)
 {
@@ -2350,48 +2334,40 @@ static int
 zfcp_erp_adapter_strategy_open_fsf_xport(struct zfcp_erp_action *erp_action)
 {
         int ret;
-        int retries;
-        int sleep;
-        struct zfcp_adapter *adapter = erp_action->adapter;
+        struct zfcp_adapter *adapter;
 
+        adapter = erp_action->adapter;
         atomic_clear_mask(ZFCP_STATUS_ADAPTER_XPORT_OK, &adapter->status);
 
-        retries = 0;
-        do {
-                write_lock(&adapter->erp_lock);
-                zfcp_erp_action_to_running(erp_action);
-                write_unlock(&adapter->erp_lock);
-                zfcp_erp_timeout_init(erp_action);
-                ret = zfcp_fsf_exchange_port_data(erp_action, adapter, NULL);
-                if (ret == -EOPNOTSUPP) {
-                        debug_text_event(adapter->erp_dbf, 3, "a_xport_notsupp");
-                        return ZFCP_ERP_SUCCEEDED;
-                } else if (ret) {
-                        debug_text_event(adapter->erp_dbf, 3, "a_xport_failed");
-                        return ZFCP_ERP_FAILED;
-                }
-                debug_text_event(adapter->erp_dbf, 6, "a_xport_ok");
+        write_lock(&adapter->erp_lock);
+        zfcp_erp_action_to_running(erp_action);
+        write_unlock(&adapter->erp_lock);
 
-                down(&adapter->erp_ready_sem);
-                if (erp_action->status & ZFCP_STATUS_ERP_TIMEDOUT) {
-                        ZFCP_LOG_INFO("error: exchange of port data "
-                                      "for adapter %s timed out\n",
-                                      zfcp_get_busid_by_adapter(adapter));
-                        break;
-                }
-                if (!atomic_test_mask(ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED,
-                                      &adapter->status))
-                        break;
+        zfcp_erp_timeout_init(erp_action);
+        ret = zfcp_fsf_exchange_port_data(erp_action, adapter, NULL);
+        if (ret == -EOPNOTSUPP) {
+                debug_text_event(adapter->erp_dbf, 3, "a_xport_notsupp");
+                return ZFCP_ERP_SUCCEEDED;
+        } else if (ret) {
+                debug_text_event(adapter->erp_dbf, 3, "a_xport_failed");
+                return ZFCP_ERP_FAILED;
+        }
+        debug_text_event(adapter->erp_dbf, 6, "a_xport_ok");
 
-                if (retries < ZFCP_EXCHANGE_PORT_DATA_SHORT_RETRIES) {
-                        sleep = ZFCP_EXCHANGE_PORT_DATA_SHORT_SLEEP;
-                        retries++;
-                } else
-                        sleep = ZFCP_EXCHANGE_PORT_DATA_LONG_SLEEP;
-                schedule_timeout(sleep);
-        } while (1);
+        ret = ZFCP_ERP_SUCCEEDED;
+        down(&adapter->erp_ready_sem);
+        if (erp_action->status & ZFCP_STATUS_ERP_TIMEDOUT) {
+                ZFCP_LOG_INFO("error: exchange port data timed out (adapter "
+                              "%s)\n", zfcp_get_busid_by_adapter(adapter));
+                ret = ZFCP_ERP_FAILED;
+        }
+        if (!atomic_test_mask(ZFCP_STATUS_ADAPTER_XPORT_OK, &adapter->status)) {
+                ZFCP_LOG_INFO("error: exchange port data failed (adapter "
+                              "%s\n", zfcp_get_busid_by_adapter(adapter));
+                ret = ZFCP_ERP_FAILED;
+        }
 
-        return ZFCP_ERP_SUCCEEDED;
+        return ret;
 }
 
 /*
@@ -3439,6 +3415,8 @@ zfcp_erp_action_cleanup(int action, struct zfcp_adapter *adapter,
                                                 "(adapter %s, wwpn=0x%016Lx)\n",
                                                 zfcp_get_busid_by_port(port),
                                                 port->wwpn);
+                        else
+                                scsi_flush_work(adapter->scsi_host);
                 }
                 zfcp_port_put(port);
                 break;
diff --git a/drivers/s390/scsi/zfcp_ext.h b/drivers/s390/scsi/zfcp_ext.h
index c1ba7cf1b496..700f5402a978 100644
--- a/drivers/s390/scsi/zfcp_ext.h
+++ b/drivers/s390/scsi/zfcp_ext.h
@@ -194,9 +194,10 @@ extern void zfcp_san_dbf_event_els_response(struct zfcp_fsf_req *);
 extern void zfcp_san_dbf_event_incoming_els(struct zfcp_fsf_req *);
 
 extern void zfcp_scsi_dbf_event_result(const char *, int, struct zfcp_adapter *,
-                                       struct scsi_cmnd *);
+                                       struct scsi_cmnd *,
+                                       struct zfcp_fsf_req *);
 extern void zfcp_scsi_dbf_event_abort(const char *, struct zfcp_adapter *,
-                                      struct scsi_cmnd *,
+                                      struct scsi_cmnd *, struct zfcp_fsf_req *,
                                       struct zfcp_fsf_req *);
 extern void zfcp_scsi_dbf_event_devreset(const char *, u8, struct zfcp_unit *,
                                          struct scsi_cmnd *);
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index 9f0cb3d820c0..662ec571d73b 100644
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -388,6 +388,7 @@ zfcp_fsf_protstatus_eval(struct zfcp_fsf_req *fsf_req)
         case FSF_PROT_LINK_DOWN:
                 zfcp_fsf_link_down_info_eval(adapter,
                                              &prot_status_qual->link_down_info);
+                zfcp_erp_adapter_reopen(adapter, 0);
                 fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR;
                 break;
 
@@ -558,10 +559,8 @@ zfcp_fsf_link_down_info_eval(struct zfcp_adapter *adapter,
 
         atomic_set_mask(ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED, &adapter->status);
 
-        if (link_down == NULL) {
-                zfcp_erp_adapter_reopen(adapter, 0);
-                return;
-        }
+        if (link_down == NULL)
+                goto out;
 
         switch (link_down->error_code) {
         case FSF_PSQ_LINK_NO_LIGHT:
@@ -643,16 +642,8 @@ zfcp_fsf_link_down_info_eval(struct zfcp_adapter *adapter,
                                 link_down->explanation_code,
                                 link_down->vendor_specific_code);
 
-        switch (link_down->error_code) {
-        case FSF_PSQ_LINK_NO_LIGHT:
-        case FSF_PSQ_LINK_WRAP_PLUG:
-        case FSF_PSQ_LINK_NO_FCP:
-        case FSF_PSQ_LINK_FIRMWARE_UPDATE:
-                zfcp_erp_adapter_reopen(adapter, 0);
-                break;
-        default:
-                zfcp_erp_adapter_failed(adapter);
-        }
+ out:
+        zfcp_erp_adapter_failed(adapter);
 }
 
 /*
@@ -2304,6 +2295,35 @@ zfcp_fsf_exchange_port_data(struct zfcp_erp_action *erp_action,
         return retval;
 }
 
+/**
+ * zfcp_fsf_exchange_port_evaluate
+ * @fsf_req: fsf_req which belongs to xchg port data request
+ * @xchg_ok: specifies if xchg port data was incomplete or complete (0/1)
+ */
+static void
+zfcp_fsf_exchange_port_evaluate(struct zfcp_fsf_req *fsf_req, int xchg_ok)
+{
+        struct zfcp_adapter *adapter;
+        struct fsf_qtcb *qtcb;
+        struct fsf_qtcb_bottom_port *bottom, *data;
+        struct Scsi_Host *shost;
+
+        adapter = fsf_req->adapter;
+        qtcb = fsf_req->qtcb;
+        bottom = &qtcb->bottom.port;
+        shost = adapter->scsi_host;
+
+        data = (struct fsf_qtcb_bottom_port*) fsf_req->data;
+        if (data)
+                memcpy(data, bottom, sizeof(struct fsf_qtcb_bottom_port));
+
+        if (adapter->connection_features & FSF_FEATURE_NPIV_MODE)
+                fc_host_permanent_port_name(shost) = bottom->wwpn;
+        else
+                fc_host_permanent_port_name(shost) = fc_host_port_name(shost);
+        fc_host_maxframe_size(shost) = bottom->maximum_frame_size;
+        fc_host_supported_speeds(shost) = bottom->supported_speed;
+}
 
 /**
  * zfcp_fsf_exchange_port_data_handler - handler for exchange_port_data request
@@ -2312,38 +2332,26 @@ zfcp_fsf_exchange_port_data(struct zfcp_erp_action *erp_action,
 static void
 zfcp_fsf_exchange_port_data_handler(struct zfcp_fsf_req *fsf_req)
 {
-        struct zfcp_adapter *adapter = fsf_req->adapter;
-        struct Scsi_Host *shost = adapter->scsi_host;
-        struct fsf_qtcb *qtcb = fsf_req->qtcb;
-        struct fsf_qtcb_bottom_port *bottom, *data;
+        struct zfcp_adapter *adapter;
+        struct fsf_qtcb *qtcb;
+
+        adapter = fsf_req->adapter;
+        qtcb = fsf_req->qtcb;
 
         if (fsf_req->status & ZFCP_STATUS_FSFREQ_ERROR)
                 return;
 
         switch (qtcb->header.fsf_status) {
         case FSF_GOOD:
+                zfcp_fsf_exchange_port_evaluate(fsf_req, 1);
                 atomic_set_mask(ZFCP_STATUS_ADAPTER_XPORT_OK, &adapter->status);
-
-                bottom = &qtcb->bottom.port;
-                data = (struct fsf_qtcb_bottom_port*) fsf_req->data;
-                if (data)
-                        memcpy(data, bottom, sizeof(struct fsf_qtcb_bottom_port));
-                if (adapter->connection_features & FSF_FEATURE_NPIV_MODE)
-                        fc_host_permanent_port_name(shost) = bottom->wwpn;
-                else
-                        fc_host_permanent_port_name(shost) =
-                                fc_host_port_name(shost);
-                fc_host_maxframe_size(shost) = bottom->maximum_frame_size;
-                fc_host_supported_speeds(shost) = bottom->supported_speed;
                 break;
-
         case FSF_EXCHANGE_CONFIG_DATA_INCOMPLETE:
+                zfcp_fsf_exchange_port_evaluate(fsf_req, 0);
                 atomic_set_mask(ZFCP_STATUS_ADAPTER_XPORT_OK, &adapter->status);
-
                 zfcp_fsf_link_down_info_eval(adapter,
                         &qtcb->header.fsf_status_qual.link_down_info);
                 break;
-
         default:
                 debug_text_event(adapter->erp_dbf, 0, "xchg-port-ng");
                 debug_event(adapter->erp_dbf, 0,
@@ -4203,11 +4211,11 @@ zfcp_fsf_send_fcp_command_task_handler(struct zfcp_fsf_req *fsf_req)
         ZFCP_LOG_DEBUG("scpnt->result =0x%x\n", scpnt->result);
 
         if (scpnt->result != 0)
-                zfcp_scsi_dbf_event_result("erro", 3, fsf_req->adapter, scpnt);
+                zfcp_scsi_dbf_event_result("erro", 3, fsf_req->adapter, scpnt, fsf_req);
         else if (scpnt->retries > 0)
-                zfcp_scsi_dbf_event_result("retr", 4, fsf_req->adapter, scpnt);
+                zfcp_scsi_dbf_event_result("retr", 4, fsf_req->adapter, scpnt, fsf_req);
         else
-                zfcp_scsi_dbf_event_result("norm", 6, fsf_req->adapter, scpnt);
+                zfcp_scsi_dbf_event_result("norm", 6, fsf_req->adapter, scpnt, fsf_req);
 
         /* cleanup pointer (need this especially for abort) */
         scpnt->host_scribble = NULL;
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index e0803757c0fa..9f6b4d7a46f3 100644
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -242,7 +242,7 @@ zfcp_scsi_command_fail(struct scsi_cmnd *scpnt, int result)
         if ((scpnt->device != NULL) && (scpnt->device->host != NULL))
                 zfcp_scsi_dbf_event_result("fail", 4,
                         (struct zfcp_adapter*) scpnt->device->host->hostdata[0],
-                        scpnt);
+                        scpnt, NULL);
         /* return directly */
         scpnt->scsi_done(scpnt);
 }
@@ -446,7 +446,7 @@ zfcp_scsi_eh_abort_handler(struct scsi_cmnd *scpnt)
         old_fsf_req = (struct zfcp_fsf_req *) scpnt->host_scribble;
         if (!old_fsf_req) {
                 write_unlock_irqrestore(&adapter->abort_lock, flags);
-                zfcp_scsi_dbf_event_abort("lte1", adapter, scpnt, new_fsf_req);
+                zfcp_scsi_dbf_event_abort("lte1", adapter, scpnt, NULL, NULL);
                 retval = SUCCESS;
                 goto out;
         }
@@ -460,6 +460,8 @@ zfcp_scsi_eh_abort_handler(struct scsi_cmnd *scpnt)
                                                  adapter, unit, 0);
         if (!new_fsf_req) {
                 ZFCP_LOG_INFO("error: initiation of Abort FCP Cmnd failed\n");
+                zfcp_scsi_dbf_event_abort("nres", adapter, scpnt, NULL,
+                                          old_fsf_req);
                 retval = FAILED;
                 goto out;
         }
@@ -470,13 +472,16 @@ zfcp_scsi_eh_abort_handler(struct scsi_cmnd *scpnt)
 
         /* status should be valid since signals were not permitted */
         if (new_fsf_req->status & ZFCP_STATUS_FSFREQ_ABORTSUCCEEDED) {
-                zfcp_scsi_dbf_event_abort("okay", adapter, scpnt, new_fsf_req);
+                zfcp_scsi_dbf_event_abort("okay", adapter, scpnt, new_fsf_req,
+                                          NULL);
                 retval = SUCCESS;
         } else if (new_fsf_req->status & ZFCP_STATUS_FSFREQ_ABORTNOTNEEDED) {
-                zfcp_scsi_dbf_event_abort("lte2", adapter, scpnt, new_fsf_req);
+                zfcp_scsi_dbf_event_abort("lte2", adapter, scpnt, new_fsf_req,
+                                          NULL);
                 retval = SUCCESS;
         } else {
-                zfcp_scsi_dbf_event_abort("fail", adapter, scpnt, new_fsf_req);
+                zfcp_scsi_dbf_event_abort("fail", adapter, scpnt, new_fsf_req,
+                                          NULL);
                 retval = FAILED;
         }
         zfcp_fsf_req_free(new_fsf_req);
diff --git a/drivers/s390/scsi/zfcp_sysfs_adapter.c b/drivers/s390/scsi/zfcp_sysfs_adapter.c
index dfc07370f412..b29ac25e07f3 100644
--- a/drivers/s390/scsi/zfcp_sysfs_adapter.c
+++ b/drivers/s390/scsi/zfcp_sysfs_adapter.c
@@ -55,8 +55,6 @@ ZFCP_DEFINE_ADAPTER_ATTR(status, "0x%08x\n", atomic_read(&adapter->status));
 ZFCP_DEFINE_ADAPTER_ATTR(peer_wwnn, "0x%016llx\n", adapter->peer_wwnn);
 ZFCP_DEFINE_ADAPTER_ATTR(peer_wwpn, "0x%016llx\n", adapter->peer_wwpn);
 ZFCP_DEFINE_ADAPTER_ATTR(peer_d_id, "0x%06x\n", adapter->peer_d_id);
-ZFCP_DEFINE_ADAPTER_ATTR(physical_wwpn, "0x%016llx\n", adapter->physical_wwpn);
-ZFCP_DEFINE_ADAPTER_ATTR(physical_s_id, "0x%06x\n", adapter->physical_s_id);
 ZFCP_DEFINE_ADAPTER_ATTR(card_version, "0x%04x\n", adapter->hydra_version);
 ZFCP_DEFINE_ADAPTER_ATTR(lic_version, "0x%08x\n", adapter->fsf_lic_version);
 ZFCP_DEFINE_ADAPTER_ATTR(hardware_version, "0x%08x\n",
@@ -241,8 +239,6 @@ static struct attribute *zfcp_adapter_attrs[] = {
         &dev_attr_peer_wwnn.attr,
         &dev_attr_peer_wwpn.attr,
         &dev_attr_peer_d_id.attr,
-        &dev_attr_physical_wwpn.attr,
-        &dev_attr_physical_s_id.attr,
         &dev_attr_card_version.attr,
         &dev_attr_lic_version.attr,
         &dev_attr_status.attr,
diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
index 31c497542272..d9152d02088c 100644
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
@@ -61,6 +61,7 @@
                  Add support for embedded firmware error strings.
    2.26.02.003 - Correctly handle single sgl's with use_sg=1.
    2.26.02.004 - Add support for 9550SX controllers.
+   2.26.02.005 - Fix use_sg == 0 mapping on systems with 4GB or higher.
 */
 
 #include <linux/module.h>
@@ -84,7 +85,7 @@
 #include "3w-9xxx.h"
 
 /* Globals */
-#define TW_DRIVER_VERSION "2.26.02.004"
+#define TW_DRIVER_VERSION "2.26.02.005"
 static TW_Device_Extension *twa_device_extension_list[TW_MAX_SLOT];
 static unsigned int twa_device_extension_count;
 static int twa_major = -1;
@@ -1408,7 +1409,7 @@ static dma_addr_t twa_map_scsi_single_data(TW_Device_Extension *tw_dev, int requ
         dma_addr_t mapping;
         struct scsi_cmnd *cmd = tw_dev->srb[request_id];
         struct pci_dev *pdev = tw_dev->tw_pci_dev;
-        int retval = 0;
+        dma_addr_t retval = 0;
 
         if (cmd->request_bufflen == 0) {
                 retval = 0;
@@ -1798,7 +1799,7 @@ static int twa_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id,
         int i, sg_count;
         struct scsi_cmnd *srb = NULL;
         struct scatterlist *sglist = NULL;
-        u32 buffaddr = 0x0;
+        dma_addr_t buffaddr = 0x0;
         int retval = 1;
 
         if (tw_dev->srb[request_id]) {
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index 7139659dd952..a16f8ded8f1d 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -173,10 +173,10 @@ int aac_get_config_status(struct aac_dev *dev)
         int status = 0;
         struct fib * fibptr;
 
-        if (!(fibptr = fib_alloc(dev)))
+        if (!(fibptr = aac_fib_alloc(dev)))
                 return -ENOMEM;
 
-        fib_init(fibptr);
+        aac_fib_init(fibptr);
         {
                 struct aac_get_config_status *dinfo;
                 dinfo = (struct aac_get_config_status *) fib_data(fibptr);
@@ -186,7 +186,7 @@ int aac_get_config_status(struct aac_dev *dev)
                 dinfo->count = cpu_to_le32(sizeof(((struct aac_get_config_status_resp *)NULL)->data));
         }
 
-        status = fib_send(ContainerCommand,
+        status = aac_fib_send(ContainerCommand,
                             fibptr,
                             sizeof (struct aac_get_config_status),
                             FsaNormal,
@@ -209,30 +209,30 @@ int aac_get_config_status(struct aac_dev *dev)
                         status = -EINVAL;
                 }
         }
-        fib_complete(fibptr);
+        aac_fib_complete(fibptr);
         /* Send a CT_COMMIT_CONFIG to enable discovery of devices */
         if (status >= 0) {
                 if (commit == 1) {
                         struct aac_commit_config * dinfo;
-                        fib_init(fibptr);
+                        aac_fib_init(fibptr);
                         dinfo = (struct aac_commit_config *) fib_data(fibptr);
         
                         dinfo->command = cpu_to_le32(VM_ContainerConfig);
                         dinfo->type = cpu_to_le32(CT_COMMIT_CONFIG);
         
-                        status = fib_send(ContainerCommand,
+                        status = aac_fib_send(ContainerCommand,
                                     fibptr,
                                     sizeof (struct aac_commit_config),
                                     FsaNormal,
                                     1, 1,
                                     NULL, NULL);
-                        fib_complete(fibptr);
+                        aac_fib_complete(fibptr);
                 } else if (commit == 0) {
                         printk(KERN_WARNING
                           "aac_get_config_status: Foreign device configurations are being ignored\n");
                 }
         }
-        fib_free(fibptr);
+        aac_fib_free(fibptr);
         return status;
 }
 
@@ -255,15 +255,15 @@ int aac_get_containers(struct aac_dev *dev)
 
         instance = dev->scsi_host_ptr->unique_id;
 
-        if (!(fibptr = fib_alloc(dev)))
+        if (!(fibptr = aac_fib_alloc(dev)))
                 return -ENOMEM;
 
-        fib_init(fibptr);
+        aac_fib_init(fibptr);
         dinfo = (struct aac_get_container_count *) fib_data(fibptr);
         dinfo->command = cpu_to_le32(VM_ContainerConfig);
         dinfo->type = cpu_to_le32(CT_GET_CONTAINER_COUNT);
 
-        status = fib_send(ContainerCommand,
+        status = aac_fib_send(ContainerCommand,
                     fibptr,
                     sizeof (struct aac_get_container_count),
                     FsaNormal,
@@ -272,7 +272,7 @@ int aac_get_containers(struct aac_dev *dev)
         if (status >= 0) {
                 dresp = (struct aac_get_container_count_resp *)fib_data(fibptr);
                 maximum_num_containers = le32_to_cpu(dresp->ContainerSwitchEntries);
-                fib_complete(fibptr);
+                aac_fib_complete(fibptr);
         }
 
         if (maximum_num_containers < MAXIMUM_NUM_CONTAINERS)
@@ -280,7 +280,7 @@ int aac_get_containers(struct aac_dev *dev)
         fsa_dev_ptr = (struct fsa_dev_info *) kmalloc(
           sizeof(*fsa_dev_ptr) * maximum_num_containers, GFP_KERNEL);
         if (!fsa_dev_ptr) {
-                fib_free(fibptr);
+                aac_fib_free(fibptr);
                 return -ENOMEM;
         }
         memset(fsa_dev_ptr, 0, sizeof(*fsa_dev_ptr) * maximum_num_containers);
@@ -294,14 +294,14 @@ int aac_get_containers(struct aac_dev *dev)
 
                 fsa_dev_ptr[index].devname[0] = '\0';
 
-                fib_init(fibptr);
+                aac_fib_init(fibptr);
                 dinfo = (struct aac_query_mount *) fib_data(fibptr);
 
                 dinfo->command = cpu_to_le32(VM_NameServe);
                 dinfo->count = cpu_to_le32(index);
                 dinfo->type = cpu_to_le32(FT_FILESYS);
 
-                status = fib_send(ContainerCommand,
+                status = aac_fib_send(ContainerCommand,
                                     fibptr,
                                     sizeof (struct aac_query_mount),
                                     FsaNormal,
@@ -319,7 +319,7 @@ int aac_get_containers(struct aac_dev *dev)
                         dinfo->count = cpu_to_le32(index);
                         dinfo->type = cpu_to_le32(FT_FILESYS);
 
-                        if (fib_send(ContainerCommand,
+                        if (aac_fib_send(ContainerCommand,
                                     fibptr,
                                     sizeof(struct aac_query_mount),
                                     FsaNormal,
@@ -347,7 +347,7 @@ int aac_get_containers(struct aac_dev *dev)
                         if (le32_to_cpu(dresp->mnt[0].state) & FSCS_READONLY)
                                     fsa_dev_ptr[index].ro = 1;
                 }
-                fib_complete(fibptr);
+                aac_fib_complete(fibptr);
                 /*
                  *      If there are no more containers, then stop asking.
                  */
@@ -355,7 +355,7 @@ int aac_get_containers(struct aac_dev *dev)
                         break;
                 }
         }
-        fib_free(fibptr);
+        aac_fib_free(fibptr);
         return status;
 }
 
@@ -413,8 +413,8 @@ static void get_container_name_callback(void *context, struct fib * fibptr)
 
         scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_GOOD;
 
-        fib_complete(fibptr);
-        fib_free(fibptr);
+        aac_fib_complete(fibptr);
+        aac_fib_free(fibptr);
         scsicmd->scsi_done(scsicmd);
 }
 
@@ -430,10 +430,10 @@ static int aac_get_container_name(struct scsi_cmnd * scsicmd, int cid)
 
         dev = (struct aac_dev *)scsicmd->device->host->hostdata;
 
-        if (!(cmd_fibcontext = fib_alloc(dev)))
+        if (!(cmd_fibcontext = aac_fib_alloc(dev)))
                 return -ENOMEM;
 
-        fib_init(cmd_fibcontext);
+        aac_fib_init(cmd_fibcontext);
         dinfo = (struct aac_get_name *) fib_data(cmd_fibcontext);
 
         dinfo->command = cpu_to_le32(VM_ContainerConfig);
@@ -441,7 +441,7 @@ static int aac_get_container_name(struct scsi_cmnd * scsicmd, int cid)
         dinfo->cid = cpu_to_le32(cid);
         dinfo->count = cpu_to_le32(sizeof(((struct aac_get_name_resp *)NULL)->data));
 
-        status = fib_send(ContainerCommand, 
+        status = aac_fib_send(ContainerCommand,
                   cmd_fibcontext, 
                   sizeof (struct aac_get_name),
                   FsaNormal, 
@@ -455,14 +455,14 @@ static int aac_get_container_name(struct scsi_cmnd * scsicmd, int cid)
         if (status == -EINPROGRESS) 
                 return 0;
                 
-        printk(KERN_WARNING "aac_get_container_name: fib_send failed with status: %d.\n", status);
-        fib_complete(cmd_fibcontext);
-        fib_free(cmd_fibcontext);
+        printk(KERN_WARNING "aac_get_container_name: aac_fib_send failed with status: %d.\n", status);
+        aac_fib_complete(cmd_fibcontext);
+        aac_fib_free(cmd_fibcontext);
         return -1;
 }
 
 /**
- *      probe_container         -       query a logical volume
+ *      aac_probe_container             -       query a logical volume
  *      @dev: device to query
  *      @cid: container identifier
  *
@@ -470,7 +470,7 @@ static int aac_get_container_name(struct scsi_cmnd * scsicmd, int cid)
  *      is updated in the struct fsa_dev_info structure rather than returned.
  */
  
-int probe_container(struct aac_dev *dev, int cid)
+int aac_probe_container(struct aac_dev *dev, int cid)
 {
         struct fsa_dev_info *fsa_dev_ptr;
         int status;
@@ -482,10 +482,10 @@ int probe_container(struct aac_dev *dev, int cid)
         fsa_dev_ptr = dev->fsa_dev;
         instance = dev->scsi_host_ptr->unique_id;
 
-        if (!(fibptr = fib_alloc(dev)))
+        if (!(fibptr = aac_fib_alloc(dev)))
                 return -ENOMEM;
 
-        fib_init(fibptr);
+        aac_fib_init(fibptr);
 
         dinfo = (struct aac_query_mount *)fib_data(fibptr);
 
@@ -493,14 +493,14 @@ int probe_container(struct aac_dev *dev, int cid)
         dinfo->count = cpu_to_le32(cid);
         dinfo->type = cpu_to_le32(FT_FILESYS);
 
-        status = fib_send(ContainerCommand,
+        status = aac_fib_send(ContainerCommand,
                             fibptr,
                             sizeof(struct aac_query_mount),
                             FsaNormal,
                             1, 1,
                             NULL, NULL);
         if (status < 0) {
-                printk(KERN_WARNING "aacraid: probe_container query failed.\n");
+                printk(KERN_WARNING "aacraid: aac_probe_container query failed.\n");
                 goto error;
         }
 
@@ -512,7 +512,7 @@ int probe_container(struct aac_dev *dev, int cid)
                 dinfo->count = cpu_to_le32(cid);
                 dinfo->type = cpu_to_le32(FT_FILESYS);
 
-                if (fib_send(ContainerCommand,
+                if (aac_fib_send(ContainerCommand,
                             fibptr,
                             sizeof(struct aac_query_mount),
                             FsaNormal,
@@ -535,8 +535,8 @@ int probe_container(struct aac_dev *dev, int cid)
         }
 
 error:
-        fib_complete(fibptr);
-        fib_free(fibptr);
+        aac_fib_complete(fibptr);
+        aac_fib_free(fibptr);
 
         return status;
 }
@@ -700,14 +700,14 @@ int aac_get_adapter_info(struct aac_dev* dev)
         struct aac_bus_info *command;
         struct aac_bus_info_response *bus_info;
 
-        if (!(fibptr = fib_alloc(dev)))
+        if (!(fibptr = aac_fib_alloc(dev)))
                 return -ENOMEM;
 
-        fib_init(fibptr);
+        aac_fib_init(fibptr);
         info = (struct aac_adapter_info *) fib_data(fibptr);
         memset(info,0,sizeof(*info));
 
-        rcode = fib_send(RequestAdapterInfo,
+        rcode = aac_fib_send(RequestAdapterInfo,
                          fibptr, 
                          sizeof(*info),
                          FsaNormal, 
@@ -716,8 +716,8 @@ int aac_get_adapter_info(struct aac_dev* dev)
                          NULL);
 
         if (rcode < 0) {
-                fib_complete(fibptr);
-                fib_free(fibptr);
+                aac_fib_complete(fibptr);
+                aac_fib_free(fibptr);
                 return rcode;
         }
         memcpy(&dev->adapter_info, info, sizeof(*info));
@@ -725,13 +725,13 @@ int aac_get_adapter_info(struct aac_dev* dev)
         if (dev->adapter_info.options & AAC_OPT_SUPPLEMENT_ADAPTER_INFO) {
                 struct aac_supplement_adapter_info * info;
 
-                fib_init(fibptr);
+                aac_fib_init(fibptr);
 
                 info = (struct aac_supplement_adapter_info *) fib_data(fibptr);
 
                 memset(info,0,sizeof(*info));
 
-                rcode = fib_send(RequestSupplementAdapterInfo,
+                rcode = aac_fib_send(RequestSupplementAdapterInfo,
                                  fibptr,
                                  sizeof(*info),
                                  FsaNormal,
@@ -748,7 +748,7 @@ int aac_get_adapter_info(struct aac_dev* dev)
          * GetBusInfo 
          */
 
-        fib_init(fibptr);
+        aac_fib_init(fibptr);
 
         bus_info = (struct aac_bus_info_response *) fib_data(fibptr);
 
@@ -761,7 +761,7 @@ int aac_get_adapter_info(struct aac_dev* dev)
         command->MethodId = cpu_to_le32(1);
         command->CtlCmd = cpu_to_le32(GetBusInfo);
 
-        rcode = fib_send(ContainerCommand,
+        rcode = aac_fib_send(ContainerCommand,
                          fibptr,
                          sizeof (*bus_info),
                          FsaNormal,
@@ -891,8 +891,8 @@ int aac_get_adapter_info(struct aac_dev* dev)
                 }
         }
 
-        fib_complete(fibptr);
-        fib_free(fibptr);
+        aac_fib_complete(fibptr);
+        aac_fib_free(fibptr);
 
         return rcode;
 }
@@ -976,8 +976,8 @@ static void io_callback(void *context, struct fib * fibptr)
                     ? sizeof(scsicmd->sense_buffer)
                     : sizeof(dev->fsa_dev[cid].sense_data));
         }
-        fib_complete(fibptr);
-        fib_free(fibptr);
+        aac_fib_complete(fibptr);
+        aac_fib_free(fibptr);
 
         scsicmd->scsi_done(scsicmd);
 }
@@ -1062,11 +1062,11 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid)
         /*
          *      Alocate and initialize a Fib
          */
-        if (!(cmd_fibcontext = fib_alloc(dev))) {
+        if (!(cmd_fibcontext = aac_fib_alloc(dev))) {
                 return -1;
         }
 
-        fib_init(cmd_fibcontext);
+        aac_fib_init(cmd_fibcontext);
 
         if (dev->raw_io_interface) {
                 struct aac_raw_io *readcmd;
@@ -1086,7 +1086,7 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid)
                 /*
                  *      Now send the Fib to the adapter
                  */
-                status = fib_send(ContainerRawIo,
+                status = aac_fib_send(ContainerRawIo,
                           cmd_fibcontext, 
                           fibsize, 
                           FsaNormal, 
@@ -1112,7 +1112,7 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid)
                 /*
                  *      Now send the Fib to the adapter
                  */
-                status = fib_send(ContainerCommand64, 
+                status = aac_fib_send(ContainerCommand64,
                           cmd_fibcontext, 
                           fibsize, 
                           FsaNormal, 
@@ -1136,7 +1136,7 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid)
                 /*
                  *      Now send the Fib to the adapter
                  */
-                status = fib_send(ContainerCommand, 
+                status = aac_fib_send(ContainerCommand,
                           cmd_fibcontext, 
                           fibsize, 
                           FsaNormal, 
@@ -1153,14 +1153,14 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid)
         if (status == -EINPROGRESS) 
                 return 0;
                 
-        printk(KERN_WARNING "aac_read: fib_send failed with status: %d.\n", status);
+        printk(KERN_WARNING "aac_read: aac_fib_send failed with status: %d.\n", status);
         /*
          *      For some reason, the Fib didn't queue, return QUEUE_FULL
          */
         scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_TASK_SET_FULL;
         scsicmd->scsi_done(scsicmd);
-        fib_complete(cmd_fibcontext);
-        fib_free(cmd_fibcontext);
+        aac_fib_complete(cmd_fibcontext);
+        aac_fib_free(cmd_fibcontext);
         return 0;
 }
 
@@ -1228,12 +1228,12 @@ static int aac_write(struct scsi_cmnd * scsicmd, int cid)
         /*
          *      Allocate and initialize a Fib then setup a BlockWrite command
          */
-        if (!(cmd_fibcontext = fib_alloc(dev))) {
+        if (!(cmd_fibcontext = aac_fib_alloc(dev))) {
                 scsicmd->result = DID_ERROR << 16;
                 scsicmd->scsi_done(scsicmd);
                 return 0;
         }
-        fib_init(cmd_fibcontext);
+        aac_fib_init(cmd_fibcontext);
 
         if (dev->raw_io_interface) {
                 struct aac_raw_io *writecmd;
@@ -1253,7 +1253,7 @@ static int aac_write(struct scsi_cmnd * scsicmd, int cid)
                 /*
                  *      Now send the Fib to the adapter
                  */
-                status = fib_send(ContainerRawIo,
+                status = aac_fib_send(ContainerRawIo,
                           cmd_fibcontext, 
                           fibsize, 
                           FsaNormal, 
@@ -1279,7 +1279,7 @@ static int aac_write(struct scsi_cmnd * scsicmd, int cid)
                 /*
                  *      Now send the Fib to the adapter
                  */
-                status = fib_send(ContainerCommand64, 
+                status = aac_fib_send(ContainerCommand64,
                           cmd_fibcontext, 
                           fibsize, 
                           FsaNormal, 
@@ -1305,7 +1305,7 @@ static int aac_write(struct scsi_cmnd * scsicmd, int cid)
                 /*
                  *      Now send the Fib to the adapter
                  */
-                status = fib_send(ContainerCommand, 
+                status = aac_fib_send(ContainerCommand,
                           cmd_fibcontext, 
                           fibsize, 
                           FsaNormal, 
@@ -1322,15 +1322,15 @@ static int aac_write(struct scsi_cmnd * scsicmd, int cid)
                 return 0;
         }
 
-        printk(KERN_WARNING "aac_write: fib_send failed with status: %d\n", status);
+        printk(KERN_WARNING "aac_write: aac_fib_send failed with status: %d\n", status);
         /*
          *      For some reason, the Fib didn't queue, return QUEUE_FULL
          */
         scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_TASK_SET_FULL;
         scsicmd->scsi_done(scsicmd);
 
-        fib_complete(cmd_fibcontext);
-        fib_free(cmd_fibcontext);
+        aac_fib_complete(cmd_fibcontext);
+        aac_fib_free(cmd_fibcontext);
         return 0;
 }
 
@@ -1369,8 +1369,8 @@ static void synchronize_callback(void *context, struct fib *fibptr)
                           sizeof(cmd->sense_buffer)));
         }
 
-        fib_complete(fibptr);
-        fib_free(fibptr);
+        aac_fib_complete(fibptr);
+        aac_fib_free(fibptr);
         cmd->scsi_done(cmd);
 }
 
@@ -1407,10 +1407,10 @@ static int aac_synchronize(struct scsi_cmnd *scsicmd, int cid)
          *      Allocate and initialize a Fib
          */
         if (!(cmd_fibcontext = 
-            fib_alloc((struct aac_dev *)scsicmd->device->host->hostdata))) 
+            aac_fib_alloc((struct aac_dev *)scsicmd->device->host->hostdata)))
                 return SCSI_MLQUEUE_HOST_BUSY;
 
-        fib_init(cmd_fibcontext);
+        aac_fib_init(cmd_fibcontext);
 
         synchronizecmd = fib_data(cmd_fibcontext);
         synchronizecmd->command = cpu_to_le32(VM_ContainerConfig);
@@ -1422,7 +1422,7 @@ static int aac_synchronize(struct scsi_cmnd *scsicmd, int cid)
         /*
          *      Now send the Fib to the adapter
          */
-        status = fib_send(ContainerCommand,
+        status = aac_fib_send(ContainerCommand,
                   cmd_fibcontext,
                   sizeof(struct aac_synchronize),
                   FsaNormal,
@@ -1437,9 +1437,9 @@ static int aac_synchronize(struct scsi_cmnd *scsicmd, int cid)
                 return 0;
 
         printk(KERN_WARNING 
-                "aac_synchronize: fib_send failed with status: %d.\n", status);
-        fib_complete(cmd_fibcontext);
-        fib_free(cmd_fibcontext);
+                "aac_synchronize: aac_fib_send failed with status: %d.\n", status);
+        aac_fib_complete(cmd_fibcontext);
+        aac_fib_free(cmd_fibcontext);
         return SCSI_MLQUEUE_HOST_BUSY;
 }
 
@@ -1465,7 +1465,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
          *      itself.
          */
         if (scmd_id(scsicmd) != host->this_id) {
-                if ((scsicmd->device->channel == 0) ){
+                if ((scsicmd->device->channel == CONTAINER_CHANNEL)) {
                         if( (scsicmd->device->id >= dev->maximum_num_containers) || (scsicmd->device->lun != 0)){ 
                                 scsicmd->result = DID_NO_CONNECT << 16;
                                 scsicmd->scsi_done(scsicmd);
@@ -1488,7 +1488,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                                 case READ_CAPACITY:
                                 case TEST_UNIT_READY:
                                         spin_unlock_irq(host->host_lock);
-                                        probe_container(dev, cid);
+                                        aac_probe_container(dev, cid);
                                         if ((fsa_dev_ptr[cid].valid & 1) == 0)
                                                 fsa_dev_ptr[cid].valid = 0;
                                         spin_lock_irq(host->host_lock);
@@ -1935,33 +1935,7 @@ static void aac_srb_callback(void *context, struct fib * fibptr)
         case SRB_STATUS_ERROR_RECOVERY:
         case SRB_STATUS_PENDING:
         case SRB_STATUS_SUCCESS:
-                if(scsicmd->cmnd[0] == INQUIRY ){
-                        u8 b;
-                        u8 b1;
-                        /* We can't expose disk devices because we can't tell whether they
-                         * are the raw container drives or stand alone drives.  If they have
-                         * the removable bit set then we should expose them though.
-                         */
-                        b = (*(u8*)scsicmd->buffer)&0x1f;
-                        b1 = ((u8*)scsicmd->buffer)[1];
-                        if( b==TYPE_TAPE || b==TYPE_WORM || b==TYPE_ROM || b==TYPE_MOD|| b==TYPE_MEDIUM_CHANGER 
-                                        || (b==TYPE_DISK && (b1&0x80)) ){
-                                scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8;
-                        /*
-                         * We will allow disk devices if in RAID/SCSI mode and
-                         * the channel is 2
-                         */
-                        } else if ((dev->raid_scsi_mode) &&
-                                        (scmd_channel(scsicmd) == 2)) {
-                                scsicmd->result = DID_OK << 16 | 
-                                                COMMAND_COMPLETE << 8;
-                        } else {
-                                scsicmd->result = DID_NO_CONNECT << 16 | 
-                                                COMMAND_COMPLETE << 8;
-                        }
-                } else {
-                        scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8;
-                }
+                scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8;
                 break;
         case SRB_STATUS_DATA_OVERRUN:
                 switch(scsicmd->cmnd[0]){
@@ -1981,28 +1955,7 @@ static void aac_srb_callback(void *context, struct fib * fibptr)
                         scsicmd->result = DID_ERROR << 16 | COMMAND_COMPLETE << 8;
                         break;
                 case INQUIRY: {
-                        u8 b;
-                        u8 b1;
-                        /* We can't expose disk devices because we can't tell whether they
-                        * are the raw container drives or stand alone drives
-                        */
-                        b = (*(u8*)scsicmd->buffer)&0x0f;
-                        b1 = ((u8*)scsicmd->buffer)[1];
-                        if( b==TYPE_TAPE || b==TYPE_WORM || b==TYPE_ROM || b==TYPE_MOD|| b==TYPE_MEDIUM_CHANGER
-                                        || (b==TYPE_DISK && (b1&0x80)) ){
-                                scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8;
-                        /*
-                         * We will allow disk devices if in RAID/SCSI mode and
-                         * the channel is 2
-                         */
-                        } else if ((dev->raid_scsi_mode) &&
-                                        (scmd_channel(scsicmd) == 2)) {
-                                scsicmd->result = DID_OK << 16 | 
-                                                COMMAND_COMPLETE << 8;
-                        } else {
-                                scsicmd->result = DID_NO_CONNECT << 16 | 
-                                                COMMAND_COMPLETE << 8;
-                        }
+                        scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8;
                         break;
                 }
                 default:
@@ -2089,8 +2042,8 @@ static void aac_srb_callback(void *context, struct fib * fibptr)
          */
         scsicmd->result |= le32_to_cpu(srbreply->scsi_status);
 
-        fib_complete(fibptr);
-        fib_free(fibptr);
+        aac_fib_complete(fibptr);
+        aac_fib_free(fibptr);
         scsicmd->scsi_done(scsicmd);
 }
 
@@ -2142,10 +2095,10 @@ static int aac_send_srb_fib(struct scsi_cmnd* scsicmd)
         /*
          *      Allocate and initialize a Fib then setup a BlockWrite command
          */
-        if (!(cmd_fibcontext = fib_alloc(dev))) {
+        if (!(cmd_fibcontext = aac_fib_alloc(dev))) {
                 return -1;
         }
-        fib_init(cmd_fibcontext);
+        aac_fib_init(cmd_fibcontext);
 
         srbcmd = (struct aac_srb*) fib_data(cmd_fibcontext);
         srbcmd->function = cpu_to_le32(SRBF_ExecuteScsi);
@@ -2179,7 +2132,7 @@ static int aac_send_srb_fib(struct scsi_cmnd* scsicmd)
                 /*
                  *      Now send the Fib to the adapter
                  */
-                status = fib_send(ScsiPortCommand64, cmd_fibcontext, 
+                status = aac_fib_send(ScsiPortCommand64, cmd_fibcontext,
                                 fibsize, FsaNormal, 0, 1,
                                   (fib_callback) aac_srb_callback, 
                                   (void *) scsicmd);
@@ -2201,7 +2154,7 @@ static int aac_send_srb_fib(struct scsi_cmnd* scsicmd)
                 /*
                  *      Now send the Fib to the adapter
                  */
-                status = fib_send(ScsiPortCommand, cmd_fibcontext, fibsize, FsaNormal, 0, 1,
+                status = aac_fib_send(ScsiPortCommand, cmd_fibcontext, fibsize, FsaNormal, 0, 1,
                                   (fib_callback) aac_srb_callback, (void *) scsicmd);
         }
         /*
@@ -2211,9 +2164,9 @@ static int aac_send_srb_fib(struct scsi_cmnd* scsicmd)
                 return 0;
         }
 
-        printk(KERN_WARNING "aac_srb: fib_send failed with status: %d\n", status);
-        fib_complete(cmd_fibcontext);
-        fib_free(cmd_fibcontext);
+        printk(KERN_WARNING "aac_srb: aac_fib_send failed with status: %d\n", status);
+        aac_fib_complete(cmd_fibcontext);
+        aac_fib_free(cmd_fibcontext);
 
         return -1;
 }
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index 66dbb6d2c506..2d430b7e8cf4 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -1774,16 +1774,16 @@ static inline u32 cap_to_cyls(sector_t capacity, u32 divisor)
 struct scsi_cmnd;
 
 const char *aac_driverinfo(struct Scsi_Host *);
-struct fib *fib_alloc(struct aac_dev *dev);
-int fib_setup(struct aac_dev *dev);
-void fib_map_free(struct aac_dev *dev);
-void fib_free(struct fib * context);
-void fib_init(struct fib * context);
+struct fib *aac_fib_alloc(struct aac_dev *dev);
+int aac_fib_setup(struct aac_dev *dev);
+void aac_fib_map_free(struct aac_dev *dev);
+void aac_fib_free(struct fib * context);
+void aac_fib_init(struct fib * context);
 void aac_printf(struct aac_dev *dev, u32 val);
-int fib_send(u16 command, struct fib * context, unsigned long size, int priority, int wait, int reply, fib_callback callback, void *ctxt);
+int aac_fib_send(u16 command, struct fib * context, unsigned long size, int priority, int wait, int reply, fib_callback callback, void *ctxt);
 int aac_consumer_get(struct aac_dev * dev, struct aac_queue * q, struct aac_entry **entry);
 void aac_consumer_free(struct aac_dev * dev, struct aac_queue * q, u32 qnum);
-int fib_complete(struct fib * context);
+int aac_fib_complete(struct fib * context);
 #define fib_data(fibctx) ((void *)(fibctx)->hw_fib->data)
 struct aac_dev *aac_init_adapter(struct aac_dev *dev);
 int aac_get_config_status(struct aac_dev *dev);
@@ -1799,11 +1799,11 @@ unsigned int aac_command_normal(struct aac_queue * q);
 unsigned int aac_intr_normal(struct aac_dev * dev, u32 Index);
 int aac_command_thread(struct aac_dev * dev);
 int aac_close_fib_context(struct aac_dev * dev, struct aac_fib_context *fibctx);
-int fib_adapter_complete(struct fib * fibptr, unsigned short size);
+int aac_fib_adapter_complete(struct fib * fibptr, unsigned short size);
 struct aac_driver_ident* aac_get_driver_ident(int devtype);
 int aac_get_adapter_info(struct aac_dev* dev);
 int aac_send_shutdown(struct aac_dev *dev);
-int probe_container(struct aac_dev *dev, int cid);
+int aac_probe_container(struct aac_dev *dev, int cid);
 extern int numacb;
 extern int acbsize;
 extern char aac_driver_version[];
diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c
index 4fe79cd7c957..47fefca72695 100644
--- a/drivers/scsi/aacraid/commctrl.c
+++ b/drivers/scsi/aacraid/commctrl.c
@@ -63,7 +63,7 @@ static int ioctl_send_fib(struct aac_dev * dev, void __user *arg)
         unsigned size;
         int retval;
 
-        fibptr = fib_alloc(dev);
+        fibptr = aac_fib_alloc(dev);
         if(fibptr == NULL) {
                 return -ENOMEM;
         }
@@ -73,7 +73,7 @@ static int ioctl_send_fib(struct aac_dev * dev, void __user *arg)
          *      First copy in the header so that we can check the size field.
          */
         if (copy_from_user((void *)kfib, arg, sizeof(struct aac_fibhdr))) {
-                fib_free(fibptr);
+                aac_fib_free(fibptr);
                 return -EFAULT;
         }
         /*
@@ -110,13 +110,13 @@ static int ioctl_send_fib(struct aac_dev * dev, void __user *arg)
                  */
                 kfib->header.XferState = 0;
         } else {
-                retval = fib_send(le16_to_cpu(kfib->header.Command), fibptr,
+                retval = aac_fib_send(le16_to_cpu(kfib->header.Command), fibptr,
                                 le16_to_cpu(kfib->header.Size) , FsaNormal,
                                 1, 1, NULL, NULL);
                 if (retval) {
                         goto cleanup;
                 }
-                if (fib_complete(fibptr) != 0) {
+                if (aac_fib_complete(fibptr) != 0) {
                         retval = -EINVAL;
                         goto cleanup;
                 }
@@ -138,7 +138,7 @@ cleanup:
                 fibptr->hw_fib_pa = hw_fib_pa;
                 fibptr->hw_fib = hw_fib;
         }
-        fib_free(fibptr);
+        aac_fib_free(fibptr);
         return retval;
 }
 
@@ -464,10 +464,10 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
         /*
          *      Allocate and initialize a Fib then setup a BlockWrite command
          */
-        if (!(srbfib = fib_alloc(dev))) {
+        if (!(srbfib = aac_fib_alloc(dev))) {
                 return -ENOMEM;
         }
-        fib_init(srbfib);
+        aac_fib_init(srbfib);
 
         srbcmd = (struct aac_srb*) fib_data(srbfib);
 
@@ -601,7 +601,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
 
                 srbcmd->count = cpu_to_le32(byte_count);
                 psg->count = cpu_to_le32(sg_indx+1);
-                status = fib_send(ScsiPortCommand64, srbfib, actual_fibsize, FsaNormal, 1, 1,NULL,NULL);
+                status = aac_fib_send(ScsiPortCommand64, srbfib, actual_fibsize, FsaNormal, 1, 1,NULL,NULL);
         } else {
                 struct user_sgmap* upsg = &user_srbcmd->sg;
                 struct sgmap* psg = &srbcmd->sg;
@@ -649,7 +649,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
                 }
                 srbcmd->count = cpu_to_le32(byte_count);
                 psg->count = cpu_to_le32(sg_indx+1);
-                status = fib_send(ScsiPortCommand, srbfib, actual_fibsize, FsaNormal, 1, 1, NULL, NULL);
+                status = aac_fib_send(ScsiPortCommand, srbfib, actual_fibsize, FsaNormal, 1, 1, NULL, NULL);
         }
 
         if (status != 0){
@@ -684,8 +684,8 @@ cleanup:
         for(i=0; i <= sg_indx; i++){
                 kfree(sg_list[i]);
         }
-        fib_complete(srbfib);
-        fib_free(srbfib);
+        aac_fib_complete(srbfib);
+        aac_fib_free(srbfib);
 
         return rcode;
 }
diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
index 82821d331c07..1628d094943d 100644
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -185,17 +185,17 @@ int aac_send_shutdown(struct aac_dev * dev)
         struct aac_close *cmd;
         int status;
 
-        fibctx = fib_alloc(dev);
+        fibctx = aac_fib_alloc(dev);
         if (!fibctx)
                 return -ENOMEM;
-        fib_init(fibctx);
+        aac_fib_init(fibctx);
 
         cmd = (struct aac_close *) fib_data(fibctx);
 
         cmd->command = cpu_to_le32(VM_CloseAll);
         cmd->cid = cpu_to_le32(0xffffffff);
 
-        status = fib_send(ContainerCommand,
+        status = aac_fib_send(ContainerCommand,
                           fibctx,
                           sizeof(struct aac_close),
                           FsaNormal,
@@ -203,8 +203,8 @@ int aac_send_shutdown(struct aac_dev * dev)
                           NULL, NULL);
 
         if (status == 0)
-                fib_complete(fibctx);
-        fib_free(fibctx);
+                aac_fib_complete(fibctx);
+        aac_fib_free(fibctx);
         return status;
 }
 
@@ -427,7 +427,7 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev)
         /*
          *      Initialize the list of fibs
          */
-        if(fib_setup(dev)<0){
+        if (aac_fib_setup(dev) < 0) {
                 kfree(dev->queues);
                 return NULL;
         }
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 014cc8d54a9f..609fd19b1844 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -67,27 +67,27 @@ static int fib_map_alloc(struct aac_dev *dev)
 }
 
 /**
- *      fib_map_free            -       free the fib objects
+ *      aac_fib_map_free                -       free the fib objects
  *      @dev: Adapter to free
  *
  *      Free the PCI mappings and the memory allocated for FIB blocks
  *      on this adapter.
  */
 
-void fib_map_free(struct aac_dev *dev)
+void aac_fib_map_free(struct aac_dev *dev)
 {
         pci_free_consistent(dev->pdev, dev->max_fib_size * (dev->scsi_host_ptr->can_queue + AAC_NUM_MGT_FIB), dev->hw_fib_va, dev->hw_fib_pa);
 }
 
 /**
- *      fib_setup       -       setup the fibs
+ *      aac_fib_setup   -       setup the fibs
  *      @dev: Adapter to set up
  *
  *      Allocate the PCI space for the fibs, map it and then intialise the
  *      fib area, the unmapped fib data and also the free list
  */
 
-int fib_setup(struct aac_dev * dev)
+int aac_fib_setup(struct aac_dev * dev)
 {
         struct fib *fibptr;
         struct hw_fib *hw_fib_va;
@@ -134,14 +134,14 @@ int fib_setup(struct aac_dev * dev)
 }
 
 /**
- *      fib_alloc       -       allocate a fib
+ *      aac_fib_alloc   -       allocate a fib
  *      @dev: Adapter to allocate the fib for
  *
  *      Allocate a fib from the adapter fib pool. If the pool is empty we
  *      return NULL.
  */
  
-struct fib * fib_alloc(struct aac_dev *dev)
+struct fib *aac_fib_alloc(struct aac_dev *dev)
 {
         struct fib * fibptr;
         unsigned long flags;
@@ -170,14 +170,14 @@ struct fib * fib_alloc(struct aac_dev *dev)
 }
 
 /**
- *      fib_free        -       free a fib
+ *      aac_fib_free    -       free a fib
  *      @fibptr: fib to free up
  *
  *      Frees up a fib and places it on the appropriate queue
  *      (either free or timed out)
  */
  
-void fib_free(struct fib * fibptr)
+void aac_fib_free(struct fib *fibptr)
 {
         unsigned long flags;
 
@@ -188,7 +188,7 @@ void fib_free(struct fib * fibptr)
                 fibptr->dev->timeout_fib = fibptr;
         } else {
                 if (fibptr->hw_fib->header.XferState != 0) {
-                        printk(KERN_WARNING "fib_free, XferState != 0, fibptr = 0x%p, XferState = 0x%x\n", 
+                        printk(KERN_WARNING "aac_fib_free, XferState != 0, fibptr = 0x%p, XferState = 0x%x\n",
                                  (void*)fibptr, 
                                  le32_to_cpu(fibptr->hw_fib->header.XferState));
                 }
@@ -199,13 +199,13 @@ void fib_free(struct fib * fibptr)
 }
 
 /**
- *      fib_init        -       initialise a fib
+ *      aac_fib_init    -       initialise a fib
  *      @fibptr: The fib to initialize
  *      
  *      Set up the generic fib fields ready for use
  */
  
-void fib_init(struct fib *fibptr)
+void aac_fib_init(struct fib *fibptr)
 {
         struct hw_fib *hw_fib = fibptr->hw_fib;
 
@@ -362,7 +362,7 @@ static int aac_queue_get(struct aac_dev * dev, u32 * index, u32 qid, struct hw_f
  */
 
 /**
- *      fib_send        -       send a fib to the adapter
+ *      aac_fib_send    -       send a fib to the adapter
  *      @command: Command to send
  *      @fibptr: The fib
  *      @size: Size of fib data area
@@ -378,7 +378,9 @@ static int aac_queue_get(struct aac_dev * dev, u32 * index, u32 qid, struct hw_f
  *      response FIB is received from the adapter.
  */
  
-int fib_send(u16 command, struct fib * fibptr, unsigned long size,  int priority, int wait, int reply, fib_callback callback, void * callback_data)
+int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,
+                int priority, int wait, int reply, fib_callback callback,
+                void *callback_data)
 {
         struct aac_dev * dev = fibptr->dev;
         struct hw_fib * hw_fib = fibptr->hw_fib;
@@ -493,7 +495,7 @@ int fib_send(u16 command, struct fib * fibptr, unsigned long size,  int priority
                 q->numpending++;
                 *(q->headers.producer) = cpu_to_le32(index + 1);
                 spin_unlock_irqrestore(q->lock, qflags);
-                dprintk((KERN_DEBUG "fib_send: inserting a queue entry at index %d.\n",index));
+                dprintk((KERN_DEBUG "aac_fib_send: inserting a queue entry at index %d.\n",index));
                 if (!(nointr & aac_config.irq_mod))
                         aac_adapter_notify(dev, AdapNormCmdQueue);
         }
@@ -520,7 +522,7 @@ int fib_send(u16 command, struct fib * fibptr, unsigned long size,  int priority
                                         list_del(&fibptr->queue);
                                         spin_unlock_irqrestore(q->lock, qflags);
                                         if (wait == -1) {
-                                                printk(KERN_ERR "aacraid: fib_send: first asynchronous command timed out.\n"
+                                                printk(KERN_ERR "aacraid: aac_fib_send: first asynchronous command timed out.\n"
                                                   "Usually a result of a PCI interrupt routing problem;\n"
                                                   "update mother board BIOS or consider utilizing one of\n"
                                                   "the SAFE mode kernel options (acpi, apic etc)\n");
@@ -624,7 +626,7 @@ void aac_consumer_free(struct aac_dev * dev, struct aac_queue *q, u32 qid)
 }        
 
 /**
- *      fib_adapter_complete    -       complete adapter issued fib
+ *      aac_fib_adapter_complete        -       complete adapter issued fib
  *      @fibptr: fib to complete
  *      @size: size of fib
  *
@@ -632,7 +634,7 @@ void aac_consumer_free(struct aac_dev * dev, struct aac_queue *q, u32 qid)
  *      the adapter.
  */
 
-int fib_adapter_complete(struct fib * fibptr, unsigned short size)
+int aac_fib_adapter_complete(struct fib *fibptr, unsigned short size)
 {
         struct hw_fib * hw_fib = fibptr->hw_fib;
         struct aac_dev * dev = fibptr->dev;
@@ -683,20 +685,20 @@ int fib_adapter_complete(struct fib * fibptr, unsigned short size)
         }
         else 
         {
-                printk(KERN_WARNING "fib_adapter_complete: Unknown xferstate detected.\n");
+                printk(KERN_WARNING "aac_fib_adapter_complete: Unknown xferstate detected.\n");
                 BUG();
         }   
         return 0;
 }
 
 /**
- *      fib_complete    -       fib completion handler
+ *      aac_fib_complete        -       fib completion handler
  *      @fib: FIB to complete
  *
  *      Will do all necessary work to complete a FIB.
  */
  
-int fib_complete(struct fib * fibptr)
+int aac_fib_complete(struct fib *fibptr)
 {
         struct hw_fib * hw_fib = fibptr->hw_fib;
 
@@ -995,14 +997,14 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)
         if (!dev || !dev->scsi_host_ptr)
                 return;
         /*
-         * force reload of disk info via probe_container
+         * force reload of disk info via aac_probe_container
          */
         if ((device_config_needed == CHANGE)
          && (dev->fsa_dev[container].valid == 1))
                 dev->fsa_dev[container].valid = 2;
         if ((device_config_needed == CHANGE) ||
                         (device_config_needed == ADD))
-                probe_container(dev, container);
+                aac_probe_container(dev, container);
         device = scsi_device_lookup(dev->scsi_host_ptr, 
                 CONTAINER_TO_CHANNEL(container), 
                 CONTAINER_TO_ID(container), 
@@ -1104,7 +1106,7 @@ int aac_command_thread(struct aac_dev * dev)
                                 /* Handle Driver Notify Events */
                                 aac_handle_aif(dev, fib);
                                 *(__le32 *)hw_fib->data = cpu_to_le32(ST_OK);
-                                fib_adapter_complete(fib, (u16)sizeof(u32));
+                                aac_fib_adapter_complete(fib, (u16)sizeof(u32));
                         } else {
                                 struct list_head *entry;
                                 /* The u32 here is important and intended. We are using
@@ -1241,7 +1243,7 @@ int aac_command_thread(struct aac_dev * dev)
                                  *      Set the status of this FIB
                                  */
                                 *(__le32 *)hw_fib->data = cpu_to_le32(ST_OK);
-                                fib_adapter_complete(fib, sizeof(u32));
+                                aac_fib_adapter_complete(fib, sizeof(u32));
                                 spin_unlock_irqrestore(&dev->fib_lock, flagv);
                                 /* Free up the remaining resources */
                                 hw_fib_p = hw_fib_pool;
diff --git a/drivers/scsi/aacraid/dpcsup.c b/drivers/scsi/aacraid/dpcsup.c
index 439948ef8251..f6bcb9486f85 100644
--- a/drivers/scsi/aacraid/dpcsup.c
+++ b/drivers/scsi/aacraid/dpcsup.c
@@ -206,7 +206,7 @@ unsigned int aac_command_normal(struct aac_queue *q)
                          *      Set the status of this FIB
                          */
                         *(__le32 *)hw_fib->data = cpu_to_le32(ST_OK);
-                        fib_adapter_complete(fib, sizeof(u32));
+                        aac_fib_adapter_complete(fib, sizeof(u32));
                         spin_lock_irqsave(q->lock, flags);
                 }               
         }
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 0bf5f9a943e8..271617890562 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -385,17 +385,45 @@ static int aac_biosparm(struct scsi_device *sdev, struct block_device *bdev,
 
 static int aac_slave_configure(struct scsi_device *sdev)
 {
-        struct Scsi_Host *host = sdev->host;
+        if (sdev_channel(sdev) == CONTAINER_CHANNEL) {
+                sdev->skip_ms_page_8 = 1;
+                sdev->skip_ms_page_3f = 1;
+        }
+        if ((sdev->type == TYPE_DISK) &&
+                        (sdev_channel(sdev) != CONTAINER_CHANNEL)) {
+                struct aac_dev *aac = (struct aac_dev *)sdev->host->hostdata;
+                if (!aac->raid_scsi_mode || (sdev_channel(sdev) != 2))
+                        sdev->no_uld_attach = 1;
+        }
+        if (sdev->tagged_supported && (sdev->type == TYPE_DISK) &&
+                        (sdev_channel(sdev) == CONTAINER_CHANNEL)) {
+                struct scsi_device * dev;
+                struct Scsi_Host *host = sdev->host;
+                unsigned num_lsu = 0;
+                unsigned num_one = 0;
+                unsigned depth;
 
-        if (sdev->tagged_supported)
-                scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, 128);
-        else
+                __shost_for_each_device(dev, host) {
+                        if (dev->tagged_supported && (dev->type == TYPE_DISK) &&
+                                (sdev_channel(dev) == CONTAINER_CHANNEL))
+                                ++num_lsu;
+                        else
+                                ++num_one;
+                }
+                if (num_lsu == 0)
+                        ++num_lsu;
+                depth = (host->can_queue - num_one) / num_lsu;
+                if (depth > 256)
+                        depth = 256;
+                else if (depth < 2)
+                        depth = 2;
+                scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, depth);
+                if (!(((struct aac_dev *)host->hostdata)->adapter_info.options &
+                                AAC_OPT_NEW_COMM))
+                        blk_queue_max_segment_size(sdev->request_queue, 65536);
+        } else
                 scsi_adjust_queue_depth(sdev, 0, 1);
 
-        if (!(((struct aac_dev *)host->hostdata)->adapter_info.options
-          & AAC_OPT_NEW_COMM))
-                blk_queue_max_segment_size(sdev->request_queue, 65536);
-
         return 0;
 }
 
@@ -870,7 +898,7 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
  
         /*
          * max channel will be the physical channels plus 1 virtual channel
-         * all containers are on the virtual channel 0
+         * all containers are on the virtual channel 0 (CONTAINER_CHANNEL)
          * physical channels are address by their actual physical number+1
          */
         if (aac->nondasd_support == 1)
@@ -913,7 +941,7 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
         aac_adapter_disable_int(aac);
         free_irq(pdev->irq, aac);
  out_unmap:
-        fib_map_free(aac);
+        aac_fib_map_free(aac);
         pci_free_consistent(aac->pdev, aac->comm_size, aac->comm_addr, aac->comm_phys);
         kfree(aac->queues);
         iounmap(aac->regs.sa);
@@ -947,7 +975,7 @@ static void __devexit aac_remove_one(struct pci_dev *pdev)
 
         aac_send_shutdown(aac);
         aac_adapter_disable_int(aac);
-        fib_map_free(aac);
+        aac_fib_map_free(aac);
         pci_free_consistent(aac->pdev, aac->comm_size, aac->comm_addr,
                         aac->comm_phys);
         kfree(aac->queues);
diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c
index cb2ee25f213f..531a1f9ceb51 100644
--- a/drivers/scsi/aha152x.c
+++ b/drivers/scsi/aha152x.c
@@ -1260,16 +1260,15 @@ static void free_hard_reset_SCs(struct Scsi_Host *shpnt, Scsi_Cmnd **SCs)
  * Reset the bus
  *
  */
-static int aha152x_bus_reset(Scsi_Cmnd *SCpnt)
+static int aha152x_bus_reset_host(struct Scsi_Host *shpnt)
 {
-        struct Scsi_Host *shpnt = SCpnt->device->host;
         unsigned long flags;
 
         DO_LOCK(flags);
 
 #if defined(AHA152X_DEBUG)
         if(HOSTDATA(shpnt)->debug & debug_eh) {
-                printk(DEBUG_LEAD "aha152x_bus_reset(%p)", CMDINFO(SCpnt), SCpnt);
+                printk(KERN_DEBUG "scsi%d: bus reset", shpnt->host_no);
                 show_queues(shpnt);
         }
 #endif
@@ -1277,14 +1276,14 @@ static int aha152x_bus_reset(Scsi_Cmnd *SCpnt)
         free_hard_reset_SCs(shpnt, &ISSUE_SC);
         free_hard_reset_SCs(shpnt, &DISCONNECTED_SC);
 
-        DPRINTK(debug_eh, DEBUG_LEAD "resetting bus\n", CMDINFO(SCpnt));
+        DPRINTK(debug_eh, KERN_DEBUG "scsi%d: resetting bus\n", shpnt->host_no);
 
         SETPORT(SCSISEQ, SCSIRSTO);
         mdelay(256);
         SETPORT(SCSISEQ, 0);
         mdelay(DELAY);
 
-        DPRINTK(debug_eh, DEBUG_LEAD "bus resetted\n", CMDINFO(SCpnt));
+        DPRINTK(debug_eh, KERN_DEBUG "scsi%d: bus resetted\n", shpnt->host_no);
 
         setup_expected_interrupts(shpnt);
         if(HOSTDATA(shpnt)->commands==0)
@@ -1295,6 +1294,14 @@ static int aha152x_bus_reset(Scsi_Cmnd *SCpnt)
         return SUCCESS;
 }
 
+/*
+ * Reset the bus
+ *
+ */
+static int aha152x_bus_reset(Scsi_Cmnd *SCpnt)
+{
+        return aha152x_bus_reset_host(SCpnt->device->host);
+}
 
 /*
  *  Restore default values to the AIC-6260 registers and reset the fifos
@@ -1337,23 +1344,28 @@ static void reset_ports(struct Scsi_Host *shpnt)
  * Reset the host (bus and controller)
  *
  */
-int aha152x_host_reset(Scsi_Cmnd * SCpnt)
+int aha152x_host_reset_host(struct Scsi_Host *shpnt)
 {
-#if defined(AHA152X_DEBUG)
-        struct Scsi_Host *shpnt = SCpnt->device->host;
-#endif
-
-        DPRINTK(debug_eh, DEBUG_LEAD "aha152x_host_reset(%p)\n", CMDINFO(SCpnt), SCpnt);
+        DPRINTK(debug_eh, KERN_DEBUG "scsi%d: host reset\n", shpnt->host_no);
 
-        aha152x_bus_reset(SCpnt);
+        aha152x_bus_reset_host(shpnt);
 
-        DPRINTK(debug_eh, DEBUG_LEAD "resetting ports\n", CMDINFO(SCpnt));
-        reset_ports(SCpnt->device->host);
+        DPRINTK(debug_eh, KERN_DEBUG "scsi%d: resetting ports\n", shpnt->host_no);
+        reset_ports(shpnt);
 
         return SUCCESS;
 }
 
 /*
+ * Reset the host (bus and controller)
+ * 
+ */
+static int aha152x_host_reset(Scsi_Cmnd *SCpnt)
+{
+        return aha152x_host_reset_host(SCpnt->device->host);
+}
+
+/*
  * Return the "logical geometry"
  *
  */
@@ -1431,22 +1443,18 @@ static void run(void)
 {
         int i;
         for (i = 0; i<ARRAY_SIZE(aha152x_host); i++) {
-                struct Scsi_Host *shpnt = aha152x_host[i];
-                if (shpnt && HOSTDATA(shpnt)->service) {
-                        HOSTDATA(shpnt)->service=0;
-                        is_complete(shpnt);
-                }
+                is_complete(aha152x_host[i]);
         }
 }
 
 /*
- *    Interrupts handler
+ * Interrupt handler
  *
  */
-
 static irqreturn_t intr(int irqno, void *dev_id, struct pt_regs *regs)
 {
         struct Scsi_Host *shpnt = lookup_irq(irqno);
+        unsigned long flags;
         unsigned char rev, dmacntrl0;
 
         if (!shpnt) {
@@ -1472,23 +1480,23 @@ static irqreturn_t intr(int irqno, void *dev_id, struct pt_regs *regs)
         if ((rev == 0xFF) && (dmacntrl0 == 0xFF))
                 return IRQ_NONE;
 
+        if( TESTLO(DMASTAT, INTSTAT) )
+                return IRQ_NONE;        
+
         /* no more interrupts from the controller, while we're busy.
            INTEN is restored by the BH handler */
         CLRBITS(DMACNTRL0, INTEN);
 
-#if 0
-        /* check if there is already something to be
-           serviced; should not happen */
-        if(HOSTDATA(shpnt)->service) {
-                printk(KERN_ERR "aha152x%d: lost interrupt (%d)\n", HOSTNO, HOSTDATA(shpnt)->service);
-                show_queues(shpnt);
+        DO_LOCK(flags);
+        if( HOSTDATA(shpnt)->service==0 ) {
+                HOSTDATA(shpnt)->service=1;
+
+                /* Poke the BH handler */
+                INIT_WORK(&aha152x_tq, (void *) run, NULL);
+                schedule_work(&aha152x_tq);
         }
-#endif
-        
-        /* Poke the BH handler */
-        HOSTDATA(shpnt)->service++;
-        INIT_WORK(&aha152x_tq, (void *) run, NULL);
-        schedule_work(&aha152x_tq);
+        DO_UNLOCK(flags);
+
         return IRQ_HANDLED;
 }
 
@@ -2527,7 +2535,18 @@ static void is_complete(struct Scsi_Host *shpnt)
         unsigned long flags;
         int pending;
 
+        if(!shpnt)
+                return;
+
         DO_LOCK(flags);
+
+        if( HOSTDATA(shpnt)->service==0 )  {
+                DO_UNLOCK(flags);
+                return;
+        }
+
+        HOSTDATA(shpnt)->service = 0;
+
         if(HOSTDATA(shpnt)->in_intr) {
                 DO_UNLOCK(flags);
                 /* aha152x_error never returns.. */
diff --git a/drivers/scsi/aha152x.h b/drivers/scsi/aha152x.h
index d277613af29b..d2add24d02a3 100644
--- a/drivers/scsi/aha152x.h
+++ b/drivers/scsi/aha152x.h
@@ -332,6 +332,6 @@ struct aha152x_setup {
 
 struct Scsi_Host *aha152x_probe_one(struct aha152x_setup *);
 void aha152x_release(struct Scsi_Host *);
-int aha152x_host_reset(Scsi_Cmnd *);
+int aha152x_host_reset_host(struct Scsi_Host *);
 
 #endif /* _AHA152X_H */
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index a800fb51168b..559ff7aae3f1 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -742,23 +742,17 @@ static irqreturn_t ahci_interrupt (int irq, void *dev_instance, struct pt_regs *
                         struct ata_queued_cmd *qc;
                         qc = ata_qc_from_tag(ap, ap->active_tag);
                         if (!ahci_host_intr(ap, qc))
-                                if (ata_ratelimit()) {
-                                        struct pci_dev *pdev =
-                                                to_pci_dev(ap->host_set->dev);
-                                        dev_printk(KERN_WARNING, &pdev->dev,
+                                if (ata_ratelimit())
+                                        dev_printk(KERN_WARNING, host_set->dev,
                                           "unhandled interrupt on port %u\n",
                                           i);
-                                }
 
                         VPRINTK("port %u\n", i);
                 } else {
                         VPRINTK("port %u (no irq)\n", i);
-                        if (ata_ratelimit()) {
-                                struct pci_dev *pdev =
-                                        to_pci_dev(ap->host_set->dev);
-                                dev_printk(KERN_WARNING, &pdev->dev,
+                        if (ata_ratelimit())
+                                dev_printk(KERN_WARNING, host_set->dev,
                                         "interrupt on disabled port %u\n", i);
-                        }
                 }
 
                 irq_ack |= (1 << i);
diff --git a/drivers/scsi/esp.c b/drivers/scsi/esp.c
index f6900538be90..87a8c3d2072c 100644
--- a/drivers/scsi/esp.c
+++ b/drivers/scsi/esp.c
@@ -2068,14 +2068,12 @@ static int esp_reset(struct scsi_cmnd *SCptr)
 {
         struct esp *esp = (struct esp *) SCptr->device->host->hostdata;
 
+        spin_lock_irq(esp->ehost->host_lock);
         (void) esp_do_resetbus(esp);
-
         spin_unlock_irq(esp->ehost->host_lock);
 
         wait_event(esp->reset_queue, (esp->resetting_bus == 0));
 
-        spin_lock_irq(esp->ehost->host_lock);
-
         return SUCCESS;
 }
 
diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
index bd3ffdf6c800..62e3cda859af 100644
--- a/drivers/scsi/gdth.c
+++ b/drivers/scsi/gdth.c
@@ -2816,7 +2816,7 @@ static int gdth_fill_cache_cmd(int hanum,Scsi_Cmnd *scp,ushort hdrive)
             }
 #endif
 
-        } else {
+        } else if (scp->request_bufflen) {
             scp->SCp.Status = GDTH_MAP_SINGLE;
             scp->SCp.Message = (read_write == 1 ? 
                 PCI_DMA_TODEVICE : PCI_DMA_FROMDEVICE);
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 27acf78cf8d8..2bba5e55d7bc 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -4236,35 +4236,6 @@ static void ipr_scsi_done(struct ipr_cmnd *ipr_cmd)
 }
 
 /**
- * ipr_save_ioafp_mode_select - Save adapters mode select data
- * @ioa_cfg:    ioa config struct
- * @scsi_cmd:   scsi command struct
- *
- * This function saves mode select data for the adapter to
- * use following an adapter reset.
- *
- * Return value:
- *      0 on success / SCSI_MLQUEUE_HOST_BUSY on failure
- **/
-static int ipr_save_ioafp_mode_select(struct ipr_ioa_cfg *ioa_cfg,
-                                       struct scsi_cmnd *scsi_cmd)
-{
-        if (!ioa_cfg->saved_mode_pages) {
-                ioa_cfg->saved_mode_pages  = kmalloc(sizeof(struct ipr_mode_pages),
-                                                     GFP_ATOMIC);
-                if (!ioa_cfg->saved_mode_pages) {
-                        dev_err(&ioa_cfg->pdev->dev,
-                                "IOA mode select buffer allocation failed\n");
-                        return SCSI_MLQUEUE_HOST_BUSY;
-                }
-        }
-
-        memcpy(ioa_cfg->saved_mode_pages, scsi_cmd->buffer, scsi_cmd->cmnd[4]);
-        ioa_cfg->saved_mode_page_len = scsi_cmd->cmnd[4];
-        return 0;
-}
-
-/**
  * ipr_queuecommand - Queue a mid-layer request
  * @scsi_cmd:   scsi command struct
  * @done:               done function
@@ -4338,9 +4309,6 @@ static int ipr_queuecommand(struct scsi_cmnd *scsi_cmd,
             (!ipr_is_gscsi(res) || scsi_cmd->cmnd[0] == IPR_QUERY_RSRC_STATE))
                 ioarcb->cmd_pkt.request_type = IPR_RQTYPE_IOACMD;
 
-        if (ipr_is_ioa_resource(res) && scsi_cmd->cmnd[0] == MODE_SELECT)
-                rc = ipr_save_ioafp_mode_select(ioa_cfg, scsi_cmd);
-
         if (likely(rc == 0))
                 rc = ipr_build_ioadl(ioa_cfg, ipr_cmd);
 
@@ -4829,17 +4797,11 @@ static int ipr_ioafp_mode_select_page28(struct ipr_cmnd *ipr_cmd)
         int length;
 
         ENTER;
-        if (ioa_cfg->saved_mode_pages) {
-                memcpy(mode_pages, ioa_cfg->saved_mode_pages,
-                       ioa_cfg->saved_mode_page_len);
-                length = ioa_cfg->saved_mode_page_len;
-        } else {
-                ipr_scsi_bus_speed_limit(ioa_cfg);
-                ipr_check_term_power(ioa_cfg, mode_pages);
-                ipr_modify_ioafp_mode_page_28(ioa_cfg, mode_pages);
-                length = mode_pages->hdr.length + 1;
-                mode_pages->hdr.length = 0;
-        }
+        ipr_scsi_bus_speed_limit(ioa_cfg);
+        ipr_check_term_power(ioa_cfg, mode_pages);
+        ipr_modify_ioafp_mode_page_28(ioa_cfg, mode_pages);
+        length = mode_pages->hdr.length + 1;
+        mode_pages->hdr.length = 0;
 
         ipr_build_mode_select(ipr_cmd, cpu_to_be32(IPR_IOA_RES_HANDLE), 0x11,
                               ioa_cfg->vpd_cbs_dma + offsetof(struct ipr_misc_cbs, mode_pages),
@@ -5969,7 +5931,6 @@ static void ipr_free_mem(struct ipr_ioa_cfg *ioa_cfg)
         }
 
         ipr_free_dump(ioa_cfg);
-        kfree(ioa_cfg->saved_mode_pages);
         kfree(ioa_cfg->trace);
 }
 
diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h
index b639332131f1..fd360bfe56dd 100644
--- a/drivers/scsi/ipr.h
+++ b/drivers/scsi/ipr.h
@@ -36,8 +36,8 @@
 /*
  * Literals
  */
-#define IPR_DRIVER_VERSION "2.1.1"
-#define IPR_DRIVER_DATE "(November 15, 2005)"
+#define IPR_DRIVER_VERSION "2.1.2"
+#define IPR_DRIVER_DATE "(February 8, 2006)"
 
 /*
  * IPR_MAX_CMD_PER_LUN: This defines the maximum number of outstanding
@@ -1000,7 +1000,6 @@ struct ipr_ioa_cfg {
         struct Scsi_Host *host;
         struct pci_dev *pdev;
         struct ipr_sglist *ucode_sglist;
-        struct ipr_mode_pages *saved_mode_pages;
         u8 saved_mode_page_len;
 
         struct work_struct work_q;
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index 780bfcc67096..ff79e68b347c 100644
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -146,7 +146,7 @@ iscsi_conn_failure(struct iscsi_conn *conn, enum iscsi_err err)
         spin_unlock_irqrestore(&session->lock, flags);
         set_bit(SUSPEND_BIT, &conn->suspend_tx);
         set_bit(SUSPEND_BIT, &conn->suspend_rx);
-        iscsi_conn_error(iscsi_handle(conn), err);
+        iscsi_conn_error(conn->cls_conn, err);
 }
 
 static inline int
@@ -244,12 +244,10 @@ iscsi_ctask_cleanup(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)
         if (sc->sc_data_direction == DMA_TO_DEVICE) {
                 struct iscsi_data_task *dtask, *n;
                 /* WRITE: cleanup Data-Out's if any */
-                spin_lock(&conn->lock);
                 list_for_each_entry_safe(dtask, n, &ctask->dataqueue, item) {
                         list_del(&dtask->item);
                         mempool_free(dtask, ctask->datapool);
                 }
-                spin_unlock(&conn->lock);
         }
         ctask->xmstate = XMSTATE_IDLE;
         ctask->r2t = NULL;
@@ -689,7 +687,7 @@ iscsi_hdr_recv(struct iscsi_conn *conn)
                                 break;
 
                         if (!conn->in.datalen) {
-                                rc = iscsi_recv_pdu(iscsi_handle(conn), hdr,
+                                rc = iscsi_recv_pdu(conn->cls_conn, hdr,
                                                     NULL, 0);
                                 if (conn->login_mtask != mtask) {
                                         spin_lock(&session->lock);
@@ -737,7 +735,7 @@ iscsi_hdr_recv(struct iscsi_conn *conn)
                         if (!conn->in.datalen) {
                                 struct iscsi_mgmt_task *mtask;
 
-                                rc = iscsi_recv_pdu(iscsi_handle(conn), hdr,
+                                rc = iscsi_recv_pdu(conn->cls_conn, hdr,
                                                     NULL, 0);
                                 mtask = (struct iscsi_mgmt_task *)
                                         session->mgmt_cmds[conn->in.itt -
@@ -761,7 +759,7 @@ iscsi_hdr_recv(struct iscsi_conn *conn)
                                 rc = iscsi_check_assign_cmdsn(session,
                                                  (struct iscsi_nopin*)hdr);
                                 if (!rc && hdr->ttt != ISCSI_RESERVED_TAG)
-                                        rc = iscsi_recv_pdu(iscsi_handle(conn),
+                                        rc = iscsi_recv_pdu(conn->cls_conn,
                                                             hdr, NULL, 0);
                         } else
                                 rc = ISCSI_ERR_PROTO;
@@ -1044,7 +1042,7 @@ iscsi_data_recv(struct iscsi_conn *conn)
                         goto exit;
                 }
 
-                rc = iscsi_recv_pdu(iscsi_handle(conn), conn->in.hdr,
+                rc = iscsi_recv_pdu(conn->cls_conn, conn->in.hdr,
                                     conn->data, conn->in.datalen);
 
                 if (!rc && conn->datadgst_en &&
@@ -2428,19 +2426,20 @@ iscsi_pool_free(struct iscsi_queue *q, void **items)
 }
 
 static struct iscsi_cls_conn *
-iscsi_conn_create(struct Scsi_Host *shost, uint32_t conn_idx)
+iscsi_conn_create(struct iscsi_cls_session *cls_session, uint32_t conn_idx)
 {
+        struct Scsi_Host *shost = iscsi_session_to_shost(cls_session);
         struct iscsi_session *session = iscsi_hostdata(shost->hostdata);
         struct iscsi_conn *conn;
         struct iscsi_cls_conn *cls_conn;
 
-        cls_conn = iscsi_create_conn(hostdata_session(shost->hostdata),
-                                     conn_idx);
+        cls_conn = iscsi_create_conn(cls_session, conn_idx);
         if (!cls_conn)
                 return NULL;
         conn = cls_conn->dd_data;
+        memset(conn, 0, sizeof(*conn));
 
-        memset(conn, 0, sizeof(struct iscsi_conn));
+        conn->cls_conn = cls_conn;
         conn->c_stage = ISCSI_CONN_INITIAL_STAGE;
         conn->in_progress = IN_PROGRESS_WAIT_HEADER;
         conn->id = conn_idx;
@@ -2452,8 +2451,6 @@ iscsi_conn_create(struct Scsi_Host *shost, uint32_t conn_idx)
         conn->data_size = DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH;
         conn->max_recv_dlength = DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH;
 
-        spin_lock_init(&conn->lock);
-
         /* initialize general xmit PDU commands queue */
         conn->xmitqueue = kfifo_alloc(session->cmds_max * sizeof(void*),
                                         GFP_KERNEL, NULL);
@@ -2625,11 +2622,13 @@ iscsi_conn_destroy(struct iscsi_cls_conn *cls_conn)
 }
 
 static int
-iscsi_conn_bind(iscsi_sessionh_t sessionh, iscsi_connh_t connh,
-                uint32_t transport_fd, int is_leading)
+iscsi_conn_bind(struct iscsi_cls_session *cls_session,
+                struct iscsi_cls_conn *cls_conn, uint32_t transport_fd,
+                int is_leading)
 {
-        struct iscsi_session *session = iscsi_ptr(sessionh);
-        struct iscsi_conn *tmp = ERR_PTR(-EEXIST), *conn = iscsi_ptr(connh);
+        struct Scsi_Host *shost = iscsi_session_to_shost(cls_session);
+        struct iscsi_session *session = iscsi_hostdata(shost->hostdata);
+        struct iscsi_conn *tmp = ERR_PTR(-EEXIST), *conn = cls_conn->dd_data;
         struct sock *sk;
         struct socket *sock;
         int err;
@@ -2703,9 +2702,9 @@ iscsi_conn_bind(iscsi_sessionh_t sessionh, iscsi_connh_t connh,
 }
 
 static int
-iscsi_conn_start(iscsi_connh_t connh)
+iscsi_conn_start(struct iscsi_cls_conn *cls_conn)
 {
-        struct iscsi_conn *conn = iscsi_ptr(connh);
+        struct iscsi_conn *conn = cls_conn->dd_data;
         struct iscsi_session *session = conn->session;
         struct sock *sk;
 
@@ -2754,9 +2753,9 @@ iscsi_conn_start(iscsi_connh_t connh)
 }
 
 static void
-iscsi_conn_stop(iscsi_connh_t connh, int flag)
+iscsi_conn_stop(struct iscsi_cls_conn *cls_conn, int flag)
 {
-        struct iscsi_conn *conn = iscsi_ptr(connh);
+        struct iscsi_conn *conn = cls_conn->dd_data;
         struct iscsi_session *session = conn->session;
         struct sock *sk;
         unsigned long flags;
@@ -3253,9 +3252,9 @@ static struct scsi_host_template iscsi_sht = {
 
 static struct iscsi_transport iscsi_tcp_transport;
 
-static struct Scsi_Host *
+static struct iscsi_cls_session *
 iscsi_session_create(struct scsi_transport_template *scsit,
-                     uint32_t initial_cmdsn)
+                     uint32_t initial_cmdsn, uint32_t *sid)
 {
         struct Scsi_Host *shost;
         struct iscsi_session *session;
@@ -3268,13 +3267,14 @@ iscsi_session_create(struct scsi_transport_template *scsit,
         session = iscsi_hostdata(shost->hostdata);
         memset(session, 0, sizeof(struct iscsi_session));
         session->host = shost;
-        session->state = ISCSI_STATE_LOGGED_IN;
+        session->state = ISCSI_STATE_FREE;
         session->mgmtpool_max = ISCSI_MGMT_CMDS_MAX;
         session->cmds_max = ISCSI_XMIT_CMDS_MAX;
         session->cmdsn = initial_cmdsn;
         session->exp_cmdsn = initial_cmdsn + 1;
         session->max_cmdsn = initial_cmdsn + 1;
         session->max_r2t = 1;
+        *sid = shost->host_no;
 
         /* initialize SCSI PDU commands pool */
         if (iscsi_pool_init(&session->cmdpool, session->cmds_max,
@@ -3311,22 +3311,24 @@ iscsi_session_create(struct scsi_transport_template *scsit,
         if (iscsi_r2tpool_alloc(session))
                 goto r2tpool_alloc_fail;
 
-        return shost;
+        return hostdata_session(shost->hostdata);
 
 r2tpool_alloc_fail:
         for (cmd_i = 0; cmd_i < session->mgmtpool_max; cmd_i++)
                 kfree(session->mgmt_cmds[cmd_i]->data);
-        iscsi_pool_free(&session->mgmtpool, (void**)session->mgmt_cmds);
 immdata_alloc_fail:
+        iscsi_pool_free(&session->mgmtpool, (void**)session->mgmt_cmds);
 mgmtpool_alloc_fail:
         iscsi_pool_free(&session->cmdpool, (void**)session->cmds);
 cmdpool_alloc_fail:
+        iscsi_transport_destroy_session(shost);
         return NULL;
 }
 
 static void
-iscsi_session_destroy(struct Scsi_Host *shost)
+iscsi_session_destroy(struct iscsi_cls_session *cls_session)
 {
+        struct Scsi_Host *shost = iscsi_session_to_shost(cls_session);
         struct iscsi_session *session = iscsi_hostdata(shost->hostdata);
         int cmd_i;
         struct iscsi_data_task *dtask, *n;
@@ -3350,10 +3352,10 @@ iscsi_session_destroy(struct Scsi_Host *shost)
 }
 
 static int
-iscsi_conn_set_param(iscsi_connh_t connh, enum iscsi_param param,
+iscsi_conn_set_param(struct iscsi_cls_conn *cls_conn, enum iscsi_param param,
                      uint32_t value)
 {
-        struct iscsi_conn *conn = iscsi_ptr(connh);
+        struct iscsi_conn *conn = cls_conn->dd_data;
         struct iscsi_session *session = conn->session;
 
         spin_lock_bh(&session->lock);
@@ -3495,9 +3497,10 @@ iscsi_conn_set_param(iscsi_connh_t connh, enum iscsi_param param,
 }
 
 static int
-iscsi_session_get_param(struct Scsi_Host *shost,
+iscsi_session_get_param(struct iscsi_cls_session *cls_session,
                         enum iscsi_param param, uint32_t *value)
 {
+        struct Scsi_Host *shost = iscsi_session_to_shost(cls_session);
         struct iscsi_session *session = iscsi_hostdata(shost->hostdata);
 
         switch(param) {
@@ -3539,9 +3542,10 @@ iscsi_session_get_param(struct Scsi_Host *shost,
 }
 
 static int
-iscsi_conn_get_param(void *data, enum iscsi_param param, uint32_t *value)
+iscsi_conn_get_param(struct iscsi_cls_conn *cls_conn,
+                     enum iscsi_param param, uint32_t *value)
 {
-        struct iscsi_conn *conn = data;
+        struct iscsi_conn *conn = cls_conn->dd_data;
 
         switch(param) {
         case ISCSI_PARAM_MAX_RECV_DLENGTH:
@@ -3564,9 +3568,9 @@ iscsi_conn_get_param(void *data, enum iscsi_param param, uint32_t *value)
 }
 
 static void
-iscsi_conn_get_stats(iscsi_connh_t connh, struct iscsi_stats *stats)
+iscsi_conn_get_stats(struct iscsi_cls_conn *cls_conn, struct iscsi_stats *stats)
 {
-        struct iscsi_conn *conn = iscsi_ptr(connh);
+        struct iscsi_conn *conn = cls_conn->dd_data;
 
         stats->txdata_octets = conn->txdata_octets;
         stats->rxdata_octets = conn->rxdata_octets;
@@ -3587,10 +3591,10 @@ iscsi_conn_get_stats(iscsi_connh_t connh, struct iscsi_stats *stats)
 }
 
 static int
-iscsi_conn_send_pdu(iscsi_connh_t connh, struct iscsi_hdr *hdr, char *data,
-                    uint32_t data_size)
+iscsi_conn_send_pdu(struct iscsi_cls_conn *cls_conn, struct iscsi_hdr *hdr,
+                    char *data, uint32_t data_size)
 {
-        struct iscsi_conn *conn = iscsi_ptr(connh);
+        struct iscsi_conn *conn = cls_conn->dd_data;
         int rc;
 
         mutex_lock(&conn->xmitmutex);
diff --git a/drivers/scsi/iscsi_tcp.h b/drivers/scsi/iscsi_tcp.h
index f95e61b76f70..ba26741ac154 100644
--- a/drivers/scsi/iscsi_tcp.h
+++ b/drivers/scsi/iscsi_tcp.h
@@ -113,7 +113,10 @@ struct iscsi_tcp_recv {
         int                     datadgst;
 };
 
+struct iscsi_cls_conn;
+
 struct iscsi_conn {
+        struct iscsi_cls_conn   *cls_conn;      /* ptr to class connection */
         struct iscsi_hdr        hdr;            /* header placeholder */
         char                    hdrext[4*sizeof(__u16) +
                                     sizeof(__u32)];
@@ -143,7 +146,6 @@ struct iscsi_conn {
         struct iscsi_mgmt_task  *login_mtask;   /* mtask used for login/text */
         struct iscsi_mgmt_task  *mtask;         /* xmit mtask in progress */
         struct iscsi_cmd_task   *ctask;         /* xmit ctask in progress */
-        spinlock_t              lock;           /* FIXME: to be removed */
 
         /* old values for socket callbacks */
         void                    (*old_data_ready)(struct sock *, int);
diff --git a/drivers/scsi/jazz_esp.c b/drivers/scsi/jazz_esp.c
index 23728d1c980c..fcd304e11c26 100644
--- a/drivers/scsi/jazz_esp.c
+++ b/drivers/scsi/jazz_esp.c
@@ -65,27 +65,6 @@ static int jazz_esp_release(struct Scsi_Host *shost)
         return 0;
 }
 
-static struct scsi_host_template driver_template = {
-        .proc_name              = "jazz_esp",
-        .proc_info              = &esp_proc_info,
-        .name                   = "ESP 100/100a/200",
-        .detect                 = jazz_esp_detect,
-        .slave_alloc            = esp_slave_alloc,
-        .slave_destroy          = esp_slave_destroy,
-        .release                = jazz_esp_release,
-        .info                   = esp_info,
-        .queuecommand           = esp_queue,
-        .eh_abort_handler       = esp_abort,
-        .eh_bus_reset_handler   = esp_reset,
-        .can_queue              = 7,
-        .this_id                = 7,
-        .sg_tablesize           = SG_ALL,
-        .cmd_per_lun            = 1,
-        .use_clustering         = DISABLE_CLUSTERING,
-};
-
-#include "scsi_module.c"
-
 /***************************************************************** Detection */
 static int jazz_esp_detect(struct scsi_host_template *tpnt)
 {
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 46c4cdbaee86..4f91b0dc572b 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -82,6 +82,10 @@ int atapi_enabled = 0;
 module_param(atapi_enabled, int, 0444);
 MODULE_PARM_DESC(atapi_enabled, "Enable discovery of ATAPI devices (0=off, 1=on)");
 
+int libata_fua = 0;
+module_param_named(fua, libata_fua, int, 0444);
+MODULE_PARM_DESC(fua, "FUA support (0=off, 1=on)");
+
 MODULE_AUTHOR("Jeff Garzik");
 MODULE_DESCRIPTION("Library module for ATA devices");
 MODULE_LICENSE("GPL");
@@ -614,7 +618,7 @@ int ata_rwcmd_protocol(struct ata_queued_cmd *qc)
         } else if (lba48 && (qc->ap->flags & ATA_FLAG_PIO_LBA48)) {
                 /* Unable to use DMA due to host limitation */
                 tf->protocol = ATA_PROT_PIO;
-                index = dev->multi_count ? 0 : 4;
+                index = dev->multi_count ? 0 : 8;
         } else {
                 tf->protocol = ATA_PROT_DMA;
                 index = 16;
@@ -2514,7 +2518,7 @@ static void ata_sg_clean(struct ata_queued_cmd *qc)
         assert(sg != NULL);
 
         if (qc->flags & ATA_QCFLAG_SINGLE)
-                assert(qc->n_elem == 1);
+                assert(qc->n_elem <= 1);
 
         VPRINTK("unmapping %u sg elements\n", qc->n_elem);
 
@@ -2537,7 +2541,7 @@ static void ata_sg_clean(struct ata_queued_cmd *qc)
                         kunmap_atomic(addr, KM_IRQ0);
                 }
         } else {
-                if (sg_dma_len(&sg[0]) > 0)
+                if (qc->n_elem)
                         dma_unmap_single(ap->host_set->dev,
                                 sg_dma_address(&sg[0]), sg_dma_len(&sg[0]),
                                 dir);
@@ -2570,7 +2574,7 @@ static void ata_fill_sg(struct ata_queued_cmd *qc)
         unsigned int idx;
 
         assert(qc->__sg != NULL);
-        assert(qc->n_elem > 0);
+        assert(qc->n_elem > 0 || qc->pad_len > 0);
 
         idx = 0;
         ata_for_each_sg(sg, qc) {
@@ -2715,6 +2719,7 @@ static int ata_sg_setup_one(struct ata_queued_cmd *qc)
         int dir = qc->dma_dir;
         struct scatterlist *sg = qc->__sg;
         dma_addr_t dma_address;
+        int trim_sg = 0;
 
         /* we must lengthen transfers to end on a 32-bit boundary */
         qc->pad_len = sg->length & 3;
@@ -2734,13 +2739,15 @@ static int ata_sg_setup_one(struct ata_queued_cmd *qc)
                 sg_dma_len(psg) = ATA_DMA_PAD_SZ;
                 /* trim sg */
                 sg->length -= qc->pad_len;
+                if (sg->length == 0)
+                        trim_sg = 1;
 
                 DPRINTK("padding done, sg->length=%u pad_len=%u\n",
                         sg->length, qc->pad_len);
         }
 
-        if (!sg->length) {
-                sg_dma_address(sg) = 0;
+        if (trim_sg) {
+                qc->n_elem--;
                 goto skip_map;
         }
 
@@ -2753,9 +2760,9 @@ static int ata_sg_setup_one(struct ata_queued_cmd *qc)
         }
 
         sg_dma_address(sg) = dma_address;
-skip_map:
         sg_dma_len(sg) = sg->length;
 
+skip_map:
         DPRINTK("mapped buffer of %d bytes for %s\n", sg_dma_len(sg),
                 qc->tf.flags & ATA_TFLAG_WRITE ? "write" : "read");
 
@@ -3357,11 +3364,12 @@ static void ata_pio_error(struct ata_port *ap)
 {
         struct ata_queued_cmd *qc;
 
-        printk(KERN_WARNING "ata%u: PIO error\n", ap->id);
-
         qc = ata_qc_from_tag(ap, ap->active_tag);
         assert(qc != NULL);
 
+        if (qc->tf.command != ATA_CMD_PACKET)
+                printk(KERN_WARNING "ata%u: PIO error\n", ap->id);
+
         /* make sure qc->err_mask is available to 
          * know what's wrong and recover
          */
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index 07b1e7cc61df..59503c9ccac9 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -1708,6 +1708,8 @@ static int ata_dev_supports_fua(u16 *id)
 {
         unsigned char model[41], fw[9];
 
+        if (!libata_fua)
+                return 0;
         if (!ata_id_has_fua(id))
                 return 0;
 
diff --git a/drivers/scsi/libata.h b/drivers/scsi/libata.h
index e03ce48b7b4b..fddaf479a544 100644
--- a/drivers/scsi/libata.h
+++ b/drivers/scsi/libata.h
@@ -41,6 +41,7 @@ struct ata_scsi_args {
 
 /* libata-core.c */
 extern int atapi_enabled;
+extern int libata_fua;
 extern struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap,
                                       struct ata_device *dev);
 extern int ata_rwcmd_protocol(struct ata_queued_cmd *qc);
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index d101a8a6f4e8..7144674bc8e6 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -5049,7 +5049,7 @@ static struct pci_device_id megaraid_pci_tbl[] = {
 MODULE_DEVICE_TABLE(pci, megaraid_pci_tbl);
 
 static struct pci_driver megaraid_pci_driver = {
-        .name           = "megaraid",
+        .name           = "megaraid_legacy",
         .id_table       = megaraid_pci_tbl,
         .probe          = megaraid_probe_one,
         .remove         = __devexit_p(megaraid_remove_one),
diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h
index 4b3e0d6e5afa..4b75fe619d9c 100644
--- a/drivers/scsi/megaraid.h
+++ b/drivers/scsi/megaraid.h
@@ -5,7 +5,7 @@
 #include <linux/mutex.h>
 
 #define MEGARAID_VERSION        \
-        "v2.00.3 (Release Date: Wed Feb 19 08:51:30 EST 2003)\n"
+        "v2.00.4 (Release Date: Thu Feb 9 08:51:30 EST 2006)\n"
 
 /*
  * Driver features - change the values to enable or disable features in the
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c
index a487f414960e..4f39dd01936d 100644
--- a/drivers/scsi/megaraid/megaraid_sas.c
+++ b/drivers/scsi/megaraid/megaraid_sas.c
@@ -10,7 +10,7 @@
  *         2 of the License, or (at your option) any later version.
  *
  * FILE         : megaraid_sas.c
- * Version      : v00.00.02.02
+ * Version      : v00.00.02.04
  *
  * Authors:
  *      Sreenivas Bagalkote     <Sreenivas.Bagalkote@lsil.com>
@@ -60,6 +60,12 @@ static struct pci_device_id megasas_pci_table[] = {
          PCI_ANY_ID,
          },
         {
+         PCI_VENDOR_ID_LSI_LOGIC,
+         PCI_DEVICE_ID_LSI_SAS1078R, // ppc IOP
+         PCI_ANY_ID,
+         PCI_ANY_ID,
+        },
+        {
          PCI_VENDOR_ID_DELL,
          PCI_DEVICE_ID_DELL_PERC5, // xscale IOP
          PCI_ANY_ID,
@@ -199,6 +205,86 @@ static struct megasas_instance_template megasas_instance_template_xscale = {
 */
 
 /**
+*       The following functions are defined for ppc (deviceid : 0x60) 
+*       controllers
+*/
+
+/**
+ * megasas_enable_intr_ppc -    Enables interrupts
+ * @regs:                       MFI register set
+ */
+static inline void
+megasas_enable_intr_ppc(struct megasas_register_set __iomem * regs)
+{
+        writel(0xFFFFFFFF, &(regs)->outbound_doorbell_clear);
+    
+        writel(~0x80000004, &(regs)->outbound_intr_mask);
+
+        /* Dummy readl to force pci flush */
+        readl(&regs->outbound_intr_mask);
+}
+
+/**
+ * megasas_read_fw_status_reg_ppc - returns the current FW status value
+ * @regs:                       MFI register set
+ */
+static u32
+megasas_read_fw_status_reg_ppc(struct megasas_register_set __iomem * regs)
+{
+        return readl(&(regs)->outbound_scratch_pad);
+}
+
+/**
+ * megasas_clear_interrupt_ppc -        Check & clear interrupt
+ * @regs:                               MFI register set
+ */
+static int 
+megasas_clear_intr_ppc(struct megasas_register_set __iomem * regs)
+{
+        u32 status;
+        /*
+         * Check if it is our interrupt
+         */
+        status = readl(&regs->outbound_intr_status);
+
+        if (!(status & MFI_REPLY_1078_MESSAGE_INTERRUPT)) {
+                return 1;
+        }
+
+        /*
+         * Clear the interrupt by writing back the same value
+         */
+        writel(status, &regs->outbound_doorbell_clear);
+
+        return 0;
+}
+/**
+ * megasas_fire_cmd_ppc -       Sends command to the FW
+ * @frame_phys_addr :           Physical address of cmd
+ * @frame_count :               Number of frames for the command
+ * @regs :                      MFI register set
+ */
+static inline void 
+megasas_fire_cmd_ppc(dma_addr_t frame_phys_addr, u32 frame_count, struct megasas_register_set __iomem *regs)
+{
+        writel((frame_phys_addr | (frame_count<<1))|1, 
+                        &(regs)->inbound_queue_port);
+}
+
+static struct megasas_instance_template megasas_instance_template_ppc = {
+        
+        .fire_cmd = megasas_fire_cmd_ppc,
+        .enable_intr = megasas_enable_intr_ppc,
+        .clear_intr = megasas_clear_intr_ppc,
+        .read_fw_status_reg = megasas_read_fw_status_reg_ppc,
+};
+
+/**
+*       This is the end of set of functions & definitions
+*       specific to ppc (deviceid : 0x60) controllers
+*/
+
+/**
  * megasas_disable_intr -       Disables interrupts
  * @regs:                       MFI register set
  */
@@ -707,6 +793,20 @@ megasas_queue_command(struct scsi_cmnd *scmd, void (*done) (struct scsi_cmnd *))
         return 0;
 }
 
+static int megasas_slave_configure(struct scsi_device *sdev)
+{
+        /*
+         * Don't export physical disk devices to the disk driver.
+         *
+         * FIXME: Currently we don't export them to the midlayer at all.
+         *        That will be fixed once LSI engineers have audited the
+         *        firmware for possible issues.
+         */
+        if (sdev->channel < MEGASAS_MAX_PD_CHANNELS && sdev->type == TYPE_DISK)
+                return -ENXIO;
+        return 0;
+}
+
 /**
  * megasas_wait_for_outstanding -       Wait for all outstanding cmds
  * @instance:                           Adapter soft state
@@ -857,6 +957,7 @@ static struct scsi_host_template megasas_template = {
         .module = THIS_MODULE,
         .name = "LSI Logic SAS based MegaRAID driver",
         .proc_name = "megaraid_sas",
+        .slave_configure = megasas_slave_configure,
         .queuecommand = megasas_queue_command,
         .eh_device_reset_handler = megasas_reset_device,
         .eh_bus_reset_handler = megasas_reset_bus_host,
@@ -985,20 +1086,6 @@ megasas_complete_cmd(struct megasas_instance *instance, struct megasas_cmd *cmd,
                         break;
                 }
 
-                /*
-                 * Don't export physical disk devices to mid-layer.
-                 */
-                if (!MEGASAS_IS_LOGICAL(cmd->scmd) &&
-                    (hdr->cmd_status == MFI_STAT_OK) &&
-                    (cmd->scmd->cmnd[0] == INQUIRY)) {
-
-                        if (((*(u8 *) cmd->scmd->request_buffer) & 0x1F) ==
-                            TYPE_DISK) {
-                                cmd->scmd->result = DID_BAD_TARGET << 16;
-                                exception = 1;
-                        }
-                }
-
         case MFI_CMD_LD_READ:
         case MFI_CMD_LD_WRITE:
 
@@ -1607,7 +1694,17 @@ static int megasas_init_mfi(struct megasas_instance *instance)
 
         reg_set = instance->reg_set;
 
-        instance->instancet = &megasas_instance_template_xscale;
+        switch(instance->pdev->device)
+        {
+                case PCI_DEVICE_ID_LSI_SAS1078R:        
+                        instance->instancet = &megasas_instance_template_ppc;
+                        break;
+                case PCI_DEVICE_ID_LSI_SAS1064R:
+                case PCI_DEVICE_ID_DELL_PERC5:
+                default:
+                        instance->instancet = &megasas_instance_template_xscale;
+                        break;
+        }
 
         /*
          * We expect the FW state to be READY
@@ -1983,6 +2080,7 @@ static int megasas_io_attach(struct megasas_instance *instance)
         host->max_channel = MEGASAS_MAX_CHANNELS - 1;
         host->max_id = MEGASAS_MAX_DEV_PER_CHANNEL;
         host->max_lun = MEGASAS_MAX_LUN;
+        host->max_cmd_len = 16;
 
         /*
          * Notify the mid-layer about the new controller
diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
index d6d166c0663f..89639f0c38ef 100644
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -18,9 +18,9 @@
 /**
  * MegaRAID SAS Driver meta data
  */
-#define MEGASAS_VERSION                         "00.00.02.02"
-#define MEGASAS_RELDATE                         "Jan 23, 2006"
-#define MEGASAS_EXT_VERSION                     "Mon Jan 23 14:09:01 PST 2006"
+#define MEGASAS_VERSION                         "00.00.02.04"
+#define MEGASAS_RELDATE                         "Feb 03, 2006"
+#define MEGASAS_EXT_VERSION                     "Fri Feb 03 14:31:44 PST 2006"
 /*
  * =====================================
  * MegaRAID SAS MFI firmware definitions
@@ -553,31 +553,46 @@ struct megasas_ctrl_info {
 #define MFI_OB_INTR_STATUS_MASK                 0x00000002
 #define MFI_POLL_TIMEOUT_SECS                   10
 
+#define MFI_REPLY_1078_MESSAGE_INTERRUPT        0x80000000
+#define PCI_DEVICE_ID_LSI_SAS1078R              0x00000060
+ 
 struct megasas_register_set {
+        u32     reserved_0[4];                  /*0000h*/
 
-        u32 reserved_0[4];      /*0000h */
+        u32     inbound_msg_0;                  /*0010h*/
+        u32     inbound_msg_1;                  /*0014h*/
+        u32     outbound_msg_0;                 /*0018h*/
+        u32     outbound_msg_1;                 /*001Ch*/
 
-        u32 inbound_msg_0;      /*0010h */
-        u32 inbound_msg_1;      /*0014h */
-        u32 outbound_msg_0;     /*0018h */
-        u32 outbound_msg_1;     /*001Ch */
+        u32     inbound_doorbell;               /*0020h*/
+        u32     inbound_intr_status;            /*0024h*/
+        u32     inbound_intr_mask;              /*0028h*/
 
-        u32 inbound_doorbell;   /*0020h */
-        u32 inbound_intr_status;        /*0024h */
-        u32 inbound_intr_mask;  /*0028h */
+        u32     outbound_doorbell;              /*002Ch*/
+        u32     outbound_intr_status;           /*0030h*/
+        u32     outbound_intr_mask;             /*0034h*/
 
-        u32 outbound_doorbell;  /*002Ch */
-        u32 outbound_intr_status;       /*0030h */
-        u32 outbound_intr_mask; /*0034h */
+        u32     reserved_1[2];                  /*0038h*/
 
-        u32 reserved_1[2];      /*0038h */
+        u32     inbound_queue_port;             /*0040h*/
+        u32     outbound_queue_port;            /*0044h*/
 
-        u32 inbound_queue_port; /*0040h */
-        u32 outbound_queue_port;        /*0044h */
+        u32     reserved_2[22];                 /*0048h*/
 
-        u32 reserved_2;         /*004Ch */
+        u32     outbound_doorbell_clear;        /*00A0h*/
 
-        u32 index_registers[1004];      /*0050h */
+        u32     reserved_3[3];                  /*00A4h*/
+
+        u32     outbound_scratch_pad ;          /*00B0h*/
+
+        u32     reserved_4[3];                  /*00B4h*/
+
+        u32     inbound_low_queue_port ;        /*00C0h*/
+
+        u32     inbound_high_queue_port ;       /*00C4h*/
+
+        u32     reserved_5;                     /*00C8h*/
+        u32     index_registers[820];           /*00CCh*/
 
 } __attribute__ ((packed));
 
diff --git a/drivers/scsi/pcmcia/aha152x_stub.c b/drivers/scsi/pcmcia/aha152x_stub.c
index 0c9edb7051f4..5609847e254a 100644
--- a/drivers/scsi/pcmcia/aha152x_stub.c
+++ b/drivers/scsi/pcmcia/aha152x_stub.c
@@ -275,10 +275,8 @@ static int aha152x_resume(struct pcmcia_device *dev)
 
         link->state &= ~DEV_SUSPEND;
         if (link->state & DEV_CONFIG) {
-                Scsi_Cmnd tmp;
                 pcmcia_request_configuration(link->handle, &link->conf);
-                tmp.device->host = info->host;
-                aha152x_host_reset(&tmp);
+                aha152x_host_reset_host(info->host);
         }
 
         return 0;
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index b17ee62dd1a9..92b3e13e9061 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -7,7 +7,6 @@
 #include "qla_def.h"
 
 #include <linux/vmalloc.h>
-#include <scsi/scsi_transport_fc.h>
 
 /* SYSFS attributes --------------------------------------------------------- */
 
@@ -114,7 +113,7 @@ qla2x00_sysfs_read_nvram(struct kobject *kobj, char *buf, loff_t off,
             struct device, kobj)));
         unsigned long   flags;
 
-        if (!capable(CAP_SYS_ADMIN) || off != 0 || count != ha->nvram_size)
+        if (!capable(CAP_SYS_ADMIN) || off != 0)
                 return 0;
 
         /* Read NVRAM. */
@@ -123,7 +122,7 @@ qla2x00_sysfs_read_nvram(struct kobject *kobj, char *buf, loff_t off,
             ha->nvram_size);
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
-        return (count);
+        return ha->nvram_size;
 }
 
 static ssize_t
@@ -175,19 +174,150 @@ static struct bin_attribute sysfs_nvram_attr = {
                 .mode = S_IRUSR | S_IWUSR,
                 .owner = THIS_MODULE,
         },
-        .size = 0,
+        .size = 512,
         .read = qla2x00_sysfs_read_nvram,
         .write = qla2x00_sysfs_write_nvram,
 };
 
+static ssize_t
+qla2x00_sysfs_read_optrom(struct kobject *kobj, char *buf, loff_t off,
+    size_t count)
+{
+        struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,
+            struct device, kobj)));
+
+        if (ha->optrom_state != QLA_SREADING)
+                return 0;
+        if (off > ha->optrom_size)
+                return 0;
+        if (off + count > ha->optrom_size)
+                count = ha->optrom_size - off;
+
+        memcpy(buf, &ha->optrom_buffer[off], count);
+
+        return count;
+}
+
+static ssize_t
+qla2x00_sysfs_write_optrom(struct kobject *kobj, char *buf, loff_t off,
+    size_t count)
+{
+        struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,
+            struct device, kobj)));
+
+        if (ha->optrom_state != QLA_SWRITING)
+                return -EINVAL;
+        if (off > ha->optrom_size)
+                return -ERANGE;
+        if (off + count > ha->optrom_size)
+                count = ha->optrom_size - off;
+
+        memcpy(&ha->optrom_buffer[off], buf, count);
+
+        return count;
+}
+
+static struct bin_attribute sysfs_optrom_attr = {
+        .attr = {
+                .name = "optrom",
+                .mode = S_IRUSR | S_IWUSR,
+                .owner = THIS_MODULE,
+        },
+        .size = OPTROM_SIZE_24XX,
+        .read = qla2x00_sysfs_read_optrom,
+        .write = qla2x00_sysfs_write_optrom,
+};
+
+static ssize_t
+qla2x00_sysfs_write_optrom_ctl(struct kobject *kobj, char *buf, loff_t off,
+    size_t count)
+{
+        struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,
+            struct device, kobj)));
+        int val;
+
+        if (off)
+                return 0;
+
+        if (sscanf(buf, "%d", &val) != 1)
+                return -EINVAL;
+
+        switch (val) {
+        case 0:
+                if (ha->optrom_state != QLA_SREADING &&
+                    ha->optrom_state != QLA_SWRITING)
+                        break;
+
+                ha->optrom_state = QLA_SWAITING;
+                vfree(ha->optrom_buffer);
+                ha->optrom_buffer = NULL;
+                break;
+        case 1:
+                if (ha->optrom_state != QLA_SWAITING)
+                        break;
+
+                ha->optrom_state = QLA_SREADING;
+                ha->optrom_buffer = (uint8_t *)vmalloc(ha->optrom_size);
+                if (ha->optrom_buffer == NULL) {
+                        qla_printk(KERN_WARNING, ha,
+                            "Unable to allocate memory for optrom retrieval "
+                            "(%x).\n", ha->optrom_size);
+
+                        ha->optrom_state = QLA_SWAITING;
+                        return count;
+                }
+
+                memset(ha->optrom_buffer, 0, ha->optrom_size);
+                ha->isp_ops.read_optrom(ha, ha->optrom_buffer, 0,
+                    ha->optrom_size);
+                break;
+        case 2:
+                if (ha->optrom_state != QLA_SWAITING)
+                        break;
+
+                ha->optrom_state = QLA_SWRITING;
+                ha->optrom_buffer = (uint8_t *)vmalloc(ha->optrom_size);
+                if (ha->optrom_buffer == NULL) {
+                        qla_printk(KERN_WARNING, ha,
+                            "Unable to allocate memory for optrom update "
+                            "(%x).\n", ha->optrom_size);
+
+                        ha->optrom_state = QLA_SWAITING;
+                        return count;
+                }
+                memset(ha->optrom_buffer, 0, ha->optrom_size);
+                break;
+        case 3:
+                if (ha->optrom_state != QLA_SWRITING)
+                        break;
+
+                ha->isp_ops.write_optrom(ha, ha->optrom_buffer, 0,
+                    ha->optrom_size);
+                break;
+        }
+        return count;
+}
+
+static struct bin_attribute sysfs_optrom_ctl_attr = {
+        .attr = {
+                .name = "optrom_ctl",
+                .mode = S_IWUSR,
+                .owner = THIS_MODULE,
+        },
+        .size = 0,
+        .write = qla2x00_sysfs_write_optrom_ctl,
+};
+
 void
 qla2x00_alloc_sysfs_attr(scsi_qla_host_t *ha)
 {
         struct Scsi_Host *host = ha->host;
 
         sysfs_create_bin_file(&host->shost_gendev.kobj, &sysfs_fw_dump_attr);
-        sysfs_nvram_attr.size = ha->nvram_size;
         sysfs_create_bin_file(&host->shost_gendev.kobj, &sysfs_nvram_attr);
+        sysfs_create_bin_file(&host->shost_gendev.kobj, &sysfs_optrom_attr);
+        sysfs_create_bin_file(&host->shost_gendev.kobj,
+            &sysfs_optrom_ctl_attr);
 }
 
 void
@@ -197,6 +327,12 @@ qla2x00_free_sysfs_attr(scsi_qla_host_t *ha)
 
         sysfs_remove_bin_file(&host->shost_gendev.kobj, &sysfs_fw_dump_attr);
         sysfs_remove_bin_file(&host->shost_gendev.kobj, &sysfs_nvram_attr);
+        sysfs_remove_bin_file(&host->shost_gendev.kobj, &sysfs_optrom_attr);
+        sysfs_remove_bin_file(&host->shost_gendev.kobj,
+            &sysfs_optrom_ctl_attr);
+
+        if (ha->beacon_blink_led == 1)
+                ha->isp_ops.beacon_off(ha);
 }
 
 /* Scsi_Host attributes. */
@@ -384,6 +520,50 @@ qla2x00_zio_timer_store(struct class_device *cdev, const char *buf,
         return strlen(buf);
 }
 
+static ssize_t
+qla2x00_beacon_show(struct class_device *cdev, char *buf)
+{
+        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        int len = 0;
+
+        if (ha->beacon_blink_led)
+                len += snprintf(buf + len, PAGE_SIZE-len, "Enabled\n");
+        else
+                len += snprintf(buf + len, PAGE_SIZE-len, "Disabled\n");
+        return len;
+}
+
+static ssize_t
+qla2x00_beacon_store(struct class_device *cdev, const char *buf,
+    size_t count)
+{
+        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        int val = 0;
+        int rval;
+
+        if (IS_QLA2100(ha) || IS_QLA2200(ha))
+                return -EPERM;
+
+        if (test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags)) {
+                qla_printk(KERN_WARNING, ha,
+                    "Abort ISP active -- ignoring beacon request.\n");
+                return -EBUSY;
+        }
+
+        if (sscanf(buf, "%d", &val) != 1)
+                return -EINVAL;
+
+        if (val)
+                rval = ha->isp_ops.beacon_on(ha);
+        else
+                rval = ha->isp_ops.beacon_off(ha);
+
+        if (rval != QLA_SUCCESS)
+                count = 0;
+
+        return count;
+}
+
 static CLASS_DEVICE_ATTR(driver_version, S_IRUGO, qla2x00_drvr_version_show,
         NULL);
 static CLASS_DEVICE_ATTR(fw_version, S_IRUGO, qla2x00_fw_version_show, NULL);
@@ -398,6 +578,8 @@ static CLASS_DEVICE_ATTR(zio, S_IRUGO | S_IWUSR, qla2x00_zio_show,
     qla2x00_zio_store);
 static CLASS_DEVICE_ATTR(zio_timer, S_IRUGO | S_IWUSR, qla2x00_zio_timer_show,
     qla2x00_zio_timer_store);
+static CLASS_DEVICE_ATTR(beacon, S_IRUGO | S_IWUSR, qla2x00_beacon_show,
+    qla2x00_beacon_store);
 
 struct class_device_attribute *qla2x00_host_attrs[] = {
         &class_device_attr_driver_version,
@@ -411,6 +593,7 @@ struct class_device_attribute *qla2x00_host_attrs[] = {
         &class_device_attr_state,
         &class_device_attr_zio,
         &class_device_attr_zio_timer,
+        &class_device_attr_beacon,
         NULL,
 };
 
@@ -426,6 +609,49 @@ qla2x00_get_host_port_id(struct Scsi_Host *shost)
 }
 
 static void
+qla2x00_get_host_speed(struct Scsi_Host *shost)
+{
+        scsi_qla_host_t *ha = to_qla_host(shost);
+        uint32_t speed = 0;
+
+        switch (ha->link_data_rate) {
+        case LDR_1GB:
+                speed = 1;
+                break;
+        case LDR_2GB:
+                speed = 2;
+                break;
+        case LDR_4GB:
+                speed = 4;
+                break;
+        }
+        fc_host_speed(shost) = speed;
+}
+
+static void
+qla2x00_get_host_port_type(struct Scsi_Host *shost)
+{
+        scsi_qla_host_t *ha = to_qla_host(shost);
+        uint32_t port_type = FC_PORTTYPE_UNKNOWN;
+
+        switch (ha->current_topology) {
+        case ISP_CFG_NL:
+                port_type = FC_PORTTYPE_LPORT;
+                break;
+        case ISP_CFG_FL:
+                port_type = FC_PORTTYPE_NLPORT;
+                break;
+        case ISP_CFG_N:
+                port_type = FC_PORTTYPE_PTP;
+                break;
+        case ISP_CFG_F:
+                port_type = FC_PORTTYPE_NPORT;
+                break;
+        }
+        fc_host_port_type(shost) = port_type;
+}
+
+static void
 qla2x00_get_starget_node_name(struct scsi_target *starget)
 {
         struct Scsi_Host *host = dev_to_shost(starget->dev.parent);
@@ -512,6 +738,41 @@ qla2x00_issue_lip(struct Scsi_Host *shost)
         return 0;
 }
 
+static struct fc_host_statistics *
+qla2x00_get_fc_host_stats(struct Scsi_Host *shost)
+{
+        scsi_qla_host_t *ha = to_qla_host(shost);
+        int rval;
+        uint16_t mb_stat[1];
+        link_stat_t stat_buf;
+        struct fc_host_statistics *pfc_host_stat;
+
+        pfc_host_stat = &ha->fc_host_stat;
+        memset(pfc_host_stat, -1, sizeof(struct fc_host_statistics));
+
+        if (IS_QLA24XX(ha) || IS_QLA25XX(ha)) {
+                rval = qla24xx_get_isp_stats(ha, (uint32_t *)&stat_buf,
+                    sizeof(stat_buf) / 4, mb_stat);
+        } else {
+                rval = qla2x00_get_link_status(ha, ha->loop_id, &stat_buf,
+                    mb_stat);
+        }
+        if (rval != 0) {
+                qla_printk(KERN_WARNING, ha,
+                    "Unable to retrieve host statistics (%d).\n", mb_stat[0]);
+                return pfc_host_stat;
+        }
+
+        pfc_host_stat->link_failure_count = stat_buf.link_fail_cnt;
+        pfc_host_stat->loss_of_sync_count = stat_buf.loss_sync_cnt;
+        pfc_host_stat->loss_of_signal_count = stat_buf.loss_sig_cnt;
+        pfc_host_stat->prim_seq_protocol_err_count = stat_buf.prim_seq_err_cnt;
+        pfc_host_stat->invalid_tx_word_count = stat_buf.inval_xmit_word_cnt;
+        pfc_host_stat->invalid_crc_count = stat_buf.inval_crc_cnt;
+
+        return pfc_host_stat;
+}
+
 struct fc_function_template qla2xxx_transport_functions = {
 
         .show_host_node_name = 1,
@@ -520,6 +781,10 @@ struct fc_function_template qla2xxx_transport_functions = {
 
         .get_host_port_id = qla2x00_get_host_port_id,
         .show_host_port_id = 1,
+        .get_host_speed = qla2x00_get_host_speed,
+        .show_host_speed = 1,
+        .get_host_port_type = qla2x00_get_host_port_type,
+        .show_host_port_type = 1,
 
         .dd_fcrport_size = sizeof(struct fc_port *),
         .show_rport_supported_classes = 1,
@@ -536,6 +801,7 @@ struct fc_function_template qla2xxx_transport_functions = {
         .show_rport_dev_loss_tmo = 1,
 
         .issue_fc_host_lip = qla2x00_issue_lip,
+        .get_fc_host_stats = qla2x00_get_fc_host_stats,
 };
 
 void
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index bad066e5772a..b31a03bbd14f 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -29,6 +29,7 @@
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_transport_fc.h>
 
 #if defined(CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE)
 #if defined(CONFIG_SCSI_QLA21XX) || defined(CONFIG_SCSI_QLA21XX_MODULE)
@@ -181,6 +182,13 @@
 #define WRT_REG_DWORD(addr, data)       writel(data,addr)
 
 /*
+ * The ISP2312 v2 chip cannot access the FLASH/GPIO registers via MMIO in an
+ * 133Mhz slot.
+ */
+#define RD_REG_WORD_PIO(addr)           (inw((unsigned long)addr))
+#define WRT_REG_WORD_PIO(addr, data)    (outw(data,(unsigned long)addr))
+
+/*
  * Fibre Channel device definitions.
  */
 #define WWN_SIZE                8       /* Size of WWPN, WWN & WWNN */
@@ -432,6 +440,9 @@ struct device_reg_2xxx {
 #define GPIO_LED_GREEN_ON_AMBER_OFF     0x0040
 #define GPIO_LED_GREEN_OFF_AMBER_ON     0x0080
 #define GPIO_LED_GREEN_ON_AMBER_ON      0x00C0
+#define GPIO_LED_ALL_OFF                0x0000
+#define GPIO_LED_RED_ON_OTHER_OFF       0x0001  /* isp2322 */
+#define GPIO_LED_RGA_ON                 0x00C1  /* isp2322: red green amber */
 
         union {
                 struct {
@@ -2199,6 +2210,15 @@ struct isp_operations {
 
         void (*fw_dump) (struct scsi_qla_host *, int);
         void (*ascii_fw_dump) (struct scsi_qla_host *);
+
+        int (*beacon_on) (struct scsi_qla_host *);
+        int (*beacon_off) (struct scsi_qla_host *);
+        void (*beacon_blink) (struct scsi_qla_host *);
+
+        uint8_t * (*read_optrom) (struct scsi_qla_host *, uint8_t *,
+                uint32_t, uint32_t);
+        int (*write_optrom) (struct scsi_qla_host *, uint8_t *, uint32_t,
+                uint32_t);
 };
 
 /*
@@ -2331,6 +2351,10 @@ typedef struct scsi_qla_host {
         uint16_t        min_external_loopid;    /* First external loop Id */
 
         uint16_t        link_data_rate;         /* F/W operating speed */
+#define LDR_1GB         0
+#define LDR_2GB         1
+#define LDR_4GB         3
+#define LDR_UNKNOWN     0xFFFF
 
         uint8_t         current_topology;
         uint8_t         prev_topology;
@@ -2486,12 +2510,26 @@ typedef struct scsi_qla_host {
         uint8_t         *port_name;
         uint32_t    isp_abort_cnt;
 
+        /* Option ROM information. */
+        char            *optrom_buffer;
+        uint32_t        optrom_size;
+        int             optrom_state;
+#define QLA_SWAITING    0
+#define QLA_SREADING    1
+#define QLA_SWRITING    2
+
         /* Needed for BEACON */
         uint16_t        beacon_blink_led;
-        uint16_t        beacon_green_on;
+        uint8_t         beacon_color_state;
+#define QLA_LED_GRN_ON          0x01
+#define QLA_LED_YLW_ON          0x02
+#define QLA_LED_ABR_ON          0x04
+#define QLA_LED_ALL_ON          0x07    /* yellow, green, amber. */
+                                        /* ISP2322: red, green, amber. */
 
         uint16_t        zio_mode;
         uint16_t        zio_timer;
+        struct fc_host_statistics fc_host_stat;
 } scsi_qla_host_t;
 
 
@@ -2557,7 +2595,9 @@ struct _qla2x00stats  {
 /*
  * Flash support definitions
  */
-#define FLASH_IMAGE_SIZE        131072
+#define OPTROM_SIZE_2300        0x20000
+#define OPTROM_SIZE_2322        0x100000
+#define OPTROM_SIZE_24XX        0x100000
 
 #include "qla_gbl.h"
 #include "qla_dbg.h"
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index 35266bd5d538..ffdc2680f049 100644
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -75,12 +75,12 @@ extern void qla2x00_cmd_timeout(srb_t *);
 extern void qla2x00_mark_device_lost(scsi_qla_host_t *, fc_port_t *, int, int);
 extern void qla2x00_mark_all_devices_lost(scsi_qla_host_t *, int);
 
-extern void qla2x00_blink_led(scsi_qla_host_t *);
-
 extern int qla2x00_down_timeout(struct semaphore *, unsigned long);
 
 extern struct fw_blob *qla2x00_request_firmware(scsi_qla_host_t *);
 
+extern int qla2x00_wait_for_hba_online(scsi_qla_host_t *);
+
 /*
  * Global Function Prototypes in qla_iocb.c source file.
  */
@@ -185,6 +185,13 @@ qla2x00_get_resource_cnts(scsi_qla_host_t *, uint16_t *, uint16_t *, uint16_t *,
 extern int
 qla2x00_get_fcal_position_map(scsi_qla_host_t *ha, char *pos_map);
 
+extern int
+qla2x00_get_link_status(scsi_qla_host_t *, uint16_t, link_stat_t *,
+    uint16_t *);
+
+extern int
+qla24xx_get_isp_stats(scsi_qla_host_t *, uint32_t *, uint32_t, uint16_t *);
+
 extern int qla24xx_abort_command(scsi_qla_host_t *, srb_t *);
 extern int qla24xx_abort_target(fc_port_t *);
 
@@ -228,6 +235,22 @@ extern int qla2x00_write_nvram_data(scsi_qla_host_t *, uint8_t *, uint32_t,
 extern int qla24xx_write_nvram_data(scsi_qla_host_t *, uint8_t *, uint32_t,
     uint32_t);
 
+extern int qla2x00_beacon_on(struct scsi_qla_host *);
+extern int qla2x00_beacon_off(struct scsi_qla_host *);
+extern void qla2x00_beacon_blink(struct scsi_qla_host *);
+extern int qla24xx_beacon_on(struct scsi_qla_host *);
+extern int qla24xx_beacon_off(struct scsi_qla_host *);
+extern void qla24xx_beacon_blink(struct scsi_qla_host *);
+
+extern uint8_t *qla2x00_read_optrom_data(struct scsi_qla_host *, uint8_t *,
+    uint32_t, uint32_t);
+extern int qla2x00_write_optrom_data(struct scsi_qla_host *, uint8_t *,
+    uint32_t, uint32_t);
+extern uint8_t *qla24xx_read_optrom_data(struct scsi_qla_host *, uint8_t *,
+    uint32_t, uint32_t);
+extern int qla24xx_write_optrom_data(struct scsi_qla_host *, uint8_t *,
+    uint32_t, uint32_t);
+
 /*
  * Global Function Prototypes in qla_dbg.c source file.
  */
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index e67bb0997818..634ee174bff2 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -8,7 +8,6 @@
 
 #include <linux/delay.h>
 #include <linux/vmalloc.h>
-#include <scsi/scsi_transport_fc.h>
 
 #include "qla_devtbl.h"
 
diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
index 7ec0b8d6f07b..6544b6d0891d 100644
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
@@ -814,6 +814,7 @@ qla24xx_start_scsi(srb_t *sp)
         cmd_pkt->port_id[2] = sp->fcport->d_id.b.domain;
 
         int_to_scsilun(sp->cmd->device->lun, &cmd_pkt->lun);
+        host_to_fcp_swap((uint8_t *)&cmd_pkt->lun, sizeof(cmd_pkt->lun));
 
         /* Load SCSI command packet. */
         memcpy(cmd_pkt->fcp_cdb, cmd->cmnd, cmd->cmd_len);
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 71a46fcee8cc..42aa7a7c1a73 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -402,9 +402,9 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
                 break;
 
         case MBA_LOOP_UP:               /* Loop Up Event */
-                ha->link_data_rate = 0;
                 if (IS_QLA2100(ha) || IS_QLA2200(ha)) {
                         link_speed = link_speeds[0];
+                        ha->link_data_rate = LDR_1GB;
                 } else {
                         link_speed = link_speeds[LS_UNKNOWN];
                         if (mb[1] < 5)
@@ -436,7 +436,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
                 }
 
                 ha->flags.management_server_logged_in = 0;
-                ha->link_data_rate = 0;
+                ha->link_data_rate = LDR_UNKNOWN;
                 if (ql2xfdmienable)
                         set_bit(REGISTER_FDMI_NEEDED, &ha->dpc_flags);
 
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 3099b379de9d..363dfdd042b0 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -7,7 +7,6 @@
 #include "qla_def.h"
 
 #include <linux/delay.h>
-#include <scsi/scsi_transport_fc.h>
 
 static void
 qla2x00_mbx_sem_timeout(unsigned long data)
@@ -1874,7 +1873,8 @@ qla2x00_get_id_list(scsi_qla_host_t *ha, void *id_list, dma_addr_t id_list_dma,
                 mcp->mb[3] = LSW(id_list_dma);
                 mcp->mb[6] = MSW(MSD(id_list_dma));
                 mcp->mb[7] = LSW(MSD(id_list_dma));
-                mcp->out_mb |= MBX_7|MBX_6|MBX_3|MBX_2;
+                mcp->mb[8] = 0;
+                mcp->out_mb |= MBX_8|MBX_7|MBX_6|MBX_3|MBX_2;
         } else {
                 mcp->mb[1] = MSW(id_list_dma);
                 mcp->mb[2] = LSW(id_list_dma);
@@ -2017,8 +2017,109 @@ qla2x00_get_fcal_position_map(scsi_qla_host_t *ha, char *pos_map)
 
         return rval;
 }
+#endif
+
+/*
+ * qla2x00_get_link_status
+ *
+ * Input:
+ *      ha = adapter block pointer.
+ *      loop_id = device loop ID.
+ *      ret_buf = pointer to link status return buffer.
+ *
+ * Returns:
+ *      0 = success.
+ *      BIT_0 = mem alloc error.
+ *      BIT_1 = mailbox error.
+ */
+int
+qla2x00_get_link_status(scsi_qla_host_t *ha, uint16_t loop_id,
+    link_stat_t *ret_buf, uint16_t *status)
+{
+        int rval;
+        mbx_cmd_t mc;
+        mbx_cmd_t *mcp = &mc;
+        link_stat_t *stat_buf;
+        dma_addr_t stat_buf_dma;
+
+        DEBUG11(printk("%s(%ld): entered.\n", __func__, ha->host_no);)
+
+        stat_buf = dma_pool_alloc(ha->s_dma_pool, GFP_ATOMIC, &stat_buf_dma);
+        if (stat_buf == NULL) {
+                DEBUG2_3_11(printk("%s(%ld): Failed to allocate memory.\n",
+                    __func__, ha->host_no));
+                return BIT_0;
+        }
+        memset(stat_buf, 0, sizeof(link_stat_t));
+
+        mcp->mb[0] = MBC_GET_LINK_STATUS;
+        mcp->mb[2] = MSW(stat_buf_dma);
+        mcp->mb[3] = LSW(stat_buf_dma);
+        mcp->mb[6] = MSW(MSD(stat_buf_dma));
+        mcp->mb[7] = LSW(MSD(stat_buf_dma));
+        mcp->out_mb = MBX_7|MBX_6|MBX_3|MBX_2|MBX_0;
+        mcp->in_mb = MBX_0;
+        if (IS_QLA24XX(ha) || IS_QLA25XX(ha)) {
+                mcp->mb[1] = loop_id;
+                mcp->mb[4] = 0;
+                mcp->mb[10] = 0;
+                mcp->out_mb |= MBX_10|MBX_4|MBX_1;
+                mcp->in_mb |= MBX_1;
+        } else if (HAS_EXTENDED_IDS(ha)) {
+                mcp->mb[1] = loop_id;
+                mcp->mb[10] = 0;
+                mcp->out_mb |= MBX_10|MBX_1;
+        } else {
+                mcp->mb[1] = loop_id << 8;
+                mcp->out_mb |= MBX_1;
+        }
+        mcp->tov = 30;
+        mcp->flags = IOCTL_CMD;
+        rval = qla2x00_mailbox_command(ha, mcp);
+
+        if (rval == QLA_SUCCESS) {
+                if (mcp->mb[0] != MBS_COMMAND_COMPLETE) {
+                        DEBUG2_3_11(printk("%s(%ld): cmd failed. mbx0=%x.\n",
+                            __func__, ha->host_no, mcp->mb[0]);)
+                        status[0] = mcp->mb[0];
+                        rval = BIT_1;
+                } else {
+                        /* copy over data -- firmware data is LE. */
+                        ret_buf->link_fail_cnt =
+                            le32_to_cpu(stat_buf->link_fail_cnt);
+                        ret_buf->loss_sync_cnt =
+                            le32_to_cpu(stat_buf->loss_sync_cnt);
+                        ret_buf->loss_sig_cnt =
+                            le32_to_cpu(stat_buf->loss_sig_cnt);
+                        ret_buf->prim_seq_err_cnt =
+                            le32_to_cpu(stat_buf->prim_seq_err_cnt);
+                        ret_buf->inval_xmit_word_cnt =
+                            le32_to_cpu(stat_buf->inval_xmit_word_cnt);
+                        ret_buf->inval_crc_cnt =
+                            le32_to_cpu(stat_buf->inval_crc_cnt);
+
+                        DEBUG11(printk("%s(%ld): stat dump: fail_cnt=%d "
+                            "loss_sync=%d loss_sig=%d seq_err=%d "
+                            "inval_xmt_word=%d inval_crc=%d.\n", __func__,
+                            ha->host_no, stat_buf->link_fail_cnt,
+                            stat_buf->loss_sync_cnt, stat_buf->loss_sig_cnt,
+                            stat_buf->prim_seq_err_cnt,
+                            stat_buf->inval_xmit_word_cnt,
+                            stat_buf->inval_crc_cnt);)
+                }
+        } else {
+                /* Failed. */
+                DEBUG2_3_11(printk("%s(%ld): failed=%x.\n", __func__,
+                    ha->host_no, rval);)
+                rval = BIT_1;
+        }
+
+        dma_pool_free(ha->s_dma_pool, stat_buf, stat_buf_dma);
 
-uint8_t
+        return rval;
+}
+
+int
 qla24xx_get_isp_stats(scsi_qla_host_t *ha, uint32_t *dwbuf, uint32_t dwords,
     uint16_t *status)
 {
@@ -2080,7 +2181,6 @@ qla24xx_get_isp_stats(scsi_qla_host_t *ha, uint32_t *dwbuf, uint32_t dwords,
 
         return rval;
 }
-#endif
 
 int
 qla24xx_abort_command(scsi_qla_host_t *ha, srb_t *sp)
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 5866a7c706a8..9f91f1a20542 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -366,6 +366,12 @@ qla2x00_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))
                 goto qc_fail_command;
         }
 
+        /* Close window on fcport/rport state-transitioning. */
+        if (!*(fc_port_t **)rport->dd_data) {
+                cmd->result = DID_IMM_RETRY << 16;
+                goto qc_fail_command;
+        }
+
         if (atomic_read(&fcport->state) != FCS_ONLINE) {
                 if (atomic_read(&fcport->state) == FCS_DEVICE_DEAD ||
                     atomic_read(&ha->loop_state) == LOOP_DEAD) {
@@ -421,6 +427,12 @@ qla24xx_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))
                 goto qc24_fail_command;
         }
 
+        /* Close window on fcport/rport state-transitioning. */
+        if (!*(fc_port_t **)rport->dd_data) {
+                cmd->result = DID_IMM_RETRY << 16;
+                goto qc24_fail_command;
+        }
+
         if (atomic_read(&fcport->state) != FCS_ONLINE) {
                 if (atomic_read(&fcport->state) == FCS_DEVICE_DEAD ||
                     atomic_read(&ha->loop_state) == LOOP_DEAD) {
@@ -513,7 +525,7 @@ qla2x00_eh_wait_on_command(scsi_qla_host_t *ha, struct scsi_cmnd *cmd)
  *    Success (Adapter is online) : 0
  *    Failed  (Adapter is offline/disabled) : 1
  */
-static int
+int
 qla2x00_wait_for_hba_online(scsi_qla_host_t *ha)
 {
         int             return_status;
@@ -1312,6 +1324,8 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)
         ha->ports = MAX_BUSES;
         ha->init_cb_size = sizeof(init_cb_t);
         ha->mgmt_svr_loop_id = MANAGEMENT_SERVER;
+        ha->link_data_rate = LDR_UNKNOWN;
+        ha->optrom_size = OPTROM_SIZE_2300;
 
         /* Assign ISP specific operations. */
         ha->isp_ops.pci_config          = qla2100_pci_config;
@@ -1339,6 +1353,8 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)
         ha->isp_ops.write_nvram         = qla2x00_write_nvram_data;
         ha->isp_ops.fw_dump             = qla2100_fw_dump;
         ha->isp_ops.ascii_fw_dump       = qla2100_ascii_fw_dump;
+        ha->isp_ops.read_optrom         = qla2x00_read_optrom_data;
+        ha->isp_ops.write_optrom        = qla2x00_write_optrom_data;
         if (IS_QLA2100(ha)) {
                 host->max_id = MAX_TARGETS_2100;
                 ha->mbx_count = MAILBOX_REGISTER_COUNT_2100;
@@ -1364,7 +1380,12 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)
                 ha->isp_ops.intr_handler = qla2300_intr_handler;
                 ha->isp_ops.fw_dump = qla2300_fw_dump;
                 ha->isp_ops.ascii_fw_dump = qla2300_ascii_fw_dump;
+                ha->isp_ops.beacon_on = qla2x00_beacon_on;
+                ha->isp_ops.beacon_off = qla2x00_beacon_off;
+                ha->isp_ops.beacon_blink = qla2x00_beacon_blink;
                 ha->gid_list_info_size = 6;
+                if (IS_QLA2322(ha) || IS_QLA6322(ha))
+                        ha->optrom_size = OPTROM_SIZE_2322;
         } else if (IS_QLA24XX(ha) || IS_QLA25XX(ha)) {
                 host->max_id = MAX_TARGETS_2200;
                 ha->mbx_count = MAILBOX_REGISTER_COUNT;
@@ -1400,7 +1421,13 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)
                 ha->isp_ops.write_nvram = qla24xx_write_nvram_data;
                 ha->isp_ops.fw_dump = qla24xx_fw_dump;
                 ha->isp_ops.ascii_fw_dump = qla24xx_ascii_fw_dump;
+                ha->isp_ops.read_optrom = qla24xx_read_optrom_data;
+                ha->isp_ops.write_optrom = qla24xx_write_optrom_data;
+                ha->isp_ops.beacon_on = qla24xx_beacon_on;
+                ha->isp_ops.beacon_off = qla24xx_beacon_off;
+                ha->isp_ops.beacon_blink = qla24xx_beacon_blink;
                 ha->gid_list_info_size = 8;
+                ha->optrom_size = OPTROM_SIZE_24XX;
         }
         host->can_queue = ha->request_q_length + 128;
 
@@ -1657,11 +1684,13 @@ qla2x00_schedule_rport_del(struct scsi_qla_host *ha, fc_port_t *fcport,
                 spin_lock_irqsave(&fcport->rport_lock, flags);
                 fcport->drport = rport;
                 fcport->rport = NULL;
+                *(fc_port_t **)rport->dd_data = NULL;
                 spin_unlock_irqrestore(&fcport->rport_lock, flags);
                 set_bit(FCPORT_UPDATE_NEEDED, &ha->dpc_flags);
         } else {
                 spin_lock_irqsave(&fcport->rport_lock, flags);
                 fcport->rport = NULL;
+                *(fc_port_t **)rport->dd_data = NULL;
                 spin_unlock_irqrestore(&fcport->rport_lock, flags);
                 fc_remote_port_delete(rport);
         }
@@ -2066,6 +2095,8 @@ qla2x00_mem_free(scsi_qla_host_t *ha)
         ha->fw_dumped = 0;
         ha->fw_dump_reading = 0;
         ha->fw_dump_buffer = NULL;
+
+        vfree(ha->optrom_buffer);
 }
 
 /*
@@ -2314,6 +2345,9 @@ qla2x00_do_dpc(void *data)
                 if (!ha->interrupts_on)
                         ha->isp_ops.enable_intrs(ha);
 
+                if (test_and_clear_bit(BEACON_BLINK_NEEDED, &ha->dpc_flags))
+                        ha->isp_ops.beacon_blink(ha);
+
                 ha->dpc_active = 0;
         } /* End of while(1) */
 
@@ -2491,6 +2525,12 @@ qla2x00_timer(scsi_qla_host_t *ha)
                     atomic_read(&ha->loop_down_timer)));
         }
 
+        /* Check if beacon LED needs to be blinked */
+        if (ha->beacon_blink_led == 1) {
+                set_bit(BEACON_BLINK_NEEDED, &ha->dpc_flags);
+                start_dpc++;
+        }
+
         /* Schedule the DPC routine if needed */
         if ((test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags) ||
             test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags) ||
@@ -2499,6 +2539,7 @@ qla2x00_timer(scsi_qla_host_t *ha)
             start_dpc ||
             test_bit(LOGIN_RETRY_NEEDED, &ha->dpc_flags) ||
             test_bit(RESET_MARKER_NEEDED, &ha->dpc_flags) ||
+            test_bit(BEACON_BLINK_NEEDED, &ha->dpc_flags) ||
             test_bit(RELOGIN_NEEDED, &ha->dpc_flags)) &&
             ha->dpc_wait && !ha->dpc_active) {
 
diff --git a/drivers/scsi/qla2xxx/qla_rscn.c b/drivers/scsi/qla2xxx/qla_rscn.c
index 2c3342108dd8..b70bebe18c01 100644
--- a/drivers/scsi/qla2xxx/qla_rscn.c
+++ b/drivers/scsi/qla2xxx/qla_rscn.c
@@ -6,8 +6,6 @@
  */
 #include "qla_def.h"
 
-#include <scsi/scsi_transport_fc.h>
-
 /**
  * IO descriptor handle definitions.
  *
diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
index f4d755a643e4..3866a5760f15 100644
--- a/drivers/scsi/qla2xxx/qla_sup.c
+++ b/drivers/scsi/qla2xxx/qla_sup.c
@@ -695,3 +695,966 @@ qla24xx_write_nvram_data(scsi_qla_host_t *ha, uint8_t *buf, uint32_t naddr,
 
         return ret;
 }
+
+
+static inline void
+qla2x00_flip_colors(scsi_qla_host_t *ha, uint16_t *pflags)
+{
+        if (IS_QLA2322(ha)) {
+                /* Flip all colors. */
+                if (ha->beacon_color_state == QLA_LED_ALL_ON) {
+                        /* Turn off. */
+                        ha->beacon_color_state = 0;
+                        *pflags = GPIO_LED_ALL_OFF;
+                } else {
+                        /* Turn on. */
+                        ha->beacon_color_state = QLA_LED_ALL_ON;
+                        *pflags = GPIO_LED_RGA_ON;
+                }
+        } else {
+                /* Flip green led only. */
+                if (ha->beacon_color_state == QLA_LED_GRN_ON) {
+                        /* Turn off. */
+                        ha->beacon_color_state = 0;
+                        *pflags = GPIO_LED_GREEN_OFF_AMBER_OFF;
+                } else {
+                        /* Turn on. */
+                        ha->beacon_color_state = QLA_LED_GRN_ON;
+                        *pflags = GPIO_LED_GREEN_ON_AMBER_OFF;
+                }
+        }
+}
+
+void
+qla2x00_beacon_blink(struct scsi_qla_host *ha)
+{
+        uint16_t gpio_enable;
+        uint16_t gpio_data;
+        uint16_t led_color = 0;
+        unsigned long flags;
+        struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
+
+        if (ha->pio_address)
+                reg = (struct device_reg_2xxx __iomem *)ha->pio_address;
+
+        spin_lock_irqsave(&ha->hardware_lock, flags);
+
+        /* Save the Original GPIOE. */
+        if (ha->pio_address) {
+                gpio_enable = RD_REG_WORD_PIO(&reg->gpioe);
+                gpio_data = RD_REG_WORD_PIO(&reg->gpiod);
+        } else {
+                gpio_enable = RD_REG_WORD(&reg->gpioe);
+                gpio_data = RD_REG_WORD(&reg->gpiod);
+        }
+
+        /* Set the modified gpio_enable values */
+        gpio_enable |= GPIO_LED_MASK;
+
+        if (ha->pio_address) {
+                WRT_REG_WORD_PIO(&reg->gpioe, gpio_enable);
+        } else {
+                WRT_REG_WORD(&reg->gpioe, gpio_enable);
+                RD_REG_WORD(&reg->gpioe);
+        }
+
+        qla2x00_flip_colors(ha, &led_color);
+
+        /* Clear out any previously set LED color. */
+        gpio_data &= ~GPIO_LED_MASK;
+
+        /* Set the new input LED color to GPIOD. */
+        gpio_data |= led_color;
+
+        /* Set the modified gpio_data values */
+        if (ha->pio_address) {
+                WRT_REG_WORD_PIO(&reg->gpiod, gpio_data);
+        } else {
+                WRT_REG_WORD(&reg->gpiod, gpio_data);
+                RD_REG_WORD(&reg->gpiod);
+        }
+
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+}
+
+int
+qla2x00_beacon_on(struct scsi_qla_host *ha)
+{
+        uint16_t gpio_enable;
+        uint16_t gpio_data;
+        unsigned long flags;
+        struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
+
+        ha->fw_options[1] &= ~FO1_SET_EMPHASIS_SWING;
+        ha->fw_options[1] |= FO1_DISABLE_GPIO6_7;
+
+        if (qla2x00_set_fw_options(ha, ha->fw_options) != QLA_SUCCESS) {
+                qla_printk(KERN_WARNING, ha,
+                    "Unable to update fw options (beacon on).\n");
+                return QLA_FUNCTION_FAILED;
+        }
+
+        if (ha->pio_address)
+                reg = (struct device_reg_2xxx __iomem *)ha->pio_address;
+
+        /* Turn off LEDs. */
+        spin_lock_irqsave(&ha->hardware_lock, flags);
+        if (ha->pio_address) {
+                gpio_enable = RD_REG_WORD_PIO(&reg->gpioe);
+                gpio_data = RD_REG_WORD_PIO(&reg->gpiod);
+        } else {
+                gpio_enable = RD_REG_WORD(&reg->gpioe);
+                gpio_data = RD_REG_WORD(&reg->gpiod);
+        }
+        gpio_enable |= GPIO_LED_MASK;
+
+        /* Set the modified gpio_enable values. */
+        if (ha->pio_address) {
+                WRT_REG_WORD_PIO(&reg->gpioe, gpio_enable);
+        } else {
+                WRT_REG_WORD(&reg->gpioe, gpio_enable);
+                RD_REG_WORD(&reg->gpioe);
+        }
+
+        /* Clear out previously set LED colour. */
+        gpio_data &= ~GPIO_LED_MASK;
+        if (ha->pio_address) {
+                WRT_REG_WORD_PIO(&reg->gpiod, gpio_data);
+        } else {
+                WRT_REG_WORD(&reg->gpiod, gpio_data);
+                RD_REG_WORD(&reg->gpiod);
+        }
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+
+        /*
+         * Let the per HBA timer kick off the blinking process based on
+         * the following flags. No need to do anything else now.
+         */
+        ha->beacon_blink_led = 1;
+        ha->beacon_color_state = 0;
+
+        return QLA_SUCCESS;
+}
+
+int
+qla2x00_beacon_off(struct scsi_qla_host *ha)
+{
+        int rval = QLA_SUCCESS;
+
+        ha->beacon_blink_led = 0;
+
+        /* Set the on flag so when it gets flipped it will be off. */
+        if (IS_QLA2322(ha))
+                ha->beacon_color_state = QLA_LED_ALL_ON;
+        else
+                ha->beacon_color_state = QLA_LED_GRN_ON;
+
+        ha->isp_ops.beacon_blink(ha);   /* This turns green LED off */
+
+        ha->fw_options[1] &= ~FO1_SET_EMPHASIS_SWING;
+        ha->fw_options[1] &= ~FO1_DISABLE_GPIO6_7;
+
+        rval = qla2x00_set_fw_options(ha, ha->fw_options);
+        if (rval != QLA_SUCCESS)
+                qla_printk(KERN_WARNING, ha,
+                    "Unable to update fw options (beacon off).\n");
+        return rval;
+}
+
+
+static inline void
+qla24xx_flip_colors(scsi_qla_host_t *ha, uint16_t *pflags)
+{
+        /* Flip all colors. */
+        if (ha->beacon_color_state == QLA_LED_ALL_ON) {
+                /* Turn off. */
+                ha->beacon_color_state = 0;
+                *pflags = 0;
+        } else {
+                /* Turn on. */
+                ha->beacon_color_state = QLA_LED_ALL_ON;
+                *pflags = GPDX_LED_YELLOW_ON | GPDX_LED_AMBER_ON;
+        }
+}
+
+void
+qla24xx_beacon_blink(struct scsi_qla_host *ha)
+{
+        uint16_t led_color = 0;
+        uint32_t gpio_data;
+        unsigned long flags;
+        struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;
+
+        /* Save the Original GPIOD. */
+        spin_lock_irqsave(&ha->hardware_lock, flags);
+        gpio_data = RD_REG_DWORD(&reg->gpiod);
+
+        /* Enable the gpio_data reg for update. */
+        gpio_data |= GPDX_LED_UPDATE_MASK;
+
+        WRT_REG_DWORD(&reg->gpiod, gpio_data);
+        gpio_data = RD_REG_DWORD(&reg->gpiod);
+
+        /* Set the color bits. */
+        qla24xx_flip_colors(ha, &led_color);
+
+        /* Clear out any previously set LED color. */
+        gpio_data &= ~GPDX_LED_COLOR_MASK;
+
+        /* Set the new input LED color to GPIOD. */
+        gpio_data |= led_color;
+
+        /* Set the modified gpio_data values. */
+        WRT_REG_DWORD(&reg->gpiod, gpio_data);
+        gpio_data = RD_REG_DWORD(&reg->gpiod);
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+}
+
+int
+qla24xx_beacon_on(struct scsi_qla_host *ha)
+{
+        uint32_t gpio_data;
+        unsigned long flags;
+        struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;
+
+        if (ha->beacon_blink_led == 0) {
+                /* Enable firmware for update */
+                ha->fw_options[1] |= ADD_FO1_DISABLE_GPIO_LED_CTRL;
+
+                if (qla2x00_set_fw_options(ha, ha->fw_options) != QLA_SUCCESS)
+                        return QLA_FUNCTION_FAILED;
+
+                if (qla2x00_get_fw_options(ha, ha->fw_options) !=
+                    QLA_SUCCESS) {
+                        qla_printk(KERN_WARNING, ha,
+                            "Unable to update fw options (beacon on).\n");
+                        return QLA_FUNCTION_FAILED;
+                }
+
+                spin_lock_irqsave(&ha->hardware_lock, flags);
+                gpio_data = RD_REG_DWORD(&reg->gpiod);
+
+                /* Enable the gpio_data reg for update. */
+                gpio_data |= GPDX_LED_UPDATE_MASK;
+                WRT_REG_DWORD(&reg->gpiod, gpio_data);
+                RD_REG_DWORD(&reg->gpiod);
+
+                spin_unlock_irqrestore(&ha->hardware_lock, flags);
+        }
+
+        /* So all colors blink together. */
+        ha->beacon_color_state = 0;
+
+        /* Let the per HBA timer kick off the blinking process. */
+        ha->beacon_blink_led = 1;
+
+        return QLA_SUCCESS;
+}
+
+int
+qla24xx_beacon_off(struct scsi_qla_host *ha)
+{
+        uint32_t gpio_data;
+        unsigned long flags;
+        struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;
+
+        ha->beacon_blink_led = 0;
+        ha->beacon_color_state = QLA_LED_ALL_ON;
+
+        ha->isp_ops.beacon_blink(ha);   /* Will flip to all off. */
+
+        /* Give control back to firmware. */
+        spin_lock_irqsave(&ha->hardware_lock, flags);
+        gpio_data = RD_REG_DWORD(&reg->gpiod);
+
+        /* Disable the gpio_data reg for update. */
+        gpio_data &= ~GPDX_LED_UPDATE_MASK;
+        WRT_REG_DWORD(&reg->gpiod, gpio_data);
+        RD_REG_DWORD(&reg->gpiod);
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+
+        ha->fw_options[1] &= ~ADD_FO1_DISABLE_GPIO_LED_CTRL;
+
+        if (qla2x00_set_fw_options(ha, ha->fw_options) != QLA_SUCCESS) {
+                qla_printk(KERN_WARNING, ha,
+                    "Unable to update fw options (beacon off).\n");
+                return QLA_FUNCTION_FAILED;
+        }
+
+        if (qla2x00_get_fw_options(ha, ha->fw_options) != QLA_SUCCESS) {
+                qla_printk(KERN_WARNING, ha,
+                    "Unable to get fw options (beacon off).\n");
+                return QLA_FUNCTION_FAILED;
+        }
+
+        return QLA_SUCCESS;
+}
+
+
+/*
+ * Flash support routines
+ */
+
+/**
+ * qla2x00_flash_enable() - Setup flash for reading and writing.
+ * @ha: HA context
+ */
+static void
+qla2x00_flash_enable(scsi_qla_host_t *ha)
+{
+        uint16_t data;
+        struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
+
+        data = RD_REG_WORD(&reg->ctrl_status);
+        data |= CSR_FLASH_ENABLE;
+        WRT_REG_WORD(&reg->ctrl_status, data);
+        RD_REG_WORD(&reg->ctrl_status);         /* PCI Posting. */
+}
+
+/**
+ * qla2x00_flash_disable() - Disable flash and allow RISC to run.
+ * @ha: HA context
+ */
+static void
+qla2x00_flash_disable(scsi_qla_host_t *ha)
+{
+        uint16_t data;
+        struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
+
+        data = RD_REG_WORD(&reg->ctrl_status);
+        data &= ~(CSR_FLASH_ENABLE);
+        WRT_REG_WORD(&reg->ctrl_status, data);
+        RD_REG_WORD(&reg->ctrl_status);         /* PCI Posting. */
+}
+
+/**
+ * qla2x00_read_flash_byte() - Reads a byte from flash
+ * @ha: HA context
+ * @addr: Address in flash to read
+ *
+ * A word is read from the chip, but, only the lower byte is valid.
+ *
+ * Returns the byte read from flash @addr.
+ */
+static uint8_t
+qla2x00_read_flash_byte(scsi_qla_host_t *ha, uint32_t addr)
+{
+        uint16_t data;
+        uint16_t bank_select;
+        struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
+
+        bank_select = RD_REG_WORD(&reg->ctrl_status);
+
+        if (IS_QLA2322(ha) || IS_QLA6322(ha)) {
+                /* Specify 64K address range: */
+                /*  clear out Module Select and Flash Address bits [19:16]. */
+                bank_select &= ~0xf8;
+                bank_select |= addr >> 12 & 0xf0;
+                bank_select |= CSR_FLASH_64K_BANK;
+                WRT_REG_WORD(&reg->ctrl_status, bank_select);
+                RD_REG_WORD(&reg->ctrl_status); /* PCI Posting. */
+
+                WRT_REG_WORD(&reg->flash_address, (uint16_t)addr);
+                data = RD_REG_WORD(&reg->flash_data);
+
+                return (uint8_t)data;
+        }
+
+        /* Setup bit 16 of flash address. */
+        if ((addr & BIT_16) && ((bank_select & CSR_FLASH_64K_BANK) == 0)) {
+                bank_select |= CSR_FLASH_64K_BANK;
+                WRT_REG_WORD(&reg->ctrl_status, bank_select);
+                RD_REG_WORD(&reg->ctrl_status); /* PCI Posting. */
+        } else if (((addr & BIT_16) == 0) &&
+            (bank_select & CSR_FLASH_64K_BANK)) {
+                bank_select &= ~(CSR_FLASH_64K_BANK);
+                WRT_REG_WORD(&reg->ctrl_status, bank_select);
+                RD_REG_WORD(&reg->ctrl_status); /* PCI Posting. */
+        }
+
+        /* Always perform IO mapped accesses to the FLASH registers. */
+        if (ha->pio_address) {
+                uint16_t data2;
+
+                reg = (struct device_reg_2xxx __iomem *)ha->pio_address;
+                WRT_REG_WORD_PIO(&reg->flash_address, (uint16_t)addr);
+                do {
+                        data = RD_REG_WORD_PIO(&reg->flash_data);
+                        barrier();
+                        cpu_relax();
+                        data2 = RD_REG_WORD_PIO(&reg->flash_data);
+                } while (data != data2);
+        } else {
+                WRT_REG_WORD(&reg->flash_address, (uint16_t)addr);
+                data = qla2x00_debounce_register(&reg->flash_data);
+        }
+
+        return (uint8_t)data;
+}
+
+/**
+ * qla2x00_write_flash_byte() - Write a byte to flash
+ * @ha: HA context
+ * @addr: Address in flash to write
+ * @data: Data to write
+ */
+static void
+qla2x00_write_flash_byte(scsi_qla_host_t *ha, uint32_t addr, uint8_t data)
+{
+        uint16_t bank_select;
+        struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
+
+        bank_select = RD_REG_WORD(&reg->ctrl_status);
+        if (IS_QLA2322(ha) || IS_QLA6322(ha)) {
+                /* Specify 64K address range: */
+                /*  clear out Module Select and Flash Address bits [19:16]. */
+                bank_select &= ~0xf8;
+                bank_select |= addr >> 12 & 0xf0;
+                bank_select |= CSR_FLASH_64K_BANK;
+                WRT_REG_WORD(&reg->ctrl_status, bank_select);
+                RD_REG_WORD(&reg->ctrl_status); /* PCI Posting. */
+
+                WRT_REG_WORD(&reg->flash_address, (uint16_t)addr);
+                RD_REG_WORD(&reg->ctrl_status);         /* PCI Posting. */
+                WRT_REG_WORD(&reg->flash_data, (uint16_t)data);
+                RD_REG_WORD(&reg->ctrl_status);         /* PCI Posting. */
+
+                return;
+        }
+
+        /* Setup bit 16 of flash address. */
+        if ((addr & BIT_16) && ((bank_select & CSR_FLASH_64K_BANK) == 0)) {
+                bank_select |= CSR_FLASH_64K_BANK;
+                WRT_REG_WORD(&reg->ctrl_status, bank_select);
+                RD_REG_WORD(&reg->ctrl_status); /* PCI Posting. */
+        } else if (((addr & BIT_16) == 0) &&
+            (bank_select & CSR_FLASH_64K_BANK)) {
+                bank_select &= ~(CSR_FLASH_64K_BANK);
+                WRT_REG_WORD(&reg->ctrl_status, bank_select);
+                RD_REG_WORD(&reg->ctrl_status); /* PCI Posting. */
+        }
+
+        /* Always perform IO mapped accesses to the FLASH registers. */
+        if (ha->pio_address) {
+                reg = (struct device_reg_2xxx __iomem *)ha->pio_address;
+                WRT_REG_WORD_PIO(&reg->flash_address, (uint16_t)addr);
+                WRT_REG_WORD_PIO(&reg->flash_data, (uint16_t)data);
+        } else {
+                WRT_REG_WORD(&reg->flash_address, (uint16_t)addr);
+                RD_REG_WORD(&reg->ctrl_status);         /* PCI Posting. */
+                WRT_REG_WORD(&reg->flash_data, (uint16_t)data);
+                RD_REG_WORD(&reg->ctrl_status);         /* PCI Posting. */
+        }
+}
+
+/**
+ * qla2x00_poll_flash() - Polls flash for completion.
+ * @ha: HA context
+ * @addr: Address in flash to poll
+ * @poll_data: Data to be polled
+ * @man_id: Flash manufacturer ID
+ * @flash_id: Flash ID
+ *
+ * This function polls the device until bit 7 of what is read matches data
+ * bit 7 or until data bit 5 becomes a 1.  If that hapens, the flash ROM timed
+ * out (a fatal error).  The flash book recommeds reading bit 7 again after
+ * reading bit 5 as a 1.
+ *
+ * Returns 0 on success, else non-zero.
+ */
+static int
+qla2x00_poll_flash(scsi_qla_host_t *ha, uint32_t addr, uint8_t poll_data,
+    uint8_t man_id, uint8_t flash_id)
+{
+        int status;
+        uint8_t flash_data;
+        uint32_t cnt;
+
+        status = 1;
+
+        /* Wait for 30 seconds for command to finish. */
+        poll_data &= BIT_7;
+        for (cnt = 3000000; cnt; cnt--) {
+                flash_data = qla2x00_read_flash_byte(ha, addr);
+                if ((flash_data & BIT_7) == poll_data) {
+                        status = 0;
+                        break;
+                }
+
+                if (man_id != 0x40 && man_id != 0xda) {
+                        if ((flash_data & BIT_5) && cnt > 2)
+                                cnt = 2;
+                }
+                udelay(10);
+                barrier();
+        }
+        return status;
+}
+
+#define IS_OEM_001(ha) \
+        ((ha)->pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2322 && \
+         (ha)->pdev->subsystem_vendor == 0x1028 && \
+         (ha)->pdev->subsystem_device == 0x0170)
+
+/**
+ * qla2x00_program_flash_address() - Programs a flash address
+ * @ha: HA context
+ * @addr: Address in flash to program
+ * @data: Data to be written in flash
+ * @man_id: Flash manufacturer ID
+ * @flash_id: Flash ID
+ *
+ * Returns 0 on success, else non-zero.
+ */
+static int
+qla2x00_program_flash_address(scsi_qla_host_t *ha, uint32_t addr, uint8_t data,
+    uint8_t man_id, uint8_t flash_id)
+{
+        /* Write Program Command Sequence. */
+        if (IS_OEM_001(ha)) {
+                qla2x00_write_flash_byte(ha, 0xaaa, 0xaa);
+                qla2x00_write_flash_byte(ha, 0x555, 0x55);
+                qla2x00_write_flash_byte(ha, 0xaaa, 0xa0);
+                qla2x00_write_flash_byte(ha, addr, data);
+        } else {
+                if (man_id == 0xda && flash_id == 0xc1) {
+                        qla2x00_write_flash_byte(ha, addr, data);
+                        if (addr & 0x7e)
+                                return 0;
+                } else {
+                        qla2x00_write_flash_byte(ha, 0x5555, 0xaa);
+                        qla2x00_write_flash_byte(ha, 0x2aaa, 0x55);
+                        qla2x00_write_flash_byte(ha, 0x5555, 0xa0);
+                        qla2x00_write_flash_byte(ha, addr, data);
+                }
+        }
+
+        udelay(150);
+
+        /* Wait for write to complete. */
+        return qla2x00_poll_flash(ha, addr, data, man_id, flash_id);
+}
+
+/**
+ * qla2x00_erase_flash() - Erase the flash.
+ * @ha: HA context
+ * @man_id: Flash manufacturer ID
+ * @flash_id: Flash ID
+ *
+ * Returns 0 on success, else non-zero.
+ */
+static int
+qla2x00_erase_flash(scsi_qla_host_t *ha, uint8_t man_id, uint8_t flash_id)
+{
+        /* Individual Sector Erase Command Sequence */
+        if (IS_OEM_001(ha)) {
+                qla2x00_write_flash_byte(ha, 0xaaa, 0xaa);
+                qla2x00_write_flash_byte(ha, 0x555, 0x55);
+                qla2x00_write_flash_byte(ha, 0xaaa, 0x80);
+                qla2x00_write_flash_byte(ha, 0xaaa, 0xaa);
+                qla2x00_write_flash_byte(ha, 0x555, 0x55);
+                qla2x00_write_flash_byte(ha, 0xaaa, 0x10);
+        } else {
+                qla2x00_write_flash_byte(ha, 0x5555, 0xaa);
+                qla2x00_write_flash_byte(ha, 0x2aaa, 0x55);
+                qla2x00_write_flash_byte(ha, 0x5555, 0x80);
+                qla2x00_write_flash_byte(ha, 0x5555, 0xaa);
+                qla2x00_write_flash_byte(ha, 0x2aaa, 0x55);
+                qla2x00_write_flash_byte(ha, 0x5555, 0x10);
+        }
+
+        udelay(150);
+
+        /* Wait for erase to complete. */
+        return qla2x00_poll_flash(ha, 0x00, 0x80, man_id, flash_id);
+}
+
+/**
+ * qla2x00_erase_flash_sector() - Erase a flash sector.
+ * @ha: HA context
+ * @addr: Flash sector to erase
+ * @sec_mask: Sector address mask
+ * @man_id: Flash manufacturer ID
+ * @flash_id: Flash ID
+ *
+ * Returns 0 on success, else non-zero.
+ */
+static int
+qla2x00_erase_flash_sector(scsi_qla_host_t *ha, uint32_t addr,
+    uint32_t sec_mask, uint8_t man_id, uint8_t flash_id)
+{
+        /* Individual Sector Erase Command Sequence */
+        qla2x00_write_flash_byte(ha, 0x5555, 0xaa);
+        qla2x00_write_flash_byte(ha, 0x2aaa, 0x55);
+        qla2x00_write_flash_byte(ha, 0x5555, 0x80);
+        qla2x00_write_flash_byte(ha, 0x5555, 0xaa);
+        qla2x00_write_flash_byte(ha, 0x2aaa, 0x55);
+        if (man_id == 0x1f && flash_id == 0x13)
+                qla2x00_write_flash_byte(ha, addr & sec_mask, 0x10);
+        else
+                qla2x00_write_flash_byte(ha, addr & sec_mask, 0x30);
+
+        udelay(150);
+
+        /* Wait for erase to complete. */
+        return qla2x00_poll_flash(ha, addr, 0x80, man_id, flash_id);
+}
+
+/**
+ * qla2x00_get_flash_manufacturer() - Read manufacturer ID from flash chip.
+ * @man_id: Flash manufacturer ID
+ * @flash_id: Flash ID
+ */
+static void
+qla2x00_get_flash_manufacturer(scsi_qla_host_t *ha, uint8_t *man_id,
+    uint8_t *flash_id)
+{
+        qla2x00_write_flash_byte(ha, 0x5555, 0xaa);
+        qla2x00_write_flash_byte(ha, 0x2aaa, 0x55);
+        qla2x00_write_flash_byte(ha, 0x5555, 0x90);
+        *man_id = qla2x00_read_flash_byte(ha, 0x0000);
+        *flash_id = qla2x00_read_flash_byte(ha, 0x0001);
+        qla2x00_write_flash_byte(ha, 0x5555, 0xaa);
+        qla2x00_write_flash_byte(ha, 0x2aaa, 0x55);
+        qla2x00_write_flash_byte(ha, 0x5555, 0xf0);
+}
+
+
+static inline void
+qla2x00_suspend_hba(struct scsi_qla_host *ha)
+{
+        int cnt;
+        unsigned long flags;
+        struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
+
+        /* Suspend HBA. */
+        scsi_block_requests(ha->host);
+        ha->isp_ops.disable_intrs(ha);
+        set_bit(MBX_UPDATE_FLASH_ACTIVE, &ha->mbx_cmd_flags);
+
+        /* Pause RISC. */
+        spin_lock_irqsave(&ha->hardware_lock, flags);
+        WRT_REG_WORD(&reg->hccr, HCCR_PAUSE_RISC);
+        RD_REG_WORD(&reg->hccr);
+        if (IS_QLA2100(ha) || IS_QLA2200(ha) || IS_QLA2300(ha)) {
+                for (cnt = 0; cnt < 30000; cnt++) {
+                        if ((RD_REG_WORD(&reg->hccr) & HCCR_RISC_PAUSE) != 0)
+                                break;
+                        udelay(100);
+                }
+        } else {
+                udelay(10);
+        }
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+}
+
+static inline void
+qla2x00_resume_hba(struct scsi_qla_host *ha)
+{
+        /* Resume HBA. */
+        clear_bit(MBX_UPDATE_FLASH_ACTIVE, &ha->mbx_cmd_flags);
+        set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
+        up(ha->dpc_wait);
+        qla2x00_wait_for_hba_online(ha);
+        scsi_unblock_requests(ha->host);
+}
+
+uint8_t *
+qla2x00_read_optrom_data(struct scsi_qla_host *ha, uint8_t *buf,
+    uint32_t offset, uint32_t length)
+{
+        unsigned long flags;
+        uint32_t addr, midpoint;
+        uint8_t *data;
+        struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
+
+        /* Suspend HBA. */
+        qla2x00_suspend_hba(ha);
+
+        /* Go with read. */
+        spin_lock_irqsave(&ha->hardware_lock, flags);
+        midpoint = ha->optrom_size / 2;
+
+        qla2x00_flash_enable(ha);
+        WRT_REG_WORD(&reg->nvram, 0);
+        RD_REG_WORD(&reg->nvram);               /* PCI Posting. */
+        for (addr = offset, data = buf; addr < length; addr++, data++) {
+                if (addr == midpoint) {
+                        WRT_REG_WORD(&reg->nvram, NVR_SELECT);
+                        RD_REG_WORD(&reg->nvram);       /* PCI Posting. */
+                }
+
+                *data = qla2x00_read_flash_byte(ha, addr);
+        }
+        qla2x00_flash_disable(ha);
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+
+        /* Resume HBA. */
+        qla2x00_resume_hba(ha);
+
+        return buf;
+}
+
+int
+qla2x00_write_optrom_data(struct scsi_qla_host *ha, uint8_t *buf,
+    uint32_t offset, uint32_t length)
+{
+
+        int rval;
+        unsigned long flags;
+        uint8_t man_id, flash_id, sec_number, data;
+        uint16_t wd;
+        uint32_t addr, liter, sec_mask, rest_addr;
+        struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
+
+        /* Suspend HBA. */
+        qla2x00_suspend_hba(ha);
+
+        rval = QLA_SUCCESS;
+        sec_number = 0;
+
+        /* Reset ISP chip. */
+        spin_lock_irqsave(&ha->hardware_lock, flags);
+        WRT_REG_WORD(&reg->ctrl_status, CSR_ISP_SOFT_RESET);
+        pci_read_config_word(ha->pdev, PCI_COMMAND, &wd);
+
+        /* Go with write. */
+        qla2x00_flash_enable(ha);
+        do {    /* Loop once to provide quick error exit */
+                /* Structure of flash memory based on manufacturer */
+                if (IS_OEM_001(ha)) {
+                        /* OEM variant with special flash part. */
+                        man_id = flash_id = 0;
+                        rest_addr = 0xffff;
+                        sec_mask   = 0x10000;
+                        goto update_flash;
+                }
+                qla2x00_get_flash_manufacturer(ha, &man_id, &flash_id);
+                switch (man_id) {
+                case 0x20: /* ST flash. */
+                        if (flash_id == 0xd2 || flash_id == 0xe3) {
+                                /*
+                                 * ST m29w008at part - 64kb sector size with
+                                 * 32kb,8kb,8kb,16kb sectors at memory address
+                                 * 0xf0000.
+                                 */
+                                rest_addr = 0xffff;
+                                sec_mask = 0x10000;
+                                break;   
+                        }
+                        /*
+                         * ST m29w010b part - 16kb sector size
+                         * Default to 16kb sectors
+                         */
+                        rest_addr = 0x3fff;
+                        sec_mask = 0x1c000;
+                        break;
+                case 0x40: /* Mostel flash. */
+                        /* Mostel v29c51001 part - 512 byte sector size. */
+                        rest_addr = 0x1ff;
+                        sec_mask = 0x1fe00;
+                        break;
+                case 0xbf: /* SST flash. */
+                        /* SST39sf10 part - 4kb sector size. */
+                        rest_addr = 0xfff;
+                        sec_mask = 0x1f000;
+                        break;
+                case 0xda: /* Winbond flash. */
+                        /* Winbond W29EE011 part - 256 byte sector size. */
+                        rest_addr = 0x7f;
+                        sec_mask = 0x1ff80;
+                        break;
+                case 0xc2: /* Macronix flash. */
+                        /* 64k sector size. */
+                        if (flash_id == 0x38 || flash_id == 0x4f) {
+                                rest_addr = 0xffff;
+                                sec_mask = 0x10000;
+                                break;
+                        }
+                        /* Fall through... */
+
+                case 0x1f: /* Atmel flash. */
+                        /* 512k sector size. */
+                        if (flash_id == 0x13) {
+                                rest_addr = 0x7fffffff;
+                                sec_mask =   0x80000000;
+                                break;
+                        }
+                        /* Fall through... */
+
+                case 0x01: /* AMD flash. */
+                        if (flash_id == 0x38 || flash_id == 0x40 ||
+                            flash_id == 0x4f) {
+                                /* Am29LV081 part - 64kb sector size. */
+                                /* Am29LV002BT part - 64kb sector size. */
+                                rest_addr = 0xffff;
+                                sec_mask = 0x10000;
+                                break;
+                        } else if (flash_id == 0x3e) {
+                                /*
+                                 * Am29LV008b part - 64kb sector size with
+                                 * 32kb,8kb,8kb,16kb sector at memory address
+                                 * h0xf0000.
+                                 */
+                                rest_addr = 0xffff;
+                                sec_mask = 0x10000;
+                                break;
+                        } else if (flash_id == 0x20 || flash_id == 0x6e) {
+                                /*
+                                 * Am29LV010 part or AM29f010 - 16kb sector
+                                 * size.
+                                 */
+                                rest_addr = 0x3fff;
+                                sec_mask = 0x1c000;
+                                break;
+                        } else if (flash_id == 0x6d) {
+                                /* Am29LV001 part - 8kb sector size. */
+                                rest_addr = 0x1fff;
+                                sec_mask = 0x1e000;
+                                break;
+                        }
+                default:
+                        /* Default to 16 kb sector size. */
+                        rest_addr = 0x3fff;
+                        sec_mask = 0x1c000;
+                        break;
+                }
+
+update_flash:
+                if (IS_QLA2322(ha) || IS_QLA6322(ha)) {
+                        if (qla2x00_erase_flash(ha, man_id, flash_id)) {
+                                rval = QLA_FUNCTION_FAILED;
+                                break;
+                        }
+                }
+
+                for (addr = offset, liter = 0; liter < length; liter++,
+                    addr++) {
+                        data = buf[liter];
+                        /* Are we at the beginning of a sector? */
+                        if ((addr & rest_addr) == 0) {
+                                if (IS_QLA2322(ha) || IS_QLA6322(ha)) {
+                                        if (addr >= 0x10000UL) {
+                                                if (((addr >> 12) & 0xf0) &&
+                                                    ((man_id == 0x01 &&
+                                                        flash_id == 0x3e) ||
+                                                     (man_id == 0x20 &&
+                                                         flash_id == 0xd2))) {
+                                                        sec_number++;
+                                                        if (sec_number == 1) {
+                                                                rest_addr =
+                                                                    0x7fff;
+                                                                sec_mask =
+                                                                    0x18000;
+                                                        } else if (
+                                                            sec_number == 2 ||
+                                                            sec_number == 3) {
+                                                                rest_addr =
+                                                                    0x1fff;
+                                                                sec_mask =
+                                                                    0x1e000;
+                                                        } else if (
+                                                            sec_number == 4) {
+                                                                rest_addr =
+                                                                    0x3fff;
+                                                                sec_mask =
+                                                                    0x1c000;
+                                                        }
+                                                }
+                                        }
+                                } else if (addr == ha->optrom_size / 2) {
+                                        WRT_REG_WORD(&reg->nvram, NVR_SELECT);
+                                        RD_REG_WORD(&reg->nvram);
+                                }
+
+                                if (flash_id == 0xda && man_id == 0xc1) {
+                                        qla2x00_write_flash_byte(ha, 0x5555,
+                                            0xaa);
+                                        qla2x00_write_flash_byte(ha, 0x2aaa,
+                                            0x55);
+                                        qla2x00_write_flash_byte(ha, 0x5555,
+                                            0xa0);
+                                } else if (!IS_QLA2322(ha) && !IS_QLA6322(ha)) {
+                                        /* Then erase it */
+                                        if (qla2x00_erase_flash_sector(ha,
+                                            addr, sec_mask, man_id,
+                                            flash_id)) {
+                                                rval = QLA_FUNCTION_FAILED;
+                                                break;
+                                        }
+                                        if (man_id == 0x01 && flash_id == 0x6d)
+                                                sec_number++;
+                                }
+                        }
+
+                        if (man_id == 0x01 && flash_id == 0x6d) {
+                                if (sec_number == 1 &&
+                                    addr == (rest_addr - 1)) {
+                                        rest_addr = 0x0fff;
+                                        sec_mask   = 0x1f000;
+                                } else if (sec_number == 3 && (addr & 0x7ffe)) {
+                                        rest_addr = 0x3fff;
+                                        sec_mask   = 0x1c000;
+                                }
+                        }
+
+                        if (qla2x00_program_flash_address(ha, addr, data,
+                            man_id, flash_id)) {
+                                rval = QLA_FUNCTION_FAILED;
+                                break;
+                        }
+                }
+        } while (0);
+        qla2x00_flash_disable(ha);
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+
+        /* Resume HBA. */
+        qla2x00_resume_hba(ha);
+
+        return rval;
+}
+
+uint8_t *
+qla24xx_read_optrom_data(struct scsi_qla_host *ha, uint8_t *buf,
+    uint32_t offset, uint32_t length)
+{
+        /* Suspend HBA. */
+        scsi_block_requests(ha->host);
+        ha->isp_ops.disable_intrs(ha);
+        set_bit(MBX_UPDATE_FLASH_ACTIVE, &ha->mbx_cmd_flags);
+
+        /* Go with read. */
+        qla24xx_read_flash_data(ha, (uint32_t *)buf, offset >> 2, length >> 2);
+
+        /* Resume HBA. */
+        clear_bit(MBX_UPDATE_FLASH_ACTIVE, &ha->mbx_cmd_flags);
+        ha->isp_ops.enable_intrs(ha);
+        scsi_unblock_requests(ha->host);
+
+        return buf;
+}
+
+int
+qla24xx_write_optrom_data(struct scsi_qla_host *ha, uint8_t *buf,
+    uint32_t offset, uint32_t length)
+{
+        int rval;
+
+        /* Suspend HBA. */
+        scsi_block_requests(ha->host);
+        ha->isp_ops.disable_intrs(ha);
+        set_bit(MBX_UPDATE_FLASH_ACTIVE, &ha->mbx_cmd_flags);
+
+        /* Go with write. */
+        rval = qla24xx_write_flash_data(ha, (uint32_t *)buf, offset >> 2,
+            length >> 2);
+
+        /* Resume HBA -- RISC reset needed. */
+        clear_bit(MBX_UPDATE_FLASH_ACTIVE, &ha->mbx_cmd_flags);
+        set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
+        up(ha->dpc_wait);
+        qla2x00_wait_for_hba_online(ha);
+        scsi_unblock_requests(ha->host);
+
+        return rval;
+}
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c
index 6fddf17a3b70..2770005324b4 100644
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@ -997,6 +997,7 @@ static void mv_qc_prep(struct ata_queued_cmd *qc)
         case ATA_CMD_READ_EXT:
         case ATA_CMD_WRITE:
         case ATA_CMD_WRITE_EXT:
+        case ATA_CMD_WRITE_FUA_EXT:
                 mv_crqb_pack_cmd(cw++, tf->hob_nsect, ATA_REG_NSECT, 0);
                 break;
 #ifdef LIBATA_NCQ               /* FIXME: remove this line when NCQ added */
diff --git a/drivers/scsi/sata_qstor.c b/drivers/scsi/sata_qstor.c
index de05e2883f9c..80480f0fb2b8 100644
--- a/drivers/scsi/sata_qstor.c
+++ b/drivers/scsi/sata_qstor.c
@@ -277,7 +277,7 @@ static unsigned int qs_fill_sg(struct ata_queued_cmd *qc)
         u8 *prd = pp->pkt + QS_CPB_BYTES;
 
         assert(qc->__sg != NULL);
-        assert(qc->n_elem > 0);
+        assert(qc->n_elem > 0 || qc->pad_len > 0);
 
         nelem = 0;
         ata_for_each_sg(sg, qc) {
diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c
index 17f74d3c10e7..9face3c6aa21 100644
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
@@ -49,11 +49,13 @@
 #define DRV_VERSION     "0.9"
 
 enum {
+        SIL_FLAG_RERR_ON_DMA_ACT = (1 << 29),
         SIL_FLAG_MOD15WRITE     = (1 << 30),
 
         sil_3112                = 0,
         sil_3112_m15w           = 1,
-        sil_3114                = 2,
+        sil_3512                = 2,
+        sil_3114                = 3,
 
         SIL_FIFO_R0             = 0x40,
         SIL_FIFO_W0             = 0x41,
@@ -90,7 +92,7 @@ static void sil_post_set_mode (struct ata_port *ap);
 static const struct pci_device_id sil_pci_tbl[] = {
         { 0x1095, 0x3112, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w },
         { 0x1095, 0x0240, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w },
-        { 0x1095, 0x3512, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 },
+        { 0x1095, 0x3512, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3512 },
         { 0x1095, 0x3114, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3114 },
         { 0x1002, 0x436e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w },
         { 0x1002, 0x4379, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w },
@@ -185,7 +187,8 @@ static const struct ata_port_info sil_port_info[] = {
                 .mwdma_mask     = 0x07,                 /* mwdma0-2 */
                 .udma_mask      = 0x3f,                 /* udma0-5 */
                 .port_ops       = &sil_ops,
-        }, /* sil_3112_15w - keep it sync'd w/ sil_3112 */
+        },
+        /* sil_3112_15w - keep it sync'd w/ sil_3112 */
         {
                 .sht            = &sil_sht,
                 .host_flags     = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
@@ -195,11 +198,24 @@ static const struct ata_port_info sil_port_info[] = {
                 .mwdma_mask     = 0x07,                 /* mwdma0-2 */
                 .udma_mask      = 0x3f,                 /* udma0-5 */
                 .port_ops       = &sil_ops,
-        }, /* sil_3114 */
+        },
+        /* sil_3512 */
         {
                 .sht            = &sil_sht,
                 .host_flags     = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
-                                  ATA_FLAG_SRST | ATA_FLAG_MMIO,
+                                  ATA_FLAG_SRST | ATA_FLAG_MMIO |
+                                  SIL_FLAG_RERR_ON_DMA_ACT,
+                .pio_mask       = 0x1f,                 /* pio0-4 */
+                .mwdma_mask     = 0x07,                 /* mwdma0-2 */
+                .udma_mask      = 0x3f,                 /* udma0-5 */
+                .port_ops       = &sil_ops,
+        },
+        /* sil_3114 */
+        {
+                .sht            = &sil_sht,
+                .host_flags     = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
+                                  ATA_FLAG_SRST | ATA_FLAG_MMIO |
+                                  SIL_FLAG_RERR_ON_DMA_ACT,
                 .pio_mask       = 0x1f,                 /* pio0-4 */
                 .mwdma_mask     = 0x07,                 /* mwdma0-2 */
                 .udma_mask      = 0x3f,                 /* udma0-5 */
@@ -216,12 +232,13 @@ static const struct {
         unsigned long scr;      /* SATA control register block */
         unsigned long sien;     /* SATA Interrupt Enable register */
         unsigned long xfer_mode;/* data transfer mode register */
+        unsigned long sfis_cfg; /* SATA FIS reception config register */
 } sil_port[] = {
         /* port 0 ... */
-        { 0x80, 0x8A, 0x00, 0x100, 0x148, 0xb4 },
-        { 0xC0, 0xCA, 0x08, 0x180, 0x1c8, 0xf4 },
-        { 0x280, 0x28A, 0x200, 0x300, 0x348, 0x2b4 },
-        { 0x2C0, 0x2CA, 0x208, 0x380, 0x3c8, 0x2f4 },
+        { 0x80, 0x8A, 0x00, 0x100, 0x148, 0xb4, 0x14c },
+        { 0xC0, 0xCA, 0x08, 0x180, 0x1c8, 0xf4, 0x1cc },
+        { 0x280, 0x28A, 0x200, 0x300, 0x348, 0x2b4, 0x34c },
+        { 0x2C0, 0x2CA, 0x208, 0x380, 0x3c8, 0x2f4, 0x3cc },
         /* ... port 3 */
 };
 
@@ -471,6 +488,23 @@ static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                 dev_printk(KERN_WARNING, &pdev->dev,
                          "cache line size not set.  Driver may not function\n");
 
+        /* Apply R_ERR on DMA activate FIS errata workaround */
+        if (probe_ent->host_flags & SIL_FLAG_RERR_ON_DMA_ACT) {
+                int cnt;
+
+                for (i = 0, cnt = 0; i < probe_ent->n_ports; i++) {
+                        tmp = readl(mmio_base + sil_port[i].sfis_cfg);
+                        if ((tmp & 0x3) != 0x01)
+                                continue;
+                        if (!cnt)
+                                dev_printk(KERN_INFO, &pdev->dev,
+                                           "Applying R_ERR on DMA activate "
+                                           "FIS errata fix\n");
+                        writel(tmp & ~0x3, mmio_base + sil_port[i].sfis_cfg);
+                        cnt++;
+                }
+        }
+
         if (ent->driver_data == sil_3114) {
                 irq_mask = SIL_MASK_4PORT;
 
diff --git a/drivers/scsi/sata_vsc.c b/drivers/scsi/sata_vsc.c
index 2e2c3b7acb0c..e484e8db6810 100644
--- a/drivers/scsi/sata_vsc.c
+++ b/drivers/scsi/sata_vsc.c
@@ -81,6 +81,19 @@
 /* Port stride */
 #define VSC_SATA_PORT_OFFSET            0x200
 
+/* Error interrupt status bit offsets */
+#define VSC_SATA_INT_ERROR_E_OFFSET     2
+#define VSC_SATA_INT_ERROR_P_OFFSET     4
+#define VSC_SATA_INT_ERROR_T_OFFSET     5
+#define VSC_SATA_INT_ERROR_M_OFFSET     1
+#define is_vsc_sata_int_err(port_idx, int_status) \
+         (int_status & ((1 << (VSC_SATA_INT_ERROR_E_OFFSET + (8 * port_idx))) | \
+                        (1 << (VSC_SATA_INT_ERROR_P_OFFSET + (8 * port_idx))) | \
+                        (1 << (VSC_SATA_INT_ERROR_T_OFFSET + (8 * port_idx))) | \
+                        (1 << (VSC_SATA_INT_ERROR_M_OFFSET + (8 * port_idx)))   \
+                       )\
+         )
+
 
 static u32 vsc_sata_scr_read (struct ata_port *ap, unsigned int sc_reg)
 {
@@ -201,13 +214,28 @@ static irqreturn_t vsc_sata_interrupt (int irq, void *dev_instance,
                         struct ata_port *ap;
 
                         ap = host_set->ports[i];
+
+                        if (is_vsc_sata_int_err(i, int_status)) {
+                                u32 err_status;
+                                printk(KERN_DEBUG "%s: ignoring interrupt(s)\n", __FUNCTION__);
+                                err_status = ap ? vsc_sata_scr_read(ap, SCR_ERROR) : 0;
+                                vsc_sata_scr_write(ap, SCR_ERROR, err_status);
+                                handled++;
+                        }
+
                         if (ap && !(ap->flags &
                                     (ATA_FLAG_PORT_DISABLED|ATA_FLAG_NOINTR))) {
                                 struct ata_queued_cmd *qc;
 
                                 qc = ata_qc_from_tag(ap, ap->active_tag);
-                                if (qc && (!(qc->tf.ctl & ATA_NIEN)))
+                                if (qc && (!(qc->tf.ctl & ATA_NIEN))) {
                                         handled += ata_host_intr(ap, qc);
+                                } else {
+                                        printk(KERN_DEBUG "%s: ignoring interrupt(s)\n", __FUNCTION__);
+                                        ata_chk_status(ap);
+                                        handled++;
+                                }
+
                         }
                 }
         }
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 5cc97b721661..ff82ccfbb106 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1308,7 +1308,7 @@ int scsi_decide_disposition(struct scsi_cmnd *scmd)
          * the request was not marked fast fail.  Note that above,
          * even if the request is marked fast fail, we still requeue
          * for queue congestion conditions (QUEUE_FULL or BUSY) */
-        if ((++scmd->retries) < scmd->allowed 
+        if ((++scmd->retries) <= scmd->allowed
             && !blk_noretry_request(scmd->request)) {
                 return NEEDS_RETRY;
         } else {
@@ -1433,7 +1433,7 @@ static void scsi_eh_flush_done_q(struct list_head *done_q)
                 list_del_init(&scmd->eh_entry);
                 if (scsi_device_online(scmd->device) &&
                     !blk_noretry_request(scmd->request) &&
-                    (++scmd->retries < scmd->allowed)) {
+                    (++scmd->retries <= scmd->allowed)) {
                         SCSI_LOG_ERROR_RECOVERY(3, printk("%s: flush"
                                                           " retry cmd: %p\n",
                                                           current->comm,
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 4a602853a98e..701a328f7beb 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -16,6 +16,7 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
+#include <linux/hardirq.h>
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_dbg.h>
@@ -1497,7 +1498,7 @@ static void scsi_kill_request(struct request *req, request_queue_t *q)
 static void scsi_softirq_done(struct request *rq)
 {
         struct scsi_cmnd *cmd = rq->completion_data;
-        unsigned long wait_for = cmd->allowed * cmd->timeout_per_command;
+        unsigned long wait_for = (cmd->allowed + 1) * cmd->timeout_per_command;
         int disposition;
 
         INIT_LIST_HEAD(&cmd->eh_entry);
@@ -2248,3 +2249,61 @@ scsi_target_unblock(struct device *dev)
                 device_for_each_child(dev, NULL, target_unblock);
 }
 EXPORT_SYMBOL_GPL(scsi_target_unblock);
+
+
+struct work_queue_work {
+        struct work_struct      work;
+        void                    (*fn)(void *);
+        void                    *data;
+};
+
+static void execute_in_process_context_work(void *data)
+{
+        void (*fn)(void *data);
+        struct work_queue_work *wqw = data;
+
+        fn = wqw->fn;
+        data = wqw->data;
+
+        kfree(wqw);
+
+        fn(data);
+}
+
+/**
+ * scsi_execute_in_process_context - reliably execute the routine with user context
+ * @fn:         the function to execute
+ * @data:       data to pass to the function
+ *
+ * Executes the function immediately if process context is available,
+ * otherwise schedules the function for delayed execution.
+ *
+ * Returns:     0 - function was executed
+ *              1 - function was scheduled for execution
+ *              <0 - error
+ */
+int scsi_execute_in_process_context(void (*fn)(void *data), void *data)
+{
+        struct work_queue_work *wqw;
+
+        if (!in_interrupt()) {
+                fn(data);
+                return 0;
+        }
+
+        wqw = kmalloc(sizeof(struct work_queue_work), GFP_ATOMIC);
+
+        if (unlikely(!wqw)) {
+                printk(KERN_ERR "Failed to allocate memory\n");
+                WARN_ON(1);
+                return -ENOMEM;
+        }
+
+        INIT_WORK(&wqw->work, execute_in_process_context_work, wqw);
+        wqw->fn = fn;
+        wqw->data = data;
+        schedule_work(&wqw->work);
+
+        return 1;
+}
+EXPORT_SYMBOL_GPL(scsi_execute_in_process_context);
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 752fb5da3de4..f9ecc3dea7df 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -387,19 +387,12 @@ static struct scsi_target *scsi_alloc_target(struct device *parent,
         return found_target;
 }
 
-struct work_queue_wrapper {
-        struct work_struct      work;
-        struct scsi_target      *starget;
-};
-
-static void scsi_target_reap_work(void *data) {
-        struct work_queue_wrapper *wqw = (struct work_queue_wrapper *)data;
-        struct scsi_target *starget = wqw->starget;
+static void scsi_target_reap_usercontext(void *data)
+{
+        struct scsi_target *starget = data;
         struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
         unsigned long flags;
 
-        kfree(wqw);
-
         spin_lock_irqsave(shost->host_lock, flags);
 
         if (--starget->reap_ref == 0 && list_empty(&starget->devices)) {
@@ -428,18 +421,7 @@ static void scsi_target_reap_work(void *data) {
  */
 void scsi_target_reap(struct scsi_target *starget)
 {
-        struct work_queue_wrapper *wqw = 
-                kzalloc(sizeof(struct work_queue_wrapper), GFP_ATOMIC);
-
-        if (!wqw) {
-                starget_printk(KERN_ERR, starget,
-                               "Failed to allocate memory in scsi_reap_target()\n");
-                return;
-        }
-
-        INIT_WORK(&wqw->work, scsi_target_reap_work, wqw);
-        wqw->starget = starget;
-        schedule_work(&wqw->work);
+        scsi_execute_in_process_context(scsi_target_reap_usercontext, starget);
 }
 
 /**
@@ -770,8 +752,20 @@ static int scsi_add_lun(struct scsi_device *sdev, char *inq_result, int *bflags)
 
         transport_configure_device(&sdev->sdev_gendev);
 
-        if (sdev->host->hostt->slave_configure)
-                sdev->host->hostt->slave_configure(sdev);
+        if (sdev->host->hostt->slave_configure) {
+                int ret = sdev->host->hostt->slave_configure(sdev);
+                if (ret) {
+                        /*
+                         * if LLDD reports slave not present, don't clutter
+                         * console with alloc failure messages
+                         */
+                        if (ret != -ENXIO) {
+                                sdev_printk(KERN_ERR, sdev,
+                                        "failed to configure device\n");
+                        }
+                        return SCSI_SCAN_NO_RESPONSE;
+                }
+        }
 
         /*
          * Ok, the device is now all set up, we can
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index a77b32deaf8f..902a5def8e62 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -217,8 +217,9 @@ static void scsi_device_cls_release(struct class_device *class_dev)
         put_device(&sdev->sdev_gendev);
 }
 
-static void scsi_device_dev_release(struct device *dev)
+static void scsi_device_dev_release_usercontext(void *data)
 {
+        struct device *dev = data;
         struct scsi_device *sdev;
         struct device *parent;
         struct scsi_target *starget;
@@ -237,6 +238,7 @@ static void scsi_device_dev_release(struct device *dev)
 
         if (sdev->request_queue) {
                 sdev->request_queue->queuedata = NULL;
+                /* user context needed to free queue */
                 scsi_free_queue(sdev->request_queue);
                 /* temporary expedient, try to catch use of queue lock
                  * after free of sdev */
@@ -252,6 +254,11 @@ static void scsi_device_dev_release(struct device *dev)
                 put_device(parent);
 }
 
+static void scsi_device_dev_release(struct device *dev)
+{
+        scsi_execute_in_process_context(scsi_device_dev_release_usercontext,    dev);
+}
+
 static struct class sdev_class = {
         .name           = "scsi_device",
         .release        = scsi_device_cls_release,
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index f2c9acf11bd0..929032e370db 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -1498,8 +1498,7 @@ fc_remote_port_add(struct Scsi_Host *shost, int channel,
         }
 
         /* Search the bindings array */
-        if (likely((ids->roles & FC_RPORT_ROLE_FCP_TARGET) &&
-                (fc_host_tgtid_bind_type(shost) != FC_TGTID_BIND_NONE))) {
+        if (fc_host_tgtid_bind_type(shost) != FC_TGTID_BIND_NONE) {
 
                 /* search for a matching consistent binding */
 
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 723f7acbeb12..71e54a64adca 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -39,10 +39,6 @@ struct iscsi_internal {
         struct iscsi_transport *iscsi_transport;
         struct list_head list;
         /*
-         * List of sessions for this transport
-         */
-        struct list_head sessions;
-        /*
          * based on transport capabilities, at register time we set these
          * bits to tell the transport class it wants attributes displayed
          * in sysfs or that it can support different iSCSI Data-Path
@@ -164,9 +160,43 @@ static struct mempool_zone *z_reply;
 #define Z_MAX_ERROR     16
 #define Z_HIWAT_ERROR   12
 
+static LIST_HEAD(sesslist);
+static DEFINE_SPINLOCK(sesslock);
 static LIST_HEAD(connlist);
 static DEFINE_SPINLOCK(connlock);
 
+static struct iscsi_cls_session *iscsi_session_lookup(uint64_t handle)
+{
+        unsigned long flags;
+        struct iscsi_cls_session *sess;
+
+        spin_lock_irqsave(&sesslock, flags);
+        list_for_each_entry(sess, &sesslist, sess_list) {
+                if (sess == iscsi_ptr(handle)) {
+                        spin_unlock_irqrestore(&sesslock, flags);
+                        return sess;
+                }
+        }
+        spin_unlock_irqrestore(&sesslock, flags);
+        return NULL;
+}
+
+static struct iscsi_cls_conn *iscsi_conn_lookup(uint64_t handle)
+{
+        unsigned long flags;
+        struct iscsi_cls_conn *conn;
+
+        spin_lock_irqsave(&connlock, flags);
+        list_for_each_entry(conn, &connlist, conn_list) {
+                if (conn == iscsi_ptr(handle)) {
+                        spin_unlock_irqrestore(&connlock, flags);
+                        return conn;
+                }
+        }
+        spin_unlock_irqrestore(&connlock, flags);
+        return NULL;
+}
+
 /*
  * The following functions can be used by LLDs that allocate
  * their own scsi_hosts or by software iscsi LLDs
@@ -365,6 +395,7 @@ iscsi_transport_create_session(struct scsi_transport_template *scsit,
 {
         struct iscsi_cls_session *session;
         struct Scsi_Host *shost;
+        unsigned long flags;
 
         shost = scsi_host_alloc(transport->host_template,
                                 hostdata_privsize(transport));
@@ -389,6 +420,9 @@ iscsi_transport_create_session(struct scsi_transport_template *scsit,
                 goto remove_host;
 
         *(unsigned long*)shost->hostdata = (unsigned long)session;
+        spin_lock_irqsave(&sesslock, flags);
+        list_add(&session->sess_list, &sesslist);
+        spin_unlock_irqrestore(&sesslock, flags);
         return shost;
 
 remove_host:
@@ -410,9 +444,13 @@ EXPORT_SYMBOL_GPL(iscsi_transport_create_session);
 int iscsi_transport_destroy_session(struct Scsi_Host *shost)
 {
         struct iscsi_cls_session *session;
+        unsigned long flags;
 
         scsi_remove_host(shost);
         session = hostdata_session(shost->hostdata);
+        spin_lock_irqsave(&sesslock, flags);
+        list_del(&session->sess_list);
+        spin_unlock_irqrestore(&sesslock, flags);
         iscsi_destroy_session(session);
         /* ref from host alloc */
         scsi_host_put(shost);
@@ -424,22 +462,6 @@ EXPORT_SYMBOL_GPL(iscsi_transport_destroy_session);
 /*
  * iscsi interface functions
  */
-static struct iscsi_cls_conn*
-iscsi_if_find_conn(uint64_t key)
-{
-        unsigned long flags;
-        struct iscsi_cls_conn *conn;
-
-        spin_lock_irqsave(&connlock, flags);
-        list_for_each_entry(conn, &connlist, conn_list)
-                if (conn->connh == key) {
-                        spin_unlock_irqrestore(&connlock, flags);
-                        return conn;
-                }
-        spin_unlock_irqrestore(&connlock, flags);
-        return NULL;
-}
-
 static struct iscsi_internal *
 iscsi_if_transport_lookup(struct iscsi_transport *tt)
 {
@@ -504,6 +526,12 @@ mempool_zone_init(unsigned max, unsigned size, unsigned hiwat)
         if (!zp)
                 return NULL;
 
+        zp->size = size;
+        zp->hiwat = hiwat;
+        INIT_LIST_HEAD(&zp->freequeue);
+        spin_lock_init(&zp->freelock);
+        atomic_set(&zp->allocated, 0);
+
         zp->pool = mempool_create(max, mempool_zone_alloc_skb,
                                   mempool_zone_free_skb, zp);
         if (!zp->pool) {
@@ -511,13 +539,6 @@ mempool_zone_init(unsigned max, unsigned size, unsigned hiwat)
                 return NULL;
         }
 
-        zp->size = size;
-        zp->hiwat = hiwat;
-
-        INIT_LIST_HEAD(&zp->freequeue);
-        spin_lock_init(&zp->freelock);
-        atomic_set(&zp->allocated, 0);
-
         return zp;
 }
 
@@ -559,25 +580,21 @@ iscsi_unicast_skb(struct mempool_zone *zone, struct sk_buff *skb)
         return 0;
 }
 
-int iscsi_recv_pdu(iscsi_connh_t connh, struct iscsi_hdr *hdr,
+int iscsi_recv_pdu(struct iscsi_cls_conn *conn, struct iscsi_hdr *hdr,
                    char *data, uint32_t data_size)
 {
         struct nlmsghdr *nlh;
         struct sk_buff *skb;
         struct iscsi_uevent *ev;
-        struct iscsi_cls_conn *conn;
         char *pdu;
         int len = NLMSG_SPACE(sizeof(*ev) + sizeof(struct iscsi_hdr) +
                               data_size);
 
-        conn = iscsi_if_find_conn(connh);
-        BUG_ON(!conn);
-
         mempool_zone_complete(conn->z_pdu);
 
         skb = mempool_zone_get_skb(conn->z_pdu);
         if (!skb) {
-                iscsi_conn_error(connh, ISCSI_ERR_CONN_FAILED);
+                iscsi_conn_error(conn, ISCSI_ERR_CONN_FAILED);
                 dev_printk(KERN_ERR, &conn->dev, "iscsi: can not deliver "
                            "control PDU: OOM\n");
                 return -ENOMEM;
@@ -590,7 +607,7 @@ int iscsi_recv_pdu(iscsi_connh_t connh, struct iscsi_hdr *hdr,
         ev->type = ISCSI_KEVENT_RECV_PDU;
         if (atomic_read(&conn->z_pdu->allocated) >= conn->z_pdu->hiwat)
                 ev->iferror = -ENOMEM;
-        ev->r.recv_req.conn_handle = connh;
+        ev->r.recv_req.conn_handle = iscsi_handle(conn);
         pdu = (char*)ev + sizeof(*ev);
         memcpy(pdu, hdr, sizeof(struct iscsi_hdr));
         memcpy(pdu + sizeof(struct iscsi_hdr), data, data_size);
@@ -599,17 +616,13 @@ int iscsi_recv_pdu(iscsi_connh_t connh, struct iscsi_hdr *hdr,
 }
 EXPORT_SYMBOL_GPL(iscsi_recv_pdu);
 
-void iscsi_conn_error(iscsi_connh_t connh, enum iscsi_err error)
+void iscsi_conn_error(struct iscsi_cls_conn *conn, enum iscsi_err error)
 {
         struct nlmsghdr *nlh;
         struct sk_buff  *skb;
         struct iscsi_uevent *ev;
-        struct iscsi_cls_conn *conn;
         int len = NLMSG_SPACE(sizeof(*ev));
 
-        conn = iscsi_if_find_conn(connh);
-        BUG_ON(!conn);
-
         mempool_zone_complete(conn->z_error);
 
         skb = mempool_zone_get_skb(conn->z_error);
@@ -626,7 +639,7 @@ void iscsi_conn_error(iscsi_connh_t connh, enum iscsi_err error)
         if (atomic_read(&conn->z_error->allocated) >= conn->z_error->hiwat)
                 ev->iferror = -ENOMEM;
         ev->r.connerror.error = error;
-        ev->r.connerror.conn_handle = connh;
+        ev->r.connerror.conn_handle = iscsi_handle(conn);
 
         iscsi_unicast_skb(conn->z_error, skb);
 
@@ -662,8 +675,7 @@ iscsi_if_send_reply(int pid, int seq, int type, int done, int multi,
 }
 
 static int
-iscsi_if_get_stats(struct iscsi_transport *transport, struct sk_buff *skb,
-                   struct nlmsghdr *nlh)
+iscsi_if_get_stats(struct iscsi_transport *transport, struct nlmsghdr *nlh)
 {
         struct iscsi_uevent *ev = NLMSG_DATA(nlh);
         struct iscsi_stats *stats;
@@ -677,7 +689,7 @@ iscsi_if_get_stats(struct iscsi_transport *transport, struct sk_buff *skb,
                               ISCSI_STATS_CUSTOM_MAX);
         int err = 0;
 
-        conn = iscsi_if_find_conn(ev->u.get_stats.conn_handle);
+        conn = iscsi_conn_lookup(ev->u.get_stats.conn_handle);
         if (!conn)
                 return -EEXIST;
 
@@ -707,14 +719,14 @@ iscsi_if_get_stats(struct iscsi_transport *transport, struct sk_buff *skb,
                         ((char*)evstat + sizeof(*evstat));
                 memset(stats, 0, sizeof(*stats));
 
-                transport->get_stats(ev->u.get_stats.conn_handle, stats);
+                transport->get_stats(conn, stats);
                 actual_size = NLMSG_SPACE(sizeof(struct iscsi_uevent) +
                                           sizeof(struct iscsi_stats) +
                                           sizeof(struct iscsi_stats_custom) *
                                           stats->custom_length);
                 actual_size -= sizeof(*nlhstat);
                 actual_size = NLMSG_LENGTH(actual_size);
-                skb_trim(skb, NLMSG_ALIGN(actual_size));
+                skb_trim(skbstat, NLMSG_ALIGN(actual_size));
                 nlhstat->nlmsg_len = actual_size;
 
                 err = iscsi_unicast_skb(conn->z_pdu, skbstat);
@@ -727,58 +739,34 @@ static int
 iscsi_if_create_session(struct iscsi_internal *priv, struct iscsi_uevent *ev)
 {
         struct iscsi_transport *transport = priv->iscsi_transport;
-        struct Scsi_Host *shost;
-
-        if (!transport->create_session)
-                return -EINVAL;
+        struct iscsi_cls_session *session;
+        uint32_t sid;
 
-        shost = transport->create_session(&priv->t,
-                                          ev->u.c_session.initial_cmdsn);
-        if (!shost)
+        session = transport->create_session(&priv->t,
+                                            ev->u.c_session.initial_cmdsn,
+                                            &sid);
+        if (!session)
                 return -ENOMEM;
 
-        ev->r.c_session_ret.session_handle = iscsi_handle(iscsi_hostdata(shost->hostdata));
-        ev->r.c_session_ret.sid = shost->host_no;
+        ev->r.c_session_ret.session_handle = iscsi_handle(session);
+        ev->r.c_session_ret.sid = sid;
         return 0;
 }
 
 static int
-iscsi_if_destroy_session(struct iscsi_internal *priv, struct iscsi_uevent *ev)
+iscsi_if_create_conn(struct iscsi_transport *transport, struct iscsi_uevent *ev)
 {
-        struct iscsi_transport *transport = priv->iscsi_transport;
-
-        struct Scsi_Host *shost;
-
-        if (!transport->destroy_session)
-                return -EINVAL;
-
-        shost = scsi_host_lookup(ev->u.d_session.sid);
-        if (shost == ERR_PTR(-ENXIO))
-                return -EEXIST;
-
-        if (transport->destroy_session)
-                transport->destroy_session(shost);
-        /* ref from host lookup */
-        scsi_host_put(shost);
-        return 0;
-}
-
-static int
-iscsi_if_create_conn(struct iscsi_transport *transport, struct iscsi_uevent *ev){
-        struct Scsi_Host *shost;
         struct iscsi_cls_conn *conn;
+        struct iscsi_cls_session *session;
         unsigned long flags;
 
-        if (!transport->create_conn)
+        session = iscsi_session_lookup(ev->u.c_conn.session_handle);
+        if (!session)
                 return -EINVAL;
 
-        shost = scsi_host_lookup(ev->u.c_conn.sid);
-        if (shost == ERR_PTR(-ENXIO))
-                return -EEXIST;
-
-        conn = transport->create_conn(shost, ev->u.c_conn.cid);
+        conn = transport->create_conn(session, ev->u.c_conn.cid);
         if (!conn)
-                goto release_ref;
+                return -ENOMEM;
 
         conn->z_pdu = mempool_zone_init(Z_MAX_PDU,
                         NLMSG_SPACE(sizeof(struct iscsi_uevent) +
@@ -800,14 +788,13 @@ iscsi_if_create_conn(struct iscsi_transport *transport, struct iscsi_uevent *ev)
                 goto free_pdu_pool;
         }
 
-        ev->r.handle = conn->connh = iscsi_handle(conn->dd_data);
+        ev->r.handle = iscsi_handle(conn);
 
         spin_lock_irqsave(&connlock, flags);
         list_add(&conn->conn_list, &connlist);
         conn->active = 1;
         spin_unlock_irqrestore(&connlock, flags);
 
-        scsi_host_put(shost);
         return 0;
 
 free_pdu_pool:
@@ -815,8 +802,6 @@ free_pdu_pool:
 destroy_conn:
         if (transport->destroy_conn)
                 transport->destroy_conn(conn->dd_data);
-release_ref:
-        scsi_host_put(shost);
         return -ENOMEM;
 }
 
@@ -827,13 +812,9 @@ iscsi_if_destroy_conn(struct iscsi_transport *transport, struct iscsi_uevent *ev
         struct iscsi_cls_conn *conn;
         struct mempool_zone *z_error, *z_pdu;
 
-        conn = iscsi_if_find_conn(ev->u.d_conn.conn_handle);
+        conn = iscsi_conn_lookup(ev->u.d_conn.conn_handle);
         if (!conn)
-                return -EEXIST;
-
-        if (!transport->destroy_conn)
                 return -EINVAL;
-
         spin_lock_irqsave(&connlock, flags);
         conn->active = 0;
         list_del(&conn->conn_list);
@@ -858,23 +839,27 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
         struct iscsi_uevent *ev = NLMSG_DATA(nlh);
         struct iscsi_transport *transport = NULL;
         struct iscsi_internal *priv;
-
-        if (NETLINK_CREDS(skb)->uid)
-                return -EPERM;
+        struct iscsi_cls_session *session;
+        struct iscsi_cls_conn *conn;
 
         priv = iscsi_if_transport_lookup(iscsi_ptr(ev->transport_handle));
         if (!priv)
                 return -EINVAL;
         transport = priv->iscsi_transport;
 
-        daemon_pid = NETLINK_CREDS(skb)->pid;
+        if (!try_module_get(transport->owner))
+                return -EINVAL;
 
         switch (nlh->nlmsg_type) {
         case ISCSI_UEVENT_CREATE_SESSION:
                 err = iscsi_if_create_session(priv, ev);
                 break;
         case ISCSI_UEVENT_DESTROY_SESSION:
-                err = iscsi_if_destroy_session(priv, ev);
+                session = iscsi_session_lookup(ev->u.d_session.session_handle);
+                if (session)
+                        transport->destroy_session(session);
+                else
+                        err = -EINVAL;
                 break;
         case ISCSI_UEVENT_CREATE_CONN:
                 err = iscsi_if_create_conn(transport, ev);
@@ -883,56 +868,64 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
                 err = iscsi_if_destroy_conn(transport, ev);
                 break;
         case ISCSI_UEVENT_BIND_CONN:
-                if (!iscsi_if_find_conn(ev->u.b_conn.conn_handle))
-                        return -EEXIST;
-                ev->r.retcode = transport->bind_conn(
-                        ev->u.b_conn.session_handle,
-                        ev->u.b_conn.conn_handle,
-                        ev->u.b_conn.transport_fd,
-                        ev->u.b_conn.is_leading);
+                session = iscsi_session_lookup(ev->u.b_conn.session_handle);
+                conn = iscsi_conn_lookup(ev->u.b_conn.conn_handle);
+
+                if (session && conn)
+                        ev->r.retcode = transport->bind_conn(session, conn,
+                                        ev->u.b_conn.transport_fd,
+                                        ev->u.b_conn.is_leading);
+                else
+                        err = -EINVAL;
                 break;
         case ISCSI_UEVENT_SET_PARAM:
-                if (!iscsi_if_find_conn(ev->u.set_param.conn_handle))
-                        return -EEXIST;
-                ev->r.retcode = transport->set_param(
-                        ev->u.set_param.conn_handle,
-                        ev->u.set_param.param, ev->u.set_param.value);
+                conn = iscsi_conn_lookup(ev->u.set_param.conn_handle);
+                if (conn)
+                        ev->r.retcode = transport->set_param(conn,
+                                ev->u.set_param.param, ev->u.set_param.value);
+                else
+                        err = -EINVAL;
                 break;
         case ISCSI_UEVENT_START_CONN:
-                if (!iscsi_if_find_conn(ev->u.start_conn.conn_handle))
-                        return -EEXIST;
-                ev->r.retcode = transport->start_conn(
-                        ev->u.start_conn.conn_handle);
+                conn = iscsi_conn_lookup(ev->u.start_conn.conn_handle);
+                if (conn)
+                        ev->r.retcode = transport->start_conn(conn);
+                else
+                        err = -EINVAL;
+
                 break;
         case ISCSI_UEVENT_STOP_CONN:
-                if (!iscsi_if_find_conn(ev->u.stop_conn.conn_handle))
-                        return -EEXIST;
-                transport->stop_conn(ev->u.stop_conn.conn_handle,
-                        ev->u.stop_conn.flag);
+                conn = iscsi_conn_lookup(ev->u.stop_conn.conn_handle);
+                if (conn)
+                        transport->stop_conn(conn, ev->u.stop_conn.flag);
+                else
+                        err = -EINVAL;
                 break;
         case ISCSI_UEVENT_SEND_PDU:
-                if (!iscsi_if_find_conn(ev->u.send_pdu.conn_handle))
-                        return -EEXIST;
-                ev->r.retcode = transport->send_pdu(
-                       ev->u.send_pdu.conn_handle,
-                       (struct iscsi_hdr*)((char*)ev + sizeof(*ev)),
-                       (char*)ev + sizeof(*ev) + ev->u.send_pdu.hdr_size,
-                        ev->u.send_pdu.data_size);
+                conn = iscsi_conn_lookup(ev->u.send_pdu.conn_handle);
+                if (conn)
+                        ev->r.retcode = transport->send_pdu(conn,
+                                (struct iscsi_hdr*)((char*)ev + sizeof(*ev)),
+                                (char*)ev + sizeof(*ev) + ev->u.send_pdu.hdr_size,
+                                ev->u.send_pdu.data_size);
+                else
+                        err = -EINVAL;
                 break;
         case ISCSI_UEVENT_GET_STATS:
-                err = iscsi_if_get_stats(transport, skb, nlh);
+                err = iscsi_if_get_stats(transport, nlh);
                 break;
         default:
                 err = -EINVAL;
                 break;
         }
 
+        module_put(transport->owner);
         return err;
 }
 
 /* Get message from skb (based on rtnetlink_rcv_skb).  Each message is
  * processed by iscsi_if_recv_msg.  Malformed skbs with wrong length are
- * discarded silently.  */
+ * or invalid creds discarded silently.  */
 static void
 iscsi_if_rx(struct sock *sk, int len)
 {
@@ -940,6 +933,12 @@ iscsi_if_rx(struct sock *sk, int len)
 
         mutex_lock(&rx_queue_mutex);
         while ((skb = skb_dequeue(&sk->sk_receive_queue)) != NULL) {
+                if (NETLINK_CREDS(skb)->uid) {
+                        skb_pull(skb, skb->len);
+                        goto free_skb;
+                }
+                daemon_pid = NETLINK_CREDS(skb)->pid;
+
                 while (skb->len >= NLMSG_SPACE(0)) {
                         int err;
                         uint32_t rlen;
@@ -951,10 +950,12 @@ iscsi_if_rx(struct sock *sk, int len)
                             skb->len < nlh->nlmsg_len) {
                                 break;
                         }
+
                         ev = NLMSG_DATA(nlh);
                         rlen = NLMSG_ALIGN(nlh->nlmsg_len);
                         if (rlen > skb->len)
                                 rlen = skb->len;
+
                         err = iscsi_if_recv_msg(skb, nlh);
                         if (err) {
                                 ev->type = ISCSI_KEVENT_IF_ERROR;
@@ -978,6 +979,7 @@ iscsi_if_rx(struct sock *sk, int len)
                         } while (err < 0 && err != -ECONNREFUSED);
                         skb_pull(skb, rlen);
                 }
+free_skb:
                 kfree_skb(skb);
         }
         mutex_unlock(&rx_queue_mutex);
@@ -997,7 +999,7 @@ show_conn_int_param_##param(struct class_device *cdev, char *buf)	\
         struct iscsi_cls_conn *conn = iscsi_cdev_to_conn(cdev);         \
         struct iscsi_transport *t = conn->transport;                    \
                                                                         \
-        t->get_conn_param(conn->dd_data, param, &value);                \
+        t->get_conn_param(conn, param, &value);                         \
         return snprintf(buf, 20, format"\n", value);                    \
 }
 
@@ -1024,10 +1026,9 @@ show_session_int_param_##param(struct class_device *cdev, char *buf)	\
 {                                                                       \
         uint32_t value = 0;                                             \
         struct iscsi_cls_session *session = iscsi_cdev_to_session(cdev);        \
-        struct Scsi_Host *shost = iscsi_session_to_shost(session);      \
         struct iscsi_transport *t = session->transport;                 \
                                                                         \
-        t->get_session_param(shost, param, &value);                     \
+        t->get_session_param(session, param, &value);                   \
         return snprintf(buf, 20, format"\n", value);                    \
 }
 
@@ -1121,7 +1122,6 @@ iscsi_register_transport(struct iscsi_transport *tt)
                 return NULL;
         memset(priv, 0, sizeof(*priv));
         INIT_LIST_HEAD(&priv->list);
-        INIT_LIST_HEAD(&priv->sessions);
         priv->iscsi_transport = tt;
 
         priv->cdev.class = &iscsi_transport_class;
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 930db398d107..9d9872347f56 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -89,6 +89,11 @@
 #define SD_MAX_RETRIES          5
 #define SD_PASSTHROUGH_RETRIES  1
 
+/*
+ * Size of the initial data buffer for mode and read capacity data
+ */
+#define SD_BUF_SIZE             512
+
 static void scsi_disk_release(struct kref *kref);
 
 struct scsi_disk {
@@ -1239,7 +1244,7 @@ sd_do_mode_sense(struct scsi_device *sdp, int dbd, int modepage,
 
 /*
  * read write protect setting, if possible - called only in sd_revalidate_disk()
- * called with buffer of length 512
+ * called with buffer of length SD_BUF_SIZE
  */
 static void
 sd_read_write_protect_flag(struct scsi_disk *sdkp, char *diskname,
@@ -1297,7 +1302,7 @@ sd_read_write_protect_flag(struct scsi_disk *sdkp, char *diskname,
 
 /*
  * sd_read_cache_type - called only from sd_revalidate_disk()
- * called with buffer of length 512
+ * called with buffer of length SD_BUF_SIZE
  */
 static void
 sd_read_cache_type(struct scsi_disk *sdkp, char *diskname,
@@ -1342,6 +1347,8 @@ sd_read_cache_type(struct scsi_disk *sdkp, char *diskname,
 
         /* Take headers and block descriptors into account */
         len += data.header_length + data.block_descriptor_length;
+        if (len > SD_BUF_SIZE)
+                goto bad_sense;
 
         /* Get the data */
         res = sd_do_mode_sense(sdp, dbd, modepage, buffer, len, &data, &sshdr);
@@ -1354,6 +1361,12 @@ sd_read_cache_type(struct scsi_disk *sdkp, char *diskname,
                 int ct = 0;
                 int offset = data.header_length + data.block_descriptor_length;
 
+                if (offset >= SD_BUF_SIZE - 2) {
+                        printk(KERN_ERR "%s: malformed MODE SENSE response",
+                                diskname);
+                        goto defaults;
+                }
+
                 if ((buffer[offset] & 0x3f) != modepage) {
                         printk(KERN_ERR "%s: got wrong page\n", diskname);
                         goto defaults;
@@ -1398,6 +1411,7 @@ defaults:
                diskname);
         sdkp->WCE = 0;
         sdkp->RCD = 0;
+        sdkp->DPOFUA = 0;
 }
 
 /**
@@ -1421,7 +1435,7 @@ static int sd_revalidate_disk(struct gendisk *disk)
         if (!scsi_device_online(sdp))
                 goto out;
 
-        buffer = kmalloc(512, GFP_KERNEL | __GFP_DMA);
+        buffer = kmalloc(SD_BUF_SIZE, GFP_KERNEL | __GFP_DMA);
         if (!buffer) {
                 printk(KERN_WARNING "(sd_revalidate_disk:) Memory allocation "
                        "failure.\n");
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 2a547538d444..5a0a19322d01 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -2162,7 +2162,7 @@ sg_link_reserve(Sg_fd * sfp, Sg_request * srp, int size)
 
         srp->res_used = 1;
         SCSI_LOG_TIMEOUT(4, printk("sg_link_reserve: size=%d\n", size));
-        rem = size = (size + 1) & (~1); /* round to even for aha1542 */
+        rem = size;
 
         for (k = 0; k < rsv_schp->k_use_sg; ++k, ++sg) {
                 num = sg->length;
diff --git a/drivers/scsi/sr_ioctl.c b/drivers/scsi/sr_ioctl.c
index 5d02ff4db6cc..b65462f76484 100644
--- a/drivers/scsi/sr_ioctl.c
+++ b/drivers/scsi/sr_ioctl.c
@@ -192,7 +192,7 @@ int sr_do_ioctl(Scsi_CD *cd, struct packet_command *cgc)
         SDev = cd->device;
 
         if (!sense) {
-                sense = kmalloc(sizeof(*sense), GFP_KERNEL);
+                sense = kmalloc(SCSI_SENSE_BUFFERSIZE, GFP_KERNEL);
                 if (!sense) {
                         err = -ENOMEM;
                         goto out;
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c
index 8260f040d39c..2627000ca653 100644
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.c
+++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c
@@ -919,6 +919,8 @@ static int sym_prepare_setting(struct Scsi_Host *shost, struct sym_hcb *np, stru
 
                 tp->usrflags |= (SYM_DISC_ENABLED | SYM_TAGS_ENABLED);
                 tp->usrtags = SYM_SETUP_MAX_TAG;
+                tp->usr_width = np->maxwide;
+                tp->usr_period = 9;
 
                 sym_nvram_setup_target(tp, i, nvram);
 
@@ -3588,7 +3590,7 @@ static int sym_evaluate_dp(struct sym_hcb *np, struct sym_ccb *cp, u32 scr, int
 
         if (pm) {
                 dp_scr  = scr_to_cpu(pm->ret);
-                dp_ofs -= scr_to_cpu(pm->sg.size);
+                dp_ofs -= scr_to_cpu(pm->sg.size) & 0x00ffffff;
         }
 
         /*
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index b1fc97d5f643..7aca22c9976d 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -2198,7 +2198,7 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
         touch_nmi_watchdog();
 
         /*
-         *      First save the UER then disable the interrupts
+         *      First save the IER then disable the interrupts
          */
         ier = serial_in(up, UART_IER);
 
@@ -2326,6 +2326,12 @@ static struct uart_driver serial8250_reg = {
         .cons                   = SERIAL8250_CONSOLE,
 };
 
+/*
+ * early_serial_setup - early registration for 8250 ports
+ *
+ * Setup an 8250 port structure prior to console initialisation.  Use
+ * after console initialisation will cause undefined behaviour.
+ */
 int __init early_serial_setup(struct uart_port *port)
 {
         if (port->line >= ARRAY_SIZE(serial8250_ports))
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 0f4361c8466b..b3c561abe3f6 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -902,8 +902,8 @@ config SERIAL_JSM
           something like this to connect more than two modems to your Linux
           box, for instance in order to become a dial-in server. This driver
           supports PCI boards only.
-          If you have a card like this, say Y here and read the file
-          <file:Documentation/jsm.txt>.
+
+          If you have a card like this, say Y here, otherwise say N.
 
           To compile this driver as a module, choose M here: the
           module will be called jsm.
diff --git a/drivers/serial/ioc4_serial.c b/drivers/serial/ioc4_serial.c
index f3763d2ccb86..a37579ce6d76 100644
--- a/drivers/serial/ioc4_serial.c
+++ b/drivers/serial/ioc4_serial.c
@@ -2301,7 +2301,6 @@ static void receive_chars(struct uart_port *the_port)
         int read_count, request_count = IOC4_MAX_CHARS;
         struct uart_icount *icount;
         struct uart_info *info = the_port->info;
-        int flip = 0;
         unsigned long pflags;
 
         /* Make sure all the pointers are "good" ones */
@@ -2313,7 +2312,7 @@ static void receive_chars(struct uart_port *the_port)
         spin_lock_irqsave(&the_port->lock, pflags);
         tty = info->tty;
 
-        request_count = tty_buffer_request_room(tty, IOC4_MAX_CHARS - 2);
+        request_count = tty_buffer_request_room(tty, IOC4_MAX_CHARS);
 
         if (request_count > 0) {
                 icount = &the_port->icount;
@@ -2326,8 +2325,7 @@ static void receive_chars(struct uart_port *the_port)
 
         spin_unlock_irqrestore(&the_port->lock, pflags);
 
-        if (flip)
-                tty_flip_buffer_push(tty);
+        tty_flip_buffer_push(tty);
 }
 
 /**
diff --git a/drivers/serial/ip22zilog.c b/drivers/serial/ip22zilog.c
index 419dd3cd7862..193722d680cf 100644
--- a/drivers/serial/ip22zilog.c
+++ b/drivers/serial/ip22zilog.c
@@ -420,10 +420,8 @@ static void ip22zilog_transmit_chars(struct uart_ip22zilog_port *up,
         if (up->port.info == NULL)
                 goto ack_tx_int;
         xmit = &up->port.info->xmit;
-        if (uart_circ_empty(xmit)) {
-                uart_write_wakeup(&up->port);
+        if (uart_circ_empty(xmit))
                 goto ack_tx_int;
-        }
         if (uart_tx_stopped(&up->port))
                 goto ack_tx_int;
 
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 95fb4939c675..cc1faa31d124 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -71,6 +71,11 @@ static void uart_change_pm(struct uart_state *state, int pm_state);
 void uart_write_wakeup(struct uart_port *port)
 {
         struct uart_info *info = port->info;
+        /*
+         * This means you called this function _after_ the port was
+         * closed.  No cookie for you.
+         */
+        BUG_ON(!info);
         tasklet_schedule(&info->tlet);
 }
 
@@ -471,14 +476,26 @@ static void uart_flush_chars(struct tty_struct *tty)
 }
 
 static int
-uart_write(struct tty_struct *tty, const unsigned char * buf, int count)
+uart_write(struct tty_struct *tty, const unsigned char *buf, int count)
 {
         struct uart_state *state = tty->driver_data;
-        struct uart_port *port = state->port;
-        struct circ_buf *circ = &state->info->xmit;
+        struct uart_port *port;
+        struct circ_buf *circ;
         unsigned long flags;
         int c, ret = 0;
 
+        /*
+         * This means you called this function _after_ the port was
+         * closed.  No cookie for you.
+         */
+        if (!state || !state->info) {
+                WARN_ON(1);
+                return -EL3HLT;
+        }
+
+        port = state->port;
+        circ = &state->info->xmit;
+
         if (!circ->buf)
                 return 0;
 
@@ -521,6 +538,15 @@ static void uart_flush_buffer(struct tty_struct *tty)
         struct uart_port *port = state->port;
         unsigned long flags;
 
+        /*
+         * This means you called this function _after_ the port was
+         * closed.  No cookie for you.
+         */
+        if (!state || !state->info) {
+                WARN_ON(1);
+                return;
+        }
+
         DPRINTK("uart_flush_buffer(%d) called\n", tty->index);
 
         spin_lock_irqsave(&port->lock, flags);
diff --git a/drivers/serial/sn_console.c b/drivers/serial/sn_console.c
index 43e67d6c29d4..60ea4a3f0713 100644
--- a/drivers/serial/sn_console.c
+++ b/drivers/serial/sn_console.c
@@ -820,7 +820,7 @@ static int __init sn_sal_module_init(void)
         int retval;
 
         if (!ia64_platform_is("sn2"))
-                return -ENODEV;
+                return 0;
 
         printk(KERN_INFO "sn_console: Console driver init\n");
 
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index 308704566948..4e453fa966ae 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -299,13 +299,10 @@ static void sunsu_start_tx(struct uart_port *port)
 static void sunsu_stop_rx(struct uart_port *port)
 {
         struct uart_sunsu_port *up = (struct uart_sunsu_port *) port;
-        unsigned long flags;
 
-        spin_lock_irqsave(&up->port.lock, flags);
         up->ier &= ~UART_IER_RLSI;
         up->port.read_status_mask &= ~UART_LSR_DR;
         serial_out(up, UART_IER, up->ier);
-        spin_unlock_irqrestore(&up->port.lock, flags);
 }
 
 static void sunsu_enable_ms(struct uart_port *port)
diff --git a/drivers/sn/Kconfig b/drivers/sn/Kconfig
index d95265b187a3..a34731625877 100644
--- a/drivers/sn/Kconfig
+++ b/drivers/sn/Kconfig
@@ -3,10 +3,11 @@
 #
 
 menu "SN Devices"
+        depends on SGI_SN
 
 config SGI_IOC4
         tristate "SGI IOC4 Base IO support"
-        depends on (IA64_GENERIC || IA64_SGI_SN2) && MMTIMER
+        depends on MMTIMER
         default m
         ---help---
         This option enables basic support for the SGI IOC4-based Base IO
@@ -19,7 +20,6 @@ config SGI_IOC4
 
 config SGI_IOC3
         tristate "SGI IOC3 Base IO support"
-        depends on (IA64_GENERIC || IA64_SGI_SN2)
         default m
         ---help---
         This option enables basic support for the SGI IOC3-based Base IO
diff --git a/drivers/sn/ioc3.c b/drivers/sn/ioc3.c
index 12357e1fa558..93449a1a0065 100644
--- a/drivers/sn/ioc3.c
+++ b/drivers/sn/ioc3.c
@@ -62,7 +62,7 @@ static int nic_reset(struct ioc3_driver_data *idd)
         return presence;
 }
 
-static inline int nic_read_bit(struct ioc3_driver_data *idd)
+static int nic_read_bit(struct ioc3_driver_data *idd)
 {
         int result;
         unsigned long flags;
@@ -77,7 +77,7 @@ static inline int nic_read_bit(struct ioc3_driver_data *idd)
         return result;
 }
 
-static inline void nic_write_bit(struct ioc3_driver_data *idd, int bit)
+static void nic_write_bit(struct ioc3_driver_data *idd, int bit)
 {
         if (bit)
                 writel(mcr_pack(6, 110), &idd->vma->mcr);
@@ -371,8 +371,7 @@ static void probe_nic(struct ioc3_driver_data *idd)
 
 /* Interrupts */
 
-static inline void
-write_ireg(struct ioc3_driver_data *idd, uint32_t val, int which)
+static void write_ireg(struct ioc3_driver_data *idd, uint32_t val, int which)
 {
         unsigned long flags;
 
@@ -735,14 +734,12 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
         }
 
         /* Add this IOC3 to all submodules */
-        read_lock(&ioc3_submodules_lock);
         for(id=0;id<IOC3_MAX_SUBMODULES;id++)
                 if(ioc3_submodules[id] && ioc3_submodules[id]->probe) {
                         idd->active[id] = 1;
                         idd->active[id] = !ioc3_submodules[id]->probe
                                                 (ioc3_submodules[id], idd);
                 }
-        read_unlock(&ioc3_submodules_lock);
 
         printk(KERN_INFO "IOC3 Master Driver loaded for %s\n", pci_name(pdev));
 
@@ -767,7 +764,6 @@ static void ioc3_remove(struct pci_dev *pdev)
         idd = pci_get_drvdata(pdev);
 
         /* Remove this IOC3 from all submodules */
-        read_lock(&ioc3_submodules_lock);
         for(id=0;id<IOC3_MAX_SUBMODULES;id++)
                 if(idd->active[id]) {
                         if(ioc3_submodules[id] && ioc3_submodules[id]->remove)
@@ -781,7 +777,6 @@ static void ioc3_remove(struct pci_dev *pdev)
                                                 pci_name(pdev));
                         idd->active[id] = 0;
                 }
-        read_unlock(&ioc3_submodules_lock);
 
         /* Clear and disable all IRQs */
         write_ireg(idd, ~0, IOC3_W_IEC);
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 791c4dc550ae..94f5e8ed83a7 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -90,7 +90,7 @@ static int spi_suspend(struct device *dev, pm_message_t message)
         int                     value;
         struct spi_driver       *drv = to_spi_driver(dev->driver);
 
-        if (!drv->suspend)
+        if (!drv || !drv->suspend)
                 return 0;
 
         /* suspend will stop irqs and dma; no more i/o */
@@ -105,7 +105,7 @@ static int spi_resume(struct device *dev)
         int                     value;
         struct spi_driver       *drv = to_spi_driver(dev->driver);
 
-        if (!drv->resume)
+        if (!drv || !drv->resume)
                 return 0;
 
         /* resume may restart the i/o queue */
@@ -449,7 +449,6 @@ void spi_unregister_master(struct spi_master *master)
 {
         (void) device_for_each_child(master->cdev.dev, NULL, __unregister);
         class_device_unregister(&master->cdev);
-        master->cdev.dev = NULL;
 }
 EXPORT_SYMBOL_GPL(spi_unregister_master);
 
diff --git a/drivers/usb/gadget/lh7a40x_udc.c b/drivers/usb/gadget/lh7a40x_udc.c
index e02fea5a5433..1a362c5e7f3d 100644
--- a/drivers/usb/gadget/lh7a40x_udc.c
+++ b/drivers/usb/gadget/lh7a40x_udc.c
@@ -1062,11 +1062,11 @@ static int lh7a40x_ep_enable(struct usb_ep *_ep,
         ep->pio_irqs = 0;
         ep->ep.maxpacket = le16_to_cpu(desc->wMaxPacketSize);
 
+        spin_unlock_irqrestore(&ep->dev->lock, flags);
+
         /* Reset halt state (does flush) */
         lh7a40x_set_halt(_ep, 0);
 
-        spin_unlock_irqrestore(&ep->dev->lock, flags);
-
         DEBUG("%s: enabled %s\n", __FUNCTION__, _ep->name);
         return 0;
 }
@@ -1775,6 +1775,7 @@ static void lh7a40x_ep0_setup(struct lh7a40x_udc *dev, u32 csr)
                                         break;
 
                                 qep = &dev->ep[ep_num];
+                                spin_unlock(&dev->lock);
                                 if (ctrl.bRequest == USB_REQ_SET_FEATURE) {
                                         DEBUG_SETUP("SET_FEATURE (%d)\n",
                                                     ep_num);
@@ -1784,6 +1785,7 @@ static void lh7a40x_ep0_setup(struct lh7a40x_udc *dev, u32 csr)
                                                     ep_num);
                                         lh7a40x_set_halt(&qep->ep, 0);
                                 }
+                                spin_lock(&dev->lock);
                                 usb_set_index(0);
 
                                 /* Reply with a ZLP on next IN token */
diff --git a/drivers/usb/gadget/rndis.c b/drivers/usb/gadget/rndis.c
index 9689efeb364c..6d6eaad73968 100644
--- a/drivers/usb/gadget/rndis.c
+++ b/drivers/usb/gadget/rndis.c
@@ -853,11 +853,14 @@ static int rndis_query_response (int configNr, rndis_query_msg_type *buf)
         // DEBUG("%s: OID = %08X\n", __FUNCTION__, cpu_to_le32(buf->OID));
         if (!rndis_per_dev_params [configNr].dev) return -ENOTSUPP;
         
-        /* 
-         * we need more memory: 
-         * oid_supported_list is the largest answer 
+        /*
+         * we need more memory:
+         * gen_ndis_query_resp expects enough space for
+         * rndis_query_cmplt_type followed by data.
+         * oid_supported_list is the largest data reply
          */
-        r = rndis_add_response (configNr, sizeof (oid_supported_list));
+        r = rndis_add_response (configNr,
+                sizeof (oid_supported_list) + sizeof(rndis_query_cmplt_type));
         if (!r)
                 return -ENOMEM;
         resp = (rndis_query_cmplt_type *) r->buf;
diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index 118288d94423..9e81c26313f9 100644
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -260,12 +260,13 @@ static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev)
                                                 offset + EHCI_USBLEGCTLSTS,
                                                 val | EHCI_USBLEGCTLSTS_SOOE);
 #endif
-                        }
 
-                        /* always say Linux will own the hardware
-                         * by setting EHCI_USBLEGSUP_OS.
-                         */
-                        pci_write_config_byte(pdev, offset + 3, 1);
+                                /* some systems get upset if this semaphore is
+                                 * set for any other reason than forcing a BIOS
+                                 * handoff..
+                                 */
+                                pci_write_config_byte(pdev, offset + 3, 1);
+                        }
 
                         /* if boot firmware now owns EHCI, spin till
                          * it hands it over.
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c
index 772478086bd3..07a012f88772 100644
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
@@ -1407,6 +1407,7 @@ void hid_init_reports(struct hid_device *hid)
 #define USB_VENDOR_ID_WISEGROUP         0x0925
 #define USB_DEVICE_ID_1_PHIDGETSERVO_20 0x8101
 #define USB_DEVICE_ID_4_PHIDGETSERVO_20 0x8104
+#define USB_DEVICE_ID_DUAL_USB_JOYPAD   0x8866
 
 #define USB_VENDOR_ID_CODEMERCS         0x07c0
 #define USB_DEVICE_ID_CODEMERCS_IOW40   0x1500
@@ -1577,6 +1578,7 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_USBHUB_KB, HID_QUIRK_NOGET},
         { USB_VENDOR_ID_HP, USB_DEVICE_ID_HP_USBHUB_KB, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_TANGTOP, USB_DEVICE_ID_TANGTOP_USBPS2, HID_QUIRK_NOGET },
+        { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
 
         { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_POWERMOUSE, HID_QUIRK_2WHEEL_POWERMOUSE },
         { USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU, HID_QUIRK_2WHEEL_MOUSE_HACK_7 },
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index f2b4ca8692d8..c145e1ed8429 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -469,8 +469,14 @@ static struct usb_device_id id_table_combined [] = {
         { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_7_PID) },
         { USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_ACTIVE_ROBOTS_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_MHAM_KW_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_MHAM_YS_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_MHAM_Y6_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_MHAM_Y8_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_MHAM_IC_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_MHAM_DB9_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_MHAM_RS232_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_MHAM_Y9_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_TERATRONIK_VCP_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_TERATRONIK_D2XX_PID) },
         { USB_DEVICE(EVOLUTION_VID, EVOLUTION_ER1_PID) },
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index ca40f16370f1..bdef3b8c731f 100644
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -333,10 +333,18 @@
 
 /*
  * microHAM product IDs (http://www.microham.com).
- * Submitted by Justin Burket (KL1RL) <zorton@jtan.com>.
+ * Submitted by Justin Burket (KL1RL) <zorton@jtan.com>
+ * and Mike Studer (K6EEP) <k6eep@hamsoftware.org>.
+ * Ian Abbott <abbotti@mev.co.uk> added a few more from the driver INF file.
  */
+#define FTDI_MHAM_KW_PID 0xEEE8         /* USB-KW interface */
+#define FTDI_MHAM_YS_PID 0xEEE9         /* USB-YS interface */
 #define FTDI_MHAM_Y6_PID 0xEEEA         /* USB-Y6 interface */
 #define FTDI_MHAM_Y8_PID 0xEEEB         /* USB-Y8 interface */
+#define FTDI_MHAM_IC_PID 0xEEEC         /* USB-IC interface */
+#define FTDI_MHAM_DB9_PID 0xEEED        /* USB-DB9 interface */
+#define FTDI_MHAM_RS232_PID 0xEEEE      /* USB-RS232 interface */
+#define FTDI_MHAM_Y9_PID 0xEEEF         /* USB-Y9 interface */
 
 /*
  * Active Robots product ids.
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 4dd6865d32b0..b5c96e74a903 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -242,8 +242,10 @@ static void serial_close(struct tty_struct *tty, struct file * filp)
 
         down(&port->sem);
 
-        if (port->open_count == 0)
-                goto out;
+        if (port->open_count == 0) {
+                up(&port->sem);
+                return;
+        }
 
         --port->open_count;
         if (port->open_count == 0) {
@@ -260,10 +262,8 @@ static void serial_close(struct tty_struct *tty, struct file * filp)
                 module_put(port->serial->type->driver.owner);
         }
 
-        kref_put(&port->serial->kref, destroy_serial);
-
-out:
         up(&port->sem);
+        kref_put(&port->serial->kref, destroy_serial);
 }
 
 static int serial_write (struct tty_struct * tty, const unsigned char *buf, int count)
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
index bce3d55affd8..11a48d874752 100644
--- a/drivers/usb/serial/visor.c
+++ b/drivers/usb/serial/visor.c
@@ -69,6 +69,8 @@ static struct usb_device_id id_table [] = {
                 .driver_info = (kernel_ulong_t)&palm_os_4_probe },
         { USB_DEVICE(HANDSPRING_VENDOR_ID, HANDSPRING_TREO600_ID),
                 .driver_info = (kernel_ulong_t)&palm_os_4_probe },
+        { USB_DEVICE(GSPDA_VENDOR_ID, GSPDA_XPLORE_M68_ID),
+                .driver_info = (kernel_ulong_t)&palm_os_4_probe },
         { USB_DEVICE(PALM_VENDOR_ID, PALM_M500_ID),
                 .driver_info = (kernel_ulong_t)&palm_os_4_probe },
         { USB_DEVICE(PALM_VENDOR_ID, PALM_M505_ID),
@@ -139,6 +141,7 @@ static struct usb_device_id id_table_combined [] = {
         { USB_DEVICE(HANDSPRING_VENDOR_ID, HANDSPRING_VISOR_ID) },
         { USB_DEVICE(HANDSPRING_VENDOR_ID, HANDSPRING_TREO_ID) },
         { USB_DEVICE(HANDSPRING_VENDOR_ID, HANDSPRING_TREO600_ID) },
+        { USB_DEVICE(GSPDA_VENDOR_ID, GSPDA_XPLORE_M68_ID) },
         { USB_DEVICE(PALM_VENDOR_ID, PALM_M500_ID) },
         { USB_DEVICE(PALM_VENDOR_ID, PALM_M505_ID) },
         { USB_DEVICE(PALM_VENDOR_ID, PALM_M515_ID) },
diff --git a/drivers/usb/serial/visor.h b/drivers/usb/serial/visor.h
index b84d1cb4c693..765118d83fb6 100644
--- a/drivers/usb/serial/visor.h
+++ b/drivers/usb/serial/visor.h
@@ -36,6 +36,9 @@
 #define PALM_ZIRE_ID                    0x0070
 #define PALM_M100_ID                    0x0080
 
+#define GSPDA_VENDOR_ID         0x115e
+#define GSPDA_XPLORE_M68_ID             0xf100
+
 #define SONY_VENDOR_ID                  0x054C
 #define SONY_CLIE_3_5_ID                0x0038
 #define SONY_CLIE_4_0_ID                0x0066
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index e71c5ca1a07b..31ca92056c27 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -753,6 +753,13 @@ UNUSUAL_DEV(  0x0693, 0x0005, 0x0100, 0x0100,
                 "Flashgate",
                 US_SC_SCSI, US_PR_BULK, NULL, 0 ), 
 
+/* Reported by David Hamilton <niftimusmaximus@lycos.com> */
+UNUSUAL_DEV(  0x069b, 0x3004, 0x0001, 0x0001,
+                "Thomson Multimedia Inc.",
+                "RCA RD1080 MP3 Player",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_FIX_CAPACITY ),
+
 UNUSUAL_DEV(  0x0781, 0x0001, 0x0200, 0x0200, 
                 "Sandisk",
                 "ImageMate SDDR-05a",
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index e64ed16bd42f..f5079c78ba4e 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -520,7 +520,7 @@ config FB_GBE
 config FB_GBE_MEM
         int "Video memory size in MB"
         depends on FB_GBE
-        default 8
+        default 4
         help
           This is the amount of memory reserved for the framebuffer,
           which can be any value between 1MB and 8MB.
diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c
index df8e5667b348..466042808daf 100644
--- a/drivers/video/arcfb.c
+++ b/drivers/video/arcfb.c
@@ -253,7 +253,7 @@ static void arcfb_lcd_update_page(struct arcfb_par *par, unsigned int upper,
 {
         unsigned char *src;
         unsigned int xindex, yindex, chipindex, linesize;
-        int i, count;
+        int i;
         unsigned char val;
         unsigned char bitmask, rightshift;
 
@@ -282,7 +282,6 @@ static void arcfb_lcd_update_page(struct arcfb_par *par, unsigned int upper,
                 }
                 ks108_writeb_data(par, chipindex, val);
                 left++;
-                count++;
                 if (bitmask == 0x80) {
                         bitmask = 1;
                         src++;
@@ -460,11 +459,11 @@ static ssize_t arcfb_write(struct file *file, const char __user *buf, size_t cou
         inode = file->f_dentry->d_inode;
         fbidx = iminor(inode);
         info = registered_fb[fbidx];
-        par = info->par;
 
         if (!info || !info->screen_base)
                 return -ENODEV;
 
+        par = info->par;
         xres = info->var.xres;
         fbmemlength = (xres * info->var.yres)/8;
 
diff --git a/drivers/video/asiliantfb.c b/drivers/video/asiliantfb.c
index 69f75547865d..c924d81f7978 100644
--- a/drivers/video/asiliantfb.c
+++ b/drivers/video/asiliantfb.c
@@ -322,32 +322,29 @@ static int asiliantfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
         writeb(green, mmio_base + 0x791);
         writeb(blue, mmio_base + 0x791);
 
-        switch(p->var.bits_per_pixel) {
-        case 15:
-                if (regno < 16) {
+        if (regno < 16) {
+                switch(p->var.red.offset) {
+                case 10: /* RGB 555 */
                         ((u32 *)(p->pseudo_palette))[regno] =
                                 ((red & 0xf8) << 7) |
                                 ((green & 0xf8) << 2) |
                                 ((blue & 0xf8) >> 3);
-                }
-                break;
-        case 16:
-                if (regno < 16) {
+                        break;
+                case 11: /* RGB 565 */
                         ((u32 *)(p->pseudo_palette))[regno] =
                                 ((red & 0xf8) << 8) |
                                 ((green & 0xfc) << 3) |
                                 ((blue & 0xf8) >> 3);
-                }
-                break;
-        case 24:
-                if (regno < 24) {
+                        break;
+                case 16: /* RGB 888 */
                         ((u32 *)(p->pseudo_palette))[regno] =
                                 (red << 16)  |
                                 (green << 8) |
                                 (blue);
+                        break;
                 }
-                break;
         }
+
         return 0;
 }
 
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index bfc8a93b2c73..620c9a934e0e 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -1326,7 +1326,7 @@ static int aty128_var_to_pll(u32 period_in_ps, struct aty128_pll *pll,
         unsigned char post_dividers[] = {1,2,4,8,3,6,12};
         u32 output_freq;
         u32 vclk;        /* in .01 MHz */
-        int i;
+        int i = 0;
         u32 n, d;
 
         vclk = 100000000 / period_in_ps;        /* convert units to 10 kHz */
@@ -1340,15 +1340,16 @@ static int aty128_var_to_pll(u32 period_in_ps, struct aty128_pll *pll,
         /* now, find an acceptable divider */
         for (i = 0; i < sizeof(post_dividers); i++) {
                 output_freq = post_dividers[i] * vclk;
-                if (output_freq >= c.ppll_min && output_freq <= c.ppll_max)
+                if (output_freq >= c.ppll_min && output_freq <= c.ppll_max) {
+                        pll->post_divider = post_dividers[i];
                         break;
+                }
         }
 
         /* calculate feedback divider */
         n = c.ref_divider * output_freq;
         d = c.ref_clk;
 
-        pll->post_divider = post_dividers[i];
         pll->feedback_divider = round_div(n, d);
         pll->vclk = vclk;
 
diff --git a/drivers/video/aty/radeon_monitor.c b/drivers/video/aty/radeon_monitor.c
index 7f9838dceab5..98c05bc0de44 100644
--- a/drivers/video/aty/radeon_monitor.c
+++ b/drivers/video/aty/radeon_monitor.c
@@ -396,6 +396,10 @@ static int __devinit radeon_parse_monitor_layout(struct radeonfb_info *rinfo,
                                 s1[i] = *s;
                         i++;
                 }
+
+                if (i > 4)
+                        i = 4;
+
         } while (*s++);
         if (second)
                 s2[i] = 0;
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c
index 556895e99645..1f8d805c61e5 100644
--- a/drivers/video/aty/radeon_pm.c
+++ b/drivers/video/aty/radeon_pm.c
@@ -1321,8 +1321,6 @@ static void radeon_pm_full_reset_sdram(struct radeonfb_info *rinfo)
         mdelay( 15);
 }
 
-#ifdef CONFIG_PPC_OF
-
 static void radeon_pm_reset_pad_ctlr_strength(struct radeonfb_info *rinfo)
 {
         u32 tmp, tmp2;
@@ -1836,6 +1834,8 @@ static void radeon_reinitialize_M10(struct radeonfb_info *rinfo)
         radeon_pm_m10_enable_lvds_spread_spectrum(rinfo);
 }
 
+#ifdef CONFIG_PPC_OF
+
 static void radeon_pm_m9p_reconfigure_mc(struct radeonfb_info *rinfo)
 {
         OUTREG(MC_CNTL, rinfo->save_regs[46]);
@@ -2728,13 +2728,23 @@ void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk)
                 printk("radeonfb: Dynamic Clock Power Management disabled\n");
         }
 
+#if defined(CONFIG_PM)
         /* Check if we can power manage on suspend/resume. We can do
          * D2 on M6, M7 and M9, and we can resume from D3 cold a few other
          * "Mac" cards, but that's all. We need more infos about what the
          * BIOS does tho. Right now, all this PM stuff is pmac-only for that
          * reason. --BenH
          */
-#if defined(CONFIG_PM) && defined(CONFIG_PPC_PMAC)
+        /* Special case for Samsung P35 laptops
+         */
+        if ((rinfo->pdev->vendor == PCI_VENDOR_ID_ATI) &&
+            (rinfo->pdev->device == PCI_CHIP_RV350_NP) &&
+            (rinfo->pdev->subsystem_vendor == PCI_VENDOR_ID_SAMSUNG) &&
+            (rinfo->pdev->subsystem_device == 0xc00c)) {
+                rinfo->reinit_func = radeon_reinitialize_M10;
+                rinfo->pm_mode |= radeon_pm_off;
+        }
+#if defined(CONFIG_PPC_PMAC)
         if (_machine == _MACH_Pmac && rinfo->of_node) {
                 if (rinfo->is_mobility && rinfo->pm_reg &&
                     rinfo->family <= CHIP_FAMILY_RV250)
@@ -2778,7 +2788,8 @@ void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk)
                 OUTREG(TV_DAC_CNTL, INREG(TV_DAC_CNTL) | 0x07000000);
 #endif
         }
-#endif /* defined(CONFIG_PM) && defined(CONFIG_PPC_PMAC) */
+#endif /* defined(CONFIG_PPC_PMAC) */
+#endif /* defined(CONFIG_PM) */
 }
 
 void radeonfb_pm_exit(struct radeonfb_info *rinfo)
diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c
index 2406899f1207..3d04b2def0f1 100644
--- a/drivers/video/au1100fb.c
+++ b/drivers/video/au1100fb.c
@@ -49,6 +49,7 @@
 #include <linux/interrupt.h>
 #include <linux/ctype.h>
 #include <linux/dma-mapping.h>
+#include <linux/platform_device.h>
 
 #include <asm/mach-au1x00/au1000.h>
 
@@ -406,7 +407,7 @@ int au1100fb_fb_mmap(struct fb_info *fbi, struct vm_area_struct *vma)
 
         vma->vm_flags |= VM_IO;
 
-        if (io_remap_page_range(vma, vma->vm_start, off,
+        if (io_remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT,
                                 vma->vm_end - vma->vm_start,
                                 vma->vm_page_prot)) {
                 return -EAGAIN;
diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
index bd39bbd88d41..151fda8dded0 100644
--- a/drivers/video/backlight/backlight.c
+++ b/drivers/video/backlight/backlight.c
@@ -172,7 +172,7 @@ struct backlight_device *backlight_device_register(const char *name, void *devda
 
         new_bd = kmalloc(sizeof(struct backlight_device), GFP_KERNEL);
         if (unlikely(!new_bd))
-                return ERR_PTR(ENOMEM);
+                return ERR_PTR(-ENOMEM);
 
         init_MUTEX(&new_bd->sem);
         new_bd->props = bp;
diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c
index 9e32485ee7bb..86908a60c630 100644
--- a/drivers/video/backlight/lcd.c
+++ b/drivers/video/backlight/lcd.c
@@ -171,7 +171,7 @@ struct lcd_device *lcd_device_register(const char *name, void *devdata,
 
         new_ld = kmalloc(sizeof(struct lcd_device), GFP_KERNEL);
         if (unlikely(!new_ld))
-                return ERR_PTR(ENOMEM);
+                return ERR_PTR(-ENOMEM);
 
         init_MUTEX(&new_ld->sem);
         new_ld->props = lp;
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index 12d9329d1408..5a86978537d2 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -509,57 +509,60 @@ static int vgacon_doresize(struct vc_data *c,
 {
         unsigned long flags;
         unsigned int scanlines = height * c->vc_font.height;
-        u8 scanlines_lo, r7, vsync_end, mode, max_scan;
+        u8 scanlines_lo = 0, r7 = 0, vsync_end = 0, mode, max_scan;
 
         spin_lock_irqsave(&vga_lock, flags);
 
-        outb_p(VGA_CRTC_MAX_SCAN, vga_video_port_reg);
-        max_scan = inb_p(vga_video_port_val);
-
-        if (max_scan & 0x80)
-                scanlines <<= 1;
-
         vgacon_xres = width * VGA_FONTWIDTH;
         vgacon_yres = height * c->vc_font.height;
-        outb_p(VGA_CRTC_MODE, vga_video_port_reg);
-        mode = inb_p(vga_video_port_val);
+        if (vga_video_type >= VIDEO_TYPE_VGAC) {
+                outb_p(VGA_CRTC_MAX_SCAN, vga_video_port_reg);
+                max_scan = inb_p(vga_video_port_val);
 
-        if (mode & 0x04)
-                scanlines >>= 1;
+                if (max_scan & 0x80)
+                        scanlines <<= 1;
 
-        scanlines -= 1;
-        scanlines_lo = scanlines & 0xff;
+                outb_p(VGA_CRTC_MODE, vga_video_port_reg);
+                mode = inb_p(vga_video_port_val);
 
-        outb_p(VGA_CRTC_OVERFLOW, vga_video_port_reg);
-        r7 = inb_p(vga_video_port_val) & ~0x42;
+                if (mode & 0x04)
+                        scanlines >>= 1;
 
-        if (scanlines & 0x100)
-                r7 |= 0x02;
-        if (scanlines & 0x200)
-                r7 |= 0x40;
+                scanlines -= 1;
+                scanlines_lo = scanlines & 0xff;
 
-        /* deprotect registers */
-        outb_p(VGA_CRTC_V_SYNC_END, vga_video_port_reg);
-        vsync_end = inb_p(vga_video_port_val);
-        outb_p(VGA_CRTC_V_SYNC_END, vga_video_port_reg);
-        outb_p(vsync_end & ~0x80, vga_video_port_val);
+                outb_p(VGA_CRTC_OVERFLOW, vga_video_port_reg);
+                r7 = inb_p(vga_video_port_val) & ~0x42;
+
+                if (scanlines & 0x100)
+                        r7 |= 0x02;
+                if (scanlines & 0x200)
+                        r7 |= 0x40;
+
+                /* deprotect registers */
+                outb_p(VGA_CRTC_V_SYNC_END, vga_video_port_reg);
+                vsync_end = inb_p(vga_video_port_val);
+                outb_p(VGA_CRTC_V_SYNC_END, vga_video_port_reg);
+                outb_p(vsync_end & ~0x80, vga_video_port_val);
+        }
 
         outb_p(VGA_CRTC_H_DISP, vga_video_port_reg);
         outb_p(width - 1, vga_video_port_val);
         outb_p(VGA_CRTC_OFFSET, vga_video_port_reg);
         outb_p(width >> 1, vga_video_port_val);
 
-        outb_p(VGA_CRTC_V_DISP_END, vga_video_port_reg);
-        outb_p(scanlines_lo, vga_video_port_val);
-        outb_p(VGA_CRTC_OVERFLOW, vga_video_port_reg);
-        outb_p(r7,vga_video_port_val);
+        if (vga_video_type >= VIDEO_TYPE_VGAC) {
+                outb_p(VGA_CRTC_V_DISP_END, vga_video_port_reg);
+                outb_p(scanlines_lo, vga_video_port_val);
+                outb_p(VGA_CRTC_OVERFLOW, vga_video_port_reg);
+                outb_p(r7,vga_video_port_val);
 
-        /* reprotect registers */
-        outb_p(VGA_CRTC_V_SYNC_END, vga_video_port_reg);
-        outb_p(vsync_end, vga_video_port_val);
+                /* reprotect registers */
+                outb_p(VGA_CRTC_V_SYNC_END, vga_video_port_reg);
+                outb_p(vsync_end, vga_video_port_val);
+        }
 
         spin_unlock_irqrestore(&vga_lock, flags);
-
         return 0;
 }
 
diff --git a/drivers/video/gbefb.c b/drivers/video/gbefb.c
index 38d22729b129..5e25b9860196 100644
--- a/drivers/video/gbefb.c
+++ b/drivers/video/gbefb.c
@@ -656,12 +656,15 @@ static int gbefb_set_par(struct fb_info *info)
         switch (bytesPerPixel) {
         case 1:
                 SET_GBE_FIELD(WID, TYP, val, GBE_CMODE_I8);
+                info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
                 break;
         case 2:
                 SET_GBE_FIELD(WID, TYP, val, GBE_CMODE_ARGB5);
+                info->fix.visual = FB_VISUAL_TRUECOLOR;
                 break;
         case 4:
                 SET_GBE_FIELD(WID, TYP, val, GBE_CMODE_RGB8);
+                info->fix.visual = FB_VISUAL_TRUECOLOR;
                 break;
         }
         SET_GBE_FIELD(WID, BUF, val, GBE_BMODE_BOTH);
@@ -1243,7 +1246,7 @@ static int __devexit gbefb_remove(struct platform_device* p_dev)
                           (void *)gbe_tiles.cpu, gbe_tiles.dma);
         release_mem_region(GBE_BASE, sizeof(struct sgi_gbe));
         iounmap(gbe);
-        gbefb_remove_sysfs(dev);
+        gbefb_remove_sysfs(&p_dev->dev);
         framebuffer_release(info);
 
         return 0;
diff --git a/drivers/video/imsttfb.c b/drivers/video/imsttfb.c
index ad416ae47596..7db42542eb19 100644
--- a/drivers/video/imsttfb.c
+++ b/drivers/video/imsttfb.c
@@ -1510,6 +1510,8 @@ imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 default:
                         printk(KERN_INFO "imsttfb: Device 0x%x unknown, "
                                          "contact maintainer.\n", pdev->device);
+                        release_mem_region(addr, size);
+                        framebuffer_release(info);
                         return -ENODEV;
         }
 
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
index 6b8bd3cdf9c0..995b47c165a7 100644
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
@@ -1333,33 +1333,35 @@ intelfb_setcolreg(unsigned regno, unsigned red, unsigned green,
         if (regno > 255)
                 return 1;
 
-        switch (dinfo->depth) {
-        case 8:
-                {
-                        red >>= 8;
-                        green >>= 8;
-                        blue >>= 8;
+        if (dinfo->depth == 8) {
+                red >>= 8;
+                green >>= 8;
+                blue >>= 8;
+
+                intelfbhw_setcolreg(dinfo, regno, red, green, blue,
+                                    transp);
+        }
 
-                        intelfbhw_setcolreg(dinfo, regno, red, green, blue,
-                                            transp);
+        if (regno < 16) {
+                switch (dinfo->depth) {
+                case 15:
+                        dinfo->pseudo_palette[regno] = ((red & 0xf800) >>  1) |
+                                ((green & 0xf800) >>  6) |
+                                ((blue & 0xf800) >> 11);
+                        break;
+                case 16:
+                        dinfo->pseudo_palette[regno] = (red & 0xf800) |
+                                ((green & 0xfc00) >>  5) |
+                                ((blue  & 0xf800) >> 11);
+                        break;
+                case 24:
+                        dinfo->pseudo_palette[regno] = ((red & 0xff00) << 8) |
+                                (green & 0xff00) |
+                                ((blue  & 0xff00) >> 8);
+                        break;
                 }
-                break;
-        case 15:
-                dinfo->pseudo_palette[regno] = ((red & 0xf800) >>  1) |
-                                               ((green & 0xf800) >>  6) |
-                                               ((blue & 0xf800) >> 11);
-                break;
-        case 16:
-                dinfo->pseudo_palette[regno] = (red & 0xf800) |
-                                               ((green & 0xfc00) >>  5) |
-                                               ((blue  & 0xf800) >> 11);
-                break;
-        case 24:
-                dinfo->pseudo_palette[regno] = ((red & 0xff00) << 8) |
-                                               (green & 0xff00) |
-                                               ((blue  & 0xff00) >> 8);
-                break;
         }
+
         return 0;
 }
 
diff --git a/drivers/video/kyro/STG4000VTG.c b/drivers/video/kyro/STG4000VTG.c
index 3690b04190af..bd389709d234 100644
--- a/drivers/video/kyro/STG4000VTG.c
+++ b/drivers/video/kyro/STG4000VTG.c
@@ -17,7 +17,7 @@
 void DisableVGA(volatile STG4000REG __iomem *pSTGReg)
 {
         u32 tmp;
-        volatile u32 count, i;
+        volatile u32 count = 0, i;
 
         /* Reset the VGA registers */
         tmp = STG_READ_REG(SoftwareReset);
diff --git a/drivers/video/neofb.c b/drivers/video/neofb.c
index b85e2b180a44..b961d5601bd9 100644
--- a/drivers/video/neofb.c
+++ b/drivers/video/neofb.c
@@ -486,10 +486,8 @@ static void vgaHWRestore(const struct fb_info *info,
 static inline int neo2200_sync(struct fb_info *info)
 {
         struct neofb_par *par = info->par;
-        int waitcycles;
 
-        while (readl(&par->neo2200->bltStat) & 1)
-                waitcycles++;
+        while (readl(&par->neo2200->bltStat) & 1);
         return 0;
 }
 
@@ -843,6 +841,9 @@ static int neofb_set_par(struct fb_info *info)
 
         par->SysIfaceCntl2 = 0xc0;      /* VESA Bios sets this to 0x80! */
 
+        /* Initialize: by default, we want display config register to be read */
+        par->PanelDispCntlRegRead = 1;
+
         /* Enable any user specified display devices. */
         par->PanelDispCntlReg1 = 0x00;
         if (par->internal_display)
@@ -1334,11 +1335,17 @@ static int neofb_blank(int blank_mode, struct fb_info *info)
         struct neofb_par *par = info->par;
         int seqflags, lcdflags, dpmsflags, reg;
 
+
         /*
-         * Reload the value stored in the register, might have been changed via
-         * FN keystroke
+         * Reload the value stored in the register, if sensible. It might have
+         * been changed via FN keystroke.
          */
-        par->PanelDispCntlReg1 = vga_rgfx(NULL, 0x20) & 0x03;
+        if (par->PanelDispCntlRegRead) {
+                neoUnlock();
+                par->PanelDispCntlReg1 = vga_rgfx(NULL, 0x20) & 0x03;
+                neoLock(&par->state);
+        }
+        par->PanelDispCntlRegRead = !blank_mode;
 
         switch (blank_mode) {
         case FB_BLANK_POWERDOWN:        /* powerdown - both sync lines down */
diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c
index e5d0f92eeae3..feec47bdd479 100644
--- a/drivers/video/s1d13xxxfb.c
+++ b/drivers/video/s1d13xxxfb.c
@@ -588,6 +588,7 @@ s1d13xxxfb_probe(struct platform_device *pdev)
                 goto bail;
         }
 
+        platform_set_drvdata(pdev, info);
         default_par = info->par;
         default_par->regs = ioremap_nocache(pdev->resource[1].start,
                         pdev->resource[1].end - pdev->resource[1].start +1);
@@ -638,8 +639,6 @@ s1d13xxxfb_probe(struct platform_device *pdev)
                 goto bail;
         }
 
-        platform_set_drvdata(pdev, info);
-
         printk(KERN_INFO "fb%d: %s frame buffer device\n",
                info->node, info->fix.id);
 
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index d574dd3c9c8a..9451932fbaf2 100644
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -82,7 +82,6 @@
 #include <linux/fb.h>
 #include <linux/init.h>
 #include <linux/dma-mapping.h>
-#include <linux/string.h>
 #include <linux/interrupt.h>
 #include <linux/workqueue.h>
 #include <linux/wait.h>
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c
index ab727eaa7f43..10e6b3aab9ea 100644
--- a/drivers/video/savage/savagefb_driver.c
+++ b/drivers/video/savage/savagefb_driver.c
@@ -2021,8 +2021,8 @@ static int __devinit savagefb_probe (struct pci_dev* dev,
 #if defined(CONFIG_FB_SAVAGE_I2C)
         savagefb_create_i2c_busses(info);
         savagefb_probe_i2c_connector(info, &par->edid);
-        kfree(par->edid);
         fb_edid_to_monspecs(par->edid, &info->monspecs);
+        kfree(par->edid);
         fb_videomode_to_modelist(info->monspecs.modedb,
                                  info->monspecs.modedb_len,
                                  &info->modelist);
diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c
index 3e7baf4c9fa8..5e5328d682db 100644
--- a/drivers/video/tdfxfb.c
+++ b/drivers/video/tdfxfb.c
@@ -786,28 +786,32 @@ static int tdfxfb_setcolreg(unsigned regno, unsigned red, unsigned green,
         if (regno >= info->cmap.len || regno > 255) return 1;
    
         switch (info->fix.visual) {
-                case FB_VISUAL_PSEUDOCOLOR:
-                        rgbcol =(((u32)red   & 0xff00) << 8) |
-                                (((u32)green & 0xff00) << 0) |
-                                (((u32)blue  & 0xff00) >> 8);
-                        do_setpalentry(par, regno, rgbcol);
-                        break;
-                /* Truecolor has no hardware color palettes. */
-                case FB_VISUAL_TRUECOLOR:
+        case FB_VISUAL_PSEUDOCOLOR:
+                rgbcol =(((u32)red   & 0xff00) << 8) |
+                        (((u32)green & 0xff00) << 0) |
+                        (((u32)blue  & 0xff00) >> 8);
+                do_setpalentry(par, regno, rgbcol);
+                break;
+        /* Truecolor has no hardware color palettes. */
+        case FB_VISUAL_TRUECOLOR:
+                if (regno < 16) {
                         rgbcol = (CNVT_TOHW( red, info->var.red.length) <<
                                   info->var.red.offset) |
-                                 (CNVT_TOHW( green, info->var.green.length) <<
-                                  info->var.green.offset) |
-                                 (CNVT_TOHW( blue, info->var.blue.length) <<
-                                  info->var.blue.offset) |
-                                 (CNVT_TOHW( transp, info->var.transp.length) <<
-                                  info->var.transp.offset);
-                                par->palette[regno] = rgbcol;
-                        break;
-                default:
-                        DPRINTK("bad depth %u\n", info->var.bits_per_pixel);
-                        break;
+                                (CNVT_TOHW( green, info->var.green.length) <<
+                                 info->var.green.offset) |
+                                (CNVT_TOHW( blue, info->var.blue.length) <<
+                                 info->var.blue.offset) |
+                                (CNVT_TOHW( transp, info->var.transp.length) <<
+                                 info->var.transp.offset);
+                        par->palette[regno] = rgbcol;
+                }
+
+                break;
+        default:
+                DPRINTK("bad depth %u\n", info->var.bits_per_pixel);
+                break;
         }
+
         return 0;
 }