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

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

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

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata-sff: Reenable Port Multiplier after libata-sff remodeling.
  libata: skip EH autopsy and recovery during suspend
  ahci: AHCI and RAID mode SATA patch for Intel Patsburg DeviceIDs
  ata_piix: IDE Mode SATA patch for Intel Patsburg DeviceIDs
  libata,pata_via: revert ata_wait_idle() removal from ata_sff/via_tf_load()
  ahci: fix hang on failed softreset
  pata_artop: Fix device ID parity check
parents eee743fd ea3c6450

drivers/ata/ahci.c

+3 −0
Original line number Diff line number Diff line
@@ -253,6 +253,9 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, 0x1c05), board_ahci }, /* CPT RAID */

	{ PCI_VDEVICE(INTEL, 0x1c06), board_ahci }, /* CPT RAID */

	{ PCI_VDEVICE(INTEL, 0x1c07), board_ahci }, /* CPT RAID */

	{ PCI_VDEVICE(INTEL, 0x1d02), board_ahci }, /* PBG AHCI */

	{ PCI_VDEVICE(INTEL, 0x1d04), board_ahci }, /* PBG RAID */

	{ PCI_VDEVICE(INTEL, 0x1d06), board_ahci }, /* PBG 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/ata_piix.c

+4 −0
Original line number Diff line number Diff line
@@ -302,6 +302,10 @@ static const struct pci_device_id piix_pci_tbl[] = { 
	{ 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },

	/* SATA Controller IDE (CPT) */

	{ 0x8086, 0x1c09, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },

	/* SATA Controller IDE (PBG) */

	{ 0x8086, 0x1d00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },

	/* SATA Controller IDE (PBG) */

	{ 0x8086, 0x1d08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },

	{ }	/* terminate list */

};

drivers/ata/libahci.c

+1 −1
Original line number Diff line number Diff line
@@ -1326,7 +1326,7 @@ int ahci_do_softreset(struct ata_link *link, unsigned int *class, 
	/* issue the first D2H Register FIS */

	msecs = 0;

	now = jiffies;

	if (time_after(now, deadline))

	if (time_after(deadline, now))

		msecs = jiffies_to_msecs(deadline - now);



	tf.ctl |= ATA_SRST;

drivers/ata/libata-core.c

+13 −1
Original line number Diff line number Diff line
@@ -5418,6 +5418,7 @@ static int ata_host_request_pm(struct ata_host *host, pm_message_t mesg, 
 */

int ata_host_suspend(struct ata_host *host, pm_message_t mesg)

{

	unsigned int ehi_flags = ATA_EHI_QUIET;

	int rc;



	/*
@@ -5426,7 +5427,18 @@ int ata_host_suspend(struct ata_host *host, pm_message_t mesg) 
	 */

	ata_lpm_enable(host);



	rc = ata_host_request_pm(host, mesg, 0, ATA_EHI_QUIET, 1);

	/*

	 * On some hardware, device fails to respond after spun down

	 * for suspend.  As the device won't be used before being

	 * resumed, we don't need to touch the device.  Ask EH to skip

	 * the usual stuff and proceed directly to suspend.

	 *

	 * http://thread.gmane.org/gmane.linux.ide/46764

	 */

	if (mesg.event == PM_EVENT_SUSPEND)

		ehi_flags |= ATA_EHI_NO_AUTOPSY | ATA_EHI_NO_RECOVERY;



	rc = ata_host_request_pm(host, mesg, 0, ehi_flags, 1);

	if (rc == 0)

		host->dev->power.power_state = mesg;

	return rc;

drivers/ata/libata-eh.c

+4 −0
Original line number Diff line number Diff line
@@ -3235,6 +3235,10 @@ static int ata_eh_skip_recovery(struct ata_link *link) 
	if (link->flags & ATA_LFLAG_DISABLED)

		return 1;



	/* skip if explicitly requested */

	if (ehc->i.flags & ATA_EHI_NO_RECOVERY)

		return 1;



	/* thaw frozen port and recover failed devices */

	if ((ap->pflags & ATA_PFLAG_FROZEN) || ata_link_nr_enabled(link))

		return 0;