Skip to contentSkip to conversation

libata updates for 2.6.35

PATCH New Jeff Garzik 1 participant 1 message May 19, 2010

Subsystems (8)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libata updates for 2.6.35

Notable changes:

* ahci: "libahci" split out of ahci driver, because several knockoffs have emerged that require a fair amount of vendor-specific code
* ahci: uses less power
* ahci: improved enclosure management interface
* PIO command submission uses fewer PIO cycles
* cleanups improving separation between SFF (original IDE interface) and BMDMA (PCI IDE DMA). NOTE: A few more patches coming down the pipe, to finish this off.
* other random minor bits

Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus

to receive the following updates:

 Documentation/DocBook/libata.tmpl   |   18 +-
 drivers/ata/Kconfig                 |   20 +-
 drivers/ata/Makefile                |    3 +-
 drivers/ata/ahci.c                  | 2544 +++--------------------------------
 drivers/ata/ahci.h                  |  343 +++++
 drivers/ata/ahci_platform.c         |  192 +++
 drivers/ata/libahci.c               | 2216 ++++++++++++++++++++++++++++++
 drivers/ata/libata-core.c           |  216 +---
 drivers/ata/libata-eh.c             |    6 +-
 drivers/ata/libata-pmp.c            |   32 +-
 drivers/ata/libata-scsi.c           |    3 -
 drivers/ata/libata-sff.c            | 1387 ++++++++++---------
 drivers/ata/libata.h                |   29 +-
 drivers/ata/pata_acpi.c             |    8 +-
 drivers/ata/pata_ali.c              |    2 +-
 drivers/ata/pata_at91.c             |    1 -
 drivers/ata/pata_atiixp.c           |    2 +-
 drivers/ata/pata_bf54x.c            |   87 +-
 drivers/ata/pata_cmd640.c           |   13 +-
 drivers/ata/pata_cs5520.c           |    2 +-
 drivers/ata/pata_cs5530.c           |    4 +-
 drivers/ata/pata_hpt366.c           |    2 +-
 drivers/ata/pata_hpt37x.c           |    4 +-
 drivers/ata/pata_hpt3x2n.c          |    2 +-
 drivers/ata/pata_icside.c           |    5 +-
 drivers/ata/pata_it821x.c           |    6 +-
 drivers/ata/pata_macio.c            |    5 +-
 drivers/ata/pata_mpc52xx.c          |   78 +-
 drivers/ata/pata_ns87415.c          |    2 +-
 drivers/ata/pata_octeon_cf.c        |   12 +-
 drivers/ata/pata_oldpiix.c          |    2 +-
 drivers/ata/pata_pcmcia.c           |    2 +-
 drivers/ata/pata_pdc2027x.c         |    4 +-
 drivers/ata/pata_pdc202xx_old.c     |    2 +-
 drivers/ata/pata_platform.c         |    1 -
 drivers/ata/pata_radisys.c          |    2 +-
 drivers/ata/pata_sc1200.c           |    4 +-
 drivers/ata/pata_scc.c              |   80 +-
 drivers/ata/pata_sch.c              |   12 +-
 drivers/ata/pata_serverworks.c      |    6 +-
 drivers/ata/pata_sil680.c           |   30 +-
 drivers/ata/pata_via.c              |    6 +-
 drivers/ata/pdc_adma.c              |   74 +-
 drivers/ata/sata_inic162x.c         |   25 +-
 drivers/ata/sata_mv.c               |   47 +-
 drivers/ata/sata_nv.c               |  265 ++--
 drivers/ata/sata_promise.c          |   32 +-
 drivers/ata/sata_qstor.c            |   90 +-
 drivers/ata/sata_sil.c              |    9 +-
 drivers/ata/sata_sil24.c            |    9 +-
 drivers/ata/sata_svw.c              |    2 +-
 drivers/ata/sata_sx4.c              |   10 +-
 drivers/ata/sata_uli.c              |    4 +-
 drivers/ata/sata_vsc.c              |   10 +-
 drivers/scsi/ipr.c                  |    6 +-
 drivers/scsi/libsas/sas_scsi_host.c |    2 +-
 include/linux/ahci_platform.h       |   29 +
 include/linux/ata.h                 |    2 +-
 include/linux/libata.h              |   80 +-
 59 files changed, 4212 insertions(+), 3879 deletions(-)
 create mode 100644 drivers/ata/ahci.h
 create mode 100644 drivers/ata/ahci_platform.c
 create mode 100644 drivers/ata/libahci.c
 create mode 100644 include/linux/ahci_platform.h

Akinobu Mita (1):
libata: use __ratelimit

Alan Cox (2):
libata: Remove excess delay in the tf_load path
pata_sil680: Do our own exec_command posting

Anton Vorontsov (10):
ahci: Get rid of host->iomap usage
ahci: Factor out PCI specifics from ahci_save_initial_config()
ahci: Get rid of pci_dev argument in ahci_save_initial_config()
ahci: Factor out PCI specifics from ahci_reset_controller()
ahci: Get rid of pci_dev argument in ahci_port_init()
ahci: Factor out PCI specifics from ahci_init_controller()
ahci: Factor out PCI specifics from ahci_print_info()
ahci: Introduce ahci_set_em_messages()
ahci: Move generic code into libahci
ahci: Add platform driver

Grant Grundler (1):
[libata] Disable R_OK (Early ACK) on SII 3726 PMP

Harry Zhang (2):
ahci: EM message type auto detect
ahci: add "em_buffer" attribute for AHCI hosts

Jeff Garzik (1):
ahci_platform: properly set up EM messaging

Matthew Garrett (1):
ahci: Turn off DMA engines when there's no device attached

Roman Fietze (1):
pata_mpc52xx: reduce code size by simple change of constant data types

Sebastian Andrzej Siewior (1):
libata: don't flush dcache on slab pages

Sergei Shtylyov (6):
libata-sff: kill unused ata_bus_reset()
pata_scc: make scc_wait_after_reset() static
pata_scc: kill useless check in scc_postreset()
libata: introduce sff_set_devctl() method
libata: make sff_irq_on() method optional
pata_cmd640: don't read CFR pointlessly

Tejun Heo (23):
ahci: clean up board IDs
ahci: implement AHCI_HFLAG_NO_FPDMA_AA and update NV quirks
libata: update gfp/slab.h includes
libata: use longer 0xff wait if parallel scan is enabled
sata_nv: use ata_pci_sff_activate_host() instead of ata_host_activate()
pata_sch: use ata_pci_sff_init_one()
sata_inic162x: inic162x is not dependent on CONFIG_ATA_SFF
sata_mv: remove unnecessary initialization
libata-sff: update bmdma host bus error handling
libata-sff: kill unused prototype and make ata_dev_select() static
libata: kill ATA_FLAG_DISABLED
sata_inic162x: kill PORT_PRD_ADDR initialization
libata-sff: reorder SFF/BMDMA functions
libata-sff: clean up inheritance in several drivers
libata-sff: clean up BMDMA initialization
libata-sff: introduce ata_sff_init/exit() and ata_sff_port_init()
libata-sff: rename ap->ops->drain_fifo() to sff_drain_fifo()
libata-sff: ap->[last_]ctl are SFF specific
libata-sff: port_task is SFF specific
libata-sff: separate out BMDMA EH
libata-sff: ata_sff_[dumb_]qc_prep are BMDMA specific
libata-sff: prd is BMDMA specific
libata-sff: separate out BMDMA qc_issue

Documentation/DocBook/libata.tmpl +14 -4
index ff3e5be..828748c 100644
@@ -81,16 +81,14 @@ void (*port_disable) (struct ata_port *);
 	</programlisting>
 
 	<para>
-	Called from ata_bus_probe() and ata_bus_reset() error paths,
-	as well as when unregistering from the SCSI module (rmmod, hot
-	unplug).
+	Called from ata_bus_probe() error path, as well as when
+	unregistering from the SCSI module (rmmod, hot unplug).
 	This function should do whatever needs to be done to take the
 	port out of use.  In most cases, ata_port_disable() can be used
 	as this hook.
 	</para>
 	<para>
 	Called from ata_bus_probe() on a failed probe.
-	Called from ata_bus_reset() on a failed bus reset.
 	Called from ata_scsi_release().
 	</para>
 
@@ -227,6 +225,18 @@ u8   (*sff_check_altstatus)(struct ata_port *ap);
 
 	</sect2>
 
+	<sect2><title>Write specific ATA shadow register</title>
+	<programlisting>
+void (*sff_set_devctl)(struct ata_port *ap, u8 ctl);
+	</programlisting>
+
+	<para>
+	Write the device control ATA shadow register to the hardware.
+	Most drivers don't need to define this.
+	</para>
+
+	</sect2>
+
 	<sect2><title>Select ATA device on bus</title>
 	<programlisting>
 void (*sff_dev_select)(struct ata_port *ap, unsigned int device);
drivers/ata/Kconfig +14 -6
index 01c52c4..e68541f 100644
@@ -65,6 +65,14 @@ config SATA_AHCI
 
 	  If unsure, say N.
 
+config SATA_AHCI_PLATFORM
+	tristate "Platform AHCI SATA support"
+	help
+	  This option enables support for Platform AHCI Serial ATA
+	  controllers.
+
+	  If unsure, say N.
+
 config SATA_SIL24
 	tristate "Silicon Image 3124/3132 SATA support"
 	depends on PCI
@@ -73,6 +81,12 @@ config SATA_SIL24
 
 	  If unsure, say N.
 
+config SATA_INIC162X
+	tristate "Initio 162x SATA support"
+	depends on PCI
+	help
+	  This option enables support for Initio 162x Serial ATA.
+
 config SATA_FSL
 	tristate "Freescale 3.0Gbps SATA support"
 	depends on FSL_SOC
@@ -213,12 +227,6 @@ config SATA_VITESSE
 
 	  If unsure, say N.
 
-config SATA_INIC162X
-	tristate "Initio 162x SATA support"
-	depends on PCI
-	help
-	  This option enables support for Initio 162x Serial ATA.
-
 config PATA_ACPI
 	tristate "ACPI firmware driver for PATA"
 	depends on ATA_ACPI
drivers/ata/Makefile +2 -1
index fc936d4..d0a93c4 100644
@@ -1,7 +1,8 @@
 
 obj-$(CONFIG_ATA)		+= libata.o
 
-obj-$(CONFIG_SATA_AHCI)		+= ahci.o
+obj-$(CONFIG_SATA_AHCI)		+= ahci.o libahci.o
+obj-$(CONFIG_SATA_AHCI_PLATFORM) += ahci_platform.o libahci.o
 obj-$(CONFIG_SATA_SVW)		+= sata_svw.o
 obj-$(CONFIG_ATA_PIIX)		+= ata_piix.o
 obj-$(CONFIG_SATA_PROMISE)	+= sata_promise.o
drivers/ata/ahci.c +167 -2377

2,767 lines not on this page · raw message

drivers/ata/ahci.h new file +343 -0

150 lines not on this page · raw message

drivers/ata/ahci_platform.c new file +192 -0

192 lines not on this page · raw message

drivers/ata/libahci.c new file +2216 -0

2,216 lines not on this page · raw message

drivers/ata/libata-core.c +31 -185

216 lines not on this page · raw message

drivers/ata/libata-eh.c +3 -3
index 228740f..f77a673 100644

Lines of this file are not shown. View the raw message.

drivers/ata/libata-pmp.c +29 -3
index 00305f4..224faab 100644

Lines of this file are not shown. View the raw message.

drivers/ata/libata-scsi.c +0 -3
index 0088cde..cfa9dd3 100644

Lines of this file are not shown. View the raw message.

drivers/ata/libata-sff.c +714 -673

1,387 lines not on this page · raw message

drivers/ata/libata.h +13 -16
index 823e630..4b84ed6 100644

Lines of this file are not shown. View the raw message.

drivers/ata/pata_acpi.c +4 -4
index 1ea2be0..066b9f3 100644

Lines of this file are not shown. View the raw message.

drivers/ata/pata_ali.c +1 -1
index dc61b72..f306e10 100644

Lines of this file are not shown. View the raw message.

drivers/ata/pata_at91.c +0 -1
index c6a946a..0da0dcc 100644

Lines of this file are not shown. View the raw message.

drivers/ata/pata_atiixp.c +1 -1
index cbaf2ed..44d88b3 100644

Lines of this file are not shown. View the raw message.

drivers/ata/pata_bf54x.c +21 -66

87 lines not on this page · raw message

drivers/ata/pata_cmd640.c +3 -10
index 45896b3..e5f289f 100644

Lines of this file are not shown. View the raw message.

drivers/ata/pata_cs5520.c +1 -1
index 95ebdac..17c5f34 100644

Lines of this file are not shown. View the raw message.

drivers/ata/pata_cs5530.c +2 -2
index 738ad2e..e809a42 100644

Lines of this file are not shown. View the raw message.

drivers/ata/pata_hpt366.c +1 -1
index af49bfb..8580eb3 100644

Lines of this file are not shown. View the raw message.

drivers/ata/pata_hpt37x.c +2 -2
index 8839307..98b498b 100644

Lines of this file are not shown. View the raw message.

drivers/ata/pata_hpt3x2n.c +1 -1
index 01457b2..8b95aeb 100644

Lines of this file are not shown. View the raw message.

drivers/ata/pata_icside.c +3 -2
index fa812e2..b56e8f7 100644

Lines of this file are not shown. View the raw message.

drivers/ata/pata_it821x.c +3 -3
index 5cb286f..2bd2b00 100644

Lines of this file are not shown. View the raw message.

drivers/ata/pata_macio.c +3 -2
index 211b643..25df50f 100644

Lines of this file are not shown. View the raw message.

drivers/ata/pata_mpc52xx.c +39 -39

78 lines not on this page · raw message

drivers/ata/pata_ns87415.c +1 -1
index 830431f..fdbba2d 100644

Lines of this file are not shown. View the raw message.

drivers/ata/pata_octeon_cf.c +3 -9
index 005a444..3001109 100644

Lines of this file are not shown. View the raw message.

drivers/ata/pata_oldpiix.c +1 -1
index 5f6aba7..988ef26 100644

Lines of this file are not shown. View the raw message.

drivers/ata/pata_pcmcia.c +1 -1
index d94b8f0..ef37438 100644

Lines of this file are not shown. View the raw message.

drivers/ata/pata_pdc2027x.c +2 -2
index ca5cad0..09f1f22 100644

Lines of this file are not shown. View the raw message.

drivers/ata/pata_pdc202xx_old.c +1 -1
index 9ac0897..fa1e2f3 100644

Lines of this file are not shown. View the raw message.

drivers/ata/pata_platform.c +0 -1
index 3f6ebc6..50400fa 100644

Lines of this file are not shown. View the raw message.

drivers/ata/pata_radisys.c +1 -1
index fc96022..a5fa388 100644

Lines of this file are not shown. View the raw message.

drivers/ata/pata_sc1200.c +2 -2
index dfecc6f..6b5b63a 100644

Lines of this file are not shown. View the raw message.

drivers/ata/pata_scc.c +20 -60

80 lines not on this page · raw message

drivers/ata/pata_sch.c +1 -11
index 99cceb4..86b3d01 100644

Lines of this file are not shown. View the raw message.

drivers/ata/pata_serverworks.c +3 -3
index 9524d54..43ea389 100644

Lines of this file are not shown. View the raw message.

drivers/ata/pata_sil680.c +26 -4
index c6c589c..43faf10 100644

Lines of this file are not shown. View the raw message.

drivers/ata/pata_via.c +2 -4
index 741e7cb..7e3e0a5 100644

Lines of this file are not shown. View the raw message.

drivers/ata/pdc_adma.c +31 -43

74 lines not on this page · raw message

drivers/ata/sata_inic162x.c +4 -21
index 27dc6c8..a36149e 100644

Lines of this file are not shown. View the raw message.

drivers/ata/sata_mv.c +24 -23

47 lines not on this page · raw message

drivers/ata/sata_nv.c +128 -135

263 lines not on this page · raw message

drivers/ata/sata_promise.c +16 -16
index 5356ec0..f03ad48 100644

Lines of this file are not shown. View the raw message.

drivers/ata/sata_qstor.c +39 -51

90 lines not on this page · raw message

drivers/ata/sata_sil.c +3 -6
index 3cb69d5..2dda312 100644

Lines of this file are not shown. View the raw message.

drivers/ata/sata_sil24.c +2 -7
index 433b6b8..e925051 100644

Lines of this file are not shown. View the raw message.

drivers/ata/sata_svw.c +1 -1
index 7257f2d..101fd6a 100644

Lines of this file are not shown. View the raw message.

drivers/ata/sata_sx4.c +2 -8
index 232468f..bedd518 100644

Lines of this file are not shown. View the raw message.

drivers/ata/sata_uli.c +1 -3
index 011e098..d8dac17 100644

Lines of this file are not shown. View the raw message.

drivers/ata/sata_vsc.c +2 -8
index 8b2a278..2107952 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/ipr.c +3 -3
index 520461b..b90c118 100644

Lines of this file are not shown. View the raw message.

drivers/scsi/libsas/sas_scsi_host.c +1 -1
index 8228350..b71b6d4 100644

Lines of this file are not shown. View the raw message.

include/linux/ahci_platform.h new file +29 -0
new file mode 100644
index 0000000..f7dd576

Lines of this file are not shown. View the raw message.

include/linux/ata.h +1 -1
index 700c5b9..fe6e681 100644

Lines of this file are not shown. View the raw message.

include/linux/libata.h +37 -43

80 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.