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

Commit b12aa1f2 authored by Tejun Heo's avatar Tejun Heo
Browse files

Merge branch 'for-3.19-fixes' of... 

Merge branch 'for-3.19-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

 into for-3.20

09c32aaa ("ahci_xgene: Fix the dma state machine lockup for the
ATA_CMD_SMART PIO mode command.") missed 3.19 release.  Fold it into
for-3.20.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parents f627cfde 09c32aaa

drivers/ata/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -835,6 +835,7 @@ config PATA_AT32 
config PATA_AT91

	tristate "PATA support for AT91SAM9260"

	depends on ARM && SOC_AT91SAM9

	depends on !ARCH_MULTIPLATFORM

	help

	  This option enables support for IDE devices on the Atmel AT91SAM9260 SoC.

drivers/ata/ahci.c

+0 −1
Original line number Diff line number Diff line
@@ -325,7 +325,6 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, 0x9d05), board_ahci }, /* Sunrise Point-LP RAID */

	{ PCI_VDEVICE(INTEL, 0x9d07), board_ahci }, /* Sunrise Point-LP RAID */

	{ PCI_VDEVICE(INTEL, 0xa103), board_ahci }, /* Sunrise Point-H AHCI */

	{ PCI_VDEVICE(INTEL, 0xa103), board_ahci }, /* Sunrise Point-H RAID */

	{ PCI_VDEVICE(INTEL, 0xa105), board_ahci }, /* Sunrise Point-H RAID */

	{ PCI_VDEVICE(INTEL, 0xa107), board_ahci }, /* Sunrise Point-H RAID */

	{ PCI_VDEVICE(INTEL, 0xa10f), board_ahci }, /* Sunrise Point-H RAID */

drivers/ata/ahci_xgene.c

+2 −1
Original line number Diff line number Diff line
@@ -213,7 +213,8 @@ static unsigned int xgene_ahci_qc_issue(struct ata_queued_cmd *qc) 
	}



	if (unlikely((ctx->last_cmd[ap->port_no] == ATA_CMD_ID_ATA) ||

	    (ctx->last_cmd[ap->port_no] == ATA_CMD_PACKET)))

	    (ctx->last_cmd[ap->port_no] == ATA_CMD_PACKET) ||

	    (ctx->last_cmd[ap->port_no] == ATA_CMD_SMART)))

		xgene_ahci_restart_engine(ap);



	rc = ahci_qc_issue(qc);

drivers/ata/libahci.c

+1 −1
Original line number Diff line number Diff line
@@ -2003,7 +2003,7 @@ static void ahci_set_aggressive_devslp(struct ata_port *ap, bool sleep) 


	devslp = readl(port_mmio + PORT_DEVSLP);

	if (!(devslp & PORT_DEVSLP_DSP)) {

		dev_err(ap->host->dev, "port does not support device sleep\n");

		dev_info(ap->host->dev, "port does not support device sleep\n");

		return;

	}

drivers/ata/libata-core.c

+31 −5
Original line number Diff line number Diff line
@@ -4206,10 +4206,33 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { 
	{ "PIONEER DVD-RW  DVR-216D",	NULL,	ATA_HORKAGE_NOSETXFER },



	/* devices that don't properly handle queued TRIM commands */

	{ "Micron_M500*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM, },

	{ "Crucial_CT???M500SSD*",	NULL,	ATA_HORKAGE_NO_NCQ_TRIM, },

	{ "Micron_M550*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM, },

	{ "Crucial_CT*M550SSD*",	NULL,	ATA_HORKAGE_NO_NCQ_TRIM, },

	{ "Micron_M[56]*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_ZERO_AFTER_TRIM, },

	{ "Crucial_CT*SSD*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM, },



	/*

	 * As defined, the DRAT (Deterministic Read After Trim) and RZAT

	 * (Return Zero After Trim) flags in the ATA Command Set are

	 * unreliable in the sense that they only define what happens if

	 * the device successfully executed the DSM TRIM command. TRIM

	 * is only advisory, however, and the device is free to silently

	 * ignore all or parts of the request.

	 *

	 * Whitelist drives that are known to reliably return zeroes

	 * after TRIM.

	 */



	/*

	 * The intel 510 drive has buggy DRAT/RZAT. Explicitly exclude

	 * that model before whitelisting all other intel SSDs.

	 */

	{ "INTEL*SSDSC2MH*",		NULL,	0, },



	{ "INTEL*SSD*", 		NULL,	ATA_HORKAGE_ZERO_AFTER_TRIM, },

	{ "SSD*INTEL*",			NULL,	ATA_HORKAGE_ZERO_AFTER_TRIM, },

	{ "Samsung*SSD*",		NULL,	ATA_HORKAGE_ZERO_AFTER_TRIM, },

	{ "SAMSUNG*SSD*",		NULL,	ATA_HORKAGE_ZERO_AFTER_TRIM, },

	{ "ST[1248][0248]0[FH]*",	NULL,	ATA_HORKAGE_ZERO_AFTER_TRIM, },



	/*

	 * Some WD SATA-I drives spin up and down erratically when the link
@@ -4721,6 +4744,9 @@ static struct ata_queued_cmd *ata_qc_new(struct ata_port *ap) 
		return NULL;



	for (i = 0, tag = ap->last_tag + 1; i < max_queue; i++, tag++) {

		if (ap->flags & ATA_FLAG_LOWTAG)

			tag = i;

		else

			tag = tag < max_queue ? tag : 0;



		/* the last tag is reserved for internal command. */