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

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

* 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (119 commits)
  [libata] struct pci_dev related cleanups
  libata: use ata_exec_internal() for PMP register access
  libata: implement ATA_PFLAG_RESETTING
  libata: add @timeout to ata_exec_internal[_sg]()
  ahci: fix notification handling
  ahci: clean up PORT_IRQ_BAD_PMP enabling
  ahci: kill leftover from enabling NCQ over PMP
  libata: wrap schedule_timeout_uninterruptible() in loop
  libata: skip suppress reporting if ATA_EHI_QUIET
  libata: clear ehi description after initial host report
  pata_jmicron: match vendor and class code only
  libata: add ST9160821AS / 3.ALD to NCQ blacklist
  pata_acpi: ACPI driver support
  libata-core: Expose gtm methods for driver use
  libata: add HDT722516DLA380 to NCQ blacklist
  libata: blacklist NCQ on Seagate Barracuda ST380817AS
  [libata] Turn on ACPI by default
  libata_scsi: Fix ATAPI transfer lengths
  libata: correct handling of SRST reset sequences
  libata: Integrate ACPI-based PATA/SATA hotplug - version 5
  ...
parents 8bd0983e 2855568b

Documentation/kernel-parameters.txt

+4 −4
Original line number Diff line number Diff line
@@ -865,6 +865,10 @@ and is between 256 and 4096 characters. It is defined in the file 
	lasi=		[HW,SCSI] PARISC LASI driver for the 53c700 chip

			Format: addr:<io>,irq:<irq>



	libata.noacpi	[LIBATA] Disables use of ACPI in libata suspend/resume

			when set.

			Format: <int>



	load_ramdisk=	[RAM] List of ramdisks to load from floppy

			See Documentation/ramdisk.txt.
@@ -1085,10 +1089,6 @@ and is between 256 and 4096 characters. It is defined in the file 
			emulation library even if a 387 maths coprocessor

			is present.



	noacpi		[LIBATA] Disables use of ACPI in libata suspend/resume

			when set.

			Format: <int>



	noaliencache	[MM, NUMA, SLAB] Disables the allocation of alien

			caches in the slab allocator.  Saves per-node memory,

			but will impact performance.

drivers/ata/Kconfig

+51 −8
Original line number Diff line number Diff line
@@ -173,6 +173,15 @@ config SATA_INIC162X 
	help

	  This option enables support for Initio 162x Serial ATA.



config PATA_ACPI

	tristate "ACPI firmware driver for PATA"

	depends on ATA_ACPI

	help

	  This option enables an ACPI method driver which drives

	  motherboard PATA controller interfaces through the ACPI

	  firmware in the BIOS. This driver can sometimes handle

	  otherwise unsupported hardware.



config PATA_ALI

	tristate "ALi PATA support (Experimental)"

	depends on PCI && EXPERIMENTAL
@@ -192,16 +201,25 @@ config PATA_AMD 
	  If unsure, say N.



config PATA_ARTOP

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

	depends on PCI && EXPERIMENTAL

	tristate "ARTOP 6210/6260 PATA support"

	depends on PCI

	help

	  This option enables support for ARTOP PATA controllers.



	  If unsure, say N.



config PATA_AT32

	tristate "Atmel AVR32 PATA support (Experimental)"

	depends on AVR32 && PLATFORM_AT32AP && EXPERIMENTAL

	help

	  This option enables support for the IDE devices on the

	  Atmel AT32AP platform.



	  If unsure, say N.



config PATA_ATIIXP

	tristate "ATI PATA support (Experimental)"

	depends on PCI && EXPERIMENTAL

	tristate "ATI PATA support"

	depends on PCI

	help

	  This option enables support for the ATI ATA interfaces

	  found on the many ATI chipsets.
@@ -219,8 +237,8 @@ config PATA_CMD640_PCI 
	  If unsure, say N.



config PATA_CMD64X

	tristate "CMD64x PATA support (Very Experimental)"

	depends on PCI&& EXPERIMENTAL

	tristate "CMD64x PATA support"

	depends on PCI

	help

	  This option enables support for the CMD64x series chips

	  except for the CMD640.
@@ -282,8 +300,8 @@ config ATA_GENERIC 
	  If unsure, say N.



config PATA_HPT366

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

	depends on PCI && EXPERIMENTAL

	tristate "HPT 366/368 PATA support"

	depends on PCI

	help

	  This option enables support for the HPT 366 and 368

	  PATA controllers via the new ATA layer.
@@ -432,6 +450,15 @@ config PATA_NS87410 


	  If unsure, say N.



config PATA_NS87415

	tristate "Nat Semi NS87415 PATA support (Experimental)"

	depends on PCI && EXPERIMENTAL

	help

	  This option enables support for the National Semiconductor

	  NS87415 PCI-IDE controller.



	  If unsure, say N.



config PATA_OPTI

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

	depends on PCI && EXPERIMENTAL
@@ -596,4 +623,20 @@ config PATA_SCC 


	  If unsure, say N.



config PATA_BF54X

	tristate "Blackfin 54x ATAPI support"

	depends on BF542 || BF548 || BF549

	help

	  This option enables support for the built-in ATAPI controller on

	  Blackfin 54x family chips.



	  If unsure, say N.



config PATA_BF54X_DMA

	bool "DMA mode"

	depends on PATA_BF54X

	default y

	help

	  Enable DMA mode for Blackfin ATAPI controller.



endif # ATA

drivers/ata/Makefile

+7 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 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_AT32)		+= pata_at32.o

obj-$(CONFIG_PATA_ATIIXP)	+= pata_atiixp.o

obj-$(CONFIG_PATA_CMD640_PCI)	+= pata_cmd640.o

obj-$(CONFIG_PATA_CMD64X)	+= pata_cmd64x.o
@@ -39,6 +40,7 @@ obj-$(CONFIG_PATA_IT8213) += pata_it8213.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_NS87415)	+= pata_ns87415.o

obj-$(CONFIG_PATA_OPTI)		+= pata_opti.o

obj-$(CONFIG_PATA_OPTIDMA)	+= pata_optidma.o

obj-$(CONFIG_PATA_MPC52xx)	+= pata_mpc52xx.o
@@ -61,12 +63,16 @@ obj-$(CONFIG_PATA_SIS) += pata_sis.o 
obj-$(CONFIG_PATA_TRIFLEX)	+= pata_triflex.o

obj-$(CONFIG_PATA_IXP4XX_CF)	+= pata_ixp4xx_cf.o

obj-$(CONFIG_PATA_SCC)		+= pata_scc.o

obj-$(CONFIG_PATA_BF54X)	+= pata_bf54x.o

obj-$(CONFIG_PATA_PLATFORM)	+= pata_platform.o

obj-$(CONFIG_PATA_ICSIDE)	+= pata_icside.o

# Should be last but two libata driver

obj-$(CONFIG_PATA_ACPI)		+= pata_acpi.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

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

		   libata-pmp.o

libata-$(CONFIG_ATA_ACPI)	+= libata-acpi.o

drivers/ata/ahci.c

+306 −145

File changed.

Preview size limit exceeded, changes collapsed.

drivers/ata/ata_generic.c

+7 −9
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 


/**

 *	generic_set_mode	-	mode setting

 *	@ap: interface to set up

 *	@link: link to set up

 *	@unused: returned device on error

 *

 *	Use a non standard set_mode function. We don't want to be tuned.
@@ -43,24 +43,24 @@ 
 *	and respect them.

 */



static int generic_set_mode(struct ata_port *ap, struct ata_device **unused)

static int generic_set_mode(struct ata_link *link, struct ata_device **unused)

{

	struct ata_port *ap = link->ap;

	int dma_enabled = 0;

	int i;

	struct ata_device *dev;



	/* Bits 5 and 6 indicate if DMA is active on master/slave */

	if (ap->ioaddr.bmdma_addr)

		dma_enabled = ioread8(ap->ioaddr.bmdma_addr + ATA_DMA_STATUS);



	for (i = 0; i < ATA_MAX_DEVICES; i++) {

		struct ata_device *dev = &ap->device[i];

	ata_link_for_each_dev(dev, link) {

		if (ata_dev_enabled(dev)) {

			/* We don't really care */

			dev->pio_mode = XFER_PIO_0;

			dev->dma_mode = XFER_MW_DMA_0;

			/* We do need the right mode information for DMA or PIO

			   and this comes from the current configuration flags */

			if (dma_enabled & (1 << (5 + i))) {

			if (dma_enabled & (1 << (5 + dev->devno))) {

				ata_id_to_dma_mode(dev, XFER_MW_DMA_0);

				dev->flags &= ~ATA_DFLAG_PIO;

			} else {
@@ -95,7 +95,6 @@ static struct scsi_host_template generic_sht = { 
static struct ata_port_operations generic_port_ops = {

	.set_mode	= generic_set_mode,



	.port_disable	= ata_port_disable,

	.tf_load	= ata_tf_load,

	.tf_read	= ata_tf_read,

	.check_status 	= ata_check_status,
@@ -121,9 +120,8 @@ static struct ata_port_operations generic_port_ops = { 
	.irq_handler	= ata_interrupt,

	.irq_clear	= ata_bmdma_irq_clear,

	.irq_on		= ata_irq_on,

	.irq_ack	= ata_irq_ack,



	.port_start	= ata_port_start,

	.port_start	= ata_sff_port_start,

};



static int all_generic_ide;		/* Set to claim all devices */

CRA Git | Maintained and supported by SUSTech CRA and CCSE