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

Commit 726ce065 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:
  pata_marvell: Add support for 88SE91A0, 88SE91A4
  libata/sas: only set FROZEN flag if new EH is supported
  libata: apply NOSETXFER horkage to the affected Pioneer drives regardless of firmware revision
  drivers/ata/sata_dwc_460ex: Fix typo 'corrresponding'
parents d9632805 f920fe1c

drivers/ata/libata-core.c

+3 −3
Original line number Diff line number Diff line
@@ -4143,9 +4143,9 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { 
	 * Devices which choke on SETXFER.  Applies only if both the

	 * device and controller are SATA.

	 */

	{ "PIONEER DVD-RW  DVRTD08",	"1.00",	ATA_HORKAGE_NOSETXFER },

	{ "PIONEER DVD-RW  DVR-212D",	"1.28", ATA_HORKAGE_NOSETXFER },

	{ "PIONEER DVD-RW  DVR-216D",	"1.08", ATA_HORKAGE_NOSETXFER },

	{ "PIONEER DVD-RW  DVRTD08",	NULL,	ATA_HORKAGE_NOSETXFER },

	{ "PIONEER DVD-RW  DVR-212D",	NULL,	ATA_HORKAGE_NOSETXFER },

	{ "PIONEER DVD-RW  DVR-216D",	NULL,	ATA_HORKAGE_NOSETXFER },



	/* End Marker */

	{ }

drivers/ata/libata-scsi.c

+6 −0
Original line number Diff line number Diff line
@@ -3797,6 +3797,12 @@ EXPORT_SYMBOL_GPL(ata_sas_port_alloc); 
 */

int ata_sas_port_start(struct ata_port *ap)

{

	/*

	 * the port is marked as frozen at allocation time, but if we don't

	 * have new eh, we won't thaw it

	 */

	if (!ap->ops->error_handler)

		ap->pflags &= ~ATA_PFLAG_FROZEN;

	return 0;

}

EXPORT_SYMBOL_GPL(ata_sas_port_start);

drivers/ata/pata_marvell.c

+3 −0
Original line number Diff line number Diff line
@@ -161,6 +161,9 @@ static const struct pci_device_id marvell_pci_tbl[] = { 
	{ PCI_DEVICE(0x11AB, 0x6121), },

	{ PCI_DEVICE(0x11AB, 0x6123), },

	{ PCI_DEVICE(0x11AB, 0x6145), },

	{ PCI_DEVICE(0x1B4B, 0x91A0), },

	{ PCI_DEVICE(0x1B4B, 0x91A4), },



	{ }	/* terminate list */

};

drivers/ata/sata_dwc_460ex.c

+1 −1
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ static void sata_dwc_tf_dump(struct ata_taskfile *tf) 
/*

 * Function: get_burst_length_encode

 * arguments: datalength: length in bytes of data

 * returns value to be programmed in register corrresponding to data length

 * returns value to be programmed in register corresponding to data length

 * This value is effectively the log(base 2) of the length

 */

static  int get_burst_length_encode(int datalength)