Commit a68aa1cc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: (50 commits)
  [libata] Delete pata_it8172 driver
  [PATCH] libata: improve handling of diagostic fail (and hardware that misreports it)
  [PATCH] libata: fix non-uniform ports handling
  Fix libata resource conflict for legacy mode
  [libata] ata_piix: build fix
  [PATCH] pata_amd: Check enable bits on Nvidia
  [PATCH] Update SiS PATA
  [libata] Add pata_jmicron driver to Kconfig, Makefile
  [libata #pata-drivers] Trim trailing whitespace.
  [libata] Trim trailing whitespace.
  [libata] Add a bunch of PATA drivers.
  Rename libata-bmdma.c to libata-sff.c.
  libata: Grand renaming.
  Clean up drivers/ata/Kconfig a bit.
  [PATCH] CONFIG_PM=n slim: drivers/scsi/sata_sil*
  [PATCH] sata_via: Add SATA support for vt8237a
  [PATCH] libata: change path to libata in libata.tmpl
  [PATCH] libata: s/CONFIG_SCSI_SATA/CONFIG_[S]ATA/g in pci/quirks.c
  libata: Make sure drivers/ata is a separate Kconfig menu
  [libata] ata_piix: add missing kfree()
  ...
parents a319a277 23930fa1

Documentation/DocBook/libata.tmpl

+6 −6
Original line number Diff line number Diff line
@@ -868,18 +868,18 @@ and other resources, etc. 


  <chapter id="libataExt">

     <title>libata Library</title>

!Edrivers/scsi/libata-core.c

!Edrivers/ata/libata-core.c

  </chapter>



  <chapter id="libataInt">

     <title>libata Core Internals</title>

!Idrivers/scsi/libata-core.c

!Idrivers/ata/libata-core.c

  </chapter>



  <chapter id="libataScsiInt">

     <title>libata SCSI translation/emulation</title>

!Edrivers/scsi/libata-scsi.c

!Idrivers/scsi/libata-scsi.c

!Edrivers/ata/libata-scsi.c

!Idrivers/ata/libata-scsi.c

  </chapter>



  <chapter id="ataExceptions">
@@ -1600,12 +1600,12 @@ and other resources, etc. 


  <chapter id="PiixInt">

     <title>ata_piix Internals</title>

!Idrivers/scsi/ata_piix.c

!Idrivers/ata/ata_piix.c

  </chapter>



  <chapter id="SILInt">

     <title>sata_sil Internals</title>

!Idrivers/scsi/sata_sil.c

!Idrivers/ata/sata_sil.c

  </chapter>



  <chapter id="libataThanks">

drivers/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ source "drivers/ide/Kconfig" 


source "drivers/scsi/Kconfig"



source "drivers/ata/Kconfig"



source "drivers/cdrom/Kconfig"



source "drivers/md/Kconfig"

drivers/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ obj-$(CONFIG_PPC_PMAC) += macintosh/ 
obj-$(CONFIG_IDE)		+= ide/

obj-$(CONFIG_FC4)		+= fc4/

obj-$(CONFIG_SCSI)		+= scsi/

obj-$(CONFIG_ATA)		+= ata/

obj-$(CONFIG_FUSION)		+= message/

obj-$(CONFIG_IEEE1394)		+= ieee1394/

obj-y				+= cdrom/

drivers/ata/Kconfig

0 → 100644
+484 −0
Original line number Diff line number Diff line 
#

# SATA/PATA driver configuration

#



menu "Serial ATA (prod) and Parallel ATA (experimental) drivers"



config ATA

	tristate "ATA device support"

	select SCSI

	---help---

	  If you want to use a ATA hard disk, ATA tape drive, ATA CD-ROM or

	  any other ATA device under Linux, say Y and make sure that you know

	  the name of your ATA host adapter (the card inside your computer

	  that "speaks" the ATA protocol, also called ATA controller),

	  because you will be asked for it.



if ATA



config SATA_AHCI

	tristate "AHCI SATA support"

	depends on PCI

	help

	  This option enables support for AHCI Serial ATA.



	  If unsure, say N.



config SATA_SVW

	tristate "ServerWorks Frodo / Apple K2 SATA support"

	depends on PCI

	help

	  This option enables support for Broadcom/Serverworks/Apple K2

	  SATA support.



	  If unsure, say N.



config ATA_PIIX

	tristate "Intel PIIX/ICH SATA support"

	depends on PCI

	help

	  This option enables support for ICH5/6/7/8 Serial ATA.

	  If PATA support was enabled previously, this enables

	  support for select Intel PIIX/ICH PATA host controllers.



	  If unsure, say N.



config SATA_MV

	tristate "Marvell SATA support (HIGHLY EXPERIMENTAL)"

	depends on PCI && EXPERIMENTAL

	help

	  This option enables support for the Marvell Serial ATA family.

	  Currently supports 88SX[56]0[48][01] chips.



	  If unsure, say N.



config SATA_NV

	tristate "NVIDIA SATA support"

	depends on PCI

	help

	  This option enables support for NVIDIA Serial ATA.



	  If unsure, say N.



config PDC_ADMA

	tristate "Pacific Digital ADMA support"

	depends on PCI

	help

	  This option enables support for Pacific Digital ADMA controllers



	  If unsure, say N.



config SATA_QSTOR

	tristate "Pacific Digital SATA QStor support"

	depends on PCI

	help

	  This option enables support for Pacific Digital Serial ATA QStor.



	  If unsure, say N.



config SATA_PROMISE

	tristate "Promise SATA TX2/TX4 support"

	depends on PCI

	help

	  This option enables support for Promise Serial ATA TX2/TX4.



	  If unsure, say N.



config SATA_SX4

	tristate "Promise SATA SX4 support"

	depends on PCI && EXPERIMENTAL

	help

	  This option enables support for Promise Serial ATA SX4.



	  If unsure, say N.



config SATA_SIL

	tristate "Silicon Image SATA support"

	depends on PCI

	help

	  This option enables support for Silicon Image Serial ATA.



	  If unsure, say N.



config SATA_SIL24

	tristate "Silicon Image 3124/3132 SATA support"

	depends on PCI

	help

	  This option enables support for Silicon Image 3124/3132 Serial ATA.



	  If unsure, say N.



config SATA_SIS

	tristate "SiS 964/180 SATA support"

	depends on PCI

	help

	  This option enables support for SiS Serial ATA 964/180.



	  If unsure, say N.



config SATA_ULI

	tristate "ULi Electronics SATA support"

	depends on PCI

	help

	  This option enables support for ULi Electronics SATA.



	  If unsure, say N.



config SATA_VIA

	tristate "VIA SATA support"

	depends on PCI

	help

	  This option enables support for VIA Serial ATA.



	  If unsure, say N.



config SATA_VITESSE

	tristate "VITESSE VSC-7174 / INTEL 31244 SATA support"

	depends on PCI

	help

	  This option enables support for Vitesse VSC7174 and Intel 31244 Serial ATA.



	  If unsure, say N.



config SATA_INTEL_COMBINED

	bool

	depends on IDE=y && !BLK_DEV_IDE_SATA && (SATA_AHCI || ATA_PIIX)

	default y



config PATA_ALI

	tristate "ALi PATA support (Experimental)"

	depends on PCI && EXPERIMENTAL

	help

	  This option enables support for the ALi ATA interfaces

	  found on the many ALi chipsets.



	  If unsure, say N.



config PATA_AMD

	tristate "AMD/NVidia PATA support (Experimental)"

	depends on PCI

	help

	  This option enables support for the AMD and NVidia PATA

	  interfaces found on the chipsets for Athlon/Athlon64.



	  If unsure, say N.



config PATA_ARTOP

	tristate "ARTOP 6210/6260 PATA support (Experimental)"

	depends on PCI && EXPERIMENTAL

	help

	  This option enables support for ARTOP PATA controllers.



	  If unsure, say N.



config PATA_ATIIXP

	tristate "ATI PATA support (Experimental)"

	depends on PCI && EXPERIMENTAL

	help

	  This option enables support for the ATI ATA interfaces

	  found on the many ATI chipsets.



	  If unsure, say N.



config PATA_CMD64X

	tristate "CMD64x PATA support (Very Experimental)"

	depends on PCI&& EXPERIMENTAL

	help

	  This option enables support for the CMD64x series chips

	  except for the CMD640.



	  If unsure, say N.



config PATA_CS5520

	tristate "CS5510/5520 PATA support"

	depends on PCI

	help

	  This option enables support for the Cyrix 5510/5520

	  companion chip used with the MediaGX/Geode processor family.



	  If unsure, say N.



config PATA_CS5530

	tristate "CS5530 PATA support (Experimental)"

	depends on PCI && EXPERIMENTAL

	help

	  This option enables support for the Cyrix/NatSemi/AMD CS5530

	  companion chip used with the MediaGX/Geode processor family.



	  If unsure, say N.



config PATA_CS5535

	tristate "CS5535 PATA support (Experimental)"

	depends on PCI && X86 && !X86_64 && EXPERIMENTAL

	help

	  This option enables support for the NatSemi/AMD CS5535

	  companion chip used with the Geode processor family.



	  If unsure, say N.



config PATA_CYPRESS

	tristate "Cypress CY82C693 PATA support (Very Experimental)"

	depends on PCI && EXPERIMENTAL

	help

	  This option enables support for the Cypress/Contaq CY82C693

	  chipset found in some Alpha systems



	  If unsure, say N.



config PATA_EFAR

	tristate "EFAR SLC90E66 support"

	depends on PCI

	help

	  This option enables support for the EFAR SLC90E66

	  IDE controller found on some older machines.



	  If unsure, say N.



config ATA_GENERIC

	tristate "Generic ATA support"

	depends on PCI

	help

	  This option enables support for generic BIOS configured

	  ATA controllers via the new ATA layer



	  If unsure, say N.



config PATA_HPT366

	tristate "HPT 366/368 PATA support (Very Experimental)"

	depends on PCI && EXPERIMENTAL

	help

	  This option enables support for the HPT 366 and 368

	  PATA controllers via the new ATA layer.



	  If unsure, say N.



config PATA_HPT37X

	tristate "HPT 370/370A/371/372/374/302 PATA support (Very Experimental)"

	depends on PCI && EXPERIMENTAL

	help

	  This option enables support for the majority of the later HPT

	  PATA controllers via the new ATA layer.



	  If unsure, say N.



config PATA_HPT3X2N

	tristate "HPT 372N/302N PATA support (Very Experimental)"

	depends on PCI && EXPERIMENTAL

	help

	  This option enables support for the N variant HPT PATA

	  controllers via the new ATA layer



	  If unsure, say N.



config PATA_HPT3X3

	tristate "HPT 343/363 PATA support (Experimental)"

	depends on PCI

	help

	  This option enables support for the HPT 343/363

	  PATA controllers via the new ATA layer



	  If unsure, say N.



config PATA_ISAPNP

	tristate "ISA Plug and Play PATA support (Very Experimental)"

	depends on EXPERIMENTAL && ISAPNP

	help

	  This option enables support for ISA plug & play ATA

	  controllers such as those found on old soundcards.



	  If unsure, say N.



config PATA_IT821X

	tristate "IT821x PATA support (Experimental)"

	depends on PCI && EXPERIMENTAL

	help

	  This option enables support for the ITE 8211 and 8212

	  PATA controllers via the new ATA layer, including RAID

	  mode.



	  If unsure, say N.



config PATA_JMICRON

	tristate "JMicron PATA support"

	depends on PCI

	help

	  Enable support for the JMicron IDE controller, via the new

	  ATA layer.



	  If unsure, say N.



config PATA_LEGACY

	tristate "Legacy ISA PATA support (Experimental)"

	depends on PCI && EXPERIMENTAL

	help

	  This option enables support for ISA/VLB bus legacy PATA

	  ports and allows them to be accessed via the new ATA layer.



	  If unsure, say N.



config PATA_TRIFLEX

	tristate "Compaq Triflex PATA support"

	depends on PCI

	help

	  Enable support for the Compaq 'Triflex' IDE controller as found

	  on many Compaq Pentium-Pro systems, via the new ATA layer.



	  If unsure, say N.



config PATA_MPIIX

	tristate "Intel PATA MPIIX support"

	depends on PCI

	help

	  This option enables support for MPIIX PATA support.



	  If unsure, say N.



config PATA_OLDPIIX

	tristate "Intel PATA old PIIX support (Experimental)"

	depends on PCI && EXPERIMENTAL

	help

	  This option enables support for old(?) PIIX PATA support.



	  If unsure, say N.



config PATA_NETCELL

	tristate "NETCELL Revolution RAID support"

	depends on PCI

	help

	  This option enables support for the Netcell Revolution RAID

	  PATA controller.



	  If unsure, say N.



config PATA_NS87410

	tristate "Nat Semi NS87410 PATA support (Experimental)"

	depends on PCI && EXPERIMENTAL

	help

	  This option enables support for the National Semiconductor

	  NS87410 PCI-IDE controller.



	  If unsure, say N.



config PATA_OPTI

	tristate "OPTI621/6215 PATA support (Very Experimental)"

	depends on PCI && EXPERIMENTAL

	help

	  This option enables full PIO support for the early Opti ATA

	  controllers found on some old motherboards.



	  If unsure, say N.



config PATA_OPTIDMA

	tristate "OPTI FireStar PATA support (Veyr Experimental)"

	depends on PCI && EXPERIMENTAL

	help

	  This option enables DMA/PIO support for the later OPTi

	  controllers found on some old motherboards and in some

	  latops



	  If unsure, say N.



config PATA_PCMCIA

	tristate "PCMCIA PATA support"

	depends on PCMCIA

	help

	  This option enables support for PCMCIA ATA interfaces, including

	  compact flash card adapters via the new ATA layer.



	  If unsure, say N.



config PATA_PDC_OLD

	tristate "Older Promise PATA controller support (Very Experimental)"

	depends on PCI && EXPERIMENTAL

	help

	  This option enables support for the Promise 20246, 20262, 20263,

	  20265 and 20267 adapters.



	  If unsure, say N.



config PATA_QDI

	tristate "QDI VLB PATA support"

	help

	  Support for QDI 6500 and 6580 PATA controllers on VESA local bus.



config PATA_RADISYS

	tristate "RADISYS 82600 PATA support (Very experimental)"

	depends on PCI && EXPERIMENTAL

	help

	  This option enables support for the RADISYS 82600

	  PATA controllers via the new ATA layer



	  If unsure, say N.



config PATA_RZ1000

	tristate "PC Tech RZ1000 PATA support"

	depends on PCI

	help

	  This option enables basic support for the PC Tech RZ1000/1

	  PATA controllers via the new ATA layer



	  If unsure, say N.



config PATA_SC1200

	tristate "SC1200 PATA support (Raving Lunatic)"

	depends on PCI && EXPERIMENTAL

	help

	  This option enables support for the NatSemi/AMD SC1200 SoC

	  companion chip used with the Geode processor family.



	  If unsure, say N.



config PATA_SERVERWORKS

	tristate "SERVERWORKS OSB4/CSB5/CSB6/HT1000 PATA support (Experimental)"

	depends on PCI && EXPERIMENTAL

	help

	  This option enables support for the Serverworks OSB4/CSB5/CSB6 and

	  HT1000 PATA controllers, via the new ATA layer.



	  If unsure, say N.



config PATA_PDC2027X

	tristate "Promise PATA 2027x support"

	depends on PCI

	help

	  This option enables support for Promise PATA pdc20268 to pdc20277 host adapters.



	  If unsure, say N.



config PATA_SIL680

	tristate "CMD / Silicon Image 680 PATA support"

	depends on PCI

	help

	  This option enables support for CMD / Silicon Image 680 PATA.



	  If unsure, say N.



config PATA_SIS

	tristate "SiS PATA support (Experimental)"

	depends on PCI && EXPERIMENTAL

	help

	  This option enables support for SiS PATA controllers



	  If unsure, say N.



config PATA_VIA

	tristate "VIA PATA support"

	depends on PCI

	help

	  This option enables support for the VIA PATA interfaces

	  found on the many VIA chipsets.



	  If unsure, say N.



config PATA_WINBOND

	tristate "Winbond SL82C105 PATA support"

	depends on PCI

	help

	  This option enables support for SL82C105 PATA devices found in the

	  Netwinder and some other systems



	  If unsure, say N.



endif

endmenu

drivers/ata/Makefile

0 → 100644
+62 −0
Original line number Diff line number Diff line 


obj-$(CONFIG_ATA)		+= libata.o



obj-$(CONFIG_SATA_AHCI)		+= ahci.o

obj-$(CONFIG_SATA_SVW)		+= sata_svw.o

obj-$(CONFIG_ATA_PIIX)		+= ata_piix.o

obj-$(CONFIG_SATA_PROMISE)	+= sata_promise.o

obj-$(CONFIG_SATA_QSTOR)	+= sata_qstor.o

obj-$(CONFIG_SATA_SIL)		+= sata_sil.o

obj-$(CONFIG_SATA_SIL24)	+= sata_sil24.o

obj-$(CONFIG_SATA_VIA)		+= sata_via.o

obj-$(CONFIG_SATA_VITESSE)	+= sata_vsc.o

obj-$(CONFIG_SATA_SIS)		+= sata_sis.o

obj-$(CONFIG_SATA_SX4)		+= sata_sx4.o

obj-$(CONFIG_SATA_NV)		+= sata_nv.o

obj-$(CONFIG_SATA_ULI)		+= sata_uli.o

obj-$(CONFIG_SATA_MV)		+= sata_mv.o

obj-$(CONFIG_PDC_ADMA)		+= pdc_adma.o



obj-$(CONFIG_PATA_ALI)		+= pata_ali.o

obj-$(CONFIG_PATA_AMD)		+= pata_amd.o

obj-$(CONFIG_PATA_ARTOP)	+= pata_artop.o

obj-$(CONFIG_PATA_ATIIXP)	+= pata_atiixp.o

obj-$(CONFIG_PATA_CMD64X)	+= pata_cmd64x.o

obj-$(CONFIG_PATA_CS5520)	+= pata_cs5520.o

obj-$(CONFIG_PATA_CS5530)	+= pata_cs5530.o

obj-$(CONFIG_PATA_CS5535)	+= pata_cs5535.o

obj-$(CONFIG_PATA_CYPRESS)	+= pata_cypress.o

obj-$(CONFIG_PATA_EFAR)		+= pata_efar.o

obj-$(CONFIG_PATA_HPT366)	+= pata_hpt366.o

obj-$(CONFIG_PATA_HPT37X)	+= pata_hpt37x.o

obj-$(CONFIG_PATA_HPT3X2N)	+= pata_hpt3x2n.o

obj-$(CONFIG_PATA_HPT3X3)	+= pata_hpt3x3.o

obj-$(CONFIG_PATA_ISAPNP)	+= pata_isapnp.o

obj-$(CONFIG_PATA_IT821X)	+= pata_it821x.o

obj-$(CONFIG_PATA_JMICRON)	+= pata_jmicron.o

obj-$(CONFIG_PATA_NETCELL)	+= pata_netcell.o

obj-$(CONFIG_PATA_NS87410)	+= pata_ns87410.o

obj-$(CONFIG_PATA_OPTI)		+= pata_opti.o

obj-$(CONFIG_PATA_OPTIDMA)	+= pata_optidma.o

obj-$(CONFIG_PATA_MPIIX)	+= pata_mpiix.o

obj-$(CONFIG_PATA_OLDPIIX)	+= pata_oldpiix.o

obj-$(CONFIG_PATA_PCMCIA)	+= pata_pcmcia.o

obj-$(CONFIG_PATA_PDC2027X)	+= pata_pdc2027x.o

obj-$(CONFIG_PATA_PDC_OLD)	+= pata_pdc202xx_old.o

obj-$(CONFIG_PATA_QDI)		+= pata_qdi.o

obj-$(CONFIG_PATA_RADISYS)	+= pata_radisys.o

obj-$(CONFIG_PATA_RZ1000)	+= pata_rz1000.o

obj-$(CONFIG_PATA_SC1200)	+= pata_sc1200.o

obj-$(CONFIG_PATA_SERVERWORKS)	+= pata_serverworks.o

obj-$(CONFIG_PATA_SIL680)	+= pata_sil680.o

obj-$(CONFIG_PATA_VIA)		+= pata_via.o

obj-$(CONFIG_PATA_WINBOND)	+= pata_sl82c105.o

obj-$(CONFIG_PATA_SIS)		+= pata_sis.o

obj-$(CONFIG_PATA_TRIFLEX)	+= pata_triflex.o

# Should be last but one libata driver

obj-$(CONFIG_ATA_GENERIC)	+= ata_generic.o

# Should be last libata driver

obj-$(CONFIG_PATA_LEGACY)	+= pata_legacy.o



libata-objs	:= libata-core.o libata-scsi.o libata-sff.o libata-eh.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE