Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90597b6c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev 

Pull libata updates from Jeff Garzik:

 1) AHCI regression fix.  A recent "make driver conform to spec" change
    broke on deployed hardware.  Make new behavior optional, rather than
    default, turning it on only for specific embedded platforms that
    need this.

    Everybody else runs in the famous "non conformant but working" mode.

 2) pata_cmd64x, pata_legacy cleanups

 3) new Intel SATA PCI IDs

 4) misc minor vendor feature additions

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  pata_cmd64x: implement sff_irq_check() method
  pata_cmd64x: implement sff_irq_clear() method
  pata_cmd64x: use interrupt status from MRDMODE register
  pata_cmd64x: turn string of *if* statements into *switch*
  drivers/ata/pata_mpc52xx.c: clean up error handling code
  ahci_platform: add STRICT_AHCI platform type
  ahci: move AHCI_HFLAGS() macro to ahci.h
  ahci: add AHCI_HFLAG_DELAY_ENGINE host flag
  sata_fsl: add support for interrupt coalsecing feature
  ata/pata_arasan_cf: Add Hibernation support
  pata_legacy: correctly mask recovery field for HT6560B
  ata_piix: IDE-mode SATA patch for Intel Lynx Point DeviceIDs
  ahci: AHCI-mode SATA patch for Intel Lynx Point DeviceIDs
parents 7bfe0e66 b8cec3c2

drivers/ata/ahci.c

+8 −2
Original line number Diff line number Diff line
@@ -103,8 +103,6 @@ static struct ata_port_operations ahci_p5wdh_ops = { 
	.hardreset		= ahci_p5wdh_hardreset,

};



#define AHCI_HFLAGS(flags)	.private_data	= (void *)(flags)



static const struct ata_port_info ahci_port_info[] = {

	/* by features */

	[board_ahci] =
@@ -261,6 +259,14 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, 0x1e06), board_ahci }, /* Panther Point RAID */

	{ PCI_VDEVICE(INTEL, 0x1e07), board_ahci }, /* Panther Point RAID */

	{ PCI_VDEVICE(INTEL, 0x1e0e), board_ahci }, /* Panther Point RAID */

	{ PCI_VDEVICE(INTEL, 0x8c02), board_ahci }, /* Lynx Point AHCI */

	{ PCI_VDEVICE(INTEL, 0x8c03), board_ahci }, /* Lynx Point AHCI */

	{ PCI_VDEVICE(INTEL, 0x8c04), board_ahci }, /* Lynx Point RAID */

	{ PCI_VDEVICE(INTEL, 0x8c05), board_ahci }, /* Lynx Point RAID */

	{ PCI_VDEVICE(INTEL, 0x8c06), board_ahci }, /* Lynx Point RAID */

	{ PCI_VDEVICE(INTEL, 0x8c07), board_ahci }, /* Lynx Point RAID */

	{ PCI_VDEVICE(INTEL, 0x8c0e), board_ahci }, /* Lynx Point RAID */

	{ PCI_VDEVICE(INTEL, 0x8c0f), board_ahci }, /* Lynx Point RAID */



	/* JMicron 360/1/3/5/6, match class to avoid IDE function */

	{ PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,

drivers/ata/ahci.h

+6 −0
Original line number Diff line number Diff line
@@ -195,6 +195,9 @@ enum { 
	PORT_FBS_EN		= (1 << 0), /* Enable FBS */



	/* hpriv->flags bits */



#define AHCI_HFLAGS(flags)		.private_data	= (void *)(flags)



	AHCI_HFLAG_NO_NCQ		= (1 << 0),

	AHCI_HFLAG_IGN_IRQ_IF_ERR	= (1 << 1), /* ignore IRQ_IF_ERR */

	AHCI_HFLAG_IGN_SERR_INTERNAL	= (1 << 2), /* ignore SERR_INTERNAL */
@@ -210,6 +213,9 @@ enum { 
	AHCI_HFLAG_NO_SNTF		= (1 << 12), /* no sntf */

	AHCI_HFLAG_NO_FPDMA_AA		= (1 << 13), /* no FPDMA AA */

	AHCI_HFLAG_YES_FBS		= (1 << 14), /* force FBS cap on */

	AHCI_HFLAG_DELAY_ENGINE		= (1 << 15), /* do not start engine on

						        port start (wait until

						        error-handling stage) */



	/* ap->flags bits */

drivers/ata/ahci_platform.c

+11 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
enum ahci_type {

	AHCI,		/* standard platform ahci */

	IMX53_AHCI,	/* ahci on i.mx53 */

	STRICT_AHCI,	/* delayed DMA engine start */

};



static struct platform_device_id ahci_devtype[] = {
@@ -35,6 +36,9 @@ static struct platform_device_id ahci_devtype[] = { 
	}, {

		.name = "imx53-ahci",

		.driver_data = IMX53_AHCI,

	}, {

		.name = "strict-ahci",

		.driver_data = STRICT_AHCI,

	}, {

		/* sentinel */

	}
@@ -56,6 +60,13 @@ static const struct ata_port_info ahci_port_info[] = { 
		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_pmp_retry_srst_ops,

	},

	[STRICT_AHCI] = {

		AHCI_HFLAGS	(AHCI_HFLAG_DELAY_ENGINE),

		.flags		= AHCI_FLAG_COMMON,

		.pio_mask	= ATA_PIO4,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,

	},

};



static struct scsi_host_template ahci_platform_sht = {

drivers/ata/ata_piix.c

+8 −0
Original line number Diff line number Diff line
@@ -321,6 +321,14 @@ static const struct pci_device_id piix_pci_tbl[] = { 
	{ 0x8086, 0x1e08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },

	/* SATA Controller IDE (Panther Point) */

	{ 0x8086, 0x1e09, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },

	/* SATA Controller IDE (Lynx Point) */

	{ 0x8086, 0x8c00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },

	/* SATA Controller IDE (Lynx Point) */

	{ 0x8086, 0x8c01, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },

	/* SATA Controller IDE (Lynx Point) */

	{ 0x8086, 0x8c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },

	/* SATA Controller IDE (Lynx Point) */

	{ 0x8086, 0x8c09, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },

	{ }	/* terminate list */

};

drivers/ata/libahci.c

+5 −0
Original line number Diff line number Diff line
@@ -737,6 +737,7 @@ static void ahci_power_down(struct ata_port *ap) 


static void ahci_start_port(struct ata_port *ap)

{

	struct ahci_host_priv *hpriv = ap->host->private_data;

	struct ahci_port_priv *pp = ap->private_data;

	struct ata_link *link;

	struct ahci_em_priv *emp;
@@ -746,6 +747,10 @@ static void ahci_start_port(struct ata_port *ap) 
	/* enable FIS reception */

	ahci_start_fis_rx(ap);



	/* enable DMA */

	if (!(hpriv->flags & AHCI_HFLAG_DELAY_ENGINE))

		ahci_start_engine(ap);



	/* turn on LEDs */

	if (ap->flags & ATA_FLAG_EM) {

		ata_for_each_link(link, ap, EDGE) {