Commit 338e33ac authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-3.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata 

Pull libata changes from Tejun Heo:
 "Nothing too interesting.  PCI ID additions, some sata_rcar fixes and a
  fringe bug fix for DMADIR handling which shouldn't affect any device
  remotely modern."

* 'for-3.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  sata_rcar: fix interrupt handling
  ahci: add an observed PCI ID for Marvell 88se9172 SATA controller
  sata_rcar: clear STOP bit in bmdma_start() method
  libata: make ata_exec_internal_sg honor DMADIR
  ata_piix: add PCI IDs for Intel BayTail
  libata: update "Maintained by:" tags
parents d683b96b 52a2a108

drivers/ata/acard-ahci.c

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
/*

 *  acard-ahci.c - ACard AHCI SATA support

 *

 *  Maintained by:  Jeff Garzik <jgarzik@pobox.com>

 *  Maintained by:  Tejun Heo <tj@kernel.org>

 *		    Please ALWAYS copy linux-ide@vger.kernel.org

 *		    on emails.

 *

drivers/ata/ahci.c

+3 −1
Original line number Diff line number Diff line 
/*

 *  ahci.c - AHCI SATA support

 *

 *  Maintained by:  Jeff Garzik <jgarzik@pobox.com>

 *  Maintained by:  Tejun Heo <tj@kernel.org>

 *    		    Please ALWAYS copy linux-ide@vger.kernel.org

 *		    on emails.

 *
@@ -423,6 +423,8 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	  .driver_data = board_ahci_yes_fbs },			/* 88se9125 */

	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x917a),

	  .driver_data = board_ahci_yes_fbs },			/* 88se9172 */

	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9172),

	  .driver_data = board_ahci_yes_fbs },			/* 88se9172 */

	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9192),

	  .driver_data = board_ahci_yes_fbs },			/* 88se9172 on some Gigabyte */

	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x91a3),

drivers/ata/ahci.h

+1 −1
Original line number Diff line number Diff line 
/*

 *  ahci.h - Common AHCI SATA definitions and declarations

 *

 *  Maintained by:  Jeff Garzik <jgarzik@pobox.com>

 *  Maintained by:  Tejun Heo <tj@kernel.org>

 *    		    Please ALWAYS copy linux-ide@vger.kernel.org

 *		    on emails.

 *

drivers/ata/ata_piix.c

+16 −1
Original line number Diff line number Diff line 
/*

 *    ata_piix.c - Intel PATA/SATA controllers

 *

 *    Maintained by:  Jeff Garzik <jgarzik@pobox.com>

 *    Maintained by:  Tejun Heo <tj@kernel.org>

 *    		    Please ALWAYS copy linux-ide@vger.kernel.org

 *		    on emails.

 *
@@ -151,6 +151,7 @@ enum piix_controller_ids { 
	piix_pata_vmw,			/* PIIX4 for VMware, spurious DMA_ERR */

	ich8_sata_snb,

	ich8_2port_sata_snb,

	ich8_2port_sata_byt,

};



struct piix_map_db {
@@ -334,6 +335,9 @@ static const struct pci_device_id piix_pci_tbl[] = { 
	{ 0x8086, 0x8d60, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },

	/* SATA Controller IDE (Wellsburg) */

	{ 0x8086, 0x8d68, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },

	/* SATA Controller IDE (BayTrail) */

	{ 0x8086, 0x0F20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata_byt },

	{ 0x8086, 0x0F21, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata_byt },



	{ }	/* terminate list */

};
@@ -441,6 +445,7 @@ static const struct piix_map_db *piix_map_db_table[] = { 
	[tolapai_sata]		= &tolapai_map_db,

	[ich8_sata_snb]		= &ich8_map_db,

	[ich8_2port_sata_snb]	= &ich8_2port_map_db,

	[ich8_2port_sata_byt]	= &ich8_2port_map_db,

};



static struct pci_bits piix_enable_bits[] = {
@@ -1254,6 +1259,16 @@ static struct ata_port_info piix_port_info[] = { 
		.udma_mask	= ATA_UDMA6,

		.port_ops	= &piix_sata_ops,

	},



	[ich8_2port_sata_byt] =

	{

		.flags          = PIIX_SATA_FLAGS | PIIX_FLAG_SIDPR | PIIX_FLAG_PIO16,

		.pio_mask       = ATA_PIO4,

		.mwdma_mask     = ATA_MWDMA2,

		.udma_mask      = ATA_UDMA6,

		.port_ops       = &piix_sata_ops,

	},



};



#define AHCI_PCI_BAR 5

drivers/ata/libahci.c

+1 −1
Original line number Diff line number Diff line 
/*

 *  libahci.c - Common AHCI SATA low-level routines

 *

 *  Maintained by:  Jeff Garzik <jgarzik@pobox.com>

 *  Maintained by:  Tejun Heo <tj@kernel.org>

 *    		    Please ALWAYS copy linux-ide@vger.kernel.org

 *		    on emails.

 *

CRA Git | Maintained and supported by SUSTech CRA and CCSE