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

Commit 87618e00 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev 

* 'upstream-linus' of git://github.com/jgarzik/libata-dev:
  pata_of_platform: Don't use NO_IRQ
  [libata] ahci: Add ASMedia ASM1061 support
  [libata] Issue SRST to Sil3726 PMP
  sata_sis.c: trivial spelling fix
  ahci_platform: use dev_get_platdata()
  [libata] libata-scsi.c: Add function parameter documentation
parents c1f42467 2d5fcc98

drivers/ata/ahci.c

+3 −0
Original line number Diff line number Diff line
@@ -390,6 +390,9 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	/* Promise */

	{ PCI_VDEVICE(PROMISE, 0x3f20), board_ahci },	/* PDC42819 */



	/* Asmedia */

	{ PCI_VDEVICE(ASMEDIA, 0x0612), board_ahci },	/* ASM1061 */



	/* Generic, PCI class code for AHCI */

	{ PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,

	  PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci },

drivers/ata/ahci_platform.c

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static struct scsi_host_template ahci_platform_sht = { 
static int __init ahci_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct ahci_platform_data *pdata = dev->platform_data;

	struct ahci_platform_data *pdata = dev_get_platdata(dev);

	const struct platform_device_id *id = platform_get_device_id(pdev);

	struct ata_port_info pi = ahci_port_info[id->driver_data];

	const struct ata_port_info *ppi[] = { &pi, NULL };
@@ -191,7 +191,7 @@ static int __init ahci_probe(struct platform_device *pdev) 
static int __devexit ahci_remove(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct ahci_platform_data *pdata = dev->platform_data;

	struct ahci_platform_data *pdata = dev_get_platdata(dev);

	struct ata_host *host = dev_get_drvdata(dev);



	ata_host_detach(host);

drivers/ata/libata-eh.c

+11 −1
Original line number Diff line number Diff line
@@ -2883,7 +2883,7 @@ int ata_eh_reset(struct ata_link *link, int classify, 
	    sata_scr_read(link, SCR_STATUS, &sstatus))

		rc = -ERESTART;



	if (rc == -ERESTART || try >= max_tries) {

	if (try >= max_tries) {

		/*

		 * Thaw host port even if reset failed, so that the port

		 * can be retried on the next phy event.  This risks
@@ -2909,6 +2909,16 @@ int ata_eh_reset(struct ata_link *link, int classify, 
		ata_eh_acquire(ap);

	}



	/*

	 * While disks spinup behind PMP, some controllers fail sending SRST.

	 * They need to be reset - as well as the PMP - before retrying.

	 */

	if (rc == -ERESTART) {

		if (ata_is_host_link(link))

			ata_eh_thaw_port(ap);

		goto out;

	}



	if (try == max_tries - 1) {

		sata_down_spd_limit(link, 0);

		if (slave)

drivers/ata/libata-pmp.c

+2 −5
Original line number Diff line number Diff line
@@ -389,12 +389,9 @@ static void sata_pmp_quirks(struct ata_port *ap) 
			/* link reports offline after LPM */

			link->flags |= ATA_LFLAG_NO_LPM;



			/* Class code report is unreliable and SRST

			 * times out under certain configurations.

			 */

			/* Class code report is unreliable. */

			if (link->pmp < 5)

				link->flags |= ATA_LFLAG_NO_SRST |

					       ATA_LFLAG_ASSUME_ATA;

				link->flags |= ATA_LFLAG_ASSUME_ATA;



			/* port 5 is for SEMB device and it doesn't like SRST */

			if (link->pmp == 5)

drivers/ata/libata-scsi.c

+4 −0
Original line number Diff line number Diff line
@@ -1217,6 +1217,10 @@ void ata_scsi_slave_destroy(struct scsi_device *sdev) 


/**

 *	__ata_change_queue_depth - helper for ata_scsi_change_queue_depth

 *	@ap: ATA port to which the device change the queue depth

 *	@sdev: SCSI device to configure queue depth for

 *	@queue_depth: new queue depth

 *	@reason: calling context

 *

 *	libsas and libata have different approaches for associating a sdev to

 *	its ata_port.