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

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

Pull libata fixes from Jeff Garzik:
 - libata-acpi regression fix
 - additional or corrected drive quirks for ata_blacklist
 - Kconfig text tweaking
 - new PCI IDs
 - pata_atiixp: quirk for MSI motherboard
 - export ahci_dev_classify for an ahci_platform driver

* tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata: Add a space to " 2GB ATA Flash Disk" DMA blacklist entry
  [libata] new quirk, lift bridge limits for Buffalo DriveStation Quattro
  [libata] Kconfig: Elaborate that SFF is meant for legacy and PATA stuff
  [libata] acpi: call ata_acpi_gtm during ata port init time
  ata_piix: Add Device IDs for Intel Lynx Point-LP PCH
  ahci: Add Device IDs for Intel Lynx Point-LP PCH
  pata_atiixp: override cable detection on MSI E350DM-E33
  ahci: un-staticize ahci_dev_classify
parents 2d809dcd d17d794c

drivers/ata/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ config SATA_SIL24 
	  If unsure, say N.



config ATA_SFF

	bool "ATA SFF support"

	bool "ATA SFF support (for legacy IDE and PATA)"

	default y

	help

	  This option adds support for ATA controllers with SFF

drivers/ata/ahci.c

+8 −0
Original line number Diff line number Diff line
@@ -256,6 +256,14 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ 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 */

	{ PCI_VDEVICE(INTEL, 0x9c02), board_ahci }, /* Lynx Point-LP AHCI */

	{ PCI_VDEVICE(INTEL, 0x9c03), board_ahci }, /* Lynx Point-LP AHCI */

	{ PCI_VDEVICE(INTEL, 0x9c04), board_ahci }, /* Lynx Point-LP RAID */

	{ PCI_VDEVICE(INTEL, 0x9c05), board_ahci }, /* Lynx Point-LP RAID */

	{ PCI_VDEVICE(INTEL, 0x9c06), board_ahci }, /* Lynx Point-LP RAID */

	{ PCI_VDEVICE(INTEL, 0x9c07), board_ahci }, /* Lynx Point-LP RAID */

	{ PCI_VDEVICE(INTEL, 0x9c0e), board_ahci }, /* Lynx Point-LP RAID */

	{ PCI_VDEVICE(INTEL, 0x9c0f), board_ahci }, /* Lynx Point-LP 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

+1 −0
Original line number Diff line number Diff line
@@ -320,6 +320,7 @@ extern struct device_attribute *ahci_sdev_attrs[]; 
extern struct ata_port_operations ahci_ops;

extern struct ata_port_operations ahci_pmp_retry_srst_ops;



unsigned int ahci_dev_classify(struct ata_port *ap);

void ahci_fill_cmd_slot(struct ahci_port_priv *pp, unsigned int tag,

			u32 opts);

void ahci_save_initial_config(struct device *dev,

drivers/ata/ata_piix.c

+8 −0
Original line number Diff line number Diff line
@@ -329,6 +329,14 @@ static const struct pci_device_id piix_pci_tbl[] = { 
	{ 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 },

	/* SATA Controller IDE (Lynx Point-LP) */

	{ 0x8086, 0x9c00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },

	/* SATA Controller IDE (Lynx Point-LP) */

	{ 0x8086, 0x9c01, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },

	/* SATA Controller IDE (Lynx Point-LP) */

	{ 0x8086, 0x9c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },

	/* SATA Controller IDE (Lynx Point-LP) */

	{ 0x8086, 0x9c09, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },

	/* SATA Controller IDE (DH89xxCC) */

	{ 0x8086, 0x2326, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },

	{ }	/* terminate list */

drivers/ata/libahci.c

+2 −1
Original line number Diff line number Diff line
@@ -1139,7 +1139,7 @@ static void ahci_dev_config(struct ata_device *dev) 
	}

}



static unsigned int ahci_dev_classify(struct ata_port *ap)

unsigned int ahci_dev_classify(struct ata_port *ap)

{

	void __iomem *port_mmio = ahci_port_base(ap);

	struct ata_taskfile tf;
@@ -1153,6 +1153,7 @@ static unsigned int ahci_dev_classify(struct ata_port *ap) 


	return ata_dev_classify(&tf);

}

EXPORT_SYMBOL_GPL(ahci_dev_classify);



void ahci_fill_cmd_slot(struct ahci_port_priv *pp, unsigned int tag,

			u32 opts)

CRA Git | Maintained and supported by SUSTech CRA and CCSE