31 files changed, 370 insertions, 208 deletions

diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index 3548ee7014ca..81b7ae376951 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -574,6 +574,8 @@ static const struct ich_laptop ich_laptop[] = {
         { 0x27DF, 0x1043, 0x1267 },     /* ICH7 on Asus W5F */
         { 0x27DF, 0x103C, 0x30A1 },     /* ICH7 on HP Compaq nc2400 */
         { 0x24CA, 0x1025, 0x0061 },     /* ICH4 on ACER Aspire 2023WLMi */
+        { 0x24CA, 0x1025, 0x003d },     /* ICH4 on ACER TM290 */
+        { 0x266F, 0x1025, 0x0066 },     /* ICH6 on ACER Aspire 1694WLMi */
         { 0x2653, 0x1043, 0x82D8 },     /* ICH6M on Asus Eee 701 */
         /* end marker */
         { 0, }
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index dbf6ca781f66..3ff8b14420d9 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -118,12 +118,62 @@ static void ata_acpi_associate_ide_port(struct ata_port *ap)
                 ap->pflags |= ATA_PFLAG_INIT_GTM_VALID;
 }
 
-static void ata_acpi_handle_hotplug(struct ata_port *ap, struct ata_device
-                                    *dev, u32 event)
+static void ata_acpi_eject_device(acpi_handle handle)
+{
+        struct acpi_object_list arg_list;
+        union acpi_object arg;
+
+        arg_list.count = 1;
+        arg_list.pointer = &arg;
+        arg.type = ACPI_TYPE_INTEGER;
+        arg.integer.value = 1;
+
+        if (ACPI_FAILURE(acpi_evaluate_object(handle, "_EJ0",
+                                              &arg_list, NULL)))
+                printk(KERN_ERR "Failed to evaluate _EJ0!\n");
+}
+
+/* @ap and @dev are the same as ata_acpi_handle_hotplug() */
+static void ata_acpi_detach_device(struct ata_port *ap, struct ata_device *dev)
+{
+        if (dev)
+                dev->flags |= ATA_DFLAG_DETACH;
+        else {
+                struct ata_link *tlink;
+                struct ata_device *tdev;
+
+                ata_port_for_each_link(tlink, ap)
+                        ata_link_for_each_dev(tdev, tlink)
+                                tdev->flags |= ATA_DFLAG_DETACH;
+        }
+
+        ata_port_schedule_eh(ap);
+}
+
+/**
+ * ata_acpi_handle_hotplug - ACPI event handler backend
+ * @ap: ATA port ACPI event occurred
+ * @dev: ATA device ACPI event occurred (can be NULL)
+ * @event: ACPI event which occurred
+ * @is_dock_event: boolean indicating whether the event was a dock one
+ *
+ * All ACPI bay / device realted events end up in this function.  If
+ * the event is port-wide @dev is NULL.  If the event is specific to a
+ * device, @dev points to it.
+ *
+ * Hotplug (as opposed to unplug) notification is always handled as
+ * port-wide while unplug only kills the target device on device-wide
+ * event.
+ *
+ * LOCKING:
+ * ACPI notify handler context.  May sleep.
+ */
+static void ata_acpi_handle_hotplug(struct ata_port *ap, struct ata_device *dev,
+                                    u32 event, int is_dock_event)
 {
         char event_string[12];
         char *envp[] = { event_string, NULL };
-        struct ata_eh_info *ehi;
+        struct ata_eh_info *ehi = &ap->link.eh_info;
         struct kobject *kobj = NULL;
         int wait = 0;
         unsigned long flags;
@@ -131,87 +181,100 @@ static void ata_acpi_handle_hotplug(struct ata_port *ap, struct ata_device
         unsigned long sta;
         acpi_status status;
 
-        if (!ap)
-                ap = dev->link->ap;
-        ehi = &ap->link.eh_info;
-
-        spin_lock_irqsave(ap->lock, flags);
-
-        if (dev)
+        if (dev) {
+                if (dev->sdev)
+                        kobj = &dev->sdev->sdev_gendev.kobj;
                 handle = dev->acpi_handle;
-        else
+        } else {
+                kobj = &ap->dev->kobj;
                 handle = ap->acpi_handle;
+        }
 
         status = acpi_get_handle(handle, "_EJ0", &tmphandle);
-        if (ACPI_FAILURE(status)) {
-                /* This device is not ejectable */
-                spin_unlock_irqrestore(ap->lock, flags);
+        if (ACPI_FAILURE(status))
+                /* This device does not support hotplug */
                 return;
-        }
 
-        status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
-        if (ACPI_FAILURE(status)) {
-                printk ("Unable to determine bay status\n");
-                spin_unlock_irqrestore(ap->lock, flags);
-                return;
-        }
+        spin_lock_irqsave(ap->lock, flags);
 
         switch (event) {
         case ACPI_NOTIFY_BUS_CHECK:
         case ACPI_NOTIFY_DEVICE_CHECK:
                 ata_ehi_push_desc(ehi, "ACPI event");
-                if (!sta) {
-                /* Device has been unplugged */
-                        if (dev)
-                                dev->flags |= ATA_DFLAG_DETACH;
-                        else {
-                                struct ata_link *tlink;
-                                struct ata_device *tdev;
-
-                                ata_port_for_each_link(tlink, ap) {
-                                        ata_link_for_each_dev(tdev, tlink) {
-                                                tdev->flags |=
-                                                        ATA_DFLAG_DETACH;
-                                        }
-                                }
-                        }
-                        ata_port_schedule_eh(ap);
-                        wait = 1;
-                } else {
+
+                status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
+                if (ACPI_FAILURE(status)) {
+                        ata_port_printk(ap, KERN_ERR,
+                                "acpi: failed to determine bay status (0x%x)\n",
+                                status);
+                        break;
+                }
+
+                if (sta) {
                         ata_ehi_hotplugged(ehi);
                         ata_port_freeze(ap);
+                } else {
+                        /* The device has gone - unplug it */
+                        ata_acpi_detach_device(ap, dev);
+                        wait = 1;
                 }
+                break;
+        case ACPI_NOTIFY_EJECT_REQUEST:
+                ata_ehi_push_desc(ehi, "ACPI event");
+
+                if (!is_dock_event)
+                        break;
+
+                /* undock event - immediate unplug */
+                ata_acpi_detach_device(ap, dev);
+                wait = 1;
+                break;
         }
 
+        /* make sure kobj doesn't go away while ap->lock is released */
+        kobject_get(kobj);
+
         spin_unlock_irqrestore(ap->lock, flags);
 
-        if (wait)
+        if (wait) {
                 ata_port_wait_eh(ap);
+                ata_acpi_eject_device(handle);
+        }
 
-        if (dev) {
-                if (dev->sdev)
-                        kobj = &dev->sdev->sdev_gendev.kobj;
-        } else
-                kobj = &ap->dev->kobj;
-
-        if (kobj) {
+        if (kobj && !is_dock_event) {
                 sprintf(event_string, "BAY_EVENT=%d", event);
                 kobject_uevent_env(kobj, KOBJ_CHANGE, envp);
         }
+
+        kobject_put(kobj);
+}
+
+static void ata_acpi_dev_notify_dock(acpi_handle handle, u32 event, void *data)
+{
+        struct ata_device *dev = data;
+
+        ata_acpi_handle_hotplug(dev->link->ap, dev, event, 1);
+}
+
+static void ata_acpi_ap_notify_dock(acpi_handle handle, u32 event, void *data)
+{
+        struct ata_port *ap = data;
+
+        ata_acpi_handle_hotplug(ap, NULL, event, 1);
 }
 
 static void ata_acpi_dev_notify(acpi_handle handle, u32 event, void *data)
 {
         struct ata_device *dev = data;
 
-        ata_acpi_handle_hotplug(NULL, dev, event);
+        ata_acpi_handle_hotplug(dev->link->ap, dev, event, 0);
 }
 
 static void ata_acpi_ap_notify(acpi_handle handle, u32 event, void *data)
 {
         struct ata_port *ap = data;
 
-        ata_acpi_handle_hotplug(ap, NULL, event);
+        ata_acpi_handle_hotplug(ap, NULL, event, 0);
 }
 
 /**
@@ -252,7 +315,7 @@ void ata_acpi_associate(struct ata_host *host)
                                                     ata_acpi_ap_notify, ap);
                         /* we might be on a docking station */
                         register_hotplug_dock_device(ap->acpi_handle,
-                                                     ata_acpi_ap_notify, ap);
+                                             ata_acpi_ap_notify_dock, ap);
                 }
 
                 for (j = 0; j < ata_link_max_devices(&ap->link); j++) {
@@ -264,7 +327,7 @@ void ata_acpi_associate(struct ata_host *host)
                                                 ata_acpi_dev_notify, dev);
                                 /* we might be on a docking station */
                                 register_hotplug_dock_device(dev->acpi_handle,
-                                                ata_acpi_dev_notify, dev);
+                                             ata_acpi_dev_notify_dock, dev);
                         }
                 }
         }
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 3c2d2289f85e..90d20c615ef5 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -247,7 +247,7 @@ u8 ata_sff_check_status(struct ata_port *ap)
  *      LOCKING:
  *      Inherited from caller.
  */
-u8 ata_sff_altstatus(struct ata_port *ap)
+static u8 ata_sff_altstatus(struct ata_port *ap)
 {
         if (ap->ops->sff_check_altstatus)
                 return ap->ops->sff_check_altstatus(ap);
@@ -256,6 +256,93 @@ u8 ata_sff_altstatus(struct ata_port *ap)
 }
 
 /**
+ *      ata_sff_irq_status - Check if the device is busy
+ *      @ap: port where the device is
+ *
+ *      Determine if the port is currently busy. Uses altstatus
+ *      if available in order to avoid clearing shared IRQ status
+ *      when finding an IRQ source. Non ctl capable devices don't
+ *      share interrupt lines fortunately for us.
+ *
+ *      LOCKING:
+ *      Inherited from caller.
+ */
+static u8 ata_sff_irq_status(struct ata_port *ap)
+{
+        u8 status;
+
+        if (ap->ops->sff_check_altstatus || ap->ioaddr.altstatus_addr) {
+                status = ata_sff_altstatus(ap);
+                /* Not us: We are busy */
+                if (status & ATA_BUSY)
+                        return status;
+        }
+        /* Clear INTRQ latch */
+        status = ata_sff_check_status(ap);
+        return status;
+}
+
+/**
+ *      ata_sff_sync - Flush writes
+ *      @ap: Port to wait for.
+ *
+ *      CAUTION:
+ *      If we have an mmio device with no ctl and no altstatus
+ *      method this will fail. No such devices are known to exist.
+ *
+ *      LOCKING:
+ *      Inherited from caller.
+ */
+
+static void ata_sff_sync(struct ata_port *ap)
+{
+        if (ap->ops->sff_check_altstatus)
+                ap->ops->sff_check_altstatus(ap);
+        else if (ap->ioaddr.altstatus_addr)
+                ioread8(ap->ioaddr.altstatus_addr);
+}
+
+/**
+ *      ata_sff_pause           -       Flush writes and wait 400nS
+ *      @ap: Port to pause for.
+ *
+ *      CAUTION:
+ *      If we have an mmio device with no ctl and no altstatus
+ *      method this will fail. No such devices are known to exist.
+ *
+ *      LOCKING:
+ *      Inherited from caller.
+ */
+
+void ata_sff_pause(struct ata_port *ap)
+{
+        ata_sff_sync(ap);
+        ndelay(400);
+}
+
+/**
+ *      ata_sff_dma_pause       -       Pause before commencing DMA
+ *      @ap: Port to pause for.
+ *
+ *      Perform I/O fencing and ensure sufficient cycle delays occur
+ *      for the HDMA1:0 transition
+ */
+ 
+void ata_sff_dma_pause(struct ata_port *ap)
+{
+        if (ap->ops->sff_check_altstatus || ap->ioaddr.altstatus_addr) {
+                /* An altstatus read will cause the needed delay without
+                   messing up the IRQ status */
+                ata_sff_altstatus(ap);
+                return;
+        }
+        /* There are no DMA controllers without ctl. BUG here to ensure
+           we never violate the HDMA1:0 transition timing and risk
+           corruption. */
+        BUG();
+}
+
+/**
  *      ata_sff_busy_sleep - sleep until BSY clears, or timeout
  *      @ap: port containing status register to be polled
  *      @tmout_pat: impatience timeout
@@ -742,7 +829,7 @@ static void ata_pio_sectors(struct ata_queued_cmd *qc)
         } else
                 ata_pio_sector(qc);
 
-        ata_sff_altstatus(qc->ap); /* flush */
+        ata_sff_sync(qc->ap); /* flush */
 }
 
 /**
@@ -763,8 +850,9 @@ static void atapi_send_cdb(struct ata_port *ap, struct ata_queued_cmd *qc)
         WARN_ON(qc->dev->cdb_len < 12);
 
         ap->ops->sff_data_xfer(qc->dev, qc->cdb, qc->dev->cdb_len, 1);
-        ata_sff_altstatus(ap); /* flush */
-
+        ata_sff_sync(ap);
+        /* FIXME: If the CDB is for DMA do we need to do the transition delay
+           or is bmdma_start guaranteed to do it ? */
         switch (qc->tf.protocol) {
         case ATAPI_PROT_PIO:
                 ap->hsm_task_state = HSM_ST;
@@ -905,7 +993,7 @@ static void atapi_pio_bytes(struct ata_queued_cmd *qc)
 
         if (unlikely(__atapi_pio_bytes(qc, bytes)))
                 goto err_out;
-        ata_sff_altstatus(ap); /* flush */
+        ata_sff_sync(ap); /* flush */
 
         return;
 
@@ -1489,14 +1577,10 @@ inline unsigned int ata_sff_host_intr(struct ata_port *ap,
                 goto idle_irq;
         }
 
-        /* check altstatus */
-        status = ata_sff_altstatus(ap);
-        if (status & ATA_BUSY)
-                goto idle_irq;
 
-        /* check main status, clearing INTRQ */
-        status = ap->ops->sff_check_status(ap);
-        if (unlikely(status & ATA_BUSY))
+        /* check main status, clearing INTRQ if needed */
+        status = ata_sff_irq_status(ap);
+        if (status & ATA_BUSY)
                 goto idle_irq;
 
         /* ack bmdma irq events */
@@ -2030,7 +2114,7 @@ void ata_sff_error_handler(struct ata_port *ap)
                 ap->ops->bmdma_stop(qc);
         }
 
-        ata_sff_altstatus(ap);
+        ata_sff_sync(ap);               /* FIXME: We don't need this */
         ap->ops->sff_check_status(ap);
         ap->ops->sff_irq_clear(ap);
 
@@ -2203,7 +2287,7 @@ void ata_bmdma_stop(struct ata_queued_cmd *qc)
                  mmio + ATA_DMA_CMD);
 
         /* one-PIO-cycle guaranteed wait, per spec, for HDMA1:0 transition */
-        ata_sff_altstatus(ap);        /* dummy read */
+        ata_sff_dma_pause(ap);
 }
 
 /**
@@ -2722,7 +2806,8 @@ EXPORT_SYMBOL_GPL(ata_sff_qc_prep);
 EXPORT_SYMBOL_GPL(ata_sff_dumb_qc_prep);
 EXPORT_SYMBOL_GPL(ata_sff_dev_select);
 EXPORT_SYMBOL_GPL(ata_sff_check_status);
-EXPORT_SYMBOL_GPL(ata_sff_altstatus);
+EXPORT_SYMBOL_GPL(ata_sff_dma_pause);
+EXPORT_SYMBOL_GPL(ata_sff_pause);
 EXPORT_SYMBOL_GPL(ata_sff_busy_sleep);
 EXPORT_SYMBOL_GPL(ata_sff_wait_ready);
 EXPORT_SYMBOL_GPL(ata_sff_tf_load);
diff --git a/drivers/ata/pata_icside.c b/drivers/ata/pata_icside.c
index 17138436423d..cf9e9848f8b5 100644
--- a/drivers/ata/pata_icside.c
+++ b/drivers/ata/pata_icside.c
@@ -270,7 +270,7 @@ static void pata_icside_bmdma_stop(struct ata_queued_cmd *qc)
         disable_dma(state->dma);
 
         /* see ata_bmdma_stop */
-        ata_sff_altstatus(ap);
+        ata_sff_dma_pause(ap);
 }
 
 static u8 pata_icside_bmdma_status(struct ata_port *ap)
diff --git a/drivers/ata/pata_rb532_cf.c b/drivers/ata/pata_rb532_cf.c
index a108d259f19d..f8b3ffc8ae9e 100644
--- a/drivers/ata/pata_rb532_cf.c
+++ b/drivers/ata/pata_rb532_cf.c
@@ -57,7 +57,9 @@ static inline void rb532_pata_finish_io(struct ata_port *ap)
         struct ata_host *ah = ap->host;
         struct rb532_cf_info *info = ah->private_data;
 
-        ata_sff_altstatus(ap);
+        /* FIXME: Keep previous delay. If this is merely a fence then
+           ata_sff_sync might be sufficient. */
+        ata_sff_dma_pause(ap);
         ndelay(RB500_CF_IO_DELAY);
 
         set_irq_type(info->irq, IRQ_TYPE_LEVEL_HIGH);
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
index e965b251ca24..bbf5aa345e68 100644
--- a/drivers/ata/pata_scc.c
+++ b/drivers/ata/pata_scc.c
@@ -726,7 +726,7 @@ static void scc_bmdma_stop (struct ata_queued_cmd *qc)
                  in_be32(bmid_base + SCC_DMA_CMD) & ~ATA_DMA_START);
 
         /* one-PIO-cycle guaranteed wait, per spec, for HDMA1:0 transition */
-        ata_sff_altstatus(ap);  /* dummy read */
+        ata_sff_dma_pause(ap);  /* dummy read */
 }
 
 /**
@@ -747,7 +747,8 @@ static u8 scc_bmdma_status (struct ata_port *ap)
                 return host_stat;
 
         /* errata A252,A308 workaround: Step4 */
-        if ((ata_sff_altstatus(ap) & ATA_ERR) && (int_status & INTSTS_INTRQ))
+        if ((scc_check_altstatus(ap) & ATA_ERR)
+                                        && (int_status & INTSTS_INTRQ))
                 return (host_stat | ATA_DMA_INTR);
 
         /* errata A308 workaround Step5 */
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index acf347f71a2f..60391e9a84db 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -224,6 +224,11 @@ enum {
 
         PHY_MODE3               = 0x310,
         PHY_MODE4               = 0x314,
+        PHY_MODE4_CFG_MASK      = 0x00000003,   /* phy internal config field */
+        PHY_MODE4_CFG_VALUE     = 0x00000001,   /* phy internal config field */
+        PHY_MODE4_RSVD_ZEROS    = 0x5de3fffa,   /* Gen2e always write zeros */
+        PHY_MODE4_RSVD_ONES     = 0x00000005,   /* Gen2e always write ones */
+
         PHY_MODE2               = 0x330,
         SATA_IFCTL_OFS          = 0x344,
         SATA_TESTCTL_OFS        = 0x348,
@@ -2563,17 +2568,16 @@ static void mv6_phy_errata(struct mv_host_priv *hpriv, void __iomem *mmio,
                 m3 &= ~0x1c;
 
         if (fix_phy_mode4) {
-                u32 m4;
-
-                m4 = readl(port_mmio + PHY_MODE4);
-
-                /* workaround for errata FEr SATA#10 (part 1) */
-                m4 = (m4 & ~(1 << 1)) | (1 << 0);
-
-                /* enforce bit restrictions on GenIIe devices */
+                u32 m4 = readl(port_mmio + PHY_MODE4);
+                /*
+                 * Enforce reserved-bit restrictions on GenIIe devices only.
+                 * For earlier chipsets, force only the internal config field
+                 *  (workaround for errata FEr SATA#10 part 1).
+                 */
                 if (IS_GEN_IIE(hpriv))
-                        m4 = (m4 & ~0x5DE3FFFC) | (1 << 2);
-
+                        m4 = (m4 & ~PHY_MODE4_RSVD_ZEROS) | PHY_MODE4_RSVD_ONES;
+                else
+                        m4 = (m4 & ~PHY_MODE4_CFG_MASK) | PHY_MODE4_CFG_VALUE;
                 writel(m4, port_mmio + PHY_MODE4);
         }
         /*
diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
index 5c006c9a4311..c9416e657487 100644
--- a/drivers/hwmon/ibmaem.c
+++ b/drivers/hwmon/ibmaem.c
@@ -189,8 +189,8 @@ static struct aem_iana_id system_x_id = {
 struct aem_find_firmware_req {
         struct aem_iana_id      id;
         u8                      rsvd;
-        u16                     index;
-        u16                     module_type_id;
+        __be16                  index;
+        __be16                  module_type_id;
 } __packed;
 
 struct aem_find_firmware_resp {
@@ -202,7 +202,7 @@ struct aem_find_firmware_resp {
 struct aem_find_instance_req {
         struct aem_iana_id      id;
         u8                      instance_number;
-        u16                     module_type_id;
+        __be16                  module_type_id;
 } __packed;
 
 struct aem_find_instance_resp {
@@ -444,17 +444,17 @@ static int aem_read_sensor(struct aem_data *data, u8 elt, u8 reg,
         }
         case 2: {
                 u16 *x = buf;
-                *x = be16_to_cpup((u16 *)rs_resp->bytes);
+                *x = be16_to_cpup((__be16 *)rs_resp->bytes);
                 break;
         }
         case 4: {
                 u32 *x = buf;
-                *x = be32_to_cpup((u32 *)rs_resp->bytes);
+                *x = be32_to_cpup((__be32 *)rs_resp->bytes);
                 break;
         }
         case 8: {
                 u64 *x = buf;
-                *x = be64_to_cpup((u64 *)rs_resp->bytes);
+                *x = be64_to_cpup((__be64 *)rs_resp->bytes);
                 break;
         }
         }
diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c
index 3cdd4e962115..1e24ab4ac38c 100644
--- a/drivers/message/fusion/mptfc.c
+++ b/drivers/message/fusion/mptfc.c
@@ -1238,8 +1238,6 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         sh->max_id = ioc->pfacts->MaxDevices;
         sh->max_lun = max_lun;
 
-        sh->this_id = ioc->pfacts[0].PortSCSIID;
-
         /* Required entry.
          */
         sh->unique_id = ioc->id;
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index 468480771f13..4d492ba232b0 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -3193,8 +3193,6 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
         sh->transportt = mptsas_transport_template;
 
-        sh->this_id = ioc->pfacts[0].PortSCSIID;
-
         /* Required entry.
          */
         sh->unique_id = ioc->id;
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index b109bd8a4d19..c68ef00c2f92 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -2451,12 +2451,6 @@ mptscsih_slave_configure(struct scsi_device *sdev)
                     ioc->name, sdev->sdtr, sdev->wdtr,
                     sdev->ppr, sdev->inquiry_len));
 
-        if (sdev->id > sh->max_id) {
-                /* error case, should never happen */
-                scsi_adjust_queue_depth(sdev, 0, 1);
-                goto slave_configure_exit;
-        }
-
         vdevice->configured_lun = 1;
         mptscsih_change_queue_depth(sdev, MPT_SCSI_CMD_PER_DEV_HIGH);
 
@@ -2470,8 +2464,6 @@ mptscsih_slave_configure(struct scsi_device *sdev)
                     ioc->name, vtarget->negoFlags, vtarget->maxOffset,
                     vtarget->minSyncFactor));
 
-slave_configure_exit:
-
         dsprintk(ioc, printk(MYIOC_s_DEBUG_FMT
                 "tagged %d, simple %d, ordered %d\n",
                 ioc->name,sdev->tagged_supported, sdev->simple_tags,
diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
index fa394104339c..e4ff50b95a5e 100644
--- a/drivers/misc/kgdbts.c
+++ b/drivers/misc/kgdbts.c
@@ -102,7 +102,6 @@
 #include <linux/nmi.h>
 #include <linux/delay.h>
 #include <linux/kthread.h>
-#include <linux/delay.h>
 
 #define v1printk(a...) do { \
         if (verbose) \
@@ -119,7 +118,6 @@
         } while (0)
 #define MAX_CONFIG_LEN          40
 
-static const char hexchars[] = "0123456789abcdef";
 static struct kgdb_io kgdbts_io_ops;
 static char get_buf[BUFMAX];
 static int get_buf_cnt;
@@ -131,6 +129,8 @@ static int repeat_test;
 static int test_complete;
 static int send_ack;
 static int final_ack;
+static int force_hwbrks;
+static int hwbreaks_ok;
 static int hw_break_val;
 static int hw_break_val2;
 #if defined(CONFIG_ARM) || defined(CONFIG_MIPS) || defined(CONFIG_SPARC)
@@ -234,12 +234,12 @@ static void break_helper(char *bp_type, char *arg, unsigned long vaddr)
 
 static void sw_break(char *arg)
 {
-        break_helper("Z0", arg, 0);
+        break_helper(force_hwbrks ? "Z1" : "Z0", arg, 0);
 }
 
 static void sw_rem_break(char *arg)
 {
-        break_helper("z0", arg, 0);
+        break_helper(force_hwbrks ? "z1" : "z0", arg, 0);
 }
 
 static void hw_break(char *arg)
@@ -619,8 +619,8 @@ static void fill_get_buf(char *buf)
                 count++;
         }
         strcat(get_buf, "#");
-        get_buf[count + 2] = hexchars[checksum >> 4];
-        get_buf[count + 3] = hexchars[checksum & 0xf];
+        get_buf[count + 2] = hex_asc_hi(checksum);
+        get_buf[count + 3] = hex_asc_lo(checksum);
         get_buf[count + 4] = '\0';
         v2printk("get%i: %s\n", ts.idx, get_buf);
 }
@@ -781,6 +781,8 @@ static void run_breakpoint_test(int is_hw_breakpoint)
                 return;
 
         eprintk("kgdbts: ERROR %s test failed\n", ts.name);
+        if (is_hw_breakpoint)
+                hwbreaks_ok = 0;
 }
 
 static void run_hw_break_test(int is_write_test)
@@ -798,9 +800,11 @@ static void run_hw_break_test(int is_write_test)
         kgdb_breakpoint();
         hw_break_val_access();
         if (is_write_test) {
-                if (test_complete == 2)
+                if (test_complete == 2) {
                         eprintk("kgdbts: ERROR %s broke on access\n",
                                 ts.name);
+                        hwbreaks_ok = 0;
+                }
                 hw_break_val_write();
         }
         kgdb_breakpoint();
@@ -809,6 +813,7 @@ static void run_hw_break_test(int is_write_test)
                 return;
 
         eprintk("kgdbts: ERROR %s test failed\n", ts.name);
+        hwbreaks_ok = 0;
 }
 
 static void run_nmi_sleep_test(int nmi_sleep)
@@ -912,6 +917,7 @@ static void kgdbts_run_tests(void)
 
         /* All HW break point tests */
         if (arch_kgdb_ops.flags & KGDB_HW_BREAKPOINT) {
+                hwbreaks_ok = 1;
                 v1printk("kgdbts:RUN hw breakpoint test\n");
                 run_breakpoint_test(1);
                 v1printk("kgdbts:RUN hw write breakpoint test\n");
@@ -925,6 +931,19 @@ static void kgdbts_run_tests(void)
                 run_nmi_sleep_test(nmi_sleep);
         }
 
+#ifdef CONFIG_DEBUG_RODATA
+        /* Until there is an api to write to read-only text segments, use
+         * HW breakpoints for the remainder of any tests, else print a
+         * failure message if hw breakpoints do not work.
+         */
+        if (!(arch_kgdb_ops.flags & KGDB_HW_BREAKPOINT && hwbreaks_ok)) {
+                eprintk("kgdbts: HW breakpoints do not work,"
+                        "skipping remaining tests\n");
+                return;
+        }
+        force_hwbrks = 1;
+#endif /* CONFIG_DEBUG_RODATA */
+
         /* If the do_fork test is run it will be the last test that is
          * executed because a kernel thread will be spawned at the very
          * end to unregister the debug hooks.
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index a20693e09ae8..b5c1e663417d 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -2861,7 +2861,8 @@ static int s2io_poll_msix(struct napi_struct *napi, int budget)
         struct config_param *config;
         struct mac_info *mac_control;
         int pkts_processed = 0;
-        u8 *addr = NULL, val8 = 0;
+        u8 __iomem *addr = NULL;
+        u8 val8 = 0;
         struct s2io_nic *nic = dev->priv;
         struct XENA_dev_config __iomem *bar0 = nic->bar0;
         int budget_org = budget;
@@ -2878,7 +2879,7 @@ static int s2io_poll_msix(struct napi_struct *napi, int budget)
         if (pkts_processed < budget_org) {
                 netif_rx_complete(dev, napi);
                 /*Re Enable MSI-Rx Vector*/
-                addr = (u8 *)&bar0->xmsi_mask_reg;
+                addr = (u8 __iomem *)&bar0->xmsi_mask_reg;
                 addr += 7 - ring->ring_no;
                 val8 = (ring->ring_no == 0) ? 0x3f : 0xbf;
                 writeb(val8, addr);
@@ -4364,9 +4365,10 @@ static irqreturn_t s2io_msix_ring_handle(int irq, void *dev_id)
                 return IRQ_HANDLED;
 
         if (sp->config.napi) {
-                u8 *addr = NULL, val8 = 0;
+                u8 __iomem *addr = NULL;
+                u8 val8 = 0;
 
-                addr = (u8 *)&bar0->xmsi_mask_reg;
+                addr = (u8 __iomem *)&bar0->xmsi_mask_reg;
                 addr += (7 - ring->ring_no);
                 val8 = (ring->ring_no == 0) ? 0x7f : 0xff;
                 writeb(val8, addr);
diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index e2b7de4cb05e..1ff3bb585ab2 100644
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -286,7 +286,7 @@ static void quirk_system_pci_resources(struct pnp_dev *dev)
                                         pci_name(pdev), i,
                                         (unsigned long long) pci_start,
                                         (unsigned long long) pci_end);
-                                res->flags = 0;
+                                res->flags |= IORESOURCE_DISABLED;
                         }
                 }
         }
diff --git a/drivers/pnp/system.c b/drivers/pnp/system.c
index 9c2496dbeee4..8f0a570509c5 100644
--- a/drivers/pnp/system.c
+++ b/drivers/pnp/system.c
@@ -81,7 +81,7 @@ static void reserve_resources_of_dev(struct pnp_dev *dev)
         }
 
         for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_MEM, i)); i++) {
-                if (res->flags & IORESOURCE_UNSET)
+                if (res->flags & IORESOURCE_DISABLED)
                         continue;
 
                 reserve_range(dev, res->start, res->end, 0);
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index ccfd8aca3765..5d23368a1bce 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -1348,7 +1348,7 @@ void ibmvscsi_handle_crq(struct viosrp_crq *crq,
 
         del_timer(&evt_struct->timer);
 
-        if (crq->status != VIOSRP_OK && evt_struct->cmnd)
+        if ((crq->status != VIOSRP_OK && crq->status != VIOSRP_OK2) && evt_struct->cmnd)
                 evt_struct->cmnd->result = DID_ERROR << 16;
         if (evt_struct->done)
                 evt_struct->done(evt_struct);
diff --git a/drivers/scsi/ibmvscsi/viosrp.h b/drivers/scsi/ibmvscsi/viosrp.h
index 4c4aadb3e405..204604501ad8 100644
--- a/drivers/scsi/ibmvscsi/viosrp.h
+++ b/drivers/scsi/ibmvscsi/viosrp.h
@@ -65,7 +65,8 @@ enum viosrp_crq_status {
         VIOSRP_VIOLATES_MAX_XFER = 0x2,
         VIOSRP_PARTNER_PANIC = 0x3,
         VIOSRP_DEVICE_BUSY = 0x8,
-        VIOSRP_ADAPTER_FAIL = 0x10
+        VIOSRP_ADAPTER_FAIL = 0x10,
+        VIOSRP_OK2 = 0x99,
 };
 
 struct viosrp_crq {
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index 287690853caf..8dd88fc1244a 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -70,6 +70,9 @@ qla2x00_sysfs_write_fw_dump(struct kobject *kobj,
         case 2:
                 qla2x00_alloc_fw_dump(ha);
                 break;
+        case 3:
+                qla2x00_system_error(ha);
+                break;
         }
         return (count);
 }
@@ -886,9 +889,13 @@ qla2x00_get_host_speed(struct Scsi_Host *shost)
 static void
 qla2x00_get_host_port_type(struct Scsi_Host *shost)
 {
-        scsi_qla_host_t *ha = to_qla_parent(shost_priv(shost));
+        scsi_qla_host_t *ha = shost_priv(shost);
         uint32_t port_type = FC_PORTTYPE_UNKNOWN;
 
+        if (ha->parent) {
+                fc_host_port_type(shost) = FC_PORTTYPE_NPIV;
+                return;
+        }
         switch (ha->current_topology) {
         case ISP_CFG_NL:
                 port_type = FC_PORTTYPE_LPORT;
@@ -1172,10 +1179,10 @@ qla24xx_vport_delete(struct fc_vport *fc_vport)
         qla24xx_disable_vp(vha);
         qla24xx_deallocate_vp_id(vha);
 
-        down(&ha->vport_sem);
+        mutex_lock(&ha->vport_lock);
         ha->cur_vport_count--;
         clear_bit(vha->vp_idx, ha->vp_idx_map);
-        up(&ha->vport_sem);
+        mutex_unlock(&ha->vport_lock);
 
         kfree(vha->node_name);
         kfree(vha->port_name);
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 299eccf6cabd..8dd600013bd1 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -2457,7 +2457,7 @@ typedef struct scsi_qla_host {
 #define MBX_INTR_WAIT   2
 #define MBX_UPDATE_FLASH_ACTIVE 3
 
-        struct semaphore vport_sem;     /* Virtual port synchronization */
+        struct mutex vport_lock;        /* Virtual port synchronization */
         struct completion mbx_cmd_comp; /* Serialize mbx access */
         struct completion mbx_intr_comp;  /* Used for completion notification */
 
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index f8827068d30f..9b4bebee6879 100644
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -228,6 +228,9 @@ extern int qla24xx_abort_target(struct fc_port *, unsigned int);
 extern int qla24xx_lun_reset(struct fc_port *, unsigned int);
 
 extern int
+qla2x00_system_error(scsi_qla_host_t *);
+
+extern int
 qla2x00_set_serdes_params(scsi_qla_host_t *, uint16_t, uint16_t, uint16_t);
 
 extern int
diff --git a/drivers/scsi/qla2xxx/qla_inline.h b/drivers/scsi/qla2xxx/qla_inline.h
index e9bae27737d1..92fafbdbbaab 100644
--- a/drivers/scsi/qla2xxx/qla_inline.h
+++ b/drivers/scsi/qla2xxx/qla_inline.h
@@ -34,7 +34,11 @@ qla2x00_debounce_register(volatile uint16_t __iomem *addr)
 static inline void
 qla2x00_poll(scsi_qla_host_t *ha)
 {
+        unsigned long flags;
+
+        local_irq_save(flags);
         ha->isp_ops->intr_handler(0, ha);
+        local_irq_restore(flags);
 }
 
 static __inline__ scsi_qla_host_t *
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 5d9a64a7879b..ec63b79f900a 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -272,8 +272,6 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
         uint32_t        rscn_entry, host_pid;
         uint8_t         rscn_queue_index;
         unsigned long   flags;
-        scsi_qla_host_t *vha;
-        int             i;
 
         /* Setup to process RIO completion. */
         handle_cnt = 0;
@@ -544,18 +542,10 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
                 break;
 
         case MBA_PORT_UPDATE:           /* Port database update */
-                if ((ha->flags.npiv_supported) && (ha->num_vhosts)) {
-                        for_each_mapped_vp_idx(ha, i) {
-                                list_for_each_entry(vha, &ha->vp_list,
-                                    vp_list) {
-                                        if ((mb[3] & 0xff)
-                                            == vha->vp_idx) {
-                                                ha = vha;
-                                                break;
-                                        }
-                                }
-                        }
-                }
+                /* Only handle SCNs for our Vport index. */
+                if (ha->parent && ha->vp_idx != (mb[3] & 0xff))
+                        break;
+
                 /*
                  * If PORT UPDATE is global (recieved LIP_OCCURED/LIP_RESET
                  * event etc. earlier indicating loop is down) then process
@@ -590,18 +580,12 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
                 break;
 
         case MBA_RSCN_UPDATE:           /* State Change Registration */
-                if ((ha->flags.npiv_supported) && (ha->num_vhosts)) {
-                        for_each_mapped_vp_idx(ha, i) {
-                                list_for_each_entry(vha, &ha->vp_list,
-                                    vp_list) {
-                                        if ((mb[3] & 0xff)
-                                            == vha->vp_idx) {
-                                                ha = vha;
-                                                break;
-                                        }
-                                }
-                        }
-                }
+                /* Check if the Vport has issued a SCR */
+                if (ha->parent && test_bit(VP_SCR_NEEDED, &ha->vp_flags))
+                        break;
+                /* Only handle SCNs for our Vport index. */
+                if (ha->parent && ha->vp_idx != (mb[3] & 0xff))
+                        break;
 
                 DEBUG2(printk("scsi(%ld): Asynchronous RSCR UPDATE.\n",
                     ha->host_no));
@@ -1132,25 +1116,6 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)
                                 break;
 
                         qla2x00_handle_sense(sp, sense_data, sense_len);
-
-                        /*
-                         * In case of a Underrun condition, set both the lscsi
-                         * status and the completion status to appropriate
-                         * values.
-                         */
-                        if (resid &&
-                            ((unsigned)(scsi_bufflen(cp) - resid) <
-                             cp->underflow)) {
-                                DEBUG2(qla_printk(KERN_INFO, ha,
-                                    "scsi(%ld:%d:%d:%d): Mid-layer underflow "
-                                    "detected (%x of %x bytes)...returning "
-                                    "error status.\n", ha->host_no,
-                                    cp->device->channel, cp->device->id,
-                                    cp->device->lun, resid,
-                                    scsi_bufflen(cp)));
-
-                                cp->result = DID_ERROR << 16 | lscsi_status;
-                        }
                 } else {
                         /*
                          * If RISC reports underrun and target does not report
@@ -1639,12 +1604,12 @@ qla24xx_msix_rsp_q(int irq, void *dev_id)
         ha = dev_id;
         reg = &ha->iobase->isp24;
 
-        spin_lock(&ha->hardware_lock);
+        spin_lock_irq(&ha->hardware_lock);
 
         qla24xx_process_response_queue(ha);
         WRT_REG_DWORD(&reg->hccr, HCCRX_CLR_RISC_INT);
 
-        spin_unlock(&ha->hardware_lock);
+        spin_unlock_irq(&ha->hardware_lock);
 
         return IRQ_HANDLED;
 }
@@ -1663,7 +1628,7 @@ qla24xx_msix_default(int irq, void *dev_id)
         reg = &ha->iobase->isp24;
         status = 0;
 
-        spin_lock(&ha->hardware_lock);
+        spin_lock_irq(&ha->hardware_lock);
         do {
                 stat = RD_REG_DWORD(&reg->host_status);
                 if (stat & HSRX_RISC_PAUSED) {
@@ -1716,7 +1681,7 @@ qla24xx_msix_default(int irq, void *dev_id)
                 }
                 WRT_REG_DWORD(&reg->hccr, HCCRX_CLR_RISC_INT);
         } while (0);
-        spin_unlock(&ha->hardware_lock);
+        spin_unlock_irq(&ha->hardware_lock);
 
         if (test_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags) &&
             (status & MBX_INTERRUPT) && ha->flags.mbox_int) {
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 210060420809..250d2f604397 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -2303,8 +2303,6 @@ qla24xx_lun_reset(struct fc_port *fcport, unsigned int l)
         return __qla24xx_issue_tmf("Lun", TCF_LUN_RESET, fcport, l);
 }
 
-#if 0
-
 int
 qla2x00_system_error(scsi_qla_host_t *ha)
 {
@@ -2312,7 +2310,7 @@ qla2x00_system_error(scsi_qla_host_t *ha)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        if (!IS_FWI2_CAPABLE(ha))
+        if (!IS_QLA23XX(ha) && !IS_FWI2_CAPABLE(ha))
                 return QLA_FUNCTION_FAILED;
 
         DEBUG11(printk("%s(%ld): entered.\n", __func__, ha->host_no));
@@ -2334,8 +2332,6 @@ qla2x00_system_error(scsi_qla_host_t *ha)
         return rval;
 }
 
-#endif  /*  0  */
-
 /**
  * qla2x00_set_serdes_params() -
  * @ha: HA context
@@ -2508,7 +2504,7 @@ qla2x00_enable_fce_trace(scsi_qla_host_t *ha, dma_addr_t fce_dma,
                 if (mb)
                         memcpy(mb, mcp->mb, 8 * sizeof(*mb));
                 if (dwords)
-                        *dwords = mcp->mb[6];
+                        *dwords = buffers;
         }
 
         return rval;
@@ -2807,9 +2803,9 @@ qla24xx_control_vp(scsi_qla_host_t *vha, int cmd)
          */
         map = (vp_index - 1) / 8;
         pos = (vp_index - 1) & 7;
-        down(&ha->vport_sem);
+        mutex_lock(&ha->vport_lock);
         vce->vp_idx_map[map] |= 1 << pos;
-        up(&ha->vport_sem);
+        mutex_unlock(&ha->vport_lock);
 
         rval = qla2x00_issue_iocb(ha, vce, vce_dma, 0);
         if (rval != QLA_SUCCESS) {
diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c
index f2b04979e5f0..62a3ad6e8ecb 100644
--- a/drivers/scsi/qla2xxx/qla_mid.c
+++ b/drivers/scsi/qla2xxx/qla_mid.c
@@ -32,12 +32,12 @@ qla24xx_allocate_vp_id(scsi_qla_host_t *vha)
         scsi_qla_host_t *ha = vha->parent;
 
         /* Find an empty slot and assign an vp_id */
-        down(&ha->vport_sem);
+        mutex_lock(&ha->vport_lock);
         vp_id = find_first_zero_bit(ha->vp_idx_map, ha->max_npiv_vports + 1);
         if (vp_id > ha->max_npiv_vports) {
                 DEBUG15(printk ("vp_id %d is bigger than max-supported %d.\n",
                     vp_id, ha->max_npiv_vports));
-                up(&ha->vport_sem);
+                mutex_unlock(&ha->vport_lock);
                 return vp_id;
         }
 
@@ -45,7 +45,7 @@ qla24xx_allocate_vp_id(scsi_qla_host_t *vha)
         ha->num_vhosts++;
         vha->vp_idx = vp_id;
         list_add_tail(&vha->vp_list, &ha->vp_list);
-        up(&ha->vport_sem);
+        mutex_unlock(&ha->vport_lock);
         return vp_id;
 }
 
@@ -55,12 +55,12 @@ qla24xx_deallocate_vp_id(scsi_qla_host_t *vha)
         uint16_t vp_id;
         scsi_qla_host_t *ha = vha->parent;
 
-        down(&ha->vport_sem);
+        mutex_lock(&ha->vport_lock);
         vp_id = vha->vp_idx;
         ha->num_vhosts--;
         clear_bit(vp_id, ha->vp_idx_map);
         list_del(&vha->vp_list);
-        up(&ha->vport_sem);
+        mutex_unlock(&ha->vport_lock);
 }
 
 static scsi_qla_host_t *
@@ -145,9 +145,9 @@ qla24xx_enable_vp(scsi_qla_host_t *vha)
         }
 
         /* Initialize the new vport unless it is a persistent port */
-        down(&ha->vport_sem);
+        mutex_lock(&ha->vport_lock);
         ret = qla24xx_modify_vp_config(vha);
-        up(&ha->vport_sem);
+        mutex_unlock(&ha->vport_lock);
 
         if (ret != QLA_SUCCESS) {
                 fc_vport_set_state(vha->fc_vport, FC_VPORT_FAILED);
@@ -406,6 +406,7 @@ qla24xx_create_vhost(struct fc_vport *fc_vport)
         INIT_LIST_HEAD(&vha->list);
         INIT_LIST_HEAD(&vha->fcports);
         INIT_LIST_HEAD(&vha->vp_fcports);
+        INIT_LIST_HEAD(&vha->work_list);
 
         vha->dpc_flags = 0L;
         set_bit(REGISTER_FDMI_NEEDED, &vha->dpc_flags);
@@ -437,10 +438,10 @@ qla24xx_create_vhost(struct fc_vport *fc_vport)
         vha->flags.init_done = 1;
         num_hosts++;
 
-        down(&ha->vport_sem);
+        mutex_lock(&ha->vport_lock);
         set_bit(vha->vp_idx, ha->vp_idx_map);
         ha->cur_vport_count++;
-        up(&ha->vport_sem);
+        mutex_unlock(&ha->vport_lock);
 
         return vha;
 
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 3223fd16bcfe..48eaa3bb5433 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -10,6 +10,7 @@
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
 #include <linux/kthread.h>
+#include <linux/mutex.h>
 
 #include <scsi/scsi_tcq.h>
 #include <scsi/scsicam.h>
@@ -1631,7 +1632,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
         /* load the F/W, read paramaters, and init the H/W */
         ha->instance = num_hosts;
 
-        init_MUTEX(&ha->vport_sem);
+        mutex_init(&ha->vport_lock);
         init_completion(&ha->mbx_cmd_comp);
         complete(&ha->mbx_cmd_comp);
         init_completion(&ha->mbx_intr_comp);
@@ -2156,13 +2157,14 @@ static int
 qla2x00_post_work(struct scsi_qla_host *ha, struct qla_work_evt *e, int locked)
 {
         unsigned long flags;
+        scsi_qla_host_t *pha = to_qla_parent(ha);
 
         if (!locked)
-                spin_lock_irqsave(&ha->hardware_lock, flags);
+                spin_lock_irqsave(&pha->hardware_lock, flags);
         list_add_tail(&e->list, &ha->work_list);
         qla2xxx_wake_dpc(ha);
         if (!locked)
-                spin_unlock_irqrestore(&ha->hardware_lock, flags);
+                spin_unlock_irqrestore(&pha->hardware_lock, flags);
         return QLA_SUCCESS;
 }
 
@@ -2202,12 +2204,13 @@ static void
 qla2x00_do_work(struct scsi_qla_host *ha)
 {
         struct qla_work_evt *e;
+        scsi_qla_host_t *pha = to_qla_parent(ha);
 
-        spin_lock_irq(&ha->hardware_lock);
+        spin_lock_irq(&pha->hardware_lock);
         while (!list_empty(&ha->work_list)) {
                 e = list_entry(ha->work_list.next, struct qla_work_evt, list);
                 list_del_init(&e->list);
-                spin_unlock_irq(&ha->hardware_lock);
+                spin_unlock_irq(&pha->hardware_lock);
 
                 switch (e->type) {
                 case QLA_EVT_AEN:
@@ -2221,9 +2224,9 @@ qla2x00_do_work(struct scsi_qla_host *ha)
                 }
                 if (e->flags & QLA_EVT_FLAG_FREE)
                         kfree(e);
-                spin_lock_irq(&ha->hardware_lock);
+                spin_lock_irq(&pha->hardware_lock);
         }
-        spin_unlock_irq(&ha->hardware_lock);
+        spin_unlock_irq(&pha->hardware_lock);
 }
 
 /**************************************************************************
@@ -2634,7 +2637,7 @@ qla2x00_timer(scsi_qla_host_t *ha)
 #define FW_FILE_ISP24XX "ql2400_fw.bin"
 #define FW_FILE_ISP25XX "ql2500_fw.bin"
 
-static DECLARE_MUTEX(qla_fw_lock);
+static DEFINE_MUTEX(qla_fw_lock);
 
 static struct fw_blob qla_fw_blobs[FW_BLOBS] = {
         { .name = FW_FILE_ISP21XX, .segs = { 0x1000, 0 }, },
@@ -2665,7 +2668,7 @@ qla2x00_request_firmware(scsi_qla_host_t *ha)
                 blob = &qla_fw_blobs[FW_ISP25XX];
         }
 
-        down(&qla_fw_lock);
+        mutex_lock(&qla_fw_lock);
         if (blob->fw)
                 goto out;
 
@@ -2678,7 +2681,7 @@ qla2x00_request_firmware(scsi_qla_host_t *ha)
         }
 
 out:
-        up(&qla_fw_lock);
+        mutex_unlock(&qla_fw_lock);
         return blob;
 }
 
@@ -2687,11 +2690,11 @@ qla2x00_release_firmware(void)
 {
         int idx;
 
-        down(&qla_fw_lock);
+        mutex_lock(&qla_fw_lock);
         for (idx = 0; idx < FW_BLOBS; idx++)
                 if (qla_fw_blobs[idx].fw)
                         release_firmware(qla_fw_blobs[idx].fw);
-        up(&qla_fw_lock);
+        mutex_unlock(&qla_fw_lock);
 }
 
 static pci_ers_result_t
@@ -2864,7 +2867,8 @@ qla2x00_module_init(void)
                 return -ENODEV;
         }
 
-        printk(KERN_INFO "QLogic Fibre Channel HBA Driver\n");
+        printk(KERN_INFO "QLogic Fibre Channel HBA Driver: %s\n",
+            qla2x00_version_str);
         ret = pci_register_driver(&qla2xxx_pci_driver);
         if (ret) {
                 kmem_cache_destroy(srb_cachep);
diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h
index afeae2bfe7eb..d058c8862b35 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.01-k2"
+#define QLA2XXX_VERSION      "8.02.01-k4"
 
 #define QLA_DRIVER_MAJOR_VER    8
 #define QLA_DRIVER_MINOR_VER    2
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 049103f1d16f..93d2b6714453 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -359,7 +359,12 @@ static int scsi_bus_match(struct device *dev, struct device_driver *gendrv)
 
 static int scsi_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
-        struct scsi_device *sdev = to_scsi_device(dev);
+        struct scsi_device *sdev;
+
+        if (dev->type != &scsi_dev_type)
+                return 0;
+
+        sdev = to_scsi_device(dev);
 
         add_uevent_var(env, "MODALIAS=" SCSI_DEVICE_MODALIAS_FMT, sdev->type);
         return 0;
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 53b03c629aff..951a75ea6e3e 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -1165,6 +1165,15 @@ out:
         return ret;
 }
 
+static void uart_set_ldisc(struct tty_struct *tty, int ldisc)
+{
+        struct uart_state *state = tty->driver_data;
+        struct uart_port *port = state->port;
+
+        if (port->ops->set_ldisc)
+                port->ops->set_ldisc(port);
+}
+
 static void uart_set_termios(struct tty_struct *tty,
                                                 struct ktermios *old_termios)
 {
@@ -2288,6 +2297,7 @@ static const struct tty_operations uart_ops = {
         .unthrottle     = uart_unthrottle,
         .send_xchar     = uart_send_xchar,
         .set_termios    = uart_set_termios,
+        .set_ldisc      = uart_set_ldisc,
         .stop           = uart_stop,
         .start          = uart_start,
         .hangup         = uart_hangup,
diff --git a/drivers/usb/c67x00/c67x00-ll-hpi.c b/drivers/usb/c67x00/c67x00-ll-hpi.c
index 5100fbbf6cb0..a9636f43bca2 100644
--- a/drivers/usb/c67x00/c67x00-ll-hpi.c
+++ b/drivers/usb/c67x00/c67x00-ll-hpi.c
@@ -120,7 +120,7 @@ static void hpi_write_word(struct c67x00_device *dev, u16 reg, u16 value)
  * Only data is little endian, addr has cpu endianess
  */
 static void hpi_write_words_le16(struct c67x00_device *dev, u16 addr,
-                                 u16 *data, u16 count)
+                                 __le16 *data, u16 count)
 {
         unsigned long flags;
         int i;
@@ -129,7 +129,7 @@ static void hpi_write_words_le16(struct c67x00_device *dev, u16 addr,
 
         hpi_write_reg(dev, HPI_ADDR, addr);
         for (i = 0; i < count; i++)
-                hpi_write_reg(dev, HPI_DATA, cpu_to_le16(*data++));
+                hpi_write_reg(dev, HPI_DATA, le16_to_cpu(*data++));
 
         spin_unlock_irqrestore(&dev->hpi.lock, flags);
 }
@@ -138,7 +138,7 @@ static void hpi_write_words_le16(struct c67x00_device *dev, u16 addr,
  * Only data is little endian, addr has cpu endianess
  */
 static void hpi_read_words_le16(struct c67x00_device *dev, u16 addr,
-                                u16 *data, u16 count)
+                                __le16 *data, u16 count)
 {
         unsigned long flags;
         int i;
@@ -146,7 +146,7 @@ static void hpi_read_words_le16(struct c67x00_device *dev, u16 addr,
         spin_lock_irqsave(&dev->hpi.lock, flags);
         hpi_write_reg(dev, HPI_ADDR, addr);
         for (i = 0; i < count; i++)
-                *data++ = le16_to_cpu(hpi_read_reg(dev, HPI_DATA));
+                *data++ = cpu_to_le16(hpi_read_reg(dev, HPI_DATA));
 
         spin_unlock_irqrestore(&dev->hpi.lock, flags);
 }
@@ -425,7 +425,7 @@ void c67x00_ll_write_mem_le16(struct c67x00_device *dev, u16 addr,
                 len--;
         }
 
-        hpi_write_words_le16(dev, addr, (u16 *)buf, len / 2);
+        hpi_write_words_le16(dev, addr, (__le16 *)buf, len / 2);
         buf += len & ~0x01;
         addr += len & ~0x01;
         len &= 0x01;
@@ -456,7 +456,7 @@ void c67x00_ll_read_mem_le16(struct c67x00_device *dev, u16 addr,
                 len--;
         }
 
-        hpi_read_words_le16(dev, addr, (u16 *)buf, len / 2);
+        hpi_read_words_le16(dev, addr, (__le16 *)buf, len / 2);
         buf += len & ~0x01;
         addr += len & ~0x01;
         len &= 0x01;
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index 107666d4e2ec..731db051070a 100644
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -611,8 +611,8 @@ next_desc:
                 goto err;
         }
 
-        desc->wMaxPacketSize = ep->wMaxPacketSize;
-        desc->bMaxPacketSize0 = cpu_to_le16(udev->descriptor.bMaxPacketSize0);
+        desc->wMaxPacketSize = le16_to_cpu(ep->wMaxPacketSize);
+        desc->bMaxPacketSize0 = udev->descriptor.bMaxPacketSize0;
 
         desc->orq = kmalloc(sizeof(struct usb_ctrlrequest), GFP_KERNEL);
         if (!desc->orq)
diff --git a/drivers/usb/host/isp1760-if.c b/drivers/usb/host/isp1760-if.c
index 440bf94f0d4c..c9db3fe98726 100644
--- a/drivers/usb/host/isp1760-if.c
+++ b/drivers/usb/host/isp1760-if.c
@@ -104,8 +104,8 @@ static u32 nxp_pci_io_base;
 static u32 iolength;
 static u32 pci_mem_phy0;
 static u32 length;
-static u8 *chip_addr;
-static u8 *iobase;
+static u8 __iomem *chip_addr;
+static u8 __iomem *iobase;
 
 static int __devinit isp1761_pci_probe(struct pci_dev *dev,
                 const struct pci_device_id *id)