Merge branch 'linux-2.6' into for-2.6.24

136 files changed, 1121 insertions, 703 deletions

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 43749c86861..3f7935ab0cf 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -886,7 +886,8 @@ int __init acpi_ec_ecdt_probe(void)
                 printk(KERN_DEBUG PREFIX "Look up EC in DSDT\n");
                 status = acpi_get_devices(ec_device_ids[0].id, ec_parse_device,
                                                 boot_ec, NULL);
-                if (ACPI_FAILURE(status))
+                /* Check that acpi_get_devices actually find something */
+                if (ACPI_FAILURE(status) || !boot_ec->handle)
                         goto error;
         }
 
diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c
index 430fcf4f9ef..94546695472 100644
--- a/drivers/ata/ata_generic.c
+++ b/drivers/ata/ata_generic.c
@@ -26,7 +26,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "ata_generic"
-#define DRV_VERSION "0.2.12"
+#define DRV_VERSION "0.2.13"
 
 /*
  *      A generic parallel ATA driver using libata
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index 071d274afaa..3b8bf1812dc 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -94,7 +94,7 @@
 #include <linux/dmi.h>
 
 #define DRV_NAME        "ata_piix"
-#define DRV_VERSION     "2.11"
+#define DRV_VERSION     "2.12"
 
 enum {
         PIIX_IOCFG              = 0x54, /* IDE I/O configuration register */
@@ -130,6 +130,7 @@ enum {
         ich6m_sata_ahci         = 8,
         ich8_sata_ahci          = 9,
         piix_pata_mwdma         = 10,   /* PIIX3 MWDMA only */
+        tolapai_sata_ahci       = 11,
 
         /* constants for mapping table */
         P0                      = 0,  /* port 0 */
@@ -253,6 +254,8 @@ static const struct pci_device_id piix_pci_tbl[] = {
         { 0x8086, 0x292d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
         /* SATA Controller IDE (ICH9M) */
         { 0x8086, 0x292e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
+        /* SATA Controller IDE (Tolapai) */
+        { 0x8086, 0x5028, PCI_ANY_ID, PCI_ANY_ID, 0, 0, tolapai_sata_ahci },
 
         { }     /* terminate list */
 };
@@ -441,12 +444,25 @@ static const struct piix_map_db ich8_map_db = {
         },
 };
 
+static const struct piix_map_db tolapai_map_db = {
+        .mask = 0x3,
+        .port_enable = 0x3,
+        .map = {
+                /* PM   PS   SM   SS       MAP */
+                {  P0,  NA,  P1,  NA }, /* 00b */
+                {  RV,  RV,  RV,  RV }, /* 01b */
+                {  RV,  RV,  RV,  RV }, /* 10b */
+                {  RV,  RV,  RV,  RV },
+        },
+};
+
 static const struct piix_map_db *piix_map_db_table[] = {
         [ich5_sata]             = &ich5_map_db,
         [ich6_sata]             = &ich6_map_db,
         [ich6_sata_ahci]        = &ich6_map_db,
         [ich6m_sata_ahci]       = &ich6m_map_db,
         [ich8_sata_ahci]        = &ich8_map_db,
+        [tolapai_sata_ahci]     = &tolapai_map_db,
 };
 
 static struct ata_port_info piix_port_info[] = {
@@ -560,6 +576,17 @@ static struct ata_port_info piix_port_info[] = {
                 .mwdma_mask     = 0x06, /* mwdma1-2 ?? CHECK 0 should be ok but slow */
                 .port_ops       = &piix_pata_ops,
         },
+
+        /* tolapai_sata_ahci: 11: */
+        {
+                .sht            = &piix_sht,
+                .flags          = PIIX_SATA_FLAGS | PIIX_FLAG_SCR |
+                                  PIIX_FLAG_AHCI,
+                .pio_mask       = 0x1f, /* pio0-4 */
+                .mwdma_mask     = 0x07, /* mwdma0-2 */
+                .udma_mask      = ATA_UDMA6,
+                .port_ops       = &piix_sata_ops,
+        },
 };
 
 static struct pci_bits piix_enable_bits[] = {
@@ -908,6 +935,13 @@ static int piix_broken_suspend(void)
                         },
                 },
                 {
+                        .ident = "Satellite U200",
+                        .matches = {
+                                DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                                DMI_MATCH(DMI_PRODUCT_NAME, "Satellite U200"),
+                        },
+                },
+                {
                         .ident = "Satellite U205",
                         .matches = {
                                 DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
@@ -921,7 +955,8 @@ static int piix_broken_suspend(void)
                                 DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE M500"),
                         },
                 },
-                { }
+
+                { }     /* terminate list */
         };
         static const char *oemstrs[] = {
                 "Tecra M3,",
@@ -1139,6 +1174,41 @@ static void __devinit piix_init_sata_map(struct pci_dev *pdev,
         hpriv->map = map;
 }
 
+static void piix_iocfg_bit18_quirk(struct pci_dev *pdev)
+{
+        static struct dmi_system_id sysids[] = {
+                {
+                        /* Clevo M570U sets IOCFG bit 18 if the cdrom
+                         * isn't used to boot the system which
+                         * disables the channel.
+                         */
+                        .ident = "M570U",
+                        .matches = {
+                                DMI_MATCH(DMI_SYS_VENDOR, "Clevo Co."),
+                                DMI_MATCH(DMI_PRODUCT_NAME, "M570U"),
+                        },
+                },
+
+                { }     /* terminate list */
+        };
+        u32 iocfg;
+
+        if (!dmi_check_system(sysids))
+                return;
+
+        /* The datasheet says that bit 18 is NOOP but certain systems
+         * seem to use it to disable a channel.  Clear the bit on the
+         * affected systems.
+         */
+        pci_read_config_dword(pdev, PIIX_IOCFG, &iocfg);
+        if (iocfg & (1 << 18)) {
+                dev_printk(KERN_INFO, &pdev->dev,
+                           "applying IOCFG bit18 quirk\n");
+                iocfg &= ~(1 << 18);
+                pci_write_config_dword(pdev, PIIX_IOCFG, iocfg);
+        }
+}
+
 /**
  *      piix_init_one - Register PIIX ATA PCI device with kernel services
  *      @pdev: PCI device to register
@@ -1200,6 +1270,9 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                               piix_map_db_table[ent->driver_data]);
         }
 
+        /* apply IOCFG bit18 quirk */
+        piix_iocfg_bit18_quirk(pdev);
+
         /* On ICH5, some BIOSen disable the interrupt using the
          * PCI_COMMAND_INTX_DISABLE bit added in PCI 2.3.
          * On ICH6, this bit has the same effect, but only when
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 2ad4dda6d4a..c43de9a710d 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -1911,8 +1911,9 @@ int ata_dev_configure(struct ata_device *dev)
                                         dev->flags |= ATA_DFLAG_FLUSH_EXT;
                         }
 
-                        if (ata_id_hpa_enabled(dev->id))
-                                dev->n_sectors = ata_hpa_resize(dev);
+                        if (!(dev->horkage & ATA_HORKAGE_BROKEN_HPA) &&
+                            ata_id_hpa_enabled(dev->id))
+                                dev->n_sectors = ata_hpa_resize(dev);
 
                         /* config NCQ */
                         ata_dev_config_ncq(dev, ncq_desc, sizeof(ncq_desc));
@@ -3795,7 +3796,11 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
         { "ST9160821AS",        "3.CLF",        ATA_HORKAGE_NONCQ, },
         { "SAMSUNG HD401LJ",    "ZZ100-15",     ATA_HORKAGE_NONCQ, },
 
-        /* Devices with NCQ limits */
+        /* devices which puke on READ_NATIVE_MAX */
+        { "HDS724040KLSA80",    "KFAOA20N",     ATA_HORKAGE_BROKEN_HPA, },
+        { "WDC WD3200JD-00KLB0", "WD-WCAMR1130137", ATA_HORKAGE_BROKEN_HPA },
+        { "WDC WD2500JD-00HBB0", "WD-WMAL71490727", ATA_HORKAGE_BROKEN_HPA },
+        { "MAXTOR 6L080L4",     "A93.0500",     ATA_HORKAGE_BROKEN_HPA },
 
         /* End Marker */
         { }
@@ -3985,6 +3990,11 @@ static unsigned int ata_dev_init_params(struct ata_device *dev,
         tf.device |= (heads - 1) & 0x0f; /* max head = num. of heads - 1 */
 
         err_mask = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0);
+        /* A clean abort indicates an original or just out of spec drive
+           and we should continue as we issue the setup based on the
+           drive reported working geometry */
+        if (err_mask == AC_ERR_DEV && (tf.feature & ATA_ABORTED))
+                err_mask = 0;
 
         DPRINTK("EXIT, err_mask=%x\n", err_mask);
         return err_mask;
@@ -6025,6 +6035,7 @@ void ata_dev_init(struct ata_device *dev)
          */
         spin_lock_irqsave(ap->lock, flags);
         dev->flags &= ~ATA_DFLAG_INIT_MASK;
+        dev->horkage = 0;
         spin_unlock_irqrestore(ap->lock, flags);
 
         memset((void *)dev + ATA_DEVICE_CLEAR_OFFSET, 0,
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
index e8a28e94fe4..71bdc3b3189 100644
--- a/drivers/ata/pata_ali.c
+++ b/drivers/ata/pata_ali.c
@@ -34,7 +34,7 @@
 #include <linux/dmi.h>
 
 #define DRV_NAME "pata_ali"
-#define DRV_VERSION "0.7.4"
+#define DRV_VERSION "0.7.5"
 
 /*
  *      Cable special cases
@@ -48,6 +48,13 @@ static struct dmi_system_id cable_dmi_table[] = {
                         DMI_MATCH(DMI_BOARD_VERSION, "OmniBook N32N-736"),
                 },
         },
+        {
+                .ident = "Toshiba Satelite S1800-814",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "S1800-814"),
+                },
+        },
         { }
 };
 
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
index b09facad63e..04048fcf630 100644
--- a/drivers/ata/pata_amd.c
+++ b/drivers/ata/pata_amd.c
@@ -25,7 +25,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_amd"
-#define DRV_VERSION "0.3.8"
+#define DRV_VERSION "0.3.9"
 
 /**
  *      timing_setup            -       shared timing computation and load
diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c
index 80509be49e7..86f85a2cab7 100644
--- a/drivers/ata/pata_atiixp.c
+++ b/drivers/ata/pata_atiixp.c
@@ -22,7 +22,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_atiixp"
-#define DRV_VERSION "0.4.5"
+#define DRV_VERSION "0.4.6"
 
 enum {
         ATIIXP_IDE_PIO_TIMING   = 0x40,
diff --git a/drivers/ata/pata_cs5520.c b/drivers/ata/pata_cs5520.c
index 7dc76e71bd5..e2459088cdc 100644
--- a/drivers/ata/pata_cs5520.c
+++ b/drivers/ata/pata_cs5520.c
@@ -41,7 +41,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "pata_cs5520"
-#define DRV_VERSION     "0.6.5"
+#define DRV_VERSION     "0.6.6"
 
 struct pio_clocks
 {
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c
index 68f150a1e2f..c6066aa43ec 100644
--- a/drivers/ata/pata_cs5530.c
+++ b/drivers/ata/pata_cs5530.c
@@ -35,7 +35,7 @@
 #include <linux/dmi.h>
 
 #define DRV_NAME        "pata_cs5530"
-#define DRV_VERSION     "0.7.3"
+#define DRV_VERSION     "0.7.4"
 
 static void __iomem *cs5530_port_base(struct ata_port *ap)
 {
diff --git a/drivers/ata/pata_isapnp.c b/drivers/ata/pata_isapnp.c
index 91a396fa5b2..9e553c54203 100644
--- a/drivers/ata/pata_isapnp.c
+++ b/drivers/ata/pata_isapnp.c
@@ -17,7 +17,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_isapnp"
-#define DRV_VERSION "0.2.1"
+#define DRV_VERSION "0.2.2"
 
 static struct scsi_host_template isapnp_sht = {
         .module                 = THIS_MODULE,
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c
index 7225124d96c..5d8b91e70ec 100644
--- a/drivers/ata/pata_it821x.c
+++ b/drivers/ata/pata_it821x.c
@@ -80,7 +80,7 @@
 
 
 #define DRV_NAME "pata_it821x"
-#define DRV_VERSION "0.3.7"
+#define DRV_VERSION "0.3.8"
 
 struct it821x_dev
 {
@@ -533,6 +533,10 @@ static int it821x_check_atapi_dma(struct ata_queued_cmd *qc)
         struct ata_port *ap = qc->ap;
         struct it821x_dev *itdev = ap->private_data;
 
+        /* Only use dma for transfers to/from the media. */
+        if (qc->nbytes < 2048)
+                return -EOPNOTSUPP;
+
         /* No ATAPI DMA in smart mode */
         if (itdev->smart)
                 return -EOPNOTSUPP;
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
index 87594c04d3a..ae206f35f74 100644
--- a/drivers/ata/pata_marvell.c
+++ b/drivers/ata/pata_marvell.c
@@ -192,6 +192,8 @@ static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *i
 
 static const struct pci_device_id marvell_pci_tbl[] = {
         { PCI_DEVICE(0x11AB, 0x6101), },
+        { PCI_DEVICE(0x11AB, 0x6121), },
+        { PCI_DEVICE(0x11AB, 0x6123), },
         { PCI_DEVICE(0x11AB, 0x6145), },
         { }     /* terminate list */
 };
diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c
index 182e83c9047..099f4cdc4cd 100644
--- a/drivers/ata/pata_mpc52xx.c
+++ b/drivers/ata/pata_mpc52xx.c
@@ -24,7 +24,7 @@
 
 
 #define DRV_NAME        "mpc52xx_ata"
-#define DRV_VERSION     "0.1.0ac2"
+#define DRV_VERSION     "0.1.2"
 
 
 /* Private structures used by the driver */
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index 6da23feed03..0f2b027624d 100644
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -42,7 +42,7 @@
 
 
 #define DRV_NAME "pata_pcmcia"
-#define DRV_VERSION "0.3.1"
+#define DRV_VERSION "0.3.2"
 
 /*
  *      Private data structure to glue stuff together
diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c
index e3245b36269..bb64a986e8f 100644
--- a/drivers/ata/pata_pdc2027x.c
+++ b/drivers/ata/pata_pdc2027x.c
@@ -35,7 +35,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "pata_pdc2027x"
-#define DRV_VERSION     "0.9"
+#define DRV_VERSION     "1.0"
 #undef PDC_DEBUG
 
 #ifdef PDC_DEBUG
diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c
index a909f793ffc..5086d03f2d7 100644
--- a/drivers/ata/pata_platform.c
+++ b/drivers/ata/pata_platform.c
@@ -22,7 +22,7 @@
 #include <linux/pata_platform.h>
 
 #define DRV_NAME "pata_platform"
-#define DRV_VERSION "1.0"
+#define DRV_VERSION "1.1"
 
 static int pio_mask = 1;
 
diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c
index b8b2d11e418..5edf67b1f3b 100644
--- a/drivers/ata/pata_sc1200.c
+++ b/drivers/ata/pata_sc1200.c
@@ -40,7 +40,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "sc1200"
-#define DRV_VERSION     "0.2.5"
+#define DRV_VERSION     "0.2.6"
 
 #define SC1200_REV_A    0x00
 #define SC1200_REV_B1   0x01
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
index 36cdbd2b0bd..2d048ef25a5 100644
--- a/drivers/ata/pata_scc.c
+++ b/drivers/ata/pata_scc.c
@@ -43,7 +43,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME                "pata_scc"
-#define DRV_VERSION             "0.2"
+#define DRV_VERSION             "0.3"
 
 #define PCI_DEVICE_ID_TOSHIBA_SCC_ATA           0x01b4
 
diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c
index 89691541fe5..0faf99c8f13 100644
--- a/drivers/ata/pata_serverworks.c
+++ b/drivers/ata/pata_serverworks.c
@@ -41,7 +41,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_serverworks"
-#define DRV_VERSION "0.4.1"
+#define DRV_VERSION "0.4.2"
 
 #define SVWKS_CSB5_REVISION_NEW 0x92 /* min PCI_REVISION_ID for UDMA5 (A2.0) */
 #define SVWKS_CSB6_REVISION     0xa0 /* min PCI_REVISION_ID for UDMA4 (A1.0) */
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index b0cd52d6e3f..40395804a66 100644
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -33,7 +33,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_sil680"
-#define DRV_VERSION "0.4.6"
+#define DRV_VERSION "0.4.7"
 
 #define SIL680_MMIO_BAR         5
 
diff --git a/drivers/ata/pata_sl82c105.c b/drivers/ata/pata_sl82c105.c
index 8c2813aa6cd..c0f43bb2595 100644
--- a/drivers/ata/pata_sl82c105.c
+++ b/drivers/ata/pata_sl82c105.c
@@ -26,7 +26,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_sl82c105"
-#define DRV_VERSION "0.3.1"
+#define DRV_VERSION "0.3.2"
 
 enum {
         /*
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index ea18e33f50e..636c4f1a0b2 100644
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -97,6 +97,7 @@ static const struct via_isa_bridge {
         u8 rev_max;
         u16 flags;
 } via_isa_bridges[] = {
+        { "vx800",      PCI_DEVICE_ID_VIA_VX800,    0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
         { "vt8237s",    PCI_DEVICE_ID_VIA_8237S,    0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
         { "vt8251",     PCI_DEVICE_ID_VIA_8251,     0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
         { "cx700",      PCI_DEVICE_ID_VIA_CX700,    0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
@@ -243,7 +244,6 @@ static void via_do_set_mode(struct ata_port *ap, struct ata_device *adev, int mo
         int ut;
         int offset = 3 - (2*ap->port_no) - adev->devno;
 
-
         /* Calculate the timing values we require */
         ata_timing_compute(adev, mode, &t, T, UT);
 
@@ -290,9 +290,17 @@ static void via_do_set_mode(struct ata_port *ap, struct ata_device *adev, int mo
                         ut = t.udma ? (0xe0 | (FIT(t.udma, 2, 9) - 2)) : 0x07;
                         break;
         }
+
         /* Set UDMA unless device is not UDMA capable */
-        if (udma_type)
-                pci_write_config_byte(pdev, 0x50 + offset, ut);
+        if (udma_type) {
+                u8 cable80_status;
+
+                /* Get 80-wire cable detection bit */
+                pci_read_config_byte(pdev, 0x50 + offset, &cable80_status);
+                cable80_status &= 0x10;
+
+                pci_write_config_byte(pdev, 0x50 + offset, ut | cable80_status);
+        }
 }
 
 static void via_set_piomode(struct ata_port *ap, struct ata_device *adev)
diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c
index bec1de594de..5c79271401a 100644
--- a/drivers/ata/pdc_adma.c
+++ b/drivers/ata/pdc_adma.c
@@ -44,7 +44,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "pdc_adma"
-#define DRV_VERSION     "0.06"
+#define DRV_VERSION     "1.0"
 
 /* macro to calculate base address for ATA regs */
 #define ADMA_ATA_REGS(base,port_no)     ((base) + ((port_no) * 0x40))
diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c
index a9c948d7604..fdbed8ecdfc 100644
--- a/drivers/ata/sata_inic162x.c
+++ b/drivers/ata/sata_inic162x.c
@@ -28,7 +28,7 @@
 #include <scsi/scsi_device.h>
 
 #define DRV_NAME        "sata_inic162x"
-#define DRV_VERSION     "0.2"
+#define DRV_VERSION     "0.3"
 
 enum {
         MMIO_BAR                = 5,
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 3acf65e75eb..11bf6c7ac12 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -72,7 +72,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "sata_mv"
-#define DRV_VERSION     "0.81"
+#define DRV_VERSION     "1.0"
 
 enum {
         /* BAR's are enumerated in terms of pci_resource_start() terms */
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index 0b58c4df6fd..40dc7313985 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -49,7 +49,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME                        "sata_nv"
-#define DRV_VERSION                     "3.4"
+#define DRV_VERSION                     "3.5"
 
 #define NV_ADMA_DMA_BOUNDARY            0xffffffffUL
 
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
index d39ebc23c4a..25698cf0dce 100644
--- a/drivers/ata/sata_promise.c
+++ b/drivers/ata/sata_promise.c
@@ -45,7 +45,7 @@
 #include "sata_promise.h"
 
 #define DRV_NAME        "sata_promise"
-#define DRV_VERSION     "2.09"
+#define DRV_VERSION     "2.10"
 
 enum {
         PDC_MAX_PORTS           = 4,
@@ -328,8 +328,8 @@ static const struct pci_device_id pdc_ata_pci_tbl[] = {
 
         { PCI_VDEVICE(PROMISE, 0x3318), board_20319 },
         { PCI_VDEVICE(PROMISE, 0x3319), board_20319 },
-        { PCI_VDEVICE(PROMISE, 0x3515), board_20319 },
-        { PCI_VDEVICE(PROMISE, 0x3519), board_20319 },
+        { PCI_VDEVICE(PROMISE, 0x3515), board_40518 },
+        { PCI_VDEVICE(PROMISE, 0x3519), board_40518 },
         { PCI_VDEVICE(PROMISE, 0x3d17), board_40518 },
         { PCI_VDEVICE(PROMISE, 0x3d18), board_40518 },
 
diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c
index c8f9242e7f4..5e1dfdda698 100644
--- a/drivers/ata/sata_qstor.c
+++ b/drivers/ata/sata_qstor.c
@@ -39,7 +39,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "sata_qstor"
-#define DRV_VERSION     "0.08"
+#define DRV_VERSION     "0.09"
 
 enum {
         QS_MMIO_BAR             = 4,
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index db676375895..8c72e714b45 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -46,7 +46,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "sata_sil"
-#define DRV_VERSION     "2.2"
+#define DRV_VERSION     "2.3"
 
 enum {
         SIL_MMIO_BAR            = 5,
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index 46fbbe7f121..ef83e6b1e31 100644
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -30,7 +30,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "sata_sil24"
-#define DRV_VERSION     "0.9"
+#define DRV_VERSION     "1.0"
 
 /*
  * Port request block (PRB) 32 bytes
diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c
index 31a2f55aae6..41c1d6e8f1f 100644
--- a/drivers/ata/sata_sis.c
+++ b/drivers/ata/sata_sis.c
@@ -43,7 +43,7 @@
 #include "sis.h"
 
 #define DRV_NAME        "sata_sis"
-#define DRV_VERSION     "0.8"
+#define DRV_VERSION     "1.0"
 
 enum {
         sis_180                 = 0,
diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c
index 92e87707503..d9678e7bc3a 100644
--- a/drivers/ata/sata_svw.c
+++ b/drivers/ata/sata_svw.c
@@ -53,7 +53,7 @@
 #endif /* CONFIG_PPC_OF */
 
 #define DRV_NAME        "sata_svw"
-#define DRV_VERSION     "2.2"
+#define DRV_VERSION     "2.3"
 
 enum {
         /* ap->flags bits */
diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c
index 5193bd8647b..97aefdd87be 100644
--- a/drivers/ata/sata_sx4.c
+++ b/drivers/ata/sata_sx4.c
@@ -92,7 +92,7 @@
 #include "sata_promise.h"
 
 #define DRV_NAME        "sata_sx4"
-#define DRV_VERSION     "0.11"
+#define DRV_VERSION     "0.12"
 
 
 enum {
diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c
index 78c28512f01..e6b8b45279a 100644
--- a/drivers/ata/sata_uli.c
+++ b/drivers/ata/sata_uli.c
@@ -36,7 +36,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "sata_uli"
-#define DRV_VERSION     "1.2"
+#define DRV_VERSION     "1.3"
 
 enum {
         uli_5289                = 0,
diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
index 86b7bfc1732..57fd30de8f0 100644
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -46,7 +46,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "sata_via"
-#define DRV_VERSION     "2.2"
+#define DRV_VERSION     "2.3"
 
 enum board_ids_enum {
         vt6420,
@@ -371,7 +371,7 @@ static void vt6421_set_dma_mode(struct ata_port *ap, struct ata_device *adev)
 {
         struct pci_dev *pdev = to_pci_dev(ap->host->dev);
         static const u8 udma_bits[] = { 0xEE, 0xE8, 0xE6, 0xE4, 0xE2, 0xE1, 0xE0, 0xE0 };
-        pci_write_config_byte(pdev, PATA_UDMA_TIMING, udma_bits[adev->pio_mode - XFER_UDMA_0]);
+        pci_write_config_byte(pdev, PATA_UDMA_TIMING, udma_bits[adev->dma_mode - XFER_UDMA_0]);
 }
 
 static const unsigned int svia_bar_sizes[] = {
diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c
index 24344d0d057..1920915dfa2 100644
--- a/drivers/ata/sata_vsc.c
+++ b/drivers/ata/sata_vsc.c
@@ -47,7 +47,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "sata_vsc"
-#define DRV_VERSION     "2.2"
+#define DRV_VERSION     "2.3"
 
 enum {
         VSC_MMIO_BAR                    = 0,
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 92bf868ca05..504a95d888b 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -17,8 +17,8 @@
 */
 
 
-#define DAC960_DriverVersion                    "2.5.48"
-#define DAC960_DriverDate                       "14 May 2006"
+#define DAC960_DriverVersion                    "2.5.49"
+#define DAC960_DriverDate                       "21 Aug 2007"
 
 
 #include <linux/module.h>
@@ -1165,9 +1165,9 @@ static bool DAC960_V1_EnableMemoryMailboxInterface(DAC960_Controller_T
   int i;
 
   
-  if (pci_set_dma_mask(Controller->PCIDevice, DAC690_V1_PciDmaMask))
+  if (pci_set_dma_mask(Controller->PCIDevice, DMA_32BIT_MASK))
         return DAC960_Failure(Controller, "DMA mask out of range");
-  Controller->BounceBufferLimit = DAC690_V1_PciDmaMask;
+  Controller->BounceBufferLimit = DMA_32BIT_MASK;
 
   if ((hw_type == DAC960_PD_Controller) || (hw_type == DAC960_P_Controller)) {
     CommandMailboxesSize =  0;
@@ -1368,9 +1368,12 @@ static bool DAC960_V2_EnableMemoryMailboxInterface(DAC960_Controller_T
   dma_addr_t    CommandMailboxDMA;
   DAC960_V2_CommandStatus_T CommandStatus;
 
-  if (pci_set_dma_mask(Controller->PCIDevice, DAC690_V2_PciDmaMask))
-        return DAC960_Failure(Controller, "DMA mask out of range");
-  Controller->BounceBufferLimit = DAC690_V2_PciDmaMask;
+        if (!pci_set_dma_mask(Controller->PCIDevice, DMA_64BIT_MASK))
+                Controller->BounceBufferLimit = DMA_64BIT_MASK;
+        else if (!pci_set_dma_mask(Controller->PCIDevice, DMA_32BIT_MASK))
+                Controller->BounceBufferLimit = DMA_32BIT_MASK;
+        else
+                return DAC960_Failure(Controller, "DMA mask out of range");
 
   /* This is a temporary dma mapping, used only in the scope of this function */
   CommandMailbox = pci_alloc_consistent(PCI_Device,
diff --git a/drivers/block/DAC960.h b/drivers/block/DAC960.h
index f5e2436c39a..85fa9bb6375 100644
--- a/drivers/block/DAC960.h
+++ b/drivers/block/DAC960.h
@@ -61,13 +61,6 @@
 #define DAC960_V2_MaxPhysicalDevices            272
 
 /*
-  Define the pci dma mask supported by DAC960 V1 and V2 Firmware Controlers
- */
-
-#define DAC690_V1_PciDmaMask    0xffffffff
-#define DAC690_V2_PciDmaMask    0xffffffffffffffffULL
-
-/*
   Define a 32/64 bit I/O Address data type.
 */
 
diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c
index 59b054810ed..98a9cdeaffb 100644
--- a/drivers/bluetooth/hci_usb.c
+++ b/drivers/bluetooth/hci_usb.c
@@ -691,15 +691,18 @@ static void hci_usb_rx_complete(struct urb *urb)
                                         urb->iso_frame_desc[i].offset,
                                         urb->iso_frame_desc[i].actual_length);
         
-                        if (!urb->iso_frame_desc[i].status)
+                        if (!urb->iso_frame_desc[i].status) {
+                                husb->hdev->stat.byte_rx += urb->iso_frame_desc[i].actual_length;
                                 hci_recv_fragment(husb->hdev, _urb->type, 
                                         urb->transfer_buffer + urb->iso_frame_desc[i].offset,
                                         urb->iso_frame_desc[i].actual_length);
+                        }
                 }
 #else
                 ;
 #endif
         } else {
+                husb->hdev->stat.byte_rx += count;
                 err = hci_recv_fragment(husb->hdev, _urb->type, urb->transfer_buffer, count);
                 if (err < 0) { 
                         BT_ERR("%s corrupted packet: type %d count %d",
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 2c9ca2c6462..7c69bf259ca 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -506,6 +506,11 @@ static void intel_i830_init_gtt_entries(void)
                         break;
                 }
         } else {
+                /* G33's GTT stolen memory is separate from gfx data
+                 * stolen memory.
+                 */
+                if (IS_G33)
+                        size = 0;
                 switch (gmch_ctrl & I830_GMCH_GMS_MASK) {
                 case I855_GMCH_GMS_STOLEN_1M:
                         gtt_entries = MB(1) - KB(size);
@@ -914,6 +919,7 @@ static int intel_i915_create_gatt_table(struct agp_bridge_data *bridge)
         struct aper_size_info_fixed *size;
         int num_entries;
         u32 temp, temp2;
+        int gtt_map_size = 256 * 1024;
 
         size = agp_bridge->current_size;
         page_order = size->page_order;
@@ -923,7 +929,9 @@ static int intel_i915_create_gatt_table(struct agp_bridge_data *bridge)
         pci_read_config_dword(intel_private.pcidev, I915_MMADDR, &temp);
         pci_read_config_dword(intel_private.pcidev, I915_PTEADDR,&temp2);
 
-        intel_private.gtt = ioremap(temp2, 256 * 1024);
+        if (IS_G33)
+            gtt_map_size = 1024 * 1024; /* 1M on G33 */
+        intel_private.gtt = ioremap(temp2, gtt_map_size);
         if (!intel_private.gtt)
                 return -ENOMEM;
 
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index 77bf4aa217a..7ecffc9c738 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -909,6 +909,8 @@ int hpet_alloc(struct hpet_data *hdp)
 
         hpetp->hp_delta = hpet_calibrate(hpetp);
 
+/* This clocksource driver currently only works on ia64 */
+#ifdef CONFIG_IA64
         if (!hpet_clocksource) {
                 hpet_mctr = (void __iomem *)&hpetp->hp_hpet->hpet_mc;
                 CLKSRC_FSYS_MMIO_SET(clocksource_hpet.fsys_mmio, hpet_mctr);
@@ -918,6 +920,7 @@ int hpet_alloc(struct hpet_data *hdp)
                 hpetp->hp_clocksource = &clocksource_hpet;
                 hpet_clocksource = &clocksource_hpet;
         }
+#endif
 
         return 0;
 }
diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c
index 3423e9ee648..4a8969cef31 100644
--- a/drivers/char/tty_ioctl.c
+++ b/drivers/char/tty_ioctl.c
@@ -796,14 +796,14 @@ int n_tty_ioctl(struct tty_struct * tty, struct file * file,
                                 retval = inq_canon(tty);
                         return put_user(retval, (unsigned int __user *) arg);
                 case TIOCGLCKTRMIOS:
-                        if (kernel_termios_to_user_termios((struct termios __user *)arg, real_tty->termios_locked))
+                        if (kernel_termios_to_user_termios_1((struct termios __user *)arg, real_tty->termios_locked))
                                 return -EFAULT;
                         return 0;
 
                 case TIOCSLCKTRMIOS:
                         if (!capable(CAP_SYS_ADMIN))
                                 return -EPERM;
-                        if (user_termios_to_kernel_termios(real_tty->termios_locked, (struct termios __user *) arg))
+                        if (user_termios_to_kernel_termios_1(real_tty->termios_locked, (struct termios __user *) arg))
                                 return -EFAULT;
                         return 0;
 
diff --git a/drivers/edac/e752x_edac.c b/drivers/edac/e752x_edac.c
index 3bba224cb55..6eb434749cd 100644
--- a/drivers/edac/e752x_edac.c
+++ b/drivers/edac/e752x_edac.c
@@ -967,7 +967,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx)
         if (!force_function_unhide && !(stat8 & (1 << 5))) {
                 printk(KERN_INFO "Contact your BIOS vendor to see if the "
                         "E752x error registers can be safely un-hidden\n");
-                return -ENOMEM;
+                return -ENODEV;
         }
         stat8 |= (1 << 5);
         pci_write_config_byte(pdev, E752X_DEVPRES1, stat8);
diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h
index 4e6bad15c4b..e80af67664c 100644
--- a/drivers/edac/edac_core.h
+++ b/drivers/edac/edac_core.h
@@ -75,7 +75,7 @@ extern int edac_debug_level;
 #define edac_debug_printk(level, fmt, arg...)                            \
         do {                                                             \
                 if (level <= edac_debug_level)                           \
-                        edac_printk(KERN_EMERG, EDAC_DEBUG, fmt, ##arg); \
+                        edac_printk(KERN_DEBUG, EDAC_DEBUG, fmt, ##arg); \
         } while(0)
 
 #define debugf0( ... ) edac_debug_printk(0, __VA_ARGS__ )
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index 7e427b4c74b..e14c1ca7813 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -1945,10 +1945,8 @@ static int pci_suspend(struct pci_dev *pdev, pm_message_t state)
                 return err;
         }
         err = pci_set_power_state(pdev, pci_choose_state(pdev, state));
-        if (err) {
-                fw_error("pci_set_power_state failed\n");
-                return err;
-        }
+        if (err)
+                fw_error("pci_set_power_state failed with %d\n", err);
 
         return 0;
 }
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c
index 565c4e679b8..6eea3476b90 100644
--- a/drivers/hwmon/lm78.c
+++ b/drivers/hwmon/lm78.c
@@ -882,7 +882,7 @@ static int __init lm78_isa_device_add(unsigned short address)
 {
         struct resource res = {
                 .start  = address,
-                .end    = address + LM78_EXTENT,
+                .end    = address + LM78_EXTENT - 1,
                 .name   = "lm78",
                 .flags  = IORESOURCE_IO,
         };
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
index c95909cc1d2..dcc941a5aaf 100644
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -1746,7 +1746,7 @@ w83781d_isa_device_add(unsigned short address)
 {
         struct resource res = {
                 .start  = address,
-                .end    = address + W83781D_EXTENT,
+                .end    = address + W83781D_EXTENT - 1,
                 .name   = "w83781d",
                 .flags  = IORESOURCE_IO,
         };
diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c
index 8a5f5825bb7..7f0a0a62cf6 100644
--- a/drivers/i2c/algos/i2c-algo-bit.c
+++ b/drivers/i2c/algos/i2c-algo-bit.c
@@ -357,13 +357,29 @@ static int sendbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
         return wrcount;
 }
 
+static int acknak(struct i2c_adapter *i2c_adap, int is_ack)
+{
+        struct i2c_algo_bit_data *adap = i2c_adap->algo_data;
+
+        /* assert: sda is high */
+        if (is_ack)             /* send ack */
+                setsda(adap, 0);
+        udelay((adap->udelay + 1) / 2);
+        if (sclhi(adap) < 0) {  /* timeout */
+                dev_err(&i2c_adap->dev, "readbytes: ack/nak timeout\n");
+                return -ETIMEDOUT;
+        }
+        scllo(adap);
+        return 0;
+}
+
 static int readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
 {
         int inval;
         int rdcount=0;          /* counts bytes read */
-        struct i2c_algo_bit_data *adap = i2c_adap->algo_data;
         unsigned char *temp = msg->buf;
         int count = msg->len;
+        const unsigned flags = msg->flags;
 
         while (count > 0) {
                 inval = i2c_inb(i2c_adap);
@@ -377,28 +393,12 @@ static int readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
                 temp++;
                 count--;
 
-                if (msg->flags & I2C_M_NO_RD_ACK) {
-                        bit_dbg(2, &i2c_adap->dev, "i2c_inb: 0x%02x\n",
-                                inval);
-                        continue;
-                }
-
-                /* assert: sda is high */
-                if (count)              /* send ack */
-                        setsda(adap, 0);
-                udelay((adap->udelay + 1) / 2);
-                bit_dbg(2, &i2c_adap->dev, "i2c_inb: 0x%02x %s\n", inval,
-                        count ? "A" : "NA");
-                if (sclhi(adap)<0) {    /* timeout */
-                        dev_err(&i2c_adap->dev, "readbytes: timeout at ack\n");
-                        return -ETIMEDOUT;
-                };
-                scllo(adap);
-
                 /* Some SMBus transactions require that we receive the
                    transaction length as the first read byte. */
-                if (rdcount == 1 && (msg->flags & I2C_M_RECV_LEN)) {
+                if (rdcount == 1 && (flags & I2C_M_RECV_LEN)) {
                         if (inval <= 0 || inval > I2C_SMBUS_BLOCK_MAX) {
+                                if (!(flags & I2C_M_NO_RD_ACK))
+                                        acknak(i2c_adap, 0);
                                 dev_err(&i2c_adap->dev, "readbytes: invalid "
                                         "block length (%d)\n", inval);
                                 return -EREMOTEIO;
@@ -409,6 +409,18 @@ static int readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
                         count += inval;
                         msg->len += inval;
                 }
+
+                bit_dbg(2, &i2c_adap->dev, "readbytes: 0x%02x %s\n",
+                        inval,
+                        (flags & I2C_M_NO_RD_ACK)
+                                ? "(no ack/nak)"
+                                : (count ? "A" : "NA"));
+
+                if (!(flags & I2C_M_NO_RD_ACK)) {
+                        inval = acknak(i2c_adap, count);
+                        if (inval < 0)
+                                return inval;
+                }
         }
         return rdcount;
 }
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 1842f523c23..9f3a4cd0b07 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -208,6 +208,7 @@ config I2C_PIIX4
             ATI IXP400
             ATI SB600
             ATI SB700
+            ATI SB800
             Serverworks OSB4
             Serverworks CSB5
             Serverworks CSB6
diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c
index 025f19423fa..44e1cd21bb0 100644
--- a/drivers/i2c/busses/i2c-gpio.c
+++ b/drivers/i2c/busses/i2c-gpio.c
@@ -147,7 +147,7 @@ static int __init i2c_gpio_probe(struct platform_device *pdev)
          * The reason to do so is to avoid sysfs names that only make
          * sense when there are multiple adapters.
          */
-        adap->nr = pdev->id >= 0 ? pdev->id : 0;
+        adap->nr = (pdev->id != -1) ? pdev->id : 0;
         ret = i2c_bit_add_numbered_bus(adap);
         if (ret)
                 goto err_add_bus;
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index debc76cd216..167e4137ee2 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -23,7 +23,7 @@
    Supports:
         Intel PIIX4, 440MX
         Serverworks OSB4, CSB5, CSB6, HT-1000
-        ATI IXP200, IXP300, IXP400, SB600, SB700
+        ATI IXP200, IXP300, IXP400, SB600, SB700, SB800
         SMSC Victory66
 
    Note: we assume there can only be one device, with one SMBus interface.
@@ -397,9 +397,7 @@ static struct pci_device_id piix4_ids[] = {
           .driver_data = 0 },
         { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS),
           .driver_data = 0 },
-        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SMBUS),
-          .driver_data = 0 },
-        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP700_SMBUS),
+        { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS),
           .driver_data = 0 },
         { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_OSB4),
           .driver_data = 0 },
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 9d6b790d432..bb5466b27b5 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -926,7 +926,7 @@ static int i2c_pxa_probe(struct platform_device *dev)
          * The reason to do so is to avoid sysfs names that only make
          * sense when there are multiple adapters.
          */
-        i2c->adap.nr = dev->id >= 0 ? dev->id : 0;
+        i2c->adap.nr = dev->id != -1 ? dev->id : 0;
 
         ret = i2c_add_numbered_adapter(&i2c->adap);
         if (ret < 0) {
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 7adb61bad6a..4200251ff63 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -781,7 +781,7 @@ endif
 
 config BLK_DEV_IDE_PMAC
         bool "Builtin PowerMac IDE support"
-        depends on PPC_PMAC && IDE=y
+        depends on PPC_PMAC && IDE=y && BLK_DEV_IDE=y
         help
           This driver provides support for the built-in IDE controller on
           most of the recent Apple Power Macintoshes and PowerBooks.
@@ -946,7 +946,7 @@ config BLK_DEV_Q40IDE
 
 config BLK_DEV_MPC8xx_IDE
         bool "MPC8xx IDE support"
-        depends on 8xx && IDE=y && BLK_DEV_IDE=y
+        depends on 8xx && IDE=y && BLK_DEV_IDE=y && !PPC_MERGE
         select IDE_GENERIC
         help
           This option provides support for IDE on Motorola MPC8xx Systems.
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index f4cd2700cae..646a54e233d 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -615,8 +615,7 @@ u8 eighty_ninty_three (ide_drive_t *drive)
         if (hwif->cbl != ATA_CBL_PATA80 && !ivb)
                 goto no_80w;
 
-        /* Check for SATA but only if we are ATA5 or higher */
-        if (id->hw_config == 0 && (id->major_rev_num & 0x7FE0))
+        if (ide_dev_is_sata(id))
                 return 1;
 
         /*
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index 025689de50e..11ecb618007 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -596,6 +596,13 @@ static struct dmi_system_id cable_dmi_table[] = {
                         DMI_MATCH(DMI_BOARD_VERSION, "OmniBook N32N-736"),
                 },
         },
+        {
+                .ident = "Toshiba Satellite S1800-814",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "S1800-814"),
+                },
+        },
         { }
 };
 
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index 2cd74c345a6..39f1c89f7c8 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/ide/pci/hpt366.c               Version 1.10    Jun 29, 2007
+ * linux/drivers/ide/pci/hpt366.c               Version 1.12    Aug 19, 2007
  *
  * Copyright (C) 1999-2003              Andre Hedrick <andre@linux-ide.org>
  * Portions Copyright (C) 2001          Sun Microsystems, Inc.
@@ -68,7 +68,8 @@
  *   HPT37x chip family; save space by introducing the separate transfer mode
  *   table in which the mode lookup is done
  * - use f_CNT value saved by  the HighPoint BIOS as reading it directly gives
- *   the wrong PCI frequency since DPLL has already been calibrated by BIOS
+ *   the wrong PCI frequency since DPLL has already been calibrated by BIOS;
+ *   read it only from the function 0 of HPT374 chips
  * - fix the hotswap code:  it caused RESET- to glitch when tristating the bus,
  *   and for HPT36x the obsolete HDIO_TRISTATE_HWIF handler was called instead
  * - pass to init_chipset() handlers a copy of the IDE PCI device structure as
@@ -113,6 +114,7 @@
  *   unify HPT36x/37x timing setup code and the speedproc handlers by joining
  *   the register setting lists into the table indexed by the clock selected
  * - set the correct hwif->ultra_mask for each individual chip
+ * - add UltraDMA mode filtering for the HPT37[24] based SATA cards
  *      Sergei Shtylyov, <sshtylyov@ru.mvista.com> or <source@mvista.com>
  */
 
@@ -517,42 +519,44 @@ static int check_in_drive_list(ide_drive_t *drive, const char **list)
 }
 
 /*
- *      Note for the future; the SATA hpt37x we must set
- *      either PIO or UDMA modes 0,4,5
+ * The Marvell bridge chips used on the HighPoint SATA cards do not seem
+ * to support the UltraDMA modes 1, 2, and 3 as well as any MWDMA modes...
  */
 
 static u8 hpt3xx_udma_filter(ide_drive_t *drive)
 {
-        struct hpt_info *info   = pci_get_drvdata(HWIF(drive)->pci_dev);
-        u8 mask;
+        ide_hwif_t *hwif        = HWIF(drive);
+        struct hpt_info *info   = pci_get_drvdata(hwif->pci_dev);
+        u8 mask                 = hwif->ultra_mask;
 
         switch (info->chip_type) {
-        case HPT370A:
-                if (!HPT370_ALLOW_ATA100_5 ||
-                    check_in_drive_list(drive, bad_ata100_5))
-                        return 0x1f;
-                else
-                        return 0x3f;
-        case HPT370:
-                if (!HPT370_ALLOW_ATA100_5 ||
-                    check_in_drive_list(drive, bad_ata100_5))
-                        mask = 0x1f;
-                else
-                        mask = 0x3f;
-                break;
         case HPT36x:
                 if (!HPT366_ALLOW_ATA66_4 ||
                     check_in_drive_list(drive, bad_ata66_4))
-                        mask = 0x0f;
-                else
-                        mask = 0x1f;
+                        mask = ATA_UDMA3;
 
                 if (!HPT366_ALLOW_ATA66_3 ||
                     check_in_drive_list(drive, bad_ata66_3))
-                        mask = 0x07;
+                        mask = ATA_UDMA2;
+                break;
+        case HPT370:
+                if (!HPT370_ALLOW_ATA100_5 ||
+                    check_in_drive_list(drive, bad_ata100_5))
+                        mask = ATA_UDMA4;
                 break;
+        case HPT370A:
+                if (!HPT370_ALLOW_ATA100_5 ||
+                    check_in_drive_list(drive, bad_ata100_5))
+                        return ATA_UDMA4;
+        case HPT372 :
+        case HPT372A:
+        case HPT372N:
+        case HPT374 :
+                if (ide_dev_is_sata(drive->id))
+                        mask &= ~0x0e;
+                /* Fall thru */
         default:
-                return 0x7f;
+                return mask;
         }
 
         return check_in_drive_list(drive, bad_ata33) ? 0x00 : mask;
@@ -981,6 +985,7 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha
         struct hpt_info *info   = kmalloc(sizeof(struct hpt_info), GFP_KERNEL);
         unsigned long io_base   = pci_resource_start(dev, 4);
         u8 pci_clk,  dpll_clk   = 0;    /* PCI and DPLL clock in MHz */
+        u8 chip_type;
         enum ata_clock  clock;
 
         if (info == NULL) {
@@ -992,7 +997,8 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha
          * Copy everything from a static "template" structure
          * to just allocated per-chip hpt_info structure.
          */
-        *info = *(struct hpt_info *)pci_get_drvdata(dev);
+        memcpy(info, pci_get_drvdata(dev), sizeof(struct hpt_info));
+        chip_type = info->chip_type;
 
         pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE, (L1_CACHE_BYTES / 4));
         pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0x78);
@@ -1002,7 +1008,7 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha
         /*
          * First, try to estimate the PCI clock frequency...
          */
-        if (info->chip_type >= HPT370) {
+        if (chip_type >= HPT370) {
                 u8  scr1  = 0;
                 u16 f_cnt = 0;
                 u32 temp  = 0;
@@ -1016,7 +1022,7 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha
                  * HighPoint does this for HPT372A.
                  * NOTE: This register is only writeable via I/O space.
                  */
-                if (info->chip_type == HPT372A)
+                if (chip_type == HPT372A)
                         outb(0x0e, io_base + 0x9c);
 
                 /*
@@ -1034,13 +1040,28 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha
                  * First try reading the register in which the HighPoint BIOS
                  * saves f_CNT value before  reprogramming the DPLL from its
                  * default setting (which differs for the various chips).
-                 * NOTE: This register is only accessible via I/O space.
                  *
-                 * In case the signature check fails, we'll have to resort to
-                 * reading the f_CNT register itself in hopes that nobody has
-                 * touched the DPLL yet...
+                 * NOTE: This register is only accessible via I/O space;
+                 * HPT374 BIOS only saves it for the function 0, so we have to
+                 * always read it from there -- no need to check the result of
+                 * pci_get_slot() for the function 0 as the whole device has
+                 * been already "pinned" (via function 1) in init_setup_hpt374()
+                 */
+                if (chip_type == HPT374 && (PCI_FUNC(dev->devfn) & 1)) {
+                        struct pci_dev  *dev1 = pci_get_slot(dev->bus,
+                                                             dev->devfn - 1);
+                        unsigned long io_base = pci_resource_start(dev1, 4);
+
+                        temp =  inl(io_base + 0x90);
+                        pci_dev_put(dev1);
+                } else
+                        temp =  inl(io_base + 0x90);
+
+                /*
+                 * In case the signature check fails, we'll have to
+                 * resort to reading the f_CNT register itself in hopes
+                 * that nobody has touched the DPLL yet...
                  */
-                temp = inl(io_base + 0x90);
                 if ((temp & 0xFFFFF000) != 0xABCDE000) {
                         int i;
 
@@ -1120,7 +1141,7 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha
          * We also  don't like using  the DPLL because this causes glitches
          * on PRST-/SRST- when the state engine gets reset...
          */
-        if (info->chip_type >= HPT374 || info->settings[clock] == NULL) {
+        if (chip_type >= HPT374 || info->settings[clock] == NULL) {
                 u16 f_low, delta = pci_clk < 50 ? 2 : 4;
                 int adjust;
 
@@ -1190,7 +1211,7 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha
         /* Point to this chip's own instance of the hpt_info structure. */
         pci_set_drvdata(dev, info);
 
-        if (info->chip_type >= HPT370) {
+        if (chip_type >= HPT370) {
                 u8  mcr1, mcr4;
 
                 /*
@@ -1209,7 +1230,7 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha
          * the MISC. register to stretch the UltraDMA Tss timing.
          * NOTE: This register is only writeable via I/O space.
          */
-        if (info->chip_type == HPT371N && clock == ATA_CLOCK_66MHZ)
+        if (chip_type == HPT371N && clock == ATA_CLOCK_66MHZ)
 
                 outb(inb(io_base + 0x9c) | 0x04, io_base + 0x9c);
 
@@ -1218,25 +1239,24 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const cha
 
 static void __devinit init_hwif_hpt366(ide_hwif_t *hwif)
 {
-        struct pci_dev  *dev            = hwif->pci_dev;
-        struct hpt_info *info           = pci_get_drvdata(dev);
-        int serialize                   = HPT_SERIALIZE_IO;
-        u8  scr1 = 0, ata66             = hwif->channel ? 0x01 : 0x02;
-        u8  chip_type                   = info->chip_type;
-        u8  new_mcr, old_mcr            = 0;
+        struct pci_dev  *dev    = hwif->pci_dev;
+        struct hpt_info *info   = pci_get_drvdata(dev);
+        int serialize           = HPT_SERIALIZE_IO;
+        u8  scr1 = 0, ata66     = hwif->channel ? 0x01 : 0x02;
+        u8  chip_type           = info->chip_type;
+        u8  new_mcr, old_mcr    = 0;
 
         /* Cache the channel's MISC. control registers' offset */
-        hwif->select_data               = hwif->channel ? 0x54 : 0x50;
+        hwif->select_data       = hwif->channel ? 0x54 : 0x50;
 
-        hwif->tuneproc                  = &hpt3xx_tune_drive;
-        hwif->speedproc                 = &hpt3xx_tune_chipset;
-        hwif->quirkproc                 = &hpt3xx_quirkproc;
-        hwif->intrproc                  = &hpt3xx_intrproc;
-        hwif->maskproc                  = &hpt3xx_maskproc;
-        hwif->busproc                   = &hpt3xx_busproc;
+        hwif->tuneproc          = &hpt3xx_tune_drive;
+        hwif->speedproc         = &hpt3xx_tune_chipset;
+        hwif->quirkproc         = &hpt3xx_quirkproc;
+        hwif->intrproc          = &hpt3xx_intrproc;
+        hwif->maskproc          = &hpt3xx_maskproc;
+        hwif->busproc           = &hpt3xx_busproc;
 
-        if (chip_type <= HPT370A)
-                hwif->udma_filter       = &hpt3xx_udma_filter;
+        hwif->udma_filter       = &hpt3xx_udma_filter;
 
         /*
          * HPT3xxN chips have some complications:
@@ -1486,19 +1506,19 @@ static int __devinit init_setup_hpt366(struct pci_dev *dev, ide_pci_device_t *d)
                 d->host_flags |= IDE_HFLAG_SINGLE;
                 d->enablebits[0].mask = d->enablebits[0].val = 0x10;
 
-                d->udma_mask = HPT366_ALLOW_ATA66_3 ?
-                              (HPT366_ALLOW_ATA66_4 ? 0x1f : 0x0f) : 0x07;
+                d->udma_mask = HPT366_ALLOW_ATA66_3 ? (HPT366_ALLOW_ATA66_4 ?
+                               ATA_UDMA4 : ATA_UDMA3) : ATA_UDMA2;
                 break;
         case 3:
         case 4:
-                d->udma_mask = HPT370_ALLOW_ATA100_5 ? 0x3f : 0x1f;
+                d->udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4;
                 break;
         default:
                 rev = 6;
                 /* fall thru */
         case 5:
         case 6:
-                d->udma_mask = HPT372_ALLOW_ATA133_6 ? 0x7f : 0x3f;
+                d->udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5;
                 break;
         }
 
@@ -1559,7 +1579,7 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                 .init_dma       = init_dma_hpt366,
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x50,0x04,0x04}, {0x54,0x04,0x04}},
-                .udma_mask      = HPT372_ALLOW_ATA133_6 ? 0x7f : 0x3f,
+                .udma_mask      = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
                 .bootable       = OFF_BOARD,
                 .extra          = 240,
                 .pio_mask       = ATA_PIO4,
@@ -1571,7 +1591,7 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                 .init_dma       = init_dma_hpt366,
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x50,0x04,0x04}, {0x54,0x04,0x04}},
-                .udma_mask      = HPT302_ALLOW_ATA133_6 ? 0x7f : 0x3f,
+                .udma_mask      = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
                 .bootable       = OFF_BOARD,
                 .extra          = 240,
                 .pio_mask       = ATA_PIO4,
@@ -1583,7 +1603,7 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                 .init_dma       = init_dma_hpt366,
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x50,0x04,0x04}, {0x54,0x04,0x04}},
-                .udma_mask      = HPT371_ALLOW_ATA133_6 ? 0x7f : 0x3f,
+                .udma_mask      = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
                 .bootable       = OFF_BOARD,
                 .extra          = 240,
                 .pio_mask       = ATA_PIO4,
@@ -1595,7 +1615,7 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                 .init_dma       = init_dma_hpt366,
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x50,0x04,0x04}, {0x54,0x04,0x04}},
-                .udma_mask      = 0x3f,
+                .udma_mask      = ATA_UDMA5,
                 .bootable       = OFF_BOARD,
                 .extra          = 240,
                 .pio_mask       = ATA_PIO4,
@@ -1607,7 +1627,7 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                 .init_dma       = init_dma_hpt366,
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x50,0x04,0x04}, {0x54,0x04,0x04}},
-                .udma_mask      = HPT372_ALLOW_ATA133_6 ? 0x7f : 0x3f,
+                .udma_mask      = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
                 .bootable       = OFF_BOARD,
                 .extra          = 240,
                 .pio_mask       = ATA_PIO4,
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index f6db2f37efa..7b0e479c355 100644
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -9,7 +9,7 @@
  *  Split from:
  *  linux/drivers/ide/pdc202xx.c        Version 0.35    Mar. 30, 2002
  *  Copyright (C) 1998-2002             Andre Hedrick <andre@linux-ide.org>
- *  Copyright (C) 2005-2006             MontaVista Software, Inc.
+ *  Copyright (C) 2005-2007             MontaVista Software, Inc.
  *  Portions Copyright (C) 1999 Promise Technology, Inc.
  *  Author: Frank Tiernan (frankt@promise.com)
  *  Released under terms of General Public License
@@ -341,7 +341,7 @@ static long __devinit detect_pll_input_clock(unsigned long dma_base)
          */
         usec_elapsed = (end_time.tv_sec - start_time.tv_sec) * 1000000 +
                 (end_time.tv_usec - start_time.tv_usec);
-        pll_input = ((start_count - end_count) & 0x3ffffff) / 10 *
+        pll_input = ((start_count - end_count) & 0x3fffffff) / 10 *
                 (10000000 / usec_elapsed);
 
         DBG("start[%ld] end[%ld]\n", start_count, end_count);
@@ -535,7 +535,7 @@ static int __devinit init_setup_pdc20270(struct pci_dev *dev,
             (dev->bus->self->device == PCI_DEVICE_ID_DEC_21150)) {
                 if (PCI_SLOT(dev->devfn) & 2)
                         return -ENODEV;
-                d->extra = 0;
+
                 while ((findev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, findev)) != NULL) {
                         if ((findev->vendor == dev->vendor) &&
                             (findev->device == dev->device) &&
@@ -544,7 +544,8 @@ static int __devinit init_setup_pdc20270(struct pci_dev *dev,
                                         findev->irq = dev->irq;
                                 }
                                 ret = ide_setup_pci_devices(dev, findev, d);
-                                pci_dev_put(findev);
+                                if (ret < 0)
+                                        pci_dev_put(findev);
                                 return ret;
                         }
                 }
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index 581316f9581..a7be7795e6a 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -1,6 +1,6 @@
 /*
  *
- * Version 3.46
+ * Version 3.47
  *
  * VIA IDE driver for Linux. Supported southbridges:
  *
@@ -74,6 +74,7 @@ static struct via_isa_bridge {
         u8 udma_mask;
         u8 flags;
 } via_isa_bridges[] = {
+        { "vx800",      PCI_DEVICE_ID_VIA_VX800,    0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
         { "cx700",      PCI_DEVICE_ID_VIA_CX700,    0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
         { "vt8237s",    PCI_DEVICE_ID_VIA_8237S,    0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
         { "vt6410",     PCI_DEVICE_ID_VIA_6410,     0x00, 0x2f, ATA_UDMA6, VIA_BAD_AST },
@@ -429,19 +430,26 @@ static struct dmi_system_id cable_dmi_table[] = {
         { }
 };
 
-static int via_cable_override(void)
+static int via_cable_override(struct pci_dev *pdev)
 {
         /* Systems by DMI */
         if (dmi_check_system(cable_dmi_table))
                 return 1;
+
+        /* Arima W730-K8/Targa Visionary 811/... */
+        if (pdev->subsystem_vendor == 0x161F &&
+            pdev->subsystem_device == 0x2032)
+                return 1;
+
         return 0;
 }
 
 static u8 __devinit via82cxxx_cable_detect(ide_hwif_t *hwif)
 {
-        struct via82cxxx_dev *vdev = pci_get_drvdata(hwif->pci_dev);
+        struct pci_dev *pdev = hwif->pci_dev;
+        struct via82cxxx_dev *vdev = pci_get_drvdata(pdev);
 
-        if (via_cable_override())
+        if (via_cable_override(pdev))
                 return ATA_CBL_PATA40_SHORT;
 
         if ((vdev->via_80w >> hwif->channel) & 1)
diff --git a/drivers/ide/ppc/mpc8xx.c b/drivers/ide/ppc/mpc8xx.c
index 8859fe2f5ac..dab79afa9b2 100644
--- a/drivers/ide/ppc/mpc8xx.c
+++ b/drivers/ide/ppc/mpc8xx.c
@@ -32,7 +32,6 @@
 #include <asm/mpc8xx.h>
 #include <asm/mmu.h>
 #include <asm/processor.h>
-#include <asm/residual.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <asm/ide.h>
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index 30e596c0f12..1129f8c3084 100644
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -816,19 +816,15 @@ static int __init ide_scan_pcidev(struct pci_dev *dev)
         struct list_head *l;
         struct pci_driver *d;
         
-        list_for_each(l, &ide_pci_drivers)
-        {
+        list_for_each(l, &ide_pci_drivers) {
                 d = list_entry(l, struct pci_driver, node);
-                if(d->id_table)
-                {
-                        const struct pci_device_id *id = pci_match_id(d->id_table, dev);
-                        if(id != NULL)
-                        {
-                                if(d->probe(dev, id) >= 0)
-                                {
-                                        dev->driver = d;
-                                        return 1;
-                                }
+                if (d->id_table) {
+                        const struct pci_device_id *id = pci_match_id(d->id_table,
+                                                                      dev);
+                        if (id != NULL && d->probe(dev, id) >= 0) {
+                                dev->driver = d;
+                                pci_dev_get(dev);
+                                return 1;
                         }
                 }
         }
@@ -851,15 +847,13 @@ void __init ide_scan_pcibus (int scan_direction)
         struct list_head *l, *n;
 
         pre_init = 0;
-        if (!scan_direction) {
-                while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
+        if (!scan_direction)
+                while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL)
                         ide_scan_pcidev(dev);
-                }
-        } else {
-                while ((dev = pci_get_device_reverse(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
+        else
+                while ((dev = pci_get_device_reverse(PCI_ANY_ID, PCI_ANY_ID, dev))
+                       != NULL)
                         ide_scan_pcidev(dev);
-                }
-        }
         
         /*
          *      Hand the drivers over to the PCI layer now we
@@ -869,12 +863,9 @@ void __init ide_scan_pcibus (int scan_direction)
         list_for_each_safe(l, n, &ide_pci_drivers) {
                 list_del(l);
                 d = list_entry(l, struct pci_driver, node);
-                if (__pci_register_driver(d, d->driver.owner,
-                                        d->driver.mod_name)) {
-                        printk(KERN_ERR "%s: failed to register driver "
-                                        "for %s\n", __FUNCTION__,
-                                         d->driver.mod_name);
-                }
+                if (__pci_register_driver(d, d->driver.owner, d->driver.mod_name))
+                        printk(KERN_ERR "%s: failed to register driver for %s\n",
+                               __FUNCTION__, d->driver.mod_name);
         }
 }
 #endif
diff --git a/drivers/infiniband/hw/cxgb3/cxio_hal.c b/drivers/infiniband/hw/cxgb3/cxio_hal.c
index 1518b41482a..beb2a381467 100644
--- a/drivers/infiniband/hw/cxgb3/cxio_hal.c
+++ b/drivers/infiniband/hw/cxgb3/cxio_hal.c
@@ -916,7 +916,7 @@ int cxio_rdev_open(struct cxio_rdev *rdev_p)
         PDBG("%s opening rnic dev %s\n", __FUNCTION__, rdev_p->dev_name);
         memset(&rdev_p->ctrl_qp, 0, sizeof(rdev_p->ctrl_qp));
         if (!rdev_p->t3cdev_p)
-                rdev_p->t3cdev_p = T3CDEV(netdev_p);
+                rdev_p->t3cdev_p = dev2t3cdev(netdev_p);
         rdev_p->t3cdev_p->ulp = (void *) rdev_p;
         err = rdev_p->t3cdev_p->ctl(rdev_p->t3cdev_p, RDMA_GET_PARAMS,
                                          &(rdev_p->rnic_info));
diff --git a/drivers/infiniband/hw/ehca/ehca_hca.c b/drivers/infiniband/hw/ehca/ehca_hca.c
index fc19ef9fd96..cf22472d941 100644
--- a/drivers/infiniband/hw/ehca/ehca_hca.c
+++ b/drivers/infiniband/hw/ehca/ehca_hca.c
@@ -93,9 +93,13 @@ int ehca_query_device(struct ib_device *ibdev, struct ib_device_attr *props)
         props->max_pd          = min_t(int, rblock->max_pd, INT_MAX);
         props->max_ah          = min_t(int, rblock->max_ah, INT_MAX);
         props->max_fmr         = min_t(int, rblock->max_mr, INT_MAX);
-        props->max_srq         = 0;
-        props->max_srq_wr      = 0;
-        props->max_srq_sge     = 0;
+
+        if (EHCA_BMASK_GET(HCA_CAP_SRQ, shca->hca_cap)) {
+                props->max_srq         = props->max_qp;
+                props->max_srq_wr      = props->max_qp_wr;
+                props->max_srq_sge     = 3;
+        }
+
         props->max_pkeys       = 16;
         props->local_ca_ack_delay
                 = rblock->local_ca_ack_delay;
diff --git a/drivers/infiniband/hw/ehca/ehca_irq.c b/drivers/infiniband/hw/ehca/ehca_irq.c
index ee06d8bd739..a925ea52443 100644
--- a/drivers/infiniband/hw/ehca/ehca_irq.c
+++ b/drivers/infiniband/hw/ehca/ehca_irq.c
@@ -175,41 +175,55 @@ error_data1:
 
 }
 
-static void qp_event_callback(struct ehca_shca *shca, u64 eqe,
-                              enum ib_event_type event_type, int fatal)
+static void dispatch_qp_event(struct ehca_shca *shca, struct ehca_qp *qp,
+                              enum ib_event_type event_type)
 {
         struct ib_event event;
-        struct ehca_qp *qp;
-        u32 token = EHCA_BMASK_GET(EQE_QP_TOKEN, eqe);
-
-        read_lock(&ehca_qp_idr_lock);
-        qp = idr_find(&ehca_qp_idr, token);
-        read_unlock(&ehca_qp_idr_lock);
-
-
-        if (!qp)
-                return;
-
-        if (fatal)
-                ehca_error_data(shca, qp, qp->ipz_qp_handle.handle);
 
         event.device = &shca->ib_device;
+        event.event = event_type;
 
         if (qp->ext_type == EQPT_SRQ) {
                 if (!qp->ib_srq.event_handler)
                         return;
 
-                event.event = fatal ? IB_EVENT_SRQ_ERR : event_type;
                 event.element.srq = &qp->ib_srq;
                 qp->ib_srq.event_handler(&event, qp->ib_srq.srq_context);
         } else {
                 if (!qp->ib_qp.event_handler)
                         return;
 
-                event.event = event_type;
                 event.element.qp = &qp->ib_qp;
                 qp->ib_qp.event_handler(&event, qp->ib_qp.qp_context);
         }
+}
+
+static void qp_event_callback(struct ehca_shca *shca, u64 eqe,
+                              enum ib_event_type event_type, int fatal)
+{
+        struct ehca_qp *qp;
+        u32 token = EHCA_BMASK_GET(EQE_QP_TOKEN, eqe);
+
+        read_lock(&ehca_qp_idr_lock);
+        qp = idr_find(&ehca_qp_idr, token);
+        read_unlock(&ehca_qp_idr_lock);
+
+        if (!qp)
+                return;
+
+        if (fatal)
+                ehca_error_data(shca, qp, qp->ipz_qp_handle.handle);
+
+        dispatch_qp_event(shca, qp, fatal && qp->ext_type == EQPT_SRQ ?
+                          IB_EVENT_SRQ_ERR : event_type);
+
+        /*
+         * eHCA only processes one WQE at a time for SRQ base QPs,
+         * so the last WQE has been processed as soon as the QP enters
+         * error state.
+         */
+        if (fatal && qp->ext_type == EQPT_SRQBASE)
+                dispatch_qp_event(shca, qp, IB_EVENT_QP_LAST_WQE_REACHED);
 
         return;
 }
diff --git a/drivers/infiniband/hw/ehca/ehca_qp.c b/drivers/infiniband/hw/ehca/ehca_qp.c
index b178cba9634..84d435a5ee1 100644
--- a/drivers/infiniband/hw/ehca/ehca_qp.c
+++ b/drivers/infiniband/hw/ehca/ehca_qp.c
@@ -600,10 +600,12 @@ static struct ehca_qp *internal_create_qp(
 
         if (EHCA_BMASK_GET(HCA_CAP_MINI_QP, shca->hca_cap)
             && !(context && udata)) { /* no small QP support in userspace ATM */
-                ehca_determine_small_queue(
-                        &parms.squeue, max_send_sge, is_llqp);
-                ehca_determine_small_queue(
-                        &parms.rqueue, max_recv_sge, is_llqp);
+                if (HAS_SQ(my_qp))
+                        ehca_determine_small_queue(
+                                &parms.squeue, max_send_sge, is_llqp);
+                if (HAS_RQ(my_qp))
+                        ehca_determine_small_queue(
+                                &parms.rqueue, max_recv_sge, is_llqp);
                 parms.qp_storage =
                         (parms.squeue.is_small || parms.rqueue.is_small);
         }
diff --git a/drivers/infiniband/hw/ehca/ipz_pt_fn.c b/drivers/infiniband/hw/ehca/ipz_pt_fn.c
index a090c679c39..29bd476fbd5 100644
--- a/drivers/infiniband/hw/ehca/ipz_pt_fn.c
+++ b/drivers/infiniband/hw/ehca/ipz_pt_fn.c
@@ -172,7 +172,7 @@ static void free_small_queue_page(struct ipz_queue *queue, struct ehca_pd *pd)
         unsigned long bit;
         int free_page = 0;
 
-        bit = ((unsigned long)queue->queue_pages[0] & PAGE_MASK)
+        bit = ((unsigned long)queue->queue_pages[0] & ~PAGE_MASK)
                 >> (order + 9);
 
         mutex_lock(&pd->lock);
diff --git a/drivers/input/joystick/iforce/iforce-packets.c b/drivers/input/joystick/iforce/iforce-packets.c
index 3154ccd7400..45c4939ced7 100644
--- a/drivers/input/joystick/iforce/iforce-packets.c
+++ b/drivers/input/joystick/iforce/iforce-packets.c
@@ -246,13 +246,12 @@ void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data)
 
 int iforce_get_id_packet(struct iforce *iforce, char *packet)
 {
-        int status;
-
         switch (iforce->bus) {
 
-        case IFORCE_USB:
-
+        case IFORCE_USB: {
 #ifdef CONFIG_JOYSTICK_IFORCE_USB
+                int status;
+
                 iforce->cr.bRequest = packet[0];
                 iforce->ctrl->dev = iforce->usbdev;
 
@@ -273,6 +272,7 @@ int iforce_get_id_packet(struct iforce *iforce, char *packet)
 #else
                 dbg("iforce_get_id_packet: iforce->bus = USB!");
 #endif
+                }
                 break;
 
         case IFORCE_232:
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index 739212252b0..f0b22b8b276 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -22,7 +22,6 @@
 #include <linux/delay.h>
 #include <linux/platform_device.h>
 #include <linux/input.h>
-#include <linux/irq.h>
 #include <linux/gpio_keys.h>
 
 #include <asm/gpio.h>
diff --git a/drivers/input/mouse/touchkit_ps2.h b/drivers/input/mouse/touchkit_ps2.h
index 61e9dfd8419..8a0dd3574ae 100644
--- a/drivers/input/mouse/touchkit_ps2.h
+++ b/drivers/input/mouse/touchkit_ps2.h
@@ -15,7 +15,8 @@
 #ifdef CONFIG_MOUSE_PS2_TOUCHKIT
 int touchkit_ps2_detect(struct psmouse *psmouse, int set_properties);
 #else
-inline int touchkit_ps2_detect(struct psmouse *psmouse, int set_properties)
+static inline int touchkit_ps2_detect(struct psmouse *psmouse,
+                                      int set_properties)
 {
         return -ENOSYS;
 }
diff --git a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c
index 74f14e09778..3e99df6be08 100644
--- a/drivers/input/serio/gscps2.c
+++ b/drivers/input/serio/gscps2.c
@@ -340,8 +340,8 @@ static int __init gscps2_probe(struct parisc_device *dev)
         if (dev->id.sversion == 0x96)
                 hpa += GSC_DINO_OFFSET;
 
-        ps2port = kmalloc(sizeof(struct gscps2port), GFP_KERNEL);
-        serio = kmalloc(sizeof(struct serio), GFP_KERNEL);
+        ps2port = kzalloc(sizeof(struct gscps2port), GFP_KERNEL);
+        serio = kzalloc(sizeof(struct serio), GFP_KERNEL);
         if (!ps2port || !serio) {
                 ret = -ENOMEM;
                 goto fail_nomem;
@@ -349,8 +349,6 @@ static int __init gscps2_probe(struct parisc_device *dev)
 
         dev_set_drvdata(&dev->dev, ps2port);
 
-        memset(ps2port, 0, sizeof(struct gscps2port));
-        memset(serio, 0, sizeof(struct serio));
         ps2port->port = serio;
         ps2port->padev = dev;
         ps2port->addr = ioremap_nocache(hpa, GSC_STATUS + 4);
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index 702a526cf45..f8fe4214809 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -211,6 +211,16 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = {
                 },
         },
         {
+                /*
+                 * Like DV4017EA does not raise AUXERR for errors on MUX ports.
+                 */
+                .ident = "HP Pavilion DV4270ca",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Pavilion dv4000 (EH476UA#ABL)"),
+                },
+        },
+        {
                 .ident = "Toshiba P10",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 3888dc307e0..c2eea2767e1 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -512,6 +512,7 @@ static irqreturn_t __devinit i8042_aux_test_irq(int irq, void *dev_id)
 {
         unsigned long flags;
         unsigned char str, data;
+        int ret = 0;
 
         spin_lock_irqsave(&i8042_lock, flags);
         str = i8042_read_status();
@@ -520,10 +521,11 @@ static irqreturn_t __devinit i8042_aux_test_irq(int irq, void *dev_id)
                 if (i8042_irq_being_tested &&
                     data == 0xa5 && (str & I8042_STR_AUXDATA))
                         complete(&i8042_aux_irq_delivered);
+                ret = 1;
         }
         spin_unlock_irqrestore(&i8042_lock, flags);
 
-        return IRQ_HANDLED;
+        return IRQ_RETVAL(ret);
 }
 
 /*
@@ -1038,7 +1040,7 @@ static void __devinit i8042_register_ports(void)
         }
 }
 
-static void __devinit i8042_unregister_ports(void)
+static void __devexit i8042_unregister_ports(void)
 {
         int i;
 
diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c
index b407028ffc5..741f6c6f1e5 100644
--- a/drivers/input/touchscreen/usbtouchscreen.c
+++ b/drivers/input/touchscreen/usbtouchscreen.c
@@ -767,7 +767,7 @@ static int usbtouch_probe(struct usb_interface *intf,
                          le16_to_cpu(udev->descriptor.idProduct));
 
         usb_make_path(udev, usbtouch->phys, sizeof(usbtouch->phys));
-        strlcpy(usbtouch->phys, "/input0", sizeof(usbtouch->phys));
+        strlcat(usbtouch->phys, "/input0", sizeof(usbtouch->phys));
 
         input_dev->name = usbtouch->name;
         input_dev->phys = usbtouch->phys;
diff --git a/drivers/lguest/interrupts_and_traps.c b/drivers/lguest/interrupts_and_traps.c
index 49aa55577d0..39731232d82 100644
--- a/drivers/lguest/interrupts_and_traps.c
+++ b/drivers/lguest/interrupts_and_traps.c
@@ -270,8 +270,11 @@ void pin_stack_pages(struct lguest *lg)
         /* Depending on the CONFIG_4KSTACKS option, the Guest can have one or
          * two pages of stack space. */
         for (i = 0; i < lg->stack_pages; i++)
-                /* The stack grows *upwards*, hence the subtraction */
-                pin_page(lg, lg->esp1 - i * PAGE_SIZE);
+                /* The stack grows *upwards*, so the address we're given is the
+                 * start of the page after the kernel stack.  Subtract one to
+                 * get back onto the first stack page, and keep subtracting to
+                 * get to the rest of the stack pages. */
+                pin_page(lg, lg->esp1 - 1 - i * PAGE_SIZE);
 }
 
 /* Direct traps also mean that we need to know whenever the Guest wants to use
diff --git a/drivers/lguest/lguest.c b/drivers/lguest/lguest.c
index 6e135ac0834..ee1c6d05c3d 100644
--- a/drivers/lguest/lguest.c
+++ b/drivers/lguest/lguest.c
@@ -964,11 +964,12 @@ __init void lguest_init(void *boot)
 {
         /* Copy boot parameters first: the Launcher put the physical location
          * in %esi, and head.S converted that to a virtual address and handed
-         * it to us. */
-        memcpy(&boot_params, boot, PARAM_SIZE);
+         * it to us.  We use "__memcpy" because "memcpy" sometimes tries to do
+         * tricky things to go faster, and we're not ready for that. */
+        __memcpy(&boot_params, boot, PARAM_SIZE);
         /* The boot parameters also tell us where the command-line is: save
          * that, too. */
-        memcpy(boot_command_line, __va(boot_params.hdr.cmd_line_ptr),
+        __memcpy(boot_command_line, __va(boot_params.hdr.cmd_line_ptr),
                COMMAND_LINE_SIZE);
 
         /* We're under lguest, paravirt is enabled, and we're running at
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 2aff4be35dc..4d63773ee73 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -2541,7 +2541,7 @@ static void handle_stripe_expansion(raid5_conf_t *conf, struct stripe_head *sh,
         struct dma_async_tx_descriptor *tx = NULL;
         clear_bit(STRIPE_EXPAND_SOURCE, &sh->state);
         for (i = 0; i < sh->disks; i++)
-                if (i != sh->pd_idx && (r6s && i != r6s->qd_idx)) {
+                if (i != sh->pd_idx && (!r6s || i != r6s->qd_idx)) {
                         int dd_idx, pd_idx, j;
                         struct stripe_head *sh2;
 
@@ -2574,7 +2574,8 @@ static void handle_stripe_expansion(raid5_conf_t *conf, struct stripe_head *sh,
                         set_bit(R5_UPTODATE, &sh2->dev[dd_idx].flags);
                         for (j = 0; j < conf->raid_disks; j++)
                                 if (j != sh2->pd_idx &&
-                                    (r6s && j != r6s->qd_idx) &&
+                                    (!r6s || j != raid6_next_disk(sh2->pd_idx,
+                                                                 sh2->disks)) &&
                                     !test_bit(R5_Expanded, &sh2->dev[j].flags))
                                         break;
                         if (j == conf->raid_disks) {
@@ -2583,12 +2584,12 @@ static void handle_stripe_expansion(raid5_conf_t *conf, struct stripe_head *sh,
                         }
                         release_stripe(sh2);
 
-                        /* done submitting copies, wait for them to complete */
-                        if (i + 1 >= sh->disks) {
-                                async_tx_ack(tx);
-                                dma_wait_for_async_tx(tx);
-                        }
                 }
+        /* done submitting copies, wait for them to complete */
+        if (tx) {
+                async_tx_ack(tx);
+                dma_wait_for_async_tx(tx);
+        }
 }
 
 /*
@@ -2855,7 +2856,7 @@ static void handle_stripe5(struct stripe_head *sh)
                 sh->disks = conf->raid_disks;
                 sh->pd_idx = stripe_to_pdidx(sh->sector, conf,
                         conf->raid_disks);
-                s.locked += handle_write_operations5(sh, 0, 1);
+                s.locked += handle_write_operations5(sh, 1, 1);
         } else if (s.expanded &&
                 !test_bit(STRIPE_OP_POSTXOR, &sh->ops.pending)) {
                 clear_bit(STRIPE_EXPAND_READY, &sh->state);
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c
index bfebd2fa7ad..955ea60583b 100644
--- a/drivers/mmc/host/at91_mci.c
+++ b/drivers/mmc/host/at91_mci.c
@@ -941,7 +941,7 @@ static int __exit at91_mci_remove(struct platform_device *pdev)
 
         host = mmc_priv(mmc);
 
-        if (host->present != -1) {
+        if (host->board->det_pin) {
                 device_init_wakeup(&pdev->dev, 0);
                 free_irq(host->board->det_pin, host);
                 cancel_delayed_work(&host->mmc->detect);
@@ -972,7 +972,7 @@ static int at91_mci_suspend(struct platform_device *pdev, pm_message_t state)
         struct at91mci_host *host = mmc_priv(mmc);
         int ret = 0;
 
-        if (device_may_wakeup(&pdev->dev))
+        if (host->board->det_pin && device_may_wakeup(&pdev->dev))
                 enable_irq_wake(host->board->det_pin);
 
         if (mmc)
@@ -987,7 +987,7 @@ static int at91_mci_resume(struct platform_device *pdev)
         struct at91mci_host *host = mmc_priv(mmc);
         int ret = 0;
 
-        if (device_may_wakeup(&pdev->dev))
+        if (host->board->det_pin && device_may_wakeup(&pdev->dev))
                 disable_irq_wake(host->board->det_pin);
 
         if (mmc)
diff --git a/drivers/mtd/maps/lubbock-flash.c b/drivers/mtd/maps/lubbock-flash.c
index 1aa0447c5e6..e8560683b97 100644
--- a/drivers/mtd/maps/lubbock-flash.c
+++ b/drivers/mtd/maps/lubbock-flash.c
@@ -15,9 +15,7 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/slab.h>
 
-#include <linux/dma-mapping.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
@@ -26,7 +24,7 @@
 #include <asm/hardware.h>
 #include <asm/arch/pxa-regs.h>
 #include <asm/arch/lubbock.h>
-
+#include <asm/cacheflush.h>
 
 #define ROM_ADDR        0x00000000
 #define FLASH_ADDR      0x04000000
@@ -35,7 +33,7 @@
 
 static void lubbock_map_inval_cache(struct map_info *map, unsigned long from, ssize_t len)
 {
-        consistent_sync((char *)map->cached + from, len, DMA_FROM_DEVICE);
+        flush_ioremap_region(map->phys, map->cached, from, len);
 }
 
 static struct map_info lubbock_maps[2] = { {
diff --git a/drivers/mtd/maps/mainstone-flash.c b/drivers/mtd/maps/mainstone-flash.c
index eaa4bbb868a..d76487d82dc 100644
--- a/drivers/mtd/maps/mainstone-flash.c
+++ b/drivers/mtd/maps/mainstone-flash.c
@@ -15,8 +15,6 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/dma-mapping.h>
-#include <linux/slab.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
@@ -26,6 +24,7 @@
 #include <asm/hardware.h>
 #include <asm/arch/pxa-regs.h>
 #include <asm/arch/mainstone.h>
+#include <asm/cacheflush.h>
 
 
 #define ROM_ADDR        0x00000000
@@ -36,7 +35,7 @@
 static void mainstone_map_inval_cache(struct map_info *map, unsigned long from,
                                       ssize_t len)
 {
-        consistent_sync((char *)map->cached + from, len, DMA_FROM_DEVICE);
+        flush_ioremap_region(map->phys, map->cached, from, len);
 }
 
 static struct map_info mainstone_maps[2] = { {
diff --git a/drivers/mtd/mtdsuper.c b/drivers/mtd/mtdsuper.c
index aca33197120..9b430f20b64 100644
--- a/drivers/mtd/mtdsuper.c
+++ b/drivers/mtd/mtdsuper.c
@@ -70,6 +70,8 @@ static int get_sb_mtd_aux(struct file_system_type *fs_type, int flags,
         DEBUG(1, "MTDSB: New superblock for device %d (\"%s\")\n",
               mtd->index, mtd->name);
 
+        sb->s_flags = flags;
+
         ret = fill_super(sb, data, flags & MS_SILENT ? 1 : 0);
         if (ret < 0) {
                 up_write(&sb->s_umount);
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 24e7f9ab3f5..854d80c330e 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -3934,11 +3934,13 @@ bnx2_reset_chip(struct bnx2 *bp, u32 reset_code)
                 /* Chip reset. */
                 REG_WR(bp, BNX2_PCICFG_MISC_CONFIG, val);
 
+                /* Reading back any register after chip reset will hang the
+                 * bus on 5706 A0 and A1.  The msleep below provides plenty
+                 * of margin for write posting.
+                 */
                 if ((CHIP_ID(bp) == CHIP_ID_5706_A0) ||
-                    (CHIP_ID(bp) == CHIP_ID_5706_A1)) {
-                        current->state = TASK_UNINTERRUPTIBLE;
-                        schedule_timeout(HZ / 50);
-                }
+                    (CHIP_ID(bp) == CHIP_ID_5706_A1))
+                        msleep(20);
 
                 /* Reset takes approximate 30 usec */
                 for (i = 0; i < 10; i++) {
diff --git a/drivers/net/cxgb3/adapter.h b/drivers/net/cxgb3/adapter.h
index ab72563b81e..20e887de254 100644
--- a/drivers/net/cxgb3/adapter.h
+++ b/drivers/net/cxgb3/adapter.h
@@ -50,7 +50,9 @@ typedef irqreturn_t(*intr_handler_t) (int, void *);
 
 struct vlan_group;
 
+struct adapter;
 struct port_info {
+        struct adapter *adapter;
         struct vlan_group *vlan_grp;
         const struct port_type_info *port_type;
         u8 port_id;
diff --git a/drivers/net/cxgb3/common.h b/drivers/net/cxgb3/common.h
index 16378004507..2129210a67c 100644
--- a/drivers/net/cxgb3/common.h
+++ b/drivers/net/cxgb3/common.h
@@ -679,7 +679,8 @@ const struct adapter_info *t3_get_adapter_info(unsigned int board_id);
 int t3_seeprom_read(struct adapter *adapter, u32 addr, u32 *data);
 int t3_seeprom_write(struct adapter *adapter, u32 addr, u32 data);
 int t3_seeprom_wp(struct adapter *adapter, int enable);
-int t3_check_tpsram_version(struct adapter *adapter);
+int t3_get_tp_version(struct adapter *adapter, u32 *vers);
+int t3_check_tpsram_version(struct adapter *adapter, int *must_load);
 int t3_check_tpsram(struct adapter *adapter, u8 *tp_ram, unsigned int size);
 int t3_set_proto_sram(struct adapter *adap, u8 *data);
 int t3_read_flash(struct adapter *adapter, unsigned int addr,
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index dc5d26988bb..5ab319cfe5d 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -358,11 +358,14 @@ static int init_dummy_netdevs(struct adapter *adap)
 
                 for (j = 0; j < pi->nqsets - 1; j++) {
                         if (!adap->dummy_netdev[dummy_idx]) {
-                                nd = alloc_netdev(0, "", ether_setup);
+                                struct port_info *p;
+
+                                nd = alloc_netdev(sizeof(*p), "", ether_setup);
                                 if (!nd)
                                         goto free_all;
 
-                                nd->priv = adap;
+                                p = netdev_priv(nd);
+                                p->adapter = adap;
                                 nd->weight = 64;
                                 set_bit(__LINK_STATE_START, &nd->state);
                                 adap->dummy_netdev[dummy_idx] = nd;
@@ -482,7 +485,8 @@ static ssize_t attr_store(struct device *d, struct device_attribute *attr,
 #define CXGB3_SHOW(name, val_expr) \
 static ssize_t format_##name(struct net_device *dev, char *buf) \
 { \
-        struct adapter *adap = dev->priv; \
+        struct port_info *pi = netdev_priv(dev); \
+        struct adapter *adap = pi->adapter; \
         return sprintf(buf, "%u\n", val_expr); \
 } \
 static ssize_t show_##name(struct device *d, struct device_attribute *attr, \
@@ -493,7 +497,8 @@ static ssize_t show_##name(struct device *d, struct device_attribute *attr, \
 
 static ssize_t set_nfilters(struct net_device *dev, unsigned int val)
 {
-        struct adapter *adap = dev->priv;
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adap = pi->adapter;
         int min_tids = is_offload(adap) ? MC5_MIN_TIDS : 0;
 
         if (adap->flags & FULL_INIT_DONE)
@@ -515,7 +520,8 @@ static ssize_t store_nfilters(struct device *d, struct device_attribute *attr,
 
 static ssize_t set_nservers(struct net_device *dev, unsigned int val)
 {
-        struct adapter *adap = dev->priv;
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adap = pi->adapter;
 
         if (adap->flags & FULL_INIT_DONE)
                 return -EBUSY;
@@ -556,9 +562,10 @@ static struct attribute_group cxgb3_attr_group = {.attrs = cxgb3_attrs };
 static ssize_t tm_attr_show(struct device *d, struct device_attribute *attr,
                             char *buf, int sched)
 {
-        ssize_t len;
+        struct port_info *pi = netdev_priv(to_net_dev(d));
+        struct adapter *adap = pi->adapter;
         unsigned int v, addr, bpt, cpt;
-        struct adapter *adap = to_net_dev(d)->priv;
+        ssize_t len;
 
         addr = A_TP_TX_MOD_Q1_Q0_RATE_LIMIT - sched / 2;
         rtnl_lock();
@@ -581,10 +588,11 @@ static ssize_t tm_attr_show(struct device *d, struct device_attribute *attr,
 static ssize_t tm_attr_store(struct device *d, struct device_attribute *attr,
                              const char *buf, size_t len, int sched)
 {
+        struct port_info *pi = netdev_priv(to_net_dev(d));
+        struct adapter *adap = pi->adapter;
+        unsigned int val;
         char *endp;
         ssize_t ret;
-        unsigned int val;
-        struct adapter *adap = to_net_dev(d)->priv;
 
         if (!capable(CAP_NET_ADMIN))
                 return -EPERM;
@@ -721,6 +729,7 @@ static void bind_qsets(struct adapter *adap)
 }
 
 #define FW_FNAME "t3fw-%d.%d.%d.bin"
+#define TPSRAM_NAME "t3%c_protocol_sram-%d.%d.%d.bin"
 
 static int upgrade_fw(struct adapter *adap)
 {
@@ -739,6 +748,71 @@ static int upgrade_fw(struct adapter *adap)
         }
         ret = t3_load_fw(adap, fw->data, fw->size);
         release_firmware(fw);
+
+        if (ret == 0)
+                dev_info(dev, "successful upgrade to firmware %d.%d.%d\n",
+                         FW_VERSION_MAJOR, FW_VERSION_MINOR, FW_VERSION_MICRO);
+        else
+                dev_err(dev, "failed to upgrade to firmware %d.%d.%d\n",
+                        FW_VERSION_MAJOR, FW_VERSION_MINOR, FW_VERSION_MICRO);
+        
+        return ret;
+}
+
+static inline char t3rev2char(struct adapter *adapter)
+{
+        char rev = 0;
+
+        switch(adapter->params.rev) {
+        case T3_REV_B:
+        case T3_REV_B2:
+                rev = 'b';
+                break;
+        }
+        return rev;
+}
+
+int update_tpsram(struct adapter *adap)
+{
+        const struct firmware *tpsram;
+        char buf[64];
+        struct device *dev = &adap->pdev->dev;
+        int ret;
+        char rev;
+        
+        rev = t3rev2char(adap);
+        if (!rev)
+                return 0;
+
+        snprintf(buf, sizeof(buf), TPSRAM_NAME, rev,
+                 TP_VERSION_MAJOR, TP_VERSION_MINOR, TP_VERSION_MICRO);
+
+        ret = request_firmware(&tpsram, buf, dev);
+        if (ret < 0) {
+                dev_err(dev, "could not load TP SRAM: unable to load %s\n",
+                        buf);
+                return ret;
+        }
+        
+        ret = t3_check_tpsram(adap, tpsram->data, tpsram->size);
+        if (ret)
+                goto release_tpsram;    
+
+        ret = t3_set_proto_sram(adap, tpsram->data);
+        if (ret == 0)
+                dev_info(dev,
+                         "successful update of protocol engine "
+                         "to %d.%d.%d\n",
+                         TP_VERSION_MAJOR, TP_VERSION_MINOR, TP_VERSION_MICRO);
+        else
+                dev_err(dev, "failed to update of protocol engine %d.%d.%d\n",
+                        TP_VERSION_MAJOR, TP_VERSION_MINOR, TP_VERSION_MICRO);
+        if (ret)
+                dev_err(dev, "loading protocol SRAM failed\n");
+
+release_tpsram:
+        release_firmware(tpsram);
+        
         return ret;
 }
 
@@ -755,6 +829,7 @@ static int upgrade_fw(struct adapter *adap)
 static int cxgb_up(struct adapter *adap)
 {
         int err = 0;
+        int must_load;
 
         if (!(adap->flags & FULL_INIT_DONE)) {
                 err = t3_check_fw_version(adap);
@@ -763,6 +838,13 @@ static int cxgb_up(struct adapter *adap)
                 if (err)
                         goto out;
 
+                err = t3_check_tpsram_version(adap, &must_load);
+                if (err == -EINVAL) {
+                        err = update_tpsram(adap);
+                        if (err && must_load)
+                                goto out;
+                }
+
                 err = init_dummy_netdevs(adap);
                 if (err)
                         goto out;
@@ -858,8 +940,9 @@ static void schedule_chk_task(struct adapter *adap)
 
 static int offload_open(struct net_device *dev)
 {
-        struct adapter *adapter = dev->priv;
-        struct t3cdev *tdev = T3CDEV(dev);
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
+        struct t3cdev *tdev = dev2t3cdev(dev);
         int adap_up = adapter->open_device_map & PORT_MASK;
         int err = 0;
 
@@ -924,10 +1007,10 @@ static int offload_close(struct t3cdev *tdev)
 
 static int cxgb_open(struct net_device *dev)
 {
-        int err;
-        struct adapter *adapter = dev->priv;
         struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
         int other_ports = adapter->open_device_map & PORT_MASK;
+        int err;
 
         if (!adapter->open_device_map && (err = cxgb_up(adapter)) < 0)
                 return err;
@@ -951,17 +1034,17 @@ static int cxgb_open(struct net_device *dev)
 
 static int cxgb_close(struct net_device *dev)
 {
-        struct adapter *adapter = dev->priv;
-        struct port_info *p = netdev_priv(dev);
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
 
-        t3_port_intr_disable(adapter, p->port_id);
+        t3_port_intr_disable(adapter, pi->port_id);
         netif_stop_queue(dev);
-        p->phy.ops->power_down(&p->phy, 1);
+        pi->phy.ops->power_down(&pi->phy, 1);
         netif_carrier_off(dev);
-        t3_mac_disable(&p->mac, MAC_DIRECTION_TX | MAC_DIRECTION_RX);
+        t3_mac_disable(&pi->mac, MAC_DIRECTION_TX | MAC_DIRECTION_RX);
 
         spin_lock(&adapter->work_lock); /* sync with update task */
-        clear_bit(p->port_id, &adapter->open_device_map);
+        clear_bit(pi->port_id, &adapter->open_device_map);
         spin_unlock(&adapter->work_lock);
 
         if (!(adapter->open_device_map & PORT_MASK))
@@ -976,13 +1059,13 @@ static int cxgb_close(struct net_device *dev)
 
 static struct net_device_stats *cxgb_get_stats(struct net_device *dev)
 {
-        struct adapter *adapter = dev->priv;
-        struct port_info *p = netdev_priv(dev);
-        struct net_device_stats *ns = &p->netstats;
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
+        struct net_device_stats *ns = &pi->netstats;
         const struct mac_stats *pstats;
 
         spin_lock(&adapter->stats_lock);
-        pstats = t3_mac_update_stats(&p->mac);
+        pstats = t3_mac_update_stats(&pi->mac);
         spin_unlock(&adapter->stats_lock);
 
         ns->tx_bytes = pstats->tx_octets;
@@ -1015,14 +1098,16 @@ static struct net_device_stats *cxgb_get_stats(struct net_device *dev)
 
 static u32 get_msglevel(struct net_device *dev)
 {
-        struct adapter *adapter = dev->priv;
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
 
         return adapter->msg_enable;
 }
 
 static void set_msglevel(struct net_device *dev, u32 val)
 {
-        struct adapter *adapter = dev->priv;
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
 
         adapter->msg_enable = val;
 }
@@ -1096,10 +1181,13 @@ static int get_eeprom_len(struct net_device *dev)
 
 static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
 {
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
         u32 fw_vers = 0;
-        struct adapter *adapter = dev->priv;
+        u32 tp_vers = 0;
 
         t3_get_fw_version(adapter, &fw_vers);
+        t3_get_tp_version(adapter, &tp_vers);
 
         strcpy(info->driver, DRV_NAME);
         strcpy(info->version, DRV_VERSION);
@@ -1108,11 +1196,14 @@ static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
                 strcpy(info->fw_version, "N/A");
         else {
                 snprintf(info->fw_version, sizeof(info->fw_version),
-                         "%s %u.%u.%u",
+                         "%s %u.%u.%u TP %u.%u.%u",
                          G_FW_VERSION_TYPE(fw_vers) ? "T" : "N",
                          G_FW_VERSION_MAJOR(fw_vers),
                          G_FW_VERSION_MINOR(fw_vers),
-                         G_FW_VERSION_MICRO(fw_vers));
+                         G_FW_VERSION_MICRO(fw_vers),
+                         G_TP_VERSION_MAJOR(tp_vers),
+                         G_TP_VERSION_MINOR(tp_vers),
+                         G_TP_VERSION_MICRO(tp_vers));
         }
 }
 
@@ -1136,8 +1227,8 @@ static unsigned long collect_sge_port_stats(struct adapter *adapter,
 static void get_stats(struct net_device *dev, struct ethtool_stats *stats,
                       u64 *data)
 {
-        struct adapter *adapter = dev->priv;
         struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
         const struct mac_stats *s;
 
         spin_lock(&adapter->stats_lock);
@@ -1205,7 +1296,8 @@ static inline void reg_block_dump(struct adapter *ap, void *buf,
 static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
                      void *buf)
 {
-        struct adapter *ap = dev->priv;
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *ap = pi->adapter;
 
         /*
          * Version scheme:
@@ -1246,8 +1338,9 @@ static int restart_autoneg(struct net_device *dev)
 
 static int cxgb3_phys_id(struct net_device *dev, u32 data)
 {
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
         int i;
-        struct adapter *adapter = dev->priv;
 
         if (data == 0)
                 data = 2;
@@ -1408,8 +1501,8 @@ static int set_rx_csum(struct net_device *dev, u32 data)
 
 static void get_sge_param(struct net_device *dev, struct ethtool_ringparam *e)
 {
-        const struct adapter *adapter = dev->priv;
-        const struct port_info *pi = netdev_priv(dev);
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
         const struct qset_params *q = &adapter->params.sge.qset[pi->first_qset];
 
         e->rx_max_pending = MAX_RX_BUFFERS;
@@ -1425,10 +1518,10 @@ static void get_sge_param(struct net_device *dev, struct ethtool_ringparam *e)
 
 static int set_sge_param(struct net_device *dev, struct ethtool_ringparam *e)
 {
-        int i;
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
         struct qset_params *q;
-        struct adapter *adapter = dev->priv;
-        const struct port_info *pi = netdev_priv(dev);
+        int i;
 
         if (e->rx_pending > MAX_RX_BUFFERS ||
             e->rx_jumbo_pending > MAX_RX_JUMBO_BUFFERS ||
@@ -1457,7 +1550,8 @@ static int set_sge_param(struct net_device *dev, struct ethtool_ringparam *e)
 
 static int set_coalesce(struct net_device *dev, struct ethtool_coalesce *c)
 {
-        struct adapter *adapter = dev->priv;
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
         struct qset_params *qsp = &adapter->params.sge.qset[0];
         struct sge_qset *qs = &adapter->sge.qs[0];
 
@@ -1471,7 +1565,8 @@ static int set_coalesce(struct net_device *dev, struct ethtool_coalesce *c)
 
 static int get_coalesce(struct net_device *dev, struct ethtool_coalesce *c)
 {
-        struct adapter *adapter = dev->priv;
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
         struct qset_params *q = adapter->params.sge.qset;
 
         c->rx_coalesce_usecs = q->coalesce_usecs;
@@ -1481,8 +1576,9 @@ static int get_coalesce(struct net_device *dev, struct ethtool_coalesce *c)
 static int get_eeprom(struct net_device *dev, struct ethtool_eeprom *e,
                       u8 * data)
 {
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
         int i, err = 0;
-        struct adapter *adapter = dev->priv;
 
         u8 *buf = kmalloc(EEPROMSIZE, GFP_KERNEL);
         if (!buf)
@@ -1501,10 +1597,11 @@ static int get_eeprom(struct net_device *dev, struct ethtool_eeprom *e,
 static int set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
                       u8 * data)
 {
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
+        u32 aligned_offset, aligned_len, *p;
         u8 *buf;
         int err = 0;
-        u32 aligned_offset, aligned_len, *p;
-        struct adapter *adapter = dev->priv;
 
         if (eeprom->magic != EEPROM_MAGIC)
                 return -EINVAL;
@@ -1592,9 +1689,10 @@ static int in_range(int val, int lo, int hi)
 
 static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)
 {
-        int ret;
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
         u32 cmd;
-        struct adapter *adapter = dev->priv;
+        int ret;
 
         if (copy_from_user(&cmd, useraddr, sizeof(cmd)))
                 return -EFAULT;
@@ -1923,10 +2021,10 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)
 
 static int cxgb_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
 {
-        int ret, mmd;
-        struct adapter *adapter = dev->priv;
-        struct port_info *pi = netdev_priv(dev);
         struct mii_ioctl_data *data = if_mii(req);
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
+        int ret, mmd;
 
         switch (cmd) {
         case SIOCGMIIPHY:
@@ -1994,9 +2092,9 @@ static int cxgb_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
 
 static int cxgb_change_mtu(struct net_device *dev, int new_mtu)
 {
-        int ret;
-        struct adapter *adapter = dev->priv;
         struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
+        int ret;
 
         if (new_mtu < 81)       /* accommodate SACK */
                 return -EINVAL;
@@ -2013,8 +2111,8 @@ static int cxgb_change_mtu(struct net_device *dev, int new_mtu)
 
 static int cxgb_set_mac_addr(struct net_device *dev, void *p)
 {
-        struct adapter *adapter = dev->priv;
         struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
         struct sockaddr *addr = p;
 
         if (!is_valid_ether_addr(addr->sa_data))
@@ -2050,8 +2148,8 @@ static void t3_synchronize_rx(struct adapter *adap, const struct port_info *p)
 
 static void vlan_rx_register(struct net_device *dev, struct vlan_group *grp)
 {
-        struct adapter *adapter = dev->priv;
         struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
 
         pi->vlan_grp = grp;
         if (adapter->params.rev > 0)
@@ -2070,8 +2168,8 @@ static void vlan_rx_register(struct net_device *dev, struct vlan_group *grp)
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void cxgb_netpoll(struct net_device *dev)
 {
-        struct adapter *adapter = dev->priv;
         struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
         int qidx;
 
         for (qidx = pi->first_qset; qidx < pi->first_qset + pi->nqsets; qidx++) {
@@ -2088,42 +2186,6 @@ static void cxgb_netpoll(struct net_device *dev)
 }
 #endif
 
-#define TPSRAM_NAME "t3%c_protocol_sram-%d.%d.%d.bin"
-int update_tpsram(struct adapter *adap)
-{
-        const struct firmware *tpsram;
-        char buf[64];
-        struct device *dev = &adap->pdev->dev;
-        int ret;
-        char rev;
-        
-        rev = adap->params.rev == T3_REV_B2 ? 'b' : 'a';
-
-        snprintf(buf, sizeof(buf), TPSRAM_NAME, rev,
-                 TP_VERSION_MAJOR, TP_VERSION_MINOR, TP_VERSION_MICRO);
-
-        ret = request_firmware(&tpsram, buf, dev);
-        if (ret < 0) {
-                dev_err(dev, "could not load TP SRAM: unable to load %s\n",
-                        buf);
-                return ret;
-        }
-        
-        ret = t3_check_tpsram(adap, tpsram->data, tpsram->size);
-        if (ret)
-                goto release_tpsram;    
-
-        ret = t3_set_proto_sram(adap, tpsram->data);
-        if (ret)
-                dev_err(dev, "loading protocol SRAM failed\n");
-
-release_tpsram:
-        release_firmware(tpsram);
-        
-        return ret;
-}
-
-
 /*
  * Periodic accumulation of MAC statistics.
  */
@@ -2433,6 +2495,7 @@ static int __devinit init_one(struct pci_dev *pdev,
 
                 adapter->port[i] = netdev;
                 pi = netdev_priv(netdev);
+                pi->adapter = adapter;
                 pi->rx_csum_offload = 1;
                 pi->nqsets = 1;
                 pi->first_qset = i;
@@ -2442,7 +2505,6 @@ static int __devinit init_one(struct pci_dev *pdev,
                 netdev->irq = pdev->irq;
                 netdev->mem_start = mmio_start;
                 netdev->mem_end = mmio_start + mmio_len - 1;
-                netdev->priv = adapter;
                 netdev->features |= NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO;
                 netdev->features |= NETIF_F_LLTX;
                 if (pci_using_dac)
@@ -2467,18 +2529,11 @@ static int __devinit init_one(struct pci_dev *pdev,
                 SET_ETHTOOL_OPS(netdev, &cxgb_ethtool_ops);
         }
 
-        pci_set_drvdata(pdev, adapter->port[0]);
+        pci_set_drvdata(pdev, adapter);
         if (t3_prep_adapter(adapter, ai, 1) < 0) {
                 err = -ENODEV;
                 goto out_free_dev;
         }
-
-        err = t3_check_tpsram_version(adapter);
-        if (err == -EINVAL)
-                err = update_tpsram(adapter);
-
-        if (err)
-                goto out_free_dev;
                 
         /*
          * The card is now ready to go.  If any errors occur during device
@@ -2547,11 +2602,10 @@ out_release_regions:
 
 static void __devexit remove_one(struct pci_dev *pdev)
 {
-        struct net_device *dev = pci_get_drvdata(pdev);
+        struct adapter *adapter = pci_get_drvdata(pdev);
 
-        if (dev) {
+        if (adapter) {
                 int i;
-                struct adapter *adapter = dev->priv;
 
                 t3_sge_stop(adapter);
                 sysfs_remove_group(&adapter->port[0]->dev.kobj,
diff --git a/drivers/net/cxgb3/cxgb3_offload.c b/drivers/net/cxgb3/cxgb3_offload.c
index e620ed4c3ff..bdff7baeb59 100644
--- a/drivers/net/cxgb3/cxgb3_offload.c
+++ b/drivers/net/cxgb3/cxgb3_offload.c
@@ -593,6 +593,16 @@ int cxgb3_alloc_stid(struct t3cdev *tdev, struct cxgb3_client *client,
 
 EXPORT_SYMBOL(cxgb3_alloc_stid);
 
+/* Get the t3cdev associated with a net_device */
+struct t3cdev *dev2t3cdev(struct net_device *dev)
+{
+        const struct port_info *pi = netdev_priv(dev);
+
+        return (struct t3cdev *)pi->adapter;
+}
+
+EXPORT_SYMBOL(dev2t3cdev);
+
 static int do_smt_write_rpl(struct t3cdev *dev, struct sk_buff *skb)
 {
         struct cpl_smt_write_rpl *rpl = cplhdr(skb);
@@ -925,7 +935,7 @@ void cxgb_neigh_update(struct neighbour *neigh)
         struct net_device *dev = neigh->dev;
 
         if (dev && (is_offloading(dev))) {
-                struct t3cdev *tdev = T3CDEV(dev);
+                struct t3cdev *tdev = dev2t3cdev(dev);
 
                 BUG_ON(!tdev);
                 t3_l2t_update(tdev, neigh);
@@ -973,9 +983,9 @@ void cxgb_redirect(struct dst_entry *old, struct dst_entry *new)
                        "device ignored.\n", __FUNCTION__);
                 return;
         }
-        tdev = T3CDEV(olddev);
+        tdev = dev2t3cdev(olddev);
         BUG_ON(!tdev);
-        if (tdev != T3CDEV(newdev)) {
+        if (tdev != dev2t3cdev(newdev)) {
                 printk(KERN_WARNING "%s: Redirect to different "
                        "offload device ignored.\n", __FUNCTION__);
                 return;
diff --git a/drivers/net/cxgb3/cxgb3_offload.h b/drivers/net/cxgb3/cxgb3_offload.h
index f15446a32ef..7a379138b5a 100644
--- a/drivers/net/cxgb3/cxgb3_offload.h
+++ b/drivers/net/cxgb3/cxgb3_offload.h
@@ -51,6 +51,8 @@ void cxgb3_offload_deactivate(struct adapter *adapter);
 
 void cxgb3_set_dummy_ops(struct t3cdev *dev);
 
+struct t3cdev *dev2t3cdev(struct net_device *dev);
+
 /*
  * Client registration.  Users of T3 driver must register themselves.
  * The T3 driver will call the add function of every client for each T3
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c
index a2cfd68ac75..58a5f60521e 100644
--- a/drivers/net/cxgb3/sge.c
+++ b/drivers/net/cxgb3/sge.c
@@ -1073,7 +1073,7 @@ int t3_eth_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         unsigned int ndesc, pidx, credits, gen, compl;
         const struct port_info *pi = netdev_priv(dev);
-        struct adapter *adap = dev->priv;
+        struct adapter *adap = pi->adapter;
         struct sge_qset *qs = dev2qset(dev);
         struct sge_txq *q = &qs->txq[TXQ_ETH];
 
@@ -1326,7 +1326,8 @@ static void restart_ctrlq(unsigned long data)
         struct sk_buff *skb;
         struct sge_qset *qs = (struct sge_qset *)data;
         struct sge_txq *q = &qs->txq[TXQ_CTRL];
-        struct adapter *adap = qs->netdev->priv;
+        const struct port_info *pi = netdev_priv(qs->netdev);
+        struct adapter *adap = pi->adapter;
 
         spin_lock(&q->lock);
       again:reclaim_completed_tx_imm(q);
@@ -1531,7 +1532,8 @@ static void restart_offloadq(unsigned long data)
         struct sk_buff *skb;
         struct sge_qset *qs = (struct sge_qset *)data;
         struct sge_txq *q = &qs->txq[TXQ_OFLD];
-        struct adapter *adap = qs->netdev->priv;
+        const struct port_info *pi = netdev_priv(qs->netdev);
+        struct adapter *adap = pi->adapter;
 
         spin_lock(&q->lock);
       again:reclaim_completed_tx(adap, q);
@@ -1675,7 +1677,8 @@ static inline void deliver_partial_bundle(struct t3cdev *tdev,
  */
 static int ofld_poll(struct net_device *dev, int *budget)
 {
-        struct adapter *adapter = dev->priv;
+        const struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
         struct sge_qset *qs = dev2qset(dev);
         struct sge_rspq *q = &qs->rspq;
         int work_done, limit = min(*budget, dev->quota), avail = limit;
@@ -2075,7 +2078,8 @@ static inline int is_pure_response(const struct rsp_desc *r)
  */
 static int napi_rx_handler(struct net_device *dev, int *budget)
 {
-        struct adapter *adap = dev->priv;
+        const struct port_info *pi = netdev_priv(dev);
+        struct adapter *adap = pi->adapter;
         struct sge_qset *qs = dev2qset(dev);
         int effective_budget = min(*budget, dev->quota);
 
@@ -2205,7 +2209,8 @@ static inline int handle_responses(struct adapter *adap, struct sge_rspq *q)
 irqreturn_t t3_sge_intr_msix(int irq, void *cookie)
 {
         struct sge_qset *qs = cookie;
-        struct adapter *adap = qs->netdev->priv;
+        const struct port_info *pi = netdev_priv(qs->netdev);
+        struct adapter *adap = pi->adapter;
         struct sge_rspq *q = &qs->rspq;
 
         spin_lock(&q->lock);
@@ -2224,7 +2229,8 @@ irqreturn_t t3_sge_intr_msix(int irq, void *cookie)
 irqreturn_t t3_sge_intr_msix_napi(int irq, void *cookie)
 {
         struct sge_qset *qs = cookie;
-        struct adapter *adap = qs->netdev->priv;
+        const struct port_info *pi = netdev_priv(qs->netdev);
+        struct adapter *adap = pi->adapter;
         struct sge_rspq *q = &qs->rspq;
 
         spin_lock(&q->lock);
@@ -2508,7 +2514,8 @@ static void sge_timer_cb(unsigned long data)
 {
         spinlock_t *lock;
         struct sge_qset *qs = (struct sge_qset *)data;
-        struct adapter *adap = qs->netdev->priv;
+        const struct port_info *pi = netdev_priv(qs->netdev);
+        struct adapter *adap = pi->adapter;
 
         if (spin_trylock(&qs->txq[TXQ_ETH].lock)) {
                 reclaim_completed_tx(adap, &qs->txq[TXQ_ETH]);
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
index dd3149d94ba..b02d15daf5d 100644
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
@@ -848,16 +848,15 @@ static int t3_write_flash(struct adapter *adapter, unsigned int addr,
 }
 
 /**
- *      t3_check_tpsram_version - read the tp sram version
+ *      t3_get_tp_version - read the tp sram version
  *      @adapter: the adapter
+ *      @vers: where to place the version
  *
- *      Reads the protocol sram version from serial eeprom.
+ *      Reads the protocol sram version from sram.
  */
-int t3_check_tpsram_version(struct adapter *adapter)
+int t3_get_tp_version(struct adapter *adapter, u32 *vers)
 {
         int ret;
-        u32 vers;
-        unsigned int major, minor;
 
         /* Get version loaded in SRAM */
         t3_write_reg(adapter, A_TP_EMBED_OP_FIELD0, 0);
@@ -866,7 +865,32 @@ int t3_check_tpsram_version(struct adapter *adapter)
         if (ret)
                 return ret;
         
-        vers = t3_read_reg(adapter, A_TP_EMBED_OP_FIELD1);
+        *vers = t3_read_reg(adapter, A_TP_EMBED_OP_FIELD1);
+
+        return 0;
+}
+
+/**
+ *      t3_check_tpsram_version - read the tp sram version
+ *      @adapter: the adapter
+ *      @must_load: set to 1 if loading a new microcode image is required
+ *
+ *      Reads the protocol sram version from flash.
+ */
+int t3_check_tpsram_version(struct adapter *adapter, int *must_load)
+{
+        int ret;
+        u32 vers;
+        unsigned int major, minor;
+
+        if (adapter->params.rev == T3_REV_A)
+                return 0;
+
+        *must_load = 1;
+
+        ret = t3_get_tp_version(adapter, &vers);
+        if (ret)
+                return ret;
 
         major = G_TP_VERSION_MAJOR(vers);
         minor = G_TP_VERSION_MINOR(vers);
@@ -874,6 +898,16 @@ int t3_check_tpsram_version(struct adapter *adapter)
         if (major == TP_VERSION_MAJOR && minor == TP_VERSION_MINOR) 
                 return 0;
 
+        if (major != TP_VERSION_MAJOR)
+                CH_ERR(adapter, "found wrong TP version (%u.%u), "
+                       "driver needs version %d.%d\n", major, minor,
+                       TP_VERSION_MAJOR, TP_VERSION_MINOR);
+        else {
+                *must_load = 0;
+                CH_ERR(adapter, "found wrong TP version (%u.%u), "
+                       "driver compiled for version %d.%d\n", major, minor,
+                       TP_VERSION_MAJOR, TP_VERSION_MINOR);
+        }
         return -EINVAL;
 }
 
diff --git a/drivers/net/cxgb3/t3cdev.h b/drivers/net/cxgb3/t3cdev.h
index fa4099bc041..77fcc1a4984 100644
--- a/drivers/net/cxgb3/t3cdev.h
+++ b/drivers/net/cxgb3/t3cdev.h
@@ -42,9 +42,6 @@
 
 #define T3CNAMSIZ 16
 
-/* Get the t3cdev associated with a net_device */
-#define T3CDEV(netdev) (struct t3cdev *)(netdev->priv)
-
 struct cxgb3_client;
 
 enum t3ctype {
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c
index 3ca1e8ece54..0834ef0eddb 100644
--- a/drivers/net/ioc3-eth.c
+++ b/drivers/net/ioc3-eth.c
@@ -48,6 +48,7 @@
 #ifdef CONFIG_SERIAL_8250
 #include <linux/serial_core.h>
 #include <linux/serial_8250.h>
+#include <linux/serial_reg.h>
 #endif
 
 #include <linux/netdevice.h>
@@ -1151,13 +1152,41 @@ static int ioc3_is_menet(struct pci_dev *pdev)
  * Also look in ip27-pci.c:pci_fixup_ioc3() for some comments on working
  * around ioc3 oddities in this respect.
  *
- * The IOC3 serials use a 22MHz clock rate with an additional divider by 3.
+ * The IOC3 serials use a 22MHz clock rate with an additional divider which
+ * can be programmed in the SCR register if the DLAB bit is set.
+ *
+ * Register to interrupt zero because we share the interrupt with
+ * the serial driver which we don't properly support yet.
+ *
+ * Can't use UPF_IOREMAP as the whole of IOC3 resources have already been
+ * registered.
  */
+static void __devinit ioc3_8250_register(struct ioc3_uartregs __iomem *uart)
+{
+#define COSMISC_CONSTANT 6
+
+        struct uart_port port = {
+                .irq            = 0,
+                .flags          = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,
+                .iotype         = UPIO_MEM,
+                .regshift       = 0,
+                .uartclk        = (22000000 << 1) / COSMISC_CONSTANT,
+
+                .membase        = (unsigned char __iomem *) uart,
+                .mapbase        = (unsigned long) uart,
+        };
+        unsigned char lcr;
+
+        lcr = uart->iu_lcr;
+        uart->iu_lcr = lcr | UART_LCR_DLAB;
+        uart->iu_scr = COSMISC_CONSTANT,
+        uart->iu_lcr = lcr;
+        uart->iu_lcr;
+        serial8250_register_port(&port);
+}
 
 static void __devinit ioc3_serial_probe(struct pci_dev *pdev, struct ioc3 *ioc3)
 {
-        struct uart_port port;
-
         /*
          * We need to recognice and treat the fourth MENET serial as it
          * does not have an SuperIO chip attached to it, therefore attempting
@@ -1171,24 +1200,35 @@ static void __devinit ioc3_serial_probe(struct pci_dev *pdev, struct ioc3 *ioc3)
                 return;
 
         /*
-         * Register to interrupt zero because we share the interrupt with
-         * the serial driver which we don't properly support yet.
-         *
-         * Can't use UPF_IOREMAP as the whole of IOC3 resources have already
-         * been registered.
+         * Switch IOC3 to PIO mode.  It probably already was but let's be
+         * paranoid
          */
-        memset(&port, 0, sizeof(port));
-        port.irq      = 0;
-        port.flags    = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF;
-        port.iotype   = UPIO_MEM;
-        port.regshift = 0;
-        port.uartclk  = 22000000 / 3;
-
-        port.membase  = (unsigned char *) &ioc3->sregs.uarta;
-        serial8250_register_port(&port);
-
-        port.membase  = (unsigned char *) &ioc3->sregs.uartb;
-        serial8250_register_port(&port);
+        ioc3->gpcr_s = GPCR_UARTA_MODESEL | GPCR_UARTB_MODESEL;
+        ioc3->gpcr_s;
+        ioc3->gppr_6 = 0;
+        ioc3->gppr_6;
+        ioc3->gppr_7 = 0;
+        ioc3->gppr_7;
+        ioc3->sscr_a = ioc3->sscr_a & ~SSCR_DMA_EN;
+        ioc3->sscr_a;
+        ioc3->sscr_b = ioc3->sscr_b & ~SSCR_DMA_EN;
+        ioc3->sscr_b;
+        /* Disable all SA/B interrupts except for SA/B_INT in SIO_IEC. */
+        ioc3->sio_iec &= ~ (SIO_IR_SA_TX_MT | SIO_IR_SA_RX_FULL |
+                            SIO_IR_SA_RX_HIGH | SIO_IR_SA_RX_TIMER |
+                            SIO_IR_SA_DELTA_DCD | SIO_IR_SA_DELTA_CTS |
+                            SIO_IR_SA_TX_EXPLICIT | SIO_IR_SA_MEMERR);
+        ioc3->sio_iec |= SIO_IR_SA_INT;
+        ioc3->sscr_a = 0;
+        ioc3->sio_iec &= ~ (SIO_IR_SB_TX_MT | SIO_IR_SB_RX_FULL |
+                            SIO_IR_SB_RX_HIGH | SIO_IR_SB_RX_TIMER |
+                            SIO_IR_SB_DELTA_DCD | SIO_IR_SB_DELTA_CTS |
+                            SIO_IR_SB_TX_EXPLICIT | SIO_IR_SB_MEMERR);
+        ioc3->sio_iec |= SIO_IR_SB_INT;
+        ioc3->sscr_b = 0;
+
+        ioc3_8250_register(&ioc3->sregs.uarta);
+        ioc3_8250_register(&ioc3->sregs.uartb);
 }
 #endif
 
diff --git a/drivers/net/netxen/netxen_nic_hdr.h b/drivers/net/netxen/netxen_nic_hdr.h
index 3276866b17e..d72f8f8fcb5 100644
--- a/drivers/net/netxen/netxen_nic_hdr.h
+++ b/drivers/net/netxen/netxen_nic_hdr.h
@@ -649,9 +649,11 @@ enum {
 #define PCIX_INT_VECTOR         (0x10100)
 #define PCIX_INT_MASK           (0x10104)
 
-#define PCIX_MN_WINDOW          (0x10200)
+#define PCIX_MN_WINDOW_F0       (0x10200)
+#define PCIX_MN_WINDOW(_f)      (PCIX_MN_WINDOW_F0 + (0x20 * (_f)))
 #define PCIX_MS_WINDOW          (0x10204)
-#define PCIX_SN_WINDOW          (0x10208)
+#define PCIX_SN_WINDOW_F0       (0x10208)
+#define PCIX_SN_WINDOW(_f)      (PCIX_SN_WINDOW_F0 + (0x20 * (_f)))
 #define PCIX_CRB_WINDOW         (0x10210)
 #define PCIX_CRB_WINDOW_F0      (0x10210)
 #define PCIX_CRB_WINDOW_F1      (0x10230)
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index aac15421bd1..a7b8d7f2325 100644
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -904,11 +904,11 @@ netxen_nic_pci_set_window(struct netxen_adapter *adapter,
                         ddr_mn_window = window;
                         writel(window, PCI_OFFSET_SECOND_RANGE(adapter,
                                                                NETXEN_PCIX_PH_REG
-                                                               (PCIX_MN_WINDOW)));
+                                                               (PCIX_MN_WINDOW(adapter->ahw.pci_func))));
                         /* MUST make sure window is set before we forge on... */
                         readl(PCI_OFFSET_SECOND_RANGE(adapter,
                                                       NETXEN_PCIX_PH_REG
-                                                      (PCIX_MN_WINDOW)));
+                                                      (PCIX_MN_WINDOW(adapter->ahw.pci_func))));
                 }
                 addr -= (window * NETXEN_WINDOW_ONE);
                 addr += NETXEN_PCI_DDR_NET;
@@ -929,11 +929,11 @@ netxen_nic_pci_set_window(struct netxen_adapter *adapter,
                         writel((window << 22),
                                PCI_OFFSET_SECOND_RANGE(adapter,
                                                        NETXEN_PCIX_PH_REG
-                                                       (PCIX_SN_WINDOW)));
+                                                       (PCIX_SN_WINDOW(adapter->ahw.pci_func))));
                         /* MUST make sure window is set before we forge on... */
                         readl(PCI_OFFSET_SECOND_RANGE(adapter,
                                                       NETXEN_PCIX_PH_REG
-                                                      (PCIX_SN_WINDOW)));
+                                                      (PCIX_SN_WINDOW(adapter->ahw.pci_func))));
                 }
                 addr -= (window * 0x400000);
                 addr += NETXEN_PCI_QDR_NET;
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 08a62acde8b..3122d010163 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -639,10 +639,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                         NETXEN_CRB_NORMALIZE(adapter,
                                 NETXEN_ROMUSB_GLB_PEGTUNE_DONE));
                 /* Handshake with the card before we register the devices. */
-                writel(0, NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE));
-                netxen_pinit_from_rom(adapter, 0);
-                msleep(1);
-                netxen_load_firmware(adapter);
                 netxen_phantom_init(adapter, NETXEN_NIC_PEG_TUNE);
         }
 
@@ -750,9 +746,6 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
 
         netxen_nic_disable_int(adapter);
 
-        if (adapter->irq)
-                free_irq(adapter->irq, adapter);
-
         if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC) {
                 init_firmware_done++;
                 netxen_free_hw_resources(adapter);
@@ -776,13 +769,8 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
                 }
         }
 
-        if (adapter->flags & NETXEN_NIC_MSI_ENABLED)
-                pci_disable_msi(pdev);
-
         vfree(adapter->cmd_buf_arr);
 
-        pci_disable_device(pdev);
-
         if (adapter->portnum == 0) {
                 if (init_firmware_done) {
                         i = 100;
@@ -833,12 +821,19 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
                 }
         }
 
+        if (adapter->irq)
+                free_irq(adapter->irq, adapter);
+
+        if (adapter->flags & NETXEN_NIC_MSI_ENABLED)
+                pci_disable_msi(pdev);
+
         iounmap(adapter->ahw.db_base);
         iounmap(adapter->ahw.pci_base0);
         iounmap(adapter->ahw.pci_base1);
         iounmap(adapter->ahw.pci_base2);
 
         pci_release_regions(pdev);
+        pci_disable_device(pdev);
         pci_set_drvdata(pdev, NULL);
 
         free_netdev(netdev);
diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c
index 13d1c0a2a25..e5650391843 100644
--- a/drivers/net/ps3_gelic_net.c
+++ b/drivers/net/ps3_gelic_net.c
@@ -556,7 +556,6 @@ static int gelic_net_stop(struct net_device *netdev)
 {
         struct gelic_net_card *card = netdev_priv(netdev);
 
-        netif_poll_disable(netdev);
         netif_stop_queue(netdev);
 
         /* turn off DMA, force end */
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 58740428dd0..9034a05734e 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -64,8 +64,8 @@
 
 #define DRV_MODULE_NAME         "tg3"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "3.80"
-#define DRV_MODULE_RELDATE      "August 2, 2007"
+#define DRV_MODULE_VERSION      "3.81"
+#define DRV_MODULE_RELDATE      "September 5, 2007"
 
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -7127,6 +7127,10 @@ static int tg3_open(struct net_device *dev)
                 } else if (pci_enable_msi(tp->pdev) == 0) {
                         u32 msi_mode;
 
+                        /* Hardware bug - MSI won't work if INTX disabled. */
+                        if (tp->tg3_flags2 & TG3_FLG2_5780_CLASS)
+                                pci_intx(tp->pdev, 1);
+
                         msi_mode = tr32(MSGINT_MODE);
                         tw32(MSGINT_MODE, msi_mode | MSGINT_MODE_ENABLE);
                         tp->tg3_flags2 |= TG3_FLG2_USING_MSI;
@@ -12172,6 +12176,11 @@ static int tg3_resume(struct pci_dev *pdev)
         if (err)
                 return err;
 
+        /* Hardware bug - MSI won't work if INTX disabled. */
+        if ((tp->tg3_flags2 & TG3_FLG2_5780_CLASS) &&
+            (tp->tg3_flags2 & TG3_FLG2_USING_MSI))
+                pci_intx(tp->pdev, 1);
+
         netif_device_attach(dev);
 
         tg3_full_lock(tp, 0);
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 27e00b2d7b5..171ca712e52 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -285,7 +285,7 @@ static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom)
         }
 }
 
-void __devinit pci_read_bridge_bases(struct pci_bus *child)
+void pci_read_bridge_bases(struct pci_bus *child)
 {
         struct pci_dev *dev = child->self;
         u8 io_base_lo, io_limit_lo;
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 2d40f437b9f..7dcaa09b3c2 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -972,8 +972,8 @@ DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237, k8t_sound_ho
  *
  * The SMBus PCI Device can be activated by setting a bit in the ICH LPC 
  * bridge. Unfortunately, this device has no subvendor/subdevice ID. So it 
- * becomes necessary to do this tweak in two steps -- I've chosen the Host
- * bridge as trigger.
+ * becomes necessary to do this tweak in two steps -- the chosen trigger
+ * is either the Host bridge (preferred) or on-board VGA controller.
  *
  * Note that we used to unhide the SMBus that way on Toshiba laptops
  * (Satellite A40 and Tecra M2) but then found that the thermal management
@@ -1070,6 +1070,14 @@ static void __init asus_hides_smbus_hostbridge(struct pci_dev *dev)
                         case 0x0058: /* Compaq Evo N620c */
                                 asus_hides_smbus = 1;
                         }
+                else if (dev->device == PCI_DEVICE_ID_INTEL_82810_IG3)
+                        switch(dev->subsystem_device) {
+                        case 0xB16C: /* Compaq Deskpro EP 401963-001 (PCA# 010174) */
+                                /* Motherboard doesn't have Host bridge
+                                 * subvendor/subdevice IDs, therefore checking
+                                 * its on-board VGA controller */
+                                asus_hides_smbus = 1;
+                        }
         }
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82845_HB,   asus_hides_smbus_hostbridge );
@@ -1082,6 +1090,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82855PM_HB,	as
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82855GM_HB, asus_hides_smbus_hostbridge );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82915GM_HB, asus_hides_smbus_hostbridge );
 
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82810_IG3,  asus_hides_smbus_hostbridge );
+
 static void asus_hides_smbus_lpc(struct pci_dev *dev)
 {
         u16 val;
@@ -1099,12 +1109,14 @@ static void asus_hides_smbus_lpc(struct pci_dev *dev)
                         printk(KERN_INFO "PCI: Enabled i801 SMBus device\n");
         }
 }
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801AA_0,  asus_hides_smbus_lpc );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801DB_0,  asus_hides_smbus_lpc );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801BA_0,  asus_hides_smbus_lpc );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801CA_0,  asus_hides_smbus_lpc );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801CA_12, asus_hides_smbus_lpc );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801DB_12, asus_hides_smbus_lpc );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801EB_0,  asus_hides_smbus_lpc );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801AA_0,  asus_hides_smbus_lpc );
 DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801DB_0,  asus_hides_smbus_lpc );
 DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801BA_0,  asus_hides_smbus_lpc );
 DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801CA_0,  asus_hides_smbus_lpc );
diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index 90755d4cdb9..6b0cf0c2a08 100644
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -107,108 +107,6 @@ static void quirk_sb16audio_resources(struct pnp_dev *dev)
                        "pnp: SB audio device quirk - increasing port range\n");
 }
 
-static int quirk_smc_fir_enabled(struct pnp_dev *dev)
-{
-        unsigned long firbase;
-        u8 bank, high, low, chip;
-
-        if (!pnp_port_valid(dev, 1))
-                return 0;
-
-        firbase = pnp_port_start(dev, 1);
-
-        /* Select register bank 3 */
-        bank = inb(firbase + 7);
-        bank &= 0xf0;
-        bank |= 3;
-        outb(bank, firbase + 7);
-
-        high = inb(firbase + 0);
-        low = inb(firbase + 1);
-        chip = inb(firbase + 2);
-
-        /* This corresponds to the check in smsc_ircc_present() */
-        if (high == 0x10 && low == 0xb8 && (chip == 0xf1 || chip == 0xf2))
-                return 1;
-
-        return 0;
-}
-
-static void quirk_smc_enable(struct pnp_dev *dev)
-{
-        struct resource fir, sir, irq;
-
-        pnp_activate_dev(dev);
-        if (quirk_smc_fir_enabled(dev))
-                return;
-
-        /*
-         * Sometimes the BIOS claims the device is enabled, but it reports
-         * the wrong FIR resources or doesn't properly configure ISA or LPC
-         * bridges on the way to the device.
-         *
-         * HP nc6000 and nc8000/nw8000 laptops have known problems like
-         * this.  Fortunately, they do fix things up if we auto-configure
-         * the device using its _PRS and _SRS methods.
-         */
-        dev_err(&dev->dev, "%s not responding at SIR 0x%lx, FIR 0x%lx; "
-                "auto-configuring\n", dev->id->id,
-                (unsigned long)pnp_port_start(dev, 0),
-                (unsigned long)pnp_port_start(dev, 1));
-
-        pnp_disable_dev(dev);
-        pnp_init_resource_table(&dev->res);
-        pnp_auto_config_dev(dev);
-        pnp_activate_dev(dev);
-        if (quirk_smc_fir_enabled(dev)) {
-                dev_err(&dev->dev, "responds at SIR 0x%lx, FIR 0x%lx\n",
-                        (unsigned long)pnp_port_start(dev, 0),
-                        (unsigned long)pnp_port_start(dev, 1));
-                return;
-        }
-
-        /*
-         * The Toshiba Portege 4000 _CRS reports the FIR region first,
-         * followed by the SIR region.  The BIOS will configure the bridge,
-         * but only if we call _SRS with SIR first, then FIR.  It also
-         * reports the IRQ as active high, when it is really active low.
-         */
-        dev_err(&dev->dev, "not responding at SIR 0x%lx, FIR 0x%lx; "
-                "swapping SIR/FIR and reconfiguring\n",
-                (unsigned long)pnp_port_start(dev, 0),
-                (unsigned long)pnp_port_start(dev, 1));
-
-        /*
-         * Clear IORESOURCE_AUTO so pnp_activate_dev() doesn't reassign
-         * these resources any more.
-         */
-        fir = dev->res.port_resource[0];
-        sir = dev->res.port_resource[1];
-        fir.flags &= ~IORESOURCE_AUTO;
-        sir.flags &= ~IORESOURCE_AUTO;
-
-        irq = dev->res.irq_resource[0];
-        irq.flags &= ~IORESOURCE_AUTO;
-        irq.flags &= ~IORESOURCE_BITS;
-        irq.flags |= IORESOURCE_IRQ_LOWEDGE;
-
-        pnp_disable_dev(dev);
-        dev->res.port_resource[0] = sir;
-        dev->res.port_resource[1] = fir;
-        dev->res.irq_resource[0] = irq;
-        pnp_activate_dev(dev);
-
-        if (quirk_smc_fir_enabled(dev)) {
-                dev_err(&dev->dev, "responds at SIR 0x%lx, FIR 0x%lx\n",
-                        (unsigned long)pnp_port_start(dev, 0),
-                        (unsigned long)pnp_port_start(dev, 1));
-                return;
-        }
-
-        dev_err(&dev->dev, "giving up; try \"smsc-ircc2.nopnp\" and "
-                "email bjorn.helgaas@hp.com\n");
-}
-
 /*
  *  PnP Quirks
  *  Cards or devices that need some tweaking due to incomplete resource info
@@ -229,7 +127,6 @@ static struct pnp_fixup pnp_fixups[] = {
         {"CTL0043", quirk_sb16audio_resources},
         {"CTL0044", quirk_sb16audio_resources},
         {"CTL0045", quirk_sb16audio_resources},
-        {"SMCf010", quirk_smc_enable},
         {""}
 };
 
diff --git a/drivers/rtc/rtc-v3020.c b/drivers/rtc/rtc-v3020.c
index 3b58d3d5d38..a6b572978dc 100644
--- a/drivers/rtc/rtc-v3020.c
+++ b/drivers/rtc/rtc-v3020.c
@@ -26,6 +26,7 @@
 #include <linux/types.h>
 #include <linux/bcd.h>
 #include <linux/rtc-v3020.h>
+#include <linux/delay.h>
 
 #include <asm/io.h>
 
@@ -47,6 +48,7 @@ static void v3020_set_reg(struct v3020 *chip, unsigned char address,
         for (i = 0; i < 4; i++) {
                 writel((tmp & 1) << chip->leftshift, chip->ioaddress);
                 tmp >>= 1;
+                udelay(1);
         }
 
         /* Commands dont have data */
@@ -54,6 +56,7 @@ static void v3020_set_reg(struct v3020 *chip, unsigned char address,
                 for (i = 0; i < 8; i++) {
                         writel((data & 1) << chip->leftshift, chip->ioaddress);
                         data >>= 1;
+                        udelay(1);
                 }
         }
 }
@@ -66,12 +69,14 @@ static unsigned char v3020_get_reg(struct v3020 *chip, unsigned char address)
         for (i = 0; i < 4; i++) {
                 writel((address & 1) << chip->leftshift, chip->ioaddress);
                 address >>= 1;
+                udelay(1);
         }
 
         for (i = 0; i < 8; i++) {
                 data >>= 1;
                 if (readl(chip->ioaddress) & (1 << chip->leftshift))
                         data |= 0x80;
+                udelay(1);
         }
 
         return data;
@@ -95,7 +100,7 @@ static int v3020_read_time(struct device *dev, struct rtc_time *dt)
         tmp = v3020_get_reg(chip, V3020_MONTH_DAY);
         dt->tm_mday     = BCD2BIN(tmp);
         tmp = v3020_get_reg(chip, V3020_MONTH);
-        dt->tm_mon      = BCD2BIN(tmp);
+        dt->tm_mon    = BCD2BIN(tmp) - 1;
         tmp = v3020_get_reg(chip, V3020_WEEK_DAY);
         dt->tm_wday     = BCD2BIN(tmp);
         tmp = v3020_get_reg(chip, V3020_YEAR);
@@ -135,7 +140,7 @@ static int v3020_set_time(struct device *dev, struct rtc_time *dt)
         v3020_set_reg(chip, V3020_MINUTES,      BIN2BCD(dt->tm_min));
         v3020_set_reg(chip, V3020_HOURS,        BIN2BCD(dt->tm_hour));
         v3020_set_reg(chip, V3020_MONTH_DAY,    BIN2BCD(dt->tm_mday));
-        v3020_set_reg(chip, V3020_MONTH,        BIN2BCD(dt->tm_mon));
+        v3020_set_reg(chip, V3020_MONTH,     BIN2BCD(dt->tm_mon + 1));
         v3020_set_reg(chip, V3020_WEEK_DAY,     BIN2BCD(dt->tm_wday));
         v3020_set_reg(chip, V3020_YEAR,         BIN2BCD(dt->tm_year % 100));
 
diff --git a/drivers/s390/net/qeth.h b/drivers/s390/net/qeth.h
index ec18bae05df..6d4959807ab 100644
--- a/drivers/s390/net/qeth.h
+++ b/drivers/s390/net/qeth.h
@@ -1178,9 +1178,9 @@ qeth_ipaddr_to_string(enum qeth_prot_versions proto, const __u8 *addr,
                       char *buf)
 {
         if (proto == QETH_PROT_IPV4)
-                return qeth_ipaddr4_to_string(addr, buf);
+                qeth_ipaddr4_to_string(addr, buf);
         else if (proto == QETH_PROT_IPV6)
-                return qeth_ipaddr6_to_string(addr, buf);
+                qeth_ipaddr6_to_string(addr, buf);
 }
 
 static inline int
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index 57f69434fbf..f3e6fbeb212 100644
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
@@ -561,7 +561,7 @@ qeth_set_offline(struct ccwgroup_device *cgdev)
 }
 
 static int
-qeth_wait_for_threads(struct qeth_card *card, unsigned long threads);
+qeth_threads_running(struct qeth_card *card, unsigned long threads);
 
 
 static void
@@ -576,8 +576,7 @@ qeth_remove_device(struct ccwgroup_device *cgdev)
         if (!card)
                 return;
 
-        if (qeth_wait_for_threads(card, 0xffffffff))
-                return;
+        wait_event(card->wait_q, qeth_threads_running(card, 0xffffffff) == 0);
 
         if (cgdev->state == CCWGROUP_ONLINE){
                 card->use_hard_stop = 1;
@@ -1542,16 +1541,21 @@ qeth_idx_write_cb(struct qeth_channel *channel, struct qeth_cmd_buffer *iob)
         card = CARD_FROM_CDEV(channel->ccwdev);
 
         if (!(QETH_IS_IDX_ACT_POS_REPLY(iob->data))) {
-                PRINT_ERR("IDX_ACTIVATE on write channel device %s: negative "
-                          "reply\n", CARD_WDEV_ID(card));
+                if (QETH_IDX_ACT_CAUSE_CODE(iob->data) == 0x19)
+                        PRINT_ERR("IDX_ACTIVATE on write channel device %s: "
+                                "adapter exclusively used by another host\n",
+                                CARD_WDEV_ID(card));
+                else
+                        PRINT_ERR("IDX_ACTIVATE on write channel device %s: "
+                                "negative reply\n", CARD_WDEV_ID(card));
                 goto out;
         }
         memcpy(&temp, QETH_IDX_ACT_FUNC_LEVEL(iob->data), 2);
         if ((temp & ~0x0100) != qeth_peer_func_level(card->info.func_level)) {
                 PRINT_WARN("IDX_ACTIVATE on write channel device %s: "
-                           "function level mismatch "
-                           "(sent: 0x%x, received: 0x%x)\n",
-                           CARD_WDEV_ID(card), card->info.func_level, temp);
+                        "function level mismatch "
+                        "(sent: 0x%x, received: 0x%x)\n",
+                        CARD_WDEV_ID(card), card->info.func_level, temp);
                 goto out;
         }
         channel->state = CH_STATE_UP;
@@ -1597,8 +1601,13 @@ qeth_idx_read_cb(struct qeth_channel *channel, struct qeth_cmd_buffer *iob)
                         goto out;
         }
         if (!(QETH_IS_IDX_ACT_POS_REPLY(iob->data))) {
-                PRINT_ERR("IDX_ACTIVATE on read channel device %s: negative "
-                          "reply\n", CARD_RDEV_ID(card));
+                if (QETH_IDX_ACT_CAUSE_CODE(iob->data) == 0x19)
+                        PRINT_ERR("IDX_ACTIVATE on read channel device %s: "
+                                "adapter exclusively used by another host\n",
+                                CARD_RDEV_ID(card));
+                else
+                        PRINT_ERR("IDX_ACTIVATE on read channel device %s: "
+                                "negative reply\n", CARD_RDEV_ID(card));
                 goto out;
         }
 
@@ -1613,8 +1622,8 @@ qeth_idx_read_cb(struct qeth_channel *channel, struct qeth_cmd_buffer *iob)
         memcpy(&temp, QETH_IDX_ACT_FUNC_LEVEL(iob->data), 2);
         if (temp != qeth_peer_func_level(card->info.func_level)) {
                 PRINT_WARN("IDX_ACTIVATE on read channel device %s: function "
-                           "level mismatch (sent: 0x%x, received: 0x%x)\n",
-                           CARD_RDEV_ID(card), card->info.func_level, temp);
+                        "level mismatch (sent: 0x%x, received: 0x%x)\n",
+                        CARD_RDEV_ID(card), card->info.func_level, temp);
                 goto out;
         }
         memcpy(&card->token.issuer_rm_r,
@@ -2496,7 +2505,7 @@ qeth_rebuild_skb_fake_ll_tr(struct qeth_card *card, struct sk_buff *skb,
         struct iphdr *ip_hdr;
 
         QETH_DBF_TEXT(trace,5,"skbfktr");
-        skb_set_mac_header(skb, -QETH_FAKE_LL_LEN_TR);
+        skb_set_mac_header(skb, (int)-QETH_FAKE_LL_LEN_TR);
         /* this is a fake ethernet header */
         fake_hdr = tr_hdr(skb);
 
@@ -2804,13 +2813,16 @@ qeth_queue_input_buffer(struct qeth_card *card, int index)
                 if (newcount < count) {
                         /* we are in memory shortage so we switch back to
                            traditional skb allocation and drop packages */
-                        if (atomic_cmpxchg(&card->force_alloc_skb, 0, 1))
-                                printk(KERN_WARNING
-                                        "qeth: switch to alloc skb\n");
+                        if (!atomic_read(&card->force_alloc_skb) &&
+                            net_ratelimit())
+                                PRINT_WARN("Switch to alloc skb\n");
+                        atomic_set(&card->force_alloc_skb, 3);
                         count = newcount;
                 } else {
-                        if (atomic_cmpxchg(&card->force_alloc_skb, 1, 0))
-                                printk(KERN_WARNING "qeth: switch to sg\n");
+                        if ((atomic_read(&card->force_alloc_skb) == 1) &&
+                            net_ratelimit())
+                                PRINT_WARN("Switch to sg\n");
+                        atomic_add_unless(&card->force_alloc_skb, -1, 0);
                 }
 
                 /*
@@ -3354,10 +3366,12 @@ out_freeoutq:
         while (i > 0)
                 kfree(card->qdio.out_qs[--i]);
         kfree(card->qdio.out_qs);
+        card->qdio.out_qs = NULL;
 out_freepool:
         qeth_free_buffer_pool(card);
 out_freeinq:
         kfree(card->qdio.in_q);
+        card->qdio.in_q = NULL;
 out_nomem:
         atomic_set(&card->qdio.state, QETH_QDIO_UNINITIALIZED);
         return -ENOMEM;
@@ -3373,16 +3387,20 @@ qeth_free_qdio_buffers(struct qeth_card *card)
                 QETH_QDIO_UNINITIALIZED)
                 return;
         kfree(card->qdio.in_q);
+        card->qdio.in_q = NULL;
         /* inbound buffer pool */
         qeth_free_buffer_pool(card);
         /* free outbound qdio_qs */
-        for (i = 0; i < card->qdio.no_out_queues; ++i){
-                for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; ++j)
-                        qeth_clear_output_buffer(card->qdio.out_qs[i],
-                                        &card->qdio.out_qs[i]->bufs[j]);
-                kfree(card->qdio.out_qs[i]);
+        if (card->qdio.out_qs) {
+                for (i = 0; i < card->qdio.no_out_queues; ++i) {
+                        for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; ++j)
+                                qeth_clear_output_buffer(card->qdio.out_qs[i],
+                                                &card->qdio.out_qs[i]->bufs[j]);
+                        kfree(card->qdio.out_qs[i]);
+                }
+                kfree(card->qdio.out_qs);
+                card->qdio.out_qs = NULL;
         }
-        kfree(card->qdio.out_qs);
 }
 
 static void
@@ -3393,7 +3411,7 @@ qeth_clear_qdio_buffers(struct qeth_card *card)
         QETH_DBF_TEXT(trace, 2, "clearqdbf");
         /* clear outbound buffers to free skbs */
         for (i = 0; i < card->qdio.no_out_queues; ++i)
-                if (card->qdio.out_qs[i]){
+                if (card->qdio.out_qs && card->qdio.out_qs[i]) {
                         for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; ++j)
                                 qeth_clear_output_buffer(card->qdio.out_qs[i],
                                                 &card->qdio.out_qs[i]->bufs[j]);
@@ -4553,6 +4571,53 @@ qeth_get_elements_no(struct qeth_card *card, void *hdr,
         return elements_needed;
 }
 
+static void qeth_tx_csum(struct sk_buff *skb)
+{
+        int tlen;
+
+        if (skb->protocol == htons(ETH_P_IP)) {
+                tlen = ntohs(ip_hdr(skb)->tot_len) - (ip_hdr(skb)->ihl << 2);
+                switch (ip_hdr(skb)->protocol) {
+                case IPPROTO_TCP:
+                        tcp_hdr(skb)->check = 0;
+                        tcp_hdr(skb)->check = csum_tcpudp_magic(
+                                ip_hdr(skb)->saddr, ip_hdr(skb)->daddr,
+                                tlen, ip_hdr(skb)->protocol,
+                                skb_checksum(skb, skb_transport_offset(skb),
+                                        tlen, 0));
+                        break;
+                case IPPROTO_UDP:
+                        udp_hdr(skb)->check = 0;
+                        udp_hdr(skb)->check = csum_tcpudp_magic(
+                                ip_hdr(skb)->saddr, ip_hdr(skb)->daddr,
+                                tlen, ip_hdr(skb)->protocol,
+                                skb_checksum(skb, skb_transport_offset(skb),
+                                        tlen, 0));
+                        break;
+                }
+        } else if (skb->protocol == htons(ETH_P_IPV6)) {
+                switch (ipv6_hdr(skb)->nexthdr) {
+                case IPPROTO_TCP:
+                        tcp_hdr(skb)->check = 0;
+                        tcp_hdr(skb)->check = csum_ipv6_magic(
+                                &ipv6_hdr(skb)->saddr, &ipv6_hdr(skb)->daddr,
+                                ipv6_hdr(skb)->payload_len,
+                                ipv6_hdr(skb)->nexthdr,
+                                skb_checksum(skb, skb_transport_offset(skb),
+                                        ipv6_hdr(skb)->payload_len, 0));
+                        break;
+                case IPPROTO_UDP:
+                        udp_hdr(skb)->check = 0;
+                        udp_hdr(skb)->check = csum_ipv6_magic(
+                                &ipv6_hdr(skb)->saddr, &ipv6_hdr(skb)->daddr,
+                                ipv6_hdr(skb)->payload_len,
+                                ipv6_hdr(skb)->nexthdr,
+                                skb_checksum(skb, skb_transport_offset(skb),
+                                        ipv6_hdr(skb)->payload_len, 0));
+                        break;
+                }
+        }
+}
 
 static int
 qeth_send_packet(struct qeth_card *card, struct sk_buff *skb)
@@ -4638,12 +4703,22 @@ qeth_send_packet(struct qeth_card *card, struct sk_buff *skb)
                 elements_needed += elems;
         }
 
+        if ((large_send == QETH_LARGE_SEND_NO) &&
+            (skb->ip_summed == CHECKSUM_PARTIAL))
+                qeth_tx_csum(new_skb);
+
         if (card->info.type != QETH_CARD_TYPE_IQD)
                 rc = qeth_do_send_packet(card, queue, new_skb, hdr,
                                          elements_needed, ctx);
-        else
+        else {
+                if ((skb->protocol == htons(ETH_P_ARP)) &&
+                    (card->dev->flags & IFF_NOARP)) {
+                        __qeth_free_new_skb(skb, new_skb);
+                        return -EPERM;
+                }
                 rc = qeth_do_send_packet_fast(card, queue, new_skb, hdr,
                                               elements_needed, ctx);
+        }
         if (!rc) {
                 card->stats.tx_packets++;
                 card->stats.tx_bytes += tx_bytes;
@@ -6385,20 +6460,18 @@ qeth_deregister_addr_entry(struct qeth_card *card, struct qeth_ipaddr *addr)
 static u32
 qeth_ethtool_get_tx_csum(struct net_device *dev)
 {
-        /* We may need to say that we support tx csum offload if
-         * we do EDDP or TSO. There are discussions going on to
-         * enforce rules in the stack and in ethtool that make
-         * SG and TSO depend on HW_CSUM. At the moment there are
-         * no such rules....
-         * If we say yes here, we have to checksum outbound packets
-         * any time. */
-        return 0;
+        return (dev->features & NETIF_F_HW_CSUM) != 0;
 }
 
 static int
 qeth_ethtool_set_tx_csum(struct net_device *dev, u32 data)
 {
-        return -EINVAL;
+        if (data)
+                dev->features |= NETIF_F_HW_CSUM;
+        else
+                dev->features &= ~NETIF_F_HW_CSUM;
+
+        return 0;
 }
 
 static u32
@@ -7412,7 +7485,8 @@ qeth_start_ipa_tso(struct qeth_card *card)
         }
         if (rc && (card->options.large_send == QETH_LARGE_SEND_TSO)){
                 card->options.large_send = QETH_LARGE_SEND_NO;
-                card->dev->features &= ~ (NETIF_F_TSO | NETIF_F_SG);
+                card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG |
+                                                NETIF_F_HW_CSUM);
         }
         return rc;
 }
@@ -7552,22 +7626,26 @@ qeth_set_large_send(struct qeth_card *card, enum qeth_large_send_types type)
         card->options.large_send = type;
         switch (card->options.large_send) {
         case QETH_LARGE_SEND_EDDP:
-                card->dev->features |= NETIF_F_TSO | NETIF_F_SG;
+                card->dev->features |= NETIF_F_TSO | NETIF_F_SG |
+                                        NETIF_F_HW_CSUM;
                 break;
         case QETH_LARGE_SEND_TSO:
                 if (qeth_is_supported(card, IPA_OUTBOUND_TSO)){
-                        card->dev->features |= NETIF_F_TSO | NETIF_F_SG;
+                        card->dev->features |= NETIF_F_TSO | NETIF_F_SG |
+                                                NETIF_F_HW_CSUM;
                 } else {
                         PRINT_WARN("TSO not supported on %s. "
                                    "large_send set to 'no'.\n",
                                    card->dev->name);
-                        card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG);
+                        card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG |
+                                                NETIF_F_HW_CSUM);
                         card->options.large_send = QETH_LARGE_SEND_NO;
                         rc = -EOPNOTSUPP;
                 }
                 break;
         default: /* includes QETH_LARGE_SEND_NO */
-                card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG);
+                card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG |
+                                        NETIF_F_HW_CSUM);
                 break;
         }
         if (card->state == CARD_STATE_UP)
diff --git a/drivers/s390/net/qeth_mpc.h b/drivers/s390/net/qeth_mpc.h
index 1d8083c9176..6de2da5ed5f 100644
--- a/drivers/s390/net/qeth_mpc.h
+++ b/drivers/s390/net/qeth_mpc.h
@@ -565,6 +565,7 @@ extern unsigned char IDX_ACTIVATE_WRITE[];
 #define QETH_IDX_ACT_QDIO_DEV_REALADDR(buffer) (buffer+0x20)
 #define QETH_IS_IDX_ACT_POS_REPLY(buffer) (((buffer)[0x08]&3)==2)
 #define QETH_IDX_REPLY_LEVEL(buffer) (buffer+0x12)
+#define QETH_IDX_ACT_CAUSE_CODE(buffer) (buffer)[0x09]
 
 #define PDU_ENCAPSULATION(buffer) \
         (buffer + *(buffer + (*(buffer+0x0b)) + \
diff --git a/drivers/s390/net/qeth_sys.c b/drivers/s390/net/qeth_sys.c
index bb0287ad1aa..2cc3f3a0e39 100644
--- a/drivers/s390/net/qeth_sys.c
+++ b/drivers/s390/net/qeth_sys.c
@@ -1760,10 +1760,10 @@ qeth_remove_device_attributes(struct device *dev)
 {
         struct qeth_card *card = dev->driver_data;
 
-        if (card->info.type == QETH_CARD_TYPE_OSN)
-                return sysfs_remove_group(&dev->kobj,
-                                          &qeth_osn_device_attr_group);
-
+        if (card->info.type == QETH_CARD_TYPE_OSN) {
+                sysfs_remove_group(&dev->kobj, &qeth_osn_device_attr_group);
+                return;
+        }
         sysfs_remove_group(&dev->kobj, &qeth_device_attr_group);
         sysfs_remove_group(&dev->kobj, &qeth_device_ipato_group);
         sysfs_remove_group(&dev->kobj, &qeth_device_vipa_group);
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index ab5ec1feaf4..90aa53fc4f3 100644
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -1503,7 +1503,7 @@ zfcp_gid_pn_buffers_alloc(struct zfcp_gid_pn_data **gid_pn, mempool_t *pool)
                         data->ct.pool = pool;
                 }
         } else {
-                data = kmalloc(sizeof(struct zfcp_gid_pn_data), GFP_ATOMIC);
+                data = kmem_cache_alloc(zfcp_data.gid_pn_cache, GFP_ATOMIC);
         }
 
         if (NULL == data)
@@ -1531,7 +1531,7 @@ static void zfcp_gid_pn_buffers_free(struct zfcp_gid_pn_data *gid_pn)
         if (gid_pn->ct.pool)
                 mempool_free(gid_pn, gid_pn->ct.pool);
         else
-                kfree(gid_pn);
+                kmem_cache_free(zfcp_data.gid_pn_cache, gid_pn);
 }
 
 /**
diff --git a/drivers/s390/scsi/zfcp_qdio.c b/drivers/s390/scsi/zfcp_qdio.c
index 81daa8204bf..c6899efdc8f 100644
--- a/drivers/s390/scsi/zfcp_qdio.c
+++ b/drivers/s390/scsi/zfcp_qdio.c
@@ -640,13 +640,9 @@ int
 zfcp_qdio_sbals_from_scsicmnd(struct zfcp_fsf_req *fsf_req,
                               unsigned long sbtype, struct scsi_cmnd *scsi_cmnd)
 {
-        if (scsi_sg_count(scsi_cmnd))
-                return zfcp_qdio_sbals_from_sg(fsf_req, sbtype,
-                                               scsi_sglist(scsi_cmnd),
-                                               scsi_sg_count(scsi_cmnd),
-                                               ZFCP_MAX_SBALS_PER_REQ);
-        else
-                return 0;
+        return zfcp_qdio_sbals_from_sg(fsf_req, sbtype, scsi_sglist(scsi_cmnd),
+                                       scsi_sg_count(scsi_cmnd),
+                                       ZFCP_MAX_SBALS_PER_REQ);
 }
 
 /**
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index 0acf6db0a08..ad7eb4a9261 100644
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -764,7 +764,9 @@ zfcp_reset_fc_host_stats(struct Scsi_Host *shost)
                 return;
 
         ret = zfcp_fsf_exchange_port_data(NULL, adapter, data);
-        if (ret == 0) {
+        if (ret) {
+                kfree(data);
+        } else {
                 adapter->stats_reset = jiffies/HZ;
                 old_data = adapter->stats_reset_data;
                 adapter->stats_reset_data = data; /* finally freed in
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index 5606d1e6297..efceed451b4 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -737,12 +737,19 @@ check_mgmt:
                  */
                 conn->ctask = list_entry(conn->xmitqueue.next,
                                          struct iscsi_cmd_task, running);
-                if (conn->ctask->state == ISCSI_TASK_PENDING) {
+                switch (conn->ctask->state) {
+                case ISCSI_TASK_ABORTING:
+                        break;
+                case ISCSI_TASK_PENDING:
                         iscsi_prep_scsi_cmd_pdu(conn->ctask);
                         conn->session->tt->init_cmd_task(conn->ctask);
+                        /* fall through */
+                default:
+                        conn->ctask->state = ISCSI_TASK_RUNNING;
+                        break;
                 }
-                conn->ctask->state = ISCSI_TASK_RUNNING;
                 list_move_tail(conn->xmitqueue.next, &conn->run_list);
+
                 rc = iscsi_xmit_ctask(conn);
                 if (rc)
                         goto again;
@@ -1049,7 +1056,9 @@ static int iscsi_exec_abort_task(struct scsi_cmnd *sc,
         ctask->mtask = __iscsi_conn_send_pdu(conn, (struct iscsi_hdr *)hdr,
                                             NULL, 0);
         if (!ctask->mtask) {
+                spin_unlock_bh(&session->lock);
                 iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
+                spin_lock_bh(&session->lock)
                 debug_scsi("abort sent failure [itt 0x%x]\n", ctask->itt);
                 return -EPERM;
         }
@@ -1066,6 +1075,7 @@ static int iscsi_exec_abort_task(struct scsi_cmnd *sc,
                 debug_scsi("abort set timeout [itt 0x%x]\n", ctask->itt);
         }
         spin_unlock_bh(&session->lock);
+        mutex_unlock(&session->eh_mutex);
         scsi_queue_work(session->host, &conn->xmitwork);
 
         /*
@@ -1083,6 +1093,7 @@ static int iscsi_exec_abort_task(struct scsi_cmnd *sc,
         if (signal_pending(current))
                 flush_signals(current);
         del_timer_sync(&conn->tmabort_timer);
+        mutex_lock(&session->eh_mutex);
         spin_lock_bh(&session->lock);
         return 0;
 }
@@ -1158,31 +1169,45 @@ static void fail_command(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask,
         __iscsi_put_ctask(ctask);
 }
 
+static void iscsi_suspend_tx(struct iscsi_conn *conn)
+{
+        set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx);
+        scsi_flush_work(conn->session->host);
+}
+
+static void iscsi_start_tx(struct iscsi_conn *conn)
+{
+        clear_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx);
+        scsi_queue_work(conn->session->host, &conn->xmitwork);
+}
+
 int iscsi_eh_abort(struct scsi_cmnd *sc)
 {
+        struct Scsi_Host *host = sc->device->host;
+        struct iscsi_session *session = iscsi_hostdata(host->hostdata);
         struct iscsi_cmd_task *ctask;
         struct iscsi_conn *conn;
-        struct iscsi_session *session;
         int rc;
 
+        mutex_lock(&session->eh_mutex);
+        spin_lock_bh(&session->lock);
         /*
          * if session was ISCSI_STATE_IN_RECOVERY then we may not have
          * got the command.
          */
         if (!sc->SCp.ptr) {
                 debug_scsi("sc never reached iscsi layer or it completed.\n");
+                spin_unlock_bh(&session->lock);
+                mutex_unlock(&session->eh_mutex);
                 return SUCCESS;
         }
 
         ctask = (struct iscsi_cmd_task *)sc->SCp.ptr;
         conn = ctask->conn;
-        session = conn->session;
 
         conn->eh_abort_cnt++;
         debug_scsi("aborting [sc %p itt 0x%x]\n", sc, ctask->itt);
 
-        spin_lock_bh(&session->lock);
-
         /*
          * If we are not logged in or we have started a new session
          * then let the host reset code handle this
@@ -1219,6 +1244,7 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)
         switch (conn->tmabort_state) {
         case TMABORT_SUCCESS:
                 spin_unlock_bh(&session->lock);
+                iscsi_suspend_tx(conn);
                 /*
                  * clean up task if aborted. grab the recv lock as a writer
                  */
@@ -1227,11 +1253,7 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)
                 fail_command(conn, ctask, DID_ABORT << 16);
                 spin_unlock(&session->lock);
                 write_unlock_bh(conn->recv_lock);
-                /*
-                 * make sure xmit thread is not still touching the
-                 * ctask/scsi_cmnd
-                 */
-                scsi_flush_work(session->host);
+                iscsi_start_tx(conn);
                 goto success_unlocked;
         case TMABORT_NOT_FOUND:
                 if (!ctask->sc) {
@@ -1251,12 +1273,14 @@ success:
         spin_unlock_bh(&session->lock);
 success_unlocked:
         debug_scsi("abort success [sc %lx itt 0x%x]\n", (long)sc, ctask->itt);
+        mutex_unlock(&session->eh_mutex);
         return SUCCESS;
 
 failed:
         spin_unlock_bh(&session->lock);
 failed_unlocked:
         debug_scsi("abort failed [sc %lx itt 0x%x]\n", (long)sc, ctask->itt);
+        mutex_unlock(&session->eh_mutex);
         return FAILED;
 }
 EXPORT_SYMBOL_GPL(iscsi_eh_abort);
@@ -1403,6 +1427,7 @@ iscsi_session_setup(struct iscsi_transport *iscsit,
         session->max_cmdsn = initial_cmdsn + 1;
         session->max_r2t = 1;
         session->tt = iscsit;
+        mutex_init(&session->eh_mutex);
 
         /* initialize SCSI PDU commands pool */
         if (iscsi_pool_init(&session->cmdpool, session->cmds_max,
@@ -1736,9 +1761,22 @@ static void iscsi_start_session_recovery(struct iscsi_session *session,
 {
         int old_stop_stage;
 
+        mutex_lock(&session->eh_mutex);
         spin_lock_bh(&session->lock);
         if (conn->stop_stage == STOP_CONN_TERM) {
                 spin_unlock_bh(&session->lock);
+                mutex_unlock(&session->eh_mutex);
+                return;
+        }
+
+        /*
+         * The LLD either freed/unset the lock on us, or userspace called
+         * stop but did not create a proper connection (connection was never
+         * bound or it was unbound then stop was called).
+         */
+        if (!conn->recv_lock) {
+                spin_unlock_bh(&session->lock);
+                mutex_unlock(&session->eh_mutex);
                 return;
         }
 
@@ -1755,9 +1793,9 @@ static void iscsi_start_session_recovery(struct iscsi_session *session,
         old_stop_stage = conn->stop_stage;
         conn->stop_stage = flag;
         conn->c_stage = ISCSI_CONN_STOPPED;
-        set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx);
         spin_unlock_bh(&session->lock);
-        scsi_flush_work(session->host);
+
+        iscsi_suspend_tx(conn);
 
         write_lock_bh(conn->recv_lock);
         set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_rx);
@@ -1786,6 +1824,7 @@ static void iscsi_start_session_recovery(struct iscsi_session *session,
         fail_all_commands(conn);
         flush_control_queues(session, conn);
         spin_unlock_bh(&session->lock);
+        mutex_unlock(&session->eh_mutex);
 }
 
 void iscsi_conn_stop(struct iscsi_cls_conn *cls_conn, int flag)
diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index 563d18f4ff5..c6680348b64 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -2050,21 +2050,18 @@ qla25xx_fw_dump_failed:
 void
 qla2x00_dump_regs(scsi_qla_host_t *ha)
 {
+        int i;
         struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
+        struct device_reg_24xx __iomem *reg24 = &ha->iobase->isp24;
+        uint16_t __iomem *mbx_reg;
+
+        mbx_reg = IS_FWI2_CAPABLE(ha) ? &reg24->mailbox0:
+            MAILBOX_REG(ha, reg, 0);
 
         printk("Mailbox registers:\n");
-        printk("scsi(%ld): mbox 0 0x%04x \n",
-            ha->host_no, RD_MAILBOX_REG(ha, reg, 0));
-        printk("scsi(%ld): mbox 1 0x%04x \n",
-            ha->host_no, RD_MAILBOX_REG(ha, reg, 1));
-        printk("scsi(%ld): mbox 2 0x%04x \n",
-            ha->host_no, RD_MAILBOX_REG(ha, reg, 2));
-        printk("scsi(%ld): mbox 3 0x%04x \n",
-            ha->host_no, RD_MAILBOX_REG(ha, reg, 3));
-        printk("scsi(%ld): mbox 4 0x%04x \n",
-            ha->host_no, RD_MAILBOX_REG(ha, reg, 4));
-        printk("scsi(%ld): mbox 5 0x%04x \n",
-            ha->host_no, RD_MAILBOX_REG(ha, reg, 5));
+        for (i = 0; i < 6; i++)
+                printk("scsi(%ld): mbox %d 0x%04x \n", ha->host_no, i,
+                    RD_REG_WORD(mbx_reg++));
 }
 
 
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 27ae3a532a5..c1964866a42 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -1502,7 +1502,6 @@ typedef struct {
         uint8_t node_name[WWN_SIZE];
         uint8_t port_name[WWN_SIZE];
         uint8_t fabric_port_name[WWN_SIZE];
-        uint16_t fp_speeds;
         uint16_t fp_speed;
 } sw_info_t;
 
diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index b06cbb8580d..a7e23583f89 100644
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -295,6 +295,8 @@ qla2x00_gid_pt(scsi_qla_host_t *ha, sw_info_t *list)
                         list[i].d_id.b.domain = gid_data->port_id[0];
                         list[i].d_id.b.area = gid_data->port_id[1];
                         list[i].d_id.b.al_pa = gid_data->port_id[2];
+                        memset(list[i].fabric_port_name, 0, WWN_SIZE);
+                        list[i].fp_speed = PORT_SPEED_UNKNOWN;
 
                         /* Last one exit. */
                         if (gid_data->control_byte & BIT_7) {
@@ -1707,8 +1709,6 @@ qla2x00_gfpn_id(scsi_qla_host_t *ha, sw_info_t *list)
 
         for (i = 0; i < MAX_FIBRE_DEVICES; i++) {
                 /* Issue GFPN_ID */
-                memset(list[i].fabric_port_name, 0, WWN_SIZE);
-
                 /* Prepare common MS IOCB */
                 ms_pkt = ha->isp_ops->prep_ms_iocb(ha, GFPN_ID_REQ_SIZE,
                     GFPN_ID_RSP_SIZE);
@@ -1821,8 +1821,6 @@ qla2x00_gpsc(scsi_qla_host_t *ha, sw_info_t *list)
 
         for (i = 0; i < MAX_FIBRE_DEVICES; i++) {
                 /* Issue GFPN_ID */
-                list[i].fp_speeds = list[i].fp_speed = 0;
-
                 /* Prepare common MS IOCB */
                 ms_pkt = qla24xx_prep_ms_fm_iocb(ha, GPSC_REQ_SIZE,
                     GPSC_RSP_SIZE);
@@ -1858,9 +1856,21 @@ qla2x00_gpsc(scsi_qla_host_t *ha, sw_info_t *list)
                         }
                         rval = QLA_FUNCTION_FAILED;
                 } else {
-                        /* Save portname */
-                        list[i].fp_speeds = ct_rsp->rsp.gpsc.speeds;
-                        list[i].fp_speed = ct_rsp->rsp.gpsc.speed;
+                        /* Save port-speed */
+                        switch (be16_to_cpu(ct_rsp->rsp.gpsc.speed)) {
+                        case BIT_15:
+                                list[i].fp_speed = PORT_SPEED_1GB;
+                                break;
+                        case BIT_14:
+                                list[i].fp_speed = PORT_SPEED_2GB;
+                                break;
+                        case BIT_13:
+                                list[i].fp_speed = PORT_SPEED_4GB;
+                                break;
+                        case BIT_11:
+                                list[i].fp_speed = PORT_SPEED_8GB;
+                                break;
+                        }
 
                         DEBUG2_3(printk("scsi(%ld): GPSC ext entry - "
                             "fpn %02x%02x%02x%02x%02x%02x%02x%02x speeds=%04x "
@@ -1873,8 +1883,8 @@ qla2x00_gpsc(scsi_qla_host_t *ha, sw_info_t *list)
                             list[i].fabric_port_name[5],
                             list[i].fabric_port_name[6],
                             list[i].fabric_port_name[7],
-                            be16_to_cpu(list[i].fp_speeds),
-                            be16_to_cpu(list[i].fp_speed)));
+                            be16_to_cpu(ct_rsp->rsp.gpsc.speeds),
+                            be16_to_cpu(ct_rsp->rsp.gpsc.speed)));
                 }
 
                 /* Last device exit. */
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 374abe19b54..1a058ec9bd0 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -2079,17 +2079,7 @@ qla2x00_configure_local_loop(scsi_qla_host_t *ha)
                 }
 
                 /* Base iIDMA settings on HBA port speed. */
-                switch (ha->link_data_rate) {
-                case PORT_SPEED_1GB:
-                        fcport->fp_speed = cpu_to_be16(BIT_15);
-                        break;
-                case PORT_SPEED_2GB:
-                        fcport->fp_speed = cpu_to_be16(BIT_14);
-                        break;
-                case PORT_SPEED_4GB:
-                        fcport->fp_speed = cpu_to_be16(BIT_13);
-                        break;
-                }
+                fcport->fp_speed = ha->link_data_rate;
 
                 qla2x00_update_fcport(ha, fcport);
 
@@ -2130,38 +2120,25 @@ static void
 qla2x00_iidma_fcport(scsi_qla_host_t *ha, fc_port_t *fcport)
 {
 #define LS_UNKNOWN      2
-        static char *link_speeds[5] = { "1", "2", "?", "4" };
+        static char *link_speeds[5] = { "1", "2", "?", "4", "8" };
         int rval;
-        uint16_t port_speed, mb[6];
+        uint16_t mb[6];
 
         if (!IS_IIDMA_CAPABLE(ha))
                 return;
 
-        switch (be16_to_cpu(fcport->fp_speed)) {
-        case BIT_15:
-                port_speed = PORT_SPEED_1GB;
-                break;
-        case BIT_14:
-                port_speed = PORT_SPEED_2GB;
-                break;
-        case BIT_13:
-                port_speed = PORT_SPEED_4GB;
-                break;
-        default:
+        if (fcport->fp_speed == PORT_SPEED_UNKNOWN) {
                 DEBUG2(printk("scsi(%ld): %02x%02x%02x%02x%02x%02x%02x%02x -- "
-                    "unsupported FM port operating speed (%04x).\n",
+                    "unsupported FM port operating speed.\n",
                     ha->host_no, fcport->port_name[0], fcport->port_name[1],
                     fcport->port_name[2], fcport->port_name[3],
                     fcport->port_name[4], fcport->port_name[5],
-                    fcport->port_name[6], fcport->port_name[7],
-                    be16_to_cpu(fcport->fp_speed)));
-                port_speed = PORT_SPEED_UNKNOWN;
-                break;
-        }
-        if (port_speed == PORT_SPEED_UNKNOWN)
+                    fcport->port_name[6], fcport->port_name[7]));
                 return;
+        }
 
-        rval = qla2x00_set_idma_speed(ha, fcport->loop_id, port_speed, mb);
+        rval = qla2x00_set_idma_speed(ha, fcport->loop_id, fcport->fp_speed,
+            mb);
         if (rval != QLA_SUCCESS) {
                 DEBUG2(printk("scsi(%ld): Unable to adjust iIDMA "
                     "%02x%02x%02x%02x%02x%02x%02x%02x -- %04x %x %04x %04x.\n",
@@ -2169,12 +2146,12 @@ qla2x00_iidma_fcport(scsi_qla_host_t *ha, fc_port_t *fcport)
                     fcport->port_name[2], fcport->port_name[3],
                     fcport->port_name[4], fcport->port_name[5],
                     fcport->port_name[6], fcport->port_name[7], rval,
-                    port_speed, mb[0], mb[1]));
+                    fcport->fp_speed, mb[0], mb[1]));
         } else {
                 DEBUG2(qla_printk(KERN_INFO, ha,
                     "iIDMA adjusted to %s GB/s on "
                     "%02x%02x%02x%02x%02x%02x%02x%02x.\n",
-                    link_speeds[port_speed], fcport->port_name[0],
+                    link_speeds[fcport->fp_speed], fcport->port_name[0],
                     fcport->port_name[1], fcport->port_name[2],
                     fcport->port_name[3], fcport->port_name[4],
                     fcport->port_name[5], fcport->port_name[6],
@@ -3354,7 +3331,8 @@ qla2x00_restart_isp(scsi_qla_host_t *ha)
 
                         spin_lock_irqsave(&ha->hardware_lock, flags);
 
-                        if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha)) {
+                        if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha) &&
+                            !IS_QLA25XX(ha)) {
                                 /*
                                  * Disable SRAM, Instruction RAM and GP RAM
                                  * parity.
@@ -3370,7 +3348,8 @@ qla2x00_restart_isp(scsi_qla_host_t *ha)
 
                         spin_lock_irqsave(&ha->hardware_lock, flags);
 
-                        if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha)) {
+                        if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha) &&
+                            !IS_QLA25XX(ha)) {
                                 /* Enable proper parity */
                                 if (IS_QLA2300(ha))
                                         /* SRAM parity */
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 50539da467b..eecae9905ec 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -490,6 +490,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
                 set_bit(REGISTER_FC4_NEEDED, &ha->dpc_flags);
 
                 ha->flags.gpsc_supported = 1;
+                ha->flags.management_server_logged_in = 0;
                 break;
 
         case MBA_CHG_IN_CONNECTION:     /* Change in connection mode */
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 93c0c7e4f08..acca898ce0a 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1564,7 +1564,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
         struct Scsi_Host *host;
         scsi_qla_host_t *ha;
         unsigned long   flags = 0;
-        char pci_info[20];
+        char pci_info[30];
         char fw_str[30];
         struct scsi_host_template *sht;
 
diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h
index dd1f8ceb79c..18095b9b76f 100644
--- a/drivers/scsi/qla2xxx/qla_version.h
+++ b/drivers/scsi/qla2xxx/qla_version.h
@@ -7,7 +7,7 @@
 /*
  * Driver version
  */
-#define QLA2XXX_VERSION      "8.02.00-k2"
+#define QLA2XXX_VERSION      "8.02.00-k3"
 
 #define QLA_DRIVER_MAJOR_VER    8
 #define QLA_DRIVER_MINOR_VER    2
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index bd66339f7a3..1ea1ed82c35 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -610,7 +610,7 @@ static int pci_netmos_init(struct pci_dev *dev)
 /* enable IO_Space bit */
 #define ITE_887x_POSIO_ENABLE           (1 << 31)
 
-static int __devinit pci_ite887x_init(struct pci_dev *dev)
+static int pci_ite887x_init(struct pci_dev *dev)
 {
         /* inta_addr are the configuration addresses of the ITE */
         static const short inta_addr[] = { 0x2a0, 0x2c0, 0x220, 0x240, 0x1e0,
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 64ff6a5f6af..81b52b7cca2 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -611,7 +611,7 @@ config SERIAL_BFIN
 
 config SERIAL_BFIN_CONSOLE
         bool "Console on Blackfin serial port"
-        depends on SERIAL_BFIN
+        depends on SERIAL_BFIN=y
         select SERIAL_CORE_CONSOLE
 
 choice
@@ -832,10 +832,10 @@ config SERIAL_MUX
             4. Change the kernel command console parameter to: console=ttyB0
 
 config SERIAL_MUX_CONSOLE
-        bool "Support for console on serial MUX"
-        depends on SERIAL_MUX
+        bool "Support for console on serial MUX"
+        depends on SERIAL_MUX=y
         select SERIAL_CORE_CONSOLE
-        default y
+        default y
 
 config PDC_CONSOLE
         bool "PDC software console support"
diff --git a/drivers/serial/sb1250-duart.c b/drivers/serial/sb1250-duart.c
index 20125375501..2d6c08b3dbc 100644
--- a/drivers/serial/sb1250-duart.c
+++ b/drivers/serial/sb1250-duart.c
@@ -58,6 +58,12 @@
 #define SBD_CTRLREGS(line)      A_BCM1480_DUART_CTRLREG((line), 0)
 #define SBD_INT(line)           (K_BCM1480_INT_UART_0 + (line))
 
+#define DUART_CHANREG_SPACING   BCM1480_DUART_CHANREG_SPACING
+
+#define R_DUART_IMRREG(line)    R_BCM1480_DUART_IMRREG(line)
+#define R_DUART_INCHREG(line)   R_BCM1480_DUART_INCHREG(line)
+#define R_DUART_ISRREG(line)    R_BCM1480_DUART_ISRREG(line)
+
 #elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)
 #include <asm/sibyte/sb1250_regs.h>
 #include <asm/sibyte/sb1250_int.h>
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index ad144054da3..b0469749310 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -251,7 +251,7 @@ atmel_spi_dma_map_xfer(struct atmel_spi *as, struct spi_transfer *xfer)
                 xfer->rx_dma = dma_map_single(dev,
                                 xfer->rx_buf, xfer->len,
                                 DMA_FROM_DEVICE);
-                if (dma_mapping_error(xfer->tx_dma)) {
+                if (dma_mapping_error(xfer->rx_dma)) {
                         if (xfer->tx_buf)
                                 dma_unmap_single(dev,
                                                 xfer->tx_dma, xfer->len,
diff --git a/drivers/spi/spi_bfin5xx.c b/drivers/spi/spi_bfin5xx.c
index 48587c27050..f540ed77a10 100644
--- a/drivers/spi/spi_bfin5xx.c
+++ b/drivers/spi/spi_bfin5xx.c
@@ -1303,8 +1303,9 @@ static int bfin5xx_spi_resume(struct platform_device *pdev)
 #define bfin5xx_spi_resume NULL
 #endif                          /* CONFIG_PM */
 
+MODULE_ALIAS("bfin-spi-master");        /* for platform bus hotplug */
 static struct platform_driver bfin5xx_spi_driver = {
-        .driver         = {
+        .driver = {
                 .name   = "bfin-spi-master",
                 .owner  = THIS_MODULE,
         },
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c
index aee9ad6f633..bd9177f51de 100644
--- a/drivers/spi/spi_imx.c
+++ b/drivers/spi/spi_imx.c
@@ -1735,7 +1735,7 @@ static int spi_imx_resume(struct platform_device *pdev)
 
 static struct platform_driver driver = {
         .driver = {
-                .name = "imx-spi",
+                .name = "spi_imx",
                 .bus = &platform_bus_type,
                 .owner = THIS_MODULE,
         },
diff --git a/drivers/spi/spi_mpc83xx.c b/drivers/spi/spi_mpc83xx.c
index 2adf856e44c..32cda77b31c 100644
--- a/drivers/spi/spi_mpc83xx.c
+++ b/drivers/spi/spi_mpc83xx.c
@@ -384,11 +384,8 @@ irqreturn_t mpc83xx_spi_irq(s32 irq, void *context_data)
 
         mpc83xx_spi->count -= 1;
         if (mpc83xx_spi->count) {
-                if (mpc83xx_spi->tx) {
-                        u32 word = mpc83xx_spi->get_tx(mpc83xx_spi);
-                        mpc83xx_spi_write_reg(&mpc83xx_spi->base->transmit,
-                                              word);
-                }
+                u32 word = mpc83xx_spi->get_tx(mpc83xx_spi);
+                mpc83xx_spi_write_reg(&mpc83xx_spi->base->transmit, word);
         } else {
                 complete(&mpc83xx_spi->done);
         }
@@ -530,6 +527,7 @@ static int __devexit mpc83xx_spi_remove(struct platform_device *dev)
         return 0;
 }
 
+MODULE_ALIAS("mpc83xx_spi");                    /* for platform bus hotplug */
 static struct platform_driver mpc83xx_spi_driver = {
         .probe = mpc83xx_spi_probe,
         .remove = __devexit_p(mpc83xx_spi_remove),
diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c
index 5cf48123e0e..e9b683f7d7b 100644
--- a/drivers/spi/spi_s3c24xx.c
+++ b/drivers/spi/spi_s3c24xx.c
@@ -427,6 +427,7 @@ static int s3c24xx_spi_resume(struct platform_device *pdev)
 #define s3c24xx_spi_resume  NULL
 #endif
 
+MODULE_ALIAS("s3c2410_spi");                    /* for platform bus hotplug */
 static struct platform_driver s3c24xx_spidrv = {
         .probe          = s3c24xx_spi_probe,
         .remove         = s3c24xx_spi_remove,
diff --git a/drivers/spi/spi_s3c24xx_gpio.c b/drivers/spi/spi_s3c24xx_gpio.c
index 611ac22b7cd..0fa25e2e80f 100644
--- a/drivers/spi/spi_s3c24xx_gpio.c
+++ b/drivers/spi/spi_s3c24xx_gpio.c
@@ -180,7 +180,7 @@ static struct platform_driver s3c2410_spigpio_drv = {
         .suspend        = s3c2410_spigpio_suspend,
         .resume         = s3c2410_spigpio_resume,
         .driver         = {
-                .name   = "s3c24xx-spi-gpio",
+                .name   = "spi_s3c24xx_gpio",
                 .owner  = THIS_MODULE,
         },
 };
diff --git a/drivers/spi/spi_txx9.c b/drivers/spi/spi_txx9.c
index 08e981c4064..b7f4bb239ea 100644
--- a/drivers/spi/spi_txx9.c
+++ b/drivers/spi/spi_txx9.c
@@ -453,7 +453,7 @@ static int __exit txx9spi_remove(struct platform_device *dev)
 static struct platform_driver txx9spi_driver = {
         .remove = __exit_p(txx9spi_remove),
         .driver = {
-                .name = "txx9spi",
+                .name = "spi_txx9",
                 .owner = THIS_MODULE,
         },
 };
diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c
index f0bf9a68e96..5d04f520c12 100644
--- a/drivers/spi/xilinx_spi.c
+++ b/drivers/spi/xilinx_spi.c
@@ -21,7 +21,7 @@
 
 #include <syslib/virtex_devices.h>
 
-#define XILINX_SPI_NAME "xspi"
+#define XILINX_SPI_NAME "xilinx_spi"
 
 /* Register definitions as per "OPB Serial Peripheral Interface (SPI) (v1.00e)
  * Product Specification", DS464
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index a1ad11d0c47..63b1243a913 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -60,7 +60,7 @@ ssize_t usb_store_new_id(struct usb_dynids *dynids,
         dynid->id.match_flags = USB_DEVICE_ID_MATCH_DEVICE;
 
         spin_lock(&dynids->lock);
-        list_add_tail(&dynids->list, &dynid->node);
+        list_add_tail(&dynid->node, &dynids->list);
         spin_unlock(&dynids->lock);
 
         if (get_driver(driver)) {
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index 9e467118dc9..7f17d0fd76c 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -28,10 +28,16 @@
  * devices is broken...
  */
 static const struct usb_device_id usb_quirk_list[] = {
+        /* CBM - Flash disk */
+        { USB_DEVICE(0x0204, 0x6025), .driver_info = USB_QUIRK_RESET_RESUME },
         /* HP 5300/5370C scanner */
         { USB_DEVICE(0x03f0, 0x0701), .driver_info = USB_QUIRK_STRING_FETCH_255 },
         /* Hewlett-Packard PhotoSmart 720 / PhotoSmart 935 (storage) */
         { USB_DEVICE(0x03f0, 0x4002), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
+
+        /* SGS Thomson Microelectronics 4in1 card reader */
+        { USB_DEVICE(0x0483, 0x0321), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
+
         /* Acer Peripherals Inc. (now BenQ Corp.) Prisa 640BU */
         { USB_DEVICE(0x04a5, 0x207e), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
         /* Benq S2W 3300U */
@@ -66,6 +72,19 @@ static const struct usb_device_id usb_quirk_list[] = {
         { USB_DEVICE(0x05cc, 0x2267), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
         /* Ultima Electronics Corp.*/
         { USB_DEVICE(0x05d8, 0x4005), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
+
+        /* Genesys USB-to-IDE */
+        { USB_DEVICE(0x0503, 0x0702), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
+
+        /* USB Graphical LCD - EEH Datalink GmbH */
+        { USB_DEVICE(0x060c, 0x04eb), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
+
+        /* INTEL VALUE SSD */
+        { USB_DEVICE(0x8086, 0xf1a5), .driver_info = USB_QUIRK_RESET_RESUME },
+
+        /* M-Systems Flash Disk Pioneers */
+        { USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },
+
         /* Agfa Snapscan1212u */
         { USB_DEVICE(0x06bd, 0x2061), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
         /* Seagate RSS LLC */
@@ -87,6 +106,12 @@ static const struct usb_device_id usb_quirk_list[] = {
         { USB_DEVICE(0x0fca, 0x0004), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
         { USB_DEVICE(0x0fca, 0x0006), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
 
+        /* Apple iPhone */
+        { USB_DEVICE(0x05ac, 0x1290), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },
+
+        /* SKYMEDI USB_DRIVE */
+        { USB_DEVICE(0x1516, 0x8628), .driver_info = USB_QUIRK_RESET_RESUME },
+
         { }  /* terminating entry must be last */
 };
 
diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c
index 9cd98e73dc1..ce4d2e09633 100644
--- a/drivers/usb/gadget/serial.c
+++ b/drivers/usb/gadget/serial.c
@@ -1691,14 +1691,12 @@ static int gs_setup_class(struct usb_gadget *gadget,
 
         switch (ctrl->bRequest) {
         case USB_CDC_REQ_SET_LINE_CODING:
-                ret = min(wLength,
-                        (u16)sizeof(struct usb_cdc_line_coding));
-                if (port) {
-                        spin_lock(&port->port_lock);
-                        memcpy(&port->port_line_coding, req->buf, ret);
-                        spin_unlock(&port->port_lock);
-                }
-                ret = 0;
+                /* FIXME Submit req to read the data; have its completion
+                 * handler copy that data to port->port_line_coding (iff
+                 * it's valid) and maybe pass it on.  Until then, fail.
+                 */
+                printk(KERN_WARNING "gs_setup: set_line_coding "
+                                "unuspported\n");
                 break;
 
         case USB_CDC_REQ_GET_LINE_CODING:
@@ -1713,11 +1711,18 @@ static int gs_setup_class(struct usb_gadget *gadget,
                 break;
 
         case USB_CDC_REQ_SET_CONTROL_LINE_STATE:
-                ret = 0;
+                /* FIXME Submit req to read the data; have its completion
+                 * handler use that to set the state (iff it's valid) and
+                 * maybe pass it on.  Until then, fail.
+                 */
+                printk(KERN_WARNING "gs_setup: set_control_line_state "
+                                "unuspported\n");
                 break;
 
         default:
-                printk(KERN_ERR "gs_setup: unknown class request, type=%02x, request=%02x, value=%04x, index=%04x, length=%d\n",
+                printk(KERN_ERR "gs_setup: unknown class request, "
+                                "type=%02x, request=%02x, value=%04x, "
+                                "index=%04x, length=%d\n",
                         ctrl->bRequestType, ctrl->bRequest,
                         wValue, wIndex, wLength);
                 break;
diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c
index 9f37ba44c13..b64ca91d9b0 100644
--- a/drivers/usb/misc/sisusbvga/sisusb.c
+++ b/drivers/usb/misc/sisusbvga/sisusb.c
@@ -3404,6 +3404,7 @@ static void sisusb_disconnect(struct usb_interface *intf)
 }
 
 static struct usb_device_id sisusb_table [] = {
+        { USB_DEVICE(0x0711, 0x0550) },
         { USB_DEVICE(0x0711, 0x0900) },
         { USB_DEVICE(0x0711, 0x0901) },
         { USB_DEVICE(0x0711, 0x0902) },
diff --git a/drivers/usb/serial/bus.c b/drivers/usb/serial/bus.c
index c08a38402b9..a47a24f8820 100644
--- a/drivers/usb/serial/bus.c
+++ b/drivers/usb/serial/bus.c
@@ -138,7 +138,7 @@ static void free_dynids(struct usb_serial_driver *drv)
 static struct driver_attribute drv_attrs[] = {
         __ATTR_NULL,
 };
-static inline void free_dynids(struct usb_driver *drv)
+static inline void free_dynids(struct usb_serial_driver *drv)
 {
 }
 #endif
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 1370c423d7c..2d045857b18 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -568,6 +568,7 @@ static struct usb_device_id id_table_combined [] = {
         { USB_DEVICE(ELEKTOR_VID, ELEKTOR_FT323R_PID) },
         { USB_DEVICE(TELLDUS_VID, TELLDUS_TELLSTICK_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_MAXSTREAM_PID) },
+        { USB_DEVICE(TML_VID, TML_USB_SERIAL_PID) },
         { USB_DEVICE(OLIMEX_VID, OLIMEX_ARM_USB_OCD_PID),
                 .driver_info = (kernel_ulong_t)&ftdi_olimex_quirk },
         { },                                    /* Optional parameter entry */
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index c70e1de6389..b57b90ae9f9 100644
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -534,6 +534,14 @@
 #define OLIMEX_VID                      0x15BA
 #define OLIMEX_ARM_USB_OCD_PID          0x0003
 
+
+/*
+ * The Mobility Lab (TML)
+ * Submitted by Pierre Castella
+ */
+#define TML_VID                 0x1B91  /* Vendor ID */
+#define TML_USB_SERIAL_PID      0x0064  /* USB - Serial Converter */
+
 /* Commands */
 #define FTDI_SIO_RESET          0 /* Reset the port */
 #define FTDI_SIO_MODEM_CTRL     1 /* Set the modem control register */
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 4cb3c165742..a18659e0700 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -108,6 +108,7 @@ static int  option_send_setup(struct usb_serial_port *port);
 #define HUAWEI_VENDOR_ID                        0x12D1
 #define HUAWEI_PRODUCT_E600                     0x1001
 #define HUAWEI_PRODUCT_E220                     0x1003
+#define HUAWEI_PRODUCT_E220BIS                  0x1004
 
 #define NOVATELWIRELESS_VENDOR_ID               0x1410
 #define DELL_VENDOR_ID                          0x413C
@@ -158,6 +159,7 @@ static struct usb_device_id option_ids[] = {
         { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_KOI_NETWORK) },
         { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) },
         { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220) },
+        { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220BIS) },
         { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1100) }, /* Novatel Merlin XS620/S640 */
         { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1110) }, /* Novatel Merlin S620 */
         { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1120) }, /* Novatel Merlin EX720 */
@@ -176,6 +178,7 @@ static struct usb_device_id option_ids[] = {
         { USB_DEVICE(DELL_VENDOR_ID, 0x8117) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO ExpressCard == Novatel Merlin XV620 CDMA/EV-DO */
         { USB_DEVICE(DELL_VENDOR_ID, 0x8118) }, /* Dell Wireless 5510 Mobile Broadband HSDPA ExpressCard == Novatel Merlin XU870 HSDPA/3G */
         { USB_DEVICE(DELL_VENDOR_ID, 0x8128) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite E720 CDMA/EV-DO */
+        { USB_DEVICE(DELL_VENDOR_ID, 0x8137) }, /* Dell Wireless HSDPA 5520 */
         { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_E100A) },
         { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_500A) },
         { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_1) },
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c
index 833ada47fc5..64f3f66a7a3 100644
--- a/drivers/usb/serial/oti6858.c
+++ b/drivers/usb/serial/oti6858.c
@@ -817,21 +817,6 @@ static int oti6858_ioctl(struct usb_serial_port *port, struct file *file,
                                 __FUNCTION__, port->number, cmd, arg);
 
         switch (cmd) {
-                case TCGETS:
-                        if (kernel_termios_to_user_termios((struct ktermios __user *)arg,
-                                                           port->tty->termios))
-                                return -EFAULT;
-                        return 0;
-
-                case TCSETS:
-                case TCSETSW:   /* FIXME: this is not the same! */
-                case TCSETSF:   /* FIXME: this is not the same! */
-                        if (user_termios_to_kernel_termios(port->tty->termios,
-                                                (struct ktermios __user *)arg))
-                                return -EFAULT;
-                        oti6858_set_termios(port, NULL);
-                        return 0;
-
                 case TCFLSH:
                         /* FIXME */
                         return 0;
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 2d92ce31018..c6b78ba815e 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -348,6 +348,13 @@ UNUSUAL_DEV(  0x04b0, 0x0411, 0x0100, 0x0101,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_FIX_CAPACITY),
 
+/* Reported by Ortwin Glueck <odi@odi.ch> */
+UNUSUAL_DEV(  0x04b0, 0x0413, 0x0110, 0x0110,
+                "NIKON",
+                "NIKON DSC D40",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_FIX_CAPACITY),
+
 /* BENQ DC5330
  * Reported by Manuel Fombuena <mfombuena@ya.com> and
  * Frank Copeland <fjc@thingy.apana.org.au> */
@@ -897,6 +904,22 @@ UNUSUAL_DEV(  0x069b, 0x3004, 0x0001, 0x0001,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_FIX_CAPACITY ),
 
+/* Reported by Massimiliano Ghilardi <massimiliano.ghilardi@gmail.com>
+ * This USB MP3/AVI player device fails and disconnects if more than 128
+ * sectors (64kB) are read/written in a single command, and may be present
+ * at least in the following products:
+ *   "Magnex Digital Video Panel DVP 1800"
+ *   "MP4 AIGO 4GB SLOT SD"
+ *   "Teclast TL-C260 MP3"
+ *   "i.Meizu PMP MP3/MP4"
+ *   "Speed MV8 MP4 Audio Player"
+ */
+UNUSUAL_DEV(  0x071b, 0x3203, 0x0100, 0x0100,
+                "RockChip",
+                "ROCK MP3",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_MAX_SECTORS_64),
+
 /* Reported by Olivier Blondeau <zeitoun@gmail.com> */
 UNUSUAL_DEV(  0x0727, 0x0306, 0x0100, 0x0100,
                 "ATMEL",
@@ -1393,6 +1416,13 @@ UNUSUAL_DEV(  0x0fce, 0xe030, 0x0000, 0x0000,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_FIX_CAPACITY | US_FL_IGNORE_RESIDUE ),
 
+/* Reported by Ricardo Barberis <ricardo@dattatec.com> */
+UNUSUAL_DEV(  0x0fce, 0xe092, 0x0000, 0x0000,
+                "Sony Ericsson",
+                "P1i",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_IGNORE_RESIDUE ),
+
 /* Reported by Emmanuel Vasilakis <evas@forthnet.gr> */
 UNUSUAL_DEV(  0x0fce, 0xe031, 0x0000, 0x0000,
                 "Sony Ericsson",
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index 5db6b1e489b..a22ccf9485a 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -182,7 +182,7 @@ config FONT_8x8
 
 config FONT_8x16
         bool "VGA 8x16 font" if FONTS
-        depends on FRAMEBUFFER_CONSOLE || SGI_NEWPORT_CONSOLE=y || STI_CONSOLE || USB_SISUSBVGA_CON 
+        depends on FRAMEBUFFER_CONSOLE || SGI_NEWPORT_CONSOLE || STI_CONSOLE || USB_SISUSBVGA_CON
         default y if !SPARC && !FONTS
         help
           This is the "high resolution" font for the VGA frame buffer (the one
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c
index 16bc8d75e36..b21d0dec928 100644
--- a/drivers/video/intelfb/intelfbhw.c
+++ b/drivers/video/intelfb/intelfbhw.c
@@ -924,10 +924,10 @@ calc_pll_params(int index, int clock, u32 *retm1, u32 *retm2, u32 *retn, u32 *re
                         if (m > pll->max_m)
                                 m = pll->max_m - 1;
                         for (testm = m - 1; testm <= m; testm++) {
-                                f_out = calc_vclock3(index, m, n, p);
+                                f_out = calc_vclock3(index, testm, n, p);
                                 if (splitm(index, testm, &m1, &m2)) {
-                                        WRN_MSG("cannot split m = %d\n", m);
-                                        n++;
+                                        WRN_MSG("cannot split m = %d\n",
+                                                testm);
                                         continue;
                                 }
                                 if (clock > f_out)