19 files changed, 483 insertions, 82 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 88e34095ca4e..96df148ed969 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -1748,7 +1748,7 @@ config SCSI_NCR53C7xx_FAST
 config SUN3_SCSI
        tristate "Sun3 NCR5380 SCSI"
-        depends on SUN3 && SCSI
+        depends on SUN3 && SCSI && BROKEN
        help
          This option will enable support for the OBIO (onboard io) NCR5380
          SCSI controller found in the Sun 3/50 and 3/60, as well as for
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index da5bd33d982d..fc5263c6b102 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -32,6 +32,7 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/sched.h>
+#include <linux/dma-mapping.h>
 #include "scsi.h"
 #include <scsi/scsi_host.h>
 #include <linux/libata.h>
@@ -289,6 +290,8 @@ static void ahci_host_stop(struct ata_host_set *host_set)
 {
        struct ahci_host_priv *hpriv = host_set->private_data;
        kfree(hpriv);
+        ata_host_stop(host_set);
 }
 static int ahci_port_start(struct ata_port *ap)
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index 53b7b2c15f86..c4eaaad2c69b 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -2488,7 +2488,7 @@ ahd_linux_dv_thread(void *data)
        sprintf(current->comm, "ahd_dv_%d", ahd->unit);
 #else
        daemonize("ahd_dv_%d", ahd->unit);
-        current->flags |= PF_FREEZE;
+        current->flags |= PF_NOFREEZE;
 #endif
        unlock_kernel();
diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c
index 3867f91ef8c7..3be546439252 100644
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
@@ -153,6 +153,7 @@ static struct ata_port_operations piix_pata_ops = {
        .port_start             = ata_port_start,
        .port_stop              = ata_port_stop,
+        .host_stop              = ata_host_stop,
 };
 static struct ata_port_operations piix_sata_ops = {
@@ -180,6 +181,7 @@ static struct ata_port_operations piix_sata_ops = {
        .port_start             = ata_port_start,
        .port_stop              = ata_port_stop,
+        .host_stop              = ata_host_stop,
 };
 static struct ata_port_info piix_port_info[] = {
@@ -663,15 +665,6 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
        return ata_pci_init_one(pdev, port_info, n_ports);
 }
-/**
- *      piix_init -
- *
- *      LOCKING:
- *
- *      RETURNS:
- *
- */
 static int __init piix_init(void)
 {
        int rc;
@@ -687,13 +680,6 @@ static int __init piix_init(void)
        return 0;
 }
-/**
- *      piix_exit -
- *
- *      LOCKING:
- *
- */
 static void __exit piix_exit(void)
 {
        pci_unregister_driver(&piix_pci_driver);
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 63d3f70d06e1..9e58f134f68b 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -186,6 +186,28 @@ static void ata_tf_load_mmio(struct ata_port *ap, struct ata_taskfile *tf)
        ata_wait_idle(ap);
 }
+/**
+ *      ata_tf_load - send taskfile registers to host controller
+ *      @ap: Port to which output is sent
+ *      @tf: ATA taskfile register set
+ *
+ *      Outputs ATA taskfile to standard ATA host controller using MMIO
+ *      or PIO as indicated by the ATA_FLAG_MMIO flag.
+ *      Writes the control, feature, nsect, lbal, lbam, and lbah registers.
+ *      Optionally (ATA_TFLAG_LBA48) writes hob_feature, hob_nsect,
+ *      hob_lbal, hob_lbam, and hob_lbah.
+ *
+ *      This function waits for idle (!BUSY and !DRQ) after writing
+ *      registers.  If the control register has a new value, this
+ *      function also waits for idle after writing control and before
+ *      writing the remaining registers.
+ *
+ *      May be used as the tf_load() entry in ata_port_operations.
+ *
+ *      LOCKING:
+ *      Inherited from caller.
+ */
 void ata_tf_load(struct ata_port *ap, struct ata_taskfile *tf)
 {
        if (ap->flags & ATA_FLAG_MMIO)
@@ -195,11 +217,11 @@ void ata_tf_load(struct ata_port *ap, struct ata_taskfile *tf)
 }
 /**
- *      ata_exec_command - issue ATA command to host controller
+ *      ata_exec_command_pio - issue ATA command to host controller
 *      @ap: port to which command is being issued
 *      @tf: ATA taskfile register set
 *
- *      Issues PIO/MMIO write to ATA command register, with proper
+ *      Issues PIO write to ATA command register, with proper
 *      synchronization with interrupt handler / other threads.
 *
 *      LOCKING:
@@ -235,6 +257,18 @@ static void ata_exec_command_mmio(struct ata_port *ap, struct ata_taskfile *tf)
        ata_pause(ap);
 }
+/**
+ *      ata_exec_command - issue ATA command to host controller
+ *      @ap: port to which command is being issued
+ *      @tf: ATA taskfile register set
+ *
+ *      Issues PIO/MMIO write to ATA command register, with proper
+ *      synchronization with interrupt handler / other threads.
+ *
+ *      LOCKING:
+ *      spin_lock_irqsave(host_set lock)
+ */
 void ata_exec_command(struct ata_port *ap, struct ata_taskfile *tf)
 {
        if (ap->flags & ATA_FLAG_MMIO)
@@ -305,7 +339,7 @@ void ata_tf_to_host_nolock(struct ata_port *ap, struct ata_taskfile *tf)
 }
 /**
- *      ata_tf_read - input device's ATA taskfile shadow registers
+ *      ata_tf_read_pio - input device's ATA taskfile shadow registers
 *      @ap: Port from which input is read
 *      @tf: ATA taskfile register set for storing input
 *
@@ -368,6 +402,23 @@ static void ata_tf_read_mmio(struct ata_port *ap, struct ata_taskfile *tf)
        }
 }
+/**
+ *      ata_tf_read - input device's ATA taskfile shadow registers
+ *      @ap: Port from which input is read
+ *      @tf: ATA taskfile register set for storing input
+ *
+ *      Reads ATA taskfile registers for currently-selected device
+ *      into @tf.
+ *
+ *      Reads nsect, lbal, lbam, lbah, and device.  If ATA_TFLAG_LBA48
+ *      is set, also reads the hob registers.
+ *
+ *      May be used as the tf_read() entry in ata_port_operations.
+ *
+ *      LOCKING:
+ *      Inherited from caller.
+ */
 void ata_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
 {
        if (ap->flags & ATA_FLAG_MMIO)
@@ -381,7 +432,7 @@ void ata_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
 *      @ap: port where the device is
 *
 *      Reads ATA taskfile status register for currently-selected device
- *      and return it's value. This also clears pending interrupts
+ *      and return its value. This also clears pending interrupts
 *      from this device
 *
 *      LOCKING:
@@ -397,7 +448,7 @@ static u8 ata_check_status_pio(struct ata_port *ap)
 *      @ap: port where the device is
 *
 *      Reads ATA taskfile status register for currently-selected device
- *      via MMIO and return it's value. This also clears pending interrupts
+ *      via MMIO and return its value. This also clears pending interrupts
 *      from this device
 *
 *      LOCKING:
@@ -408,6 +459,20 @@ static u8 ata_check_status_mmio(struct ata_port *ap)
        return readb((void __iomem *) ap->ioaddr.status_addr);
 }
+/**
+ *      ata_check_status - Read device status reg & clear interrupt
+ *      @ap: port where the device is
+ *
+ *      Reads ATA taskfile status register for currently-selected device
+ *      and return its value. This also clears pending interrupts
+ *      from this device
+ *
+ *      May be used as the check_status() entry in ata_port_operations.
+ *
+ *      LOCKING:
+ *      Inherited from caller.
+ */
 u8 ata_check_status(struct ata_port *ap)
 {
        if (ap->flags & ATA_FLAG_MMIO)
@@ -415,6 +480,20 @@ u8 ata_check_status(struct ata_port *ap)
        return ata_check_status_pio(ap);
 }
+/**
+ *      ata_altstatus - Read device alternate status reg
+ *      @ap: port where the device is
+ *
+ *      Reads ATA taskfile alternate status register for
+ *      currently-selected device and return its value.
+ *
+ *      Note: may NOT be used as the check_altstatus() entry in
+ *      ata_port_operations.
+ *
+ *      LOCKING:
+ *      Inherited from caller.
+ */
 u8 ata_altstatus(struct ata_port *ap)
 {
        if (ap->ops->check_altstatus)
@@ -425,6 +504,20 @@ u8 ata_altstatus(struct ata_port *ap)
        return inb(ap->ioaddr.altstatus_addr);
 }
+/**
+ *      ata_chk_err - Read device error reg
+ *      @ap: port where the device is
+ *
+ *      Reads ATA taskfile error register for
+ *      currently-selected device and return its value.
+ *
+ *      Note: may NOT be used as the check_err() entry in
+ *      ata_port_operations.
+ *
+ *      LOCKING:
+ *      Inherited from caller.
+ */
 u8 ata_chk_err(struct ata_port *ap)
 {
        if (ap->ops->check_err)
@@ -873,10 +966,24 @@ void ata_dev_id_string(u16 *id, unsigned char *s,
        }
 }
+/**
+ *      ata_noop_dev_select - Select device 0/1 on ATA bus
+ *      @ap: ATA channel to manipulate
+ *      @device: ATA device (numbered from zero) to select
+ *
+ *      This function performs no actual function.
+ *
+ *      May be used as the dev_select() entry in ata_port_operations.
+ *
+ *      LOCKING:
+ *      caller.
+ */
 void ata_noop_dev_select (struct ata_port *ap, unsigned int device)
 {
 }
 /**
 *      ata_std_dev_select - Select device 0/1 on ATA bus
 *      @ap: ATA channel to manipulate
@@ -884,7 +991,9 @@ void ata_noop_dev_select (struct ata_port *ap, unsigned int device)
 *
 *      Use the method defined in the ATA specification to
 *      make either device 0, or device 1, active on the
- *      ATA channel.
+ *      ATA channel.  Works with both PIO and MMIO.
+ *
+ *      May be used as the dev_select() entry in ata_port_operations.
 *
 *      LOCKING:
 *      caller.
@@ -1190,7 +1299,12 @@ err_out:
 *      ata_bus_probe - Reset and probe ATA bus
 *      @ap: Bus to probe
 *
+ *      Master ATA bus probing function.  Initiates a hardware-dependent
+ *      bus reset, then attempts to identify any devices found on
+ *      the bus.
+ *
 *      LOCKING:
+ *      PCI/etc. bus probe sem.
 *
 *      RETURNS:
 *      Zero on success, non-zero on error.
@@ -1229,10 +1343,14 @@ err_out:
 }
 /**
- *      ata_port_probe -
+ *      ata_port_probe - Mark port as enabled
- *      @ap:
+ *      @ap: Port for which we indicate enablement
 *
- *      LOCKING:
+ *      Modify @ap data structure such that the system
+ *      thinks that the entire port is enabled.
+ *
+ *      LOCKING: host_set lock, or some other form of
+ *      serialization.
 */
 void ata_port_probe(struct ata_port *ap)
@@ -1241,10 +1359,15 @@ void ata_port_probe(struct ata_port *ap)
 }
 /**
- *      __sata_phy_reset -
+ *      __sata_phy_reset - Wake/reset a low-level SATA PHY
- *      @ap:
+ *      @ap: SATA port associated with target SATA PHY.
+ *
+ *      This function issues commands to standard SATA Sxxx
+ *      PHY registers, to wake up the phy (and device), and
+ *      clear any reset condition.
 *
 *      LOCKING:
+ *      PCI/etc. bus probe sem.
 *
 */
 void __sata_phy_reset(struct ata_port *ap)
@@ -1289,10 +1412,14 @@ void __sata_phy_reset(struct ata_port *ap)
 }
 /**
- *      __sata_phy_reset -
+ *      sata_phy_reset - Reset SATA bus.
- *      @ap:
+ *      @ap: SATA port associated with target SATA PHY.
+ *
+ *      This function resets the SATA bus, and then probes
+ *      the bus for devices.
 *
 *      LOCKING:
+ *      PCI/etc. bus probe sem.
 *
 */
 void sata_phy_reset(struct ata_port *ap)
@@ -1304,10 +1431,16 @@ void sata_phy_reset(struct ata_port *ap)
 }
 /**
- *      ata_port_disable -
+ *      ata_port_disable - Disable port.
- *      @ap:
+ *      @ap: Port to be disabled.
 *
- *      LOCKING:
+ *      Modify @ap data structure such that the system
+ *      thinks that the entire port is disabled, and should
+ *      never attempt to probe or communicate with devices
+ *      on this port.
+ *
+ *      LOCKING: host_set lock, or some other form of
+ *      serialization.
 */
 void ata_port_disable(struct ata_port *ap)
@@ -1416,7 +1549,10 @@ static void ata_host_set_dma(struct ata_port *ap, u8 xfer_mode,
 *      ata_set_mode - Program timings and issue SET FEATURES - XFER
 *      @ap: port on which timings will be programmed
 *
+ *      Set ATA device disk transfer mode (PIO3, UDMA6, etc.).
+ *
 *      LOCKING:
+ *      PCI/etc. bus probe sem.
 *
 */
 static void ata_set_mode(struct ata_port *ap)
@@ -1467,7 +1603,10 @@ err_out:
 *      @tmout_pat: impatience timeout
 *      @tmout: overall timeout
 *
- *      LOCKING:
+ *      Sleep until ATA Status register bit BSY clears,
+ *      or a timeout occurs.
+ *
+ *      LOCKING: None.
 *
 */
@@ -1553,10 +1692,14 @@ static void ata_bus_post_reset(struct ata_port *ap, unsigned int devmask)
 }
 /**
- *      ata_bus_edd -
+ *      ata_bus_edd - Issue EXECUTE DEVICE DIAGNOSTIC command.
- *      @ap:
+ *      @ap: Port to reset and probe
+ *
+ *      Use the EXECUTE DEVICE DIAGNOSTIC command to reset and
+ *      probe the bus.  Not often used these days.
 *
 *      LOCKING:
+ *      PCI/etc. bus probe sem.
 *
 */
@@ -1633,8 +1776,8 @@ static unsigned int ata_bus_softreset(struct ata_port *ap,
 *      the device is ATA or ATAPI.
 *
 *      LOCKING:
- *      Inherited from caller.  Some functions called by this function
+ *      PCI/etc. bus probe sem.
- *      obtain the host_set lock.
+ *      Obtains host_set lock.
 *
 *      SIDE EFFECTS:
 *      Sets ATA_FLAG_PORT_DISABLED if bus reset fails.
@@ -1876,7 +2019,11 @@ static int fgb(u32 bitmap)
 *      @xfer_mode_out: (output) SET FEATURES - XFER MODE code
 *      @xfer_shift_out: (output) bit shift that selects this mode
 *
+ *      Based on host and device capabilities, determine the
+ *      maximum transfer mode that is amenable to all.
+ *
 *      LOCKING:
+ *      PCI/etc. bus probe sem.
 *
 *      RETURNS:
 *      Zero on success, negative on error.
@@ -1909,7 +2056,11 @@ static int ata_choose_xfer_mode(struct ata_port *ap,
 *      @ap: Port associated with device @dev
 *      @dev: Device to which command will be sent
 *
+ *      Issue SET FEATURES - XFER MODE command to device @dev
+ *      on port @ap.
+ *
 *      LOCKING:
+ *      PCI/etc. bus probe sem.
 */
 static void ata_dev_set_xfermode(struct ata_port *ap, struct ata_device *dev)
@@ -1947,10 +2098,13 @@ static void ata_dev_set_xfermode(struct ata_port *ap, struct ata_device *dev)
 }
 /**
- *      ata_sg_clean -
+ *      ata_sg_clean - Unmap DMA memory associated with command
- *      @qc:
+ *      @qc: Command containing DMA memory to be released
+ *
+ *      Unmap all mapped DMA memory associated with this command.
 *
 *      LOCKING:
+ *      spin_lock_irqsave(host_set lock)
 */
 static void ata_sg_clean(struct ata_queued_cmd *qc)
@@ -1981,7 +2135,11 @@ static void ata_sg_clean(struct ata_queued_cmd *qc)
 *      ata_fill_sg - Fill PCI IDE PRD table
 *      @qc: Metadata associated with taskfile to be transferred
 *
+ *      Fill PCI IDE PRD (scatter-gather) table with segments
+ *      associated with the current disk command.
+ *
 *      LOCKING:
+ *      spin_lock_irqsave(host_set lock)
 *
 */
 static void ata_fill_sg(struct ata_queued_cmd *qc)
@@ -2028,7 +2186,13 @@ static void ata_fill_sg(struct ata_queued_cmd *qc)
 *      ata_check_atapi_dma - Check whether ATAPI DMA can be supported
 *      @qc: Metadata associated with taskfile to check
 *
+ *      Allow low-level driver to filter ATA PACKET commands, returning
+ *      a status indicating whether or not it is OK to use DMA for the
+ *      supplied PACKET command.
+ *
 *      LOCKING:
+ *      spin_lock_irqsave(host_set lock)
+ *
 *      RETURNS: 0 when ATAPI DMA can be used
 *               nonzero otherwise
 */
@@ -2046,6 +2210,8 @@ int ata_check_atapi_dma(struct ata_queued_cmd *qc)
 *      ata_qc_prep - Prepare taskfile for submission
 *      @qc: Metadata associated with taskfile to be prepared
 *
+ *      Prepare ATA taskfile for submission.
+ *
 *      LOCKING:
 *      spin_lock_irqsave(host_set lock)
 */
@@ -2057,6 +2223,32 @@ void ata_qc_prep(struct ata_queued_cmd *qc)
        ata_fill_sg(qc);
 }
+/**
+ *      ata_sg_init_one - Associate command with memory buffer
+ *      @qc: Command to be associated
+ *      @buf: Memory buffer
+ *      @buflen: Length of memory buffer, in bytes.
+ *
+ *      Initialize the data-related elements of queued_cmd @qc
+ *      to point to a single memory buffer, @buf of byte length @buflen.
+ *
+ *      LOCKING:
+ *      spin_lock_irqsave(host_set lock)
+ */
+/**
+ *      ata_sg_init_one - Prepare a one-entry scatter-gather list.
+ *      @qc:  Queued command
+ *      @buf:  transfer buffer
+ *      @buflen:  length of buf
+ *
+ *      Builds a single-entry scatter-gather list to initiate a
+ *      transfer utilizing the specified buffer.
+ *
+ *      LOCKING:
+ */
 void ata_sg_init_one(struct ata_queued_cmd *qc, void *buf, unsigned int buflen)
 {
        struct scatterlist *sg;
@@ -2074,6 +2266,32 @@ void ata_sg_init_one(struct ata_queued_cmd *qc, void *buf, unsigned int buflen)
        sg->length = buflen;
 }
+/**
+ *      ata_sg_init - Associate command with scatter-gather table.
+ *      @qc: Command to be associated
+ *      @sg: Scatter-gather table.
+ *      @n_elem: Number of elements in s/g table.
+ *
+ *      Initialize the data-related elements of queued_cmd @qc
+ *      to point to a scatter-gather table @sg, containing @n_elem
+ *      elements.
+ *
+ *      LOCKING:
+ *      spin_lock_irqsave(host_set lock)
+ */
+/**
+ *      ata_sg_init - Assign a scatter gather list to a queued command
+ *      @qc:  Queued command
+ *      @sg:  Scatter-gather list
+ *      @n_elem:  length of sg list
+ *
+ *      Attaches a scatter-gather list to a queued command.
+ *
+ *      LOCKING:
+ */
 void ata_sg_init(struct ata_queued_cmd *qc, struct scatterlist *sg,
                 unsigned int n_elem)
 {
@@ -2083,14 +2301,16 @@ void ata_sg_init(struct ata_queued_cmd *qc, struct scatterlist *sg,
 }
 /**
- *      ata_sg_setup_one -
+ *      ata_sg_setup_one - DMA-map the memory buffer associated with a command.
- *      @qc:
+ *      @qc: Command with memory buffer to be mapped.
+ *
+ *      DMA-map the memory buffer associated with queued_cmd @qc.
 *
 *      LOCKING:
 *      spin_lock_irqsave(host_set lock)
 *
 *      RETURNS:
- *
+ *      Zero on success, negative on error.
 */
 static int ata_sg_setup_one(struct ata_queued_cmd *qc)
@@ -2115,13 +2335,16 @@ static int ata_sg_setup_one(struct ata_queued_cmd *qc)
 }
 /**
- *      ata_sg_setup -
+ *      ata_sg_setup - DMA-map the scatter-gather table associated with a command.
- *      @qc:
+ *      @qc: Command with scatter-gather table to be mapped.
+ *
+ *      DMA-map the scatter-gather table associated with queued_cmd @qc.
 *
 *      LOCKING:
 *      spin_lock_irqsave(host_set lock)
 *
 *      RETURNS:
+ *      Zero on success, negative on error.
 *
 */
@@ -2151,6 +2374,7 @@ static int ata_sg_setup(struct ata_queued_cmd *qc)
 *      @ap:
 *
 *      LOCKING:
+ *      None.  (executing in kernel thread context)
 *
 *      RETURNS:
 *
@@ -2198,6 +2422,7 @@ static unsigned long ata_pio_poll(struct ata_port *ap)
 *      @ap:
 *
 *      LOCKING:
+ *      None.  (executing in kernel thread context)
 */
 static void ata_pio_complete (struct ata_port *ap)
@@ -2240,6 +2465,18 @@ static void ata_pio_complete (struct ata_port *ap)
        ata_qc_complete(qc, drv_stat);
 }
+/**
+ *      swap_buf_le16 -
+ *      @buf:  Buffer to swap
+ *      @buf_words:  Number of 16-bit words in buffer.
+ *
+ *      Swap halves of 16-bit words if needed to convert from
+ *      little-endian byte order to native cpu byte order, or
+ *      vice-versa.
+ *
+ *      LOCKING:
+ */
 void swap_buf_le16(u16 *buf, unsigned int buf_words)
 {
 #ifdef __BIG_ENDIAN
@@ -2340,7 +2577,6 @@ static void __atapi_pio_bytes(struct ata_queued_cmd *qc, unsigned int bytes)
 next_sg:
        sg = &qc->sg[qc->cursg];
-next_page:
        page = sg->page;
        offset = sg->offset + qc->cursg_ofs;
@@ -2348,6 +2584,7 @@ next_page:
        page = nth_page(page, (offset >> PAGE_SHIFT));
        offset %= PAGE_SIZE;
+        /* don't overrun current sg */
        count = min(sg->length - qc->cursg_ofs, bytes);
        /* don't cross page boundaries */
@@ -2372,8 +2609,6 @@ next_page:
        kunmap(page);
        if (bytes) {
-                if (qc->cursg_ofs < sg->length)
-                        goto next_page;
                goto next_sg;
        }
 }
@@ -2415,6 +2650,7 @@ err_out:
 *      @ap:
 *
 *      LOCKING:
+ *      None.  (executing in kernel thread context)
 */
 static void ata_pio_block(struct ata_port *ap)
@@ -2583,6 +2819,7 @@ static void atapi_request_sense(struct ata_port *ap, struct ata_device *dev,
 *      transaction completed successfully.
 *
 *      LOCKING:
+ *      Inherited from SCSI layer (none, can sleep)
 */
 static void ata_qc_timeout(struct ata_queued_cmd *qc)
@@ -2692,6 +2929,7 @@ out:
 *      @dev: Device from whom we request an available command structure
 *
 *      LOCKING:
+ *      None.
 */
 static struct ata_queued_cmd *ata_qc_new(struct ata_port *ap)
@@ -2717,6 +2955,7 @@ static struct ata_queued_cmd *ata_qc_new(struct ata_port *ap)
 *      @dev: Device from whom we request an available command structure
 *
 *      LOCKING:
+ *      None.
 */
 struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap,
@@ -2781,6 +3020,7 @@ static void __ata_qc_complete(struct ata_queued_cmd *qc)
 *      in case something prevents using it.
 *
 *      LOCKING:
+ *      spin_lock_irqsave(host_set lock)
 *
 */
 void ata_qc_free(struct ata_queued_cmd *qc)
@@ -2794,9 +3034,13 @@ void ata_qc_free(struct ata_queued_cmd *qc)
 /**
 *      ata_qc_complete - Complete an active ATA command
 *      @qc: Command to complete
- *      @drv_stat: ATA status register contents
+ *      @drv_stat: ATA Status register contents
+ *
+ *      Indicate to the mid and upper layers that an ATA
+ *      command has completed, with either an ok or not-ok status.
 *
 *      LOCKING:
+ *      spin_lock_irqsave(host_set lock)
 *
 */
@@ -2892,6 +3136,7 @@ err_out:
        return -1;
 }
 /**
 *      ata_qc_issue_prot - issue taskfile to device in proto-dependent manner
 *      @qc: command to issue to device
@@ -2901,6 +3146,8 @@ err_out:
 *      classes called "protocols", and issuing each type of protocol
 *      is slightly different.
 *
+ *      May be used as the qc_issue() entry in ata_port_operations.
+ *
 *      LOCKING:
 *      spin_lock_irqsave(host_set lock)
 *
@@ -2958,7 +3205,7 @@ int ata_qc_issue_prot(struct ata_queued_cmd *qc)
 }
 /**
- *      ata_bmdma_setup - Set up PCI IDE BMDMA transaction
+ *      ata_bmdma_setup_mmio - Set up PCI IDE BMDMA transaction
 *      @qc: Info associated with this ATA transaction.
 *
 *      LOCKING:
@@ -3065,6 +3312,18 @@ static void ata_bmdma_start_pio (struct ata_queued_cmd *qc)
             ap->ioaddr.bmdma_addr + ATA_DMA_CMD);
 }
+/**
+ *      ata_bmdma_start - Start a PCI IDE BMDMA transaction
+ *      @qc: Info associated with this ATA transaction.
+ *
+ *      Writes the ATA_DMA_START flag to the DMA command register.
+ *
+ *      May be used as the bmdma_start() entry in ata_port_operations.
+ *
+ *      LOCKING:
+ *      spin_lock_irqsave(host_set lock)
+ */
 void ata_bmdma_start(struct ata_queued_cmd *qc)
 {
        if (qc->ap->flags & ATA_FLAG_MMIO)
@@ -3073,6 +3332,20 @@ void ata_bmdma_start(struct ata_queued_cmd *qc)
                ata_bmdma_start_pio(qc);
 }
+/**
+ *      ata_bmdma_setup - Set up PCI IDE BMDMA transaction
+ *      @qc: Info associated with this ATA transaction.
+ *
+ *      Writes address of PRD table to device's PRD Table Address
+ *      register, sets the DMA control register, and calls
+ *      ops->exec_command() to start the transfer.
+ *
+ *      May be used as the bmdma_setup() entry in ata_port_operations.
+ *
+ *      LOCKING:
+ *      spin_lock_irqsave(host_set lock)
+ */
 void ata_bmdma_setup(struct ata_queued_cmd *qc)
 {
        if (qc->ap->flags & ATA_FLAG_MMIO)
@@ -3081,6 +3354,19 @@ void ata_bmdma_setup(struct ata_queued_cmd *qc)
                ata_bmdma_setup_pio(qc);
 }
+/**
+ *      ata_bmdma_irq_clear - Clear PCI IDE BMDMA interrupt.
+ *      @ap: Port associated with this ATA transaction.
+ *
+ *      Clear interrupt and error flags in DMA status register.
+ *
+ *      May be used as the irq_clear() entry in ata_port_operations.
+ *
+ *      LOCKING:
+ *      spin_lock_irqsave(host_set lock)
+ */
 void ata_bmdma_irq_clear(struct ata_port *ap)
 {
    if (ap->flags & ATA_FLAG_MMIO) {
@@ -3093,6 +3379,19 @@ void ata_bmdma_irq_clear(struct ata_port *ap)
 }
+/**
+ *      ata_bmdma_status - Read PCI IDE BMDMA status
+ *      @ap: Port associated with this ATA transaction.
+ *
+ *      Read and return BMDMA status register.
+ *
+ *      May be used as the bmdma_status() entry in ata_port_operations.
+ *
+ *      LOCKING:
+ *      spin_lock_irqsave(host_set lock)
+ */
 u8 ata_bmdma_status(struct ata_port *ap)
 {
        u8 host_stat;
@@ -3104,6 +3403,19 @@ u8 ata_bmdma_status(struct ata_port *ap)
        return host_stat;
 }
+/**
+ *      ata_bmdma_stop - Stop PCI IDE BMDMA transfer
+ *      @ap: Port associated with this ATA transaction.
+ *
+ *      Clears the ATA_DMA_START flag in the dma control register
+ *
+ *      May be used as the bmdma_stop() entry in ata_port_operations.
+ *
+ *      LOCKING:
+ *      spin_lock_irqsave(host_set lock)
+ */
 void ata_bmdma_stop(struct ata_port *ap)
 {
        if (ap->flags & ATA_FLAG_MMIO) {
@@ -3203,13 +3515,18 @@ idle_irq:
 /**
 *      ata_interrupt - Default ATA host interrupt handler
- *      @irq: irq line
+ *      @irq: irq line (unused)
- *      @dev_instance: pointer to our host information structure
+ *      @dev_instance: pointer to our ata_host_set information structure
 *      @regs: unused
 *
+ *      Default interrupt handler for PCI IDE devices.  Calls
+ *      ata_host_intr() for each port that is not disabled.
+ *
 *      LOCKING:
+ *      Obtains host_set lock during operation.
 *
 *      RETURNS:
+ *      IRQ_NONE or IRQ_HANDLED.
 *
 */
@@ -3302,6 +3619,19 @@ err_out:
        ata_qc_complete(qc, ATA_ERR);
 }
+/**
+ *      ata_port_start - Set port up for dma.
+ *      @ap: Port to initialize
+ *
+ *      Called just after data structures for each port are
+ *      initialized.  Allocates space for PRD table.
+ *
+ *      May be used as the port_start() entry in ata_port_operations.
+ *
+ *      LOCKING:
+ */
 int ata_port_start (struct ata_port *ap)
 {
        struct device *dev = ap->host_set->dev;
@@ -3315,6 +3645,18 @@ int ata_port_start (struct ata_port *ap)
        return 0;
 }
+/**
+ *      ata_port_stop - Undo ata_port_start()
+ *      @ap: Port to shut down
+ *
+ *      Frees the PRD table.
+ *
+ *      May be used as the port_stop() entry in ata_port_operations.
+ *
+ *      LOCKING:
+ */
 void ata_port_stop (struct ata_port *ap)
 {
        struct device *dev = ap->host_set->dev;
@@ -3322,6 +3664,13 @@ void ata_port_stop (struct ata_port *ap)
        dma_free_coherent(dev, ATA_PRD_TBL_SZ, ap->prd, ap->prd_dma);
 }
+void ata_host_stop (struct ata_host_set *host_set)
+{
+        if (host_set->mmio_base)
+                iounmap(host_set->mmio_base);
+}
 /**
 *      ata_host_remove - Unregister SCSI host structure with upper layers
 *      @ap: Port to unregister
@@ -3350,7 +3699,11 @@ static void ata_host_remove(struct ata_port *ap, unsigned int do_unregister)
 *      @ent: Probe information provided by low-level driver
 *      @port_no: Port number associated with this ata_port
 *
+ *      Initialize a new ata_port structure, and its associated
+ *      scsi_host.
+ *
 *      LOCKING:
+ *      Inherited from caller.
 *
 */
@@ -3405,9 +3758,13 @@ static void ata_host_init(struct ata_port *ap, struct Scsi_Host *host,
 *      @host_set: Collections of ports to which we add
 *      @port_no: Port number associated with this host
 *
+ *      Attach low-level ATA driver to system.
+ *
 *      LOCKING:
+ *      PCI/etc. bus probe sem.
 *
 *      RETURNS:
+ *      New ata_port on success, for NULL on error.
 *
 */
@@ -3440,12 +3797,22 @@ err_out:
 }
 /**
- *      ata_device_add -
+ *      ata_device_add - Register hardware device with ATA and SCSI layers
- *      @ent:
+ *      @ent: Probe information describing hardware device to be registered
+ *
+ *      This function processes the information provided in the probe
+ *      information struct @ent, allocates the necessary ATA and SCSI
+ *      host information structures, initializes them, and registers
+ *      everything with requisite kernel subsystems.
+ *
+ *      This function requests irqs, probes the ATA bus, and probes
+ *      the SCSI bus.
 *
 *      LOCKING:
+ *      PCI/etc. bus probe sem.
 *
 *      RETURNS:
+ *      Number of ports registered.  Zero on error (no ports registered).
 *
 */
@@ -3597,7 +3964,15 @@ int ata_scsi_release(struct Scsi_Host *host)
 /**
 *      ata_std_ports - initialize ioaddr with standard port offsets.
 *      @ioaddr: IO address structure to be initialized
+ *
+ *      Utility function which initializes data_addr, error_addr,
+ *      feature_addr, nsect_addr, lbal_addr, lbam_addr, lbah_addr,
+ *      device_addr, status_addr, and command_addr to standard offsets
+ *      relative to cmd_addr.
+ *
+ *      Does not set ctl_addr, altstatus_addr, bmdma_addr, or scr_addr.
 */
 void ata_std_ports(struct ata_ioports *ioaddr)
 {
        ioaddr->data_addr = ioaddr->cmd_addr + ATA_REG_DATA;
@@ -3639,6 +4014,20 @@ ata_probe_ent_alloc(struct device *dev, struct ata_port_info *port)
        return probe_ent;
 }
+/**
+ *      ata_pci_init_native_mode - Initialize native-mode driver
+ *      @pdev:  pci device to be initialized
+ *      @port:  array[2] of pointers to port info structures.
+ *
+ *      Utility function which allocates and initializes an
+ *      ata_probe_ent structure for a standard dual-port
+ *      PIO-based IDE controller.  The returned ata_probe_ent
+ *      structure can be passed to ata_device_add().  The returned
+ *      ata_probe_ent structure should then be freed with kfree().
+ */
 #ifdef CONFIG_PCI
 struct ata_probe_ent *
 ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port)
@@ -3720,10 +4109,19 @@ ata_pci_init_legacy_mode(struct pci_dev *pdev, struct ata_port_info **port,
 *      @port_info: Information from low-level host driver
 *      @n_ports: Number of ports attached to host controller
 *
+ *      This is a helper function which can be called from a driver's
+ *      xxx_init_one() probe function if the hardware uses traditional
+ *      IDE taskfile registers.
+ *
+ *      This function calls pci_enable_device(), reserves its register
+ *      regions, sets the dma mask, enables bus master mode, and calls
+ *      ata_device_add()
+ *
 *      LOCKING:
 *      Inherited from PCI layer (may sleep).
 *
 *      RETURNS:
+ *      Zero on success, negative on errno-based value on error.
 *
 */
@@ -3878,10 +4276,6 @@ void ata_pci_remove_one (struct pci_dev *pdev)
        }
        free_irq(host_set->irq, host_set);
-        if (host_set->ops->host_stop)
-                host_set->ops->host_stop(host_set);
-        if (host_set->mmio_base)
-                iounmap(host_set->mmio_base);
        for (i = 0; i < host_set->n_ports; i++) {
                ap = host_set->ports[i];
@@ -3900,6 +4294,9 @@ void ata_pci_remove_one (struct pci_dev *pdev)
                scsi_host_put(ap->host);
        }
+        if (host_set->ops->host_stop)
+                host_set->ops->host_stop(host_set);
        kfree(host_set);
        pci_release_regions(pdev);
@@ -3943,15 +4340,6 @@ int pci_test_config_bits(struct pci_dev *pdev, struct pci_bits *bits)
 #endif /* CONFIG_PCI */
-/**
- *      ata_init -
- *
- *      LOCKING:
- *
- *      RETURNS:
- *
- */
 static int __init ata_init(void)
 {
        ata_wq = create_workqueue("ata");
@@ -3997,6 +4385,7 @@ EXPORT_SYMBOL_GPL(ata_chk_err);
 EXPORT_SYMBOL_GPL(ata_exec_command);
 EXPORT_SYMBOL_GPL(ata_port_start);
 EXPORT_SYMBOL_GPL(ata_port_stop);
+EXPORT_SYMBOL_GPL(ata_host_stop);
 EXPORT_SYMBOL_GPL(ata_interrupt);
 EXPORT_SYMBOL_GPL(ata_qc_prep);
 EXPORT_SYMBOL_GPL(ata_bmdma_setup);
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index 416ba67ba9ee..7a4adc4c8f09 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -947,7 +947,7 @@ unsigned int ata_scsiop_inq_83(struct ata_scsi_args *args, u8 *rbuf,
 }
 /**
- *      ata_scsiop_noop -
+ *      ata_scsiop_noop - Command handler that simply returns success.
 *      @args: device IDENTIFY data / SCSI command of interest.
 *      @rbuf: Response buffer, to which simulated SCSI cmd output is sent.
 *      @buflen: Response buffer length.
diff --git a/drivers/scsi/libata.h b/drivers/scsi/libata.h
index 6518226b8f87..d90430bbb0de 100644
--- a/drivers/scsi/libata.h
+++ b/drivers/scsi/libata.h
@@ -26,7 +26,7 @@
 #define __LIBATA_H__
 #define DRV_NAME        "libata"
-#define DRV_VERSION     "1.10"  /* must be exactly four chars */
+#define DRV_VERSION     "1.11"  /* must be exactly four chars */
 struct ata_scsi_args {
        u16                     *id;
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index f12a2b6fa7a0..e6831264f67c 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -465,6 +465,7 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
        int ret, i;
        unsigned int id, lun;
        unsigned long serial;
+        unsigned long flags;
        if (!CMD_SP(cmd))
                return FAILED;
@@ -476,7 +477,7 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
        serial = cmd->serial_number;
        /* Check active list for command command. */
-        spin_lock(&ha->hardware_lock);
+        spin_lock_irqsave(&ha->hardware_lock, flags);
        for (i = 1; i < MAX_OUTSTANDING_COMMANDS; i++) {
                sp = ha->outstanding_cmds[i];
@@ -491,7 +492,7 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
                    sp->state));
                DEBUG3(qla2x00_print_scsi_cmd(cmd);)
-                spin_unlock(&ha->hardware_lock);
+                spin_unlock_irqrestore(&ha->hardware_lock, flags);
                if (qla2x00_abort_command(ha, sp)) {
                        DEBUG2(printk("%s(%ld): abort_command "
                            "mbx failed.\n", __func__, ha->host_no));
@@ -500,20 +501,19 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
                            "mbx success.\n", __func__, ha->host_no));
                        ret = SUCCESS;
                }
-                spin_lock(&ha->hardware_lock);
+                spin_lock_irqsave(&ha->hardware_lock, flags);
                break;
        }
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
        /* Wait for the command to be returned. */
        if (ret == SUCCESS) {
-                spin_unlock(&ha->hardware_lock);
                if (qla2x00_eh_wait_on_command(ha, cmd) != QLA_SUCCESS) {
                        qla_printk(KERN_ERR, ha, 
                            "scsi(%ld:%d:%d): Abort handler timed out -- %lx "
                            "%x.\n", ha->host_no, id, lun, serial, ret);
                }
-                spin_lock(&ha->hardware_lock);
        }
        qla_printk(KERN_INFO, ha, 
@@ -544,6 +544,7 @@ qla2x00_eh_wait_for_pending_target_commands(scsi_qla_host_t *ha, unsigned int t)
        int     status;
        srb_t           *sp;
        struct scsi_cmnd *cmd;
+        unsigned long flags;
        status = 0;
@@ -552,11 +553,11 @@ qla2x00_eh_wait_for_pending_target_commands(scsi_qla_host_t *ha, unsigned int t)
         * array
         */
        for (cnt = 1; cnt < MAX_OUTSTANDING_COMMANDS; cnt++) {
-                spin_lock(&ha->hardware_lock);
+                spin_lock_irqsave(&ha->hardware_lock, flags);
                sp = ha->outstanding_cmds[cnt];
                if (sp) {
                        cmd = sp->cmd;
-                        spin_unlock(&ha->hardware_lock);
+                        spin_unlock_irqrestore(&ha->hardware_lock, flags);
                        if (cmd->device->id == t) {
                                if (!qla2x00_eh_wait_on_command(ha, cmd)) {
                                        status = 1;
@@ -564,7 +565,7 @@ qla2x00_eh_wait_for_pending_target_commands(scsi_qla_host_t *ha, unsigned int t)
                                }
                        }
                } else {
-                        spin_unlock(&ha->hardware_lock);
+                        spin_unlock_irqrestore(&ha->hardware_lock, flags);
                }
        }
        return (status);
@@ -690,6 +691,7 @@ qla2x00_eh_wait_for_pending_commands(scsi_qla_host_t *ha)
        int     status;
        srb_t           *sp;
        struct scsi_cmnd *cmd;
+        unsigned long flags;
        status = 1;
@@ -698,17 +700,17 @@ qla2x00_eh_wait_for_pending_commands(scsi_qla_host_t *ha)
         * array
         */
        for (cnt = 1; cnt < MAX_OUTSTANDING_COMMANDS; cnt++) {
-                spin_lock(&ha->hardware_lock);
+                spin_lock_irqsave(&ha->hardware_lock, flags);
                sp = ha->outstanding_cmds[cnt];
                if (sp) {
                        cmd = sp->cmd;
-                        spin_unlock(&ha->hardware_lock);
+                        spin_unlock_irqrestore(&ha->hardware_lock, flags);
                        status = qla2x00_eh_wait_on_command(ha, cmd);
                        if (status == 0)
                                break;
                }
                else {
-                        spin_unlock(&ha->hardware_lock);
+                        spin_unlock_irqrestore(&ha->hardware_lock, flags);
                }
        }
        return (status);
diff --git a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c
index 69009f853a49..b0403ccd8a25 100644
--- a/drivers/scsi/sata_nv.c
+++ b/drivers/scsi/sata_nv.c
@@ -329,6 +329,8 @@ static void nv_host_stop (struct ata_host_set *host_set)
                host->host_desc->disable_hotplug(host_set);
        kfree(host);
+        ata_host_stop(host_set);
 }
 static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c
index c4e9e0298122..b18c90582e67 100644
--- a/drivers/scsi/sata_promise.c
+++ b/drivers/scsi/sata_promise.c
@@ -122,6 +122,7 @@ static struct ata_port_operations pdc_ata_ops = {
        .scr_write              = pdc_sata_scr_write,
        .port_start             = pdc_port_start,
        .port_stop              = pdc_port_stop,
+        .host_stop              = ata_host_stop,
 };
 static struct ata_port_info pdc_port_info[] = {
diff --git a/drivers/scsi/sata_qstor.c b/drivers/scsi/sata_qstor.c
index dfd362104717..1383e8a28d72 100644
--- a/drivers/scsi/sata_qstor.c
+++ b/drivers/scsi/sata_qstor.c
@@ -536,6 +536,8 @@ static void qs_host_stop(struct ata_host_set *host_set)
        writeb(0, mmio_base + QS_HCT_CTRL); /* disable host interrupts */
        writeb(QS_CNFG3_GSRST, mmio_base + QS_HCF_CNFG3); /* global reset */
+        ata_host_stop(host_set);
 }
 static void qs_host_init(unsigned int chip_id, struct ata_probe_ent *pe)
diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c
index 2b2ff48be396..49ed557a4b66 100644
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
@@ -161,6 +161,7 @@ static struct ata_port_operations sil_ops = {
        .scr_write              = sil_scr_write,
        .port_start             = ata_port_start,
        .port_stop              = ata_port_stop,
+        .host_stop              = ata_host_stop,
 };
 static struct ata_port_info sil_port_info[] = {
@@ -431,7 +432,13 @@ static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                writeb(cls, mmio_base + SIL_FIFO_R0);
                writeb(cls, mmio_base + SIL_FIFO_W0);
                writeb(cls, mmio_base + SIL_FIFO_R1);
-                writeb(cls, mmio_base + SIL_FIFO_W2);
+                writeb(cls, mmio_base + SIL_FIFO_W1);
+                if (ent->driver_data == sil_3114) {
+                        writeb(cls, mmio_base + SIL_FIFO_R2);
+                        writeb(cls, mmio_base + SIL_FIFO_W2);
+                        writeb(cls, mmio_base + SIL_FIFO_R3);
+                        writeb(cls, mmio_base + SIL_FIFO_W3);
+                }
        } else
                printk(KERN_WARNING DRV_NAME "(%s): cache line size not set.  Driver may not function\n",
                        pci_name(pdev));
diff --git a/drivers/scsi/sata_sis.c b/drivers/scsi/sata_sis.c
index 5105ddd08447..e418b89c6b9d 100644
--- a/drivers/scsi/sata_sis.c
+++ b/drivers/scsi/sata_sis.c
@@ -114,6 +114,7 @@ static struct ata_port_operations sis_ops = {
        .scr_write              = sis_scr_write,
        .port_start             = ata_port_start,
        .port_stop              = ata_port_stop,
+        .host_stop              = ata_host_stop,
 };
 static struct ata_port_info sis_port_info = {
diff --git a/drivers/scsi/sata_svw.c b/drivers/scsi/sata_svw.c
index 05075bd3a893..edef1fa969fc 100644
--- a/drivers/scsi/sata_svw.c
+++ b/drivers/scsi/sata_svw.c
@@ -313,6 +313,7 @@ static struct ata_port_operations k2_sata_ops = {
        .scr_write              = k2_sata_scr_write,
        .port_start             = ata_port_start,
        .port_stop              = ata_port_stop,
+        .host_stop              = ata_host_stop,
 };
 static void k2_sata_setup_port(struct ata_ioports *port, unsigned long base)
diff --git a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c
index 70118650c461..140cea05de3f 100644
--- a/drivers/scsi/sata_sx4.c
+++ b/drivers/scsi/sata_sx4.c
@@ -245,6 +245,8 @@ static void pdc20621_host_stop(struct ata_host_set *host_set)
        iounmap(dimm_mmio);
        kfree(hpriv);
+        ata_host_stop(host_set);
 }
 static int pdc_port_start(struct ata_port *ap)
diff --git a/drivers/scsi/sata_uli.c b/drivers/scsi/sata_uli.c
index 0bff4f475f26..a71fb54eebd3 100644
--- a/drivers/scsi/sata_uli.c
+++ b/drivers/scsi/sata_uli.c
@@ -113,6 +113,7 @@ static struct ata_port_operations uli_ops = {
        .port_start             = ata_port_start,
        .port_stop              = ata_port_stop,
+        .host_stop              = ata_host_stop,
 };
 static struct ata_port_info uli_port_info = {
diff --git a/drivers/scsi/sata_via.c b/drivers/scsi/sata_via.c
index 3a7830667277..f43183c19a12 100644
--- a/drivers/scsi/sata_via.c
+++ b/drivers/scsi/sata_via.c
@@ -134,6 +134,7 @@ static struct ata_port_operations svia_sata_ops = {
        .port_start             = ata_port_start,
        .port_stop              = ata_port_stop,
+        .host_stop              = ata_host_stop,
 };
 static struct ata_port_info svia_port_info = {
diff --git a/drivers/scsi/sata_vsc.c b/drivers/scsi/sata_vsc.c
index 2c28f0ad73c2..c5e09dc6f3de 100644
--- a/drivers/scsi/sata_vsc.c
+++ b/drivers/scsi/sata_vsc.c
@@ -21,6 +21,7 @@
 #include <linux/blkdev.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
+#include <linux/dma-mapping.h>
 #include "scsi.h"
 #include <scsi/scsi_host.h>
 #include <linux/libata.h>
@@ -230,6 +231,7 @@ static struct ata_port_operations vsc_sata_ops = {
        .scr_write              = vsc_sata_scr_write,
        .port_start             = ata_port_start,
        .port_stop              = ata_port_stop,
+        .host_stop              = ata_host_stop,
 };
 static void __devinit vsc_sata_setup_port(struct ata_ioports *port, unsigned long base)
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 4d273ceb1d09..9fa209097e3b 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -1216,6 +1216,7 @@ struct scsi_device *__scsi_add_device(struct Scsi_Host *shost, uint channel,
        if (!starget)
                return ERR_PTR(-ENOMEM);
+        get_device(&starget->dev);
        down(&shost->scan_mutex);
        res = scsi_probe_and_add_lun(starget, lun, NULL, &sdev, 1, hostdata);
        if (res != SCSI_SCAN_LUN_PRESENT)