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

Commit 557eed60 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: Power off empty ports
  libata-pmp: add support for Thermaltake BlackX Duet esata drive dock
  ATA: Don't powerdown Compaq Triflex IDE device on suspend
  libata: Use Maximum Write Same Length to report discard size limit
  drivers/ata/acard-ahci.c: fix enum warning
  pata_at91: SMC settings calculation bugfixes, support for t6z and IORDY
  libata-sff: prevent irq descriptions for dummy ports
  pata_cm64x: fix boot crash on parisc
parents be84bfcc 8a745f1f

drivers/ata/acard-ahci.c

+1 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ static int acard_ahci_init_one(struct pci_dev *pdev, const struct pci_device_id 


	VPRINTK("ENTER\n");



	WARN_ON(ATA_MAX_QUEUE > AHCI_MAX_CMDS);

	WARN_ON((int)ATA_MAX_QUEUE > AHCI_MAX_CMDS);



	if (!printed_version++)

		dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");

drivers/ata/libata-core.c

+8 −2
Original line number Diff line number Diff line
@@ -3619,8 +3619,14 @@ int sata_link_scr_lpm(struct ata_link *link, enum ata_lpm_policy policy, 
		scontrol |= (0x2 << 8);

		break;

	case ATA_LPM_MIN_POWER:

		if (ata_link_nr_enabled(link) > 0)

			/* no restrictions on LPM transitions */

			scontrol &= ~(0x3 << 8);

		else {

			/* empty port, power off */

			scontrol &= ~0xf;

			scontrol |= (0x1 << 2);

		}

		break;

	default:

		WARN_ON(1);

drivers/ata/libata-eh.c

+1 −1
Original line number Diff line number Diff line
@@ -3423,7 +3423,7 @@ fail: 
	return rc;

}



static int ata_link_nr_enabled(struct ata_link *link)

int ata_link_nr_enabled(struct ata_link *link)

{

	struct ata_device *dev;

	int cnt = 0;

drivers/ata/libata-pmp.c

+10 −0
Original line number Diff line number Diff line
@@ -449,6 +449,16 @@ static void sata_pmp_quirks(struct ata_port *ap) 
		 * otherwise.  Don't try hard to recover it.

		 */

		ap->pmp_link[ap->nr_pmp_links - 1].flags |= ATA_LFLAG_NO_RETRY;

	} else if (vendor == 0x197b && devid == 0x2352) {

		/* chip found in Thermaltake BlackX Duet, jmicron JMB350? */

		ata_for_each_link(link, ap, EDGE) {

			/* SRST breaks detection and disks get misclassified

			 * LPM disabled to avoid potential problems

			 */

			link->flags |= ATA_LFLAG_NO_LPM |

				       ATA_LFLAG_NO_SRST |

				       ATA_LFLAG_ASSUME_ATA;

		}

	}

}

drivers/ata/libata-scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -2138,7 +2138,7 @@ static unsigned int ata_scsiop_inq_b0(struct ata_scsi_args *args, u8 *rbuf) 
	 * with the unmap bit set.

	 */

	if (ata_id_has_trim(args->id)) {

		put_unaligned_be32(65535 * 512 / 8, &rbuf[20]);

		put_unaligned_be64(65535 * 512 / 8, &rbuf[36]);

		put_unaligned_be32(1, &rbuf[28]);

	}