bk://gkernel.bkbits.net/libata-2.6
jgarzik@redhat.com|ChangeSet|20040521210330|22511 jgarzik
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2004/05/21 18:58:02-07:00 akpm@bix.(none)
# Merge bk://gkernel.bkbits.net/libata-2.6
# into bix.(none):/usr/src/bk-libata
#
# drivers/scsi/libata-core.c
# 2004/05/21 18:57:59-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/21 17:03:30-04:00 jgarzik@redhat.com
# Merge redhat.com:/spare/repo/linux-2.6
# into redhat.com:/spare/repo/libata-2.6
#
# drivers/scsi/libata-core.c
# 2004/05/21 17:03:26-04:00 jgarzik@redhat.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/18 23:52:37-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-libata
#
# include/linux/pci_ids.h
# 2004/05/18 23:52:34-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/scsi/libata-core.c
# 2004/05/18 23:52:34-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/18 14:40:31-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-libata
#
# include/linux/pci_ids.h
# 2004/05/18 14:40:28-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/17 19:39:54-04:00 jgarzik@redhat.com
# [libata] polish DocBook docs a bit
#
# Mainly involved fixing a great many docproc warnings, by filling in
# missing documentation in the source code.
#
# drivers/scsi/sata_via.c
# 2004/05/17 19:39:49-04:00 jgarzik@redhat.com +0 -27
# [libata] polish DocBook docs a bit
#
# Mainly involved fixing a great many docproc warnings, by filling in
# missing documentation in the source code.
#
# drivers/scsi/sata_sil.c
# 2004/05/17 19:39:49-04:00 jgarzik@redhat.com +1 -1
# [libata] polish DocBook docs a bit
#
# Mainly involved fixing a great many docproc warnings, by filling in
# missing documentation in the source code.
#
# drivers/scsi/libata-scsi.c
# 2004/05/17 19:39:49-04:00 jgarzik@redhat.com +1 -0
# [libata] polish DocBook docs a bit
#
# Mainly involved fixing a great many docproc warnings, by filling in
# missing documentation in the source code.
#
# drivers/scsi/libata-core.c
# 2004/05/17 19:39:49-04:00 jgarzik@redhat.com +49 -46
# [libata] polish DocBook docs a bit
#
# Mainly involved fixing a great many docproc warnings, by filling in
# missing documentation in the source code.
#
# drivers/scsi/ata_piix.c
# 2004/05/17 19:39:49-04:00 jgarzik@redhat.com +1 -1
# [libata] polish DocBook docs a bit
#
# Mainly involved fixing a great many docproc warnings, by filling in
# missing documentation in the source code.
#
# Documentation/DocBook/libata.tmpl
# 2004/05/17 19:39:49-04:00 jgarzik@redhat.com +6 -7
# [libata] polish DocBook docs a bit
#
# Mainly involved fixing a great many docproc warnings, by filling in
# missing documentation in the source code.
#
# ChangeSet
# 2004/05/16 01:41:16-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-libata
#
# include/linux/pci_ids.h
# 2004/05/16 01:41:13-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/scsi/sata_vsc.c
# 2004/05/16 01:41:13-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/scsi/sata_sis.c
# 2004/05/16 01:41:13-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/14 21:35:03-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-libata
#
# include/linux/pci_ids.h
# 2004/05/14 21:35:00-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/11 16:47:43-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-libata
#
# include/linux/pci_ids.h
# 2004/05/11 16:47:40-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/scsi/sata_vsc.c
# 2004/05/11 16:47:40-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/scsi/sata_sis.c
# 2004/05/11 16:47:40-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/07 01:05:16-07:00 akpm@bix.(none)
# Merge bk://gkernel.bkbits.net/libata-2.6
# into bix.(none):/usr/src/bk-libata
#
# include/linux/pci_ids.h
# 2004/05/07 01:05:13-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/scsi/sata_vsc.c
# 2004/05/07 01:05:13-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/scsi/sata_sis.c
# 2004/05/07 01:05:13-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/05/05 14:42:21-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-libata
#
# drivers/scsi/sata_vsc.c
# 2004/05/05 14:42:18-07:00 akpm@bix.(none) +0 -4
# Auto merged
#
# drivers/scsi/sata_sis.c
# 2004/05/05 14:42:18-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/04/29 15:49:47-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-libata
#
# include/linux/pci_ids.h
# 2004/04/29 15:49:44-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/04/25 22:53:46-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-libata
#
# include/linux/pci_ids.h
# 2004/04/25 22:53:43-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
diff -Nru a/Documentation/DocBook/libata.tmpl b/Documentation/DocBook/libata.tmpl
--- a/Documentation/DocBook/libata.tmpl Fri May 21 18:58:46 2004
+++ b/Documentation/DocBook/libata.tmpl Fri May 21 18:58:46 2004
@@ -64,12 +64,16 @@
libata Library
!Edrivers/scsi/libata-core.c
-!Edrivers/scsi/libata-scsi.c
- libata Internals
+ libata Core Internals
!Idrivers/scsi/libata-core.c
+
+
+
+ libata SCSI translation/emulation
+!Edrivers/scsi/libata-scsi.c
!Idrivers/scsi/libata-scsi.c
@@ -81,11 +85,6 @@
ata_sil Internals
!Idrivers/scsi/sata_sil.c
-
-
-
- ata_via Internals
-!Idrivers/scsi/sata_via.c
diff -Nru a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c
--- a/drivers/scsi/ata_piix.c Fri May 21 18:58:46 2004
+++ b/drivers/scsi/ata_piix.c Fri May 21 18:58:46 2004
@@ -272,7 +272,7 @@
/**
* piix_sata_probe - Probe PCI device for present SATA devices
- * @pdev: PCI device to probe
+ * @ap: Port associated with the PCI device we wish to probe
*
* Reads SATA PCI device's PCI config register Port Configuration
* and Status (PCS) to determine port and device availability.
diff -Nru a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
--- a/drivers/scsi/libata-core.c Fri May 21 18:58:46 2004
+++ b/drivers/scsi/libata-core.c Fri May 21 18:58:46 2004
@@ -98,7 +98,7 @@
/**
* ata_tf_load_pio - send taskfile registers to host controller
- * @ioaddr: set of IO ports to which output is sent
+ * @ap: Port to which output is sent
* @tf: ATA taskfile register set
*
* Outputs ATA taskfile to standard ATA host controller using PIO.
@@ -156,7 +156,7 @@
/**
* ata_tf_load_mmio - send taskfile registers to host controller
- * @ioaddr: set of IO ports to which output is sent
+ * @ap: Port to which output is sent
* @tf: ATA taskfile register set
*
* Outputs ATA taskfile to standard ATA host controller using MMIO.
@@ -316,7 +316,7 @@
/**
* ata_tf_read_pio - input device's ATA taskfile shadow registers
- * @ioaddr: set of IO ports from which input is read
+ * @ap: Port from which input is read
* @tf: ATA taskfile register set for storing input
*
* Reads ATA taskfile registers for currently-selected device
@@ -348,7 +348,7 @@
/**
* ata_tf_read_mmio - input device's ATA taskfile shadow registers
- * @ioaddr: set of IO ports from which input is read
+ * @ap: Port from which input is read
* @tf: ATA taskfile register set for storing input
*
* Reads ATA taskfile registers for currently-selected device
@@ -414,6 +414,7 @@
* ata_tf_to_fis - Convert ATA taskfile to SATA FIS structure
* @tf: Taskfile to convert
* @fis: Buffer into which data will output
+ * @pmp: Port multiplier port
*
* Converts a standard ATA taskfile to a Serial ATA
* FIS structure (Register - Host to Device).
@@ -1680,9 +1681,9 @@
}
/**
- * ata_dev_set_xfermode -
- * @ap:
- * @dev:
+ * ata_dev_set_xfermode - Issue SET FEATURES - XFER MODE command
+ * @ap: Port associated with device @dev
+ * @dev: Device to which command will be sent
*
* LOCKING:
*/
@@ -1721,9 +1722,9 @@
}
/**
- * ata_dev_set_udma -
- * @ap:
- * @device:
+ * ata_dev_set_udma - Set ATA device's transfer mode to Ultra DMA
+ * @ap: Port associated with device @dev
+ * @device: Device whose mode will be set
*
* LOCKING:
*/
@@ -1745,9 +1746,9 @@
}
/**
- * ata_dev_set_pio -
- * @ap:
- * @device:
+ * ata_dev_set_pio - Set ATA device's transfer mode to PIO
+ * @ap: Port associated with device @dev
+ * @device: Device whose mode will be set
*
* LOCKING:
*/
@@ -2223,9 +2224,9 @@
}
/**
- * ata_qc_new -
- * @ap:
- * @dev:
+ * ata_qc_new - Request an available ATA command, for queueing
+ * @ap: Port associated with device @dev
+ * @dev: Device from whom we request an available command structure
*
* LOCKING:
*/
@@ -2248,9 +2249,9 @@
}
/**
- * ata_qc_new_init -
- * @ap:
- * @dev:
+ * ata_qc_new_init - Request an available ATA command, and initialize it
+ * @ap: Port associated with device @dev
+ * @dev: Device from whom we request an available command structure
*
* LOCKING:
*/
@@ -2282,9 +2283,9 @@
}
/**
- * ata_qc_complete -
- * @qc:
- * @drv_stat:
+ * ata_qc_complete - Complete an active ATA command
+ * @qc: Command to complete
+ * @drv_stat: ATA status register contents
*
* LOCKING:
*
@@ -2551,9 +2552,9 @@
}
/**
- * ata_dma_complete -
- * @qc:
- * @host_stat:
+ * ata_dma_complete - Complete an active ATA BMDMA command
+ * @qc: Command to complete
+ * @host_stat: BMDMA status register contents
*
* LOCKING:
*/
@@ -2670,10 +2671,10 @@
}
/**
- * ata_interrupt -
- * @irq:
- * @dev_instance:
- * @regs:
+ * ata_interrupt - Default ATA host interrupt handler
+ * @irq: irq line
+ * @dev_instance: pointer to our host information structure
+ * @regs: unused
*
* LOCKING:
*
@@ -2862,9 +2863,9 @@
}
/**
- * ata_host_remove -
- * @ap:
- * @do_unregister:
+ * ata_host_remove - Unregister SCSI host structure with upper layers
+ * @ap: Port to unregister
+ * @do_unregister: 1 if we fully unregister, 0 to just stop the port
*
* LOCKING:
*/
@@ -2882,10 +2883,12 @@
}
/**
- * ata_host_init -
- * @host:
- * @ent:
- * @port_no:
+ * ata_host_init - Initialize an ata_port structure
+ * @ap: Structure to initialize
+ * @host: associated SCSI mid-layer structure
+ * @host_set: Collection of hosts to which @ap belongs
+ * @ent: Probe information provided by low-level driver
+ * @port_no: Port number associated with this ata_port
*
* LOCKING:
*
@@ -2939,10 +2942,10 @@
}
/**
- * ata_host_add -
- * @ent:
- * @host_set:
- * @port_no:
+ * ata_host_add - Attach low-level ATA driver to system
+ * @ent: Information provided by low-level driver
+ * @host_set: Collections of ports to which we add
+ * @port_no: Port number associated with this host
*
* LOCKING:
*
@@ -3098,7 +3101,7 @@
* ata_scsi_release - SCSI layer callback hook for host unload
* @host: libata host to be unloaded
*
- * Performs all duties necessary to shut down a libata port:
+ * Performs all duties necessary to shut down a libata port...
* Kill port kthread, disable port, and release resources.
*
* LOCKING:
@@ -3123,7 +3126,7 @@
/**
* ata_std_ports - initialize ioaddr with standard port offsets.
- * @ioaddr:
+ * @ioaddr: IO address structure to be initialized
*/
void ata_std_ports(struct ata_ioports *ioaddr)
{
@@ -3140,10 +3143,10 @@
}
/**
- * ata_pci_init_one -
- * @pdev:
- * @port_info:
- * @n_ports:
+ * ata_pci_init_one - Initialize/register PCI IDE host controller
+ * @pdev: Controller to be initialized
+ * @port_info: Information from low-level host driver
+ * @n_ports: Number of ports attached to host controller
*
* LOCKING:
* Inherited from PCI layer (may sleep).
diff -Nru a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
--- a/drivers/scsi/libata-scsi.c Fri May 21 18:58:46 2004
+++ b/drivers/scsi/libata-scsi.c Fri May 21 18:58:46 2004
@@ -340,6 +340,7 @@
* @dev: ATA device to which the command is addressed
* @cmd: SCSI command to execute
* @done: SCSI command completion function
+ * @xlat_func: Actor which translates @cmd to an ATA taskfile
*
* Our ->queuecommand() function has decided that the SCSI
* command issued can be directly translated into an ATA
diff -Nru a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c
--- a/drivers/scsi/sata_sil.c Fri May 21 18:58:46 2004
+++ b/drivers/scsi/sata_sil.c Fri May 21 18:58:46 2004
@@ -267,7 +267,7 @@
*
* 20040111 - Seagate drives affected by the Mod15Write bug are blacklisted
* The Maxtor quirk is in the blacklist, but I'm keeping the original
- * pessimistic fix for the following reasons:
+ * pessimistic fix for the following reasons...
* - There seems to be less info on it, only one device gleaned off the
* Windows driver, maybe only one is affected. More info would be greatly
* appreciated.
diff -Nru a/drivers/scsi/sata_via.c b/drivers/scsi/sata_via.c
--- a/drivers/scsi/sata_via.c Fri May 21 18:58:46 2004
+++ b/drivers/scsi/sata_via.c Fri May 21 18:58:46 2004
@@ -148,17 +148,6 @@
return addr + (port * 128);
}
-/**
- * svia_init_one -
- * @pdev:
- * @ent:
- *
- * LOCKING:
- *
- * RETURNS:
- *
- */
-
static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
{
static int printed_version;
@@ -289,26 +278,10 @@
return rc;
}
-/**
- * svia_init -
- *
- * LOCKING:
- *
- * RETURNS:
- *
- */
-
static int __init svia_init(void)
{
return pci_module_init(&svia_pci_driver);
}
-
-/**
- * svia_exit -
- *
- * LOCKING:
- *
- */
static void __exit svia_exit(void)
{